[jboss-svn-commits] JBL Code SVN: r10567 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/modeldriven/ui and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 28 02:40:38 EDT 2007
Author: michael.neale at jboss.com
Date: 2007-03-28 02:40:37 -0400 (Wed, 28 Mar 2007)
New Revision: 10567
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/brxml/Constraint.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/FactPatternWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/converter/BRXMLToDescrConverterTest.java
Log:
JBRULES-690 and adding predicate support
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/brxml/Constraint.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/brxml/Constraint.java 2007-03-28 04:10:02 UTC (rev 10566)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/brxml/Constraint.java 2007-03-28 06:40:37 UTC (rev 10567)
@@ -10,13 +10,33 @@
implements
PortableObject {
- public static final int UNDEFINED = 0;
- public static final int LITERAL = 1;
- public static final int VARIABLE = 2;
- public static final int RET_VALUE = 3;
- public static final int ENUM = 4;
- public static final int PREDICATE = 5;
+ /**
+ * This may be string, or number, anything really.
+ */
+ public static final int TYPE_LITERAL = 1;
+
+ /**
+ * This is when it is set to a valid previously bound variable.
+ */
+ public static final int TYPE_VARIABLE = 2;
+
+ /**
+ * This is for a "formula" that calculates a value.
+ */
+ public static final int TYPE_RET_VALUE = 3;
+
+ /**
+ * This is not used yet. ENUMs are not suitable for business rules
+ * until we can get data driven non code enums.
+ */
+ public static final int TYPE_ENUM = 4;
+
+ /**
+ * The fieldName and fieldBinding is not used in the case of a predicate.
+ */
+ public static final int TYPE_PREDICATE = 5;
+
public String fieldBinding;
public String fieldName;
public String operator;
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-03-28 04:10:02 UTC (rev 10566)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java 2007-03-28 06:40:37 UTC (rev 10567)
@@ -1,6 +1,7 @@
package org.drools.brms.client.modeldriven.ui;
import org.drools.brms.client.common.FormStylePopup;
+import org.drools.brms.client.common.ImageButton;
import org.drools.brms.client.modeldriven.HumanReadable;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
@@ -37,7 +38,7 @@
this.completions = completions;
this.pattern = pattern;
this.modeller = modeller;
-
+
this.layout = new Grid( 1, 2 );
this.layout.setStyleName( "model-builderInner-Background" );
@@ -68,7 +69,7 @@
private Widget getCompositeLabel() {
HorizontalPanel horiz = new HorizontalPanel();
- Image edit = new Image( "images/add_field_to_fact.gif" );
+ Image edit = new ImageButton( "images/add_field_to_fact.gif" );
edit.setTitle( "Add a fact to this constraint. If it is an 'or' type, it will need at least 2." );
edit.addClickListener( new ClickListener() {
public void onClick(Widget w) {
@@ -78,6 +79,7 @@
horiz.add( new Label( HumanReadable.getCEDisplayName( pattern.type ) ) );
horiz.add( edit );
+ horiz.setStyleName( "modeller-composite-Label" );
return horiz;
}
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-03-28 04:10:02 UTC (rev 10566)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java 2007-03-28 06:40:37 UTC (rev 10567)
@@ -16,12 +16,15 @@
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
/**
* This is the new smart widget that works off the model.
@@ -43,10 +46,13 @@
this.modeller = mod;
this.bindable = canBind;
layout.setWidget( 0, 0, getPatternLabel() );
+ FlexCellFormatter formatter = layout.getFlexCellFormatter();
+ formatter.setAlignment( 0, 0, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_MIDDLE );
+ formatter.setStyleName( 0, 0, "modeller-fact-TypeHeader" );
final FlexTable inner = new FlexTable();
- layout.setWidget( 0, 1, inner );
+ layout.setWidget( 1, 0, inner );
for ( int row = 0; row < pattern.constraints.length; row++ ) {
final Constraint c = pattern.constraints[row];
@@ -93,10 +99,12 @@
}
if (bindable) {
- layout.setStyleName( "model-builderInner-Background" );
+ //layout.setStyleName( "model-builderInner-Background" );
+ layout.setStyleName( "modeller-fact-pattern-Widget" );
} else {
- layout.setStyleName( "model-builderInnerInner-Background" );
+ //layout.setStyleName( "model-builderInnerInner-Background" );
}
+
initWidget( layout );
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css 2007-03-28 04:10:02 UTC (rev 10566)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css 2007-03-28 06:40:37 UTC (rev 10567)
@@ -125,22 +125,32 @@
.model-builder-Background {
background-color: #f7f2d0;
- border: 1px solid #aaaa99;
+ border: 1px solid #ccc;
}
.model-builderInner-Background {
background-color: white;
- border: 1px solid #aaaa99;
+ border: 1px solid #ccc;
}
.model-builderInnerInner-Background {
background-color: white;
- border-top: 0px solid gray;
- border-bottom: 0px solid gray;
+ border-top: 0px solid #ccc;
+ border-bottom: 0px solid #ccc;
}
+.modeller-fact-TypeHeader {
+ background-color: #f6f6f6;
+}
+.modeller-fact-pattern-Widget {
+ border: 1px solid #ccc;
+}
+
+.modeller-composite-Label { font-style: italic; }
+
+
.gwt-DialogBox {
border: 1px solid #aaaa99;
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java 2007-03-28 04:10:02 UTC (rev 10566)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java 2007-03-28 06:40:37 UTC (rev 10567)
@@ -96,7 +96,7 @@
constr.fieldBinding );
column.addDescr( fieldDescr );
}
- if ( constr.type == Constraint.PREDICATE ) {
+ if ( constr.type == Constraint.TYPE_PREDICATE ) {
PredicateDescr predicateDescr = new PredicateDescr( constr.value );
column.addDescr( predicateDescr );
} else {
@@ -139,20 +139,20 @@
String operator,
String value) {
switch ( type ) {
- case Constraint.LITERAL :
+ case Constraint.TYPE_LITERAL :
LiteralRestrictionDescr lit = new LiteralRestrictionDescr( operator,
value );
return lit;
- case Constraint.VARIABLE :
+ case Constraint.TYPE_VARIABLE :
VariableRestrictionDescr var = new VariableRestrictionDescr( operator,
value );
return var;
- case Constraint.ENUM :
+ case Constraint.TYPE_ENUM :
LiteralRestrictionDescr enu = new LiteralRestrictionDescr( operator,
value,
true );
return enu;
- case Constraint.RET_VALUE :
+ case Constraint.TYPE_RET_VALUE :
ReturnValueRestrictionDescr rvc = new ReturnValueRestrictionDescr( operator,
value );
return rvc;
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/converter/BRXMLToDescrConverterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/converter/BRXMLToDescrConverterTest.java 2007-03-28 04:10:02 UTC (rev 10566)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/converter/BRXMLToDescrConverterTest.java 2007-03-28 06:40:37 UTC (rev 10567)
@@ -45,7 +45,7 @@
Constraint constr = new Constraint( "type" );
constr.operator = "==";
constr.value = "stilton";
- constr.type = Constraint.LITERAL;
+ constr.type = Constraint.TYPE_LITERAL;
pat1.addConstraint( constr );
model.addLhsItem( pat1 );
More information about the jboss-svn-commits
mailing list