Index: applications/editors/josm/plugins/FixAddresses/build.xml
===================================================================
--- applications/editors/josm/plugins/FixAddresses/build.xml	(revision 26298)
+++ applications/editors/josm/plugins/FixAddresses/build.xml	(revision 26299)
@@ -94,5 +94,5 @@
                 <attribute name="de_Plugin-Description" value="Findet ungültige Addressen und bietet Unterstützung zur deren Korrektur."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/FixAddresses"/>
-                <attribute name="Plugin-Mainversion" value="3835"/>
+                <attribute name="Plugin-Mainversion" value="4223"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
                 <attribute name="Plugin-Icon" value="images/fixaddresses.png"/>
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 26298)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 26299)
@@ -644,16 +644,16 @@
 
 	/* (non-Javadoc)
-	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primtivesAdded(org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent)
-	 */
-	@Override
-	public void primtivesAdded(PrimitivesAddedEvent event) {
+	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesAdded(org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent)
+	 */
+	@Override
+	public void primitivesAdded(PrimitivesAddedEvent event) {
 		invalidate();
 	}
 
 	/* (non-Javadoc)
-	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primtivesRemoved(org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent)
-	 */
-	@Override
-	public void primtivesRemoved(PrimitivesRemovedEvent event) {
+	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesRemoved(org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent)
+	 */
+	@Override
+	public void primitivesRemoved(PrimitivesRemovedEvent event) {
 		invalidate();
 	}
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java	(revision 26298)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java	(revision 26299)
@@ -155,17 +155,17 @@
 
 	/* (non-Javadoc)
-	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primtivesAdded(org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent)
-	 */
-	@Override
-	public void primtivesAdded(PrimitivesAddedEvent event) {
-		container.invalidate();
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primtivesRemoved(org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent)
-	 */
-	@Override
-	public void primtivesRemoved(PrimitivesRemovedEvent event) {
+	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesAdded(org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent)
+	 */
+	@Override
+	public void primitivesAdded(PrimitivesAddedEvent event) {
+		container.invalidate();
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesRemoved(org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent)
+	 */
+	@Override
+	public void primitivesRemoved(PrimitivesRemovedEvent event) {
 		container.invalidate();
 	}
Index: applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- applications/editors/josm/plugins/czechaddress/build.xml	(revision 26298)
+++ applications/editors/josm/plugins/czechaddress/build.xml	(revision 26299)
@@ -32,5 +32,5 @@
             <attribute name="Plugin-Description" value="Creating and handling address nodes and buildings within Czech Republic."/>
             <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/Cz:JOSM/Plugins/CzechAddress"/>
-            <attribute name="Plugin-Mainversion" value="3835"/>
+            <attribute name="Plugin-Mainversion" value="4126"/>
             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         </manifest>
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java	(revision 26298)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java	(revision 26299)
@@ -55,5 +55,5 @@
 
         Collection<Way> selectedWays = Main.main.getCurrentDataSet().getSelectedWays();
-        Collection<Way> newSelection = new LinkedList(Main.main.getCurrentDataSet().getSelectedWays());
+        Collection<Way> newSelection = new LinkedList<Way>(Main.main.getCurrentDataSet().getSelectedWays());
 
         for (Way area : selectedWays) {
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 26298)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 26299)
@@ -91,5 +91,5 @@
 
         if (message == MESSAGE_LOCATION_CHANGED) {
-            DataSet.selListeners.add(this);
+            DataSet.addSelectionListener(this);
 
             streetModel.setParent(CzechAddressPlugin.getLocation());
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java	(revision 26298)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java	(revision 26299)
@@ -101,5 +101,5 @@
 
         try {
-            center = Main.proj.eastNorth2latlon(Main.map.mapView.getCenter());
+            center = Main.getProjection().eastNorth2latlon(Main.map.mapView.getCenter());
         } catch (Exception e) {
             System.err.println("AUTO: No bounds to determine autolocation.");
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java	(revision 26298)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java	(revision 26299)
@@ -27,5 +27,5 @@
         if (singleton == null) {
             singleton = new SelectionMonitor();
-            DataSet.selListeners.add(singleton);
+            DataSet.addSelectionListener(singleton);
         }
         return singleton;
Index: applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 26298)
+++ applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 26299)
@@ -27,5 +27,5 @@
 <project name="openstreetbugs" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="3835"/>
+    <property name="plugin.main.version" value="4223"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java	(revision 26298)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java	(revision 26299)
@@ -79,5 +79,5 @@
         this.data = dataSet;
         this.dialog = dialog;
-        DataSet.selListeners.add(new SelectionChangedListener() {
+        DataSet.addSelectionListener(new SelectionChangedListener() {
             public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
                 selection = newSelection;
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 26298)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 26299)
@@ -451,7 +451,7 @@
     public void otherDatasetChange(AbstractDatasetChangedEvent event) {}
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {}
-
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {}
+    public void primitivesAdded(PrimitivesAddedEvent event) {}
+
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {}
 
     public void relationMembersChanged(RelationMembersChangedEvent event) {}
Index: applications/editors/josm/plugins/reltoolbox/build.xml
===================================================================
--- applications/editors/josm/plugins/reltoolbox/build.xml	(revision 26298)
+++ applications/editors/josm/plugins/reltoolbox/build.xml	(revision 26299)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="RelToolbox"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="3835"/>
+    <property name="plugin.main.version" value="4223"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java	(revision 26298)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java	(revision 26299)
@@ -165,5 +165,5 @@
     }
 
-    public void primtivesRemoved( PrimitivesRemovedEvent event ) {
+    public void primitivesRemoved( PrimitivesRemovedEvent event ) {
         if( chosenRelation != null && event.getPrimitives().contains(chosenRelation) )
             clear();
@@ -175,5 +175,5 @@
     }
 
-    public void primtivesAdded( PrimitivesAddedEvent event ) {}
+    public void primitivesAdded( PrimitivesAddedEvent event ) {}
     public void nodeMoved( NodeMovedEvent event ) {}
     public void otherDatasetChange( AbstractDatasetChangedEvent event ) {}
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java	(revision 26298)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java	(revision 26299)
@@ -34,5 +34,5 @@
         );
 
-        DataSet.selListeners.add(this);
+        DataSet.addSelectionListener(this);
         setEnabled(false);
     }
Index: applications/editors/josm/plugins/turnlanes/build.xml
===================================================================
--- applications/editors/josm/plugins/turnlanes/build.xml	(revision 26298)
+++ applications/editors/josm/plugins/turnlanes/build.xml	(revision 26299)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4126"/>
+    <property name="plugin.main.version" value="4223"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java
===================================================================
--- applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java	(revision 26298)
+++ applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java	(revision 26299)
@@ -98,10 +98,10 @@
         
         @Override
-        public void primtivesRemoved(PrimitivesRemovedEvent event) {
-            refresh();
-        }
-        
-        @Override
-        public void primtivesAdded(PrimitivesAddedEvent event) {
+        public void primitivesRemoved(PrimitivesRemovedEvent event) {
+            refresh();
+        }
+        
+        @Override
+        public void primitivesAdded(PrimitivesAddedEvent event) {
             refresh();
         }
Index: applications/editors/josm/plugins/turnrestrictions/build.xml
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/build.xml	(revision 26298)
+++ applications/editors/josm/plugins/turnrestrictions/build.xml	(revision 26299)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Adapt to JOSM core change (DefaultNameFormatter)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4100"/>
+    <property name="plugin.main.version" value="4223"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java	(revision 26298)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java	(revision 26299)
@@ -213,6 +213,6 @@
     }
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */}
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/}
+    public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */}
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/}
   
     /* ------------------------------------------------------------------------ */
Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModel.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModel.java	(revision 26298)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModel.java	(revision 26299)
@@ -410,6 +410,6 @@
     public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* irrelevant in this context */}
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {/* irrelevant in this context */}
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {/* irrelevant in this context */}
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         // relevant for the state of this model but not handled here. When the 
         // state of this model is applied to the dataset we check whether the 
Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetListModel.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetListModel.java	(revision 26298)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetListModel.java	(revision 26299)
@@ -87,5 +87,5 @@
     }
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {
         List<Relation> turnRestrictions = filterTurnRestrictions(event.getPrimitives());
         if (!turnRestrictions.isEmpty()) {
@@ -94,5 +94,5 @@
     }
 
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         List<Relation> turnRestrictions = filterTurnRestrictions(event.getPrimitives());
         if (!turnRestrictions.isEmpty()) {
Index: applications/editors/josm/plugins/walkingpapers/build.xml
===================================================================
--- applications/editors/josm/plugins/walkingpapers/build.xml	(revision 26298)
+++ applications/editors/josm/plugins/walkingpapers/build.xml	(revision 26299)
@@ -26,5 +26,5 @@
     -->
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="3835"/>
+    <property name="plugin.main.version" value="4126"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java
===================================================================
--- applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java	(revision 26298)
+++ applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java	(revision 26299)
@@ -238,5 +238,5 @@
             for (int y = viewportMinY - 1; y <= viewportMaxY + 1; y++) {
                 LatLon tmpLL = new LatLon(tileYToLat(y), lon);
-                pixelpos[x - viewportMinX + 1][y - viewportMinY + 1] = mv.getPoint(Main.proj
+                pixelpos[x - viewportMinX + 1][y - viewportMinY + 1] = mv.getPoint(Main.getProjection()
                         .latlon2eastNorth(tmpLL));
             }
Index: applications/editors/josm/plugins/wms-turbo-challenge2/build.xml
===================================================================
--- applications/editors/josm/plugins/wms-turbo-challenge2/build.xml	(revision 26298)
+++ applications/editors/josm/plugins/wms-turbo-challenge2/build.xml	(revision 26299)
@@ -67,5 +67,5 @@
                 <attribute name="Plugin-Icon" value="images/wmsracer.png"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WMS_Racer"/>
-                <attribute name="Plugin-Mainversion" value="4065"/>
+                <attribute name="Plugin-Mainversion" value="4126"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/GameWindow.java
===================================================================
--- applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/GameWindow.java	(revision 26298)
+++ applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/GameWindow.java	(revision 26299)
@@ -104,5 +104,5 @@
              * have a fix and add any distortions.  */
 
-            segment.add(new WayPoint(Main.proj.eastNorth2latlon(
+            segment.add(new WayPoint(Main.getProjection().eastNorth2latlon(
                     new EastNorth(lon, lat))));
         }