[jboss-svn-commits] JBL Code SVN: r12587 - labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Jun 14 16:38:41 EDT 2007


Author: arhan
Date: 2007-06-14 16:38:41 -0400 (Thu, 14 Jun 2007)
New Revision: 12587

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/FactPatternWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ValueEditorTypeSelectionDialog.java
Log:
new API patch

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-14 19:27:19 UTC (rev 12586)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java	2007-06-14 20:38:41 UTC (rev 12587)
@@ -2,6 +2,7 @@
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.brms.client.modeldriven.brxml.FactPattern;
+import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -106,18 +107,17 @@
                                                      "New formula",
                                                      SWT.PUSH );
 
-        //TODO: adjust to new API
-       /* formulaButton.addListener( SWT.Selection,
+       formulaButton.addListener( SWT.Selection,
                                    new Listener() {
                                        public void handleEvent(Event event) {
-                                           Constraint con = new Constraint();
-                                           con.constraintValueType = IConstraint.TYPE_PREDICATE;
+                                    	   SingleFieldConstraint con = new SingleFieldConstraint();
+                                           con.constraintValueType = SingleFieldConstraint.TYPE_PREDICATE;
                                            pattern.addConstraint( con );
                                            modeller.setDirty( true );
                                            modeller.reloadLhs();
                                            close();
                                        }
-                                   } );*/
+                                   } );
 
         formulaButton.setLayoutData( gd );
     }
@@ -136,23 +136,21 @@
         }
         fieldsCombo.select( 0 );
 
-        
-        //TODO: adjust to new API
-       /* fieldsCombo.addListener( SWT.Selection,
+        fieldsCombo.addListener( SWT.Selection,
                                  new Listener() {
                                      public void handleEvent(Event event) {
                                          if ( fieldsCombo.getSelectionIndex() == 0 ) {
                                              return;
                                          }
 
-                                         Constraint constraint = new Constraint();
+                                         SingleFieldConstraint constraint = new SingleFieldConstraint();
                                          constraint.fieldName = fieldsCombo.getText();
                                          pattern.addConstraint( constraint );
                                          modeller.setDirty( true );
                                          modeller.reloadLhs();
                                          close();
                                      }
-                                 } );*/
+                                 } );
     }
 
     private SuggestionCompletionEngine getCompletion() {

Modified: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java	2007-06-14 19:27:19 UTC (rev 12586)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java	2007-06-14 20:38:41 UTC (rev 12587)
@@ -342,9 +342,9 @@
 			link.setToolTipText("Choose value editor type");
 			link.addHyperlinkListener(new IHyperlinkListener() {
 				public void linkActivated(HyperlinkEvent e) {
-					/*RuleDialog popup = new ValueEditorTypeSelectionDialog(
+					RuleDialog popup = new ValueEditorTypeSelectionDialog(
 							parent.getShell(), toolkit, getModeller(), c);
-					popup.open();*/
+					popup.open();
 				}
 
 				public void linkEntered(HyperlinkEvent e) {

Modified: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ValueEditorTypeSelectionDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ValueEditorTypeSelectionDialog.java	2007-06-14 19:27:19 UTC (rev 12586)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/ValueEditorTypeSelectionDialog.java	2007-06-14 20:38:41 UTC (rev 12587)
@@ -1,5 +1,6 @@
 package org.drools.eclipse.rulebuilder.ui;
 
+import org.drools.brms.client.modeldriven.brxml.ISingleFieldConstraint;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -15,18 +16,17 @@
 
     private RuleModeller      modeller;
 
-   // private IConstraint       constraint;
+    private ISingleFieldConstraint   constraint;
 
     public ValueEditorTypeSelectionDialog(Shell parent,
                                           FormToolkit toolkit,
-                                          RuleModeller modeller
-                                          //,
-                                          //IConstraint constraint
+                                          RuleModeller modeller,
+                                          ISingleFieldConstraint constraint
                                           ) {
         super(parent,"Select value editor type","Select value editor type" );
         this.toolkit = toolkit;
         this.modeller = modeller;
-        //this.constraint = constraint;
+        this.constraint = constraint;
     }
 
     protected Control createDialogArea(final Composite parent) {
@@ -40,9 +40,7 @@
         valueTypeCombo.add( "A formula" ); // 1
 
         
-        //TODO: adjust to new API
-        
-       /* if ( modeller.getModel().getBoundVariablesInScope( constraint ).size() > 0 ) {
+        if ( modeller.getModel().getBoundVariablesInScope( constraint ).size() > 0 ) {
             valueTypeCombo.add( "Bound variable" ); // 2
         }
 
@@ -50,20 +48,20 @@
             public void modifyText(ModifyEvent e) {
                 switch ( valueTypeCombo.getSelectionIndex() ) {
                     case 0 :
-                        constraint.constraintValueType = IFieldConstraint.TYPE_LITERAL;
+                        constraint.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
                         break;
                     case 1 :
-                        constraint.constraintValueType = IConstraint.TYPE_RET_VALUE;
+                        constraint.constraintValueType = ISingleFieldConstraint.TYPE_RET_VALUE;
                         break;
                     case 2 :
-                        constraint.constraintValueType = IConstraint.TYPE_VARIABLE;
+                        constraint.constraintValueType = ISingleFieldConstraint.TYPE_VARIABLE;
                         break;
                 }
                 modeller.reloadLhs();
                 modeller.setDirty( true );
                 close();
             }
-        } );*/
+        } );
 
         toolkit.paintBordersFor( composite );
         return composite;




More information about the jboss-svn-commits mailing list