Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java	(revision 18408)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java	(revision 18409)
@@ -53,7 +53,8 @@
 
         // And finalize initializing the form.
-        setupDialog(mainPanel, new String[] { "ok.png", "cancel.png" });
+        setContent(mainPanel);
+        setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setupDialog();
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-        setAlwaysOnTop(false);
 
         // TODO: Why does it always crash if the modality is set in constructor?
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 18408)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java	(revision 18409)
@@ -50,5 +50,7 @@
 
         initComponents();
-        setupDialog(mainPanel, new String[] { "ok.png", "cancel.png"});
+        setContent(mainPanel);
+        setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setupDialog();
 
         oblastComboBox.setRenderer(new AddressElementRenderer());
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 18408)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java	(revision 18409)
@@ -69,5 +69,7 @@
 
         // And finalize initializing the form.
-        setupDialog(mainPanel, new String[] {});
+        setContent(mainPanel);
+        setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setupDialog();
     }
 
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 18408)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java	(revision 18409)
@@ -19,5 +19,5 @@
 /**
  * Updates the names in the database according the map.
- * 
+ *
  * @author Radomír Černoch, radomir.cernoch@gmail.com
  */
@@ -41,10 +41,10 @@
         for (Street elem : results.keySet()) {
             try {
-                
+
                 OsmPrimitive match = results.get(elem).get();
                 if (match == null) continue;
 
                 map.put(elem, match);
-                
+
             } catch (InterruptedException ex) {
                 logger.log(Level.SEVERE, "Thread interrupted during matching", ex);
@@ -55,5 +55,5 @@
     }
 
-    private class StreetMatcher implements Callable {
+    private class StreetMatcher implements Callable<OsmPrimitive> {
 
         private AddressElement elem;
@@ -75,5 +75,5 @@
                 if (prim.get("name").equals(elem.getName()))
                     return prim;
-                
+
                 if (StringUtils.matchAbbrev(prim.get("name"), elem.getName()))
                     candidate = prim;