Changeset 5617 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

Timestamp:

2012-12-10T02:04:50+01:00 (12 years ago)

Author:

simon04

Message:

see #8254 - new imagery entry wms_endpoint: Store WMS endpoint only, select layers at usage

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -336 +336 @@
             activeToolbar.setBorderPainted(false);
             activeToolbar.setOpaque(false);
-            activeToolbar.add(new NewEntryAction());
+            activeToolbar.add(new NewEntryAction(ImageryInfo.ImageryType.WMS));
+            activeToolbar.add(new NewEntryAction(ImageryInfo.ImageryType.TMS));
             //activeToolbar.add(edit); TODO
             activeToolbar.add(remove);
@@ -420 +421 @@
 
         private class NewEntryAction extends AbstractAction {
-            public NewEntryAction() {
-                putValue(NAME, tr("New"));
-                putValue(SHORT_DESCRIPTION, tr("Add a new WMS/TMS entry by entering the URL"));
+
+            private final ImageryInfo.ImageryType type;
+
+            public NewEntryAction(ImageryInfo.ImageryType type) {
+                putValue(NAME, type.toString());
+                putValue(SHORT_DESCRIPTION, tr("Add a new {0} entry by entering the URL", type.toString()));
                 putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
+                this.type = type;
             }
 
             public void actionPerformed(ActionEvent evt) {
-                final AddWMSLayerPanel p = new AddWMSLayerPanel();
+                final AddImageryPanel p;
+                if (ImageryInfo.ImageryType.WMS.equals(type)) {
+                    p = new AddWMSLayerPanel();
+                } else if (ImageryInfo.ImageryType.TMS.equals(type)) {
+                    p = new AddTMSLayerPanel();
+                } else {
+                    throw new IllegalStateException("Type " + type + " not supported");
+                }
                 GuiHelper.prepareResizeableOptionPane(p, new Dimension(250, 350));
                 int answer = JOptionPane.showConfirmDialog(