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

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

Author: jervisliu
Date: 2009-12-14 23:02:30 -0500 (Mon, 14 Dec 2009)
New Revision: 30652

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java
Log:
GUVNOR-262: Declarative fact model editor: "pencil" to change/delete fact instance should better be next to the fact name

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java	2009-12-14 23:20:16 UTC (rev 30651)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java	2009-12-15 04:02:30 UTC (rev 30652)
@@ -117,8 +117,63 @@
 				}
 			});
 			headerPanel.add(addField);
-			headerPanel.add(editFact(mm, m));
+			
+			Button changeName = new Button(constants.ChangeFactName());
+			changeName.addClickListener(new ClickListener() {
+				public void onClick(Widget arg0) {
+					final FormStylePopup pop = new FormStylePopup();
+					HorizontalPanel changeName = new HorizontalPanel();
+					final TextBox name = new TextBox();
+					name.setText(mm.name);
+					changeName.add(name);
+					Button nameBut = new Button(constants.ChangeName());
 
+					nameBut.addKeyboardListener(noSpaceListener());
+
+					nameBut.addClickListener(new ClickListener() {
+						public void onClick(Widget w) {
+	                        if (!uniqueName(name.getText(), m.models)) {
+	                            Window.alert(Format.format(constants.NameTakenForModel(), name.getText()));
+	                            return;
+	                        }
+							if (Window.confirm(constants.ModelNameChangeWarning())) {
+								mm.name = name.getText();
+								pop.hide();
+								renderEditor();
+							}
+						}
+					});
+					changeName.add(nameBut);
+					pop.addAttribute(constants.ChangeFactName(), changeName);
+
+					pop.show();				}
+			});
+			headerPanel.add(changeName);
+			
+			
+			Button deleteFact = new Button(constants.Delete());
+			deleteFact.addClickListener(new ClickListener() {
+				public void onClick(Widget arg0) {
+					final FormStylePopup pop = new FormStylePopup();
+					HorizontalPanel changeName = new HorizontalPanel();
+
+					Button delFact = new Button(constants.Delete());
+					delFact.addClickListener(new ClickListener() {
+						public void onClick(Widget w) {
+							if (Window.confirm(constants.AreYouSureYouWantToRemoveThisFact())) {
+								m.models.remove(mm);
+								pop.hide();
+								renderEditor();
+							}
+						}
+					});
+					pop.addAttribute(constants.RemoveThisFactType(), delFact);
+
+					pop.show();	
+				}
+			});
+			headerPanel.add(deleteFact);
+
 			tb.setWidget(0, 0, headerPanel);
 			FlexCellFormatter formatter = tb.getFlexCellFormatter();
 			formatter.setColSpan(0, 0, 2);
@@ -261,59 +316,6 @@
 		pop.show();
 	}
 
-	/**
-	 * An editor for fact header name.
-	 * @param m
-	 */
-	private Widget editFact(final FactMetaModel mm, final FactModels m) {
-		ImageButton edit = new ImageButton("images/edit.gif");  //NON-NLS
-		//Button edit = new Button("Edit/remove");
-		edit.addClickListener(new ClickListener() {
-			public void onClick(Widget arg0) {
-				final FormStylePopup pop = new FormStylePopup();
-				HorizontalPanel changeName = new HorizontalPanel();
-				final TextBox name = new TextBox();
-				name.setText(mm.name);
-				changeName.add(name);
-				Button nameBut = new Button(constants.ChangeName());
-
-				nameBut.addKeyboardListener(noSpaceListener());
-
-				nameBut.addClickListener(new ClickListener() {
-					public void onClick(Widget w) {
-                        if (!uniqueName(name.getText(), m.models)) {
-                            Window.alert(Format.format(constants.NameTakenForModel(), name.getText()));
-                            return;
-                        }
-						if (Window.confirm(constants.ModelNameChangeWarning())) {
-							mm.name = name.getText();
-							pop.hide();
-							renderEditor();
-						}
-					}
-				});
-				changeName.add(nameBut);
-				pop.addAttribute(constants.ChangeFactName(), changeName);
-
-				Button delFact = new Button(constants.Delete());
-				delFact.addClickListener(new ClickListener() {
-					public void onClick(Widget w) {
-						if (Window.confirm(constants.AreYouSureYouWantToRemoveThisFact())) {
-							m.models.remove(mm);
-							pop.hide();
-							renderEditor();
-						}
-					}
-				});
-				pop.addAttribute(constants.RemoveThisFactType(), delFact);
-
-				pop.show();
-			}
-
-		});
-		return edit;
-	}
-
 	private KeyboardListener noSpaceListener() {
 		return new KeyboardListener() {
 			public void onKeyDown(Widget arg0, char arg1, int arg2) {