Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 4074)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 4126)
@@ -76,5 +76,5 @@
         their = new DataSet();
         their.setVersion("0.6");
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java	(revision 4074)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java	(revision 4126)
@@ -29,5 +29,5 @@
     @BeforeClass
     public static void setUp() {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         Main.pref = new Preferences();
     }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java	(revision 4074)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java	(revision 4126)
@@ -29,5 +29,5 @@
     @BeforeClass
     public static void setUp() {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java	(revision 4074)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java	(revision 4126)
@@ -66,5 +66,5 @@
     @Test
     public void testRemove() throws Exception {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/restriction.osm"), NullProgressMonitor.INSTANCE);
         removeAllTest(ds);
@@ -73,5 +73,5 @@
     @Test
     public void testMove() throws Exception {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/restriction.osm"), NullProgressMonitor.INSTANCE);
 
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java	(revision 4074)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java	(revision 4126)
@@ -16,5 +16,5 @@
     @BeforeClass
     public static void setUp() {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         Main.pref = new Preferences();
     }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 4074)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 4126)
@@ -37,5 +37,5 @@
     @BeforeClass
     public static void setUp() {
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
         Main.pref = new Preferences();
     }
Index: trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java	(revision 4074)
+++ trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java	(revision 4126)
@@ -15,5 +15,5 @@
     @BeforeClass
     public static void setUp() {
-        Main.proj = new SwissGrid();
+        Main.setProjection(new SwissGrid());
     }
 
@@ -62,6 +62,8 @@
         {
             LatLon ll = new LatLon(46.518, 6.567);
-            EastNorth en = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en);
+            EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en);
+            }
             assertTrue("Lausanne", Math.abs(en.east() - 533111.69) < 0.1);
             assertTrue("Lausanne", Math.abs(en.north() - 152227.85) < 0.1);
@@ -70,6 +72,8 @@
         {
             LatLon ll = new LatLon(47.78, 8.58);
-            EastNorth en = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en);
+            EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en);
+            }
             assertTrue("Schafouse", Math.abs(en.east() - 685544.16) < 0.1);
             assertTrue("Schafouse", Math.abs(en.north() - 292782.91) < 0.1);
@@ -78,6 +82,8 @@
         {
             LatLon ll = new LatLon(46.58, 10.48);
-            EastNorth en = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en);
+            EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en);
+            }
             assertTrue("Grinson", Math.abs(en.east() - 833068.04) < 0.1);
             assertTrue("Grinson", Math.abs(en.north() - 163265.39) < 0.1);
@@ -86,6 +92,8 @@
         {
             LatLon ll = new LatLon(46.0 + 57.0 / 60 + 3.89813884505 / 3600, 7.0 + 26.0 / 60 + 19.076595154147 / 3600);
-            EastNorth en = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en);
+            EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en);
+            }
             assertTrue("Berne", Math.abs(en.east() - 600000.0) < 0.1);
             assertTrue("Berne", Math.abs(en.north() - 200000.0) < 0.1);
@@ -93,6 +101,8 @@
         {
             LatLon ll = new LatLon(46.0 + 2.0 / 60 + 38.87 / 3600, 8.0 + 43.0 / 60 + 49.79 / 3600);
-            EastNorth en = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en);
+            EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en);
+            }
             assertTrue("Ref", Math.abs(en.east() - 700000.0) < 0.1);
             assertTrue("Ref", Math.abs(en.north() - 100000.0) < 0.1);
