Merge pull request #7 from tschoening/locale_fixes

Locale fixes
ppalucha · Nov 2, 2017 · 4e60828 · 4e60828
2 parents e73233f + fff2e55
commit 4e60828
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/net/atomique/ksar/Graph/Graph.java b/src/net/atomique/ksar/Graph/Graph.java
@@ -8,6 +8,7 @@
 import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -96,11 +97,12 @@ private void create_DataStore() {
 
     public int parse_line(Second now, String s) {
         String[] cols = s.split("\\s+");
-        Double colvalue = null;
+        Number colvalue = null;
+        NumberFormat nf = NumberFormat.getInstance();
         //System.out.println("graph parsing:" + s);
         for (int i = skipColumn; i < HeaderStr.length; i++) {
             try {
-                colvalue = new Double(cols[i]);
+                colvalue = nf.parse(cols[i]);
             } catch (NumberFormatException ne) {
                 System.out.println(graphtitle + " " + cols[i] + " is NaN");
                 return 0;
@@ -110,12 +112,12 @@ public int parse_line(Second now, String s) {
                 return 0;
             }
 
-            add_datapoint_plot(now, i-skipColumn , HeaderStr[i-skipColumn], colvalue);
+            add_datapoint_plot(now, i-skipColumn , HeaderStr[i-skipColumn], colvalue.doubleValue());
 
 
             TimeTableXYDataset tmp = StackListbyCol.get(HeaderStr[i]);
             if (tmp != null) {
-                add_datapoint_stack(tmp, now, i , HeaderStr[i], colvalue);
+                add_datapoint_stack(tmp, now, i , HeaderStr[i], colvalue.doubleValue());
             }
         }
 

diff --git a/src/net/atomique/ksar/Parser/Linux.java b/src/net/atomique/ksar/Parser/Linux.java
@@ -132,7 +132,8 @@ public int parse(String line, String[] columns) {
         int seconde = 0;
         Second now = null;
 
-        if ("Average:".equals(columns[0])) {
+        // Test for "Average:" in different locales, like "Durchschnitt:":
+        if (columns[0].matches("(?i)^[a-z]+:")) {
             currentStat = "NONE";
             return 0;
         }