Review: rename getProjectListGeneral to getJobs and minor style changes

Author: svanoort

pom.xml

@@ -181,7 +181,7 @@
     <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <workflow.version>1.4</workflow.version>
+      <workflow.version>1.4</workflow.version>
     </properties>
 </project>  
 

src/main/java/hudson/plugins/parameterizedtrigger/BuildTrigger.java

@@ -58,7 +58,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         for (BuildTriggerConfig config : configs) {
             boolean hasNonAbstractProject = false;
 
-            List<Job> jobs = config.getProjectListGeneral(build.getRootBuild().getProject().getParent(), build.getEnvironment(listener));
+            List<Job> jobs = config.getJobs(build.getRootBuild().getProject().getParent(), build.getEnvironment(listener));
             for (Job j : jobs) {
                 if (!(j instanceof AbstractProject)) {
                     hasNonAbstractProject = true;
@@ -95,8 +95,9 @@ public void buildDependencyGraph(AbstractProject owner, DependencyGraph graph) {
 
 		for (BuildTriggerConfig config : configs) {
 			List<AbstractProject> projectList = config.getProjectList(owner.getParent(), null);
-			for (AbstractProject project : projectList)
+			for (AbstractProject project : projectList) {
 				ParameterizedDependency.add(owner, project, config, graph);
+			}
 		}
 	}
 

src/main/java/hudson/plugins/parameterizedtrigger/BuildTriggerConfig.java

@@ -4,8 +4,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multiset;
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.Launcher;
@@ -115,7 +113,7 @@ public boolean getTriggerWithNoParameters() {
 
     /**
      * @deprecated
-     *      Use {@link #getProjectListGeneral(ItemGroup, EnvVars)}
+     *      Use {@link #getJobs(ItemGroup, EnvVars)}
      */
     public List<AbstractProject> getProjectList(EnvVars env) {
         return getProjectList(null, env);
@@ -127,11 +125,11 @@ public List<AbstractProject> getProjectList(EnvVars env) {
      * @param context
      *      The container with which to resolve relative project names.
      * @deprecated
-     *      Use {@link #getProjectListGeneral(ItemGroup, EnvVars)}
+     *      Use {@link #getJobs(ItemGroup, EnvVars)}
      */
-    @Deprecated // Prefer getProjectListGeneral since it can return implementations of the more general Job class
+    @Deprecated
 	public List<AbstractProject> getProjectList(ItemGroup context, EnvVars env) {
-        return Util.filter(getProjectListGeneral(context,env), AbstractProject.class);
+        return Util.filter(getJobs(context, env), AbstractProject.class);
 	}
 
     /**
@@ -140,7 +138,7 @@ public List<AbstractProject> getProjectList(ItemGroup context, EnvVars env) {
      * @param context
      *      The container with which to resolve relative project names.
      */
-    public List<Job> getProjectListGeneral(ItemGroup context, EnvVars env) {
+    public List<Job> getJobs(ItemGroup context, EnvVars env) {
         List<Job> projectList = new ArrayList<Job>();
         projectList.addAll(Items.fromNameList(context, getProjects(env), Job.class));
         return projectList;
@@ -327,7 +325,7 @@ public List<Future<AbstractBuild>> perform(AbstractBuild<?, ?> build, Launcher l
                     List<Action> actions = getBaseActions(
                             ImmutableList.<AbstractBuildParameters>builder().addAll(configs).addAll(addConfigs).build(),
                             build, listener);
-                    for (Job project : getProjectListGeneral(build.getRootBuild().getProject().getParent(), env)) {
+                    for (Job project : getJobs(build.getRootBuild().getProject().getParent(), env)) {
                         List<Action> list = getBuildActions(actions, project);
 
                         futures.add(schedule(build, project, list));
@@ -374,7 +372,7 @@ public ListMultimap<Job, Future<Run>> perform3(AbstractBuild<?, ?> build, Launch
 
                 for (List<AbstractBuildParameters> addConfigs : getDynamicBuildParameters(build, listener)) {
                     List<Action> actions = getBaseActions(ImmutableList.<AbstractBuildParameters>builder().addAll(configs).addAll(addConfigs).build(), build, listener);
-                    for (Job project : getProjectListGeneral(build.getRootBuild().getProject().getParent(), env)) {
+                    for (Job project : getJobs(build.getRootBuild().getProject().getParent(), env)) {
                         List<Action> list = getBuildActions(actions, project);
 
                         futures.put(project, schedule(build, project, list));

src/main/java/hudson/plugins/parameterizedtrigger/TriggerBuilder.java

@@ -86,7 +86,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher,
             for (BlockableBuildTriggerConfig config : configs) {
                 ListMultimap<Job, Future<Run>> futures = config.perform3(build, launcher, listener);
                 // Only contains resolved projects
-                List<Job> projectList = config.getProjectListGeneral(build.getRootBuild().getProject().getParent(),env);
+                List<Job> projectList = config.getJobs(build.getRootBuild().getProject().getParent(), env);
 
                 // Get the actual defined projects
                 StringTokenizer tokenizer = new StringTokenizer(config.getProjects(env), ",");