[jboss-svn-commits] JBL Code SVN: r31926 - in labs/jbossrules/branches/factsConstraints_baunax_esteban: drools-repository/src/main/java/org/drools/repository and 1 other directory.

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

Author: baunax
Date: 2010-03-03 19:58:54 -0500 (Wed, 03 Mar 2010)
New Revision: 31926

Modified:
   labs/jbossrules/branches/factsConstraints_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceFactory.java
   labs/jbossrules/branches/factsConstraints_baunax_esteban/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java
Log:
clean up

Modified: labs/jbossrules/branches/factsConstraints_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceFactory.java
===================================================================
--- labs/jbossrules/branches/factsConstraints_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceFactory.java	2010-03-04 00:58:19 UTC (rev 31925)
+++ labs/jbossrules/branches/factsConstraints_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceFactory.java	2010-03-04 00:58:54 UTC (rev 31926)
@@ -29,32 +29,29 @@
 
     public static RepositoryServiceAsync SERVICE;
 
-    public static RepositoryServiceAsync getService() {
-        if (SERVICE == null) {
-            loadService();
-        }
-        return SERVICE;
+	public static RepositoryServiceAsync getService() {
+		if (SERVICE == null) {
+			loadService();
+		}
+		return SERVICE;
 
-    }
+	}
 
-    private static void loadService() {
-            SERVICE = getRealService();
-    }
+	private static void loadService() {
+		SERVICE = getRealService();
+	}
 
+	private static RepositoryServiceAsync getRealService() {
+		// define the service you want to call
+		RepositoryServiceAsync svc = (RepositoryServiceAsync) GWT.create(RepositoryService.class);
+		ServiceDefTarget endpoint = (ServiceDefTarget) svc;
 
+		String endpointURL = GWT.getModuleBaseURL() + "guvnorService";
 
-    private static RepositoryServiceAsync getRealService() {
-        // define the service you want to call
-        RepositoryServiceAsync svc =
-            (RepositoryServiceAsync) GWT.create(RepositoryService.class);
-        ServiceDefTarget endpoint = (ServiceDefTarget) svc;
+		endpoint.setServiceEntryPoint(endpointURL);
+		return svc;
+	}
 
-        String endpointURL = GWT.getModuleBaseURL() + "guvnorService";
-
-        endpoint.setServiceEntryPoint(endpointURL);
-        return svc;
-    }
-
     /**
      * Perform the login.
      */

Modified: labs/jbossrules/branches/factsConstraints_baunax_esteban/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java
===================================================================
--- labs/jbossrules/branches/factsConstraints_baunax_esteban/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java	2010-03-04 00:58:19 UTC (rev 31925)
+++ labs/jbossrules/branches/factsConstraints_baunax_esteban/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java	2010-03-04 00:58:54 UTC (rev 31926)
@@ -18,17 +18,16 @@
  */
 public class RepositorySessionUtil {
 
-    private static ThreadLocal repo = new ThreadLocal();
+    private static ThreadLocal<RulesRepository> repo = new ThreadLocal<RulesRepository>();
 
-    private static final Logger log = Logger.getLogger( RepositorySessionUtil.class );
+//    private static final Logger log = Logger.getLogger( RepositorySessionUtil.class );
 
     public static boolean deleteDir(File dir) {
 
         if (dir.isDirectory()) {
             String[] children = dir.list();
             for (int i=0; i<children.length; i++) {
-                boolean success = deleteDir(new File(dir, children[i]));
-                if (!success) {
+                if (!deleteDir(new File(dir, children[i]))) {
                     return false;
                 }
             }
@@ -40,7 +39,7 @@
 
 
     public static RulesRepository getRepository() throws RulesRepositoryException {
-        Object repoInstance = repo.get();
+    	RulesRepository repoInstance = repo.get();
     	System.out.println("----------getRepository");
         if ( repoInstance == null ) {
         	
@@ -78,7 +77,7 @@
             }
         }
 
-        return (RulesRepository) repoInstance;
+        return repoInstance;
     }
 
 }