[jbpm-commits] JBoss JBPM SVN: r6097 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm: util and 1 other directory.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-01-19 19:35:58 -0500 (Tue, 19 Jan 2010)
New Revision: 6097

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/file/def/FileDefinition.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/CustomLoaderObjectInputStream.java
Log:
improve a couple naughty uses of Arrays.asList

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/file/def/FileDefinition.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/file/def/FileDefinition.java	2010-01-19 17:14:51 UTC (rev 6096)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/file/def/FileDefinition.java	2010-01-20 00:35:58 UTC (rev 6097)
@@ -28,11 +28,9 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -256,26 +254,24 @@
   }
 
   String findNewDirName() {
-    String newDirName = "files-1";
+    String dirName = "files-1";
 
     File parentFile = new File(getRootDir());
-    if (parentFile.exists()) {
+    if (parentFile.isDirectory()) {
       // get the current contents of the directory
-      String[] children = parentFile.list();
-      List fileNames = new ArrayList();
-      if (children != null) {
-        fileNames = new ArrayList(Arrays.asList(children));
-      }
+      String[] fileNames = parentFile.list();
+      Arrays.sort(fileNames);
 
       // find an unused name for the directory to be created
-      int seqNr = 1;
-      while (fileNames.contains(newDirName)) {
-        seqNr++;
-        newDirName = "files-" + seqNr;
+      StringBuffer nameBuilder = new StringBuffer("files-");
+      for (int seqNr = 2; Arrays.binarySearch(fileNames, dirName) >= 0; seqNr++) {
+        dirName = nameBuilder.append(seqNr).toString();
+        // remove appended number
+        nameBuilder.setLength(6);
       }
     }
 
-    return newDirName;
+    return dirName;
   }
 
   File getFilePath(String name) {

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/CustomLoaderObjectInputStream.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/CustomLoaderObjectInputStream.java	2010-01-19 17:14:51 UTC (rev 6096)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/CustomLoaderObjectInputStream.java	2010-01-20 00:35:58 UTC (rev 6097)
@@ -27,7 +27,6 @@
 import java.io.ObjectStreamClass;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
-import java.util.Arrays;
 
 /**
  * Specialized object input stream that allows classes to be fetched through a
@@ -123,7 +122,7 @@
       }
       catch (IllegalArgumentException iae) {
         throw new ClassNotFoundException("could not get proxy class for interfaces: "
-            + Arrays.asList(classes), e);
+            + ArrayUtil.toString(classes), e);
       }
     }
   }