Index: trunk/src/org/openstreetmap/josm/data/osm/INode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/INode.java	(revision 14145)
+++ trunk/src/org/openstreetmap/josm/data/osm/INode.java	(revision 14146)
@@ -2,5 +2,4 @@
 package org.openstreetmap.josm.data.osm;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.ILatLon;
@@ -29,5 +28,5 @@
      * Replies the projected east/north coordinates.
      * <p>
-     * Uses the {@link Main#getProjection() global projection} to project the lat/lon-coordinates.
+     * Uses the {@link ProjectionRegistry#getProjection() global projection} to project the lat/lon-coordinates.
      * <p>
      * @return the east north coordinates or {@code null} if {@link #isLatLonKnown()} is false.
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 14145)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 14146)
@@ -14,5 +14,4 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -26,4 +25,5 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData.Intersection;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
@@ -484,5 +484,5 @@
          * Calculate area and perimeter length in the given projection.
          *
-         * @param projection the projection to use for the calculation, {@code null} defaults to {@link Main#getProjection()}
+         * @param projection the projection to use for the calculation, {@code null} defaults to {@link ProjectionRegistry#getProjection()}
          * @return area and perimeter
          */
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 14145)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 14146)
@@ -548,5 +548,5 @@
      * @param reason the reason for exiting
      * @return {@code true} if JOSM has been closed, {@code false} if the user has cancelled the operation.
-     * @since 12636 (specialized version of {@link Main#exitJosm})
+     * @since 12636 (specialized version of {@link Lifecycle#exitJosm})
      */
     public static boolean exitJosm(boolean exit, int exitCode, SaveLayersDialog.Reason reason) {
Index: trunk/src/org/openstreetmap/josm/gui/download/UserQueryList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/UserQueryList.java	(revision 14145)
+++ trunk/src/org/openstreetmap/josm/gui/download/UserQueryList.java	(revision 14146)
@@ -42,5 +42,4 @@
 import javax.swing.text.JTextComponent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -245,5 +244,5 @@
 
     /**
-     * Saves all elements from the list to {@link Main#pref}.
+     * Saves all elements from the list to {@link Config#getPref}.
      */
     private void savePreferences() {
@@ -262,5 +261,5 @@
 
     /**
-     * Loads the user saved items from {@link Main#pref}.
+     * Loads the user saved items from {@link Config#getPref}.
      * @return A set of the user saved items.
      */
Index: trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java	(revision 14145)
+++ trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java	(revision 14146)
@@ -8,6 +8,4 @@
 import java.net.URI;
 import java.net.URISyntaxException;
-
-import org.openstreetmap.josm.Main;
 
 /**
@@ -36,5 +34,5 @@
      * @return <code>null</code> for success or a string in case of an error.
      * @throws IllegalStateException if no platform is set to which opening the URL can be dispatched,
-     * {@link Main#platform}
+     * {@link PlatformManager#getPlatform}
      */
     public static String displayUrl(URI uri) {
@@ -85,5 +83,5 @@
      * @return <code>null</code> for success or a string in case of an error.
      * @throws IllegalStateException if no platform is set to which opening the URL can be dispatched,
-     * {@link Main#platform}
+     * {@link PlatformManager#getPlatform}
      */
     public static String displayUrl(String url) {