Changeset 79 in josm for src/org/openstreetmap/josm/gui/PreferenceDialog.java

Timestamp:

2006-04-03T22:25:02+02:00 (19 years ago)

Author:

imi

Message:

• fixed bug in osm import (now reject id=0)
• added WMS server layer (not finished)
• added save state for dialogs

File:

• src/org/openstreetmap/josm/gui/PreferenceDialog.java (modified) (6 diffs)

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

@@ -68 +68 @@
                                 pwd = null;
                         Main.pref.put("osm-server.password", pwd);
+                        Main.pref.put("wmsServerBaseUrl", wmsServerBaseUrl.getText());
                         Main.pref.put("csvImportString", csvImportString.getText());
                         Main.pref.put("drawRawGpsLines", drawRawGpsLines.isSelected());
@@ -106 +107 @@
          * ComboBox with all look and feels.
          */
-        JComboBox lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
+    private JComboBox lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
         /**
          * Combobox with all projections available
          */
-        JComboBox projectionCombo = new JComboBox(Projection.allProjections);
+    private JComboBox projectionCombo = new JComboBox(Projection.allProjections);
         /**
          * The main tab panel.
@@ -119 +120 @@
          * Editfield for the Base url to the REST API from OSM. 
          */
-        JTextField osmDataServer = new JTextField(20);
+    private JTextField osmDataServer = new JTextField(20);
         /**
          * Editfield for the username to the OSM account.
          */
-        JTextField osmDataUsername = new JTextField(20);
+    private JTextField osmDataUsername = new JTextField(20);
         /**
          * Passwordfield for the userpassword of the REST API.
          */
-        JPasswordField osmDataPassword = new JPasswordField(20);
+    private JPasswordField osmDataPassword = new JPasswordField(20);
+    /**
+     * Base url of the WMS server. Holds everything except the bbox= argument.
+     */
+        private JTextField wmsServerBaseUrl = new JTextField(20);
         /**
          * Comma seperated import string specifier or <code>null</code> if the first
          * data line should be interpreted as one.
          */
-        JTextField csvImportString = new JTextField(20);
+    private JTextField csvImportString = new JTextField(20);
         /**
          * The checkbox stating whether nodes should be merged together.
          */
-        JCheckBox drawRawGpsLines = new JCheckBox("Draw lines between raw gps points.");
+    private JCheckBox drawRawGpsLines = new JCheckBox("Draw lines between raw gps points.");
         /**
          * The checkbox stating whether raw gps lines should be forced.
          */
-        JCheckBox forceRawGpsLines = new JCheckBox("Force lines if no line segments imported.");
-
-        JTable colors;
+    private JCheckBox forceRawGpsLines = new JCheckBox("Force lines if no line segments imported.");
+
+    private JTable colors;
         
         
@@ -199 +204 @@
                 osmDataUsername.setText(Main.pref.get("osm-server.username"));
                 osmDataPassword.setText(Main.pref.get("osm-server.password"));
-                csvImportString.setText(Main.pref.get("csvImportString"));
+        wmsServerBaseUrl.setText(Main.pref.get("wmsServerBaseUrl", "http://wms.jpl.nasa.gov/wms.cgi?request=GetMap&width=512&height=512&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg&"));
+        csvImportString.setText(Main.pref.get("csvImportString"));
                 drawRawGpsLines.setSelected(Main.pref.getBoolean("drawRawGpsLines"));
                 forceRawGpsLines.setToolTipText("Force drawing of lines if the imported data contain no line information.");
@@ -258 +264 @@
                 osmDataUsername.setToolTipText("Login name (email) to the OSM account.");
                 osmDataPassword.setToolTipText("Login password to the OSM account. Leave blank to not store any password.");
+        wmsServerBaseUrl.setToolTipText("The base URL to the server retrieving WMS background pictures from.");
                 csvImportString.setToolTipText("<html>Import string specification. lat/lon and time are imported.<br>" +
                                 "<b>lat</b>: The latitude coordinate<br>" +
@@ -297 +304 @@
                 warning.setFont(warning.getFont().deriveFont(Font.ITALIC));
                 con.add(warning, GBC.eop().fill(GBC.HORIZONTAL));
+                con.add(new JLabel("WMS server base url (everything except bbox-parameter)"), GBC.eol());
+                con.add(wmsServerBaseUrl, GBC.eop().fill(GBC.HORIZONTAL));
+                con.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
                 con.add(new JLabel("CSV import specification (empty: read from first line in data)"), GBC.eol());
                 con.add(csvImportString, GBC.eop().fill(GBC.HORIZONTAL));