continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r482601 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ java/org/apache/maven/continuum/web/view/ mdo/
Date Tue, 05 Dec 2006 11:26:52 GMT
Author: evenisse
Date: Tue Dec  5 03:26:47 2006
New Revision: 482601

URL: http://svn.apache.org/viewvc?view=rev&rev=482601
Log:
o Add missing projectGroupId in some links
o Remove unused BuoldNowCell component

Removed:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
    maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?view=diff&rev=482601&r1=482600&r2=482601
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
Tue Dec  5 03:26:47 2006
@@ -109,6 +109,8 @@
 
                 model.setVersion( project.getVersion() );
 
+                model.setProjectGroupId( project.getProjectGroup().getId() );
+
                 model.setProjectGroupName( project.getProjectGroup().getName() );
 
                 if ( getContinuum().isInBuildingQueue( project.getId() ) || getContinuum().isInCheckoutQueue(
project.getId() ) )

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?view=diff&rev=482601&r1=482600&r2=482601
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
Tue Dec  5 03:26:47 2006
@@ -29,7 +29,7 @@
 
 /**
  * Used to render the list of projects in the project group page.
- * 
+ *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
  * @plexus.component role="com.opensymphony.xwork.Action"
@@ -49,7 +49,7 @@
     private int nbErrors;
 
     private List summary;
-    
+
     private List projects;
 
     public String execute()
@@ -78,9 +78,12 @@
 
             model.setVersion( project.getVersion() );
 
+            model.setProjectGroupId( project.getProjectGroup().getId() );
+
             model.setProjectGroupName( project.getProjectGroup().getName() );
 
-            if ( getContinuum().isInBuildingQueue( project.getId() ) || getContinuum().isInCheckoutQueue(
project.getId() ) )
+            if ( getContinuum().isInBuildingQueue( project.getId() ) ||
+                getContinuum().isInCheckoutQueue( project.getId() ) )
             {
                 model.setInQueue( true );
             }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?view=diff&rev=482601&r1=482600&r2=482601
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
Tue Dec  5 03:26:47 2006
@@ -38,11 +38,10 @@
 /**
  * Used in Summary view
  *
- * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
- *             Use jsp:include instead.
- *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ *             Use jsp:include instead.
  */
 public class BuildCell
     extends DisplayCell
@@ -58,7 +57,8 @@
 
         if ( project.isInQueue() )
         {
-            result += "<img src=\"" + contextPath + "/images/inqueue.gif\" alt=\"In Queue\"
title=\"In Queue\" border=\"0\">";
+            result +=
+                "<img src=\"" + contextPath + "/images/inqueue.gif\" alt=\"In Queue\"
title=\"In Queue\" border=\"0\">";
         }
         else
         {
@@ -75,6 +75,8 @@
 
                     params.put( "buildId", new Integer( buildNumber ) );
 
+                    params.put( "projectGroupId", new Integer( project.getProjectGroupId()
) );
+
                     PageContext pageContext = (PageContext) tableModel.getContext().getContextObject();
 
                     HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
@@ -100,19 +102,23 @@
             }
             else if ( project.getState() == 6 )
             {
-                result += "<img src=\"" + contextPath + "/images/building.gif\" alt=\"Building\"
title=\"Building\" border=\"0\">";
+                result += "<img src=\"" + contextPath +
+                    "/images/building.gif\" alt=\"Building\" title=\"Building\" border=\"0\">";
             }
             else if ( project.getState() == 7 )
             {
-                result += "<img src=\"" + contextPath + "/images/checkingout.gif\" alt=\"Checking
Out sources\" title=\"Checking Out sources\" border=\"0\">";
+                result += "<img src=\"" + contextPath +
+                    "/images/checkingout.gif\" alt=\"Checking Out sources\" title=\"Checking
Out sources\" border=\"0\">";
             }
             else if ( project.getState() == 8 )
             {
-                result += "<img src=\"" + contextPath + "/images/checkingout.gif\" alt=\"Updating
sources\" title=\"Updating sources\" border=\"0\">";
+                result += "<img src=\"" + contextPath +
+                    "/images/checkingout.gif\" alt=\"Updating sources\" title=\"Updating
sources\" border=\"0\">";
             }
             else
             {
-                result += "<img src=\"" + contextPath + "/images/inqueue.gif\" alt=\"In
Queue\" title=\"In Queue\" border=\"0\">";
+                result += "<img src=\"" + contextPath +
+                    "/images/inqueue.gif\" alt=\"In Queue\" title=\"In Queue\" border=\"0\">";
             }
         }
 

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?view=diff&rev=482601&r1=482600&r2=482601
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
Tue Dec  5 03:26:47 2006
@@ -81,6 +81,8 @@
 
         params.put( "buildId", new Integer( project.getLatestBuildId() ) );
 
+        params.put( "projectGroupId", new Integer( project.getProjectGroupId()));
+
         String url = UrlHelper.buildUrl( "/" + action + ".action",
                                          ServletActionContext.getRequest(),
                                          ServletActionContext.getResponse(),

Modified: maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo?view=diff&rev=482601&r1=482600&r2=482601
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo Tue Dec  5 03:26:47
2006
@@ -81,6 +81,14 @@
           <type>String</type>
         </field>
         <field>
+          <name>projectGroupId</name>
+          <version>1.0.0</version>
+          <required>true</required>
+          <description>id of the project group this project is a member of</description>
+          <type>int</type>
+          <defaultValue>-1</defaultValue>
+        </field>
+        <field>
           <name>projectGroupName</name>
           <version>1.0.0</version>
           <required>true</required>



Mime
View raw message