continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r492505 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ java/org/apache/maven/continuum/web/view/ mdo/
Date Thu, 04 Jan 2007 10:25:01 GMT
Author: evenisse
Date: Thu Jan  4 02:24:59 2007
New Revision: 492505

URL: http://svn.apache.org/viewvc?view=rev&rev=492505
Log:
[CONTINUUM-1111] Use the checkout icon when the project is in checkout queue

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/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=492505&r1=492504&r2=492505
==============================================================================
--- 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
Thu Jan  4 02:24:59 2007
@@ -113,13 +113,18 @@
 
                 model.setProjectGroupName( project.getProjectGroup().getName() );
 
-                if ( getContinuum().isInBuildingQueue( project.getId() ) || getContinuum().isInCheckoutQueue(
project.getId() ) )
+                if ( getContinuum().isInBuildingQueue( project.getId() ) )
                 {
-                    model.setInQueue( true );
+                    model.setInBuildingQueue( true );
+                }
+                else if ( getContinuum().isInCheckoutQueue( project.getId() ) )
+                {
+                    model.setInCheckoutQueue( true );
                 }
                 else
                 {
-                    model.setInQueue( false );
+                    model.setInBuildingQueue( false );
+                    model.setInCheckoutQueue( false );
                 }
 
                 model.setState( project.getState() );

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=492505&r1=492504&r2=492505
==============================================================================
--- 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
Thu Jan  4 02:24:59 2007
@@ -82,14 +82,18 @@
 
             model.setProjectGroupName( project.getProjectGroup().getName() );
 
-            if ( getContinuum().isInBuildingQueue( project.getId() ) ||
-                getContinuum().isInCheckoutQueue( project.getId() ) )
+            if ( getContinuum().isInBuildingQueue( project.getId() ) )
             {
-                model.setInQueue( true );
+                model.setInBuildingQueue( true );
+            }
+            else if ( getContinuum().isInCheckoutQueue( project.getId() ) )
+            {
+                model.setInCheckoutQueue( true );
             }
             else
             {
-                model.setInQueue( false );
+                model.setInBuildingQueue( false );
+                model.setInCheckoutQueue( false );
             }
 
             model.setState( project.getState() );

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=492505&r1=492504&r2=492505
==============================================================================
--- 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
Thu Jan  4 02:24:59 2007
@@ -55,10 +55,15 @@
 
         String result = "<div align=\"center\">";
 
-        if ( project.isInQueue() )
+        if ( project.isInBuildingQueue() )
         {
             result +=
                 "<img src=\"" + contextPath + "/images/inqueue.gif\" alt=\"In Queue\"
title=\"In Queue\" border=\"0\">";
+        }
+        else if ( project.isInCheckoutQueue() )
+        {
+            result += "<img src=\"" + contextPath +
+                "/images/checkingout.gif\" alt=\"Checking Out sources\" title=\"Checking
Out sources\" border=\"0\">";
         }
         else
         {

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=492505&r1=492504&r2=492505
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo Thu Jan  4 02:24:59
2007
@@ -128,10 +128,18 @@
           <defaultValue>-1</defaultValue>
         </field>
         <field>
-          <name>inQueue</name>
+          <name>inBuildingQueue</name>
           <version>1.0.0</version>
           <required>true</required>
           <description>true/false depending on if the project is in the build queue
or not</description>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+        </field>
+        <field>
+          <name>inCheckoutQueue</name>
+          <version>1.0.0</version>
+          <required>true</required>
+          <description>true/false depending on if the project is in the checkout queue
or not</description>
           <type>boolean</type>
           <defaultValue>false</defaultValue>
         </field>



Mime
View raw message