continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r580778 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/localization/ webapp/WEB-INF/jsp/
Date Sun, 30 Sep 2007 20:23:53 GMT
Author: olamy
Date: Sun Sep 30 13:23:52 2007
New Revision: 580778

URL: http://svn.apache.org/viewvc?rev=580778&view=rev
Log:
[CONTINUUM-1453] Confirmation Page for Deleting a Build Definition is not Informative Enough
display description and goals

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?rev=580778&r1=580777&r2=580778&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
Sun Sep 30 13:23:52 2007
@@ -19,6 +19,13 @@
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.builddefinition.BuildDefinitionService;
 import org.apache.maven.continuum.builddefinition.BuildDefinitionServiceException;
@@ -33,13 +40,6 @@
 import org.apache.maven.continuum.web.exception.ContinuumActionException;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 /**
  * BuildDefinitionAction:
  *
@@ -89,7 +89,7 @@
     private String buildDefinitionType;
 
     private boolean alwaysBuild;
-
+    
     /**
      * @plexus.requirement
      */    
@@ -375,6 +375,9 @@
             }
             else
             {
+                BuildDefinition buildDefinition = getContinuum().getBuildDefinition( buildDefinitionId
);
+                this.description = buildDefinition.getDescription();
+                this.goals = buildDefinition.getGoals();
                 return CONFIRM;
             }
         }
@@ -400,6 +403,9 @@
             }
             else
             {
+                BuildDefinition buildDefinition = getContinuum().getBuildDefinition( buildDefinitionId
);
+                this.description = buildDefinition.getDescription();
+                this.goals = buildDefinition.getGoals();
                 return CONFIRM;
             }
         }
@@ -654,4 +660,5 @@
     {
         this.alwaysBuild = alwaysBuild;
     }
+    
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=580778&r1=580777&r2=580778&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Sun Sep 30 13:23:52 2007
@@ -400,7 +400,7 @@
 # ----------------------------------------------------------------------
 deleteBuildDefinition.page.title = Continuum - Delete Build Definition
 deleteBuildDefinition.section.title = Delete Build Definition
-deleteBuildDefinition.confirmation.message = Are you sure you want to delete the build definition
"{0}"?
+deleteBuildDefinition.confirmation.message = Are you sure you want to delete the build definition
with description "{1}", goals "{2}" and id "{0}" ?
 
 # ----------------------------------------------------------------------
 # Page: DeleteNotifier

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp?rev=580778&r1=580777&r2=580778&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp
Sun Sep 30 13:23:52 2007
@@ -32,7 +32,9 @@
           <p>
             <strong>
                 <ww:text name="deleteBuildDefinition.confirmation.message">
-                    <ww:param><ww:property value="buildDefinitionId"/></ww:param>
+                  <ww:param><ww:property value="buildDefinitionId"/></ww:param>
+                  <ww:param><ww:property value="description"/></ww:param>
+                  <ww:param><ww:property value="goals"/></ww:param>
                 </ww:text>
             </strong>
           </p>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp?rev=580778&r1=580777&r2=580778&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp
Sun Sep 30 13:23:52 2007
@@ -32,6 +32,8 @@
             <strong>
               <ww:text name="deleteBuildDefinition.confirmation.message">
           	  	<ww:param><ww:property value="buildDefinitionId"/></ww:param>
+          	  	<ww:param><ww:property value="description"/></ww:param>
+          	  	<ww:param><ww:property value="goals"/></ww:param>
           	  </ww:text>
             </strong>
           </p>



Mime
View raw message