[jboss-svn-commits] JBL Code SVN: r31506 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client: ruleeditor and 1 other directory.

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

Author: jervisliu
Date: 2010-02-09 02:05:12 -0500 (Tue, 09 Feb 2010)
New Revision: 31506

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
Log:
https://jira.jboss.org/jira/browse/GUVNOR-429: Actions... button without action behavior

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties	2010-02-09 06:46:10 UTC (rev 31505)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties	2010-02-09 07:05:12 UTC (rev 31506)
@@ -46,7 +46,7 @@
 AreYouSureYouWantToArchiveThisItem=Are you sure you want to archive this item?
 ArchivedItemOn=Archived Item on :
 Delete=Delete
-DeleteAssetTooltip=Permanently delete this asset. This will only be shown before the asset is checked in.
+DeleteAssetTooltip=Permanently delete this asset. This will only be enabled before the asset is checked in.
 DeleteAreYouSure=Are you sure you want to permanently delete this (unversioned) item?
 ChangeStatus=Change status
 ChangeStatusTip=Change the status of this asset.

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	2010-02-09 06:46:10 UTC (rev 31505)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java	2010-02-09 07:05:12 UTC (rev 31506)
@@ -175,6 +175,27 @@
                 }
             }
         }));
+        
+        final Item deleteItem = new Item(constants.Delete(), new BaseItemListenerAdapter() {
+            @Override
+            public void onClick(BaseItem baseItem, EventObject eventObject) {
+                if (Window.confirm(constants.DeleteAreYouSure())) {
+                    deleteAction.execute();
+                }
+            }
+        });
+        moreMenu.addItem(deleteItem);
+        deleteItem.setTitle(constants.DeleteAssetTooltip());
+    	this.afterCheckinEvent = new Command() {
+		    public void execute() {
+				deleteItem.setDisabled(true);
+			}
+    	};
+    		
+    	if (!notCheckedInYet()) {
+			deleteItem.setDisabled(true);
+		}
+
         moreMenu.addItem(new Item(constants.ChangeStatus(), new BaseItemListenerAdapter() {
             @Override
             public void onClick(BaseItem baseItem, EventObject eventObject) {
@@ -209,30 +230,6 @@
             }
         }
 
-        if (notCheckedInYet()) {
-
-        	final ToolbarButton delete = new ToolbarButton();
-        	delete.setText(constants.Delete());
-    		delete.setTooltip(getTip(constants.DeleteAssetTooltip()));
-    		delete.addListener(new ButtonListenerAdapter() {
-    			public void onClick(
-    					com.gwtext.client.widgets.Button button,
-    					EventObject e) {
-                            if (Window.confirm(constants.DeleteAreYouSure()) ) {
-                                deleteAction.execute();
-                            }
-				}
-    			});
-    		toolbar.addButton(delete);
-
-    		this.afterCheckinEvent = new Command() {
-				public void execute() {
-					delete.setVisible(false);
-				}
-    		};
-
-        }
-
         toolbar.addButton(more);
     }