[jboss-svn-commits] JBL Code SVN: r10808 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/public and 4 other directories.

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

Author: michael.neale at jboss.com
Date: 2007-04-07 08:47:52 -0400 (Sat, 07 Apr 2007)
New Revision: 10808

Added:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/error_dialog.png
Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/ErrorPopup.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/util/BRMSSuggestionCompletionLoader.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/jboss/seam/remoting/gwt/GWTRemoteServiceServlet.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/rules/BRMSSuggestionCompletionLoaderTest.java
Log:
fixed a bug with creating models

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/ErrorPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/ErrorPopup.java	2007-04-07 12:06:36 UTC (rev 10807)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/ErrorPopup.java	2007-04-07 12:47:52 UTC (rev 10808)
@@ -1,8 +1,11 @@
 package org.drools.brms.client.common;
 
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.HorizontalPanel;
+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.PopupPanel;
@@ -13,16 +16,18 @@
  * Generic error dialog popup.
  * This is a lazy singleton, only really need one to be shown at time. 
  */
-public class ErrorPopup extends PopupPanel {
+public class ErrorPopup extends DialogBox {
     
     public static ErrorPopup instance = null;
     
     Label errorMessage = new Label();
     Panel panel = new HorizontalPanel();
-    Button ok = new Button("OK");
+    Image ok = new ImageButton("images/close.gif");
     
     public ErrorPopup() {        
         super(true);
+        
+        panel.add( new Image("images/error_dialog.png") );
         panel.add( errorMessage );
         panel.add( ok );
         final PopupPanel self = this;
@@ -31,8 +36,9 @@
                 self.hide();
             }            
         });
-        this.add( panel );
-        this.setPopupPosition( 0, 0 );
+        this.setWidget( panel );
+        this.setPopupPosition( 40, 40 );
+        setHeight( "150px" );
         setStyleName( "rule-error-Popup" );        
     }
     

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-04-07 12:06:36 UTC (rev 10807)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css	2007-04-07 12:47:52 UTC (rev 10808)
@@ -320,9 +320,11 @@
 }
 
 .rule-error-Popup {
-  background-color: red;
-  border: 1px solid #aaaa99;
+  background-color: white;
+  border: 2px solid black;
   padding: 4px;
+  font-style: bold !important;
+  font-color: black !important;
 }
 
 .loading-Popup {

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


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

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/BRMSSuggestionCompletionLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/BRMSSuggestionCompletionLoader.java	2007-04-07 12:06:36 UTC (rev 10807)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/BRMSSuggestionCompletionLoader.java	2007-04-07 12:47:52 UTC (rev 10808)
@@ -50,10 +50,12 @@
         AssetItemIterator ait = pkg.listAssetsByFormat( new String[]{AssetFormats.MODEL} );
         while ( ait.hasNext() ) {
             AssetItem item = (AssetItem) ait.next();
-            try {
-                result.add( new JarInputStream( item.getBinaryContentAttachment(), false ) );
-            } catch ( IOException e ) {
-                this.errors.add( e.getMessage() );
+            if (item.getBinaryContentAttachment() != null) {
+                try {
+                    result.add( new JarInputStream( item.getBinaryContentAttachment(), false ) );
+                } catch ( IOException e ) {
+                    this.errors.add( e.getMessage() );
+                }
             }
         }
         return result;

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/jboss/seam/remoting/gwt/GWTRemoteServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/jboss/seam/remoting/gwt/GWTRemoteServiceServlet.java	2007-04-07 12:06:36 UTC (rev 10807)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/jboss/seam/remoting/gwt/GWTRemoteServiceServlet.java	2007-04-07 12:47:52 UTC (rev 10808)
@@ -66,7 +66,7 @@
   private static final String CONTENT_ENCODING = "Content-Encoding";
   private static final String CONTENT_ENCODING_GZIP = "gzip";
   private static final String CONTENT_TYPE_TEXT_PLAIN_UTF8 = "text/plain; charset=utf-8";
-  private static final String GENERIC_FAILURE_MSG = "The call failed on the server; see server log for details";
+  private static final String GENERIC_FAILURE_MSG = "An unexpected error happened on the server; See server log for details.";
   private static final HashMap TYPE_NAMES;
 
   /**

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/rules/BRMSSuggestionCompletionLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/rules/BRMSSuggestionCompletionLoaderTest.java	2007-04-07 12:06:36 UTC (rev 10807)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/rules/BRMSSuggestionCompletionLoaderTest.java	2007-04-07 12:47:52 UTC (rev 10808)
@@ -120,4 +120,23 @@
         
     }
     
+    /**
+     * This shows we need to load up the model without anything attached yet.
+     */
+    public void testModelWithNoAttachment() throws Exception {
+        RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
+        PackageItem item = repo.createPackage( "testmodelWithNoAttachment", "to test model loading" );
+        
+        item.addAsset( "testModel", "", null, AssetFormats.MODEL );
+        repo.save();
+        
+        BRMSSuggestionCompletionLoader loader = new BRMSSuggestionCompletionLoader();
+
+        
+        assertNotNull(loader.getSuggestionEngine( item ));
+        assertFalse(loader.hasErrors());
+        
+        
+    }
+    
 }