[jboss-svn-commits] JBL Code SVN: r13127 - labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui.

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

Author: arhan
Date: 2007-07-05 19:47:34 -0400 (Thu, 05 Jul 2007)
New Revision: 13127

Modified:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java
Log:
a change in layout: the fact label spans over its constraints

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java	2007-07-05 23:40:21 UTC (rev 13126)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java	2007-07-05 23:47:34 UTC (rev 13127)
@@ -4,9 +4,12 @@
 import org.drools.brms.client.modeldriven.brl.FactPattern;
 import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+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.Label;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.events.IHyperlinkListener;
@@ -44,18 +47,33 @@
         layout.marginRight = 0;
         layout.marginTop = 0;
         layout.marginWidth = 0;
-        layout.verticalSpacing = 0;
+        layout.verticalSpacing = 2;
         parent.setLayout( layout );
 
         create();
     }
 
     private void create() {
-        toolkit.createLabel( parent,
+        Label l = toolkit.createLabel( parent,
                              HumanReadable.getCEDisplayName( pattern.type ) );
+        
+        GridData labelGD = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
+        labelGD.horizontalSpan = 2;
+        //labelGD.verticalAlignment = SWT.CENTER;
+        //labelGD.horizontalAlignment = SWT.CENTER;
+        l.setLayoutData(labelGD);
+        l.setBackground(new Color(parent.getShell().getDisplay(),240,240,240));
+        
+        l.setLayoutData(labelGD);
         addDeleteAction();
         addMoreOptionsAction();
         Composite composite = toolkit.createComposite( parent );
+        
+
+    	GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+        gd.horizontalAlignment = SWT.CENTER;
+    	composite.setLayoutData(gd);
+    	
         createFactRows( toolkit,
                         composite );
     }
@@ -114,9 +132,12 @@
 
     private void createFactRows(FormToolkit toolkit,
                                 Composite constraintComposite) {
+    	
+    	
         if ( pattern.patterns != null ) {
             FactPattern[] facts = pattern.patterns;
             for ( int i = 0; i < facts.length; i++ ) {
+            	
                 new FactPatternWidget( toolkit,
                                        constraintComposite,
                                        getModeller(),
@@ -124,6 +145,9 @@
                                        pattern,
                                        i,
                                        false );
+                
+                toolkit.createLabel(constraintComposite, "");
+                toolkit.createLabel(constraintComposite, "");
             }
         }
     }

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java	2007-07-05 23:40:21 UTC (rev 13126)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java	2007-07-05 23:47:34 UTC (rev 13127)
@@ -15,6 +15,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Combo;
@@ -78,10 +79,19 @@
     }
 
     private void create() {
-        toolkit.createLabel( parent,
+        Label l = toolkit.createLabel( parent,
                              getPatternLabel() );
+        
+        GridData labelGD = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
+        labelGD.horizontalSpan = 2;
+        //labelGD.verticalAlignment = SWT.CENTER;
+        //labelGD.horizontalAlignment = SWT.CENTER;
+        l.setLayoutData(labelGD);
+        l.setBackground(new Color(parent.getShell().getDisplay(),240,240,240));
+        
         addDeleteAction();
         addMoreOptionsAction();
+        
         Composite constraintComposite = toolkit.createComposite( parent );
         GridLayout constraintLayout = new GridLayout();
         constraintLayout.numColumns = 8;