[jboss-svn-commits] JBL Code SVN: r36818 - in labs/jbossrules/soa_branches/BRMS-5.1.x: drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Mar 15 23:04:27 EDT 2011
Author: tsurdilovic
Date: 2011-03-15 23:04:27 -0400 (Tue, 15 Mar 2011)
New Revision: 36818
Modified:
labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/HumanReadable.java
labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java
labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.x/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/SuggestionCompletionEngine.java
Log:
BRMS-543 : Add 'is null' and 'is not null' to drop-down in Guided Editor
Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2011-03-15 18:05:25 UTC (rev 36817)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2011-03-16 03:04:27 UTC (rev 36818)
@@ -706,6 +706,10 @@
String isNotEqualTo();
+ String isEqualToNull();
+
+ String isNotEqualToNull();
+
String isLessThan();
String lessThanOrEqualTo();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2011-03-15 18:05:25 UTC (rev 36817)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2011-03-16 03:04:27 UTC (rev 36818)
@@ -344,6 +344,8 @@
CreateANewFactPattern=Create a new fact pattern
isEqualTo=equal to
isNotEqualTo=not equal to
+isEqualToNull=is null
+isNotEqualToNull=is not null
isLessThan=less than
lessThanOrEqualTo=less than or equal to
greaterThan=greater than
@@ -1036,4 +1038,4 @@
ActivateRuleFlowGroup=Activate rule flow group
FillInColumnWithValue=Please fill in this column with a {0} value.
LoadTemplateData=Load Template Data
-InvalidDateFormatMessage=Date format is invalid. Please follow the correct date format: dd-MMM-yyyy
\ No newline at end of file
+InvalidDateFormatMessage=Date format is invalid. Please follow the correct date format: dd-MMM-yyyy
Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/HumanReadable.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/HumanReadable.java 2011-03-15 18:05:25 UTC (rev 36817)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/HumanReadable.java 2011-03-16 03:04:27 UTC (rev 36818)
@@ -88,6 +88,8 @@
operatorDisplayMap.put( "soundslike", constants.soundsLike());
operatorDisplayMap.put("in", constants.isContainedInTheFollowingList());
+ operatorDisplayMap.put("== null", constants.isEqualToNull());
+ operatorDisplayMap.put("!= null", constants.isNotEqualToNull());
ceDisplayMap.put( "not", constants.ThereIsNo());
ceDisplayMap.put( "exists", constants.ThereExists());
@@ -122,4 +124,4 @@
public static String getActionDisplayName(String action) {
return lookup(action, actionDisplayMap);
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java 2011-03-15 18:05:25 UTC (rev 36817)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java 2011-03-16 03:04:27 UTC (rev 36818)
@@ -133,6 +133,10 @@
initWidget(panel);
}
+ public BaseSingleFieldConstraint getConstraint() {
+ return constraint;
+ }
+
private void refreshEditor() {
panel.clear();
Widget constraintWidget = null;
Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java 2011-03-15 18:05:25 UTC (rev 36817)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java 2011-03-16 03:04:27 UTC (rev 36818)
@@ -350,8 +350,8 @@
} else {
inner.setWidget(row, 0 + col, fieldLabel(constraint, showBinding, tabs * 20));
}
- inner.setWidget(row, 1 + col, operatorDropDown(constraint));
inner.setWidget(row, 2 + col, valueEditor(constraint, constraint.getFieldType()));
+ inner.setWidget( row, 1 + col, operatorDropDown( constraint, inner, row, 2 + col ) );
inner.setWidget(row, 3 + col, connectives.connectives(constraint, constraint.getFieldType()));
if (ebContainer != null && ebContainer.getWidgetCount() > 0) {
@@ -471,7 +471,6 @@
}
private Widget valueEditor(final SingleFieldConstraint c, String factType) {
- //String type = this.modeller.getSuggestionCompletions().getFieldType( factType, c.fieldName );
ConstraintValueEditor constraintValueEditor = new ConstraintValueEditor(pattern, c.getFieldName(), c, this.getModeller(), c.getFieldType(),this.readOnly);
constraintValueEditor.setOnValueChangeCommand(new Command() {
public void execute() {
@@ -481,14 +480,17 @@
return constraintValueEditor;
}
-
-
- private Widget operatorDropDown(final SingleFieldConstraint c) {
- return operatorDropDown(c, connectives.getCompletions()
- .getFieldType(pattern.factType, c.getFieldName()));
+ private Widget operatorDropDown(final SingleFieldConstraint c, String type) {
+ return operatorDropDown( c, type, null, -1, -1 );
}
+
+ private Widget operatorDropDown(final SingleFieldConstraint c, DirtyableFlexTable inner, int row, int col)
+ {
+ return operatorDropDown( c, connectives.getCompletions()
+ .getFieldType(pattern.factType, c.getFieldName()), inner, row, col);
+ }
- private Widget operatorDropDown(final SingleFieldConstraint c, String type) {
+ private Widget operatorDropDown(final SingleFieldConstraint c, String type, final DirtyableFlexTable inner, final int row, final int col) {
if (!this.readOnly) {
String[] ops = connectives.getCompletions().getOperatorCompletions(type);
final ListBox box = new ListBox();
@@ -497,6 +499,10 @@
String op = ops[i];
box.addItem(HumanReadable.getOperatorDisplayName(op), op);
if (op.equals(c.getOperator())) {
+ if(HumanReadable.getOperatorDisplayName( op ).equals(constants.isEqualToNull()) || HumanReadable.getOperatorDisplayName( op ).equals(constants.isNotEqualToNull())) {
+ inner.getWidget(row, col).setVisible(false);
+ ( (ConstraintValueEditor) inner.getWidget(row, col)).getConstraint().setValue("");
+ }
box.setSelectedIndex(i + 1);
}
@@ -507,9 +513,26 @@
public void onChange(ChangeEvent event) {
setModified(true);
c.setOperator(box.getValue(box.getSelectedIndex()));
+ String selected = box.getValue( box.getSelectedIndex());
+ String selectedText = box.getItemText( box.getSelectedIndex() );
+ c.setOperator( selected );
+
if (c.getOperator().equals("")) {
c.setOperator(null);
}
+
+
+ if( selectedText.equals(constants.isEqualToNull()) || selectedText.equals(constants.isNotEqualToNull())) {
+ if(inner != null) {
+ inner.getWidget(row, col).setVisible(false);
+ ( (ConstraintValueEditor) inner.getWidget(row, col)).getConstraint().setValue("");
+ }
+ } else {
+ if(inner != null) {
+ inner.getWidget(row, col).setVisible(true);
+ }
+ }
+
getModeller().makeDirty();
}
});
Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/SuggestionCompletionEngine.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/SuggestionCompletionEngine.java 2011-03-15 18:05:25 UTC (rev 36817)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/SuggestionCompletionEngine.java 2011-03-16 03:04:27 UTC (rev 36818)
@@ -59,10 +59,10 @@
private static final String[] COMPARABLE_CONNECTIVES = new String[]{"|| ==", "|| !=", "&& !=", "&& >", "&& <", "|| >", "|| <", "&& >=", "&& <=", "|| <=", "|| >="};
private static final String[] COLLECTION_CONNECTIVES = new String[]{"|| ==", "|| !=", "&& !=", "|| contains", "&& contains", "|| excludes", "&& excludes"};
- private static final String[] STANDARD_OPERATORS = new String[]{"==", "!="};
- private static final String[] COMPARABLE_OPERATORS = new String[]{"==", "!=", "<", ">", "<=", ">="};
- private static final String[] STRING_OPERATORS = new String[]{"==", "!=", "matches", "soundslike"};
- private static final String[] COLLECTION_OPERATORS = new String[]{"contains", "excludes", "==", "!="};
+ private static final String[] STANDARD_OPERATORS = new String[]{"==", "!=", "== null", "!= null"};
+ private static final String[] COMPARABLE_OPERATORS = new String[]{"==", "!=", "<", ">", "<=", ">=", "== null", "!= null"};
+ private static final String[] STRING_OPERATORS = new String[]{"==", "!=", "matches", "soundslike", "== null", "!= null"};
+ private static final String[] COLLECTION_OPERATORS = new String[]{"contains", "excludes", "==", "!=", "== null", "!= null"};
/** The top level conditional elements (first order logic) */
private static final String[] CONDITIONAL_ELEMENTS = new String[]{"not", "exists", "or"};
More information about the jboss-svn-commits
mailing list