Added ability to open *.csv files to menu.

[debian/openrocket] / core / src / net / sf / openrocket / preset / loader / DoubleUnitColumnParser.java

diff --git a/core/src/net/sf/openrocket/preset/loader/DoubleUnitColumnParser.java b/core/src/net/sf/openrocket/preset/loader/DoubleUnitColumnParser.java
index f99791784dd200cb47e4fc98768fe7b0f79885a6..bd9a5c1852e6519fec0a006522d91befe1a212bc 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/DoubleUnitColumnParser.java
+++ b/core/src/net/sf/openrocket/preset/loader/DoubleUnitColumnParser.java
@@ -22,13 +22,13 @@ public class DoubleUnitColumnParser extends BaseUnitColumnParser {
                                return;
                        }
                        double value = Double.valueOf(columnData);
-                       
+
                        if ( unitConfigured ) {
                                String unitName = data[unitIndex];
-                               
+
                                Unit unit = rocksimUnits.get(unitName);
                                if ( unit == null ) {
-                                       if ( unitName == null || "" .equals(unitName) ) {
+                                       if ( unitName == null || "" .equals(unitName) || "?".equals(unitName)) {
                                                // Hmm no data...  Lets assume SI
                                                if ( propKey.getUnitGroup() == UnitGroup.UNITS_LENGTH ) {
                                                        unit = UnitGroup.UNITS_LENGTH.getUnit("in");
@@ -41,14 +41,16 @@ public class DoubleUnitColumnParser extends BaseUnitColumnParser {
                                                unit = group.getUnit(unitName);
                                        }
                                }
-                               
+
                                value = unit.fromUnit(value);
                        }
-                       
+
                        props.put(propKey, value);
                }
                catch ( NumberFormatException nex) {
                }
+        catch ( IllegalArgumentException iae) {
+        }
        }