continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r491864 - in /maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action: BuildResultsListAction.java WorkingCopyAction.java
Date Tue, 02 Jan 2007 17:33:27 GMT
Author: evenisse
Date: Tue Jan  2 09:33:26 2007
New Revision: 491864

URL: http://svn.apache.org/viewvc?view=rev&rev=491864
Log:
[CONTINUUM-1102] Fix projectGroupId in build results/working copy pages
Submitted by: Franz Allan Valencia See

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?view=diff&rev=491864&r1=491863&r2=491864
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
Tue Jan  2 09:33:26 2007
@@ -17,6 +17,7 @@
  */
 
 import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.Project;
 
 import java.util.Collection;
 
@@ -31,17 +32,19 @@
 public class BuildResultsListAction
     extends ContinuumActionSupport
 {
+    private Project project;
+
     private Collection buildResults;
 
     private int projectId;
 
-    private int projectGroupId;
-
     private String projectName;
 
     public String execute()
         throws ContinuumException
     {
+        project = getContinuum().getProject( projectId );
+
         buildResults = getContinuum().getBuildResultsForProject( projectId );
 
         return SUCCESS;
@@ -57,16 +60,6 @@
         this.projectId = projectId;
     }
 
-    public int getProjectGroupId()
-    {
-        return projectGroupId;
-    }
-
-    public void setProjectGroupId( int projectGroupId )
-    {
-        this.projectGroupId = projectGroupId;
-    }
-
     public Collection getBuildResults()
     {
         return buildResults;
@@ -80,5 +73,10 @@
     public void setProjectName( String projectName )
     {
         this.projectName = projectName;
+    }
+
+    public Project getProject()
+    {
+        return project;
     }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?view=diff&rev=491864&r1=491863&r2=491864
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
Tue Jan  2 09:33:26 2007
@@ -17,6 +17,7 @@
  */
 
 import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.web.util.WorkingCopyContentGenerator;
 
 import com.opensymphony.webwork.ServletActionContext;
@@ -46,9 +47,9 @@
      */
     private WorkingCopyContentGenerator generator;
 
-    private int projectId;
+    private Project project;
 
-    private int projectGroupId;
+    private int projectId;
 
     private String userDirectory;
 
@@ -73,14 +74,14 @@
     {
         files = getContinuum().getFiles( projectId, userDirectory );
 
-        projectName = getContinuum().getProject( projectId ).getName();
+        project = getContinuum().getProject( projectId );
+
+        projectName = project.getName();
 
         HashMap params = new HashMap();
 
         params.put( "projectId", new Integer( projectId ) );
 
-        params.put( "projectGroupId", new Integer( projectGroupId ) );
-
         params.put( "projectName", projectName );
 
         String baseUrl = UrlHelper.buildUrl( "/workingCopy.action", ServletActionContext.getRequest(),
ServletActionContext.getResponse(), params );
@@ -142,16 +143,6 @@
         return projectName;
     }
 
-    public int getProjectGroupId()
-    {
-        return projectGroupId;
-    }
-
-    public void setProjectGroupId( int projectGroupId )
-    {
-        this.projectGroupId = projectGroupId;
-    }
-
     public String getUserDirectory()
     {
         return userDirectory;
@@ -212,5 +203,10 @@
     public String getMimeType()
     {
         return this.mimeType;
+    }
+
+    public Project getProject()
+    {
+        return project;
     }
 }



Mime
View raw message