Changeset 23207 in osm for applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java

Timestamp:

2010-09-16T11:32:35+02:00 (14 years ago)

Author:

stoecker

Message:

rework preferences and layer storage

File:

• applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java (modified) (14 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.awt.Dimension;
@@ -8 +9 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -23 +26 @@
 import javax.swing.SpinnerNumberModel;
 import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumnModel;
 
 import org.openstreetmap.josm.Main;
@@ -30 +34 @@
 
 public class WMSPreferenceEditor implements PreferenceSetting {
-    private DefaultTableModel model;
+    private WMSLayerTableModel model;
     private JComboBox browser;
-    private HashMap<Integer, WMSInfo> oldValues = new HashMap<Integer, WMSInfo>();
 
     JCheckBox overlapCheckBox;
@@ -40 +43 @@
     JCheckBox remoteCheckBox;
     boolean allowRemoteControl = true;
+    WMSPlugin plugin = WMSPlugin.instance;
 
     public void addGui(final PreferenceTabbedPane gui) {
         JPanel p = gui.createPreferenceTab("wms", tr("WMS Plugin Preferences"), tr("Modify list of WMS servers displayed in the WMS plugin menu"));
 
-        model = new DefaultTableModel(new String[]{tr("Menu Name"), tr("WMS URL")}, 0);
-        final JTable list = new JTable(model);
+        model = new WMSLayerTableModel();
+        final JTable list = new JTable(model) {
+            @Override
+            public String getToolTipText(MouseEvent e) {
+                java.awt.Point p = e.getPoint();
+                return (String) model.getValueAt(rowAtPoint(p), columnAtPoint(p));
+            }
+        };
         JScrollPane scroll = new JScrollPane(list);
         p.add(scroll, GBC.eol().fill(GridBagConstraints.BOTH));
         scroll.setPreferredSize(new Dimension(200,200));
 
-        for (WMSInfo i : WMSPlugin.wmsList) {
-            oldValues.put(i.prefid, i);
-            model.addRow(new String[]{i.name, i.url});
-        }
-
-        final DefaultTableModel modeldef = new DefaultTableModel(
-                new String[]{tr("Menu Name (Default)"), tr("WMS URL (Default)")}, 0);
-        final JTable listdef = new JTable(modeldef){
+        final WMSDefaultLayerTableModel modeldef = new WMSDefaultLayerTableModel();
+        final JTable listdef = new JTable(modeldef) {
             @Override
-            public boolean isCellEditable(int row,int column){return false;}
+            public String getToolTipText(MouseEvent e) {
+                java.awt.Point p = e.getPoint();
+                return (String) modeldef.getValueAt(rowAtPoint(p), columnAtPoint(p));
+            }
         };
         JScrollPane scrolldef = new JScrollPane(listdef);
@@ -66 +73 @@
         scrolldef.setPreferredSize(new Dimension(200,200));
 
-        for (Map.Entry<String,String> i : WMSPlugin.wmsListDefault.entrySet()) {
-            modeldef.addRow(new String[]{i.getKey(), i.getValue()});
-        }
+        TableColumnModel mod = listdef.getColumnModel();
+        mod.getColumn(1).setPreferredWidth(800);
+        mod.getColumn(0).setPreferredWidth(200);
+        mod = list.getColumnModel();
+        mod.getColumn(2).setPreferredWidth(50);
+        mod.getColumn(1).setPreferredWidth(800);
+        mod.getColumn(0).setPreferredWidth(200);
 
         JPanel buttonPanel = new JPanel(new FlowLayout());
@@ -82 +93 @@
                         JOptionPane.OK_CANCEL_OPTION);
                 if (answer == JOptionPane.OK_OPTION) {
-                    model.addRow(new String[]{p.getUrlName(), p.getUrl()});
+                    model.addRow(new WMSInfo(p.getUrlName(), p.getUrl()));
                 }
             }
@@ -118 +129 @@
 
                 outer: for(int i = 0; i < lines.length; i++) {
-                    String c1 = modeldef.getValueAt(lines[i], 0).toString();
-                    String c2 = modeldef.getValueAt(lines[i], 1).toString();
+                    WMSInfo info = modeldef.getRow(lines[i]);
 
                     // Check if an entry with exactly the same values already
                     // exists
                     for(int j = 0; j < model.getRowCount(); j++) {
-                        if(c1.equals(model.getValueAt(j, 0).toString())
-                                && c2.equals(model.getValueAt(j, 1).toString())) {
+                        if(info.equalsBaseValues(model.getRow(j))) {
                             // Select the already existing row so the user has
                             // some feedback in case an entry exists
@@ -134 +143 @@
                     }
 
-                    model.addRow(new String[] {c1, c2});
+                    model.addRow(new WMSInfo(info));
                     int lastLine = model.getRowCount() - 1;
                     list.getSelectionModel().setSelectionInterval(lastLine, lastLine);
@@ -151 +160 @@
                 "gnome-web-photo --mode=photo --format=png {0} /dev/stdout",
                 "gnome-web-photo-fixed {0}",
-        "webkit-image-gtk {0}"});
+                "webkit-image-gtk {0}"});
         browser.setEditable(true);
         browser.setSelectedItem(Main.pref.get("wmsplugin.browser", "webkit-image {0}"));
@@ -160 +169 @@
         p.add(Box.createHorizontalGlue(), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
 
-        overlapCheckBox = new JCheckBox(tr("Overlap tiles"), WMSPlugin.PROP_OVERLAP.get() );
+        overlapCheckBox = new JCheckBox(tr("Overlap tiles"), plugin.PROP_OVERLAP.get() );
         JLabel labelEast = new JLabel(tr("% of east:"));
         JLabel labelNorth = new JLabel(tr("% of north:"));
-        spinEast = new JSpinner(new SpinnerNumberModel(WMSPlugin.PROP_OVERLAP_EAST.get(), 1, 50, 1));
-        spinNorth = new JSpinner(new SpinnerNumberModel(WMSPlugin.PROP_OVERLAP_NORTH.get(), 1, 50, 1));
+        spinEast = new JSpinner(new SpinnerNumberModel(plugin.PROP_OVERLAP_EAST.get(), 1, 50, 1));
+        spinNorth = new JSpinner(new SpinnerNumberModel(plugin.PROP_OVERLAP_NORTH.get(), 1, 50, 1));
 
         JPanel overlapPanel = new JPanel(new FlowLayout());
@@ -178 +187 @@
         p.add(Box.createHorizontalGlue(), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
         JLabel labelSimConn = new JLabel(tr("Simultaneous connections"));
-        spinSimConn = new JSpinner(new SpinnerNumberModel(WMSPlugin.PROP_SIMULTANEOUS_CONNECTIONS.get(), 1, 30, 1));
+        spinSimConn = new JSpinner(new SpinnerNumberModel(plugin.PROP_SIMULTANEOUS_CONNECTIONS.get(), 1, 30, 1));
         JPanel overlapPanelSimConn = new JPanel(new FlowLayout());
         overlapPanelSimConn.add(labelSimConn);
@@ -191 +200 @@
 
         p.add(remotePanel);
-
     }
 
     public boolean ok() {
-        boolean change = false;
-        for (int i = 0; i < model.getRowCount(); ++i) {
-            String name = model.getValueAt(i,0).toString();
-            String url = model.getValueAt(i,1).toString();
-
-            WMSInfo origValue = oldValues.get(i);
-            if (origValue == null)
-            {
-                new WMSInfo(name, url, i).save();
-                change = true;
-            }
-            else
-            {
-                if (!origValue.name.equals(name) || !origValue.url.equals(url))
-                {
-                    origValue.name = name;
-                    origValue.url = url;
-                    origValue.save();
-                    change = true;
-                }
-                oldValues.remove(i);
-            }
-        }
-
-        // using null values instead of empty string really deletes
-        // the preferences entry
-        for (WMSInfo i : oldValues.values())
-        {
-            i.url = null;
-            i.name = null;
-            i.save();
-            change = true;
-        }
-
-        if (change) WMSPlugin.refreshMenu();
-
-        WMSPlugin.PROP_OVERLAP.put(overlapCheckBox.getModel().isSelected());
-        WMSPlugin.PROP_OVERLAP_EAST.put((Integer) spinEast.getModel().getValue());
-        WMSPlugin.PROP_OVERLAP_NORTH.put((Integer) spinNorth.getModel().getValue());
-        WMSPlugin.PROP_SIMULTANEOUS_CONNECTIONS.put((Integer) spinSimConn.getModel().getValue());
+        plugin.info.save();
+        plugin.refreshMenu();
+
+        plugin.PROP_OVERLAP.put(overlapCheckBox.getModel().isSelected());
+        plugin.PROP_OVERLAP_EAST.put((Integer) spinEast.getModel().getValue());
+        plugin.PROP_OVERLAP_NORTH.put((Integer) spinNorth.getModel().getValue());
+        plugin.PROP_SIMULTANEOUS_CONNECTIONS.put((Integer) spinSimConn.getModel().getValue());
         allowRemoteControl = remoteCheckBox.getModel().isSelected();
 
@@ -279 +254 @@
         return null;
     }
+
+    /**
+     * The table model for the WMS layer
+     *
+     */
+    class WMSLayerTableModel extends DefaultTableModel {
+        public WMSLayerTableModel() {
+            setColumnIdentifiers(new String[]{tr("Menu Name"), tr("WMS URL"), trc("layer", "Zoom")});
+        }
+
+        public WMSInfo getRow(int row) {
+            return plugin.info.layers.get(row);
+        }
+
+        public void addRow(WMSInfo i) {
+            plugin.info.add(i);
+            int p = getRowCount()-1;
+            fireTableRowsInserted(p,p);
+        }
+
+        public void removeRow(int i) {
+            plugin.info.remove(getRow(i));
+            fireTableRowsDeleted(i,i);
+        }
+
+        @Override
+        public int getRowCount() {
+            return plugin.info.layers.size();
+        }
+
+        @Override
+        public Object getValueAt(int row, int column) {
+            WMSInfo info = plugin.info.layers.get(row);
+            switch(column) {
+            case 0: return info.name;
+            case 1: return info.getFullURL();
+            case 2: return info.pixelPerDegree == 0.0 ? "" : info.pixelPerDegree;
+            }
+            return null;
+        }
+
+        @Override
+        public boolean isCellEditable(int row, int column) {
+            return (column != 2);
+        }
+    }
+
+    /**
+     * The table model for the WMS layer
+     *
+     */
+    class WMSDefaultLayerTableModel extends DefaultTableModel {
+        public WMSDefaultLayerTableModel() {
+            setColumnIdentifiers(new String[]{tr("Menu Name (Default)"), tr("WMS URL (Default)")});
+        }
+
+        public WMSInfo getRow(int row) {
+            return plugin.info.defaultLayers.get(row);
+        }
+
+        @Override
+        public int getRowCount() {
+            return plugin.info.defaultLayers.size();
+        }
+
+        @Override
+        public Object getValueAt(int row, int column) {
+            WMSInfo info = plugin.info.defaultLayers.get(row);
+            switch(column) {
+            case 0: return info.name;
+            case 1: return info.getFullURL();
+            }
+            return null;
+        }
+
+        @Override
+        public boolean isCellEditable(int row, int column) {
+            return false;
+        }
+    }
 }
-