[jboss-svn-commits] JBL Code SVN: r9486 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms: client/packages and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Feb 14 05:55:16 EST 2007


Author: michael.neale at jboss.com
Date: 2007-02-14 05:55:16 -0500 (Wed, 14 Feb 2007)
New Revision: 9486

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/StatusChangePopup.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DSLRuleEditor.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
Log:
some content assistance

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/StatusChangePopup.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/StatusChangePopup.java	2007-02-14 08:02:05 UTC (rev 9485)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/StatusChangePopup.java	2007-02-14 10:55:16 UTC (rev 9486)
@@ -27,11 +27,13 @@
     private Command changedStatus;
 
     public StatusChangePopup(String uuid, boolean isPackage) {
-        super();
+        super(true);
         
         this.uuid = uuid;
         this.isPackage = isPackage;
         
+        setStyleName( "ks-popups-Popup" );
+        
         setHTML( "<img src='images/status_small.gif'/><b>Change status</b>" );
         HorizontalPanel horiz = new HorizontalPanel();
         final ListBox box = new ListBox();

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java	2007-02-14 08:02:05 UTC (rev 9485)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java	2007-02-14 10:55:16 UTC (rev 9486)
@@ -9,11 +9,9 @@
 import org.drools.brms.client.rpc.RepositoryServiceFactory;
 
 import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DSLRuleEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DSLRuleEditor.java	2007-02-14 08:02:05 UTC (rev 9485)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DSLRuleEditor.java	2007-02-14 10:55:16 UTC (rev 9486)
@@ -9,13 +9,14 @@
 import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.DockPanel;
 import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.KeyboardListener;
+import com.google.gwt.user.client.ui.KeyboardListenerAdapter;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.TextArea;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.DockPanel.DockLayoutConstant;
 
 
 /**
@@ -27,6 +28,8 @@
     
     private TextArea text;
     final private RuleContentText data;
+    private String[] conditions;
+    private String[] actions;
     
 
     
@@ -38,6 +41,9 @@
         text.setHeight("100%");
         text.setVisibleLines(10);
         text.setText(tex.content);
+
+        this.conditions = dslConditions;
+        this.actions = dslActions;       
         
         text.setStyleName( "dsl-text-Editor" );
         
@@ -51,6 +57,22 @@
         });
 
 
+        text.addKeyboardListener( new KeyboardListenerAdapter() {
+
+
+
+            public void onKeyDown(Widget arg0,
+                                   char arg1,
+                                   int arg2) {
+                if (arg1 == ' ' && arg2 == MODIFIER_CTRL) {
+                    showInTextOptions( ); 
+                } 
+                
+            }
+
+
+            
+        });
         
         VerticalPanel vert = new VerticalPanel();
         
@@ -85,6 +107,23 @@
         initWidget( layout );
     }
     
+    protected void showInTextOptions() {
+        String prev = text.getText().substring( 0, this.text.getCursorPos() );
+        if (prev.indexOf( "then" ) > -1) {
+            PickList pick = new PickList("Choose an action", actions , this);
+            pick.setPopupPosition( text.getAbsoluteLeft(), text.getAbsoluteTop() );
+            pick.show();
+            
+        } else {
+            PickList pick = new PickList("Choose a condition", conditions , this);
+            pick.setPopupPosition( text.getAbsoluteLeft(), text.getAbsoluteTop() );
+            pick.show();
+            
+        }
+        
+    }
+    
+
     private void showOptions(final String[] items,
                              Widget w, String message) {
         PickList pick = new PickList(message, items, this);
@@ -97,6 +136,7 @@
         String left = text.getText().substring( 0, i );
         String right = text.getText().substring( i, text.getText().length() );
         text.setText( left + ins + right );
+        this.data.content = text.getText();
     }    
 
     /**
@@ -119,9 +159,11 @@
             list.setVisibleItemCount( 6 );
             vert.add( list );
             
-            DockPanel buttons = new DockPanel();
             
             
+            FlexTable buttons = new FlexTable();
+            
+            
             Button ok = new Button("OK");
             ok.addClickListener( new ClickListener() {
                 public void onClick(Widget w) {
@@ -129,7 +171,8 @@
                     hide();
                 }
             }  );
-            buttons.add( ok, DockPanel.WEST );
+            buttons.setWidget( 0, 0, ok );
+            buttons.getFlexCellFormatter().setAlignment( 0, 0, HasHorizontalAlignment.ALIGN_LEFT, HasVerticalAlignment.ALIGN_MIDDLE );
             
             
             
@@ -139,7 +182,10 @@
                     hide();
                 }
             } );
-            buttons.add( close, DockPanel.EAST );
+            
+            buttons.setWidget( 0, 1, close);
+            buttons.getFlexCellFormatter().setAlignment( 0, 1, HasHorizontalAlignment.ALIGN_RIGHT, HasVerticalAlignment.ALIGN_MIDDLE );
+            
             buttons.setWidth( "100%" );
             vert.add( buttons );
             

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css	2007-02-14 08:02:05 UTC (rev 9485)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css	2007-02-14 10:55:16 UTC (rev 9486)
@@ -303,8 +303,8 @@
 
 
 .ks-popups-Popup {
-  background-color: #FDFCDC;
-  border: 1px solid #B8B8B8;
+  background-color: white;
+  border: 2px solid #B8B8B8;
   padding: 4px;
 }
 
@@ -417,6 +417,7 @@
 .dsl-text-Editor {
   font-family: Arial, sans-serif;
   font-size: smaller;
+  background-color: #FDFCDC;
   border: 1px solid #B8B8B8;
   padding: 0px;	
 }




More information about the jboss-svn-commits mailing list