[jboss-svn-commits] JBL Code SVN: r21151 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2008-07-22 02:47:05 -0400 (Tue, 22 Jul 2008)
New Revision: 21151

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
Log:
JBRULES-1688 Commit comments not being stored

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java	2008-07-22 06:27:23 UTC (rev 21150)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java	2008-07-22 06:47:05 UTC (rev 21151)
@@ -22,7 +22,6 @@
 import org.drools.guvnor.client.common.GenericCallback;
 import org.drools.guvnor.client.common.RulePackageSelector;
 import org.drools.guvnor.client.common.StatusChangePopup;
-import org.drools.guvnor.client.rpc.MetaData;
 import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
 import org.drools.guvnor.client.rpc.RuleAsset;
 
@@ -48,30 +47,30 @@
 public class ActionToolbar extends Composite {
 
 	private Toolbar		toolbar;
-    private MetaData      metaData;
-    private Command checkinAction;
-    private Command archiveAction;
+    private CheckinAction checkinAction;
+    private CheckinAction archiveAction;
     private Command deleteAction;
     private String uuid;
     private ToolbarTextItem state;
+	private boolean notCheckedInYet;
 
     public ActionToolbar(final RuleAsset asset,
-                         final Command checkin,
-                         final Command archiv,
+                         final CheckinAction checkin,
+                         final CheckinAction archiv,
                          final Command delete, boolean readOnly) {
 
-        this.metaData = asset.metaData;
         this.checkinAction = checkin;
         this.uuid = asset.uuid;
         this.archiveAction = archiv;
         this.deleteAction = delete;
+
         this.state = new ToolbarTextItem("Status: ");
+        this.notCheckedInYet = (asset.metaData.versionNumber == 0);
 
-
         toolbar = new Toolbar();
 
 
-        String status = metaData.status;
+        String status = asset.metaData.status;
 
         setState(status);
 
@@ -130,8 +129,7 @@
 					com.gwtext.client.widgets.Button button,
 					EventObject e) {
                         if (Window.confirm( "Are you sure you want to archive this item?" )) {
-                            metaData.checkinComment = "Archived Item on " + new java.util.Date().toString();
-                            archiveAction.execute();
+                            archiveAction.doCheckin("Archived Item on " + new java.util.Date().toString());
                         }
 			}
 			});
@@ -140,7 +138,7 @@
 
 
 
-        if (this.metaData.versionNumber == 0) {
+        if (notCheckedInYet) {
 
         	ToolbarButton delete = new ToolbarButton();
         	delete.setText("Delete");
@@ -234,8 +232,7 @@
         pop.setCommand( new Command() {
 
             public void execute() {
-                metaData.checkinComment = pop.getCheckinComment();
-                checkinAction.execute();
+                checkinAction.doCheckin(pop.getCheckinComment());
             }
         });
         pop.show();
@@ -256,5 +253,9 @@
     }
 
 
+    public static interface CheckinAction {
+    	void doCheckin(String comment);
+    }
 
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java	2008-07-22 06:27:23 UTC (rev 21150)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java	2008-07-22 06:47:05 UTC (rev 21151)
@@ -31,14 +31,10 @@
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DisclosurePanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.HorizontalSplitPanel;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.VerticalSplitPanel;
 import com.google.gwt.user.client.ui.Widget;
 
 /**
@@ -104,21 +100,22 @@
 
         //the action widgets (checkin/close etc).
         toolbar = new ActionToolbar( asset,
-                                     new Command() {
-                public void execute() {
+                                     new ActionToolbar.CheckinAction() {
+                public void doCheckin(String comment) {
                 	if (editor instanceof SaveEventListener) {
                 		((SaveEventListener) editor).onSave();
                 	}
-                    doCheckin();
+                    performCheckIn(comment);
                     if (editor instanceof SaveEventListener) {
                     	((SaveEventListener) editor).onAfterSave();
                     }
                 }
                 },
-                new Command() {
-                    public void execute() {
-                        doArchive();
+                new ActionToolbar.CheckinAction() {
+                    public void doCheckin(String comment) {
+                        doArchive(comment);
                     }
+
                 },
 
                 new Command() {
@@ -199,15 +196,15 @@
      * This responds to the checkin command.
      */
 
-    void doArchive() {
+    private void doArchive(String comment) {
         this.asset.archived = true;
-        this.doCheckin();
+        this.performCheckIn(comment);
         this.closeCommand.execute();
     }
 
-    void doCheckin() {
+    private void performCheckIn(String comment) {
         //layout.clear();
-
+    	this.asset.metaData.checkinComment = comment;
         LoadingPopup.showMessage( "Saving, please wait..." );
         RepositoryServiceFactory.getService().checkinVersion( this.asset, new GenericCallback() {