Changeset 16781 in osm for applications/editors/josm/plugins/wmsplugin

Timestamp:

2009-08-03T10:45:15+02:00 (15 years ago)

Author:

guggis

Message:

Updated to JOSM release 1893

Location:

applications/editors/josm/plugins/wmsplugin

Files:

• build.xml (modified) (1 diff)
• src/wmsplugin/GeorefImage.java (modified) (1 diff)
• src/wmsplugin/Map_Rectifier_WMSmenuAction.java (modified) (2 diffs)
• src/wmsplugin/WMSAdjustAction.java (modified) (3 diffs)
• src/wmsplugin/WMSGrabber.java (modified) (3 diffs)
• src/wmsplugin/WMSLayer.java (modified) (8 diffs)
• src/wmsplugin/WMSPlugin.java (modified) (3 diffs)
• src/wmsplugin/WMSPreferenceEditor.java (modified) (4 diffs)

applications/editors/josm/plugins/wmsplugin/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WMSPlugin"/>
-                <attribute name="Plugin-Mainversion" value="1815"/>
+                <attribute name="Plugin-Mainversion" value="1893"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
                 <attribute name="de_Plugin-Link" value="http://wiki.openstreetmap.org/wiki/DE:JOSM/Plugins/WMSPlugin"/>

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

