Index: applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- applications/editors/josm/plugins/czechaddress/build.xml	(revision 33251)
+++ applications/editors/josm/plugins/czechaddress/build.xml	(revision 33252)
@@ -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="10580"/>
+    <property name="plugin.main.version" value="11713"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java	(revision 33251)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java	(revision 33252)
@@ -134,5 +134,5 @@
 
         newFrame.addToggleDialog(FactoryDialog.getInstance());
-        newFrame.addMapMode(new IconToggleButton(new FactoryAction(newFrame)));
+        newFrame.addMapMode(new IconToggleButton(new FactoryAction()));
     }
 
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java	(revision 33251)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java	(revision 33252)
@@ -134,6 +134,6 @@
         for (int i = 0; i < charr.length; i++) {
             ch = charr[i];
-            if ((last >= 'a') && (last <= 'ž') ||
-                    (last >= 'A') && (last <= 'Ž'))
+            if ((last >= 'a' && last <= 'ž') ||
+                    (last >= 'A' && last <= 'Ž'))
                 ch = Character.toLowerCase(ch);
             else
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java	(revision 33251)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java	(revision 33252)
@@ -34,5 +34,5 @@
      * Default constructor, which sets the title, shortcut, ...
      */
-    public FactoryAction(MapFrame frame) {
+    public FactoryAction() {
         super("Sputit továrnu na adresy",
               "envelope-cursor.png",
@@ -41,5 +41,4 @@
                   "Sputit továrnu na adresy",
                   KeyEvent.VK_K, Shortcut.ALT_SHIFT),
-              frame,
               ImageProvider.getCursor("crosshair", "envelope-star-small"));
     }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java	(revision 33251)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java	(revision 33252)
@@ -3,4 +3,5 @@
 
 import java.util.List;
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -147,9 +148,14 @@
      * {@code true} otherwise.
      */
-    public boolean equals(AddressElement elem) {
-        if (elem == null)
-            return false;
-        else
-            return name.equals(elem.name) && this.parent == elem.parent;
+    @Override
+    public boolean equals(Object elem) {
+        return this == elem || (elem instanceof AddressElement
+                && name.equals(((AddressElement) elem).name)
+                && parent == ((AddressElement) elem).parent);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, parent);
     }
 
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 33251)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 33252)
@@ -388,5 +388,5 @@
 //==============================================================================
 
-    private class StreetListRenderer extends DefaultListCellRenderer {
+    private static class StreetListRenderer extends DefaultListCellRenderer {
         @Override
         public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
@@ -408,5 +408,5 @@
 //==============================================================================
 
-    private class HouseListRenderer extends DefaultListCellRenderer {
+    private static class HouseListRenderer extends DefaultListCellRenderer {
 
         Font plainFont = null;
@@ -446,5 +446,5 @@
 //==============================================================================
 
-    private class AllStreetProvider extends ElementWithHouses {
+    private static class AllStreetProvider extends ElementWithHouses {
         AllStreetProvider() {
             super("všechny domy");
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java	(revision 33251)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java	(revision 33252)
@@ -84,5 +84,5 @@
     }
 
-    private class DatabaseModel extends HalfCookedTreeModel {
+    private static class DatabaseModel extends HalfCookedTreeModel {
 
         @Override
@@ -376,5 +376,5 @@
     // End of variables declaration//GEN-END:variables
 
-    private class AddressElementRenderer extends DefaultTableCellRenderer {
+    private static class AddressElementRenderer extends DefaultTableCellRenderer {
 
         AddressElementRenderer() {}
@@ -389,5 +389,5 @@
     }
 
-    private class RenameModel<Element> implements TableModel {
+    private static class RenameModel<Element> implements TableModel {
 
         List<Element> elems = new ArrayList<>();
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java	(revision 33251)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java	(revision 33252)
@@ -59,5 +59,5 @@
     }
 
-    private class StreetMatcher implements Callable<OsmPrimitive> {
+    private static class StreetMatcher implements Callable<OsmPrimitive> {
 
         private AddressElement elem;