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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Nov 14 09:33:28 EST 2006


Author: michael.neale at jboss.com
Date: 2006-11-14 09:33:17 -0500 (Tue, 14 Nov 2006)
New Revision: 7586

Added:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/checkin.gif
Modified:
   labs/jbossrules/trunk/drools-jbrms/.classpath
   labs/jbossrules/trunk/drools-jbrms/JBRMS.launch
   labs/jbossrules/trunk/drools-jbrms/pom.xml
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/CheckinPopup.java
   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/public/JBRMS.css
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
Log:
rearranged widgets, added checkin stuff, still WIP

Modified: labs/jbossrules/trunk/drools-jbrms/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/.classpath	2006-11-14 14:30:14 UTC (rev 7585)
+++ labs/jbossrules/trunk/drools-jbrms/.classpath	2006-11-14 14:33:17 UTC (rev 7586)
@@ -1,24 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry output="target/test-classes" kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/geronimo-spec/geronimo-spec-jta/1.0-M1/geronimo-spec-jta-1.0-M1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.0/slf4j-log4j12-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.1.1.0/derby-10.1.1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/google/gwt-servlet/1.1.10/gwt-servlet-1.1.10.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.0.1/jackrabbit-core-1.0.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jsr170/jcr/1.0/jcr-1.0.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/drools-repository"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/drools/drools-repository/3.2/drools-repository-3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/geronimo-spec/geronimo-spec-jta/1.0-M1/geronimo-spec-jta-1.0-M1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.0/slf4j-log4j12-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.1.1.0/derby-10.1.1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/google/gwt-servlet/1.2.11/gwt-servlet-1.2.11.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.0.1/jackrabbit-core-1.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jsr170/jcr/1.0/jcr-1.0.jar"/>
+</classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-jbrms/JBRMS.launch
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/JBRMS.launch	2006-11-14 14:30:14 UTC (rev 7585)
+++ labs/jbossrules/trunk/drools-jbrms/JBRMS.launch	2006-11-14 14:33:17 UTC (rev 7586)
@@ -7,22 +7,22 @@
 </listAttribute>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;drools-brms&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;GWT_HOME/gwt-dev-linux.jar&quot; path=&quot;3&quot; type=&quot;3&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/src/main/java&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/classes&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;GWT_HOME/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;3&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-collections-3.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/concurrent-1.3.4.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/derby-10.1.1.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/geronimo-spec-jta-1.0-M1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-core-1.0.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jcr-1.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/log4j-1.2.8.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/lucene-1.4.3.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/slf4j-log4j12-1.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xercesImpl-2.6.2.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xmlParserAPIs-2.0.2.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-collections-3.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/concurrent-1.3.4.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/derby-10.1.1.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/geronimo-spec-jta-1.0-M1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-core-1.0.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jcr-1.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/log4j-1.2.8.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/lucene-1.4.3.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/slf4j-log4j12-1.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xercesImpl-2.6.2.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xmlParserAPIs-2.0.2.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;drools-repository&quot; type=&quot;1&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;GWT_DEV&quot; path=&quot;3&quot; type=&quot;3&quot;/&gt;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out www org.drools.brms.JBRMS/JBRMS.html"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="drools-jbrms"/>

Modified: labs/jbossrules/trunk/drools-jbrms/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/pom.xml	2006-11-14 14:30:14 UTC (rev 7585)
+++ labs/jbossrules/trunk/drools-jbrms/pom.xml	2006-11-14 14:33:17 UTC (rev 7586)
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>google</groupId>
       <artifactId>gwt-servlet</artifactId>
