continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r170185 - in /maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web: action/CallApplicationModel.java tool/ContinuumStateContentGenerator.java
Date Sun, 15 May 2005 01:04:58 GMT
Author: jvanzyl
Date: Sat May 14 18:04:57 2005
New Revision: 170185

URL: http://svn.apache.org/viewcvs?rev=170185&view=rev
Log:
o updating state content generator to account for the new checkout and
update states.

Modified:
    maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/action/CallApplicationModel.java
    maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.java

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/action/CallApplicationModel.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/action/CallApplicationModel.java?rev=170185&r1=170184&r2=170185&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/action/CallApplicationModel.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/action/CallApplicationModel.java
Sat May 14 18:04:57 2005
@@ -49,15 +49,11 @@
     {
         Object application = lookup( applicationRole );
 
-        System.out.println( "application = " + application );
-
         String cid = (String) parameters.get( CID );
 
         Call call = (Call) callMap.get( cid );
 
         String expression = call.getExpression();
-
-        System.out.println( "expression = " + expression );
 
         Ognl.getValue( expression, parameters, application );
     }

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.java?rev=170185&r1=170184&r2=170185&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.java
Sat May 14 18:04:57 2005
@@ -44,14 +44,17 @@
         {
             return "<img src=\"/continuum/images/icon_warning_sml.gif\" alt=\"Error\"/>";
         }
-        // TODO: Indicate in some way else
-//        else if ( state == ContinuumProjectState.BUILD_SIGNALED )
-//        {
-//            return "Build Queued";
-//        }
         else if ( state == ContinuumProjectState.BUILDING )
         {
+            return "Updating";
+        }
+        else if ( state == ContinuumProjectState.UPDATING )
+        {
             return "Building";
+        }
+        else if ( state == ContinuumProjectState.CHECKING_OUT )
+        {
+            return "Checking Out";
         }
         else
         {



Mime
View raw message