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

[jboss-svn-commits at lists.jboss.org]

Author: arhan
Date: 2007-06-16 16:07:58 -0400 (Sat, 16 Jun 2007)
New Revision: 12632

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/RuleAttributesDialog.java
Log:
todo: layout fix is required

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-16 10:20:49 UTC (rev 12631)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java	2007-06-16 20:07:58 UTC (rev 12632)
@@ -143,13 +143,14 @@
 					showBinding);
 		} else if (constraint instanceof CompositeFieldConstraint) {
 			compositeFieldConstraintEditor(constraintComposite,
-					(CompositeFieldConstraint) constraint);
+					(CompositeFieldConstraint) constraint, row);
 		}
-
 	}
 
 	private void compositeFieldConstraintEditor(Composite constraintComposite,
-			CompositeFieldConstraint constraint) {
+			final CompositeFieldConstraint constraint, int row) {
+		
+		//Label
 		if (constraint.compositeJunctionType
 				.equals(CompositeFieldConstraint.COMPOSITE_TYPE_AND)) {
 			toolkit.createLabel(constraintComposite, "All of:");
@@ -157,31 +158,81 @@
 			toolkit.createLabel(constraintComposite, "Any of:");
 		}
 
+		//button "add"
 		ImageHyperlink link = addImage(constraintComposite,
 				"icons/new_item.gif");
 		link.addHyperlinkListener(new IHyperlinkListener() {
 			public void linkActivated(HyperlinkEvent e) {
-				// TODO Auto-generated method stub
+				RuleDialog popup = new AddCompositeConstraintOptionDialog(
+						parent.getShell(), toolkit, getModeller(), constraint,
+						pattern);
+				popup.open();
 			}
 
 			public void linkEntered(HyperlinkEvent e) {
-				// TODO Auto-generated method stub
 			}
 
 			public void linkExited(HyperlinkEvent e) {
-				// TODO Auto-generated method stub
 			}
-
 		});
-
+		
+		// Nested elements
+		
+		
 		FieldConstraint[] nested = constraint.constraints;
 		if (nested != null) {
-			//TODO: implement as a pop-up
-			
 			for (int i = 0; i < nested.length; i++) {
-				//renderFieldConstraints(constraintComposite, nested[i], i, false);
+				Composite nestedComposite = toolkit.createComposite(constraintComposite);
+				
+				GridLayout l = new GridLayout();
+				l.numColumns = 6;
+				l.marginBottom = 0;
+				l.marginHeight = 0;
+				l.marginLeft = 0;
+				l.marginRight = 0;
+				l.marginTop = 0;
+				l.marginWidth = 0;
+				l.verticalSpacing = 0;
+				nestedComposite.setLayout(l);
+				
+				GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+				gd.horizontalSpan = 3;
+				nestedComposite.setLayoutData(gd);
+				
+				renderFieldConstraints(nestedComposite, nested[i], i, false);
 			}
+		}else{
+			toolkit.createLabel(constraintComposite, ""); // dummy
+			toolkit.createLabel(constraintComposite, ""); // dummy
+			toolkit.createLabel(constraintComposite, ""); // dummy			
 		}
+		
+		//button "delete"
+		ImageHyperlink delLink = addImage(constraintComposite,
+				"icons/delete_item_small.gif");
+		
+		final int currectRow = row;
+		
+		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 (nested) restriction.");
+				dialog.setText("Remove this item from nested constraint?");
+				if (dialog.open() == SWT.YES) {
+					pattern.removeConstraint(currectRow);
+					getModeller().reloadLhs();
+					getModeller().setDirty(true);
+				}
+			}
+
+			public void linkEntered(HyperlinkEvent e) {
+			}
+
+			public void linkExited(HyperlinkEvent e) {
+			}
+		});
+		toolkit.createLabel(constraintComposite, ""); // dummy
 	}
 
 	private void renderSingleFieldConstraint(Composite constraintComposite,
@@ -195,8 +246,7 @@
 	}
 
 	private void createConstraintRow(Composite constraintComposite, int row,
-			final SingleFieldConstraint c, boolean showBinding) { // TODO: use
-		// showBinding
+			final SingleFieldConstraint c, boolean showBinding) { // <-- TODO:
 		toolkit.createLabel(constraintComposite, c.fieldName);
 		if (c.connectives == null || c.connectives.length == 0) {
 			addRemoveFieldAction(constraintComposite, row);

Modified: labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/RuleAttributesDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/RuleAttributesDialog.java	2007-06-16 10:20:49 UTC (rev 12631)
+++ labs/jbossrules/trunk/drools-eclipse/drools-guided-editor-plugin/src/org/drools/eclipse/rulebuilder/ui/RuleAttributesDialog.java	2007-06-16 20:07:58 UTC (rev 12632)
@@ -24,7 +24,7 @@
 	public RuleAttributesDialog(Shell parent, FormToolkit toolkit,
 			RuleModeller modeller) {
 		super(parent, "Add new option to the rule",
-				"Pick the value from combo and confirm the selection.");
+				"Pick the value from combo.");
 
 		this.toolkit = toolkit;
 		this.modeller = modeller;