[CIShell-SVN] SF.net SVN: cishell:[964] trunk/core/org.cishell.utilities/src/org/cishell/ utilities

[<jrb...@us...>]

Revision: 964
          http://cishell.svn.sourceforge.net/cishell/?rev=964&view=rev
Author:   jrbibers
Date:     2009-10-14 21:27:55 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
Added TableUtilities.copyTable for copying prefuse Tables.

Modified Paths:
--------------
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/FAQCalendar.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/ImageUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/NumberUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/TableUtilities.java

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java	2009-10-13 18:01:02 UTC (rev 963)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java	2009-10-14 21:27:55 UTC (rev 964)
@@ -16,7 +16,7 @@
 	
 	public static void swapFirstMatchToFront(Object[] array, List targets) {
 		for (Iterator targetsIt = targets.iterator(); targetsIt.hasNext();) {
-			Object target = (Object) targetsIt.next();
+			Object target = targetsIt.next();
 			int index = ArrayUtilities.indexOf(array, target);
 			
 			if ( index != -1 ) {

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/FAQCalendar.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/FAQCalendar.java	2009-10-13 18:01:02 UTC (rev 963)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/FAQCalendar.java	2009-10-14 21:27:55 UTC (rev 964)
@@ -12,7 +12,9 @@
  * @copyright 2004 Paul Hill
  */
 public class FAQCalendar extends GregorianCalendar {  
-    /**
+	private static final long serialVersionUID = 1L;
+
+	/**
      * All minutes have this many milliseconds except the last minute of the day on a day defined with
      * a leap second.
      */

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/ImageUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/ImageUtilities.java	2009-10-13 18:01:02 UTC (rev 963)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/ImageUtilities.java	2009-10-14 21:27:55 UTC (rev 964)
@@ -24,4 +24,4 @@
 		
 		return bufferedImage;
 	}
-};
\ No newline at end of file
+}
\ No newline at end of file

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/NumberUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/NumberUtilities.java	2009-10-13 18:01:02 UTC (rev 963)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/NumberUtilities.java	2009-10-14 21:27:55 UTC (rev 964)
@@ -20,7 +20,7 @@
 				throw new NumberFormatException(EMPTY_CELL_MESSAGE);
 			}
 			else {
-				return new Double((double)objectAsShortArray[0]);
+				return new Double(objectAsShortArray[0]);
 			}
 		}
 		else if (object instanceof Short[]) {
@@ -40,7 +40,7 @@
 				throw new NumberFormatException(EMPTY_CELL_MESSAGE);
 			}
 			else {
-				return new Double((double)objectAsIntArray[0]);
+				return new Double(objectAsIntArray[0]);
 			}
 		}
 		else if (object instanceof Integer[]) {
@@ -60,7 +60,7 @@
 				throw new NumberFormatException(EMPTY_CELL_MESSAGE);
 			}
 			else {
-				return new Double((double)objectAsLongArray[0]);
+				return new Double(objectAsLongArray[0]);
 			}
 		}
 		else if (object instanceof Long[]) {
@@ -80,7 +80,7 @@
 				throw new NumberFormatException(EMPTY_CELL_MESSAGE);
 			}
 			else {
-				return new Double((double)objectAsFloatArray[0]);
+				return new Double(objectAsFloatArray[0]);
 			}
 		}
 		else if (object instanceof Float[]) {

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/TableUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/TableUtilities.java	2009-10-13 18:01:02 UTC (rev 963)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/TableUtilities.java	2009-10-14 21:27:55 UTC (rev 964)
@@ -2,10 +2,12 @@
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 import prefuse.data.Schema;
 import prefuse.data.Table;
+import prefuse.data.Tuple;
 import prefuse.util.collections.IntIterator;
 
 public class TableUtilities {
@@ -231,6 +233,9 @@
 												possibleNumberClasses);
 	}
 	
+	/**
+	 * @deprecated Replace calls with schema.instantiate().
+	 */
 	public static Table createTableUsingSchema(Schema tableSchema) {
 		final int numTableColumns = tableSchema.getColumnCount();
 		Table table = new Table();
@@ -293,4 +298,16 @@
 
 		return newTable;
 	}
+
+	public static Table copyTable(Table oldTable) {
+		Schema oldSchema = oldTable.getSchema();
+		Table newTable = oldSchema.instantiate();
+		
+		for (Iterator rowIt = oldTable.tuples(); rowIt.hasNext();) {
+			Tuple row = (Tuple) rowIt.next();			
+			newTable.addTuple(row);
+		}		
+		
+		return newTable;
+	}
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.