Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AbstractLayer.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AbstractLayer.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AbstractLayer.java	(revision 31433)
@@ -103,4 +103,5 @@
     }
 
+    @Override
     public String toString() {
         return name;
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Coordinate.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Coordinate.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Coordinate.java	(revision 31433)
@@ -24,16 +24,20 @@
     }
 
+    @Override
     public double getLat() {
         return data.y;
     }
 
+    @Override
     public void setLat(double lat) {
         data.y = lat;
     }
 
+    @Override
     public double getLon() {
         return data.x;
     }
 
+    @Override
     public void setLon(double lon) {
         data.x = lon;
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java	(revision 31433)
@@ -39,4 +39,5 @@
     private boolean doubleClickZoomEnabled = true;
 
+    @Override
     public void mouseDragged(MouseEvent e) {
         if (!movementEnabled || !isMoving)
@@ -55,4 +56,5 @@
     }
 
+    @Override
     public void mouseClicked(MouseEvent e) {
         if (doubleClickZoomEnabled && e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
@@ -61,4 +63,5 @@
     }
 
+    @Override
     public void mousePressed(MouseEvent e) {
         if (e.getButton() == movementMouseButton || isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK) {
@@ -68,4 +71,5 @@
     }
 
+    @Override
     public void mouseReleased(MouseEvent e) {
         if (e.getButton() == movementMouseButton || isPlatformOsx() && e.getButton() == MouseEvent.BUTTON1) {
@@ -75,4 +79,5 @@
     }
 
+    @Override
     public void mouseWheelMoved(MouseWheelEvent e) {
         if (wheelZoomEnabled) {
@@ -141,10 +146,13 @@
     }
 
+    @Override
     public void mouseEntered(MouseEvent e) {
     }
 
+    @Override
     public void mouseExited(MouseEvent e) {
     }
 
+    @Override
     public void mouseMoved(MouseEvent e) {
         // Mac OSX simulates with  ctrl + mouse 1  the second mouse button hence no dragging events get fired.
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java	(revision 31433)
@@ -84,5 +84,5 @@
         JButton button = new JButton("setDisplayToFitMapMarkers");
         button.addActionListener(new ActionListener() {
-
+            @Override
             public void actionPerformed(ActionEvent e) {
                 map().setDisplayToFitMapMarkers();
@@ -96,4 +96,5 @@
                 new MapQuestOpenAerialTileSource() });
         tileSourceSelector.addItemListener(new ItemListener() {
+            @Override
             public void itemStateChanged(ItemEvent e) {
                 map().setTileSource((TileSource) e.getItem());
@@ -103,4 +104,5 @@
         tileLoaderSelector = new JComboBox<>(new TileLoader[] {new OsmTileLoader(map())});
         tileLoaderSelector.addItemListener(new ItemListener() {
+            @Override
             public void itemStateChanged(ItemEvent e) {
                 map().setTileLoader((TileLoader) e.getItem());
@@ -113,4 +115,5 @@
         showMapMarker.setSelected(map().getMapMarkersVisible());
         showMapMarker.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 map().setMapMarkerVisible(showMapMarker.isSelected());
@@ -121,4 +124,5 @@
         final JCheckBox showTreeLayers = new JCheckBox("Tree Layers visible");
         showTreeLayers.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 treeMap.setTreeVisible(showTreeLayers.isSelected());
@@ -129,4 +133,5 @@
         final JCheckBox showToolTip = new JCheckBox("ToolTip visible");
         showToolTip.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 map().setToolTipText(null);
@@ -138,4 +143,5 @@
         showTileGrid.setSelected(map().isTileGridVisible());
         showTileGrid.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 map().setTileGridVisible(showTileGrid.isSelected());
@@ -146,4 +152,5 @@
         showZoomControls.setSelected(map().getZoomControlsVisible());
         showZoomControls.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 map().setZoomContolsVisible(showZoomControls.isSelected());
@@ -153,4 +160,5 @@
         final JCheckBox scrollWrapEnabled = new JCheckBox("Scrollwrap enabled");
         scrollWrapEnabled.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 map().setScrollWrapEnabled(scrollWrapEnabled.isSelected());
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java	(revision 31433)
@@ -139,4 +139,5 @@
         zoomSlider.setOpaque(false);
         zoomSlider.addChangeListener(new ChangeListener() {
+            @Override
             public void stateChanged(ChangeEvent e) {
                 setZoom(zoomSlider.getValue());
@@ -157,4 +158,5 @@
         zoomInButton.addActionListener(new ActionListener() {
 
+            @Override
             public void actionPerformed(ActionEvent e) {
                 zoomIn();
@@ -174,4 +176,5 @@
         zoomOutButton.addActionListener(new ActionListener() {
 
+            @Override
             public void actionPerformed(ActionEvent e) {
                 zoomOut();
@@ -1000,4 +1003,5 @@
     }
 
+    @Override
     public void tileLoadingFinished(Tile tile, boolean success) {
         tile.setLoaded(success);
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java	(revision 31433)
@@ -56,24 +56,30 @@
     }
 
+    @Override
     public Coordinate getCoordinate() {
         return coord;
     }
 
+    @Override
     public double getLat() {
         return coord.getLat();
     }
 
+    @Override
     public double getLon() {
         return coord.getLon();
     }
 
+    @Override
     public double getRadius() {
         return radius;
     }
 
+    @Override
     public STYLE getMarkerStyle() {
         return markerStyle;
     }
 
+    @Override
     public void paint(Graphics g, Point position, int radius) {
         int size_h = radius;
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java	(revision 31433)
@@ -31,4 +31,5 @@
         }
 
+        @Override
         public void run() {
             synchronized (tile) {
@@ -75,4 +76,5 @@
         }
 
+        @Override
         public Tile getTile() {
             return tile;
@@ -106,4 +108,5 @@
     }
 
+    @Override
     public TileJob createTileLoaderJob(final Tile tile) {
         return new OsmTileJob(tile);
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java	(revision 31433)
@@ -27,4 +27,5 @@
      * @return Latitude of the map marker position
      */
+    @Override
     double getLat();
 
@@ -32,4 +33,5 @@
      * @return Longitude of the map marker position
      */
+    @Override
     double getLon();
 
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java	(revision 31433)
@@ -52,4 +52,5 @@
      * @return default tile size to use, when not set in Imagery Preferences
      */
+    @Override
     public int getDefaultTileSize() {
         return OsmMercator.DEFAUL_TILE_SIZE;
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTileSource.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTileSource.java	(revision 31433)
@@ -77,4 +77,5 @@
     }
 
+    @Override
     public boolean isNoTileAtZoom(Map<String, List<String>> headers, int statusCode, byte[] content) {
         // default handler - when HTTP 404 is returned, then treat this situation as no tile at this zoom level
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java	(revision 31433)
@@ -37,4 +37,5 @@
         }
 
+        @Override
         public TileUpdate getTileUpdate() {
             return TileUpdate.IfNoneMatch;
@@ -72,4 +73,5 @@
         }
 
+        @Override
         public TileUpdate getTileUpdate() {
             return TileUpdate.LastModified;
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 31432)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 31433)
@@ -80,4 +80,5 @@
     }
 
+    @Override
     public Map<String, String> getHeaders() {
         return headers;