Index: /applications/editors/josm/plugins/mapdust/build.xml
===================================================================
--- /applications/editors/josm/plugins/mapdust/build.xml	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/build.xml	(revision 34528)
@@ -3,5 +3,5 @@
     <!-- properties -->
     <property name="commit.message" value="MapDust bug reporter plugin"/>
-    <property name="plugin.main.version" value="12881"/>
+    <property name="plugin.main.version" value="14153"/>
     <property name="apidoc.dir" value="doc"/>
 
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustLayer.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustLayer.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustLayer.java	(revision 34528)
@@ -30,4 +30,5 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.Color;
 import java.awt.Dimension;
@@ -40,8 +41,10 @@
 import java.util.List;
 import java.util.Locale;
+
 import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JToolTip;
+
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java	(revision 34528)
@@ -43,5 +43,4 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.UserIdentityManager;
@@ -68,4 +67,5 @@
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBugFilter;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustRelevance;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
@@ -137,10 +137,10 @@
                 KeyEvent.VK_0, Shortcut.ALT_SHIFT);
         /* add default values for static variables */
-        Main.pref.put("mapdust.pluginState", MapdustPluginState.ONLINE.getValue());
-        Main.pref.put("mapdust.nickname", "");
-        Main.pref.putBoolean("mapdust.showError", true);
-        Main.pref.put("mapdust.version", getPluginInformation().version);
-        Main.pref.put("mapdust.localVersion", getPluginInformation().localversion);
-        Main.pref.addPreferenceChangeListener(this);
+        Config.getPref().put("mapdust.pluginState", MapdustPluginState.ONLINE.getValue());
+        Config.getPref().put("mapdust.nickname", "");
+        Config.getPref().putBoolean("mapdust.showError", true);
+        Config.getPref().put("mapdust.version", getPluginInformation().version);
+        Config.getPref().put("mapdust.localVersion", getPluginInformation().localversion);
+        Config.getPref().addPreferenceChangeListener(this);
     }
 
@@ -168,5 +168,5 @@
             newMapFrame.mapView.addMouseListener(this);
             /* put username to preferences */
