[jboss-svn-commits] JBL Code SVN: r6177 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client main/java/org/drools/brms/client/rulenav main/java/org/drools/brms/server test/java/org/drools/brms/server

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

Author: michael.neale at jboss.com
Date: 2006-09-12 12:37:13 -0400 (Tue, 12 Sep 2006)
New Revision: 6177

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ErrorPopup.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulenav/RulesNavigatorTree.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/JBRMSServiceServletTest.java
Log:
refactoring goodness

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ErrorPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ErrorPopup.java	2006-09-12 16:31:53 UTC (rev 6176)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ErrorPopup.java	2006-09-12 16:37:13 UTC (rev 6177)
@@ -9,7 +9,10 @@
 import com.google.gwt.user.client.ui.Widget;
 
 
-/** Generic error dialog popup */
+/** 
+ * Generic error dialog popup.
+ * This is a lazy singleton, only really need one to be shown at time. 
+ */
 public class ErrorPopup extends PopupPanel {
     
     public static ErrorPopup instance = null;

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulenav/RulesNavigatorTree.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulenav/RulesNavigatorTree.java	2006-09-12 16:31:53 UTC (rev 6176)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulenav/RulesNavigatorTree.java	2006-09-12 16:37:13 UTC (rev 6177)
@@ -48,15 +48,11 @@
 
     public RulesNavigatorTree(CategorySelectHandler handler) {
         this.categorySelectHandler = handler;
-        service.loadChildCategories( "",
+        service.loadChildCategories( "/",
                                      new AsyncCallback() {
 
                                          public void onFailure(Throwable caught) {
-                                             ErrorPopup popup = ErrorPopup.getInstance();
-                                             popup.setMessage( "Unable to load categories" );
-                                             popup.setPopupPosition( 0, 0 );
-                                             popup.show();
-                                             
+                                             ErrorPopup.showMessage( "Unable to load categories" );                                             
                                          }
 
                                          public void onSuccess(Object result) {

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-09-12 16:31:53 UTC (rev 6176)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2006-09-12 16:37:13 UTC (rev 6177)
@@ -22,19 +22,14 @@
 
     private static final long serialVersionUID = 3150768417428383474L;
 
-    public String[] loadChildCategories(String categoryPath) {
+    public String[] loadChildCategories(String categoryPath) {        
         RulesRepository repo = this.getRepositoryFrom( getSession() );
         CategoryItem item = repo.getOrCreateCategory( categoryPath );
         List children = item.getChildTags();
-
         String[] list = new String[children.size()];
-
         for ( int i = 0; i < list.length; i++ ) {
             list[i] = ((CategoryItem) children.get( i )).getName();
         }
-
-        log( "loadChildCategories",
-             "loading cat path: " + categoryPath );
         return list;
     }
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/JBRMSServiceServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/JBRMSServiceServletTest.java	2006-09-12 16:31:53 UTC (rev 6176)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/JBRMSServiceServletTest.java	2006-09-12 16:37:13 UTC (rev 6177)
@@ -8,11 +8,11 @@
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionContext;
 
-import org.drools.repository.RulesRepository;
-
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.drools.repository.RulesRepository;
+
 public class JBRMSServiceServletTest extends TestCase {
 
     public void testInit() throws Exception {