Changeset 12740 in osm for applications/editors/josm/plugins

Timestamp:

2008-12-31T21:33:29+01:00 (16 years ago)

Author:

khris78

Message:

Fix #1661

File:

• applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java (modified) (4 diffs)

applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java

@@ -578 +578 @@
             gpstimezone = timezoneValue.floatValue();
             
-            try {
-                delta = Long.parseLong(tfOffset.getText());
-            } catch(NumberFormatException nfe) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing offset.\nExpected format: {0}", "number"), 
-                        tr("Invalid offset"), JOptionPane.ERROR_MESSAGE);
-                continue;
+            String deltaText = tfOffset.getText().trim();
+            if (deltaText.length() > 0) {
+                try {
+                    delta = Long.parseLong(deltaText);
+                } catch(NumberFormatException nfe) {
+                    JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing offset.\nExpected format: {0}", "number"), 
+                            tr("Invalid offset"), JOptionPane.ERROR_MESSAGE);
+                    continue;
+                }
+            } else {
+                delta = 0;
             }
             
@@ -804 +809 @@
     
     private Float parseTimezone(String timezone) {
+        if (timezone.length() == 0) {
+                return new Float(0);
+        }
+        
         char sgnTimezone = '+';
-        String hTimezone = "";
-        String mTimezone = "";
+        StringBuffer hTimezone = new StringBuffer();
+        StringBuffer mTimezone = new StringBuffer();
         int state = 1; // 1=start/sign, 2=hours, 3=minutes.
         for (int i = 0; i < timezone.length(); i++) {
@@ -837 +846 @@
                 switch(state) {
                 case 1 : 
+                case 2 : 
                     state = 2;
-                    hTimezone += c;
-                    break;
-                case 2 : 
-                    hTimezone += c;
+                    hTimezone.append(c);
                     break;
                 case 3 : 
-                    mTimezone += c;
+                    mTimezone.append(c);
                     break;
                 default : 
@@ -854 +861 @@
             }
         }
-        int h = Integer.parseInt(hTimezone);
-        int m = Integer.parseInt(mTimezone);
+        
+        int h = 0;
+        int m = 0;
+        try {
+                h = Integer.parseInt(hTimezone.toString());
+                if (mTimezone.length() > 0) {
+                        m = Integer.parseInt(mTimezone.toString());
+                }
+        } catch (NumberFormatException nfe) {
+                // Invalid timezone
+                return null;
+        }
+        
         if (h > 12 || m > 59 ) {
             return null;
-        }
-        return new Float((h + m / 60.0) * (sgnTimezone == '-' ? -1 : 1));
+        } else {
+                return new Float((h + m / 60.0) * (sgnTimezone == '-' ? -1 : 1));
+        }
     }