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

[<pat...@us...>]

Revision: 893
          http://cishell.svn.sourceforge.net/cishell/?rev=893&view=rev
Author:   pataphil
Date:     2009-07-21 13:07:46 +0000 (Tue, 21 Jul 2009)

Log Message:
-----------
Fixed 1.4 compatibility issues?

Modified Paths:
--------------
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.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/ArrayListUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java	2009-07-20 22:31:21 UTC (rev 892)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java	2009-07-21 13:07:46 UTC (rev 893)
@@ -27,7 +27,8 @@
 			}
 		}
 		
-		for (String keyToAdd : keysToAdd) {
+		for (int ii = 0; ii < keysToAdd.length; ii++) {
+			String keyToAdd = keysToAdd[ii];
 			if (!union.contains(keyToAdd)) {
 				union.add(keyToAdd);
 			}

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java	2009-07-20 22:31:21 UTC (rev 892)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java	2009-07-21 13:07:46 UTC (rev 893)
@@ -196,8 +196,9 @@
 	
 	public static Date parseDate(String dateString)
 			throws ParseException {
-		for (DateFormat format : ACCEPTED_DATE_FORMATS) {
+		for (int ii = 0; ii < ACCEPTED_DATE_FORMATS.length; ii++) {
 			try {
+				DateFormat format = ACCEPTED_DATE_FORMATS[ii];
 				format.setLenient(false);
 				Date date = format.parse(dateString);
 				

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.java	2009-07-20 22:31:21 UTC (rev 892)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.java	2009-07-21 13:07:46 UTC (rev 893)
@@ -5,15 +5,14 @@
 import java.util.Set;
 
 public class MapUtilities {
-	public static String[] getValidKeysOfTypesInMap(Map map,
-													String[] types,
-													String[] keysToSkip,
-													String[] keysToAdd)
+	public static String[] getValidKeysOfTypesInMap(
+			Map map, String[] types, String[] keysToSkip, String[] keysToAdd)
 			throws ColumnNotFoundException {
 		ArrayList workingKeys = new ArrayList();
 		Set entrySet = map.entrySet();
 		
-		for (String type : types) {
+		for (int ii = 0; ii < types.length; ii++) {
+			String type = types[ii];
 			ArrayList keysForType =
 				SetUtilities.getKeysOfMapEntrySetWithValue(entrySet, type);
 			workingKeys = ArrayListUtilities.unionArrayLists(

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/NumberUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/NumberUtilities.java	2009-07-20 22:31:21 UTC (rev 892)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/NumberUtilities.java	2009-07-21 13:07:46 UTC (rev 893)
@@ -30,7 +30,7 @@
 				throw new NumberFormatException(EMPTY_CELL_MESSAGE);
 			}
 			else {
-				return objectAsShortArray[0].doubleValue();
+				return new Double(objectAsShortArray[0].doubleValue());
 			}
 		}
 		else if (object instanceof int[]) {
@@ -50,7 +50,7 @@
 				throw new NumberFormatException(EMPTY_CELL_MESSAGE);
 			}
 			else {
-				return objectAsIntegerArray[0].doubleValue();
+				return new Double(objectAsIntegerArray[0].doubleValue());
 			}
 		}
 		else if (object instanceof long[]) {
@@ -70,7 +70,7 @@
 				throw new NumberFormatException(EMPTY_CELL_MESSAGE);
 			}
 			else {
-				return objectAsLongArray[0].doubleValue();
+				return new Double(objectAsLongArray[0].doubleValue());
 			}
 		}
 		else if (object instanceof float[]) {
@@ -90,7 +90,7 @@
 				throw new NumberFormatException(EMPTY_CELL_MESSAGE);
 			}
 			else {
-				return objectAsFloatArray[0].doubleValue();
+				return new Double(objectAsFloatArray[0].doubleValue());
 			}
 		}
 		else if (object instanceof double[]) {

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/TableUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/TableUtilities.java	2009-07-20 22:31:21 UTC (rev 892)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/TableUtilities.java	2009-07-21 13:07:46 UTC (rev 893)
@@ -125,7 +125,9 @@
 		ArrayList workingColumnNames = new ArrayList();
 		
 		for (int ii = 0; ii < schema.getColumnCount(); ii++) {
-			for (Class objectClass : objectClasses) {
+			for (int jj = 0; jj < objectClasses.length; jj++) {
+				Class objectClass = objectClasses[jj];
+			
 				if (objectClass.isAssignableFrom(schema.getColumnType(ii))) {
 					workingColumnNames.add(schema.getColumnName(ii));
 					


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