Changeset 7614

Timestamp:

04/19/09 13:22:47 (16 months ago)

Author:

dragisak

Message:

Clean up the code clean-up. Fix some stuff done in r7600

Location:

head/ambra/webapp/src/main/java/org/topazproject/ambra

Files:

• journal/JournalFilterService.java (modified) (2 diffs)
• user/service/UserService.java (modified) (2 diffs)
• util/MimeTypeToFileExtMapper.java (modified) (1 diff)
• web/DebuggingFilter.java (modified) (2 diffs)
• xacml/cond/CachedBagFunction.java (modified) (1 diff)

head/ambra/webapp/src/main/java/org/topazproject/ambra/journal/JournalFilterService.java

@@ -73 +73 @@
   private final String                   keyPrefix;            // in cache for filters
   private final JournalKeyService        journalKeyService;
-  private static final String TYPE_QRY = "select id, (select o.<rdf:type> from Object x) " +
-      "from Object o, Aggregation a "+
-      "where id := cast(o, Article).id and a.id = :a and o = a.simpleCollection;";
 
   /**
@@ -315 +312 @@
      */
 
-    Results r = s.createQuery(TYPE_QRY).setParameter("a", a.getId()).execute();
+    Results r = s.createQuery("select id, (select o.<rdf:type> from Object x) " +
+        "from Object o, Aggregation a " +
+        "where id := cast(o, Article).id and a.id = :a and o = a.simpleCollection;")
+        .setParameter("a", a.getId()).execute();
 
     // build a map of uri's keyed by class

head/ambra/webapp/src/main/java/org/topazproject/ambra/user/service/UserService.java

@@ -23 +23 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.Arrays;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -578 +579 @@
         if (log.isDebugEnabled()) {
           log.debug("TopazId:" + topazId);
-          StringBuilder gr = new StringBuilder();
-          for (String publicGrant : publicGrants) {
-            if (gr.length() > 0)
-              gr.append(", ");
-            gr.append(publicGrant);
-          }
-          log.debug("Cancelling grants:" + publicGrants.toString());
-          log.debug("Adding grants:" + ArrayUtils.toString(grants));
+          log.debug("Cancelling grants: " + Arrays.toString(publicGrants));
+          log.debug("Adding grants:" + Arrays.toString(grants));
         }
         //Cancel all previous grants first

head/ambra/webapp/src/main/java/org/topazproject/ambra/util/MimeTypeToFileExtMapper.java

@@ -47 +47 @@
         new BufferedReader(new InputStreamReader(mappingLocation.getInputStream(), "UTF-8"));
 
-    final Map<String, String> mimeMap;
-    mimeMap = new HashMap<String, String>();
+    final Map<String, String> mimeMap = new HashMap<String, String>();
     String line;
     try {

head/ambra/webapp/src/main/java/org/topazproject/ambra/web/DebuggingFilter.java

@@ -33 +33 @@
 import java.io.PrintWriter;
 import java.util.Enumeration;
+import java.util.Arrays;
 
 /**
@@ -114 +115 @@
       while (params.hasMoreElements()) {
         final String paramName = (String) params.nextElement();
-        StringBuilder paramValues = new StringBuilder();
-        for (String value : request.getParameterValues(paramName)) {
-          if (paramValues.length() > 0)
-            paramValues.append(", ");
-          paramValues.append(value);
-        }
-        log(paramName + ":" + paramValues.toString());
+        log(paramName + ":" + Arrays.toString(request.getParameterValues(paramName)));
       }
     }

head/ambra/webapp/src/main/java/org/topazproject/ambra/xacml/cond/CachedBagFunction.java

@@ -281 +281 @@
 
     public String toString() {
-      StringBuilder ret = new StringBuilder("[");
-
-      if (results.length > 0)
-        ret.append(results[0]);
-
-      for (int i = 1; i < results.length; i++)
-        ret.append(", ").append(results[i]);
-
-      ret.append(']');
-      return ret.toString();
+      return Arrays.toString(results);
     }
   }