continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r727656 - in /continuum/branches/continuum-parallel-builds/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/admin/QueuesAction.java webapp/WEB-INF/jsp/admin/buildQueueView.jsp
Date Thu, 18 Dec 2008 06:37:08 GMT
Author: oching
Date: Wed Dec 17 22:37:07 2008
New Revision: 727656

URL: http://svn.apache.org/viewvc?rev=727656&view=rev
Log:
cleaned unused variables and methods in QueuesAction

Modified:
    continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
    continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java?rev=727656&r1=727655&r2=727656&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
(original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
Wed Dec 17 22:37:07 2008
@@ -49,18 +49,9 @@
 public class QueuesAction
     extends AbstractBuildQueueAction
     implements SecureAction, LogEnabled
-{    
-    private BuildProjectTask currentBuildProjectTask;
-    
-    private List<BuildProjectTask> buildProjectTasks;
-    
+{            
     private List<String> selectedBuildTaskHashCodes;
         
-    private CheckOutTask currentCheckOutTask;
-    
-    // retain! can be used for parallel builds
-    private List<CheckOutTask> currentCheckOutTasks;
-    
     private List<String> selectedCheckOutTaskHashCodes;
     
     private int buildDefinitionId;
@@ -70,13 +61,6 @@
     private int trigger;
 
     private String projectName;
-
-    /**
-     * @plexus.requirement
-     */
-    //private TaskQueueManager taskQueueManager;
-        
-    //private List<BuildProjectTask> currentBuildProjectTasks = new ArrayList<BuildProjectTask>();
     
     private Map<String, BuildProjectTask> currentBuildProjectTasks = new HashMap<String,
BuildProjectTask>();
     
@@ -131,7 +115,6 @@
         }
          
         getContinuum().getBuildsManager().removeProjectFromCheckoutQueue( projectId );
-        //taskQueueManager.removeProjectFromCheckoutQueue( projectId );
         return SUCCESS;
     }
 
@@ -294,8 +277,7 @@
         }
         
         getContinuum().getBuildsManager().removeProjectsFromBuildQueueWithHashcodes(
-                                                                                     listToIntArray(
this.getSelectedBuildTaskHashCodes() ) );
-        //taskQueueManager.removeProjectsFromBuildingQueueWithHashCodes( listToIntArray(this.getSelectedBuildTaskHashCodes())
);
+                 listToIntArray( this.getSelectedBuildTaskHashCodes() ) );
         return SUCCESS;
     }
 
@@ -317,11 +299,8 @@
             return REQUIRES_AUTHENTICATION;
         }
      
-        //taskQueueManager
-          //  .removeTasksFromCheckoutQueueWithHashCodes( listToIntArray( this.getSelectedCheckOutTaskHashCodes()
) );
-        
         getContinuum().getBuildsManager().removeProjectsFromCheckoutQueueWithHashcodes(
-                                                                                        listToIntArray(
this.getSelectedCheckOutTaskHashCodes() ) );
+                    listToIntArray( this.getSelectedCheckOutTaskHashCodes() ) );
         return SUCCESS;
     }
 
@@ -386,18 +365,7 @@
         }
         
         return false;
-    }
-    
-
-    public List<BuildProjectTask> getBuildProjectTasks()
-    {
-        return buildProjectTasks;
-    }
-
-    public void setBuildProjectTasks( List<BuildProjectTask> buildProjectTasks )
-    {
-        this.buildProjectTasks = buildProjectTasks;
-    }
+    }    
 
     public int getBuildDefinitionId()
     {
@@ -439,57 +407,6 @@
         this.projectName = projectName;
     }
 
-    public BuildProjectTask getCurrentBuildProjectTask()
-    {
-        return currentBuildProjectTask;
-    }
-
-    public void setCurrentBuildProjectTask( BuildProjectTask currentBuildProjectTask )
-    {
-        this.currentBuildProjectTask = currentBuildProjectTask;
-    }
-
-    /*public TaskQueueExecutor getTaskQueueExecutor()
-    {
-        return taskQueueExecutor;
-    }
-
-
-    public TaskQueueExecutor getCheckoutTaskQueueExecutor()
-    {
-        return checkoutTaskQueueExecutor;
-    }
-
-
-    public void setCheckoutTaskQueueExecutor( TaskQueueExecutor checkoutTaskQueueExecutor
)
-    {
-        this.checkoutTaskQueueExecutor = checkoutTaskQueueExecutor;
-    }*/
-
-
-    public CheckOutTask getCurrentCheckOutTask()
-    {
-        return currentCheckOutTask;
-    }
-
-
-    public void setCurrentCheckOutTask( CheckOutTask currentCheckOutTask )
-    {
-        this.currentCheckOutTask = currentCheckOutTask;
-    }
-
-
-    public List<CheckOutTask> getCurrentCheckOutTasks()
-    {
-        return currentCheckOutTasks;
-    }
-
-
-    public void setCurrentCheckOutTasks( List<CheckOutTask> currentCheckOutTasks )
-    {
-        this.currentCheckOutTasks = currentCheckOutTasks;
-    }
-
     public List<String> getSelectedBuildTaskHashCodes()
     {
         return selectedBuildTaskHashCodes;
@@ -549,15 +466,4 @@
     {
         this.checkoutsInQueue = checkoutsInQueue;
     }
-
-
-    /*public List<BuildProjectTask> getCurrentBuildProjectTasks()
-    {
-        return currentBuildProjectTasks;
-    }
-
-    public void setCurrentBuildProjectTasks( List<BuildProjectTask> currentBuildProjectTasks
)
-    {
-        this.currentBuildProjectTasks = currentBuildProjectTasks;
-    }*/
 }

Modified: continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp?rev=727656&r1=727655&r2=727656&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
(original)
+++ continuum/branches/continuum-parallel-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
Wed Dec 17 22:37:07 2008
@@ -136,10 +136,7 @@
           </div>
         </c:if> 
         
-        <%-- deng - parallel builds
-        TODO: might need to loop through each element of map (each returns a list) 
-        
-          
+        <%--           
         <div id="h3">
           <h3>
             <s:text name="buildQueue.section.title"/>
@@ -196,7 +193,7 @@
           </div>
         </c:if>        
         
-        END OF COMMENT --%>
+        --%>
         
         
         <!-- checkout queue -->



Mime
View raw message