-            Main.pref.put("mapdust.josmUserName", UserIdentityManager.getInstance().getUserName());
+            Config.getPref().put("mapdust.josmUserName", UserIdentityManager.getInstance().getUserName());
         } else {
             /* if new MapFrame is null, remove listener */
@@ -195,18 +195,18 @@
             if (event.getKey().equals("osm-server.username")) {
                 String newUserName = UserIdentityManager.getInstance().getUserName();
-                String oldUserName = Main.pref.get("mapdust.josmUserName");
-                String nickname = Main.pref.get("mapdust.nickname");
+                String oldUserName = Config.getPref().get("mapdust.josmUserName");
+                String nickname = Config.getPref().get("mapdust.nickname");
                 if (nickname.isEmpty()) {
                     /* nickname was not completed */
-                    Main.pref.put("mapdust.josmUserName", newUserName);
-                    Main.pref.put("mapdust.nickname", newUserName);
+                    Config.getPref().put("mapdust.josmUserName", newUserName);
+                    Config.getPref().put("mapdust.nickname", newUserName);
                 } else {
                     if (nickname.equals(oldUserName)) {
                         /* user name was used for nickname, and was not changed */
-                        Main.pref.put("mapdust.josmUserName", newUserName);
-                        Main.pref.put("mapdust.nickname", newUserName);
+                        Config.getPref().put("mapdust.josmUserName", newUserName);
+                        Config.getPref().put("mapdust.nickname", newUserName);
                     } else {
                         /* user name was used for nickname, and was changed */
-                        Main.pref.put("mapdust.josmUserName", newUserName);
+                        Config.getPref().put("mapdust.josmUserName", newUserName);
                     }
                 }
@@ -262,5 +262,5 @@
                     String title = "MapDust";
                     String message = "The operation was successful.";
-                    JOptionPane.showMessageDialog(Main.parent, message, title,
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(), message, title,
                             JOptionPane.INFORMATION_MESSAGE);
                 }
@@ -380,8 +380,8 @@
                         MapdustBug bug = mapdustGUI.getSelectedBug();
                         if (bug != null) {
-                            Main.pref.put("selectedBug.status", bug.getStatus()
+                            Config.getPref().put("selectedBug.status", bug.getStatus()
                                     .getValue());
                         } else {
-                            Main.pref.put("selectedBug.status", "create");
+                            Config.getPref().put("selectedBug.status", "create");
                         }
                         /* disable MapdustButtonPanel */
@@ -458,5 +458,5 @@
         if (e.getRemovedLayer() instanceof MapdustLayer) {
             /* remove the layer */
-            Main.pref.put("mapdust.pluginState",
+            Config.getPref().put("mapdust.pluginState",
                     MapdustPluginState.ONLINE.getValue());
             NavigatableComponent.removeZoomChangeListener(this);
@@ -627,12 +627,12 @@
      */
     protected void handleError() {
-        String showMessage = Main.pref.get("mapdust.showError");
+        String showMessage = Config.getPref().get("mapdust.showError");
         Boolean showErrorMessage = Boolean.parseBoolean(showMessage);
         if (showErrorMessage) {
             /* show errprMessage, and remove the layer */
-            Main.pref.putBoolean("mapdust.showError", false);
+            Config.getPref().putBoolean("mapdust.showError", false);
             String errorMessage = "There was a Mapdust service error.";
             errorMessage += " Please try later.";
-            JOptionPane.showMessageDialog(Main.parent, tr(errorMessage));
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(errorMessage));
         }
     }
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustActionUploader.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustActionUploader.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustActionUploader.java	(revision 34528)
@@ -30,4 +30,5 @@
 
 import java.util.List;
+
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustAction;
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustServiceCommand;
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustGUI.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustGUI.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustGUI.java	(revision 34528)
@@ -30,11 +30,13 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.BorderLayout;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -54,4 +56,5 @@
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBugFilter;
 import org.openstreetmap.josm.plugins.mapdust.service.value.Status;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -233,5 +236,5 @@
             MapdustPlugin mapdustPlugin) {
         setMapdustPlugin(mapdustPlugin);
-        String pluginState = Main.pref.get("mapdust.pluginState");
+        String pluginState = Config.getPref().get("mapdust.pluginState");
         if (pluginState.equals(MapdustPluginState.ONLINE.getValue())) {
             if (tabbedPane != null) {
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/adapter/WindowClose.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/adapter/WindowClose.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/adapter/WindowClose.java	(revision 34528)
@@ -31,9 +31,10 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.AbstractDialog;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.panel.MapdustButtonPanel;
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustPluginState;
 import org.openstreetmap.josm.plugins.mapdust.service.value.Status;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -70,6 +71,6 @@
     @Override
     public void windowClosing(WindowEvent event) {
-        String status = Main.pref.get("selectedBug.status");
-        String pluginState = Main.pref.get("mapdust.pluginState");
+        String status = Config.getPref().get("selectedBug.status");
+        String pluginState = Config.getPref().get("mapdust.pluginState");
         /* enable buttons */
         if (btnPanel != null) {
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java	(revision 34528)
@@ -35,9 +35,10 @@
 import javax.swing.JToggleButton;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustActionUploader;
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustActionUploaderException;
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustPluginState;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -74,8 +75,8 @@
                 String errorMessage = "There was an error uploading the ";
                 errorMessage += "action list.";
-                JOptionPane.showMessageDialog(Main.parent, tr(errorMessage),
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(errorMessage),
                         tr("Error"), JOptionPane.ERROR_MESSAGE);
             }
-            Main.pref.put("mapdust.pluginState",
+            Config.getPref().put("mapdust.pluginState",
                     MapdustPluginState.ONLINE.getValue());
             notifyObservers(null, false);
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java	(revision 34528)
@@ -30,10 +30,12 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Iterator;
+
 import javax.swing.JOptionPane;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -49,7 +51,8 @@
 import org.openstreetmap.josm.plugins.mapdust.service.MapdustServiceHandler;
 import org.openstreetmap.josm.plugins.mapdust.service.MapdustServiceHandlerException;
+import org.openstreetmap.josm.plugins.mapdust.service.value.BugType;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
 import org.openstreetmap.josm.plugins.mapdust.service.value.Status;
-import org.openstreetmap.josm.plugins.mapdust.service.value.BugType;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -112,10 +115,10 @@
             if (errorMessage != null) {
                 /* invalid data */
-                JOptionPane.showMessageDialog(Main.parent, tr(errorMessage),
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(errorMessage),
                         tr("Missing input data"), JOptionPane.WARNING_MESSAGE);
                 return;
             }
             /* valid data */
-            Main.pref.put("mapdust.nickname", nickname);
+            Config.getPref().put("mapdust.nickname", nickname);
             Point p = createDialog.getPoint();
             LatLon latlon = null;
@@ -125,5 +128,5 @@
             MapdustBug bug = new MapdustBug(latlon, type, commentText,
                     nickname);
-            String pluginState = Main.pref.get("mapdust.pluginState");
+            String pluginState = Config.getPref().get("mapdust.pluginState");
             if (pluginState.equals(MapdustPluginState.OFFLINE.getValue())) {
                 /* offline state */
@@ -146,5 +149,5 @@
                 } catch (MapdustServiceHandlerException e) {
                     errorMessage = "There was a Mapdust service error.";
-                    JOptionPane.showMessageDialog(Main.parent, tr(errorMessage),
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(errorMessage),
                             tr("Error"), JOptionPane.ERROR_MESSAGE);
                 }
@@ -156,5 +159,5 @@
                     } catch (MapdustServiceHandlerException e) {
                         errorMessage = "There was a Mapdust service error.";
-                        JOptionPane.showMessageDialog(Main.parent,
+                        JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                 tr(errorMessage), tr("Error"),
                                 JOptionPane.ERROR_MESSAGE);
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCancel.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCancel.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCancel.java	(revision 34528)
@@ -30,5 +30,5 @@
 
 import java.awt.event.ActionEvent;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.AbstractDialog;
@@ -36,4 +36,5 @@
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustPluginState;
 import org.openstreetmap.josm.plugins.mapdust.service.value.Status;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -73,6 +74,6 @@
     public void actionPerformed(ActionEvent event) {
         if (event != null) {
-            String pluginState = Main.pref.get("mapdust.pluginState");
-            String status = Main.pref.get("selectedBug.status");
+            String pluginState = Config.getPref().get("mapdust.pluginState");
+            String status = Config.getPref().get("selectedBug.status");
             /* enable buttons */
             MapdustButtonPanel btnPanel =
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java	(revision 34528)
@@ -30,10 +30,13 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Iterator;
+
 import javax.swing.JButton;
 import javax.swing.JOptionPane;
-import org.openstreetmap.josm.Main;
+
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.ChangeBugStatusDialog;
@@ -50,4 +53,5 @@
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustComment;
 import org.openstreetmap.josm.plugins.mapdust.service.value.Status;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -109,14 +113,14 @@
                 if (errorMessage != null) {
                     /* invalid input data */
-                    JOptionPane.showMessageDialog(Main.parent, tr(errorMessage),
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(errorMessage),
                             tr("Missing input data"), JOptionPane.WARNING_MESSAGE);
                     return;
                 }
                 /* valid input data */
-                Main.pref.put("mapdust.nickname", nickname);
+                Config.getPref().put("mapdust.nickname", nickname);
                 MapdustBug selectedBug = mapdustGUI.getSelectedBug();
                 MapdustComment comment = new MapdustComment(selectedBug.getId(),
                         commentText, nickname);
-                String pluginState = Main.pref.get("mapdust.pluginState");
+                String pluginState = Config.getPref().get("mapdust.pluginState");
                 if (pluginState.equals(MapdustPluginState.OFFLINE.getValue())) {
                     /* offline state, put to the actions list */
@@ -141,5 +145,5 @@
                     } catch (MapdustServiceHandlerException e) {
                         errorMessage = "There was a Mapdust service error.";
-                        JOptionPane.showMessageDialog(Main.parent,
+                        JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                 tr(errorMessage), tr("Error"),
                                 JOptionPane.ERROR_MESSAGE);
@@ -153,5 +157,5 @@
                         } catch (MapdustServiceHandlerException e) {
                             errorMessage = "There was a Mapdust service error.";
-                            JOptionPane.showMessageDialog(Main.parent,
+                            JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                     tr(errorMessage), tr("Error"),
                                     JOptionPane.ERROR_MESSAGE);
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java	(revision 34528)
@@ -30,10 +30,13 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Iterator;
+
 import javax.swing.JButton;
 import javax.swing.JOptionPane;
-import org.openstreetmap.josm.Main;
+
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.CommentBugDialog;
@@ -49,4 +52,5 @@
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustComment;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -111,14 +115,14 @@
                 if (errorMessage != null) {
                     /* invalid input data */
-                    JOptionPane.showMessageDialog(Main.parent, tr(errorMessage),
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(errorMessage),
                             tr("Missing input data"), JOptionPane.WARNING_MESSAGE);
                     return;
                 }
                 /* valid */
-                Main.pref.put("mapdust.nickname", nickname);
+                Config.getPref().put("mapdust.nickname", nickname);
                 MapdustBug selectedBug = mapdustGUI.getSelectedBug();
                 MapdustComment comment = new MapdustComment(selectedBug.getId(),
                         commentText, nickname);
-                String pluginState = Main.pref.get("mapdust.pluginState");
+                String pluginState = Config.getPref().get("mapdust.pluginState");
                 if (pluginState.equals(MapdustPluginState.OFFLINE.getValue())) {
                     /* offline, save to actions list */
@@ -144,5 +148,5 @@
                     } catch (MapdustServiceHandlerException e) {
                         errorMessage = "There was a Mapdust service error.";
-                        JOptionPane.showMessageDialog(Main.parent,
+                        JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                 tr(errorMessage), tr("Error"),
                                 JOptionPane.ERROR_MESSAGE);
@@ -156,5 +160,5 @@
                         } catch (MapdustServiceHandlerException e) {
                             errorMessage = "There was a Mapdust service error.";
-                            JOptionPane.showMessageDialog(Main.parent,
+                            JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                     tr(errorMessage), tr("Error"),
                                     JOptionPane.ERROR_MESSAGE);
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java	(revision 34528)
@@ -30,10 +30,13 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Iterator;
+
 import javax.swing.JButton;
 import javax.swing.JOptionPane;
-import org.openstreetmap.josm.Main;
+
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.ChangeBugStatusDialog;
@@ -50,4 +53,5 @@
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustComment;
 import org.openstreetmap.josm.plugins.mapdust.service.value.Status;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -115,14 +119,14 @@
                 if (errorMessage != null) {
                     /* invalid input */
-                    JOptionPane.showMessageDialog(Main.parent, tr(errorMessage),
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(errorMessage),
                             tr("Missing input data"), JOptionPane.WARNING_MESSAGE);
                     return;
                 }
                 /* valid input */
-                Main.pref.put("mapdust.nickname", nickname);
+                Config.getPref().put("mapdust.nickname", nickname);
                 MapdustBug selectedBug = mapdustGUI.getSelectedBug();
                 MapdustComment comment = new MapdustComment(selectedBug.getId(),
                         commentText, nickname);
-                String pluginState = Main.pref.get("mapdust.pluginState");
+                String pluginState = Config.getPref().get("mapdust.pluginState");
                 if (pluginState.equals(MapdustPluginState.OFFLINE.getValue())) {
                     /* 'offline' state , add to action list */
@@ -149,5 +153,5 @@
                     } catch (MapdustServiceHandlerException e) {
                         errorMessage = "There was a Mapdust service error.";
-                        JOptionPane.showMessageDialog(Main.parent,
+                        JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                 tr(errorMessage), tr("Error"),
                                 JOptionPane.ERROR_MESSAGE);
@@ -162,5 +166,5 @@
                             errorMessage = "There was a Mapdust service error.";
                             errorMessage += "Mapdust bug report.";
-                            JOptionPane.showMessageDialog(Main.parent,
+                            JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                     tr(errorMessage), tr("Error"),
                                     JOptionPane.ERROR_MESSAGE);
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java	(revision 34528)
@@ -30,10 +30,13 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Iterator;
+
 import javax.swing.JButton;
 import javax.swing.JOptionPane;
-import org.openstreetmap.josm.Main;
+
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.ChangeBugStatusDialog;
@@ -50,4 +53,5 @@
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustComment;
 import org.openstreetmap.josm.plugins.mapdust.service.value.Status;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -112,14 +116,14 @@
                 if (errorMessage != null) {
                     /* invalid data */
-                    JOptionPane.showMessageDialog(Main.parent, tr(errorMessage),
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(errorMessage),
                             tr("Missing input data"), JOptionPane.WARNING_MESSAGE);
                     return;
                 }
                 /* valid */
-                Main.pref.put("mapdust.nickname", nickname);
+                Config.getPref().put("mapdust.nickname", nickname);
                 MapdustBug selectedBug = mapdustGUI.getSelectedBug();
                 MapdustComment comment = new MapdustComment(selectedBug.getId(),
                         commentText, nickname);
-                String pluginState = Main.pref.get("mapdust.pluginState");
+                String pluginState = Config.getPref().get("mapdust.pluginState");
                 if (pluginState.equals(MapdustPluginState.OFFLINE.getValue())) {
                     /* offline , save to action list */
@@ -145,5 +149,5 @@
                         errorMessage = "There was a Mapdust service error.";
                         errorMessage += "Mapdust bug report.";
-                        JOptionPane.showMessageDialog(Main.parent,
+                        JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                 tr(errorMessage), tr("Error"),
                                 JOptionPane.ERROR_MESSAGE);
@@ -157,5 +161,5 @@
                             errorMessage = "There was a Mapdust service error.";
                             errorMessage += "Mapdust bug report.";
-                            JOptionPane.showMessageDialog(Main.parent,
+                            JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                     tr(errorMessage), tr("Error"),
                                     JOptionPane.ERROR_MESSAGE);
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteRefresh.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteRefresh.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteRefresh.java	(revision 34528)
@@ -32,10 +32,12 @@
 import java.util.ArrayList;
 import java.util.Iterator;
+
 import javax.swing.AbstractAction;
 import javax.swing.JToggleButton;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.plugins.mapdust.gui.observer.MapdustUpdateObservable;
 import org.openstreetmap.josm.plugins.mapdust.gui.observer.MapdustUpdateObserver;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBugFilter;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -72,5 +74,5 @@
             JToggleButton btn = (JToggleButton) event.getSource();
             /* update the bugs */
-            Main.pref.putBoolean("mapdust.showError", true);
+            Config.getPref().putBoolean("mapdust.showError", true);
             notifyObservers(null, false);
             btn.setSelected(false);
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java	(revision 34528)
@@ -35,9 +35,10 @@
 import javax.swing.JToggleButton;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustActionUploader;
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustActionUploaderException;
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustPluginState;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -81,7 +82,7 @@
             JToggleButton btn = (JToggleButton) event.getSource();
             if (getMapdustGUI() != null) {
-                String pluginState = Main.pref.get("mapdust.pluginState");
+                String pluginState = Config.getPref().get("mapdust.pluginState");
                 if (pluginState.equals(MapdustPluginState.ONLINE.getValue())) {
-                    Main.pref.put("mapdust.pluginState",
+                    Config.getPref().put("mapdust.pluginState",
                             MapdustPluginState.OFFLINE.getValue());
                     btn.setSelected(false);
@@ -92,5 +93,5 @@
                     String message = "Do you want to submit your changes ";
                     message += "to Mapdust?";
-                    int result = JOptionPane.showConfirmDialog(Main.parent,
+                    int result = JOptionPane.showConfirmDialog(MainApplication.getMainFrame(),
                             tr(message), tr(title), JOptionPane.YES_NO_OPTION);
                     if (result == JOptionPane.YES_OPTION) {
@@ -101,10 +102,10 @@
                             String errorMessage = "There was a Mapdust service";
                             errorMessage += " error.";
-                            JOptionPane.showMessageDialog(Main.parent,
+                            JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                     tr(errorMessage), tr("Error"),
                                     JOptionPane.ERROR_MESSAGE);
                         }
                     }
-                    Main.pref.put("mapdust.pluginState",
+                    Config.getPref().put("mapdust.pluginState",
                             MapdustPluginState.ONLINE.getValue());
                     btn.setSelected(false);
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/MapdustExecuteAction.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/MapdustExecuteAction.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/MapdustExecuteAction.java	(revision 34528)
@@ -31,4 +31,5 @@
 import javax.swing.AbstractAction;
 import javax.swing.JToggleButton;
+
 import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.AbstractDialog;
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/MapdustShowAction.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/MapdustShowAction.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/MapdustShowAction.java	(revision 34528)
@@ -30,4 +30,5 @@
 
 import javax.swing.AbstractAction;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.panel.MapdustButtonPanel;
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowCloseBugAction.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowCloseBugAction.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowCloseBugAction.java	(revision 34528)
@@ -30,6 +30,8 @@
 
 import java.awt.event.ActionEvent;
+
 import javax.swing.JMenuItem;
 import javax.swing.JToggleButton;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.ChangeBugStatusDialog;
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowCommentBugAction.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowCommentBugAction.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowCommentBugAction.java	(revision 34528)
@@ -30,6 +30,8 @@
 
 import java.awt.event.ActionEvent;
+
 import javax.swing.JMenuItem;
 import javax.swing.JToggleButton;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.CommentBugDialog;
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowFilterBugAction.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowFilterBugAction.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowFilterBugAction.java	(revision 34528)
@@ -34,11 +34,13 @@
 
 import java.awt.event.ActionEvent;
+
 import javax.swing.JMenuItem;
 import javax.swing.JToggleButton;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.FilterBugDialog;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.panel.MapdustButtonPanel;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -93,8 +95,8 @@
                     mapdustPlugin.getMapdustGUI().getSelectedBug();
             if (selectedBug != null) {
-                Main.pref.put("selectedBug.status", selectedBug.getStatus()
+                Config.getPref().put("selectedBug.status", selectedBug.getStatus()
                         .getValue());
             } else {
-                Main.pref.put("selectedBug.status", "");
+                Config.getPref().put("selectedBug.status", "");
             }
             disableButtons(getButtonPanel());
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowInvalidateBugAction.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowInvalidateBugAction.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowInvalidateBugAction.java	(revision 34528)
@@ -30,6 +30,8 @@
 
 import java.awt.event.ActionEvent;
+
 import javax.swing.JMenuItem;
 import javax.swing.JToggleButton;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.ChangeBugStatusDialog;
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowReOpenBugAction.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowReOpenBugAction.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowReOpenBugAction.java	(revision 34528)
@@ -30,6 +30,8 @@
 
 import java.awt.event.ActionEvent;
+
 import javax.swing.JMenuItem;
 import javax.swing.JToggleButton;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.ChangeBugStatusDialog;
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/AbstractDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/AbstractDialog.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/AbstractDialog.java	(revision 34528)
@@ -31,4 +31,5 @@
 import javax.swing.JDialog;
 import javax.swing.JToggleButton;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/ChangeBugStatusDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/ChangeBugStatusDialog.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/ChangeBugStatusDialog.java	(revision 34528)
@@ -33,4 +33,5 @@
 import java.awt.Image;
 import java.awt.Rectangle;
+
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
@@ -41,5 +42,5 @@
 import javax.swing.JToggleButton;
 import javax.swing.WindowConstants;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.action.adapter.WindowClose;
@@ -50,4 +51,5 @@
 import org.openstreetmap.josm.plugins.mapdust.gui.component.panel.MapdustButtonPanel;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.ComponentUtil;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -141,8 +143,8 @@
             txtNickname = ComponentUtil.createJTextField(bounds);
             /* get the nickname */
-            String nickname = Main.pref.get("mapdust.nickname");
+            String nickname = Config.getPref().get("mapdust.nickname");
             if (nickname.isEmpty()) {
                 /* if nickname is empty, then get JOSM username */
-                nickname = Main.pref.get("mapdust.josmUserName");
+                nickname = Config.getPref().get("mapdust.josmUserName");
             }
             if (nickname != null && !nickname.isEmpty()) {
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/CommentBugDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/CommentBugDialog.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/CommentBugDialog.java	(revision 34528)
@@ -33,4 +33,5 @@
 import java.awt.Image;
 import java.awt.Rectangle;
+
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -40,5 +41,5 @@
 import javax.swing.JToggleButton;
 import javax.swing.WindowConstants;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.action.adapter.WindowClose;
@@ -47,4 +48,5 @@
 import org.openstreetmap.josm.plugins.mapdust.gui.component.panel.MapdustButtonPanel;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.ComponentUtil;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -132,8 +134,8 @@
             txtNickname = ComponentUtil.createJTextField(bounds);
             /* get the nickname */
-            String nickname = Main.pref.get("mapdust.nickname");
+            String nickname = Config.getPref().get("mapdust.nickname");
             if (nickname.isEmpty()) {
                 /* if nickname is empty, get JOSM username */
-                nickname = Main.pref.get("mapdust.josmUserName");
+                nickname = Config.getPref().get("mapdust.josmUserName");
             }
             if (nickname != null && !nickname.isEmpty()) {
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/CreateBugDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/CreateBugDialog.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/CreateBugDialog.java	(revision 34528)
@@ -42,5 +42,4 @@
 import javax.swing.WindowConstants;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.action.adapter.WindowClose;
@@ -51,4 +50,5 @@
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.ComponentUtil;
 import org.openstreetmap.josm.plugins.mapdust.service.value.BugType;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -174,8 +174,8 @@
             txtNickname = ComponentUtil.createJTextField(bounds);
             /* get the nickname */
-            String nickname = Main.pref.get("mapdust.nickname");
+            String nickname = Config.getPref().get("mapdust.nickname");
             if (nickname.isEmpty()) {
                 /* if nickname is empty, get the JOSM username */
-                nickname = Main.pref.get("mapdust.josmUserName");
+                nickname = Config.getPref().get("mapdust.josmUserName");
             }
             if (nickname != null && !nickname.isEmpty()) {
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/FilterBugDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/FilterBugDialog.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/FilterBugDialog.java	(revision 34528)
@@ -39,8 +39,10 @@
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JToggleButton;
 import javax.swing.WindowConstants;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.action.adapter.WindowClose;
@@ -52,8 +54,8 @@
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.FilterCheckBox;
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustRelevanceValue;
+import org.openstreetmap.josm.plugins.mapdust.service.value.BugType;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBugFilter;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustRelevance;
 import org.openstreetmap.josm.plugins.mapdust.service.value.Status;
-import org.openstreetmap.josm.plugins.mapdust.service.value.BugType;
 import org.openstreetmap.josm.tools.ImageProvider;
 
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustAddressPanel.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustAddressPanel.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustAddressPanel.java	(revision 34528)
@@ -32,5 +32,7 @@
 import java.awt.Font;
 import java.awt.GridLayout;
+
 import javax.swing.JPanel;
+
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.ComponentUtil;
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java	(revision 34528)
@@ -30,4 +30,5 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.Color;
 import java.awt.Dimension;
@@ -37,4 +38,5 @@
 import java.text.DateFormat;
 import java.util.Locale;
+
 import javax.swing.JEditorPane;
 import javax.swing.JOptionPane;
@@ -43,5 +45,6 @@
 import javax.swing.event.HyperlinkListener;
 import javax.swing.text.html.HTMLEditorKit;
-import org.openstreetmap.josm.Main;
+
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.ComponentUtil;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
@@ -169,5 +172,5 @@
                     String errorMessage = "Error opening the MapDust bug ";
                     errorMessage += "details page";
-                    JOptionPane.showMessageDialog(Main.parent,
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                             tr(errorMessage), tr("Error"),
                             JOptionPane.ERROR_MESSAGE);
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugListPanel.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugListPanel.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugListPanel.java	(revision 34528)
@@ -34,4 +34,5 @@
 import java.util.Iterator;
 import java.util.List;
+
 import javax.swing.JList;
 import javax.swing.JMenuItem;
@@ -42,5 +43,5 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
@@ -58,4 +59,5 @@
 import org.openstreetmap.josm.plugins.mapdust.gui.observer.MapdustBugDetailsObserver;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -223,5 +225,5 @@
                     (MapdustBug) mapdustBugsJList.getSelectedValue();
             if (selectedBug != null) {
-                Main.pref.put("selectedBug.status", selectedBug.getStatus()
+                Config.getPref().put("selectedBug.status", selectedBug.getStatus()
                         .getValue());
                 if (selectedBug.getStatus().getKey().equals(1)) {
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java	(revision 34528)
@@ -30,12 +30,15 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.BorderLayout;
 import java.awt.Dimension;
+
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.ComponentUtil;
 import org.openstreetmap.josm.plugins.mapdust.gui.observer.MapdustBugDetailsObserver;
@@ -219,5 +222,5 @@
             String errorMessage = "There was a MapDust service error durring ";
             errorMessage += " the MapDust bug retrieve process.";
-            JOptionPane.showMessageDialog(Main.parent, tr(errorMessage),
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(errorMessage),
                     tr("Error"), JOptionPane.ERROR_MESSAGE);
         }
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustButtonPanel.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustButtonPanel.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustButtonPanel.java	(revision 34528)
@@ -30,8 +30,9 @@
 
 import java.awt.GridLayout;
+
 import javax.swing.AbstractAction;
 import javax.swing.JPanel;
 import javax.swing.JToggleButton;
-import org.openstreetmap.josm.Main;
+
 import org.openstreetmap.josm.plugins.mapdust.MapdustPlugin;
 import org.openstreetmap.josm.plugins.mapdust.gui.action.execute.ExecuteRefresh;
@@ -44,4 +45,5 @@
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.ComponentUtil;
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustPluginState;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -104,5 +106,5 @@
         String imagePath = "";
         if (btnWorkOffline == null) {
-            String pluginState = Main.pref.get("mapdust.pluginState");
+            String pluginState = Config.getPref().get("mapdust.pluginState");
             if (pluginState.equals(MapdustPluginState.ONLINE.getValue())) {
                 text = "Work offline mode";
@@ -174,5 +176,5 @@
             text = "Refresh";
             imagePath = "dialogs/mapdust_refresh.png";
-            String pluginState = Main.pref.get("mapdust.pluginState");
+            String pluginState = Config.getPref().get("mapdust.pluginState");
             AbstractAction action = new ExecuteRefresh();
             ((ExecuteRefresh) action).addObserver(mapdustPlugin);
@@ -251,5 +253,5 @@
         btnFilter.setSelected(false);
         btnFilter.setFocusable(false);
-        String pluginState = Main.pref.get("mapdust.pluginState");
+        String pluginState = Config.getPref().get("mapdust.pluginState");
         if (pluginState.equals(MapdustPluginState.ONLINE.getValue())) {
             btnRefresh.setEnabled(true);
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustCommentsPanel.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustCommentsPanel.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustCommentsPanel.java	(revision 34528)
@@ -35,7 +35,9 @@
 import java.text.DateFormat;
 import java.util.Locale;
+
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
+
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.ComponentUtil;
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustComment;
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustDescriptionPanel.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustDescriptionPanel.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustDescriptionPanel.java	(revision 34528)
@@ -33,7 +33,9 @@
 import java.awt.Dimension;
 import java.awt.Font;
+
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
+
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.ComponentUtil;
 
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java	(revision 34528)
@@ -30,8 +30,10 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.net.URI;
+
 import javax.swing.JEditorPane;
 import javax.swing.JOptionPane;
@@ -41,7 +43,9 @@
 import javax.swing.event.HyperlinkListener;
 import javax.swing.text.html.HTMLEditorKit;
-import org.openstreetmap.josm.Main;
+
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.mapdust.gui.component.util.ComponentUtil;
 import org.openstreetmap.josm.plugins.mapdust.util.Configuration;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.OpenBrowser;
 
@@ -85,5 +89,5 @@
             } catch (Exception e) {
                 String errorMessage = "Error opening the MapDust wiki page";
-                JOptionPane.showMessageDialog(Main.parent, tr(errorMessage),
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(errorMessage),
                         tr("Error"), JOptionPane.ERROR_MESSAGE);
             }
@@ -101,5 +105,5 @@
         Integer version;
         try {
-            version = Integer.decode(Main.pref.get("mapdust.version"));
+            version = Integer.decode(Config.getPref().get("mapdust.version"));
         } catch (NumberFormatException e) {
             version = null;
@@ -108,5 +112,5 @@
         Integer localVersion;
         try {
-            localVersion = Integer.decode(Main.pref.get("mapdust.localVersion"));
+            localVersion = Integer.decode(Config.getPref().get("mapdust.localVersion"));
         } catch (NumberFormatException e) {
             localVersion = null;
@@ -118,7 +122,7 @@
         sb.append("<i style='color:red;font-size:10px'>");
         if (version != null && localVersion != null && version <= localVersion) {
-            sb.append(Main.pref.get("mapdust.version")).append("</i>.</b><br>");
+            sb.append(Config.getPref().get("mapdust.version")).append("</i>.</b><br>");
         } else {
-            sb.append(Main.pref.get("mapdust.localVersion"));
+            sb.append(Config.getPref().get("mapdust.localVersion"));
             sb.append("</i>. There is an update available. ");
             sb.append("Please update to version ");
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/http/HttpConnector.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/http/HttpConnector.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/http/HttpConnector.java	(revision 34528)
@@ -41,9 +41,7 @@
 import java.util.Map;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.mapdust.util.retry.RetryAgent;
 import org.openstreetmap.josm.plugins.mapdust.util.retry.RetrySetup;
 import org.openstreetmap.josm.tools.Logging;
-
 
 /**
Index: /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetryAgent.java
===================================================================
--- /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetryAgent.java	(revision 34527)
+++ /applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetryAgent.java	(revision 34528)
@@ -28,5 +28,4 @@
 package org.openstreetmap.josm.plugins.mapdust.util.retry;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Logging;