[jboss-svn-commits] JBL Code SVN: r19135 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/decisiontable and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Mar 20 02:55:24 EDT 2008
Author: michael.neale at jboss.com
Date: 2008-03-20 02:55:23 -0400 (Thu, 20 Mar 2008)
New Revision: 19135
Added:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/SaveEventListener.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/gdst.gif
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
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerLayoutManager.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/EditorLauncher.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleValidatorWrapper.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentManagerTest.java
Log:
JBRULES-1494 Decision table for the web
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-20 05:21:04 UTC (rev 19134)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java 2008-03-20 06:55:23 UTC (rev 19135)
@@ -126,19 +126,19 @@
// a1.header = "Do something !";
// dt.actionCols.add(a1);
- //initWidget( form );
- final RuleAsset asset_ = new RuleAsset();
- asset_.metaData = new MetaData();
- asset_.metaData.packageName = "com.billasurf.manufacturing.plant";
- asset_.content = dt;
- initWidget( new GuidedDecisionTableWidget(asset_) );
- SuggestionCompletionCache.getInstance().doAction("com.billasurf.manufacturing.plant", new Command() {
- public void execute() {
- System.err.println("loaded SCE");
+ initWidget( form );
+// final RuleAsset asset_ = new RuleAsset();
+// asset_.metaData = new MetaData();
+// asset_.metaData.packageName = "com.billasurf.manufacturing.plant";
+// asset_.content = dt;
+// initWidget( new GuidedDecisionTableWidget(asset_) );
+// SuggestionCompletionCache.getInstance().doAction("com.billasurf.manufacturing.plant", new Command() {
+// public void execute() {
+// System.err.println("loaded SCE");
+//
+// }
+// });
- }
- });
-
}
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-20 05:21:04 UTC (rev 19134)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/decisiontable/GuidedDecisionTableWidget.java 2008-03-20 06:55:23 UTC (rev 19135)
@@ -21,6 +21,7 @@
import org.drools.brms.client.modeldriven.ui.ActionValueEditor;
import org.drools.brms.client.packages.SuggestionCompletionCache;
import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.brms.client.ruleeditor.SaveEventListener;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
@@ -70,7 +71,7 @@
* This is the new guided decision table editor for the web.
* @author Michael Neale
*/
-public class GuidedDecisionTableWidget extends Composite {
+public class GuidedDecisionTableWidget extends Composite implements SaveEventListener {
private GuidedDecisionTable dt;
private VerticalPanel layout;
@@ -485,7 +486,8 @@
vp.setWidth("100%");
PrettyFormLayout pfl = new PrettyFormLayout();
pfl.startSection();
- pfl.addRow(new HTML("<img src='images/information.gif'/> Configure the columns first, then add rows (rules)."));
+ pfl.addRow(new HTML("<img src='images/information.gif'/> Configure the columns first, then add rows (rules)." +
+ " A fact model (in the current package) will be needed to provide the facts and fields to configure this decision table."));
pfl.endSection();
vp.add(pfl);
@@ -821,5 +823,12 @@
w.show();
}
+ /**
+ * Need to copy the data from the record store.
+ */
+ public void onSave() {
+ this.scrapeData(-1);
+ }
+
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerLayoutManager.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerLayoutManager.java 2008-03-20 05:21:04 UTC (rev 19134)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerLayoutManager.java 2008-03-20 06:55:23 UTC (rev 19135)
@@ -410,6 +410,12 @@
}
}, "images/spreadsheet_small.gif"));
+ m.addItem(new Item("New Decision Table (Web - guided editor)", new BaseItemListenerAdapter() {
+ public void onClick(BaseItem item, EventObject e) {
+ launchWizard(AssetFormats.DECISION_TABLE_GUIDED, "New Decision Table (Guided editor)", true);
+ }
+ }, "images/gdst.gif"));
+
m.addItem(new Item("New Test Scenario", new BaseItemListenerAdapter() {
public void onClick(BaseItem item, EventObject e) {
launchWizard(AssetFormats.TEST_SCENARIO,
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/EditorLauncher.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/EditorLauncher.java 2008-03-20 05:21:04 UTC (rev 19134)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/EditorLauncher.java 2008-03-20 06:55:23 UTC (rev 19135)
@@ -22,6 +22,7 @@
import org.drools.brms.client.common.AssetFormats;
import org.drools.brms.client.decisiontable.DecisionTableXLSWidget;
+import org.drools.brms.client.decisiontable.GuidedDecisionTableWidget;
import org.drools.brms.client.modeldriven.ui.RuleModeller;
import org.drools.brms.client.packages.ModelAttachmentFileWidget;
import org.drools.brms.client.qa.ScenarioWidget;
@@ -69,6 +70,8 @@
return new RuleValidatorWrapper(new DefaultRuleContentWidget( asset ), asset);
} else if (asset.metaData.format.equals(AssetFormats.TEST_SCENARIO)) {
return new ScenarioWidget(asset);
+ } else if (asset.metaData.format.equals(AssetFormats.DECISION_TABLE_GUIDED)) {
+ return new RuleValidatorWrapper(new GuidedDecisionTableWidget(asset), asset);
} else {
return new DefaultRuleContentWidget( asset );
}
@@ -89,6 +92,7 @@
result.put( AssetFormats.RULE_FLOW_RF, "ruleflow_small.gif" );
result.put( AssetFormats.TEST_SCENARIO, "test_manager.gif");
result.put( AssetFormats.ENUMERATION, "enumeration.gif");
+ result.put( AssetFormats.DECISION_TABLE_GUIDED, "gdst.gif");
return result;
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java 2008-03-20 05:21:04 UTC (rev 19134)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java 2008-03-20 06:55:23 UTC (rev 19135)
@@ -116,6 +116,7 @@
box.addItem( "Business rule (using guided editor)", AssetFormats.BUSINESS_RULE );
box.addItem( "DRL rule (technical rule - text editor)", AssetFormats.DRL );
box.addItem( "Business rule using a DSL (text editor)", AssetFormats.DSL_TEMPLATE_RULE );
+ box.addItem( "Decision table (web - guided editor)", AssetFormats.DECISION_TABLE_GUIDED );
box.addItem( "Decision table (spreadsheet)", AssetFormats.DECISION_SPREADSHEET_XLS );
box.setSelectedIndex( 0 );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleValidatorWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleValidatorWrapper.java 2008-03-20 05:21:04 UTC (rev 19134)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleValidatorWrapper.java 2008-03-20 06:55:23 UTC (rev 19135)
@@ -41,7 +41,7 @@
* This widget wraps a rule asset widget, and provides actions to validate and view source.
* @author Michael Neale
*/
-public class RuleValidatorWrapper extends DirtyableComposite {
+public class RuleValidatorWrapper extends DirtyableComposite implements SaveEventListener {
private RuleAsset asset;
private VerticalPanel layout = new VerticalPanel();
@@ -159,6 +159,13 @@
LoadingPopup.close();
}
+ public void onSave() {
+ if (editor instanceof SaveEventListener) {
+ SaveEventListener el = (SaveEventListener) editor;
+ el.onSave();
+ }
+ }
+
}
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/SaveEventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/SaveEventListener.java (rev 0)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/SaveEventListener.java 2008-03-20 06:55:23 UTC (rev 19135)
@@ -0,0 +1,12 @@
+package org.drools.brms.client.ruleeditor;
+
+/**
+ * This is used to notify that a save even is about to occur.
+ * @author Michael Neale
+ *
+ */
+public interface SaveEventListener {
+
+ void onSave();
+
+}
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/SaveEventListener.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/gdst.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/gdst.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentManagerTest.java 2008-03-20 05:21:04 UTC (rev 19134)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentManagerTest.java 2008-03-20 06:55:23 UTC (rev 19135)
@@ -11,7 +11,7 @@
ContentManager mgr_ = ContentManager.getInstance();
assertSame(mgr, mgr_);
- assertEquals(10, mgr.getContentHandlers().size());
+ assertEquals(11, mgr.getContentHandlers().size());
assertTrue(mgr.getContentHandlers().get("drl") instanceof DRLFileContentHandler);
assertTrue(mgr.getContentHandlers().containsKey(AssetFormats.TEST_SCENARIO));
More information about the jboss-svn-commits
mailing list