@@ -160 +160 @@
         ImageProducer ip = img.getSource();
         RGBImageFilter filter = new RGBImageFilter() {
+                @Override
             public int filterRGB(int x, int y, int rgb) {
                 return rgb | 0xff000000;

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

@@ -23 +23 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -195 +196 @@
 
             // and display an error message. The while(true) ensures that the dialog pops up again
-            JOptionPane.showMessageDialog(Main.parent,
+            OptionPaneUtil.showMessageDialog(Main.parent,
                     tr("Couldn't match the entered link or id to the selected service. Please try again."),
                     tr("No valid WMS URL or id"),

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

@@ -47 +47 @@
 
         Layer layer=Main.map.mapView.getActiveLayer();
-        if (layer.visible && layer instanceof WMSLayer) {
+        if (layer.isVisible() && layer instanceof WMSLayer) {
             prevEastNorth=Main.map.mapView.getEastNorth(e.getX(),e.getY());
             selectedLayer = ((WMSLayer)layer);
@@ -78 +78 @@
         selectedLayer = null;
     }
-
+    
+    @Override
     public void mouseEntered(MouseEvent e) {
     }
+    
+    @Override
     public void mouseExited(MouseEvent e) {
     }
+    
+    @Override
     public void mouseMoved(MouseEvent e) {
     }
@@ -92 +97 @@
     // provided there aren't any other means to activate this tool
     @Override public boolean layerIsSupported(Layer l) {
-        return (l instanceof WMSLayer) && l.visible;
+        return (l instanceof WMSLayer) && l.isVisible();
     }
 }

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

@@ -30 +30 @@
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.io.CacheFiles;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -51 +52 @@
     }
 
+    @Override
     void fetch() throws Exception{
         URL url = null;
@@ -122 +124 @@
                 if(!projname.equals(m.group(1)) && warn)
                 {
-                    JOptionPane.showMessageDialog(Main.parent,
+                    OptionPaneUtil.showMessageDialog(Main.parent,
                     tr("The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
                     + "This may lead to wrong coordinates.",
-                    m.group(1), projname));
+                    m.group(1), projname),
+                    tr("Warning"),
+                    JOptionPane.WARNING_MESSAGE);
                 }
             }

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

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
@@ -117 +118 @@
     @Override public String getToolTipText() {
         if(startstop.isSelected())
-            return tr("WMS layer ({0}), automatically downloading in zoom {1}", name, resolution);
+            return tr("WMS layer ({0}), automatically downloading in zoom {1}", getName(), resolution);
         else
-            return tr("WMS layer ({0}), downloading in zoom {1}", name, resolution);
+            return tr("WMS layer ({0}), downloading in zoom {1}", getName(), resolution);
     }
 
@@ -163 +164 @@
 
         if((bmaxx - bminx > dax) || (bmaxy - bminy > day)){
-            JOptionPane.showMessageDialog(Main.parent, tr("The requested area is too big. Please zoom in a little, or change resolution"));
+            OptionPaneUtil.showMessageDialog(
+                        Main.parent, 
+                        tr("The requested area is too big. Please zoom in a little, or change resolution"),
+                        tr("Error"),
+                        JOptionPane.ERROR_MESSAGE
+                        );
             return;
         }
@@ -196 +202 @@
     @Override public Component[] getMenuEntries() {
         return new Component[]{
-                new JMenuItem(new LayerListDialog.ShowHideLayerAction(this)),
-                new JMenuItem(new LayerListDialog.DeleteLayerAction(this)),
+                new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
+                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
                 new JSeparator(),
                 new JMenuItem(new LoadWmsAction()),
@@ -299 +305 @@
                 oos.writeInt(ImageSize);
                 oos.writeDouble(pixelPerDegree);
-                oos.writeObject(name);
+                oos.writeObject(getName());
                 oos.writeObject(baseURL);
                 oos.writeObject(images);
@@ -327 +333 @@
                 int sfv = ois.readInt();
                 if (sfv != serializeFormatVersion) {
-                    JOptionPane.showMessageDialog(Main.parent,
+                    OptionPaneUtil.showMessageDialog(Main.parent,
                             tr("Unsupported WMS file version; found {0}, expected {1}", sfv, serializeFormatVersion),
                             tr("File Format Error"),
@@ -338 +344 @@
                 ImageSize = ois.readInt();
                 pixelPerDegree = ois.readDouble();
-                name = (String) ois.readObject();
+                setName((String)ois.readObject());
                 baseURL = (String) ois.readObject();
                 images = (GeorefImage[][])ois.readObject();
@@ -348 +354 @@
                 // FIXME be more specific
                 ex.printStackTrace(System.out);
-                JOptionPane.showMessageDialog(Main.parent,
+                OptionPaneUtil.showMessageDialog(Main.parent,
                         tr("Error loading file"),
                         tr("Error"),

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

@@ -58 +58 @@
     // wmsplugin.1.url=http://and.so.on/
 
+    @Override
     public void copy(String from, String to) throws FileNotFoundException, IOException
     {
@@ -202 +203 @@
     }
 
+    @Override
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
         if (oldFrame==null && newFrame!=null) {
@@ -212 +214 @@
     }
 
+    @Override
     public PreferenceSetting getPreferenceSetting() {
         return new WMSPreferenceEditor();

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

@@ -26 +26 @@
 import javax.swing.table.DefaultTableModel;
 
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -53 +54 @@
         new String[]{tr("Menu Name (Default)"), tr("WMS URL (Default)")}, 0);
         final JTable listdef = new JTable(modeldef){
+                @Override
             public boolean isCellEditable(int row,int column){return false;}
         };;
@@ -76 +78 @@
                 p.add(new JLabel(tr("WMS URL")), GBC.std().insets(0,0,5,0));
                 p.add(value, GBC.eol().insets(5,0,0,0).fill(GBC.HORIZONTAL));
-                int answer = JOptionPane.showConfirmDialog(gui, p, tr("Enter a menu name and WMS URL"), JOptionPane.OK_CANCEL_OPTION);
+                int answer = OptionPaneUtil.showConfirmationDialog(
+                                gui, p, 
+                                tr("Enter a menu name and WMS URL"), 
+                                JOptionPane.OK_CANCEL_OPTION,
+                                JOptionPane.QUESTION_MESSAGE);
                 if (answer == JOptionPane.OK_OPTION) {
                     model.addRow(new String[]{key.getText(), value.getText()});
@@ -104 +110 @@
                 Integer line = listdef.getSelectedRow();
                 if (line == -1)
-                    JOptionPane.showMessageDialog(gui, tr("Please select the row to copy."));
+                    OptionPaneUtil.showMessageDialog(
+                                gui, 
+                                tr("Please select the row to copy."),
+                                tr("Information"),
+                                JOptionPane.INFORMATION_MESSAGE
+                                );
                 else
                 {