[Swift-commit] r5757 - usertools/plotter/src/plotter

[wozniak at ci.uchicago.edu]

Author: wozniak
Date: 2012-04-26 15:32:52 -0500 (Thu, 26 Apr 2012)
New Revision: 5757

Modified:
   usertools/plotter/src/plotter/LineReader.java
   usertools/plotter/src/plotter/Lines.java
Log:
New shape.all property; superficial imports changes


Modified: usertools/plotter/src/plotter/LineReader.java
===================================================================
--- usertools/plotter/src/plotter/LineReader.java	2012-04-25 19:36:49 UTC (rev 5756)
+++ usertools/plotter/src/plotter/LineReader.java	2012-04-26 20:32:52 UTC (rev 5757)
@@ -1,7 +1,8 @@
 package plotter;
 
-import java.util.*;
 import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Utility to read a file into a List of String lines.
@@ -101,6 +102,7 @@
                 {
                     String v = tokens.get(i)[j];
                     v = v.replaceAll(",", "");
+                    v = v.replaceAll("%", "");
                     double d = Double.parseDouble(v);
                     result[i][j] = d;
                 }

Modified: usertools/plotter/src/plotter/Lines.java
===================================================================
--- usertools/plotter/src/plotter/Lines.java	2012-04-25 19:36:49 UTC (rev 5756)
+++ usertools/plotter/src/plotter/Lines.java	2012-04-26 20:32:52 UTC (rev 5757)
@@ -4,16 +4,8 @@
 
 import java.awt.Color;
 import java.awt.geom.Rectangle2D;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
+import java.io.*;
+import java.util.*;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.xmlgraphics.java2d.GraphicContext;
@@ -388,6 +380,9 @@
     // System.out.println(mode);
     if ("none".equals(mode))
       return false;
+    mode = properties.getProperty("shape.all");
+    if ("none".equals(mode))
+      return false;
     return true;
   }