improve V1 parsing

diylc/diylc-core/src/org/diylc/core/measures/AbstractMeasure.java

@@ -85,4 +85,11 @@ public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializ
   public String toString() {
     return format.format(value) + unit;
   }
+  
+  protected static double parse(String value) {
+    if (value.startsWith("."))
+      value = "0" + value;
+    value = value.replace(",", ".").replace("*", "");
+    return Double.parseDouble(value);
+  }
 }

diylc/diylc-core/src/org/diylc/core/measures/Capacitance.java

@@ -20,10 +20,11 @@ public class Capacitance extends AbstractMeasure<CapacitanceUnit> {
   }
 
   public static Capacitance parseCapacitance(String value) {
+    value = value.replace("*", "");
     for (CapacitanceUnit unit : CapacitanceUnit.values()) {
       if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
-        value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+        value = value.substring(0, value.length() - unit.toString().length()).trim();
-        return new Capacitance(Double.parseDouble(value), unit);
+        return new Capacitance(parse(value), unit);
       }
     }
     throw new IllegalArgumentException("Could not parse capacitance: " + value);

diylc/diylc-core/src/org/diylc/core/measures/Inductance.java

@@ -20,10 +20,11 @@ public class Inductance extends AbstractMeasure<InductanceUnit> {
   }
 
   public static Inductance parseCapacitance(String value) {
+    value = value.replace("*", "");
     for (InductanceUnit unit : InductanceUnit.values()) {
       if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
-        value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+        value = value.substring(0, value.length() - unit.toString().length()).trim();
-        return new Inductance(Double.parseDouble(value), unit);
+        return new Inductance(parse(value), unit);
       }
     }
     throw new IllegalArgumentException("Could not parse inductance: " + value);

diylc/diylc-core/src/org/diylc/core/measures/Power.java

@@ -20,10 +20,11 @@ public class Power extends AbstractMeasure<PowerUnit> {
   }
 
   public static Power parseCapacitance(String value) {
+    value = value.replace("*", "");
     for (PowerUnit unit : PowerUnit.values()) {
       if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
-        value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+        value = value.substring(0, value.length() - unit.toString().length()).trim();
-        return new Power(Double.parseDouble(value), unit);
+        return new Power(parse(value), unit);
       }
     }
     throw new IllegalArgumentException("Could not parse power: " + value);

diylc/diylc-core/src/org/diylc/core/measures/Resistance.java

@@ -88,10 +88,11 @@ public class Resistance extends AbstractMeasure<ResistanceUnit> {
   }
 
   public static Resistance parseResistance(String value) {
+    value = value.replace("*", "").replace("R", "\u2126");
     for (ResistanceUnit unit : ResistanceUnit.values()) {
       if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
         value = value.substring(0, value.length() - unit.toString().length()).trim();
-        return new Resistance(Double.parseDouble(value), unit);
+        return new Resistance(parse(value), unit);
       }
     }
     throw new IllegalArgumentException("Could not parse resistance: " + value);

diylc/diylc-core/src/org/diylc/core/measures/Size.java

@@ -31,10 +31,11 @@ public class Size extends AbstractMeasure<SizeUnit> implements Comparable<Size>
   }
 
   public static Size parseSize(String value) {
+    value = value.replace("*", "");
     for (SizeUnit unit : SizeUnit.values()) {
       if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
-        value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+        value = value.substring(0, value.length() - unit.toString().length()).trim();
-        return new Size(Double.parseDouble(value), unit);
+        return new Size(parse(value), unit);
       }
     }
     throw new IllegalArgumentException("Could not parse size: " + value);

diylc/diylc-core/src/org/diylc/core/measures/Voltage.java

@@ -20,10 +20,11 @@ public class Voltage extends AbstractMeasure<VoltageUnit> {
   }
 
   public static Voltage parseCapacitance(String value) {
+    value = value.replace("*", "");
     for (VoltageUnit unit : VoltageUnit.values()) {
       if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
-        value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+        value = value.substring(0, value.length() - unit.toString().length()).trim();
-        return new Voltage(Double.parseDouble(value), unit);
+        return new Voltage(parse(value), unit);
       }
     }
     throw new IllegalArgumentException("Could not parse voltage: " + value);

diylc/diylc-library/src/org/diylc/parsing/V1FileParser.java

@@ -731,7 +731,7 @@ public class V1FileParser implements IOldFileParser {
   private int randInt(int range) {
     long newSeed = randSeed * 0x08088405 + 1;
     randSeed = newSeed;
-    return (int) (newSeed * range >> 32);
+    return (int) ((long)newSeed * range >> 32);
   }
 
 }