[jboss-svn-commits] JBL Code SVN: r18751 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client: decisiontable and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2008-03-07 00:24:19 -0500 (Fri, 07 Mar 2008)
New Revision: 18751

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/decisiontable/GuidedDecisionTableWidget.java
Log:
JBRULES-1494 Decision table model

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java	2008-03-07 05:20:10 UTC (rev 18750)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java	2008-03-07 05:24:19 UTC (rev 18751)
@@ -25,6 +25,8 @@
 import org.drools.brms.client.common.PrettyFormLayout;
 import org.drools.brms.client.decisiontable.GuidedDecisionTableWidget;
 import org.drools.brms.client.modeldriven.dt.ActionCol;
+import org.drools.brms.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.brms.client.modeldriven.dt.AttributeCol;
 import org.drools.brms.client.modeldriven.dt.ConditionCol;
 import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
 import org.drools.brms.client.rpc.RepositoryServiceFactory;
@@ -100,9 +102,9 @@
 
         GuidedDecisionTable dt = new GuidedDecisionTable();
         dt.data = new String[][] {
-        		new String[] {"1", "a", "b", "c"},
-        		new String[] {"2", "d", "e", "f"},
-        		new String[] {"3", "d", "q", "x"}
+        		new String[] {"1", "des1","", "a", "b", "c"},
+        		new String[] {"2", "des1","" , "d", "e", "f"},
+        		new String[] {"3",  "des3", "groupA", "d", "q", "x"}
         };
         ConditionCol c1 = new ConditionCol();
         c1.header = "Driver 1 age";
@@ -111,8 +113,11 @@
         c2.header = "Driver 2 age";
         dt.conditionCols.add(c2);
 
+        AttributeCol attr = new AttributeCol();
+        attr.attr = "rule-flow";
+        dt.attributeCols.add(attr);
 
-        ActionCol a1 = new ActionCol();
+        ActionCol a1 = new ActionSetFieldCol();
         a1.header = "Do something !";
         dt.actionCols.add(a1);
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/decisiontable/GuidedDecisionTableWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/decisiontable/GuidedDecisionTableWidget.java	2008-03-07 05:20:10 UTC (rev 18750)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/decisiontable/GuidedDecisionTableWidget.java	2008-03-07 05:24:19 UTC (rev 18751)
@@ -1,6 +1,7 @@
 package org.drools.brms.client.decisiontable;
 
 import org.drools.brms.client.modeldriven.dt.ActionCol;
+import org.drools.brms.client.modeldriven.dt.AttributeCol;
 import org.drools.brms.client.modeldriven.dt.ConditionCol;
 import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
 
@@ -61,7 +62,7 @@
 
 	private GridPanel doGrid() {
 
-		FieldDef[] fds = new FieldDef[dt.actionCols.size() + dt.conditionCols.size() + 2]; //its +2 as we have counter and description data
+		FieldDef[] fds = new FieldDef[dt.attributeCols.size() + dt.actionCols.size() + dt.conditionCols.size() + 2]; //its +2 as we have counter and description data
 
 		fds[0] = new StringFieldDef("num");
 		fds[1] = new StringFieldDef("desc");
@@ -94,7 +95,21 @@
 		colCount++;
 
 
+		//now to attributes
+		for (int i = 0; i < dt.attributeCols.size(); i++) {
+			final AttributeCol attr = (AttributeCol) dt.attributeCols.get(i);
+			fds[colCount] = new StringFieldDef(attr.attr);
+			cols[colCount] = new ColumnConfig() {
+				{
+					setHeader(attr.attr);
+					setDataIndex(attr.attr);
+					setSortable(true);
+				}
+			};
+			colCount++;
+		}
 
+
 		//do all the condition cols
 		for (int i = 0; i < dt.conditionCols.size(); i++) {
 			//here we could also deal with numeric type?