Projects >> perforce-plugin >>92e8c1d79e381a8541f3ff29230a6eb6449e21de

Chunk
Conflicting content
        }
        
        @Override
<<<<<<< HEAD
        public SCM newInstance(StaplerRequest req, JSONObject formData) throws FormException {
            return (PerforceSCM)super.newInstance(req, formData);
        }
        
        /**Generates a random key for p4.config.instanceID*/
        private static final AtomicLong P4_INSTANCE_COUNTER = new AtomicLong();
        public String generateP4InstanceID() {
            // There's no problem even if the counter reaches overflow 
            return Long.toString(P4_INSTANCE_COUNTER.incrementAndGet());
=======
        public SCM newInstance(StaplerRequest req, JSONObject formData) throws FormException {           
            PerforceSCM newInstance = (PerforceSCM)super.newInstance(req, formData);
            String depotType = req.getParameter("p4.depotType");
            boolean useStreamDepot = depotType.equals("stream");
            boolean useClientSpec = depotType.equals("file");
            newInstance.setUseStreamDepot(useStreamDepot);
            if (useStreamDepot) {
                newInstance.setP4Stream(req.getParameter("p4Stream"));
            }
            else {
                newInstance.setUseClientSpec(useClientSpec);
                if (useClientSpec) {
                    newInstance.setClientSpec(req.getParameter("clientSpec"));
                }
                else {
                    newInstance.setProjectPath(req.getParameter("projectPath"));
                }
            }
            newInstance.setUseViewMask(req.getParameter("p4.useViewMask") != null);
            newInstance.setViewMask(Util.fixEmptyAndTrim(req.getParameter("p4.viewMask")));
            newInstance.setUseViewMaskForPolling(req.getParameter("p4.useViewMaskForPolling") != null);
            newInstance.setUseViewMaskForSyncing(req.getParameter("p4.useViewMaskForSyncing") != null);
            newInstance.setUseViewMaskForChangeLog(req.getParameter("p4.useViewMaskForChangeLog") != null);
            
            String cleanType = req.getParameter("p4.cleanType");
            boolean useWipe = false;
            boolean useQuickClean = false;
            if(cleanType != null && req.getParameter("p4.cleanWorkspace") != null){
                useWipe = cleanType.equals("wipe");
                useQuickClean = cleanType.equals("quick");
            }
            newInstance.setWipeBeforeBuild(useWipe);
            newInstance.setQuickCleanBeforeBuild(useQuickClean);
            
            String wipeRepo = req.getParameter("p4.wipeRepoBeforeBuild");
            newInstance.setWipeRepoBeforeBuild(wipeRepo != null);
            
            newInstance.setRestoreChangedDeletedFiles(req.getParameter("p4.restoreChangedDeletedFiles") != null);
            
            return newInstance;
>>>>>>> 02d2fcf2a20676873687bedac544064f7aa9ce9a
        }

        /**
Solution content
        }
        
        @Override
        public SCM newInstance(StaplerRequest req, JSONObject formData) throws FormException {           
            return (PerforceSCM)super.newInstance(req, formData);
        }
        
        /**Generates a random key for p4.config.instanceID*/
        private static final AtomicLong P4_INSTANCE_COUNTER = new AtomicLong();
        public String generateP4InstanceID() {
            // There's no problem even if the counter reaches overflow 
            return Long.toString(P4_INSTANCE_COUNTER.incrementAndGet());
        }

        /**
File
PerforceSCM.java
Developer's decision
Version 1
Kind of conflict
Attribute
Cast expression
Comment
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable