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

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

Author: arhan
Date: 2008-08-12 20:03:18 -0400 (Tue, 12 Aug 2008)
New Revision: 21500

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java
Log:
GSOC2008: properties editor

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java	2008-08-12 23:30:39 UTC (rev 21499)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java	2008-08-13 00:03:18 UTC (rev 21500)
@@ -23,10 +23,8 @@
 import com.gwtext.client.widgets.ToolbarButton;
 import com.gwtext.client.widgets.event.ButtonListenerAdapter;
 import com.gwtext.client.widgets.form.TextField;
-import com.gwtext.client.widgets.grid.ColumnConfig;
-import com.gwtext.client.widgets.grid.ColumnModel;
-import com.gwtext.client.widgets.grid.EditorGridPanel;
-import com.gwtext.client.widgets.grid.GridEditor;
+import com.gwtext.client.widgets.grid.*;
+import com.gwtext.client.widgets.grid.event.GridRowListener;
 import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
 import org.drools.guvnor.client.rpc.RuleAsset;
 
@@ -86,23 +84,41 @@
         final EditorGridPanel grid = new EditorGridPanel();
 
         Toolbar toolbar = new Toolbar();
-        ToolbarButton button = new ToolbarButton("Add ...", new ButtonListenerAdapter() {
+        ToolbarButton add = new ToolbarButton("Add", new ButtonListenerAdapter() {
             public void onClick(Button button, EventObject e) {
-                Record pair = recordDef.createRecord(new Object[]{"", ""});
-                grid.stopEditing();
-                store.insert(0, pair);
-                grid.startEditing(0, 0);
+                addNewField(recordDef, grid);
             }
         });
-        toolbar.addButton(button);
 
+        toolbar.addButton(add);
+
+        /*ToolbarButton delete = new ToolbarButton("Delete", new ButtonListenerAdapter() {
+            public void onClick(Button button, EventObject e) {
+                store.remove(store.getRecordAt(grid.getPosition()[1]));
+                if(store.getTotalCount() == 0){
+                    addNewField(recordDef, grid);
+                }
+            }
+        });
+
+        toolbar.addButton(delete);*/
+
+        ToolbarButton clear = new ToolbarButton("Clear", new ButtonListenerAdapter() {
+            public void onClick(Button button, EventObject e) {
+                store.removeAll();
+                addNewField(recordDef, grid);
+            }
+        });
+
+        toolbar.addButton(clear);
+
         grid.setStore(store);
         grid.setColumnModel(columnModel);
         grid.setWidth(215);
         grid.setHeight(300);
         grid.setTitle("Properties");
         grid.setFrame(true);
-        grid.setClicksToEdit(1);
+        grid.setClicksToEdit(2);
         grid.setTopToolbar(toolbar);
 
         panel.add(grid);
@@ -110,13 +126,20 @@
         layout.addRow(grid);
     }
 
+    private void addNewField(RecordDef recordDef, EditorGridPanel grid) {
+        Record pair = recordDef.createRecord(new Object[]{"", ""});
+        grid.stopEditing();
+        store.insert(0, pair);
+        grid.startEditing(0, 0);
+    }
 
+
     public String getIcon() {
         return "";       //TODO: set correct icon
     }
 
     public String getOverallStyleName() {
-        return "";       //TODOL set correct style
+        return "";       //TODO: set correct style
     }
 
     public void onSave() {
@@ -124,7 +147,10 @@
 
         Record[] records = store.getRecords();
         for (Record record : records) {
-            result.add(new PropertyHolder(record.getAsString("key"), record.getAsString("value")));
+            String key = record.getAsString("key");
+            if (key != null && !"".equals(key)) {
+                result.add(new PropertyHolder(key, record.getAsString("value")));
+            }
         }
 
         properties.list = result;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java	2008-08-12 23:30:39 UTC (rev 21499)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java	2008-08-13 00:03:18 UTC (rev 21500)
@@ -37,7 +37,6 @@
         if (item.getContent() != null) {
             asset.content = PropertiesPersistence.getInstance().unmarshal(item.getContent());
         }
-        System.out.println("CONTENT: >>>>>>>>>>>>>>>>>>>>>> " + item.getContent());
     }
 
     public void storeAssetContent(RuleAsset asset, AssetItem repoAsset)