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

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

Revision: 976
          http://cishell.svn.sourceforge.net/cishell/?rev=976&view=rev
Author:   jrbibers
Date:     2009-11-03 20:01:05 +0000 (Tue, 03 Nov 2009)

Log Message:
-----------
Added new constructor for BasicDataPlus.

This plug-in is intended to be 1.4 compatible and so should not use the new-in-1.5 String method contains.  Use in NumberUtilities was corrected to test indexOf != -1.

Modified Paths:
--------------
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/BasicDataPlus.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/NumberUtilities.java

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/BasicDataPlus.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/BasicDataPlus.java	2009-10-30 19:58:48 UTC (rev 975)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/BasicDataPlus.java	2009-11-03 20:01:05 UTC (rev 976)
@@ -32,8 +32,19 @@
 	}
 	
 	/**
+	 * The type of inner is assumed to be the toString value of its Class.
 	 * 
 	 * @param inner		The object wrapped by this Data.
+	 * @param parent	The parent of inner.
+	 */
+	public BasicDataPlus(Object inner, Data parent) {
+		this(inner);
+		setParent(parent);
+	}
+	
+	/**
+	 * 
+	 * @param inner		The object wrapped by this Data.
 	 * @param type		The _TYPE constant from {@link DataProperty}
 	 * 						that best characterizes the type of inner.
 	 * @param parent	The parent of inner.

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-30 19:58:48 UTC (rev 975)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/NumberUtilities.java	2009-11-03 20:01:05 UTC (rev 976)
@@ -119,7 +119,7 @@
 	 */
 	public static String convertToDecimalNotation(String numberAsString) {
 		// Check for a scientific notation delimiter.
-		if (numberAsString.contains("E") || numberAsString.contains("e")) {
+		if (numberAsString.indexOf("E") != -1 || numberAsString.indexOf("e") != -1) {
 			Format format =
 				new DecimalFormat(UNROUNDED_DECIMAL_PATTERN);
 			


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