[jboss-svn-commits] JBL Code SVN: r12529 - in labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin: lib and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 12 22:57:36 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-06-12 22:57:35 -0400 (Tue, 12 Jun 2007)
New Revision: 12529
Added:
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/antlr.jar
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/drools-compiler.jar
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/drools-core.jar
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/xstream.jar
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ActionInsertFactWidget.java
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewInsertedFactFieldDialog.java
Removed:
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/antlr-3.0b7.jar
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/drools-compiler-4.0.0.SNAPSHOT.jar
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/drools-core-4.0.0.SNAPSHOT.jar
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/xstream-1.1.3.jar
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ActionAssertFactWidget.java
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewAssertFactFieldDialog.java
Modified:
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/.classpath
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/modeldriven/HumanReadable.java
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewActionDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/RuleModeller.java
Log:
JBRULES-922 API change for assert and modify
Modified: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/.classpath 2007-06-13 02:47:12 UTC (rev 12528)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/.classpath 2007-06-13 02:57:35 UTC (rev 12529)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-core-4.0.0.SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-compiler-4.0.0.SNAPSHOT.jar" sourcepath="/drools-compiler"/>
- <classpathentry exported="true" kind="lib" path="lib/antlr-3.0b7.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xstream-1.1.3.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="lib" path="lib/antlr.jar"/>
+ <classpathentry kind="lib" path="lib/drools-compiler.jar"/>
+ <classpathentry kind="lib" path="lib/drools-core.jar"/>
+ <classpathentry kind="lib" path="lib/xstream.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/antlr-3.0b7.jar
===================================================================
(Binary files differ)
Added: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/antlr.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/antlr.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/drools-compiler-4.0.0.SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/drools-compiler.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/drools-compiler.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/drools-core-4.0.0.SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/drools-core.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/drools-core.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/xstream-1.1.3.jar
===================================================================
(Binary files differ)
Added: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/xstream.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/lib/xstream.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/modeldriven/HumanReadable.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/modeldriven/HumanReadable.java 2007-06-13 02:47:12 UTC (rev 12528)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/modeldriven/HumanReadable.java 2007-06-13 02:57:35 UTC (rev 12529)
@@ -74,16 +74,16 @@
ceDisplayMap.put( "or",
"Any of" );
- actionDisplayMap.put( "assert",
- "Assert" );
- actionDisplayMap.put( "assertLogical",
- "Logically assert" );
+ actionDisplayMap.put( "insert",
+ "Insert" );
+ actionDisplayMap.put( "insertLogical",
+ "Logically insert" );
actionDisplayMap.put( "retract",
"Retract" );
actionDisplayMap.put( "set",
"Set" );
- actionDisplayMap.put( "modify",
- "Modify" );
+ actionDisplayMap.put( "update",
+ "Update" );
}
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ActionAssertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ActionAssertFactWidget.java 2007-06-13 02:47:12 UTC (rev 12528)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ActionAssertFactWidget.java 2007-06-13 02:57:35 UTC (rev 12529)
@@ -1,155 +0,0 @@
-package org.drools.eclipse.rulebuilder.ui;
-
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-
-/**
- *
- *
- * @author Anton Arhipov
- * @author Ahti Kitsik
- *
- */
-public class ActionAssertFactWidget extends Widget {
-
- private final ActionAssertFact fact;
-
- public ActionAssertFactWidget(FormToolkit toolkit,
- Composite parent,
- RuleModeller mod,
- ActionAssertFact fact,
- int index) {
- super(parent,toolkit,mod,index);
-
- this.fact = fact;
-
- GridLayout l = new GridLayout();
- l.numColumns = 4;
- l.marginBottom = 0;
- l.marginHeight = 0;
- l.marginLeft = 0;
- l.marginRight = 0;
- l.marginTop = 0;
- l.marginWidth = 0;
- l.verticalSpacing = 0;
- parent.setLayout( l );
-
- create();
- }
-
- private void create() {
- toolkit.createLabel( parent,
- HumanReadable.getActionDisplayName( this.fact.getType() ) + " " + this.fact.factType );
- addDeleteRHSAction();
- addMoreOptionsAction();
- Composite constraintComposite = toolkit.createComposite( parent );
- GridLayout constraintLayout = new GridLayout();
- constraintLayout.numColumns = 3;
- constraintComposite.setLayout( constraintLayout );
- createConstraintRows( constraintComposite );
- toolkit.paintBordersFor( constraintComposite );
- }
-
- private void addMoreOptionsAction() {
- final Shell shell = new Shell( Display.getCurrent() );
- ImageHyperlink link = addImage( parent,
- "icons/new_item.gif" );
-
- link.addHyperlinkListener( new IHyperlinkListener() {
- public void linkActivated(HyperlinkEvent e) {
- RuleDialog popup = new AddNewAssertFactFieldDialog( shell,
- toolkit,
- getModeller(),
- fact );
- popup.open();
- }
-
- public void linkEntered(HyperlinkEvent e) {
- }
-
- public void linkExited(HyperlinkEvent e) {
- }
- } );
- link.setToolTipText( "Add another field to this so you can set its value" );
- }
-
- private void createConstraintRows(Composite constraintComposite) {
- for ( int row = 0; row < fact.fieldValues.length; row++ ) {
- ActionFieldValue val = fact.fieldValues[row];
- toolkit.createLabel( constraintComposite,
- val.field );
- valueEditor( constraintComposite,
- val );
- addRemoveFieldAction( constraintComposite,
- row );
- }
- }
-
- private void addRemoveFieldAction(Composite constraintComposite,
- final int row) {
- ImageHyperlink delLink = addImage( constraintComposite,
- "icons/delete_item_small.gif" );
- delLink.setToolTipText( "Remove this field action" );
-
- delLink.addHyperlinkListener( new IHyperlinkListener() {
- public void linkActivated(HyperlinkEvent e) {
- MessageBox dialog = new MessageBox( Display.getCurrent().getActiveShell(),
- SWT.YES | SWT.NO | SWT.ICON_WARNING );
- dialog.setMessage( "Remove this item?" );
- dialog.setText( "Remove this item?" );
- if ( dialog.open() == SWT.YES ) {
- fact.removeField( row );
- getModeller().setDirty( true );
- getModeller().reloadRhs();
- }
- }
-
- public void linkEntered(HyperlinkEvent e) {
- }
-
- public void linkExited(HyperlinkEvent e) {
- }
- } );
- }
-
- private void valueEditor(Composite parent,
- final ActionFieldValue val) {
- final Text box = toolkit.createText( parent,
- "" );
-
- if ( val.value != null ) {
- box.setText( val.value );
- }
-
- box.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
- box.addModifyListener( new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- getModeller().setDirty( true );
- val.value = box.getText();
- }
- } );
-
- }
-
- public SuggestionCompletionEngine getCompletion() {
- return getModeller().getSuggestionCompletionEngine();
- }
-
-}
Copied: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ActionInsertFactWidget.java (from rev 12325, labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ActionAssertFactWidget.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ActionInsertFactWidget.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ActionInsertFactWidget.java 2007-06-13 02:57:35 UTC (rev 12529)
@@ -0,0 +1,155 @@
+package org.drools.eclipse.rulebuilder.ui;
+
+import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
+import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.events.IHyperlinkListener;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ImageHyperlink;
+
+/**
+ *
+ *
+ * @author Anton Arhipov
+ * @author Ahti Kitsik
+ *
+ */
+public class ActionInsertFactWidget extends Widget {
+
+ private final ActionInsertFact fact;
+
+ public ActionInsertFactWidget(FormToolkit toolkit,
+ Composite parent,
+ RuleModeller mod,
+ ActionInsertFact fact,
+ int index) {
+ super(parent,toolkit,mod,index);
+
+ this.fact = fact;
+
+ GridLayout l = new GridLayout();
+ l.numColumns = 4;
+ l.marginBottom = 0;
+ l.marginHeight = 0;
+ l.marginLeft = 0;
+ l.marginRight = 0;
+ l.marginTop = 0;
+ l.marginWidth = 0;
+ l.verticalSpacing = 0;
+ parent.setLayout( l );
+
+ create();
+ }
+
+ private void create() {
+ toolkit.createLabel( parent,
+ HumanReadable.getActionDisplayName( this.fact.getType() ) + " " + this.fact.factType );
+ addDeleteRHSAction();
+ addMoreOptionsAction();
+ Composite constraintComposite = toolkit.createComposite( parent );
+ GridLayout constraintLayout = new GridLayout();
+ constraintLayout.numColumns = 3;
+ constraintComposite.setLayout( constraintLayout );
+ createConstraintRows( constraintComposite );
+ toolkit.paintBordersFor( constraintComposite );
+ }
+
+ private void addMoreOptionsAction() {
+ final Shell shell = new Shell( Display.getCurrent() );
+ ImageHyperlink link = addImage( parent,
+ "icons/new_item.gif" );
+
+ link.addHyperlinkListener( new IHyperlinkListener() {
+ public void linkActivated(HyperlinkEvent e) {
+ RuleDialog popup = new AddNewInsertedFactFieldDialog( shell,
+ toolkit,
+ getModeller(),
+ fact );
+ popup.open();
+ }
+
+ public void linkEntered(HyperlinkEvent e) {
+ }
+
+ public void linkExited(HyperlinkEvent e) {
+ }
+ } );
+ link.setToolTipText( "Add another field to this so you can set its value" );
+ }
+
+ private void createConstraintRows(Composite constraintComposite) {
+ for ( int row = 0; row < fact.fieldValues.length; row++ ) {
+ ActionFieldValue val = fact.fieldValues[row];
+ toolkit.createLabel( constraintComposite,
+ val.field );
+ valueEditor( constraintComposite,
+ val );
+ addRemoveFieldAction( constraintComposite,
+ row );
+ }
+ }
+
+ private void addRemoveFieldAction(Composite constraintComposite,
+ final int row) {
+ ImageHyperlink delLink = addImage( constraintComposite,
+ "icons/delete_item_small.gif" );
+ delLink.setToolTipText( "Remove this field action" );
+
+ delLink.addHyperlinkListener( new IHyperlinkListener() {
+ public void linkActivated(HyperlinkEvent e) {
+ MessageBox dialog = new MessageBox( Display.getCurrent().getActiveShell(),
+ SWT.YES | SWT.NO | SWT.ICON_WARNING );
+ dialog.setMessage( "Remove this item?" );
+ dialog.setText( "Remove this item?" );
+ if ( dialog.open() == SWT.YES ) {
+ fact.removeField( row );
+ getModeller().setDirty( true );
+ getModeller().reloadRhs();
+ }
+ }
+
+ public void linkEntered(HyperlinkEvent e) {
+ }
+
+ public void linkExited(HyperlinkEvent e) {
+ }
+ } );
+ }
+
+ private void valueEditor(Composite parent,
+ final ActionFieldValue val) {
+ final Text box = toolkit.createText( parent,
+ "" );
+
+ if ( val.value != null ) {
+ box.setText( val.value );
+ }
+
+ box.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+
+ box.addModifyListener( new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ getModeller().setDirty( true );
+ val.value = box.getText();
+ }
+ } );
+
+ }
+
+ public SuggestionCompletionEngine getCompletion() {
+ return getModeller().getSuggestionCompletionEngine();
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewActionDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewActionDialog.java 2007-06-13 02:47:12 UTC (rev 12528)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewActionDialog.java 2007-06-13 02:57:35 UTC (rev 12529)
@@ -1,8 +1,8 @@
package org.drools.eclipse.rulebuilder.ui;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertLogicalFact;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertLogicalFact;
import org.drools.brms.client.modeldriven.brxml.ActionSetField;
import org.drools.brms.client.modeldriven.brxml.DSLSentence;
import org.eclipse.swt.SWT;
@@ -93,7 +93,7 @@
}
modeller.getModel().addRhsItem(
- new ActionAssertLogicalFact(factsCombo.getText()));
+ new ActionInsertLogicalFact(factsCombo.getText()));
modeller.setDirty(true);
modeller.reloadRhs();
close();
@@ -112,7 +112,7 @@
}
modeller.getModel().addRhsItem(
- new ActionAssertFact(factsCombo.getText()));
+ new ActionInsertFact(factsCombo.getText()));
modeller.setDirty(true);
modeller.reloadRhs();
close();
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewAssertFactFieldDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewAssertFactFieldDialog.java 2007-06-13 02:47:12 UTC (rev 12528)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewAssertFactFieldDialog.java 2007-06-13 02:57:35 UTC (rev 12529)
@@ -1,87 +0,0 @@
-package org.drools.eclipse.rulebuilder.ui;
-
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- *
- * @author Anton Arhipov
- * @author Ahti Kitsik
- *
- */
-public class AddNewAssertFactFieldDialog extends RuleDialog {
-
- private final FormToolkit toolkit;
-
- private RuleModeller modeller;
-
- private final ActionAssertFact fact;
-
- public AddNewAssertFactFieldDialog(Shell parent,
- FormToolkit toolkit,
- RuleModeller modeller,
- ActionAssertFact fact) {
- super( parent,
- "Add new condition to the rule",
- "Pick the values from combos and confirm the selection." );
- this.toolkit = toolkit;
- this.modeller = modeller;
- this.fact = fact;
- }
-
- protected Control createDialogArea(final Composite parent) {
- System.out.println("Creating new ASSERT fact constraint");
-
- Composite composite = (Composite) super.createDialogArea( parent );
-
- toolkit.createLabel( composite,
- "Field:" );
-
- final Combo factsCombo = new Combo( composite,
- SWT.READ_ONLY );
-
- String[] fields = getCompletion().getFieldCompletions( fact.factType );
- factsCombo.add( "..." );
- for ( int i = 0; i < fields.length; i++ ) {
- factsCombo.add( fields[i] );
- }
- factsCombo.select( 0 );
-
- factsCombo.addListener( SWT.Selection,
- new Listener() {
- public void handleEvent(Event event) {
-
- System.out.println("HERE2222! event "+event);
-
- if ( factsCombo.getSelectionIndex() == 0 ) {
- return;
- }
-
- // TODO Is NUMBERIC ok?
- fact.addFieldValue( new ActionFieldValue( factsCombo.getText(),
- "",
- SuggestionCompletionEngine.TYPE_NUMERIC ) );
-
- modeller.setDirty( true );
- modeller.reloadRhs();
- close();
- }
- } );
-
- return composite;
- }
-
- public SuggestionCompletionEngine getCompletion() {
- return modeller.getSuggestionCompletionEngine();
- }
-
-}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java 2007-06-13 02:47:12 UTC (rev 12528)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java 2007-06-13 02:57:35 UTC (rev 12529)
@@ -40,7 +40,7 @@
FactPattern pattern,
boolean isNested) {
super( parent,
- "Modify constraints",
+ "Update constraints",
"Pick the values from combos and confirm the selection." );
this.toolkit = toolkit;
this.modeller = modeller;
Copied: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewInsertedFactFieldDialog.java (from rev 12325, labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewAssertFactFieldDialog.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewInsertedFactFieldDialog.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewInsertedFactFieldDialog.java 2007-06-13 02:57:35 UTC (rev 12529)
@@ -0,0 +1,87 @@
+package org.drools.eclipse.rulebuilder.ui;
+
+import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+/**
+ *
+ * @author Anton Arhipov
+ * @author Ahti Kitsik
+ *
+ */
+public class AddNewInsertedFactFieldDialog extends RuleDialog {
+
+ private final FormToolkit toolkit;
+
+ private RuleModeller modeller;
+
+ private final ActionInsertFact fact;
+
+ public AddNewInsertedFactFieldDialog(Shell parent,
+ FormToolkit toolkit,
+ RuleModeller modeller,
+ ActionInsertFact fact) {
+ super( parent,
+ "Add new condition to the rule",
+ "Pick the values from combos and confirm the selection." );
+ this.toolkit = toolkit;
+ this.modeller = modeller;
+ this.fact = fact;
+ }
+
+ protected Control createDialogArea(final Composite parent) {
+ System.out.println("Creating new ASSERT fact constraint");
+
+ Composite composite = (Composite) super.createDialogArea( parent );
+
+ toolkit.createLabel( composite,
+ "Field:" );
+
+ final Combo factsCombo = new Combo( composite,
+ SWT.READ_ONLY );
+
+ String[] fields = getCompletion().getFieldCompletions( fact.factType );
+ factsCombo.add( "..." );
+ for ( int i = 0; i < fields.length; i++ ) {
+ factsCombo.add( fields[i] );
+ }
+ factsCombo.select( 0 );
+
+ factsCombo.addListener( SWT.Selection,
+ new Listener() {
+ public void handleEvent(Event event) {
+
+ System.out.println("HERE2222! event "+event);
+
+ if ( factsCombo.getSelectionIndex() == 0 ) {
+ return;
+ }
+
+ // TODO Is NUMBERIC ok?
+ fact.addFieldValue( new ActionFieldValue( factsCombo.getText(),
+ "",
+ SuggestionCompletionEngine.TYPE_NUMERIC ) );
+
+ modeller.setDirty( true );
+ modeller.reloadRhs();
+ close();
+ }
+ } );
+
+ return composite;
+ }
+
+ public SuggestionCompletionEngine getCompletion() {
+ return modeller.getSuggestionCompletionEngine();
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/RuleModeller.java 2007-06-13 02:47:12 UTC (rev 12528)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/RuleModeller.java 2007-06-13 02:57:35 UTC (rev 12529)
@@ -1,7 +1,7 @@
package org.drools.eclipse.rulebuilder.ui;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
import org.drools.brms.client.modeldriven.brxml.ActionSetField;
import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
@@ -179,15 +179,24 @@
if (action instanceof ActionSetField) {
addActionSetFieldWidget(action, i);
- } else if (action instanceof ActionAssertFact) {
- addActionAssertFactWidget(action, i);
+ } else if (action instanceof ActionInsertFact) {
+ addActionInsertFactWidget(action, i);
} else if (action instanceof ActionRetractFact) {
addActionRetractFactWidget(action, i);
} else if (action instanceof DSLSentence) {
addRHSDSLSentenceWidget(i, (DSLSentence) action);
}
- }
+ }
+ }
+ private void addActionInsertFactWidget(IAction action,
+ int i) {
+ Composite comp = toolkit.createComposite( thenComposite );
+ new ActionInsertFactWidget( toolkit,
+ comp,
+ this,
+ (ActionInsertFact) action,
+ i );
}
private void redrawLhs() {
@@ -222,8 +231,8 @@
private void addActionAssertFactWidget(IAction action, int i) {
Composite comp = toolkit.createComposite(thenComposite);
- new ActionAssertFactWidget(toolkit, comp, this,
- (ActionAssertFact) action, i);
+ new ActionInsertFactWidget(toolkit, comp, this,
+ (ActionInsertFact) action, i);
}
More information about the jboss-svn-commits
mailing list