-      <version>1.1.10</version>
+      <version>1.2.11</version>
     </dependency>
 
   </dependencies>

Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java	2006-11-14 14:30:14 UTC (rev 7585)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java	2006-11-14 14:33:17 UTC (rev 7586)
@@ -0,0 +1,60 @@
+package org.drools.brms.client.ruleeditor;
+
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Hyperlink;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
+
+/**
+ * This contains the widgets used to action a rule asset
+ * (ie checkin, change state, close window)
+ * @author Michael Neale
+ */
+public class ActionToolbar extends Composite {
+
+    private HorizontalPanel panel = new HorizontalPanel();
+    private ClickListener changeState;
+    private ClickListener close;
+    private ClickListener checkin;
+    
+    /**
+     * TODO: 
+     *  * Maybe move current state to here from meta data?
+     *  * add check for dirty before closing?
+     *  * need to somehow refresh on checkin? (or just close?)
+     * 
+     */
+    public ActionToolbar(ClickListener checkin, ClickListener close, ClickListener changeState) {
+        this.checkin = checkin;
+        this.close = close;
+        this.changeState = changeState;
+
+        ListBox actions = new ListBox();
+        actions.addItem( "-- actions --" );
+        actions.addItem( "Check in changes", "checkin" );
+        actions.addItem( "Change status", "status" );
+        
+        panel.add( actions );
+        
+        panel.add( new Label("Current status: ") );
+        panel.add( new TextBox() );
+
+        panel.add( new HTML("&nbsp;") );
+        
+        panel.add( new Label("Close: ") );
+        panel.add( new Image("images/remove_item.gif") );
+        
+        
+        
+
+        initWidget( panel );
+    }
+    
+    
+}


Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/CheckinPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/CheckinPopup.java	2006-11-14 14:30:14 UTC (rev 7585)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/CheckinPopup.java	2006-11-14 14:33:17 UTC (rev 7586)
@@ -3,6 +3,7 @@
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.PopupPanel;
@@ -23,27 +24,34 @@
     final private TextArea comment = new TextArea();
     final private ClickListener okClick;    
     
-    public CheckinPopup(ClickListener okClick) {
+    public CheckinPopup(ClickListener click) {
         super(true);        
-        this.okClick = okClick;
+        this.okClick = click;
         
+        this.setStyleName( "ks-popups-Popup" );
+        
         FlexCellFormatter formatter = layout.getFlexCellFormatter();
         
         layout.setWidget( 0, 0, new Image() );
         layout.setWidget( 1, 0, new Label("Comment:") );
+        formatter.setHorizontalAlignment( 1, 0, HasHorizontalAlignment.ALIGN_RIGHT );
+        
         layout.setWidget( 1, 1, comment );
+        formatter.setHorizontalAlignment( 1, 1, HasHorizontalAlignment.ALIGN_LEFT );
+        comment.setWidth( "100%" );
+        comment.setHeight( "100%" );
+        comment.setStyleName( "rule-viewer-Documentation" );        
+        
         Button ok = new Button();
         ok.addClickListener( new ClickListener() {
-
             public void onClick(Widget w) {
-
-                
-            }
-            
+                okClick.onClick( w );
+            }            
         });
+        
         layout.setWidget( 2, 0,  ok);
+        formatter.setHorizontalAlignment( 2, 0, HasHorizontalAlignment.ALIGN_LEFT );
         
-        
         add( layout );
     }
     

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	2006-11-14 14:30:14 UTC (rev 7585)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java	2006-11-14 14:33:17 UTC (rev 7586)
@@ -1,5 +1,8 @@
 package org.drools.brms.client.ruleeditor;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.drools.brms.client.breditor.BREditor;
 import org.drools.brms.client.common.ErrorPopup;
 import org.drools.brms.client.rpc.MetaData;
@@ -8,9 +11,17 @@
 import org.drools.brms.client.rpc.TextData;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
 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.Label;
