Index: /applications/editors/josm/plugins/ImportImagePlugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/build.xml	(revision 31113)
+++ /applications/editors/josm/plugins/ImportImagePlugin/build.xml	(revision 31114)
@@ -5,5 +5,5 @@
 	<property name="commit.message" value="use consistent plugin name (don't mix up the words)" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="7001" />
+	<property name="plugin.main.version" value="7817" />
 
     <property name="plugin.author" value="Christoph Beekmans, Fabian Kowitz, Anna Robaszkiewicz, Oliver Kuhn, Martin Ulitzny"/>
Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java	(revision 31113)
+++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java	(revision 31114)
@@ -305,5 +305,5 @@
         BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
         visitBoundingBox(boundingXYVisitor);
-        Main.map.mapView.recalculateCenterScale(boundingXYVisitor);
+        Main.map.mapView.zoomTo(boundingXYVisitor);
     }
 
Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java	(revision 31113)
+++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java	(revision 31114)
@@ -60,5 +60,5 @@
             BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
             layer.visitBoundingBox(boundingXYVisitor);
-            Main.map.mapView.recalculateCenterScale(boundingXYVisitor);
+            Main.map.mapView.zoomTo(boundingXYVisitor);
         }
     }
Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java	(revision 31113)
+++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java	(revision 31114)
@@ -60,5 +60,5 @@
             BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
             layer.visitBoundingBox(boundingXYVisitor);
-            Main.map.mapView.recalculateCenterScale(boundingXYVisitor);
+            Main.map.mapView.zoomTo(boundingXYVisitor);
         }
     }
Index: /applications/editors/josm/plugins/piclayer/build.xml
===================================================================
--- /applications/editors/josm/plugins/piclayer/build.xml	(revision 31113)
+++ /applications/editors/josm/plugins/piclayer/build.xml	(revision 31114)
@@ -3,5 +3,5 @@
     <property name="commit.message" value="[josm/PicLayer] - #10335 add interpolation hints for the image drawing"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="7817"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java
===================================================================
--- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java	(revision 31113)
+++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java	(revision 31114)
@@ -172,5 +172,5 @@
             BoundingXYVisitor v = new BoundingXYVisitor();
             layer.visitBoundingBox(v);
-            Main.map.mapView.recalculateCenterScale(v);
+            Main.map.mapView.zoomTo(v);
         }
     }
Index: /applications/editors/josm/plugins/public_transport/build.xml
===================================================================
--- /applications/editors/josm/plugins/public_transport/build.xml	(revision 31113)
+++ /applications/editors/josm/plugins/public_transport/build.xml	(revision 31114)
@@ -5,5 +5,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="7575"/>
+    <property name="plugin.main.version" value="7817"/>
 
     <property name="plugin.author" value="Roland M. Olbricht"/>
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java	(revision 31113)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java	(revision 31114)
@@ -67,5 +67,6 @@
   }
 
