[jboss-svn-commits] JBL Code SVN: r8661 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client main/java/org/drools/brms/client/modeldriven main/java/org/drools/brms/client/modeldriven/model main/java/org/drools/brms/client/modeldriven/ui main/java/org/drools/brms/client/rpc main/java/org/drools/brms/client/rpc/brxml main/java/org/drools/brms/client/ruleeditor main/java/org/drools/brms/server main/java/org/drools/brms/server/util test/java/org/drools/brms/client/modeldriven test/java/org/drools/brms/server/util
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 3 11:27:05 EST 2007
Author: michael.neale at jboss.com
Date: 2007-01-03 11:25:25 -0500 (Wed, 03 Jan 2007)
New Revision: 8661
Added:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionAssertFact.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldList.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldValue.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionRetractFact.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionSetField.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/CompositeFactPattern.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ConnectiveConstraint.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/Constraint.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentence.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentenceFragment.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/FactPattern.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IAction.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IPattern.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/PortableObject.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleAttribute.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleModel.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/package.html
Removed:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionAssertFact.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldList.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldValue.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionRetractFact.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionSetField.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/CompositeFactPattern.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ConnectiveConstraint.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/Constraint.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentence.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentenceFragment.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/FactPattern.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IAction.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IPattern.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleAttribute.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleModel.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionAssertFact.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldList.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldValue.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionRetractFact.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionSetField.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/CompositeFactPattern.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ConnectiveConstraint.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/Constraint.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentence.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentenceFragment.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/FactPattern.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IAction.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IPattern.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleAttribute.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleModel.java
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionRetractFactWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleAttributeWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.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/server/JBRMSServiceServlet.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/BRLPersistence.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ActionSetFieldTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/CompositeFactPatternTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ConstraintTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/FactPatternTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/RuleModelTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java
Log:
Some major refactoring of RPC code.
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,19 +1,19 @@
package org.drools.brms.client;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.model.ActionAssertFact;
-import org.drools.brms.client.modeldriven.model.ActionFieldValue;
-import org.drools.brms.client.modeldriven.model.ActionRetractFact;
-import org.drools.brms.client.modeldriven.model.ActionSetField;
-import org.drools.brms.client.modeldriven.model.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.model.Constraint;
-import org.drools.brms.client.modeldriven.model.DSLSentence;
-import org.drools.brms.client.modeldriven.model.DSLSentenceFragment;
-import org.drools.brms.client.modeldriven.model.FactPattern;
-import org.drools.brms.client.modeldriven.model.IAction;
-import org.drools.brms.client.modeldriven.model.IPattern;
-import org.drools.brms.client.modeldriven.model.RuleModel;
import org.drools.brms.client.modeldriven.ui.RuleModeller;
+import org.drools.brms.client.rpc.brxml.ActionAssertFact;
+import org.drools.brms.client.rpc.brxml.ActionFieldValue;
+import org.drools.brms.client.rpc.brxml.ActionRetractFact;
+import org.drools.brms.client.rpc.brxml.ActionSetField;
+import org.drools.brms.client.rpc.brxml.CompositeFactPattern;
+import org.drools.brms.client.rpc.brxml.Constraint;
+import org.drools.brms.client.rpc.brxml.DSLSentence;
+import org.drools.brms.client.rpc.brxml.DSLSentenceFragment;
+import org.drools.brms.client.rpc.brxml.FactPattern;
+import org.drools.brms.client.rpc.brxml.IAction;
+import org.drools.brms.client.rpc.brxml.IPattern;
+import org.drools.brms.client.rpc.brxml.RuleModel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.VerticalPanel;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -7,7 +7,7 @@
import java.util.Map;
import java.util.Set;
-import org.drools.brms.client.modeldriven.model.DSLSentence;
+import org.drools.brms.client.rpc.brxml.DSLSentence;
/**
* An suggestion completion processor. This should be usable in both GWT/Web and the IDE.
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionAssertFact.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionAssertFact.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionAssertFact.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,21 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-/**
- * This is used when asserting a new fact.
- * @author Michael Neale
- *
- */
-public class ActionAssertFact
- extends
- ActionFieldList {
-
- public String factType;
-
- public ActionAssertFact(String type) {
- this.factType = type;
- }
-
- public ActionAssertFact() {}
-
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldList.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldList.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldList.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,48 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-/**
- * This class is the parent for field setting or assertion actions.
- *
- * Contains the list of fields and their values to be set.
- *
- * @author Michael Neale
- *
- */
-public abstract class ActionFieldList
- implements
- IAction {
-
- public ActionFieldValue[] fieldValues = new ActionFieldValue[0];
-
- public void removeField(int idx) {
- //Unfortunately, this is kinda duplicate code with other methods,
- //but with typed arrays, and GWT, its not really possible to do anything "better"
- //at this point in time.
- ActionFieldValue[] newList = new ActionFieldValue[fieldValues.length - 1];
- int newIdx = 0;
- for ( int i = 0; i < fieldValues.length; i++ ) {
-
- if (i != idx) {
- newList[newIdx] = fieldValues[i];
- newIdx++;
- }
-
- }
- this.fieldValues = newList;
- }
-
- public void addFieldValue(ActionFieldValue val) {
- if (fieldValues == null) {
- fieldValues = new ActionFieldValue[1];
- fieldValues[0] = val;
- } else {
- ActionFieldValue[] newList = new ActionFieldValue[fieldValues.length + 1];
- for ( int i = 0; i < fieldValues.length; i++ ) {
- newList[i] = fieldValues[i];
- }
- newList[fieldValues.length] = val;
- fieldValues = newList;
- }
- }
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldValue.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldValue.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldValue.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,24 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Holds field/values for "action" parts of the rule.
- *
- * @author Michael Neale
- */
-public class ActionFieldValue
- implements
- IsSerializable {
-
- public ActionFieldValue(String field, String value) {
- this.field = field;
- this.value = value;
- }
-
- public ActionFieldValue() {}
-
- public String field;
- public String value;
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionRetractFact.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionRetractFact.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionRetractFact.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,20 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-/**
- * This is used to specify that the bound fact should be retracted
- * when the rule fires.
- * @author Michael Neale
- *
- */
-public class ActionRetractFact
- implements
- IAction {
-
-
- public ActionRetractFact(String var) {
- this.variableName = var;
- }
-
- public String variableName;
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionSetField.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionSetField.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionSetField.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,21 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-/**
- * For setting a field on a bound LHS variable or a global.
- * @author Michael Neale
- *
- */
-public class ActionSetField extends ActionFieldList {
-
- public ActionSetField(String var) {
- this.variable = var;
- }
-
- public ActionSetField() {}
- public String variable;
- public boolean modify;
-
-
-
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/CompositeFactPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/CompositeFactPattern.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/CompositeFactPattern.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,39 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-
-/**
- * Represents first order logic like Or, Not, Exists.
- *
- * @author Michael Neale
- */
-public class CompositeFactPattern implements IPattern {
-
- /**
- * this will one of: [Not, Exist, Or]
- */
- public String type;
- public FactPattern[] patterns;
-
-
- public CompositeFactPattern(String type) {
- this.type = type;
- }
-
- public CompositeFactPattern() {}
-
-
- public void addFactPattern(FactPattern pat) {
- if (this.patterns == null) this.patterns = new FactPattern[0];
-
- FactPattern[] list = this.patterns;
- FactPattern[] newList = new FactPattern[list.length + 1];
-
- for ( int i = 0; i < list.length; i++ ) {
- newList[i] = list[i];
- }
- newList[list.length] = pat;
-
- this.patterns = newList;
- }
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ConnectiveConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ConnectiveConstraint.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ConnectiveConstraint.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,23 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * This is for a connective constraint that adds more options to a field constraint.
- * @author Michael Neale
- */
-public class ConnectiveConstraint
- implements
- IsSerializable {
-
- public ConnectiveConstraint() {}
-
- public ConnectiveConstraint(String opr,
- String val) {
- this.operator = opr;
- this.value = val;
- }
- public String operator;
- public String value;
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/Constraint.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/Constraint.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/Constraint.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,37 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public class Constraint implements IsSerializable {
- public String fieldBinding;
- public String fieldName;
- public String operator;
- public String value;
-
- public ConnectiveConstraint[] connectives;
-
- public Constraint(String field) {
- this.fieldName = field;
- }
-
- public Constraint() {}
-
- /**
- * This adds a new connective.
- *
- */
- public void addNewConnective() {
- if (connectives == null) {
- connectives = new ConnectiveConstraint[] {new ConnectiveConstraint()};
- } else {
- ConnectiveConstraint[] newList = new ConnectiveConstraint[connectives.length + 1];
- for ( int i = 0; i < connectives.length; i++ ) {
- newList[i] = connectives[i];
- }
- newList[connectives.length] = new ConnectiveConstraint();
- connectives = newList;
- }
- }
-
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentence.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentence.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentence.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,24 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-
-/**
- * This represents a DSL sentence.
- * @author Michael Neale
- */
-public class DSLSentence
- implements
- IPattern,
- IAction {
-
- public DSLSentenceFragment[] elements;
-
- public String toString() {
- String result = "";
- if (elements != null) {
- for ( int i = 0; i < elements.length; i++ ) {
- result += elements[i].value + " ";
- }
- }
- return result;
- }
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentenceFragment.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentenceFragment.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentenceFragment.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,30 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * This holds the value of a fragment of a DSL.
- * It can either be a sentence fragment (a display only thing) or a
- * value which the user can change.
- *
- * @author Michael Neale
- *
- */
-public class DSLSentenceFragment
- implements
- IsSerializable {
-
- public String value;
- public boolean isEditableField;
-
- /**
- * @param fragment
- * @param isEditableField true if it is a editable value. false means display only.
- */
- public DSLSentenceFragment(String fragment,
- boolean isEditableField) {
- value = fragment;
- this.isEditableField = isEditableField;
- }
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/FactPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/FactPattern.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/FactPattern.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,63 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-/**
- * A fact pattern is a declaration of a fact type, and its constraint,
- * and perhaps a variable that is it bound to
- * It is the equivalent of a "column" in drools terms.
- * @author Michael Neale
- *
- */
-public class FactPattern implements IPattern {
-
- public Constraint[] constraints;
- public String factType;
- public String boundName;
-
- public FactPattern() {
- this.constraints = new Constraint[0];
- }
-
- public FactPattern(String factType) {
- this.factType = factType;
- this.constraints = new Constraint[0];
- }
-
-
-
-
- public void addConstraint(Constraint constraint) {
- if (constraints == null) {
- constraints = new Constraint[1];
- constraints[0] = constraint;
- } else {
- Constraint[] newList = new Constraint[constraints.length + 1];
- for ( int i = 0; i < constraints.length; i++ ) {
- newList[i] = constraints[i];
- }
- newList[constraints.length] = constraint;
- constraints = newList;
- }
- }
-
- public void removeConstraint(int idx) {
- //Unfortunately, this is kinda duplicate code with other methods,
- //but with typed arrays, and GWT, its not really possible to do anything "better"
- //at this point in time.
- Constraint[] newList = new Constraint[constraints.length - 1];
- int newIdx = 0;
- for ( int i = 0; i < constraints.length; i++ ) {
-
- if (i != idx) {
- newList[newIdx] = constraints[i];
- newIdx++;
- }
-
- }
- this.constraints = newList;
-
- }
-
-
-
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IAction.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IAction.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IAction.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,7 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public interface IAction extends IsSerializable {
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IPattern.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IPattern.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,9 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public interface IPattern
- extends
- IsSerializable {
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleAttribute.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleAttribute.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleAttribute.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,21 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * This holds values for rule attributes (eg salience, agenda-group etc).
- * @author Michael Neale
- */
-public class RuleAttribute
- implements
- IsSerializable {
-
- public RuleAttribute(String name,
- String value) {
- this.attributeName = name;
- this.value = value;
- }
- public String attributeName;
- public String value;
-
-}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleModel.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleModel.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleModel.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,176 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public class RuleModel implements IsSerializable {
-
- public String name;
- public RuleAttribute[] attributes = new RuleAttribute[0];
-
- public IPattern[] lhs;
- public IAction[] rhs;
-
- /**
- * This will return the fact pattern that a variable is bound to.
- *
- * @param var The bound fact variable (NOT bound field).
- * @return null or the FactPattern found.
- */
- public FactPattern getBoundFact(String var) {
- if (lhs == null ) return null;
- for ( int i = 0; i < lhs.length; i++ ) {
-
- if (lhs[i] instanceof FactPattern) {
- FactPattern p = (FactPattern) lhs[i];
- if (p.boundName != null && var.equals( p.boundName)) {
- return p;
- }
- }
- }
- return null;
- }
-
- /**
- * @return A list of bound facts (String). Or empty list if none are found.
- */
- public List getBoundFacts() {
- if (lhs == null) return null;
- List list = new ArrayList();
- for ( int i = 0; i < lhs.length; i++ ) {
- if (lhs[i] instanceof FactPattern) {
- FactPattern p = (FactPattern) lhs[i];
- if (p.boundName != null) list.add( p.boundName );
- }
- }
- return list;
-
- }
-
- /**
- *
- * @param idx Remove this index from the LHS.
- * @param Returns false if it was NOT allowed to remove this item (ie
- * it is used on the RHS).
- */
- public boolean removeLhsItem(int idx) {
-
- IPattern[] newList = new IPattern[lhs.length - 1];
- int newIdx = 0;
- for ( int i = 0; i < lhs.length; i++ ) {
-
- if (i != idx) {
- newList[newIdx] = lhs[i];
- newIdx++;
- } else {
- if (lhs[i] instanceof FactPattern) {
- FactPattern p = (FactPattern) lhs[i];
- if (p.boundName != null && isBoundFactUsed( p.boundName )) {
- return false;
- }
- }
-
- }
-
- }
- this.lhs = newList;
- return true;
- }
-
- /**
- * @param binding The name of the LHS fact binding.
- * @return Returns true if the specified binding is used on the RHS.
- */
- public boolean isBoundFactUsed(String binding) {
- if (rhs == null) return false;
- for ( int i = 0; i < rhs.length; i++ ) {
- if (rhs[i] instanceof ActionSetField) {
- ActionSetField set = (ActionSetField) rhs[i];
- if (set.variable.equals( binding )) {
- return true;
- }
- } else if (rhs[i] instanceof ActionRetractFact) {
- ActionRetractFact ret = (ActionRetractFact) rhs[i];
- if (ret.variableName.equals( binding )) {
- return true;
- }
- }
- }
- return false;
- }
-
- public void addLhsItem(IPattern pat) {
- if (this.lhs == null) this.lhs = new IPattern[0];
-
- IPattern[] list = this.lhs;
- IPattern[] newList = new IPattern[list.length + 1];
-
- for ( int i = 0; i < list.length; i++ ) {
- newList[i] = list[i];
- }
- newList[list.length] = pat;
-
- this.lhs = newList;
- }
-
- public void addRhsItem(IAction action) {
- if (this.rhs == null) this.rhs = new IAction[0];
-
- IAction[] list = this.rhs;
- IAction[] newList = new IAction[list.length + 1];
-
- for ( int i = 0; i < list.length; i++ ) {
- newList[i] = list[i];
- }
- newList[list.length] = action;
-
- this.rhs = newList;
- }
-
- public void removeRhsItem(int idx) {
- IAction[] newList = new IAction[rhs.length - 1];
- int newIdx = 0;
- for ( int i = 0; i < rhs.length; i++ ) {
-
- if (i != idx) {
- newList[newIdx] = rhs[i];
- newIdx++;
- }
-
- }
- this.rhs = newList;
- }
-
- public void addAttribute(RuleAttribute attribute) {
-
-
- RuleAttribute[] list = this.attributes;
- RuleAttribute[] newList = new RuleAttribute[list.length + 1];
-
- for ( int i = 0; i < list.length; i++ ) {
- newList[i] = list[i];
- }
- newList[list.length] = attribute;
-
- this.attributes = newList;
-
- }
-
- public void removeAttribute(int idx) {
- RuleAttribute[] newList = new RuleAttribute[attributes.length - 1];
- int newIdx = 0;
- for ( int i = 0; i < attributes.length; i++ ) {
-
- if (i != idx) {
- newList[newIdx] = attributes[i];
- newIdx++;
- }
-
- }
- this.attributes = newList;
-
- }
-
-}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -3,8 +3,8 @@
import org.drools.brms.client.common.FormStylePopup;
import org.drools.brms.client.common.YesNoDialog;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.model.ActionAssertFact;
-import org.drools.brms.client.modeldriven.model.ActionFieldValue;
+import org.drools.brms.client.rpc.brxml.ActionAssertFact;
+import org.drools.brms.client.rpc.brxml.ActionFieldValue;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.ChangeListener;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionRetractFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionRetractFactWidget.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionRetractFactWidget.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,7 +1,7 @@
package org.drools.brms.client.modeldriven.ui;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.model.ActionRetractFact;
+import org.drools.brms.client.rpc.brxml.ActionRetractFact;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlexTable;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -3,10 +3,10 @@
import org.drools.brms.client.common.FormStylePopup;
import org.drools.brms.client.common.YesNoDialog;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.model.ActionFieldValue;
-import org.drools.brms.client.modeldriven.model.ActionSetField;
-import org.drools.brms.client.modeldriven.model.FactPattern;
-import org.drools.brms.client.modeldriven.model.RuleModel;
+import org.drools.brms.client.rpc.brxml.ActionFieldValue;
+import org.drools.brms.client.rpc.brxml.ActionSetField;
+import org.drools.brms.client.rpc.brxml.FactPattern;
+import org.drools.brms.client.rpc.brxml.RuleModel;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.ChangeListener;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -2,8 +2,8 @@
import org.drools.brms.client.common.FormStylePopup;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.model.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.model.FactPattern;
+import org.drools.brms.client.rpc.brxml.CompositeFactPattern;
+import org.drools.brms.client.rpc.brxml.FactPattern;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.ClickListener;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,7 +1,7 @@
package org.drools.brms.client.modeldriven.ui;
-import org.drools.brms.client.modeldriven.model.DSLSentence;
-import org.drools.brms.client.modeldriven.model.DSLSentenceFragment;
+import org.drools.brms.client.rpc.brxml.DSLSentence;
+import org.drools.brms.client.rpc.brxml.DSLSentenceFragment;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.Composite;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -3,10 +3,10 @@
import org.drools.brms.client.common.FormStylePopup;
import org.drools.brms.client.common.YesNoDialog;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.model.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.model.Constraint;
-import org.drools.brms.client.modeldriven.model.FactPattern;
-import org.drools.brms.client.modeldriven.model.IPattern;
+import org.drools.brms.client.rpc.brxml.ConnectiveConstraint;
+import org.drools.brms.client.rpc.brxml.Constraint;
+import org.drools.brms.client.rpc.brxml.FactPattern;
+import org.drools.brms.client.rpc.brxml.IPattern;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleAttributeWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleAttributeWidget.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleAttributeWidget.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -2,8 +2,8 @@
import org.drools.brms.client.common.FormStyleLayout;
import org.drools.brms.client.common.YesNoDialog;
-import org.drools.brms.client.modeldriven.model.RuleAttribute;
-import org.drools.brms.client.modeldriven.model.RuleModel;
+import org.drools.brms.client.rpc.brxml.RuleAttribute;
+import org.drools.brms.client.rpc.brxml.RuleModel;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.ChangeListener;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -7,16 +7,16 @@
import org.drools.brms.client.common.FormStylePopup;
import org.drools.brms.client.common.YesNoDialog;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.model.ActionAssertFact;
-import org.drools.brms.client.modeldriven.model.ActionRetractFact;
-import org.drools.brms.client.modeldriven.model.ActionSetField;
-import org.drools.brms.client.modeldriven.model.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.model.DSLSentence;
-import org.drools.brms.client.modeldriven.model.FactPattern;
-import org.drools.brms.client.modeldriven.model.IAction;
-import org.drools.brms.client.modeldriven.model.IPattern;
-import org.drools.brms.client.modeldriven.model.RuleAttribute;
-import org.drools.brms.client.modeldriven.model.RuleModel;
+import org.drools.brms.client.rpc.brxml.ActionAssertFact;
+import org.drools.brms.client.rpc.brxml.ActionRetractFact;
+import org.drools.brms.client.rpc.brxml.ActionSetField;
+import org.drools.brms.client.rpc.brxml.CompositeFactPattern;
+import org.drools.brms.client.rpc.brxml.DSLSentence;
+import org.drools.brms.client.rpc.brxml.FactPattern;
+import org.drools.brms.client.rpc.brxml.IAction;
+import org.drools.brms.client.rpc.brxml.IPattern;
+import org.drools.brms.client.rpc.brxml.RuleAttribute;
+import org.drools.brms.client.rpc.brxml.RuleModel;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.ChangeListener;
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml (from rev 8620, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model)
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionAssertFact.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionAssertFact.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionAssertFact.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,21 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-/**
- * This is used when asserting a new fact.
- * @author Michael Neale
- *
- */
-public class ActionAssertFact
- extends
- ActionFieldList {
-
- public String factType;
-
- public ActionAssertFact(String type) {
- this.factType = type;
- }
-
- public ActionAssertFact() {}
-
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionAssertFact.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionAssertFact.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionAssertFact.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionAssertFact.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,21 @@
+package org.drools.brms.client.rpc.brxml;
+
+/**
+ * This is used when asserting a new fact.
+ * @author Michael Neale
+ *
+ */
+public class ActionAssertFact
+ extends
+ ActionFieldList {
+
+ public String factType;
+
+ public ActionAssertFact(String type) {
+ this.factType = type;
+ }
+
+ public ActionAssertFact() {}
+
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldList.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldList.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldList.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,48 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-/**
- * This class is the parent for field setting or assertion actions.
- *
- * Contains the list of fields and their values to be set.
- *
- * @author Michael Neale
- *
- */
-public abstract class ActionFieldList
- implements
- IAction {
-
- public ActionFieldValue[] fieldValues = new ActionFieldValue[0];
-
- public void removeField(int idx) {
- //Unfortunately, this is kinda duplicate code with other methods,
- //but with typed arrays, and GWT, its not really possible to do anything "better"
- //at this point in time.
- ActionFieldValue[] newList = new ActionFieldValue[fieldValues.length - 1];
- int newIdx = 0;
- for ( int i = 0; i < fieldValues.length; i++ ) {
-
- if (i != idx) {
- newList[newIdx] = fieldValues[i];
- newIdx++;
- }
-
- }
- this.fieldValues = newList;
- }
-
- public void addFieldValue(ActionFieldValue val) {
- if (fieldValues == null) {
- fieldValues = new ActionFieldValue[1];
- fieldValues[0] = val;
- } else {
- ActionFieldValue[] newList = new ActionFieldValue[fieldValues.length + 1];
- for ( int i = 0; i < fieldValues.length; i++ ) {
- newList[i] = fieldValues[i];
- }
- newList[fieldValues.length] = val;
- fieldValues = newList;
- }
- }
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldList.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldList.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldList.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldList.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,48 @@
+package org.drools.brms.client.rpc.brxml;
+
+/**
+ * This class is the parent for field setting or assertion actions.
+ *
+ * Contains the list of fields and their values to be set.
+ *
+ * @author Michael Neale
+ *
+ */
+public abstract class ActionFieldList
+ implements
+ IAction {
+
+ public ActionFieldValue[] fieldValues = new ActionFieldValue[0];
+
+ public void removeField(int idx) {
+ //Unfortunately, this is kinda duplicate code with other methods,
+ //but with typed arrays, and GWT, its not really possible to do anything "better"
+ //at this point in time.
+ ActionFieldValue[] newList = new ActionFieldValue[fieldValues.length - 1];
+ int newIdx = 0;
+ for ( int i = 0; i < fieldValues.length; i++ ) {
+
+ if (i != idx) {
+ newList[newIdx] = fieldValues[i];
+ newIdx++;
+ }
+
+ }
+ this.fieldValues = newList;
+ }
+
+ public void addFieldValue(ActionFieldValue val) {
+ if (fieldValues == null) {
+ fieldValues = new ActionFieldValue[1];
+ fieldValues[0] = val;
+ } else {
+ ActionFieldValue[] newList = new ActionFieldValue[fieldValues.length + 1];
+ for ( int i = 0; i < fieldValues.length; i++ ) {
+ newList[i] = fieldValues[i];
+ }
+ newList[fieldValues.length] = val;
+ fieldValues = newList;
+ }
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldValue.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldValue.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldValue.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,24 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Holds field/values for "action" parts of the rule.
- *
- * @author Michael Neale
- */
-public class ActionFieldValue
- implements
- IsSerializable {
-
- public ActionFieldValue(String field, String value) {
- this.field = field;
- this.value = value;
- }
-
- public ActionFieldValue() {}
-
- public String field;
- public String value;
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldValue.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldValue.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionFieldValue.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionFieldValue.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,23 @@
+package org.drools.brms.client.rpc.brxml;
+
+
+/**
+ * Holds field and value for "action" parts of the rule.
+ *
+ * @author Michael Neale
+ */
+public class ActionFieldValue
+ implements
+ PortableObject {
+
+ public ActionFieldValue(String field, String value) {
+ this.field = field;
+ this.value = value;
+ }
+
+ public ActionFieldValue() {}
+
+ public String field;
+ public String value;
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionRetractFact.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionRetractFact.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionRetractFact.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,20 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-/**
- * This is used to specify that the bound fact should be retracted
- * when the rule fires.
- * @author Michael Neale
- *
- */
-public class ActionRetractFact
- implements
- IAction {
-
-
- public ActionRetractFact(String var) {
- this.variableName = var;
- }
-
- public String variableName;
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionRetractFact.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionRetractFact.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionRetractFact.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionRetractFact.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,21 @@
+package org.drools.brms.client.rpc.brxml;
+
+/**
+ * This is used to specify that the bound fact should be retracted
+ * when the rule fires.
+ * @author Michael Neale
+ *
+ */
+public class ActionRetractFact
+ implements
+ IAction {
+
+ public ActionRetractFact() {}
+
+ public ActionRetractFact(String var) {
+ this.variableName = var;
+ }
+
+ public String variableName;
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionSetField.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionSetField.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionSetField.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,21 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-/**
- * For setting a field on a bound LHS variable or a global.
- * @author Michael Neale
- *
- */
-public class ActionSetField extends ActionFieldList {
-
- public ActionSetField(String var) {
- this.variable = var;
- }
-
- public ActionSetField() {}
- public String variable;
- public boolean modify;
-
-
-
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionSetField.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionSetField.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionSetField.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ActionSetField.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,22 @@
+package org.drools.brms.client.rpc.brxml;
+
+/**
+ * For setting a field on a bound LHS variable or a global.
+ * @author Michael Neale
+ *
+ */
+public class ActionSetField extends ActionFieldList {
+
+
+ public ActionSetField(String var) {
+ this.variable = var;
+ }
+
+ public ActionSetField() {}
+ public String variable;
+ public boolean modify;
+
+
+
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/CompositeFactPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/CompositeFactPattern.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/CompositeFactPattern.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,39 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-
-/**
- * Represents first order logic like Or, Not, Exists.
- *
- * @author Michael Neale
- */
-public class CompositeFactPattern implements IPattern {
-
- /**
- * this will one of: [Not, Exist, Or]
- */
- public String type;
- public FactPattern[] patterns;
-
-
- public CompositeFactPattern(String type) {
- this.type = type;
- }
-
- public CompositeFactPattern() {}
-
-
- public void addFactPattern(FactPattern pat) {
- if (this.patterns == null) this.patterns = new FactPattern[0];
-
- FactPattern[] list = this.patterns;
- FactPattern[] newList = new FactPattern[list.length + 1];
-
- for ( int i = 0; i < list.length; i++ ) {
- newList[i] = list[i];
- }
- newList[list.length] = pat;
-
- this.patterns = newList;
- }
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/CompositeFactPattern.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/CompositeFactPattern.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/CompositeFactPattern.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/CompositeFactPattern.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,39 @@
+package org.drools.brms.client.rpc.brxml;
+
+
+/**
+ * Represents first order logic like Or, Not, Exists.
+ *
+ * @author Michael Neale
+ */
+public class CompositeFactPattern implements IPattern {
+
+ /**
+ * this will one of: [Not, Exist, Or]
+ */
+ public String type;
+ public FactPattern[] patterns;
+
+
+ public CompositeFactPattern(String type) {
+ this.type = type;
+ }
+
+ public CompositeFactPattern() {}
+
+
+ public void addFactPattern(FactPattern pat) {
+ if (this.patterns == null) this.patterns = new FactPattern[0];
+
+ FactPattern[] list = this.patterns;
+ FactPattern[] newList = new FactPattern[list.length + 1];
+
+ for ( int i = 0; i < list.length; i++ ) {
+ newList[i] = list[i];
+ }
+ newList[list.length] = pat;
+
+ this.patterns = newList;
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ConnectiveConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ConnectiveConstraint.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ConnectiveConstraint.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,23 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * This is for a connective constraint that adds more options to a field constraint.
- * @author Michael Neale
- */
-public class ConnectiveConstraint
- implements
- IsSerializable {
-
- public ConnectiveConstraint() {}
-
- public ConnectiveConstraint(String opr,
- String val) {
- this.operator = opr;
- this.value = val;
- }
- public String operator;
- public String value;
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ConnectiveConstraint.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ConnectiveConstraint.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ConnectiveConstraint.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/ConnectiveConstraint.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,22 @@
+package org.drools.brms.client.rpc.brxml;
+
+
+/**
+ * This is for a connective constraint that adds more options to a field constraint.
+ * @author Michael Neale
+ */
+public class ConnectiveConstraint
+ implements
+ PortableObject {
+
+ public ConnectiveConstraint() {}
+
+ public ConnectiveConstraint(String opr,
+ String val) {
+ this.operator = opr;
+ this.value = val;
+ }
+ public String operator;
+ public String value;
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/Constraint.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/Constraint.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/Constraint.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,37 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public class Constraint implements IsSerializable {
- public String fieldBinding;
- public String fieldName;
- public String operator;
- public String value;
-
- public ConnectiveConstraint[] connectives;
-
- public Constraint(String field) {
- this.fieldName = field;
- }
-
- public Constraint() {}
-
- /**
- * This adds a new connective.
- *
- */
- public void addNewConnective() {
- if (connectives == null) {
- connectives = new ConnectiveConstraint[] {new ConnectiveConstraint()};
- } else {
- ConnectiveConstraint[] newList = new ConnectiveConstraint[connectives.length + 1];
- for ( int i = 0; i < connectives.length; i++ ) {
- newList[i] = connectives[i];
- }
- newList[connectives.length] = new ConnectiveConstraint();
- connectives = newList;
- }
- }
-
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/Constraint.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/Constraint.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/Constraint.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/Constraint.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,42 @@
+package org.drools.brms.client.rpc.brxml;
+
+
+/**
+ * This represents a contraint on a fact.
+ * Can also include optional "connective constraints" that extend the options for matches.
+ * @author Michael Neale
+ *
+ */
+public class Constraint implements PortableObject {
+ public String fieldBinding;
+ public String fieldName;
+ public String operator;
+ public String value;
+
+ public ConnectiveConstraint[] connectives;
+
+ public Constraint(String field) {
+ this.fieldName = field;
+ }
+
+ public Constraint() {}
+
+ /**
+ * This adds a new connective.
+ *
+ */
+ public void addNewConnective() {
+ if (connectives == null) {
+ connectives = new ConnectiveConstraint[] {new ConnectiveConstraint()};
+ } else {
+ ConnectiveConstraint[] newList = new ConnectiveConstraint[connectives.length + 1];
+ for ( int i = 0; i < connectives.length; i++ ) {
+ newList[i] = connectives[i];
+ }
+ newList[connectives.length] = new ConnectiveConstraint();
+ connectives = newList;
+ }
+ }
+
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentence.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentence.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentence.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,24 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-
-/**
- * This represents a DSL sentence.
- * @author Michael Neale
- */
-public class DSLSentence
- implements
- IPattern,
- IAction {
-
- public DSLSentenceFragment[] elements;
-
- public String toString() {
- String result = "";
- if (elements != null) {
- for ( int i = 0; i < elements.length; i++ ) {
- result += elements[i].value + " ";
- }
- }
- return result;
- }
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentence.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentence.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentence.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentence.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,24 @@
+package org.drools.brms.client.rpc.brxml;
+
+
+/**
+ * This represents a DSL sentence.
+ * @author Michael Neale
+ */
+public class DSLSentence
+ implements
+ IPattern,
+ IAction {
+
+ public DSLSentenceFragment[] elements;
+
+ public String toString() {
+ String result = "";
+ if (elements != null) {
+ for ( int i = 0; i < elements.length; i++ ) {
+ result += elements[i].value + " ";
+ }
+ }
+ return result;
+ }
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentenceFragment.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentenceFragment.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentenceFragment.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,30 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * This holds the value of a fragment of a DSL.
- * It can either be a sentence fragment (a display only thing) or a
- * value which the user can change.
- *
- * @author Michael Neale
- *
- */
-public class DSLSentenceFragment
- implements
- IsSerializable {
-
- public String value;
- public boolean isEditableField;
-
- /**
- * @param fragment
- * @param isEditableField true if it is a editable value. false means display only.
- */
- public DSLSentenceFragment(String fragment,
- boolean isEditableField) {
- value = fragment;
- this.isEditableField = isEditableField;
- }
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentenceFragment.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentenceFragment.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/DSLSentenceFragment.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/DSLSentenceFragment.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,31 @@
+package org.drools.brms.client.rpc.brxml;
+
+
+/**
+ * This holds the value of a fragment of a DSL.
+ * It can either be a sentence fragment (a display only thing) or a
+ * value which the user can change.
+ *
+ * @author Michael Neale
+ *
+ */
+public class DSLSentenceFragment
+ implements
+ PortableObject {
+
+ public String value;
+ public boolean isEditableField;
+
+ /**
+ * @param fragment
+ * @param isEditableField true if it is a editable value. false means display only.
+ */
+ public DSLSentenceFragment(String fragment,
+ boolean isEditableField) {
+ value = fragment;
+ this.isEditableField = isEditableField;
+ }
+
+ public DSLSentenceFragment() {}
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/FactPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/FactPattern.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/FactPattern.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,63 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-/**
- * A fact pattern is a declaration of a fact type, and its constraint,
- * and perhaps a variable that is it bound to
- * It is the equivalent of a "column" in drools terms.
- * @author Michael Neale
- *
- */
-public class FactPattern implements IPattern {
-
- public Constraint[] constraints;
- public String factType;
- public String boundName;
-
- public FactPattern() {
- this.constraints = new Constraint[0];
- }
-
- public FactPattern(String factType) {
- this.factType = factType;
- this.constraints = new Constraint[0];
- }
-
-
-
-
- public void addConstraint(Constraint constraint) {
- if (constraints == null) {
- constraints = new Constraint[1];
- constraints[0] = constraint;
- } else {
- Constraint[] newList = new Constraint[constraints.length + 1];
- for ( int i = 0; i < constraints.length; i++ ) {
- newList[i] = constraints[i];
- }
- newList[constraints.length] = constraint;
- constraints = newList;
- }
- }
-
- public void removeConstraint(int idx) {
- //Unfortunately, this is kinda duplicate code with other methods,
- //but with typed arrays, and GWT, its not really possible to do anything "better"
- //at this point in time.
- Constraint[] newList = new Constraint[constraints.length - 1];
- int newIdx = 0;
- for ( int i = 0; i < constraints.length; i++ ) {
-
- if (i != idx) {
- newList[newIdx] = constraints[i];
- newIdx++;
- }
-
- }
- this.constraints = newList;
-
- }
-
-
-
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/FactPattern.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/FactPattern.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/FactPattern.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/FactPattern.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,63 @@
+package org.drools.brms.client.rpc.brxml;
+
+/**
+ * A fact pattern is a declaration of a fact type, and its constraint,
+ * and perhaps a variable that is it bound to
+ * It is the equivalent of a "column" in drools terms.
+ * @author Michael Neale
+ *
+ */
+public class FactPattern implements IPattern {
+
+ public Constraint[] constraints;
+ public String factType;
+ public String boundName;
+
+ public FactPattern() {
+ this.constraints = new Constraint[0];
+ }
+
+ public FactPattern(String factType) {
+ this.factType = factType;
+ this.constraints = new Constraint[0];
+ }
+
+
+
+
+ public void addConstraint(Constraint constraint) {
+ if (constraints == null) {
+ constraints = new Constraint[1];
+ constraints[0] = constraint;
+ } else {
+ Constraint[] newList = new Constraint[constraints.length + 1];
+ for ( int i = 0; i < constraints.length; i++ ) {
+ newList[i] = constraints[i];
+ }
+ newList[constraints.length] = constraint;
+ constraints = newList;
+ }
+ }
+
+ public void removeConstraint(int idx) {
+ //Unfortunately, this is kinda duplicate code with other methods,
+ //but with typed arrays, and GWT, its not really possible to do anything "better"
+ //at this point in time.
+ Constraint[] newList = new Constraint[constraints.length - 1];
+ int newIdx = 0;
+ for ( int i = 0; i < constraints.length; i++ ) {
+
+ if (i != idx) {
+ newList[newIdx] = constraints[i];
+ newIdx++;
+ }
+
+ }
+ this.constraints = newList;
+
+ }
+
+
+
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IAction.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IAction.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IAction.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,7 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public interface IAction extends IsSerializable {
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IAction.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IAction.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IAction.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IAction.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,6 @@
+package org.drools.brms.client.rpc.brxml;
+
+
+public interface IAction extends PortableObject {
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IPattern.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IPattern.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,9 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public interface IPattern
- extends
- IsSerializable {
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IPattern.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IPattern.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/IPattern.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/IPattern.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,8 @@
+package org.drools.brms.client.rpc.brxml;
+
+
+public interface IPattern
+ extends
+ PortableObject {
+
+}
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/PortableObject.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/PortableObject.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/PortableObject.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,13 @@
+package org.drools.brms.client.rpc.brxml;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+/**
+ * This interface means the object will be squirted over the wire to the GWT client.
+ * It also means that the object is part of BRXML serialization.
+ *
+ * @author Michael Neale
+ */
+public interface PortableObject extends IsSerializable {
+
+}
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/PortableObject.java
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleAttribute.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleAttribute.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleAttribute.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,21 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * This holds values for rule attributes (eg salience, agenda-group etc).
- * @author Michael Neale
- */
-public class RuleAttribute
- implements
- IsSerializable {
-
- public RuleAttribute(String name,
- String value) {
- this.attributeName = name;
- this.value = value;
- }
- public String attributeName;
- public String value;
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleAttribute.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleAttribute.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleAttribute.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleAttribute.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,22 @@
+package org.drools.brms.client.rpc.brxml;
+
+
+/**
+ * This holds values for rule attributes (eg salience, agenda-group etc).
+ * @author Michael Neale
+ */
+public class RuleAttribute
+ implements
+ PortableObject {
+
+ public RuleAttribute(String name,
+ String value) {
+ this.attributeName = name;
+ this.value = value;
+ }
+ public String attributeName;
+ public String value;
+
+ public RuleAttribute() {}
+
+}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleModel.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleModel.java 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleModel.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,176 +0,0 @@
-package org.drools.brms.client.modeldriven.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public class RuleModel implements IsSerializable {
-
- public String name;
- public RuleAttribute[] attributes = new RuleAttribute[0];
-
- public IPattern[] lhs;
- public IAction[] rhs;
-
- /**
- * This will return the fact pattern that a variable is bound to.
- *
- * @param var The bound fact variable (NOT bound field).
- * @return null or the FactPattern found.
- */
- public FactPattern getBoundFact(String var) {
- if (lhs == null ) return null;
- for ( int i = 0; i < lhs.length; i++ ) {
-
- if (lhs[i] instanceof FactPattern) {
- FactPattern p = (FactPattern) lhs[i];
- if (p.boundName != null && var.equals( p.boundName)) {
- return p;
- }
- }
- }
- return null;
- }
-
- /**
- * @return A list of bound facts (String). Or empty list if none are found.
- */
- public List getBoundFacts() {
- if (lhs == null) return null;
- List list = new ArrayList();
- for ( int i = 0; i < lhs.length; i++ ) {
- if (lhs[i] instanceof FactPattern) {
- FactPattern p = (FactPattern) lhs[i];
- if (p.boundName != null) list.add( p.boundName );
- }
- }
- return list;
-
- }
-
- /**
- *
- * @param idx Remove this index from the LHS.
- * @param Returns false if it was NOT allowed to remove this item (ie
- * it is used on the RHS).
- */
- public boolean removeLhsItem(int idx) {
-
- IPattern[] newList = new IPattern[lhs.length - 1];
- int newIdx = 0;
- for ( int i = 0; i < lhs.length; i++ ) {
-
- if (i != idx) {
- newList[newIdx] = lhs[i];
- newIdx++;
- } else {
- if (lhs[i] instanceof FactPattern) {
- FactPattern p = (FactPattern) lhs[i];
- if (p.boundName != null && isBoundFactUsed( p.boundName )) {
- return false;
- }
- }
-
- }
-
- }
- this.lhs = newList;
- return true;
- }
-
- /**
- * @param binding The name of the LHS fact binding.
- * @return Returns true if the specified binding is used on the RHS.
- */
- public boolean isBoundFactUsed(String binding) {
- if (rhs == null) return false;
- for ( int i = 0; i < rhs.length; i++ ) {
- if (rhs[i] instanceof ActionSetField) {
- ActionSetField set = (ActionSetField) rhs[i];
- if (set.variable.equals( binding )) {
- return true;
- }
- } else if (rhs[i] instanceof ActionRetractFact) {
- ActionRetractFact ret = (ActionRetractFact) rhs[i];
- if (ret.variableName.equals( binding )) {
- return true;
- }
- }
- }
- return false;
- }
-
- public void addLhsItem(IPattern pat) {
- if (this.lhs == null) this.lhs = new IPattern[0];
-
- IPattern[] list = this.lhs;
- IPattern[] newList = new IPattern[list.length + 1];
-
- for ( int i = 0; i < list.length; i++ ) {
- newList[i] = list[i];
- }
- newList[list.length] = pat;
-
- this.lhs = newList;
- }
-
- public void addRhsItem(IAction action) {
- if (this.rhs == null) this.rhs = new IAction[0];
-
- IAction[] list = this.rhs;
- IAction[] newList = new IAction[list.length + 1];
-
- for ( int i = 0; i < list.length; i++ ) {
- newList[i] = list[i];
- }
- newList[list.length] = action;
-
- this.rhs = newList;
- }
-
- public void removeRhsItem(int idx) {
- IAction[] newList = new IAction[rhs.length - 1];
- int newIdx = 0;
- for ( int i = 0; i < rhs.length; i++ ) {
-
- if (i != idx) {
- newList[newIdx] = rhs[i];
- newIdx++;
- }
-
- }
- this.rhs = newList;
- }
-
- public void addAttribute(RuleAttribute attribute) {
-
-
- RuleAttribute[] list = this.attributes;
- RuleAttribute[] newList = new RuleAttribute[list.length + 1];
-
- for ( int i = 0; i < list.length; i++ ) {
- newList[i] = list[i];
- }
- newList[list.length] = attribute;
-
- this.attributes = newList;
-
- }
-
- public void removeAttribute(int idx) {
- RuleAttribute[] newList = new RuleAttribute[attributes.length - 1];
- int newIdx = 0;
- for ( int i = 0; i < attributes.length; i++ ) {
-
- if (i != idx) {
- newList[newIdx] = attributes[i];
- newIdx++;
- }
-
- }
- this.attributes = newList;
-
- }
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleModel.java (from rev 8642, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleModel.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/RuleModel.java 2007-01-03 09:09:47 UTC (rev 8642)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/RuleModel.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,176 @@
+package org.drools.brms.client.rpc.brxml;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RuleModel implements PortableObject {
+
+ public String name;
+ public String modelVersion = "1.0";
+
+ public RuleAttribute[] attributes = new RuleAttribute[0];
+
+ public IPattern[] lhs;
+ public IAction[] rhs;
+
+ /**
+ * This will return the fact pattern that a variable is bound to.
+ *
+ * @param var The bound fact variable (NOT bound field).
+ * @return null or the FactPattern found.
+ */
+ public FactPattern getBoundFact(String var) {
+ if (lhs == null ) return null;
+ for ( int i = 0; i < lhs.length; i++ ) {
+
+ if (lhs[i] instanceof FactPattern) {
+ FactPattern p = (FactPattern) lhs[i];
+ if (p.boundName != null && var.equals( p.boundName)) {
+ return p;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @return A list of bound facts (String). Or empty list if none are found.
+ */
+ public List getBoundFacts() {
+ if (lhs == null) return null;
+ List list = new ArrayList();
+ for ( int i = 0; i < lhs.length; i++ ) {
+ if (lhs[i] instanceof FactPattern) {
+ FactPattern p = (FactPattern) lhs[i];
+ if (p.boundName != null) list.add( p.boundName );
+ }
+ }
+ return list;
+
+ }
+
+ /**
+ *
+ * @param idx Remove this index from the LHS.
+ * @param Returns false if it was NOT allowed to remove this item (ie
+ * it is used on the RHS).
+ */
+ public boolean removeLhsItem(int idx) {
+
+ IPattern[] newList = new IPattern[lhs.length - 1];
+ int newIdx = 0;
+ for ( int i = 0; i < lhs.length; i++ ) {
+
+ if (i != idx) {
+ newList[newIdx] = lhs[i];
+ newIdx++;
+ } else {
+ if (lhs[i] instanceof FactPattern) {
+ FactPattern p = (FactPattern) lhs[i];
+ if (p.boundName != null && isBoundFactUsed( p.boundName )) {
+ return false;
+ }
+ }
+
+ }
+
+ }
+ this.lhs = newList;
+ return true;
+ }
+
+ /**
+ * @param binding The name of the LHS fact binding.
+ * @return Returns true if the specified binding is used on the RHS.
+ */
+ public boolean isBoundFactUsed(String binding) {
+ if (rhs == null) return false;
+ for ( int i = 0; i < rhs.length; i++ ) {
+ if (rhs[i] instanceof ActionSetField) {
+ ActionSetField set = (ActionSetField) rhs[i];
+ if (set.variable.equals( binding )) {
+ return true;
+ }
+ } else if (rhs[i] instanceof ActionRetractFact) {
+ ActionRetractFact ret = (ActionRetractFact) rhs[i];
+ if (ret.variableName.equals( binding )) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public void addLhsItem(IPattern pat) {
+ if (this.lhs == null) this.lhs = new IPattern[0];
+
+ IPattern[] list = this.lhs;
+ IPattern[] newList = new IPattern[list.length + 1];
+
+ for ( int i = 0; i < list.length; i++ ) {
+ newList[i] = list[i];
+ }
+ newList[list.length] = pat;
+
+ this.lhs = newList;
+ }
+
+ public void addRhsItem(IAction action) {
+ if (this.rhs == null) this.rhs = new IAction[0];
+
+ IAction[] list = this.rhs;
+ IAction[] newList = new IAction[list.length + 1];
+
+ for ( int i = 0; i < list.length; i++ ) {
+ newList[i] = list[i];
+ }
+ newList[list.length] = action;
+
+ this.rhs = newList;
+ }
+
+ public void removeRhsItem(int idx) {
+ IAction[] newList = new IAction[rhs.length - 1];
+ int newIdx = 0;
+ for ( int i = 0; i < rhs.length; i++ ) {
+
+ if (i != idx) {
+ newList[newIdx] = rhs[i];
+ newIdx++;
+ }
+
+ }
+ this.rhs = newList;
+ }
+
+ public void addAttribute(RuleAttribute attribute) {
+
+
+ RuleAttribute[] list = this.attributes;
+ RuleAttribute[] newList = new RuleAttribute[list.length + 1];
+
+ for ( int i = 0; i < list.length; i++ ) {
+ newList[i] = list[i];
+ }
+ newList[list.length] = attribute;
+
+ this.attributes = newList;
+
+ }
+
+ public void removeAttribute(int idx) {
+ RuleAttribute[] newList = new RuleAttribute[attributes.length - 1];
+ int newIdx = 0;
+ for ( int i = 0; i < attributes.length; i++ ) {
+
+ if (i != idx) {
+ newList[newIdx] = attributes[i];
+ newIdx++;
+ }
+
+ }
+ this.attributes = newList;
+
+ }
+
+}
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/package.html
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/package.html 2007-01-02 17:41:58 UTC (rev 8620)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/package.html 2007-01-03 16:25:25 UTC (rev 8661)
@@ -0,0 +1,9 @@
+<body>
+ This package holds classes that are used as RPC classes for the rule modeller,
+ as well as the DOM for the BRXML rule format that the rule modeller uses.
+
+ IMPORTANT:
+ Do not change these unless you are adding fields or removing fields, not refactoring
+ fields. Especially if there is existing data. XSLT may need to be used to massage
+ the existing XML to suit the new structure.
+</body>
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/brxml/package.html
___________________________________________________________________
Name: svn:eol-style
+ native
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 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/EditorLauncher.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,20 +1,20 @@
package org.drools.brms.client.ruleeditor;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.model.ActionAssertFact;
-import org.drools.brms.client.modeldriven.model.ActionFieldValue;
-import org.drools.brms.client.modeldriven.model.ActionRetractFact;
-import org.drools.brms.client.modeldriven.model.ActionSetField;
-import org.drools.brms.client.modeldriven.model.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.model.Constraint;
-import org.drools.brms.client.modeldriven.model.DSLSentence;
-import org.drools.brms.client.modeldriven.model.DSLSentenceFragment;
-import org.drools.brms.client.modeldriven.model.FactPattern;
-import org.drools.brms.client.modeldriven.model.IAction;
-import org.drools.brms.client.modeldriven.model.IPattern;
-import org.drools.brms.client.modeldriven.model.RuleModel;
import org.drools.brms.client.modeldriven.ui.RuleModeller;
import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.brms.client.rpc.brxml.ActionAssertFact;
+import org.drools.brms.client.rpc.brxml.ActionFieldValue;
+import org.drools.brms.client.rpc.brxml.ActionRetractFact;
+import org.drools.brms.client.rpc.brxml.ActionSetField;
+import org.drools.brms.client.rpc.brxml.CompositeFactPattern;
+import org.drools.brms.client.rpc.brxml.Constraint;
+import org.drools.brms.client.rpc.brxml.DSLSentence;
+import org.drools.brms.client.rpc.brxml.DSLSentenceFragment;
+import org.drools.brms.client.rpc.brxml.FactPattern;
+import org.drools.brms.client.rpc.brxml.IAction;
+import org.drools.brms.client.rpc.brxml.IPattern;
+import org.drools.brms.client.rpc.brxml.RuleModel;
import com.google.gwt.user.client.ui.Widget;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -13,13 +13,13 @@
import javax.servlet.http.HttpSession;
import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.modeldriven.model.RuleModel;
import org.drools.brms.client.rpc.MetaData;
import org.drools.brms.client.rpc.RepositoryService;
import org.drools.brms.client.rpc.RuleAsset;
import org.drools.brms.client.rpc.RuleContentText;
import org.drools.brms.client.rpc.TableConfig;
import org.drools.brms.client.rpc.TableDataResult;
+import org.drools.brms.client.rpc.brxml.RuleModel;
import org.drools.brms.server.util.BRLPersistence;
import org.drools.brms.server.util.MetaDataMapper;
import org.drools.brms.server.util.TableDisplayHandler;
@@ -219,7 +219,7 @@
} else if (item.getFormat().equals( AssetFormats.BUSINESS_RULE )) {
RuleModel model = BRLPersistence.getInstance().toModel( item.getContent() );
- //asset.content = model;
+ asset.content = model;
} else {
//default to text, goode olde texte, just like mum used to make.
RuleContentText text = new RuleContentText();
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/BRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/BRLPersistence.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/BRLPersistence.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,18 +1,18 @@
package org.drools.brms.server.util;
-import org.drools.brms.client.modeldriven.model.ActionAssertFact;
-import org.drools.brms.client.modeldriven.model.ActionFieldList;
-import org.drools.brms.client.modeldriven.model.ActionFieldValue;
-import org.drools.brms.client.modeldriven.model.ActionRetractFact;
-import org.drools.brms.client.modeldriven.model.ActionSetField;
-import org.drools.brms.client.modeldriven.model.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.model.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.model.Constraint;
-import org.drools.brms.client.modeldriven.model.DSLSentence;
-import org.drools.brms.client.modeldriven.model.DSLSentenceFragment;
-import org.drools.brms.client.modeldriven.model.FactPattern;
-import org.drools.brms.client.modeldriven.model.RuleAttribute;
-import org.drools.brms.client.modeldriven.model.RuleModel;
+import org.drools.brms.client.rpc.brxml.ActionAssertFact;
+import org.drools.brms.client.rpc.brxml.ActionFieldList;
+import org.drools.brms.client.rpc.brxml.ActionFieldValue;
+import org.drools.brms.client.rpc.brxml.ActionRetractFact;
+import org.drools.brms.client.rpc.brxml.ActionSetField;
+import org.drools.brms.client.rpc.brxml.CompositeFactPattern;
+import org.drools.brms.client.rpc.brxml.ConnectiveConstraint;
+import org.drools.brms.client.rpc.brxml.Constraint;
+import org.drools.brms.client.rpc.brxml.DSLSentence;
+import org.drools.brms.client.rpc.brxml.DSLSentenceFragment;
+import org.drools.brms.client.rpc.brxml.FactPattern;
+import org.drools.brms.client.rpc.brxml.RuleAttribute;
+import org.drools.brms.client.rpc.brxml.RuleModel;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ActionSetFieldTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ActionSetFieldTest.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ActionSetFieldTest.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,7 +1,7 @@
package org.drools.brms.client.modeldriven;
-import org.drools.brms.client.modeldriven.model.ActionFieldValue;
-import org.drools.brms.client.modeldriven.model.ActionSetField;
+import org.drools.brms.client.rpc.brxml.ActionFieldValue;
+import org.drools.brms.client.rpc.brxml.ActionSetField;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/CompositeFactPatternTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/CompositeFactPatternTest.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/CompositeFactPatternTest.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,7 +1,7 @@
package org.drools.brms.client.modeldriven;
-import org.drools.brms.client.modeldriven.model.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.model.FactPattern;
+import org.drools.brms.client.rpc.brxml.CompositeFactPattern;
+import org.drools.brms.client.rpc.brxml.FactPattern;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ConstraintTest.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ConstraintTest.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.model.Constraint;
+import org.drools.brms.client.rpc.brxml.Constraint;
public class ConstraintTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/FactPatternTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/FactPatternTest.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/FactPatternTest.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -1,7 +1,7 @@
package org.drools.brms.client.modeldriven;
-import org.drools.brms.client.modeldriven.model.Constraint;
-import org.drools.brms.client.modeldriven.model.FactPattern;
+import org.drools.brms.client.rpc.brxml.Constraint;
+import org.drools.brms.client.rpc.brxml.FactPattern;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/RuleModelTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/RuleModelTest.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/RuleModelTest.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -2,13 +2,13 @@
import java.util.List;
-import org.drools.brms.client.modeldriven.model.ActionRetractFact;
-import org.drools.brms.client.modeldriven.model.ActionSetField;
-import org.drools.brms.client.modeldriven.model.FactPattern;
-import org.drools.brms.client.modeldriven.model.IAction;
-import org.drools.brms.client.modeldriven.model.IPattern;
-import org.drools.brms.client.modeldriven.model.RuleAttribute;
-import org.drools.brms.client.modeldriven.model.RuleModel;
+import org.drools.brms.client.rpc.brxml.ActionRetractFact;
+import org.drools.brms.client.rpc.brxml.ActionSetField;
+import org.drools.brms.client.rpc.brxml.FactPattern;
+import org.drools.brms.client.rpc.brxml.IAction;
+import org.drools.brms.client.rpc.brxml.IPattern;
+import org.drools.brms.client.rpc.brxml.RuleAttribute;
+import org.drools.brms.client.rpc.brxml.RuleModel;
import com.thoughtworks.xstream.XStream;
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java 2007-01-03 16:18:26 UTC (rev 8660)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java 2007-01-03 16:25:25 UTC (rev 8661)
@@ -2,17 +2,17 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.model.ActionAssertFact;
-import org.drools.brms.client.modeldriven.model.ActionFieldValue;
-import org.drools.brms.client.modeldriven.model.ActionRetractFact;
-import org.drools.brms.client.modeldriven.model.ActionSetField;
-import org.drools.brms.client.modeldriven.model.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.model.Constraint;
-import org.drools.brms.client.modeldriven.model.DSLSentence;
-import org.drools.brms.client.modeldriven.model.DSLSentenceFragment;
-import org.drools.brms.client.modeldriven.model.FactPattern;
-import org.drools.brms.client.modeldriven.model.RuleAttribute;
-import org.drools.brms.client.modeldriven.model.RuleModel;
+import org.drools.brms.client.rpc.brxml.ActionAssertFact;
+import org.drools.brms.client.rpc.brxml.ActionFieldValue;
+import org.drools.brms.client.rpc.brxml.ActionRetractFact;
+import org.drools.brms.client.rpc.brxml.ActionSetField;
+import org.drools.brms.client.rpc.brxml.CompositeFactPattern;
+import org.drools.brms.client.rpc.brxml.Constraint;
+import org.drools.brms.client.rpc.brxml.DSLSentence;
+import org.drools.brms.client.rpc.brxml.DSLSentenceFragment;
+import org.drools.brms.client.rpc.brxml.FactPattern;
+import org.drools.brms.client.rpc.brxml.RuleAttribute;
+import org.drools.brms.client.rpc.brxml.RuleModel;
public class BRLPersitenceTest extends TestCase {
More information about the jboss-svn-commits
mailing list