Changeset 938 in josm for trunk/src/org/openstreetmap

Timestamp:

2008-09-09T08:43:09+02:00 (16 years ago)

Author:

stoecker

Message:

added patches from bug #682 (proxy settings) and #1519 (NMEA)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (5 diffs)
• gui/preferences/FilePreferences.java (modified) (2 diffs)
• gui/preferences/PreferenceDialog.java (modified) (1 diff)
• gui/preferences/ProxyPreferences.java (added)
• io/NmeaReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -13 +13 @@
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.Properties;
 import java.util.SortedMap;
 import java.util.StringTokenizer;
@@ -19 +20 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.ProxyPreferences;
 import org.openstreetmap.josm.tools.ColorHelper;
 
@@ -213 +215 @@
         public void save() {
                 try {
+                        setSystemProperties();
                         final PrintWriter out = new PrintWriter(new FileWriter(getPreferencesDir() + "preferences"), false);
                         for (final Entry<String, String> e : properties.entrySet()) {
@@ -241 +244 @@
                         throw new IOException("Malformed config file at lines " + errLines);
                 }
+                setSystemProperties();
         }
 
@@ -377 +381 @@
                 return def;
         }
+
+        private void setSystemProperties() {
+                Properties sysProp = System.getProperties();
+                if (getBoolean(ProxyPreferences.PROXY_ENABLE)) {
+                        sysProp.put("proxySet", "true");
+                        sysProp.put("http.proxyHost", get(ProxyPreferences.PROXY_HOST));
+                        sysProp.put("proxyPort", get(ProxyPreferences.PROXY_PORT));
+                        if (!getBoolean(ProxyPreferences.PROXY_ANONYMOUS)) {
+                                sysProp.put("proxyUser", get(ProxyPreferences.PROXY_USER));
+                                sysProp.put("proxyPassword", get(ProxyPreferences.PROXY_PASS));
+                        }
+                } else {
+                        sysProp.put("proxySet", "false");
+                        sysProp.remove("http.proxyHost");
+                        sysProp.remove("proxyPort");
+                        sysProp.remove("proxyUser");
+                        sysProp.remove("proxyPassword");
+                }
+                System.setProperties(sysProp);
+        }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java

@@ -6 +6 @@
 import javax.swing.Box;
 import javax.swing.JCheckBox;
+import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
 
 import org.openstreetmap.josm.Main;
@@ -21 +23 @@
         
         public void addGui(PreferenceDialog gui) {
+                gui.connection.add(new JSeparator(SwingConstants.HORIZONTAL), GBC.eol().fill(GBC.HORIZONTAL));
                 keepBackup.setSelected(Main.pref.getBoolean("save.keepbackup"));
                 keepBackup.setToolTipText(tr("When saving, keep backup files ending with a ~"));
                 gui.connection.add(keepBackup, GBC.eol().insets(20,0,0,0));
-                gui.connection.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -105 +105 @@
                 settings.add(new ServerAccessPreference());
                 settings.add(new FilePreferences());
+                settings.add(new ProxyPreferences());
                 settings.add(new ProjectionPreference());
                 settings.add(new TaggingPresetPreference());

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -162 +162 @@
 
         private LatLon parseLatLon(String[] e) throws NumberFormatException {
-                String widthNorth = e[GPRMC.WIDTH_NORTH.position];
-                String lengthEast = e[GPRMC.LENGTH_EAST.position];
+                String widthNorth = e[GPRMC.WIDTH_NORTH.position].trim();
+                String lengthEast = e[GPRMC.LENGTH_EAST.position].trim();
                 if ("".equals(widthNorth) || "".equals(lengthEast)) {
                         return null;
                 }
 
-                int latdeg = Integer.parseInt(widthNorth.substring(0, 2));
-                double latmin = Double.parseDouble(widthNorth.substring(2));
+                // The format is xxDDLL.LLLL
+                // xx optional whitespace
+                // DD (int) degres
+                // LL.LLLL (double) latidude
+                int latdegsep = widthNorth.indexOf('.') - 2;
+                if (latdegsep < 0) {
+                        return null;
+                }
+                int latdeg = Integer.parseInt(widthNorth.substring(0, latdegsep));
+                double latmin = Double.parseDouble(widthNorth.substring(latdegsep));
                 double lat = latdeg + latmin / 60;
                 if ("S".equals(e[GPRMC.WIDTH_NORTH_NAME.position])) {
@@ -175 +183 @@
                 }       
 
-                int londeg = Integer.parseInt(lengthEast.substring(0, 3));
-                double lonmin = Double.parseDouble(lengthEast.substring(3));
+                int londegsep = lengthEast.indexOf('.') - 2;
+                if (londegsep < 0) {
+                        return null;
+                }
+                int londeg = Integer.parseInt(lengthEast.substring(0, londegsep));
+                double lonmin = Double.parseDouble(lengthEast.substring(londegsep));
                 double lon = londeg + lonmin / 60;
                 if ("W".equals(e[GPRMC.LENGTH_EAST_NAME.position])) {