[jboss-svn-commits] JBL Code SVN: r21138 - in labs/jbossrules/trunk/drools-guvnor/src: main/java/org/drools/guvnor/client/categorynav and 2 other directories.

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

Author: michael.neale at jboss.com
Date: 2008-07-21 02:06:02 -0400 (Mon, 21 Jul 2008)
New Revision: 21138

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderHelper.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java
Log:
JBRULES-1678 Problem adding global into package

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java	2008-07-21 05:58:00 UTC (rev 21137)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java	2008-07-21 06:06:02 UTC (rev 21138)
@@ -89,7 +89,11 @@
         newCat.setTitle( "Create a new category" );
         newCat.addClickListener( new ClickListener() {
             public void onClick(Widget w) {
-                CategoryEditor newCat = new CategoryEditor( explorer.getSelectedPath() );
+                CategoryEditor newCat = new CategoryEditor( explorer.getSelectedPath(), new Command() {
+					public void execute() {
+						explorer.refresh();
+					}
+                });
 
                 newCat.show();
             }

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java	2008-07-21 05:58:00 UTC (rev 21137)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java	2008-07-21 06:06:02 UTC (rev 21138)
@@ -20,15 +20,12 @@
 import org.drools.guvnor.client.common.ErrorPopup;
 import org.drools.guvnor.client.common.FormStylePopup;
 import org.drools.guvnor.client.common.GenericCallback;
-import org.drools.guvnor.client.common.ImageButton;
 import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
 
+import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.FlexTable;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.TextArea;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
@@ -42,8 +39,14 @@
     private String path;
     private TextBox name = new TextBox();
     private TextArea description = new TextArea();
+	private Command refresh;
 
 
+    public CategoryEditor(String catPath, Command refresh) {
+    	this(catPath);
+    	this.refresh = refresh;
+    }
+
     /** This is used when creating a new category */
     public CategoryEditor(String catPath) {
     	super("images/edit_category.gif", getTitle(catPath));
@@ -72,10 +75,11 @@
     void ok() {
 
         AsyncCallback cb = new GenericCallback() {
-
-
             public void onSuccess(Object result) {
                 if (((Boolean) result).booleanValue()) {
+                	if (refresh != null) {
+                		refresh.execute();
+                	}
                     hide();
                 } else {
                     ErrorPopup.showMessage( "Category was not successfully created. ");

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderHelper.java	2008-07-21 05:58:00 UTC (rev 21137)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderHelper.java	2008-07-21 06:06:02 UTC (rev 21138)
@@ -58,6 +58,9 @@
 		for (Iterator it = t.globals.iterator(); it.hasNext();) {
 			Global g = (Global) it.next();
 			sb.append("global " + g.type + " " + g.name);
+			if (it.hasNext()) {
+				sb.append('\n');
+			}
 		}
 		return sb.toString();
 	}

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java	2008-07-21 05:58:00 UTC (rev 21137)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java	2008-07-21 06:06:02 UTC (rev 21138)
@@ -100,8 +100,9 @@
 		assertEquals("foo.bar.Baz", i.type);
 
 		t.globals.add(new Global("foo.Bar", "xs"));
+		t.globals.add(new Global("whee.wah", "tt"));
 		h = PackageHeaderHelper.renderTypes(t);
-		assertEquals("import foo.bar.Baz\nglobal foo.Bar xs", h.trim());
+		assertEquals("import foo.bar.Baz\nglobal foo.Bar xs\nglobal whee.wah tt", h.trim());
 
 	}