Index: /applications/editors/josm/plugins/wmsplugin/build.xml =================================================================== --- /applications/editors/josm/plugins/wmsplugin/build.xml (revision 16780) +++ /applications/editors/josm/plugins/wmsplugin/build.xml (revision 16781) @@ -26,5 +26,5 @@ - + Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/GeorefImage.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/GeorefImage.java (revision 16780) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/GeorefImage.java (revision 16781) @@ -160,4 +160,5 @@ ImageProducer ip = img.getSource(); RGBImageFilter filter = new RGBImageFilter() { + @Override public int filterRGB(int x, int y, int rgb) { return rgb | 0xff000000; Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java (revision 16780) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java (revision 16781) @@ -23,4 +23,5 @@ 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,5 +196,5 @@ // 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"), Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java (revision 16780) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java (revision 16781) @@ -47,5 +47,5 @@ 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,9 +78,14 @@ selectedLayer = null; } - + + @Override public void mouseEntered(MouseEvent e) { } + + @Override public void mouseExited(MouseEvent e) { } + + @Override public void mouseMoved(MouseEvent e) { } @@ -92,5 +97,5 @@ // 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(); } } Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java (revision 16780) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java (revision 16781) @@ -30,4 +30,5 @@ 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,4 +52,5 @@ } + @Override void fetch() throws Exception{ URL url = null; @@ -122,8 +124,10 @@ 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); } } Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java (revision 16780) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java (revision 16781) @@ -31,4 +31,5 @@ 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,7 +118,7 @@ @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,5 +164,10 @@ 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,6 +202,6 @@ @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,5 +305,5 @@ oos.writeInt(ImageSize); oos.writeDouble(pixelPerDegree); - oos.writeObject(name); + oos.writeObject(getName()); oos.writeObject(baseURL); oos.writeObject(images); @@ -327,5 +333,5 @@ 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,5 +344,5 @@ ImageSize = ois.readInt(); pixelPerDegree = ois.readDouble(); - name = (String) ois.readObject(); + setName((String)ois.readObject()); baseURL = (String) ois.readObject(); images = (GeorefImage[][])ois.readObject(); @@ -348,5 +354,5 @@ // FIXME be more specific ex.printStackTrace(System.out); - JOptionPane.showMessageDialog(Main.parent, + OptionPaneUtil.showMessageDialog(Main.parent, tr("Error loading file"), tr("Error"), Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java (revision 16780) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java (revision 16781) @@ -58,4 +58,5 @@ // wmsplugin.1.url=http://and.so.on/ + @Override public void copy(String from, String to) throws FileNotFoundException, IOException { @@ -202,4 +203,5 @@ } + @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { if (oldFrame==null && newFrame!=null) { @@ -212,4 +214,5 @@ } + @Override public PreferenceSetting getPreferenceSetting() { return new WMSPreferenceEditor(); Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java (revision 16780) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java (revision 16781) @@ -26,4 +26,5 @@ 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,4 +54,5 @@ 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,5 +78,9 @@ 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,5 +110,10 @@ 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 {