Changeset 5731 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

Timestamp:

2013-02-19T22:38:52+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8444 - NPE when no WMS url is entered in WMS add dialog + various UI improvements in add WMS/TMS dialogs (OK button enabled status is dynamic, new Help button, name suggested for wms_endpoint)

File:

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
-import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -14 +12 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
+
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -20 +19 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
-import javax.swing.JTextField;
+
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
@@ -30 +29 @@
 
     private final WMSImagery wms = new WMSImagery();
-    private final JTextArea rawUrl = new JTextArea(3, 40);
     private final JCheckBox endpoint = new JCheckBox(tr("Store WMS endpoint only, select layers at usage"));
     private final WMSLayerTree tree = new WMSLayerTree();
+    private final JLabel wmsInstruction;
     private final JTextArea wmsUrl = new JTextArea(3, 40);
-    private final JTextField name = new JTextField();
+    private final JButton showBounds = new JButton(tr("Show bounds"));
 
     public AddWMSLayerPanel() {
-        super(new GridBagLayout());
 
         add(new JLabel(tr("1. Enter service URL")), GBC.eol());
@@ -48 +46 @@
         add(endpoint, GBC.eol().fill());
         add(new JScrollPane(tree.getLayerTree()), GBC.eol().fill().weight(1, 100));
-        final JButton showBounds = new JButton(tr("Show bounds"));
+
         showBounds.setEnabled(false);
         add(new JScrollPane(showBounds), GBC.eop().fill());
 
-        add(new JLabel(tr("3. Verify generated WMS URL")), GBC.eol());
+        add(wmsInstruction = new JLabel(tr("3. Verify generated WMS URL")), GBC.eol());
         add(wmsUrl, GBC.eop().fill());
         wmsUrl.setLineWrap(true);
@@ -85 +83 @@
                 tree.getLayerTree().setEnabled(!endpoint.isSelected());
                 showBounds.setEnabled(!endpoint.isSelected());
+                wmsInstruction.setEnabled(!endpoint.isSelected());
                 wmsUrl.setEnabled(!endpoint.isSelected());
+                if (endpoint.isSelected()) {
+                    name.setText(wms.getServiceUrl().getHost());
+                } else {
+                    onLayerSelectionChanged();
+                }
             }
         });
@@ -91 +95 @@
         tree.getLayerTree().addPropertyChangeListener("selectedLayers", new PropertyChangeListener() {
             @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                if (wms.getServiceUrl() != null) {
-                    wmsUrl.setText(wms.buildGetMapUrl(tree.getSelectedLayers()));
-                    name.setText(wms.getServiceUrl().getHost() + ": " + Utils.join(", ", tree.getSelectedLayers()));
-                }
-                showBounds.setEnabled(tree.getSelectedLayers().size() == 1);
+            public void propertyChange(PropertyChangeEvent evt) { 
+                onLayerSelectionChanged();
             }
         });
@@ -113 +113 @@
             }
         });
-
+        
+        registerValidableComponent(endpoint);
+        registerValidableComponent(rawUrl);
+        registerValidableComponent(wmsUrl);
+    }
+    
+    protected final void onLayerSelectionChanged() {
+        if (wms.getServiceUrl() != null) {
+            wmsUrl.setText(wms.buildGetMapUrl(tree.getSelectedLayers()));
+            name.setText(wms.getServiceUrl().getHost() + ": " + Utils.join(", ", tree.getSelectedLayers()));
+        }
+        showBounds.setEnabled(tree.getSelectedLayers().size() == 1);
     }
 
@@ -120 +131 @@
         final ImageryInfo info;
         if (endpoint.isSelected()) {
-            info = new ImageryInfo(name.getText(), rawUrl.getText());
+            info = new ImageryInfo(getImageryName(), getImageryRawUrl());
             info.setImageryType(ImageryInfo.ImageryType.WMS_ENDPOINT);
         } else {
-            info = wms.toImageryInfo(name.getText(), tree.getSelectedLayers());
-            info.setUrl(wmsUrl.getText());
+            info = wms.toImageryInfo(getImageryName(), tree.getSelectedLayers());
+            info.setUrl(getWmsUrl());
         }
         return info;
     }
+    
+    protected final String getWmsUrl() {
+        return sanitize(wmsUrl.getText());
+    }
+    
+    protected boolean isImageryValid() {
+        if (getImageryName().isEmpty()) {
+            return false;
+        }
+        if (endpoint.isSelected()) {
+            return !getImageryRawUrl().isEmpty();
+        } else {
+            return !getWmsUrl().isEmpty();
+        }
+    }
 }