Changeset 1179

Timestamp:

05/27/08 07:41:53 (3 months ago)

Author:

phoenix

Message:

Simplified ExceptionAdapter?, added some more util methods. (now commited in the right place)

Files:

• trunk/descent.core/src-util/melnorme/miscutil/ArrayUtil.java (modified) (3 diffs)
• trunk/descent.core/src-util/melnorme/miscutil/Assert.java (modified) (3 diffs)
• trunk/descent.core/src-util/melnorme/miscutil/ExceptionAdapter.java (modified) (3 diffs)
• trunk/descent.core/src-util/melnorme/miscutil/IteratorUtil.java (modified) (1 diff)
• trunk/descent.core/src-util/melnorme/miscutil/StringUtil.java (modified) (1 diff)
• trunk/descent.core/src-util/melnorme/miscutil/log/AbstractPrinter.java (deleted)
• trunk/descent.core/src-util/melnorme/miscutil/log/IPrinter.java (deleted)
• trunk/descent.core/src-util/melnorme/miscutil/log/StreamPrinter.java (deleted)
• trunk/descent.core/src-util/melnorme/miscutil/log/WriterPrinter.java (deleted)
• trunk/descent.core/src-util/melnorme/miscutil/tree/TreeDepthRecon.java (modified) (2 diffs)
• trunk/descent.core/src-util/readme.txt (added)

trunk/descent.core/src-util/melnorme/miscutil/ArrayUtil.java

@@ -1 +1 @@
-package melnorme.miscutil;
-
+import static melnorme.miscutil.Assert.assertTrue;
+
-import java.lang.reflect.Array;
+import java.util.List;
-
-public class ArrayUtil {
@@ -75 +78 @@
-        return false;
-    }
+    
+    /** Return the index of the first occurrence of elem in array, or -1 if no occurrences. */
+    public static <T> int indexOf(T[] array, T elem) {
+        for (int i = 0; i < array.length; i++) {
+            if(array[i].equals(elem))
+                return i;
+        }
+        return -1;
+    }
+    
+    /** Return the index of the first occurrence of elem in array, or -1 if no occurrences. */
+    public static int indexOf(byte[] array, byte elem) {
+        for (int i = 0; i < array.length; i++) {
+            if(array[i] == elem)
+                return i;
+        }
+        return -1;
+    }
+
-    
-    /**
@@ -152 +174 @@
-        return copy;
-    }
+    
+    /** Copies src array range [0 .. src.length] to dest array starting at destIx. */
+    public static void copyToRange(byte[] src, byte[] dest, int destIx) {
+        assertTrue(src.length < dest.length - destIx);
+        System.arraycopy(src, 0, dest, destIx, src.length);
+    }
+
+    /** Create an array from the given list, with the given run-time 
+     * component type.
+     * If the list is null, a zero-length array is created. */
+    @SuppressWarnings("unchecked")
+    public static <T> T[] createFrom(List<T> list, Class<T> cpType) {
+        if(list == null)
+            return (T[])Array.newInstance(cpType, 0);
+    
+        return list.toArray((T[])Array.newInstance(cpType, list.size()));
+    }
+
+    /** Creates an array with the same size as the given list.
+     * If the list is null, a zero-length array is created. */
+    @SuppressWarnings("unchecked")
+    public static <T> T[] newSameSize(List<?> list, Class<T> cpType) {
+        if(list == null)
+            return (T[])Array.newInstance(cpType, 0);
+        
+        return (T[])Array.newInstance(cpType, list.size());
+    }
+
+    /** Finds the index in the given array of the element that
+     * equal given elem. */
+    public static <T> int getIndexOfEquals(T[] arr, T elem) {
+        for (int i = 0; i < arr.length; i++) {
+            if(arr[i].equals(elem));
+                return i;
+        }
+        return -1;
+    }
-
-

trunk/descent.core/src-util/melnorme/miscutil/Assert.java

@@ -82 +82 @@
-    
-    /** Causes an inconditional assertion failure, with message msg.
+     * Never returns, even though return type is not void.
-     */
-void
+AssertionFailedException
-        throw new AssertionFailedException("ASSERT FAIL:" + msg);
-    }
@@ -89 +90 @@
-    /** Like {@link #fail(String)} with empty message. 
-     */
-void
+AssertionFailedException
-        throw new AssertionFailedException("ASSERT FAIL");
-    }
@@ -139 +140 @@
-    /** Causes an inconditional assertion failure, with message msg.
-     */
-void
-
+AssertionFailedException
+return 
-    }
-    
-    /** Like {@link #fail(String)} with empty message. 
-     */
-void
-
+AssertionFailedException
+return 
-    }
-    

trunk/descent.core/src-util/melnorme/miscutil/ExceptionAdapter.java

@@ -1 +1 @@
-package melnorme.miscutil;
+
+import java.io.IOException;
-
-
@@ -36 +38 @@
-*/
-    
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
-    
-
-
+
+
+
-    }
-
+    @Override
-    public void printStackTrace(java.io.PrintWriter pw) {
-new melnorme.miscutil.log.WriterPrinter(pw)
+pw
-    }
-
@@ -62 +71 @@
-    }
-
+    @Override
-    public String toString() {
-        //String name = getClass().getName();

trunk/descent.core/src-util/melnorme/miscutil/IteratorUtil.java

@@ -6 +6 @@
-public class IteratorUtil { 
-
-
+<?>
-    
-    @SuppressWarnings("unchecked")
-    public static <T> Iterator<T> getEMPTY_ITERATOR() {
-
+(Iterator<T>) 
-    }
-

trunk/descent.core/src-util/melnorme/miscutil/StringUtil.java

@@ -82 +82 @@
-            return new String[0];
-        String[] strs = new String[coll.size()];
-
+<?>
-        for (int i = 0; i < strs.length; i++) {
-            strs[i] = iter.next().toString();

trunk/descent.core/src-util/melnorme/miscutil/tree/TreeDepthRecon.java

@@ -39 +39 @@
-    
-    
+    @Override
-    public boolean enterNode(IElement element) {
-        depth++;
@@ -56 +57 @@
-    }
-    
+    @Override
-    public void leaveNode(IElement element) {
-        depth--;