[jboss-svn-commits] JBL Code SVN: r8250 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms: client/modeldriven client/modeldriven/model client/modeldriven/ui public/images
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Dec 12 07:51:24 EST 2006
Author: michael.neale at jboss.com
Date: 2006-12-12 07:51:12 -0500 (Tue, 12 Dec 2006)
New Revision: 8250
Added:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/add_field_to_fact.gif
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/model/ActionAssertFact.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/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/FactPatternWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.java
Log:
some cosmetic issues, merging in DSL editor
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 2006-12-12 11:32:13 UTC (rev 8249)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java 2006-12-12 12:51:12 UTC (rev 8250)
@@ -9,8 +9,6 @@
* An suggestion completion processor. This should be usable in both GWT/Web and the IDE.
* The data for this can be loaded into this from simple string lists.
*
- * TODO: make this i18n friendly, either at this level, or the data
- * being fed into it.
* TODO: also make this include type info for the fields (for display, but may be needed
* for rendering DRL).
* TODO: MAYBE make operator suggestions based on type of field, not field/fact as it is now?
Modified: 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 2006-12-12 11:32:13 UTC (rev 8249)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/model/ActionAssertFact.java 2006-12-12 12:51:12 UTC (rev 8250)
@@ -11,5 +11,11 @@
public String factType;
+ public ActionAssertFact(String type) {
+ this.factType = type;
+ }
+
+ public ActionAssertFact() {}
+
}
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 2006-12-12 11:32:13 UTC (rev 8249)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java 2006-12-12 12:51:12 UTC (rev 8250)
@@ -99,7 +99,8 @@
HorizontalPanel horiz = new HorizontalPanel();
- Image edit = new Image("images/edit.gif");
+ Image edit = new Image("images/add_field_to_fact.gif");
+ edit.setTitle( "Add another field to this so you can set its value." );
edit.addClickListener( new ClickListener() {
public void onClick(Widget w) {
showAddFieldPopup(w);
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 2006-12-12 11:32:13 UTC (rev 8249)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java 2006-12-12 12:51:12 UTC (rev 8250)
@@ -97,7 +97,8 @@
HorizontalPanel horiz = new HorizontalPanel();
- Image edit = new Image("images/edit.gif");
+ Image edit = new Image("images/add_field_to_fact.gif");
+ edit.setTitle( "Add another field to this so you can set its value." );
edit.addClickListener( new ClickListener() {
public void onClick(Widget w) {
showAddFieldPopup(w);
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 2006-12-12 11:32:13 UTC (rev 8249)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java 2006-12-12 12:51:12 UTC (rev 8250)
@@ -67,7 +67,8 @@
private Widget getCompositeLabel() {
HorizontalPanel horiz = new HorizontalPanel();
- Image edit = new Image( "images/edit.gif" );
+ Image edit = new Image( "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) {
showFactTypeSelector( w );
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 2006-12-12 11:32:13 UTC (rev 8249)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java 2006-12-12 12:51:12 UTC (rev 8250)
@@ -106,7 +106,8 @@
private Widget getPatternLabel() {
HorizontalPanel horiz = new HorizontalPanel();
- Image edit = new Image("images/edit.gif");
+ Image edit = new Image("images/add_field_to_fact.gif");
+ edit.setTitle( "Add a field to this condition, or bind a varible to this fact." );
horiz.add( edit );
edit.addClickListener( new ClickListener() {
public void onClick(Widget w) {
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 2006-12-12 11:32:13 UTC (rev 8249)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.java 2006-12-12 12:51:12 UTC (rev 8250)
@@ -59,6 +59,7 @@
layout.clear();
Image addPattern = new Image( "images/new_item.gif" );
+ addPattern.setTitle( "Add a condition to this rule." );
addPattern.addClickListener( new ClickListener() {
public void onClick(Widget w) {
showAddConditionSelector(w);
@@ -72,6 +73,7 @@
layout.setWidget( 2, 0, new Label("THEN") );
Image addAction = new Image("images/new_item.gif");
+ addAction.setTitle( "Add an action to this rule." );
addAction.addClickListener( new ClickListener() {
public void onClick(Widget w) {
showActionSelector(w);
@@ -222,8 +224,26 @@
}
});
+
+ final ListBox factsToAssert = new ListBox();
+ factsToAssert.addItem( "Choose..." );
+ for ( int i = 0; i < completions.getFactTypes().length; i++ ) {
+ factsToAssert.addItem( completions.getFactTypes()[i] );
+ }
+
+ factsToAssert.addChangeListener( new ChangeListener() {
+ public void onChange(Widget w) {
+ String fact = factsToAssert.getItemText( factsToAssert.getSelectedIndex() );
+ model.addRhsItem( new ActionAssertFact(fact) );
+ refreshWidget();
+ popup.hide();
+
+ }
+ });
+
popup.addAttribute( "Modify a field on", varBox );
popup.addAttribute( "Retract a fact", retractBox );
+ popup.addAttribute( "Assert a new fact", factsToAssert );
popup.setPopupPosition( w.getAbsoluteLeft() - 400, w.getAbsoluteTop() );
popup.show();
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/add_field_to_fact.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/add_field_to_fact.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-svn-commits
mailing list