[jboss-svn-commits] JBL Code SVN: r10547 - labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor.

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

Author: michael.neale at jboss.com
Date: 2007-03-27 00:09:22 -0400 (Tue, 27 Mar 2007)
New Revision: 10547

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java
Log:
JBRULES-690 Style improvements with consultation from Andy Fitz.

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java	2007-03-27 00:18:34 UTC (rev 10546)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java	2007-03-27 04:09:22 UTC (rev 10547)
@@ -55,14 +55,13 @@
     private void loadData(MetaData d) {
         this.data = d;
         addAttribute("Categories:", categories());
-           
+        addRow( new HTML("<hr/>") );   
         
         addAttribute("Last modified:", readOnlyDate(data.lastModifiedDate));
         addAttribute("Last contributor:", readOnlyText(data.lastContributor));
         addAttribute("Note:", readOnlyText( data.checkinComment ));
         addAttribute("Created by:", readOnlyText(data.creator));
         addAttribute("Version:", getVersionNumberLabel());
-        addAttribute("Package:", packageEditor(data.packageName));
         addAttribute("Format:", new HTML( "<b>" + data.format + "</b>" ));
         
         if (!readOnly) {
@@ -71,7 +70,8 @@
 
         
         addRow(new HTML("<hr/>"));
-        
+
+        addAttribute("Package:", packageEditor(data.packageName));        
         addAttribute("Subject:", editableText(new FieldBinding() {
             public String getValue() {
                 return data.subject;
@@ -126,6 +126,7 @@
             return readOnlyText( packageName );
         } else {
             HorizontalPanel horiz = new HorizontalPanel();
+            horiz.setStyleName( "current-Asset-Package" );
             horiz.add( readOnlyText( packageName ) );
             Image editPackage = new ImageButton("images/edit.gif");
             editPackage.addClickListener( new ClickListener() {
@@ -171,7 +172,7 @@
             }
             
         });
-        pop.setPopupPosition( source.getAbsoluteLeft(), source.getAbsoluteTop() );
+        pop.setPopupPosition( source.getParent().getParent().getAbsoluteLeft(), source.getParent().getParent().getAbsoluteTop() );
         pop.show();
     }
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java	2007-03-27 00:18:34 UTC (rev 10546)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java	2007-03-27 04:09:22 UTC (rev 10547)
@@ -11,6 +11,7 @@
 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.Widget;
 import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
 
 /**
@@ -27,6 +28,14 @@
     private final FlexTable layout;
     private boolean readOnly;
 
+    private MetaDataWidget metaWidget;
+
+    private ActionToolbar toolbar;
+
+    private Widget editor;
+
+    private RuleDocumentWidget doco;
+
     public RuleViewer(RuleAsset asset) {
         this(asset, false);
     }
@@ -57,7 +66,7 @@
     private void doWidgets() {
         this.layout.clear();
         
-        final MetaDataWidget metaWidget = new MetaDataWidget( this.asset.metaData,
+        metaWidget = new MetaDataWidget( this.asset.metaData,
                                                               readOnly, this.asset.uuid, new Command() {
 
                                                                 public void execute() {
@@ -67,8 +76,8 @@
         });
 
 
-        metaWidget.setWidth( "100%" );
-        //metaWidget.setHeight( "100%" );
+        //metaWidget.setWidth( "100%" );
+
         //now the main layout table
         FlexCellFormatter formatter = layout.getFlexCellFormatter();
         layout.setWidget( 0,
@@ -83,7 +92,7 @@
                             "30%" );
 
         //and now the action widgets (checkin/close etc).
-        ActionToolbar toolbar = new ActionToolbar( asset,
+        toolbar = new ActionToolbar( asset,
                                                    new Command() {
                                                        public void execute() {
                                                            doCheckin();
@@ -91,7 +100,7 @@
                                                    },
                                                    new Command() {
                                                        public void execute() {
-                                                           toggleMetaDataWidget();
+                                                           zoomIntoAsset();
                                                        }
                                                    },
                                                    readOnly);
@@ -112,11 +121,12 @@
         //REMEMBER: subsequent rows have only one column, doh that is confusing ! 
         //GAAAAAAAAAAAAAAAAAAAAAAAAAAH
 
-        layout.setWidget( 1, 0, EditorLauncher.getEditorViewer(asset, this));
+        editor = EditorLauncher.getEditorViewer(asset, this);
+        layout.setWidget( 1, 0, editor);
         
 
         //the document widget
-        final RuleDocumentWidget doco = new RuleDocumentWidget(asset.metaData);
+        doco = new RuleDocumentWidget(asset.metaData);
         layout.setWidget( 2,
                           0,
                           doco );
@@ -174,10 +184,12 @@
      * Calling this will toggle the visibility of the meta-data widget (effectively zooming
      * in the rule asset).
      */
-    public void toggleMetaDataWidget() {
-       boolean vis = layout.getFlexCellFormatter().isVisible( 1, 0 );
-       this.layout.getFlexCellFormatter().setVisible( 1, 0, !vis );
-       this.layout.getFlexCellFormatter().setVisible( 0, 1, !vis ); 
+    public void zoomIntoAsset() {
+        
+
+       boolean vis = !layout.getFlexCellFormatter().isVisible( 2, 0 );
+       this.layout.getFlexCellFormatter().setVisible( 0, 1, vis );
+       this.layout.getFlexCellFormatter().setVisible( 2, 0, vis ); 
     }