Merge pull request #54 from jenkinsci/variables_handling_refactoring

Variables handling refactoring

Author: rpetti

.gitignore

@@ -6,4 +6,7 @@ work
 .classpath
 .settings
 .project
-.DS_Store
+.DS_Store
+
+# Coverity
+/cov-int

pom.xml

@@ -120,7 +120,13 @@
       <artifactId>commons-codec</artifactId>
       <version>1.4</version>
     </dependency>
-  </dependencies>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>2.0.1</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
 
   <distributionManagement>
     <repository>

src/main/java/hudson/plugins/perforce/PerforceSCM.java

@@ -19,6 +19,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.List;
+import javax.annotation.CheckForNull;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -144,6 +145,14 @@ public String isInvalidTag(String tag) {
         }
         return null;
     }
+    
+    @CheckForNull
+    public PerforceSCM getSCM() {
+        if(this.getBuild().getProject().getScm() instanceof PerforceSCM){
+            return (PerforceSCM)this.getBuild().getProject().getScm();
+        }
+        return null;
+    }
 
     /**
      * Checks if the value is a valid Perforce tag (label) name.
@@ -158,7 +167,7 @@ public synchronized FormValidation doCheckTag(@QueryParameter String value) {
     /**
      * Invoked to actually tag the workspace.
      */
-    public synchronized void doSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, InterruptedException {
         getACL().checkPermission(getPermission());
 
         String tag = req.getParameter("name");
@@ -170,16 +179,16 @@ public synchronized void doSubmit(StaplerRequest req, StaplerResponse rsp) throw
         rsp.sendRedirect(".");
     }
 
-    public void tagBuild(String tagname, String description, String owner) throws IOException {
+    public void tagBuild(String tagname, String description, String owner) throws IOException, InterruptedException {
         Label label = new Label();
         label.setName(tagname);
         label.setDescription(description);
         label.setRevision(new Integer(changeNumber).toString());
         if(owner!=null && !owner.equals("")) label.setOwner(owner);
 
-        if(this.getBuild().getProject().getScm() instanceof PerforceSCM){
-            PerforceSCM scm = (PerforceSCM)this.getBuild().getProject().getScm();
-            depot.setPassword(scm.getDecryptedP4Passwd(this.getBuild().getProject()));
+        PerforceSCM scm = getSCM();
+        if(scm != null){
+            depot.setPassword(scm.getDecryptedP4Passwd(this.getBuild().getProject(), this.getBuild().getBuiltOn()));
         }
 
         //Only take the depot paths and add them to the view.

src/main/java/hudson/plugins/perforce/PerforceTagAction.java

@@ -110,14 +110,20 @@ public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListene
                     return false;
                 }
             }
+            
+            PerforceSCM scm = tagAction.getSCM();
+            if (scm == null) {
+                listener.getLogger().println("Cannot retrieve the Perforce SCM");
+                return false;
+            }
 
             listener.getLogger().println("Labelling Build in Perforce using " + rawLabelName);
 
             String labelName, labelDesc, labelOwner;
             try {
-                labelName = MacroStringHelper.substituteParameters(rawLabelName, build, null);
-                labelDesc = MacroStringHelper.substituteParameters(rawLabelDesc, build, null);
-                labelOwner = MacroStringHelper.substituteParameters(rawLabelOwner, build, null);
+                labelName = MacroStringHelper.substituteParameters(rawLabelName, scm, build, null);
+                labelDesc = MacroStringHelper.substituteParameters(rawLabelDesc, scm, build, null);
+                labelOwner = MacroStringHelper.substituteParameters(rawLabelOwner, scm, build, null);
             } catch (ParameterSubstitutionException ex) {
                 listener.getLogger().println("Parameter substitution error in label items. "+ex.getMessage());
                 return false;