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 32770)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 32771)
@@ -742,5 +742,5 @@
             if (arg0 == null) return 1;
 
-            return new Integer(score).compareTo(new Integer(arg0.score));
+            return Integer.valueOf(score).compareTo(Integer.valueOf(arg0.score));
         }
     }
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPreferences.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPreferences.java	(revision 32770)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPreferences.java	(revision 32771)
@@ -25,4 +25,5 @@
      */
     public static class Factory implements PreferenceSettingFactory {
+        @Override
         public PreferenceSetting createPreferenceSetting() {
             return new FixAddressesPreferences();
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java	(revision 32770)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java	(revision 32771)
@@ -66,6 +66,5 @@
             Collection<? extends OsmPrimitive> selection) {
         // Enable button if there is either a selection or at least a data set
-        setEnabled( selection != null && !selection.isEmpty() ||
-                    (getLayerManager().getEditDataSet() != null));
+        setEnabled((selection != null && !selection.isEmpty()) || getLayerManager().getEditDataSet() != null);
     }
 
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 32770)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 32771)
@@ -195,5 +195,5 @@
 
     // TODO: Put in separate file
-    private class GuessStreetValueHandler extends GuessedValueHandler {
+    private static class GuessStreetValueHandler extends GuessedValueHandler {
         public GuessStreetValueHandler(String tag) {
             this(tag, null);
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java	(revision 32770)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java	(revision 32771)
@@ -66,4 +66,5 @@
     public void visit(IAllKnowingTrashHeap trashHeap, IProblemVisitor visitor);
 
+    @Override
     int compareTo(IOSMEntity o);
 }
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java	(revision 32770)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java	(revision 32771)
@@ -108,4 +108,5 @@
         }
 
+        @Override
         public void mouseClicked(MouseEvent e) {
             TableColumnModel colModel = table.getColumnModel();
@@ -141,5 +142,5 @@
      * Internal base class to sort items by different columns.
      */
-    protected abstract class ColumnSorter<E> implements Comparator<E> {
+    protected static abstract class ColumnSorter<E> implements Comparator<E> {
         private int column;
         private boolean ascending;
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java	(revision 32770)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java	(revision 32771)
@@ -117,5 +117,5 @@
      * Internal class StreetModelSorter.
      */
-    class IncompleteAddressModelSorter extends ColumnSorter<OSMAddress> {
+    static class IncompleteAddressModelSorter extends ColumnSorter<OSMAddress> {
 
         /**
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java	(revision 32770)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java	(revision 32771)
@@ -105,5 +105,5 @@
      * Internal class StreetModelSorter.
      */
-    class StreetModelSorter extends ColumnSorter<OSMStreet> {
+    static class StreetModelSorter extends ColumnSorter<OSMStreet> {
 
         public StreetModelSorter(int column, boolean asc) {
@@ -111,4 +111,5 @@
         }
 
+        @Override
         public int compare(OSMStreet arg0, OSMStreet arg1) {
             if (arg0 == null || arg1 == null) return 0;
@@ -128,6 +129,6 @@
                 }
             case 2:
-                return new Integer(arg0.getNumberOfAddresses()).
-                                compareTo(new Integer(arg1.getNumberOfAddresses()));
+                return Integer.valueOf(arg0.getNumberOfAddresses()).
+                                compareTo(Integer.valueOf(arg1.getNumberOfAddresses()));
             default:
             }
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java	(revision 32770)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java	(revision 32771)
@@ -128,5 +128,5 @@
      * Internal class StreetModelSorter.
      */
-    class UnresolvedAddressModelSorter extends ColumnSorter<OSMAddress> {
+    static class UnresolvedAddressModelSorter extends ColumnSorter<OSMAddress> {
 
         public UnresolvedAddressModelSorter(int column, boolean asc) {