+import com.google.gwt.user.client.ui.Panel;
+import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
 
 /**
@@ -24,41 +35,37 @@
     private final String name;
     private final String format;
     private MetaData metaData;
-    
-    
-    private FlexTable layout = new FlexTable();
+    private SimplePanel   panel = new SimplePanel();
     protected RuleAsset asset;
     
     /**
      * @param UUID The resource to open.
-     * @param format The type of resource (will determine what editor is used).
+     * @param format The type of resource (may determine what editor is used).
      * @param name The name to be displayed.
      */
     public RuleViewer(String UUID, String format,  String name) {
         this.resourceUUID = UUID;
         this.name = name;
         this.format = format;
-        
+                
         //just pad it out a bit, so it gets the layout right - it will be loaded later.
+        FlexTable layout = new FlexTable();
         layout.setWidget( 0, 0, new Label("Loading ...") );
-        layout.setWidget( 0, 1, new Label("") );
-        layout.setWidget( 1, 0, new Label("") );
-        layout.setWidget( 1, 1, new Label("") );
-        layout.setWidget( 2, 0, new Label("") );
-        layout.setWidget( 2, 1, new Label("") );
-        
+      
+        //may use format here to determine which service to use in future
         RepositoryServiceFactory.getService().loadRuleAsset( this.resourceUUID, new AsyncCallback() {
             public void onFailure(Throwable e) {
                 ErrorPopup.showMessage( e.getMessage() );
             }
             public void onSuccess(Object o) {
                 asset = (RuleAsset) o;                
-                loadAssetData();
+                doWidgets();
             }
             
         });
         
-		initWidget(layout);
+        panel.add( layout );
+		initWidget(panel);
 	}
     
     
@@ -67,32 +74,51 @@
      * when we get the data back from the server,
      * also determines what widgets to load up).
      */
-    private void loadAssetData() {
+    private void doWidgets() {
         metaData = asset.metaData;
         
-        
         final MetaDataWidget metaWidget = new MetaDataWidget(this.name, false);
         
-        //now the layout table
+        FlexTable layout = new FlexTable();
+        
+        //now the main layout table
         FlexCellFormatter formatter =  layout.getFlexCellFormatter();
         layout.setWidget( 0, 0, metaWidget );
-        formatter.setRowSpan( 0, 0, 3 );
+        formatter.setRowSpan( 0, 0, 4 );
         formatter.setWidth( 0, 0, "40%" );        
+
         
-        layout.setWidget( 0, 1, new Label("") );
+        //and now the action widgets (checkin/close etc).
+        layout.setWidget( 1, 1, new ActionToolbar(null, null, null) );
+        formatter.setAlignment( 0, 1, HasHorizontalAlignment.ALIGN_RIGHT, HasVerticalAlignment.ALIGN_MIDDLE );
+//        formatter.setWidth( 0, 1, "60%");
+
+//        formatter.setStyleName( 0, 1, "outline-Debug" );
+//        formatter.setStyleName( 1, 1, "outline-Debug" );
+//        formatter.setStyleName( 2, 1, "outline-Debug" );
+//        formatter.setStyleName( 0, 0, "outline-Debug" );
         
+        //depending on the format, load the appropriate editor
         if (metaData.format.equals( "DSL" )) {
             BREditor ed = new BREditor();
-            layout.setWidget( 1, 1, ed );
+            layout.setWidget( 2, 1, ed );
         } else {
             DefaultRuleContentWidget ed = new DefaultRuleContentWidget((TextData) asset.content);
-            layout.setWidget( 1, 1, ed );
+            layout.setWidget( 2, 1, ed );
         }
-
+        
+        
+        
+        //the document widget
         final RuleDocumentWidget doco = new RuleDocumentWidget();
-        layout.setWidget( 2, 1, doco );
+        layout.setWidget( 3, 1, doco );
+        
         metaWidget.loadData( metaData );
         doco.loadData( metaData );
+        
+        
+        panel.clear();
+        panel.setWidget( layout );
     }
     
 

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	2006-11-14 14:30:14 UTC (rev 7585)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css	2006-11-14 14:33:17 UTC (rev 7586)
@@ -250,6 +250,10 @@
   margin: 8px;
 }
 
+.outline-Debug {
+  border: 2px solid #87B3FF;
+}
+
 .ks-popups-Popup {
   background-color: #FDFCDC;
   border: 1px solid #87B3FF;

Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/checkin.gif
===================================================================
(Binary files differ)


Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/checkin.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2006-11-14 14:30:14 UTC (rev 7585)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2006-11-14 14:33:17 UTC (rev 7586)
@@ -222,10 +222,8 @@
             asset.content = text;
 
         }
-        
         asset.metaData.packageName = item.getPackageName();
         
-        
         return asset;
     }
     




More information about the jboss-svn-commits mailing list