Index: /applications/editors/josm/plugins/wmsplugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/build.xml	(revision 17389)
+++ /applications/editors/josm/plugins/wmsplugin/build.xml	(revision 17390)
@@ -32,5 +32,5 @@
     <property name="ant.build.javac.target" value="1.5"/>
 	<property name="commit.message"         value="fixing JOSM issue #3186" />
-	<property name="josm.reference.release" value="1949" />
+	<property name="josm.reference.release" value="2012" />
 	
     <target name="init">
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java	(revision 17389)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java	(revision 17390)
@@ -23,5 +23,4 @@
 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;
@@ -196,5 +195,5 @@
 
             // and display an error message. The while(true) ensures that the dialog pops up again
-            OptionPaneUtil.showMessageDialog(Main.parent,
+            JOptionPane.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 17389)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java	(revision 17390)
@@ -25,5 +25,4 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.GBC;
@@ -187,5 +186,5 @@
     */
    protected void warnNoWMSLayers() {
-       OptionPaneUtil.showMessageDialog(
+       JOptionPane.showMessageDialog(
     		   Main.parent,
                tr("There are currently no WMS layer to adjust."),
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java	(revision 17389)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java	(revision 17390)
@@ -28,5 +28,4 @@
 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;
@@ -122,5 +121,5 @@
                 if(!projname.equals(m.group(1)) && warn)
                 {
-                    OptionPaneUtil.showMessageDialog(Main.parent,
+                    JOptionPane.showMessageDialog(Main.parent,
                     tr("The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
                     + "This may lead to wrong coordinates.",
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java	(revision 17389)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java	(revision 17390)
@@ -32,5 +32,4 @@
 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;
@@ -164,5 +163,5 @@
 
 		if((bmaxx - bminx > dax) || (bmaxy - bminy > day)){
-			OptionPaneUtil.showMessageDialog(
+			JOptionPane.showMessageDialog(
 					Main.parent,
 					tr("The requested area is too big. Please zoom in a little, or change resolution"),
@@ -340,5 +339,5 @@
 				int sfv = ois.readInt();
 				if (sfv != serializeFormatVersion) {
-					OptionPaneUtil.showMessageDialog(Main.parent,
+					JOptionPane.showMessageDialog(Main.parent,
 							tr("Unsupported WMS file version; found {0}, expected {1}", sfv, serializeFormatVersion),
 							tr("File Format Error"),
@@ -361,5 +360,5 @@
 				// FIXME be more specific
 				ex.printStackTrace(System.out);
-				OptionPaneUtil.showMessageDialog(Main.parent,
+				JOptionPane.showMessageDialog(Main.parent,
 						tr("Error loading file"),
 						tr("Error"),
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java	(revision 17389)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java	(revision 17390)
@@ -1,9 +1,8 @@
 package wmsplugin;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Dimension;
 import java.awt.FlowLayout;
-import org.openstreetmap.josm.Main;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -23,5 +22,5 @@
 import javax.swing.table.DefaultTableModel;
 
-import org.openstreetmap.josm.gui.OptionPaneUtil;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -75,5 +74,5 @@
                 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 = OptionPaneUtil.showConfirmationDialog(
+                int answer = JOptionPane.showConfirmDialog(
                 		gui, p, 
                 		tr("Enter a menu name and WMS URL"), 
@@ -107,5 +106,5 @@
                 Integer line = listdef.getSelectedRow();
                 if (line == -1)
-                    OptionPaneUtil.showMessageDialog(
+                    JOptionPane.showMessageDialog(
                     		gui, 
                     		tr("Please select the row to copy."),