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

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

Author: michael.neale at jboss.com
Date: 2008-10-14 02:22:10 -0400 (Tue, 14 Oct 2008)
New Revision: 23449

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/StateItem.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/security/PermissionManager.java
Log:
fixing what find bugs picked up

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2008-10-13 23:37:04 UTC (rev 23448)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2008-10-14 06:22:10 UTC (rev 23449)
@@ -527,7 +527,7 @@
         } catch ( Exception e ) {
             log.error( "Caught Exception",
                        e );
-            return null;
+            return "";
         }
     }
 

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2008-10-13 23:37:04 UTC (rev 23448)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2008-10-14 06:22:10 UTC (rev 23449)
@@ -1251,9 +1251,10 @@
 
             String sql = "SELECT " + AssetItem.TITLE_PROPERTY_NAME + ", " + AssetItem.DESCRIPTION_PROPERTY_NAME + ", " + AssetItem.CONTENT_PROPERTY_ARCHIVE_FLAG + " FROM " + AssetItem.RULE_NODE_TYPE_NAME;
             sql += " WHERE jcr:path LIKE '/" + RULES_REPOSITORY_NAME + "/" + RULE_PACKAGE_AREA + "/%'";
-            for ( Iterator<String> iterator = params.keySet().iterator(); iterator.hasNext(); ) {
-                String fld = iterator.next();
-                String[] options = params.get( fld );
+            for ( Iterator<Map.Entry<String, String[]>> iterator = params.entrySet().iterator(); iterator.hasNext(); ) {
+            	Map.Entry<String, String[]> en = iterator.next();
+                String fld = en.getKey();
+                String[] options = en.getValue();
                 if ( options != null && options.length > 0 ) {
                     if ( options.length > 1 ) {
                         sql += " AND (";

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/StateItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/StateItem.java	2008-10-13 23:37:04 UTC (rev 23448)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/StateItem.java	2008-10-14 06:22:10 UTC (rev 23449)
@@ -18,7 +18,7 @@
     /**
      * All assets when created, or a new version saved, have a status of Draft.
      */
-    public static String DRAFT_STATE_NAME = "Draft";
+    public static final String DRAFT_STATE_NAME = "Draft";
     
     /**
      * The name of the state node type
@@ -54,8 +54,6 @@
             return false;
         } else if (in == this) {
             return true;
-        } else if (in == null) {
-            return false;
         } else {
             StateItem other = (StateItem) in;
             return this.getName().equals( other.getName() );

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/security/PermissionManager.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/security/PermissionManager.java	2008-10-13 23:37:04 UTC (rev 23448)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/security/PermissionManager.java	2008-10-14 06:22:10 UTC (rev 23449)
@@ -48,9 +48,10 @@
 	    	Node permsNode = getUserPermissionNode(userName);
 	    	permsNode.remove(); //remove this so we get a fresh set
 	    	permsNode = getUserPermissionNode(userName).addNode("jcr:content", "nt:unstructured");
-	    	for (Iterator<String> iterator = perms.keySet().iterator(); iterator.hasNext();) {
-				String perm = iterator.next();
-				List<String> targets = perms.get(perm);
+	    	for (Iterator<Map.Entry<String, List<String>>> iterator = perms.entrySet().iterator(); iterator.hasNext();) {
+	    		Map.Entry<String, List<String>> en = iterator.next();
+				String perm = en.getKey();
+				List<String> targets = en.getValue();
 				if (targets == null) targets = new ArrayList<String>();
 				permsNode.setProperty(perm, targets.toArray(new String[targets.size()]));
 			}