-  public void actionPerformed(ActionEvent event) {
+  @Override
+public void actionPerformed(ActionEvent event) {
 
     if (dialog == null)
@@ -316,5 +317,5 @@
       return;
     box.enlargeBoundingBox();
-    Main.map.mapView.recalculateCenterScale(box);
+    Main.map.mapView.zoomTo(box);
   }
 
@@ -357,4 +358,5 @@
   private class FocusAddAction extends AbstractAction
   {
+    @Override
     public void actionPerformed(ActionEvent e)
     {
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java	(revision 31113)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java	(revision 31114)
@@ -64,4 +64,5 @@
     }
 
+    @Override
     public void valueChanged(ListSelectionEvent e) {
       root.routesSelectionChanged();
@@ -76,4 +77,5 @@
     }
 
+    @Override
     public int compareTo(RouteReference rr) {
       if (route.get("route") != null)
@@ -124,4 +126,5 @@
     }
 
+    @Override
     public String toString() {
       String buf = route.get("route");
@@ -162,4 +165,5 @@
     }
 
+    @Override
     public boolean isCellEditable(int row, int column) {
       if ((column == 0) && (hasFixedKeys))
@@ -207,4 +211,5 @@
     }
 
+    @Override
     public void tableChanged(TableModelEvent e)
     {
@@ -242,4 +247,5 @@
     }
 
+    @Override
     public TableCellEditor getCellEditor(int row, int column) {
       TableCellEditor editor = null;
@@ -266,4 +272,5 @@
     public Vector<Node> nodes = new Vector<Node>();
 
+    @Override
     public boolean isCellEditable(int row, int column) {
       if (column != STOPLIST_ROLE_COLUMN)
@@ -272,8 +279,10 @@
     }
 
+    @Override
     public void addRow(Object[] obj) {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public void insertRow(int insPos, Object[] obj) {
       throw new UnsupportedOperationException();
@@ -323,4 +332,5 @@
 
   private class StoplistTableModelListener implements TableModelListener {
+    @Override
     public void tableChanged(TableModelEvent e)
     {
@@ -383,4 +393,5 @@
     }
 
+    @Override
     public int compareTo(StopReference sr) {
       if (this.index < sr.index)
@@ -426,5 +437,6 @@
   }
 
-  public void actionPerformed(ActionEvent event) {
+  @Override
+public void actionPerformed(ActionEvent event) {
     Frame frame = JOptionPane.getFrameForComponent(Main.parent);
     DataSet mainDataSet = Main.main.getCurrentDataSet();
@@ -1078,5 +1090,5 @@
       for (int i = 0; i < relsListModel.size(); ++i)
       {
-    if (currentRoute == ((RouteReference)relsListModel.elementAt(i)).route)
+    if (currentRoute == relsListModel.elementAt(i).route)
       relsList.setSelectedIndex(i);
       }
@@ -1093,5 +1105,5 @@
       for (int i = 0; i < relsListModel.size(); ++i)
       {
-    if (currentRoute == ((RouteReference)relsListModel.elementAt(i)).route)
+    if (currentRoute == relsListModel.elementAt(i).route)
       relsList.setSelectedIndex(i);
       }
@@ -1151,5 +1163,5 @@
       for (int i = 0; i < relsListModel.size(); ++i)
       {
-        if (currentRoute == ((RouteReference)relsListModel.elementAt(i)).route)
+        if (currentRoute == relsListModel.elementAt(i).route)
           relsList.setSelectedIndex(i);
       }
@@ -1231,5 +1243,5 @@
         return;
       box.enlargeBoundingBox();
-      Main.map.mapView.recalculateCenterScale(box);
+      Main.map.mapView.zoomTo(box);
     }
     else if ("routePattern.itineraryMark".equals(event.getActionCommand()))
@@ -1514,5 +1526,5 @@
         return;
       box.enlargeBoundingBox();
-      Main.map.mapView.recalculateCenterScale(box);
+      Main.map.mapView.zoomTo(box);
     }
     else if ("routePattern.stoplistMark".equals(event.getActionCommand()))
@@ -2064,5 +2076,5 @@
     if (relsList.isSelectedIndex(selectedPos))
     {
-      currentRoute = ((RouteReference)relsListModel.elementAt(selectedPos)).route;
+      currentRoute = relsListModel.elementAt(selectedPos).route;
       tabbedPane.setEnabledAt(1, true);
       tabbedPane.setEnabledAt(2, true);
@@ -2163,5 +2175,5 @@
         if (!(way.isIncomplete()))
         {
-          if ("backward".equals((String)(itineraryData.getValueAt(i, 1))))
+          if ("backward".equals((itineraryData.getValueAt(i, 1))))
           {
             for (int j = way.getNodesCount()-2; j >= 0; --j)
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 31113)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 31114)
@@ -74,5 +74,6 @@
   }
 
-  public void actionPerformed(ActionEvent event)
+  @Override
+public void actionPerformed(ActionEvent event)
   {
     if (dialog == null)
@@ -246,5 +247,5 @@
     if (selectedPos >= 0)
     {
-      currentTrack = ((TrackReference)tracksListModel.elementAt(selectedPos));
+      currentTrack = (tracksListModel.elementAt(selectedPos));
       dialog.setTrackValid(true);
 
@@ -256,5 +257,5 @@
       //Prepare Stoplist
       dialog.setStoplistTableModel
-          (((TrackReference)tracksListModel.elementAt(selectedPos)).stoplistTM);
+          (tracksListModel.elementAt(selectedPos).stoplistTM);
     }
     else
@@ -354,5 +355,5 @@
       return;
     box.enlargeBoundingBox();
-    Main.map.mapView.recalculateCenterScale(box);
+    Main.map.mapView.zoomTo(box);
   }
 
@@ -402,5 +403,6 @@
     return new AbstractAction()
     {
-      public void actionPerformed(ActionEvent e)
+      @Override
+    public void actionPerformed(ActionEvent e)
       {
         JTable table = dialog.getWaypointsTable();
@@ -430,5 +432,6 @@
     return new AbstractAction()
     {
-      public void actionPerformed(ActionEvent e)
+      @Override
+    public void actionPerformed(ActionEvent e)
       {
         JTable table = dialog.getStoplistTable();
@@ -446,4 +449,5 @@
   private class FocusWaypointNameAction extends AbstractAction
   {
+    @Override
     public void actionPerformed(ActionEvent e)
     {
@@ -476,4 +480,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e)
     {
@@ -499,4 +504,5 @@
   private class FocusTrackStoplistNameAction extends AbstractAction
   {
+    @Override
     public void actionPerformed(ActionEvent e)
     {
@@ -529,4 +535,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e)
     {
Index: /applications/editors/josm/plugins/walkingpapers/build.xml
===================================================================
--- /applications/editors/josm/plugins/walkingpapers/build.xml	(revision 31113)
+++ /applications/editors/josm/plugins/walkingpapers/build.xml	(revision 31114)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="7817"/>
 
     <property name="plugin.author" value="Frederik Ram"/>
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 31113)
+++ /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java	(revision 31114)
@@ -79,5 +79,5 @@
                 BoundingXYVisitor bbox = new BoundingXYVisitor();
                 bbox.visit(printBounds);
-                Main.map.mapView.recalculateCenterScale(bbox);
+                Main.map.mapView.zoomTo(bbox);
                 needRedraw = true;
             }
Index: /applications/editors/josm/plugins/wikipedia/build.xml
===================================================================
--- /applications/editors/josm/plugins/wikipedia/build.xml	(revision 31113)
+++ /applications/editors/josm/plugins/wikipedia/build.xml	(revision 31114)
@@ -5,5 +5,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="7521"/>
+    <property name="plugin.main.version" value="7817"/>
     <property name="plugin.canloadatruntime" value="true"/>
 
Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java	(revision 31113)
+++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java	(revision 31114)
@@ -74,5 +74,5 @@
                             BoundingXYVisitor bbox = new BoundingXYVisitor();
                             bbox.visit(entry.coordinate);
-                            Main.map.mapView.recalculateCenterScale(bbox);
+                            Main.map.mapView.zoomTo(bbox);
                         }
                         SearchAction.search(entry.name.replaceAll("\\(.*\\)", ""), SearchAction.SearchMode.replace);