Author: mes
Date: 2010-11-29 14:52:28 -0800 (Mon, 29 Nov 2010)
New Revision: 23047
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/data/readers/GMLTree.java
cytoscape/trunk/application/src/main/java/cytoscape/visual/LabelPosition.java
cytoscape/trunk/corelibs/ding/src/main/java/ding/view/ObjectPositionImpl.java
cytoscape/trunk/corelibs/equations/src/main/java/org/cytoscape/equations/builtins/Text.java
Log:
forcing all DecimalFormat usages when used for serialization to US locale for
consistency
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/data/readers/GMLTree.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/data/readers/GMLTree.java
2010-11-29 22:43:51 UTC (rev 23046)
+++
cytoscape/trunk/application/src/main/java/cytoscape/data/readers/GMLTree.java
2010-11-29 22:52:28 UTC (rev 23047)
@@ -55,6 +55,8 @@
import java.awt.geom.Point2D;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
import java.util.Iterator;
import java.util.LinkedList;
@@ -134,8 +136,8 @@
* the GraphView used to create the GMLTree
*/
public GMLTree(CyNetworkView networkView) {
- // DecimalFormat cf = new DecimalFormat("00");
- DecimalFormat df = new DecimalFormat("####0.0#");
+ // force the locale to US so that we consistently serialize
things
+ DecimalFormat df = new DecimalFormat("####0.0#", new
DecimalFormatSymbols(Locale.US));
GraphView myView = networkView.getView();
// networkView.getNetwork().getNodeAttributes();
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/visual/LabelPosition.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/visual/LabelPosition.java
2010-11-29 22:43:51 UTC (rev 23046)
+++
cytoscape/trunk/application/src/main/java/cytoscape/visual/LabelPosition.java
2010-11-29 22:52:28 UTC (rev 23047)
@@ -39,6 +39,8 @@
import giny.view.Label;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -460,8 +462,8 @@
* @return DOCUMENT ME!
*/
public String shortString() {
- DecimalFormat df = new DecimalFormat();
- df.setMaximumFractionDigits(2);
+ // force the locale to US so that we consistently serialize
+ DecimalFormat df = new DecimalFormat("#0.00;-#0.00", new
DecimalFormatSymbols(Locale.US));
StringBuffer sb = new StringBuffer();
sb.append(getShortName(targetAnchor));
Modified:
cytoscape/trunk/corelibs/ding/src/main/java/ding/view/ObjectPositionImpl.java
===================================================================
---
cytoscape/trunk/corelibs/ding/src/main/java/ding/view/ObjectPositionImpl.java
2010-11-29 22:43:51 UTC (rev 23046)
+++
cytoscape/trunk/corelibs/ding/src/main/java/ding/view/ObjectPositionImpl.java
2010-11-29 22:52:28 UTC (rev 23047)
@@ -8,6 +8,8 @@
import giny.view.Position;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
/**
*
@@ -210,7 +212,8 @@
* @see cytoscape.visual.ObjectPosition#shortString()
*/
public String shortString() {
- DecimalFormat df = new DecimalFormat("#0.00;-#0.00");
+ // force the locale to US so that we consistently serialize
+ DecimalFormat df = new DecimalFormat("#0.00;-#0.00", new
DecimalFormatSymbols(Locale.US));
final StringBuilder sb = new StringBuilder();
sb.append(targetAnchor.getShortName());
Modified:
cytoscape/trunk/corelibs/equations/src/main/java/org/cytoscape/equations/builtins/Text.java
===================================================================
---
cytoscape/trunk/corelibs/equations/src/main/java/org/cytoscape/equations/builtins/Text.java
2010-11-29 22:43:51 UTC (rev 23046)
+++
cytoscape/trunk/corelibs/equations/src/main/java/org/cytoscape/equations/builtins/Text.java
2010-11-29 22:52:28 UTC (rev 23047)
@@ -31,6 +31,8 @@
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
import org.cytoscape.equations.AbstractFunction;
import org.cytoscape.equations.ArgDescriptor;
@@ -78,7 +80,8 @@
final DecimalFormat decimalFormat;
try {
- decimalFormat = new DecimalFormat(format);
+ // force the locale to US so that we
consistently serialize
+ decimalFormat = new DecimalFormat(format, new
DecimalFormatSymbols(Locale.US));
} catch (final Exception e) {
throw new IllegalStateException("we should
*never* get here!");
}
@@ -93,7 +96,8 @@
private boolean isValidFormat(final String format) {
try {
- new DecimalFormat(format);
+ // force the locale to US so that we consistently
serialize
+ new DecimalFormat(format, new
DecimalFormatSymbols(Locale.US));
return true;
} catch (final Exception e) {
return false;
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