@@ -105,6 +115,8 @@
         {
             EastNorth en = new EastNorth(533111.69, 152227.85);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            if (debug) System.out.println(ll);
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            if (debug) {
+                System.out.println(ll);
+            }
             assertTrue("Lausanne", Math.abs(ll.lat() - 46.518) < 0.00001);
             assertTrue("Lausanne", Math.abs(ll.lon() - 6.567) < 0.00001);
@@ -113,6 +125,8 @@
         {
             EastNorth en = new EastNorth(685544.16, 292782.91);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            if (debug) System.out.println(ll);
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            if (debug) {
+                System.out.println(ll);
+            }
             assertTrue("Schafouse", Math.abs(ll.lat() - 47.78) < 0.00001);
             assertTrue("Schafouse", Math.abs(ll.lon() - 8.58) < 0.00001);
@@ -121,6 +135,8 @@
         {
             EastNorth en = new EastNorth(833068.04, 163265.39);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            if (debug) System.out.println(ll);
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            if (debug) {
+                System.out.println(ll);
+            }
             assertTrue("Grinson", Math.abs(ll.lat() - 46.58) < 0.00001);
             assertTrue("Grinson", Math.abs(ll.lon() - 10.48) < 0.00001);
@@ -129,6 +145,8 @@
         {
             EastNorth en = new EastNorth(600000.0, 200000.0);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            if (debug) System.out.println(ll);
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            if (debug) {
+                System.out.println(ll);
+            }
             assertTrue("Berne", Math.abs(ll.lat() - (46.0 + 57.0 / 60 + 3.89813884505 / 3600)) < 0.00001);
             assertTrue("Berne", Math.abs(ll.lon() - (7.0 + 26.0 / 60 + 19.076595154147 / 3600)) < 0.00001);
@@ -137,6 +155,8 @@
         {
             EastNorth en = new EastNorth(700000.0, 100000.0);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            if (debug) System.out.println(ll);
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            if (debug) {
+                System.out.println(ll);
+            }
             assertTrue("Ref", Math.abs(ll.lat() - (46.0 + 2.0 / 60 + 38.87 / 3600)) < 0.00001);
             assertTrue("Ref", Math.abs(ll.lon() - (8.0 + 43.0 / 60 + 49.79 / 3600)) < 0.00001);
@@ -152,8 +172,12 @@
         {
             EastNorth en = new EastNorth(533111.69, 152227.85);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            EastNorth en2 = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en.east() - en2.east());
-            if (debug) System.out.println(en.north() - en2.north());
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            EastNorth en2 = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en.east() - en2.east());
+            }
+            if (debug) {
+                System.out.println(en.north() - en2.north());
+            }
             assertTrue("Lausanne", Math.abs(en.east() - en2.east()) < 0.002);
             assertTrue("Lausanne", Math.abs(en.north() - en2.north()) < 0.002);
@@ -162,8 +186,12 @@
         {
             EastNorth en = new EastNorth(685544.16, 292782.91);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            EastNorth en2 = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en.east() - en2.east());
-            if (debug) System.out.println(en.north() - en2.north());
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            EastNorth en2 = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en.east() - en2.east());
+            }
+            if (debug) {
+                System.out.println(en.north() - en2.north());
+            }
             assertTrue("Schafouse", Math.abs(en.east() - en2.east()) < 0.002);
             assertTrue("Schafouse", Math.abs(en.north() - en2.north()) < 0.002);
@@ -172,8 +200,12 @@
         {
             EastNorth en = new EastNorth(833068.04, 163265.39);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            EastNorth en2 = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en.east() - en2.east());
-            if (debug) System.out.println(en.north() - en2.north());
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            EastNorth en2 = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en.east() - en2.east());
+            }
+            if (debug) {
+                System.out.println(en.north() - en2.north());
+            }
             assertTrue("Grinson", Math.abs(en.east() - en2.east()) < 0.002);
             assertTrue("Grinson", Math.abs(en.north() - en2.north()) < 0.002);
@@ -182,8 +214,12 @@
         {
             EastNorth en = new EastNorth(600000.0, 200000.0);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            EastNorth en2 = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en.east() - en2.east());
-            if (debug) System.out.println(en.north() - en2.north());
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            EastNorth en2 = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en.east() - en2.east());
+            }
+            if (debug) {
+                System.out.println(en.north() - en2.north());
+            }
             assertTrue("Berne", Math.abs(en.east() - en2.east()) < 0.002);
             assertTrue("Berne", Math.abs(en.north() - en2.north()) < 0.002);
@@ -192,8 +228,12 @@
         {
             EastNorth en = new EastNorth(700000.0, 100000.0);
-            LatLon ll = Main.proj.eastNorth2latlon(en);
-            EastNorth en2 = Main.proj.latlon2eastNorth(ll);
-            if (debug) System.out.println(en.east() - en2.east());
-            if (debug) System.out.println(en.north() - en2.north());
+            LatLon ll = Main.getProjection().eastNorth2latlon(en);
+            EastNorth en2 = Main.getProjection().latlon2eastNorth(ll);
+            if (debug) {
+                System.out.println(en.east() - en2.east());
+            }
+            if (debug) {
+                System.out.println(en.north() - en2.north());
+            }
             assertTrue("Ref", Math.abs(en.east() - en2.east()) < 0.002);
             assertTrue("Ref", Math.abs(en.north() - en2.north()) < 0.002);
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 4074)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 4126)
@@ -47,5 +47,5 @@
     @BeforeClass
     public static void init() {
-        Main.proj = new Epsg4326();
+        Main.setProjection(new Epsg4326());
         Main.pref = new Preferences();
     }