Index: /applications/editors/josm/plugins/czechaddress/.checkstyle
===================================================================
--- /applications/editors/josm/plugins/czechaddress/.checkstyle	(revision 32566)
+++ /applications/editors/josm/plugins/czechaddress/.checkstyle	(revision 32566)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="JOSM" location="/JOSM/tools/checkstyle/josm_checks.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="JOSM" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="DerivedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="data"/>
+    <filter-data value="images"/>
+    <filter-data value="styles"/>
+    <filter-data value="resources"/>
+    <filter-data value="scripts"/>
+  </filter>
+</fileset-config>
Index: /applications/editors/josm/plugins/czechaddress/.classpath
===================================================================
--- /applications/editors/josm/plugins/czechaddress/.classpath	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/.classpath	(revision 32566)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="src/" including="images/**" kind="src" path=""/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
Index: /applications/editors/josm/plugins/czechaddress/.project
===================================================================
--- /applications/editors/josm/plugins/czechaddress/.project	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/.project	(revision 32566)
@@ -16,7 +16,13 @@
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>
Index: /applications/editors/josm/plugins/czechaddress/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- /applications/editors/josm/plugins/czechaddress/.settings/org.eclipse.jdt.ui.prefs	(revision 32566)
+++ /applications/editors/josm/plugins/czechaddress/.settings/org.eclipse.jdt.ui.prefs	(revision 32566)
@@ -0,0 +1,60 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
Index: /applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- /applications/editors/josm/plugins/czechaddress/build.xml	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/build.xml	(revision 32566)
@@ -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="10279"/>
+    <property name="plugin.main.version" value="10420"/>
 
     <!-- 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 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress;
 
@@ -93,5 +94,5 @@
 
         if (!GraphicsEnvironment.isHeadless()) {
-        	ConflictResolver.getInstance();
+            ConflictResolver.getInstance();
         }
         SelectionMonitor.getInstance();
@@ -120,5 +121,5 @@
                             "Selhalo načtení databáze. Plugin je neaktivní.");
             }
-        }};
+        } };
 
         t.setPriority(Thread.MIN_PRIORITY);
@@ -136,15 +137,17 @@
     }
 
-    static public void initReasoner() {
+    public static void initReasoner() {
         Reasoner reasoner = Reasoner.getInstance();
 
-        synchronized(reasoner) {
+        synchronized (reasoner) {
             reasoner.reset();
             reasoner.openTransaction();
-            for (House house : location.getAllHouses())
+            for (House house : location.getAllHouses()) {
                 reasoner.update(house);
-
-            for (Street street : location.getAllStreets())
+            }
+
+            for (Street street : location.getAllStreets()) {
                 reasoner.update(street);
+            }
 
             DataSet dataSet = Main.getLayerManager().getEditDataSet();
@@ -162,6 +165,7 @@
     }
 
-    static private ElementWithStreets location = null;
-    static public  ElementWithStreets getLocation() {
+    private static ElementWithStreets location = null;
+
+    public static ElementWithStreets getLocation() {
         if (location == null)
             changeLocation();
@@ -169,5 +173,5 @@
     }
 
-    static public void changeLocation() {
+    public static void changeLocation() {
         ElementWithStreets newLocation = LocationSelector.selectLocation();
 
@@ -178,17 +182,27 @@
     }
 
-    static private final Set<StatusListener> listeners = new HashSet<>();
-    static public synchronized void addStatusListener(StatusListener l)    {listeners.add(l);}
-    static public synchronized void removeStatusListener(StatusListener l) {listeners.remove(l);}
-    static public synchronized void broadcastStatusChange(int statusMessage) {
-        for (StatusListener listener : listeners)
+    private static final Set<StatusListener> listeners = new HashSet<>();
+
+    public static synchronized void addStatusListener(StatusListener l) {
+        listeners.add(l);
+    }
+
+    public static synchronized void removeStatusListener(StatusListener l) {
+        listeners.remove(l);
+    }
+
+    public static synchronized void broadcastStatusChange(int statusMessage) {
+        for (StatusListener listener : listeners) {
             listener.pluginStatusChanged(statusMessage);
-    }
-
+        }
+    }
+
+    @Override
     public void pluginStatusChanged(int message) {
         if (message == MESSAGE_DATABASE_LOADED) {
             GuiHelper.runInEDTAndWait(new Runnable() {
                 @Override public void run() {
-                    czechMenu = Main.main.menu.addMenu("Address", tr("Address"), KeyEvent.VK_Z, Main.main.menu.getDefaultMenuPos(), ht("/Plugin/CzechAddress"));
+                    czechMenu = Main.main.menu.addMenu("Address", tr("Address"), KeyEvent.VK_Z,
+                            Main.main.menu.getDefaultMenuPos(), ht("/Plugin/CzechAddress"));
                     menuItems.add(MainMenu.add(czechMenu, new PointManipulatorAction()));
                     menuItems.add(MainMenu.add(czechMenu, new GroupManipulatorAction()));
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/DatabaseLoadException.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/DatabaseLoadException.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/DatabaseLoadException.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress;
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/MapUtils.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/MapUtils.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/MapUtils.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress;
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/NotNullList.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/NotNullList.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/NotNullList.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress;
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/Preferences.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/Preferences.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/Preferences.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress;
 
@@ -22,5 +23,5 @@
  * @author radek
  */
-public class Preferences extends DefaultTabPreferenceSetting {
+public final class Preferences extends DefaultTabPreferenceSetting {
 
     public JPanel thisPanel;
@@ -56,9 +57,9 @@
         thisPanel = new JPanel();
         initComponents();
-        addBuildingTag = Main.pref.getBoolean(KEY_BUILDINGTAG,    buildingCheckBox.isSelected());
-        addNewTag      = Main.pref.getBoolean(KEY_ADDNEWTAG,      addNewTagCheckBox.isSelected());
-        addNewTagKey   = Main.pref.get(       KEY_ADDNEWTAGKEY,   addNewTagKeyField.getText());
-        addNewTagValue = Main.pref.get(       KEY_ADDNEWTAGVALUE, addNewTagValueField.getText());
-        optimize       = Main.pref.getInteger(KEY_OPTIMIZE,       optimizeComboBox.getSelectedIndex());
+        addBuildingTag = Main.pref.getBoolean(KEY_BUILDINGTAG, buildingCheckBox.isSelected());
+        addNewTag = Main.pref.getBoolean(KEY_ADDNEWTAG, addNewTagCheckBox.isSelected());
+        addNewTagKey = Main.pref.get(KEY_ADDNEWTAGKEY, addNewTagKeyField.getText());
+        addNewTagValue = Main.pref.get(KEY_ADDNEWTAGVALUE, addNewTagValueField.getText());
+        optimize = Main.pref.getInteger(KEY_OPTIMIZE, optimizeComboBox.getSelectedIndex());
     }
 
@@ -94,4 +95,5 @@
         addNewTagCheckBox.setText("Novým primitivám přidávat tag:");
         addNewTagCheckBox.addChangeListener(new ChangeListener() {
+            @Override
             public void stateChanged(ChangeEvent evt) {
                 addNewTagChanged(evt);
@@ -99,4 +101,5 @@
         });
         addNewTagCheckBox.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent evt) {
                 addNewTagCheckBoxActionPerformed(evt);
@@ -114,5 +117,5 @@
         jLabel2.setText("Optimalizovat algoritmus přiřazování:");
 
-        optimizeComboBox.setModel(new DefaultComboBoxModel<>(new String[] { "pro rychlejší odezvu", "menší spotřebu paměti" }));
+        optimizeComboBox.setModel(new DefaultComboBoxModel<>(new String[] {"pro rychlejší odezvu", "menší spotřebu paměti"}));
         optimizeComboBox.setSelectedIndex(1);
         optimizeComboBox.setEnabled(false);
@@ -120,4 +123,5 @@
         buildingCheckBox.setText("Nově polygonům přidávat tag \"building=yes\"");
         buildingCheckBox.addChangeListener(new ChangeListener() {
+            @Override
             public void stateChanged(ChangeEvent evt) {
                 buildingCheckBoxaddNewTagChanged(evt);
@@ -125,4 +129,5 @@
         });
         buildingCheckBox.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 buildingCheckBoxActionPerformed(evt);
@@ -171,23 +176,24 @@
 
         thisPanel.add(mainPanel);
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void addNewTagChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_addNewTagChanged
+    } // </editor-fold>//GEN-END:initComponents
+
+    private void addNewTagChanged(javax.swing.event.ChangeEvent evt) { //GEN-FIRST:event_addNewTagChanged
         addNewTagKeyField.setEnabled(addNewTagCheckBox.isSelected());
         addNewTagValueField.setEnabled(addNewTagCheckBox.isSelected());
-    }//GEN-LAST:event_addNewTagChanged
-
-    private void addNewTagCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addNewTagCheckBoxActionPerformed
-
-    }//GEN-LAST:event_addNewTagCheckBoxActionPerformed
-
-    private void buildingCheckBoxaddNewTagChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_buildingCheckBoxaddNewTagChanged
-
-    }//GEN-LAST:event_buildingCheckBoxaddNewTagChanged
-
-    private void buildingCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buildingCheckBoxActionPerformed
-
-    }//GEN-LAST:event_buildingCheckBoxActionPerformed
-
+    } //GEN-LAST:event_addNewTagChanged
+
+    private void addNewTagCheckBoxActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_addNewTagCheckBoxActionPerformed
+
+    } //GEN-LAST:event_addNewTagCheckBoxActionPerformed
+
+    private void buildingCheckBoxaddNewTagChanged(javax.swing.event.ChangeEvent evt) { //GEN-FIRST:event_buildingCheckBoxaddNewTagChanged
+
+    } //GEN-LAST:event_buildingCheckBoxaddNewTagChanged
+
+    private void buildingCheckBoxActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_buildingCheckBoxActionPerformed
+
+    } //GEN-LAST:event_buildingCheckBoxActionPerformed
+
+    @Override
     public void addGui(PreferenceTabbedPane gui) {
         JPanel p = gui.createPreferenceTab(this);
@@ -196,4 +202,5 @@
     }
 
+    @Override
     public boolean ok() {
         addBuildingTag = buildingCheckBox.isSelected();
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java	(revision 32566)
@@ -1,5 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress;
 
 import java.util.Comparator;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
@@ -33,4 +35,5 @@
     public static final Comparator<OsmPrimitive> comparator =
         new Comparator<OsmPrimitive>() {
+        @Override
         public int compare(OsmPrimitive o1, OsmPrimitive o2) {
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StatusListener.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StatusListener.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StatusListener.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress;
 
@@ -20,7 +21,6 @@
  * {@code removeStatusListener()}.
  *
+ * @author Radomír Černoch, radomir.cernoch@gmail.com
  * @see CzechAddressPlugin
- *
- * @author Radomír Černoch, radomir.cernoch@gmail.com
  */
 public interface StatusListener {
@@ -34,5 +34,5 @@
      * @see AddressElement
      */
-    static final int MESSAGE_LOCATION_CHANGED  = 1;
+    int MESSAGE_LOCATION_CHANGED = 1;
 
     /**
@@ -45,5 +45,5 @@
      * @see Database
      */
-    static final int MESSAGE_DATABASE_LOADED   = 2;
+    int MESSAGE_DATABASE_LOADED = 2;
 
     /**
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 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress;
 
@@ -4,4 +5,5 @@
 import java.util.ArrayList;
 import java.util.List;
+
 import org.openstreetmap.josm.data.coor.LatLon;
 
@@ -25,5 +27,5 @@
     public static String extractNumber(String s) {
         String result = "";
-        for (int i=0; i<s.length(); i++) {
+        for (int i = 0; i < s.length(); i++) {
             char ch = s.charAt(i);
             if (ch >= '0' && ch <= '9')
@@ -37,10 +39,10 @@
     public static String coordinateToString(double coor) {
         double degrees = Math.floor(coor);
-        double minutes = Math.floor( 60*(coor-degrees) );
+        double minutes = Math.floor(60*(coor-degrees));
         double seconds = 60*60*(coor-degrees-minutes/60);
 
-        return String.valueOf(Math.round(    degrees))     + "°" +
-               String.valueOf(Math.round(    minutes))     + "'" +
-               String.valueOf(Math.round(100*seconds)/100.0) + "\"";
+        return String.valueOf(Math.round(degrees)) + "°" +
+        String.valueOf(Math.round(minutes)) + "'" +
+        String.valueOf(Math.round(100*seconds)/100.0) + "\"";
     }
 
@@ -49,5 +51,5 @@
 
         return "(lat: " + coordinateToString(position.lat())
-             + " lon: " + coordinateToString(position.lon()) + ")";
+        + " lon: " + coordinateToString(position.lon()) + ")";
     }
 
@@ -67,5 +69,5 @@
 
         char lastChar = ' ';
-        for (int i=0; i<s1.length(); i++) {
+        for (int i = 0; i < s1.length(); i++) {
             if (s1.charAt(i) != ' ' && lastChar == ' ')
                 beg1.add(i);
@@ -74,5 +76,5 @@
 
         lastChar = ' ';
-        for (int i=0; i<s2.length(); i++) {
+        for (int i = 0; i < s2.length(); i++) {
             if (s2.charAt(i) != ' ' && lastChar == ' ')
                 beg2.add(i);
@@ -83,5 +85,5 @@
             return false;
 
-        for (int i=0; i<beg1.size(); i++) {
+        for (int i = 0; i < beg1.size(); i++) {
 
             int pos1 = beg1.get(i);
@@ -90,11 +92,12 @@
             boolean doContinue = false;
             while (pos1 < s1.length() && pos2 < s2.length()) {
-                if (s1.charAt(pos1) == '.' || s2.charAt(pos2) == '.')
-                    {doContinue = true; break;}
-                if (s1.charAt(pos1) == ' ' && s2.charAt(pos2) == ' ')
-                     {doContinue = true; break;}
+                if (s1.charAt(pos1) == '.' || s2.charAt(pos2) == '.') {
+                    doContinue = true; break;
+                }
+                if (s1.charAt(pos1) == ' ' && s2.charAt(pos2) == ' ') {
+                    doContinue = true; break;
+                }
 
-                if (Character.toUpperCase(s1.charAt(pos1)) !=
-                    Character.toUpperCase(s2.charAt(pos2)))
+                if (Character.toUpperCase(s1.charAt(pos1)) != Character.toUpperCase(s2.charAt(pos2)))
                     return false;
 
@@ -129,8 +132,8 @@
         char last = ' ';
         char ch = last;
-        for (int i=0; i<charr.length; i++) {
+        for (int i = 0; i < charr.length; i++) {
             ch = charr[i];
             if ((last >= 'a') && (last <= 'ž') ||
-                (last >= 'A') && (last <= 'Ž'))
+                    (last >= 'A') && (last <= 'Ž'))
                 ch = Character.toLowerCase(ch);
             else
@@ -142,24 +145,25 @@
 
         result = result.replaceAll("Nábř. ", "nábřeží ");
-        result = result.replaceAll("Ul. ",   "ulice ");
-        result = result.replaceAll("Nám. ",  "náměstí ");
-        result = result.replaceAll("Kpt. ",  "kapitána ");
-        result = result.replaceAll("Bří. ",  "bratří ");
+        result = result.replaceAll("Ul. ", "ulice ");
+        result = result.replaceAll("Nám. ", "náměstí ");
+        result = result.replaceAll("Kpt. ", "kapitána ");
+        result = result.replaceAll("Bří. ", "bratří ");
 
-        String[] noCapitalize = { "Nad", "Pod", "U", "Na", "Z" };
-        for (String noc : noCapitalize)
+        String[] noCapitalize = {"Nad", "Pod", "U", "Na", "Z"};
+        for (String noc : noCapitalize) {
             result = result.replaceAll(" "+noc+" ", " "+noc.toLowerCase()+" ");
-
+        }
 
         String[] mesice = {"Ledna", "Února", "Března", "Dubna", "Května",
-            "Máje", "Června", "Července", "Srpna", "Září", "Října",
-            "Listopadu", "Prosince"};
-        for (String mesic : mesice)
+                "Máje", "Června", "Července", "Srpna", "Září", "Října",
+                "Listopadu", "Prosince"};
+        for (String mesic : mesice) {
             result = result.replaceAll("."+mesic, ". " + mesic.toLowerCase());
-
+        }
 
         String[] noBegCap = {"Třída", "Ulice", "Náměstí", "Nábřeží"};
-        for (String noc : noBegCap)
+        for (String noc : noBegCap) {
             result = result.replaceAll(noc, noc.toLowerCase());
+        }
 
         return result.replaceAll("  ", " ");
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.actions;
 
@@ -12,7 +13,6 @@
  * Action, which shows the dialog for resolving conflicts.
  *
+ * @author Radomír Černoch, radomir.cernoch@gmail.com
  * @see ConflictResolver
- *
- * @author Radomír Černoch, radomir.cernoch@gmail.com
  */
 public class ConflictResolveAction extends JosmAction {
@@ -39,4 +39,5 @@
      * from {@link CzechAddressPlugin}{@code .conflictResolver}.
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
         ConflictResolver.getInstance().showDialog();
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 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.actions;
 
@@ -25,7 +26,6 @@
  * on the map.</p>
  *
+ * @author Radomír Černoch, radomir.cernoch@gmail.com
  * @see FactoryDialog
- *
- * @author Radomír Černoch, radomir.cernoch@gmail.com
  */
 public class FactoryAction extends MapMode {
@@ -38,5 +38,5 @@
               "envelope-cursor.png",
               "Vytváří adresní body jedním kliknutím",
-              Shortcut.registerShortcut( "mapmode:clickaddress",
+              Shortcut.registerShortcut("mapmode:clickaddress",
                   "Sputit továrnu na adresy",
                   KeyEvent.VK_K, Shortcut.ALT_SHIFT),
@@ -99,5 +99,5 @@
 
         Reasoner r = Reasoner.getInstance();
-        synchronized(r) {
+        synchronized (r) {
             r.openTransaction();
             r.doOverwrite(newNode, house);
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.actions;
 
@@ -12,7 +13,6 @@
  * Action adding a menu item for doing address completion.
  *
+ * @author Radomír Černoch radomir.cernoch@gmail.com
  * @see GroupManipulatorDialog
- *
- * @author Radomír Černoch radomir.cernoch@gmail.com
  */
 public class GroupManipulatorAction extends JosmAction {
@@ -38,4 +38,5 @@
      * {@code null}. If so, nothing happens.</p>
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
         if (CzechAddressPlugin.getLocation() == null) return;
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/HelpAction.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/HelpAction.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/HelpAction.java	(revision 32566)
@@ -1,10 +1,7 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.actions;
 
 import java.awt.event.ActionEvent;
+
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.tools.OpenBrowser;
@@ -24,4 +21,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         OpenBrowser.displayUrl("http://wiki.openstreetmap.org/wiki/Cz:JOSM/Plugins/CzechAddress");
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.actions;
 
@@ -17,5 +18,5 @@
     public ManagerAction() {
         super("Upravit databázi",
-              (String)null,//"envelope-closed-big.png",
+              (String) null, //"envelope-closed-big.png",
               "Upravit jména elemntů dle mapy",
               null,
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.actions;
 
@@ -15,7 +16,6 @@
  * Action adding a menu item for editing address points
  *
+ * @author Radomír Černoch radomir.cernoch@gmail.com
  * @see PointManipulatorDialog
- *
- * @author Radomír Černoch radomir.cernoch@gmail.com
  */
 public class PointManipulatorAction extends JosmAction {
@@ -42,4 +42,5 @@
      * selected. If both conditions are satisfied, dialog is opened.</p>
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
         org.openstreetmap.josm.data.osm.DataSet dataSet = Main.getLayerManager().getEditDataSet();
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.actions;
 
@@ -53,4 +54,5 @@
      * area.
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
         DataSet ds = Main.getLayerManager().getEditDataSet();
@@ -59,14 +61,14 @@
 
         for (Way area : selectedWays) {
-            if (! area.isClosed()) continue;
+            if (!area.isClosed()) continue;
 
             for (OsmPrimitive prim2 : ds.allNonDeletedPrimitives()) {
                 if (!(prim2 instanceof Way)) continue;
-                if (prim2.equals(area))      continue;
+                if (prim2.equals(area)) continue;
                 Way border = (Way) prim2;
-                if (border.getNodes().isEmpty())   continue;
+                if (border.getNodes().isEmpty()) continue;
                 if (border.keySet().size() > 0) continue;
                 if (!area.getNodes().contains(border.firstNode())) continue;
-                if (!area.getNodes().contains(border.lastNode()))  continue;
+                if (!area.getNodes().contains(border.lastNode())) continue;
 
                 Way newArea1 = new Way();
@@ -110,12 +112,13 @@
      * @param newArea1 reference to the first new area
      * @param newArea2 reference to the second new area
-     * @return
      */
     private int splitArea(Way area, Way border, Way newArea1, Way newArea2) {
 
-        for (Relation r : Main.getLayerManager().getEditDataSet().getRelations())
-            for (RelationMember rm : r.getMembers())
+        for (Relation r : Main.getLayerManager().getEditDataSet().getRelations()) {
+            for (RelationMember rm : r.getMembers()) {
                 if (rm.refersTo(area) || rm.refersTo(border))
                     return 2;
+            }
+        }
 
         List<Node> bordNodes = border.getNodes();
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 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java	(revision 32566)
@@ -1,5 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
 
 import java.util.List;
+
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -25,5 +27,5 @@
      * Constructor setting the name of this element.
      */
-    public AddressElement (String name) {
+    public AddressElement(String name) {
         if (name == null)
             throw new NullPointerException("You must specify the name of this AddressElement");
@@ -50,5 +52,4 @@
     }
 
-
     public static String getName(Object o) {
         if (o instanceof OsmPrimitive)
@@ -62,4 +63,5 @@
 
     public static String getName(OsmPrimitive prim) {
+        // CHECKSTYLE.OFF: SingleSpaceSeparator
         String cp     = prim.get(PrimUtils.KEY_ADDR_CP);
         String co     = prim.get(PrimUtils.KEY_ADDR_CO);
@@ -67,4 +69,5 @@
         String city   = prim.get(PrimUtils.KEY_ADDR_CITY);
         String name   = prim.get(PrimUtils.KEY_NAME);
+        // CHECKSTYLE.ON: SingleSpaceSeparator
 
         String result = "";
@@ -137,5 +140,5 @@
      *
      * <p>Basic criterion to comparing elements is their <i>name</i> and the
-     * </i>parent</i>. Notice that this behaviour might be changed
+     * <i>parent</i>. Notice that this behaviour might be changed
      * in subclasses.</p>
      *
@@ -211,10 +214,9 @@
     public static int matchFieldAbbrev(String elemValue, String primValue) {
 
-        if (elemValue == null) return  0;
+        if (elemValue == null) return 0;
         if (primValue == null) return -1;
 
         return StringUtils.matchAbbrev(primValue, elemValue) ? 1 : -1;
     }
-
 
     protected int[] getFieldMatchList(OsmPrimitive primitive) {
@@ -250,5 +252,5 @@
         int minVal = fieldMatches[0];
         int maxVal = fieldMatches[0];
-        for (int i=1; i<fieldMatches.length; i++) {
+        for (int i = 1; i < fieldMatches.length; i++) {
             if (minVal > fieldMatches[i])
                 minVal = fieldMatches[i];
@@ -278,4 +280,5 @@
     }
 
+    @Override
     public int compareTo(AddressElement elem) {
 
@@ -286,5 +289,5 @@
         if (retVal != 0) return retVal;
 
-        return toString().compareTo(((AddressElement) elem).toString());
+        return toString().compareTo(elem.toString());
     }
 }
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Database.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Database.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Database.java	(revision 32566)
@@ -1,5 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
 
 import java.util.ArrayList;
+
 import org.openstreetmap.josm.plugins.czechaddress.parser.DatabaseParser;
 
@@ -10,14 +12,15 @@
  * and houses in the Czech republic.</p>
  *
+ * @author Radomír Černoch radomir.cernoch@gmail.com
  * @see AddressElement
  * @see DatabaseParser
-
- * @author Radomír Černoch radomir.cernoch@gmail.com
  */
-public class Database {
+public final class Database {
 
     private Database() {}
+
     private static Database singleton = null;
-    public  static Database getInstance() {
+
+    public static Database getInstance() {
         if (singleton == null)
             singleton = new Database();
@@ -44,9 +47,9 @@
                 continue;
 
-            if ( region.getNuts3Name() != null &&
+            if (region.getNuts3Name() != null &&
                 !region.getNuts3Name().toUpperCase().equals(nuts3))
                 continue;
 
-            if ( region.getNuts4Name() != null &&
+            if (region.getNuts4Name() != null &&
                 !region.getNuts4Name().toUpperCase().equals(nuts3))
                 continue;
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithHouses.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithHouses.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithHouses.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithStreets.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithStreets.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithStreets.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
 
@@ -33,7 +34,8 @@
      */
     public void addStreets(Collection<Street> streetsToAdd) {
-        streets.ensureCapacity(streets.size() + streetsToAdd.size() );
-        for (Street streetToAdd : streetsToAdd)
+        streets.ensureCapacity(streets.size() + streetsToAdd.size());
+        for (Street streetToAdd : streetsToAdd) {
             addStreet(streetToAdd);
+        }
     }
 
@@ -59,5 +61,4 @@
     }
 
-
     public Street findStreet(String streetName) {
 
@@ -66,7 +67,8 @@
         streetName = streetName.toUpperCase();
 
-        for (Street street : streets)
+        for (Street street : streets) {
             if (street.getName().toUpperCase().equals(streetName))
                 return street;
+        }
         return null;
     }
@@ -82,6 +84,7 @@
         result.addAll(this.houses);
 
-        for (Street street : streets)
+        for (Street street : streets) {
             result.addAll(street.getHouses());
+        }
 
         return result;
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java	(revision 32566)
@@ -1,12 +1,14 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
 
+import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getListFieldDiff;
+import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getStringFieldDiff;
+
 import java.util.List;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.czechaddress.NotNullList;
 import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
 import org.openstreetmap.josm.plugins.czechaddress.proposal.Proposal;
-
-import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getStringFieldDiff;
-import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getListFieldDiff;
 
 /**
@@ -158,5 +160,5 @@
         // First field is the AlternateNubmer
         result[0] = matchField(this.cp, prim.get(PrimUtils.KEY_ADDR_CP));
-        result[2] = matchField(name,    prim.get(PrimUtils.KEY_ADDR_HOUSE_N));
+        result[2] = matchField(name, prim.get(PrimUtils.KEY_ADDR_HOUSE_N));
 
         // Second field is the Housenumber
@@ -164,5 +166,5 @@
             result[1] = Math.min(
                 matchFieldAbbrev(parent.getName(), prim.get(PrimUtils.KEY_ADDR_STREET)),
-                matchField(      this.co,          prim.get(PrimUtils.KEY_ADDR_CO)) );
+                matchField(this.co, prim.get(PrimUtils.KEY_ADDR_CO)));
         return result;
     }
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ParentResolver.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ParentResolver.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ParentResolver.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
 
@@ -62,4 +63,5 @@
     }
 
+    @Override
     public int compareTo(ParentResolver o) {
         int val = 0;
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
 
@@ -56,5 +57,4 @@
     /**
      * Default constructor setting the name of this region.
-     * @param name
      */
     public Region(String name) {
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java	(revision 32566)
@@ -1,11 +1,13 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
 
+import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getStringFieldDiff;
+
 import java.util.List;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.czechaddress.NotNullList;
 import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
 import org.openstreetmap.josm.plugins.czechaddress.proposal.Proposal;
-
-import static org.openstreetmap.josm.plugins.czechaddress.proposal.ProposalFactory.getStringFieldDiff;
 
 /**
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Suburb.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Suburb.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Suburb.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ViToCi.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ViToCi.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ViToCi.java	(revision 32566)
@@ -1,6 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java	(revision 32566)
@@ -1,4 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -11,6 +14,8 @@
 import javax.swing.ComboBoxModel;
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.GroupLayout;
 import javax.swing.Icon;
 import javax.swing.JButton;
+import javax.swing.LayoutStyle;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
@@ -35,5 +40,5 @@
  * @author Radomír Černoch, radomir.cernoch@gmail.com
  */
-public class ConflictResolver extends ExtendedDialog {
+public final class ConflictResolver extends ExtendedDialog {
 
     private static ConflictResolver singleton = null;
@@ -98,4 +103,5 @@
         candZoomButton.setEnabled(false);
         candZoomButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 candZoomButtonActionPerformed(evt);
@@ -108,4 +114,5 @@
         reassignButton.setEnabled(false);
         reassignButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 reassignButtonActionPerformed(evt);
@@ -118,4 +125,5 @@
         mainZoomButton.setEnabled(false);
         mainZoomButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 mainZoomButtonActionPerformed(evt);
@@ -123,8 +131,8 @@
         });
 
-        mainField.setModel(new javax.swing.DefaultComboBoxModel<Object>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        mainField.setModel(new javax.swing.DefaultComboBoxModel<Object>(new String[] {"Item 1", "Item 2", "Item 3", "Item 4"}));
         mainField.setRenderer(new UniversalListRenderer());
 
-        candField.setModel(new javax.swing.DefaultComboBoxModel<Object>(new String[] { " " }));
+        candField.setModel(new javax.swing.DefaultComboBoxModel<Object>(new String[] {" "}));
         candField.setRenderer(new UniversalListRenderer());
 
@@ -132,4 +140,5 @@
         candPickButton.setEnabled(false);
         candPickButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 candPickButtonActionPerformed(evt);
@@ -139,52 +148,53 @@
         mainPickButton.setText("     ");
         mainPickButton.setEnabled(false);
-        mainPickButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
+        mainPickButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
                 mainPickButtonActionPerformed(evt);
             }
         });
 
-        javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel);
+        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
         mainPanel.setLayout(mainPanelLayout);
         mainPanelLayout.setHorizontalGroup(
-            mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
-                .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addComponent(candLabel)
                     .addComponent(mainLabel))
                 .addGap(6, 6, 6)
-                .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(candField, javax.swing.GroupLayout.Alignment.TRAILING, 0, 430, Short.MAX_VALUE)
+                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(candField, GroupLayout.Alignment.TRAILING, 0, 430, Short.MAX_VALUE)
                     .addComponent(mainField, 0, 430, Short.MAX_VALUE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
                     .addComponent(candZoomButton)
                     .addComponent(mainZoomButton))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addComponent(mainPickButton)
                     .addComponent(candPickButton)))
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+            .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
                 .addContainerGap()
                 .addComponent(reassignButton))
         );
         mainPanelLayout.setVerticalGroup(
-            mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
             .addGroup(mainPanelLayout.createSequentialGroup()
-                .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                        .addComponent(mainField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                        .addComponent(mainField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                         .addComponent(mainLabel))
                     .addGroup(mainPanelLayout.createSequentialGroup()
-                        .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                             .addComponent(mainZoomButton)
                             .addComponent(mainPickButton))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                             .addComponent(candPickButton)
                             .addComponent(candZoomButton)
-                            .addComponent(candField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(candField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                             .addComponent(candLabel))))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addComponent(reassignButton))
         );
@@ -193,13 +203,13 @@
 
         pack();
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void mainZoomButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_mainZoomButtonActionPerformed
+    } // </editor-fold>//GEN-END:initComponents
+
+    private void mainZoomButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_mainZoomButtonActionPerformed
         zoomTo(mainField.getSelectedItem());
-    }//GEN-LAST:event_mainZoomButtonActionPerformed
-
-    private void candZoomButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_candZoomButtonActionPerformed
+    } //GEN-LAST:event_mainZoomButtonActionPerformed
+
+    private void candZoomButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_candZoomButtonActionPerformed
         zoomTo(candField.getSelectedItem());
-    }//GEN-LAST:event_candZoomButtonActionPerformed
+    } //GEN-LAST:event_candZoomButtonActionPerformed
 
     private void zoomTo(Object item) {
@@ -223,5 +233,5 @@
     }
 
-    private void reassignButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_reassignButtonActionPerformed
+    private void reassignButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_reassignButtonActionPerformed
 
         Reasoner r = Reasoner.getInstance();
@@ -266,15 +276,15 @@
             r.closeTransaction();
         }
-    }//GEN-LAST:event_reassignButtonActionPerformed
-
-    private void mainPickButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_mainPickButtonActionPerformed
+    } //GEN-LAST:event_reassignButtonActionPerformed
+
+    private void mainPickButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_mainPickButtonActionPerformed
         if (mainField.getSelectedItem() instanceof House)
             FactoryDialog.getInstance().setSelectedHouse((House) mainField.getSelectedItem());
-    }//GEN-LAST:event_mainPickButtonActionPerformed
-
-    private void candPickButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_candPickButtonActionPerformed
+    } //GEN-LAST:event_mainPickButtonActionPerformed
+
+    private void candPickButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_candPickButtonActionPerformed
         if (candField.getSelectedItem() instanceof House)
             FactoryDialog.getInstance().setSelectedHouse((House) candField.getSelectedItem());
-    }//GEN-LAST:event_candPickButtonActionPerformed
+    } //GEN-LAST:event_candPickButtonActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
@@ -298,4 +308,5 @@
     private class ReasonerHook implements ReasonerListener {
 
+        @Override
         public void elementChanged(AddressElement elem) {
             if (!(elem instanceof House)) return;
@@ -308,4 +319,5 @@
         }
 
+        @Override
         public void primitiveChanged(OsmPrimitive prim) {
             if (!House.isMatchable(prim)) return;
@@ -318,4 +330,5 @@
         }
 
+        @Override
         public void resonerReseted() {
         }
@@ -425,4 +438,5 @@
         }
 */
+        @Override
         public void setSelectedItem(Object anItem) {
 
@@ -437,19 +451,22 @@
         }
 
+        @Override
         public Object getSelectedItem() {
             return selected;
         }
 
+        @Override
         public int getSize() {
             return primitives.size() + elements.size();
         }
 
+        @Override
         public Object getElementAt(int index) {
-            if (index< elements.size())
+            if (index < elements.size())
                 return elements.get(index);
 
             index -= elements.size();
 
-            if (index< primitives.size())
+            if (index < primitives.size())
                 return primitives.get(index);
 
@@ -457,8 +474,10 @@
         }
 
+        @Override
         public void addListDataListener(ListDataListener l) {
             listeners.add(l);
         }
 
+        @Override
         public void removeListDataListener(ListDataListener l) {
             listeners.remove(l);
@@ -518,8 +537,9 @@
         Object selected = null;
 
-        public CandidatesModel(List<? extends E> data) {
+        CandidatesModel(List<? extends E> data) {
             primitives = data;
         }
 
+        @Override
         public void setSelectedItem(Object anItem) {
             selected = anItem;
@@ -528,5 +548,5 @@
 
             if (conflictModel.getSelectedItem() instanceof AddressElement) {
-                reassignButton.setEnabled( selected !=
+                reassignButton.setEnabled(selected !=
                         Reasoner.getInstance().getStrictlyBest(
                             (AddressElement) conflictModel.getSelectedItem()));
@@ -534,5 +554,5 @@
                 reassignButton.setEnabled(true);
             } else if (conflictModel.getSelectedItem() instanceof OsmPrimitive) {
-                reassignButton.setEnabled( selected !=
+                reassignButton.setEnabled(selected !=
                         Reasoner.getInstance().getStrictlyBest(
                             (OsmPrimitive) conflictModel.getSelectedItem()));
@@ -542,12 +562,15 @@
         }
 
+        @Override
         public Object getSelectedItem() {
             return selected;
         }
 
+        @Override
         public int getSize() {
             return primitives.size();
         }
 
+        @Override
         public E getElementAt(int index) {
             if (index < primitives.size())
@@ -556,8 +579,10 @@
         }
 
+        @Override
         public void addListDataListener(ListDataListener l) {
             listeners.add(l);
         }
 
+        @Override
         public void removeListDataListener(ListDataListener l) {
             listeners.remove(l);
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 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui;
 
@@ -4,4 +5,6 @@
 import java.awt.Font;
 import java.awt.LayoutManager;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
@@ -12,7 +15,10 @@
 
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JList;
-
+import javax.swing.LayoutStyle;
+
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -41,10 +47,10 @@
  * @author Radomír Černoch, radomir.cernoch@gmail.com
  */
-public class FactoryDialog extends ToggleDialog
+public final class FactoryDialog extends ToggleDialog
         implements SelectionChangedListener, StatusListener, ReasonerListener {
 
-
     private static FactoryDialog singleton = null;
-    public  static FactoryDialog getInstance() {
+
+    public static FactoryDialog getInstance() {
         if (singleton == null)
             singleton = new FactoryDialog();
@@ -52,13 +58,13 @@
     }
 
-    private HouseListModel  houseModel  = new HouseListModel();
+    private HouseListModel houseModel = new HouseListModel();
     private StreetListModel streetModel = new StreetListModel();
 
     private FactoryDialog() {
 
-        super( "Továrna na adresy",
+        super("Továrna na adresy",
                "envelope-scrollbar.png",
                "Umožňuje rychlé vytváření adresních bodů „jedním kliknutím.“",
-                Shortcut.registerShortcut("subwindow:addressfactory","Přepnout: Továrna na adresy",
+                Shortcut.registerShortcut("subwindow:addressfactory", "Přepnout: Továrna na adresy",
                     KeyEvent.VK_Q, Shortcut.ALT_CTRL_SHIFT),
                 200);
@@ -113,5 +119,5 @@
     public void setSelectedHouse(House house) {
 
-        for (int i=0; i<streetModel.getSize(); i++)
+        for (int i = 0; i < streetModel.getSize(); i++)
             if (streetModel.getElementAt(i) == house.getParent()) {
                 streetComboBox.setSelectedIndex(i);
@@ -120,5 +126,5 @@
             }
 
-        for (int i=0; i<houseModel.getSize(); i++)
+        for (int i = 0; i < houseModel.getSize(); i++)
             if (houseModel.getElementAt(i) == house) {
                 houseList.setSelectedIndex(i);
@@ -130,5 +136,5 @@
     public House getSelectedHouse() {
         if (houseList.getSelectedValue() instanceof House)
-            return (House) houseList.getSelectedValue();
+            return houseList.getSelectedValue();
         return null;
     }
@@ -139,5 +145,5 @@
         int i = houseList.getSelectedIndex();
         while (i < houseModel.getSize()) {
-            if (r.translate((House) houseModel.getElementAt(i)) == null)
+            if (r.translate(houseModel.getElementAt(i)) == null)
                 return true;
             i++;
@@ -146,5 +152,5 @@
         i = 0;
         while (i < houseList.getSelectedIndex()) {
-            if (r.translate((House) houseModel.getElementAt(i)) == null)
+            if (r.translate(houseModel.getElementAt(i)) == null)
                 return true;
             i++;
@@ -159,7 +165,8 @@
         index++; // Initial kick to do at least one move.
         House current;
-        while ( (current = houseModel.getElementAt(index)) != null
-             && Reasoner.getInstance().translate(current) != null)
+        while ((current = houseModel.getElementAt(index)) != null
+             && Reasoner.getInstance().translate(current) != null) {
             index++;
+        }
 
         if (index >= houseModel.getSize())
@@ -195,5 +202,7 @@
         // If anything goes wrong, we can silently ignore the errors.
         // The selected item just does not get updated...
-        } catch (Exception exp) {}
+        } catch (Exception exp) {
+            Main.trace(exp);
+        }
     }
 
@@ -293,7 +302,7 @@
         relocateButton.setText("Inicializovat");
         relocateButton.setEnabled(false);
-        relocateButton.addActionListener(new java.awt.event.ActionListener() {
+        relocateButton.addActionListener(new ActionListener() {
             @Override
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
+            public void actionPerformed(ActionEvent evt) {
                 relocateButtonActionPerformed(evt);
             }
@@ -304,37 +313,37 @@
         streetComboBox.setFocusable(false);
 
-        javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel);
+        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
         mainPanel.setLayout(mainPanelLayout);
         mainPanelLayout.setHorizontalGroup(
-            mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
                 .addComponent(streetComboBox, 0, 199, Short.MAX_VALUE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(relocateButton))
             .addGroup(mainPanelLayout.createSequentialGroup()
-                .addComponent(keepOddityCheckBox, javax.swing.GroupLayout.DEFAULT_SIZE, 278, Short.MAX_VALUE)
+                .addComponent(keepOddityCheckBox, GroupLayout.DEFAULT_SIZE, 278, Short.MAX_VALUE)
                 .addContainerGap())
-            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 290, Short.MAX_VALUE)
+            .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 290, Short.MAX_VALUE)
         );
         mainPanelLayout.setVerticalGroup(
-            mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
             .addGroup(mainPanelLayout.createSequentialGroup()
-                .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(streetComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                    .addComponent(streetComboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                     .addComponent(relocateButton))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 125, Short.MAX_VALUE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 125, Short.MAX_VALUE)
+                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(keepOddityCheckBox))
         );
 
         add(mainPanel);
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void relocateButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_relocateButtonActionPerformed
+    } // </editor-fold>//GEN-END:initComponents
+
+    private void relocateButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_relocateButtonActionPerformed
         CzechAddressPlugin.changeLocation();
-    }//GEN-LAST:event_relocateButtonActionPerformed
-
-    private void houseListClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_houseListClicked
+    } //GEN-LAST:event_relocateButtonActionPerformed
+
+    private void houseListClicked(java.awt.event.MouseEvent evt) { //GEN-FIRST:event_houseListClicked
         if (evt.getClickCount() == 2 && evt.getButton() == MouseEvent.BUTTON1) {
             Reasoner r = Reasoner.getInstance();
@@ -345,5 +354,5 @@
                 ConflictResolver.getInstance().focusElement(getSelectedHouse());
         }
-    }//GEN-LAST:event_houseListClicked
+    } //GEN-LAST:event_houseListClicked
 
 
@@ -361,6 +370,8 @@
         houseModel.notifyAllListeners();
     }
+
     @Override
     public void primitiveChanged(OsmPrimitive prim) {}
+
     @Override
     public void resonerReseted() {}
@@ -427,5 +438,5 @@
 
     private class AllStreetProvider extends ElementWithHouses {
-        public AllStreetProvider() {
+        AllStreetProvider() {
             super("všechny domy");
         }
@@ -440,5 +451,5 @@
                                      implements ReasonerListener {
 
-        public FreeStreetProvider() {
+        FreeStreetProvider() {
             super("nepřiřazené domy");
             Reasoner.getInstance().addListener(this);
@@ -446,7 +457,11 @@
 
         @Override
-        public void resonerReseted() { houses.clear(); }
+        public void resonerReseted() {
+            houses.clear();
+        }
+
         @Override
         public void primitiveChanged(OsmPrimitive prim) {}
+
         @Override
         public void elementChanged(AddressElement elem) {
@@ -458,5 +473,5 @@
                 if (index >= 0) houses.remove(index);
             } else {
-                if (index < 0)  houses.add(-index-1, house);
+                if (index < 0) houses.add(-index-1, house);
             }
 
@@ -475,5 +490,5 @@
                 = new ArrayList<>();
 
-        public StreetListModel() {
+        StreetListModel() {
             metaElem.add(null);
             metaElem.add(new AllStreetProvider());
@@ -491,5 +506,5 @@
 
             this.selected = parent;
-            this.parent   = parent;
+            this.parent = parent;
 
             metaElem.set(0, parent);
@@ -531,5 +546,5 @@
                                  implements ReasonerListener {
 
-        public HouseListModel() {
+        HouseListModel() {
             Reasoner.getInstance().addListener(this);
         }
@@ -557,4 +572,5 @@
         @Override
         public void primitiveChanged(OsmPrimitive prim) {}
+
         @Override
         public void elementChanged(AddressElement elem) {
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 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui;
 
@@ -48,5 +49,5 @@
     public GroupManipulatorDialog() {
         super(Main.parent, "Přiřadit adresy",
-                            new String[] { "OK", "Zrušit" }, true);
+                            new String[] {"OK", "Zrušit"}, true);
         initComponents();
 
@@ -115,4 +116,5 @@
         locationChangeButton.setText("Změnit");
         locationChangeButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 locationChangeButtonActionPerformed(evt);
@@ -163,5 +165,5 @@
 
         add(mainPanel);
-    }// </editor-fold>//GEN-END:initComponents
+    } // </editor-fold>//GEN-END:initComponents
 
     /**
@@ -169,9 +171,9 @@
      * the current location.
      */
-    private void locationChangeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_locationChangeButtonActionPerformed
+    private void locationChangeButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_locationChangeButtonActionPerformed
         CzechAddressPlugin.changeLocation();
-    }//GEN-LAST:event_locationChangeButtonActionPerformed
-
-    private void proposalTreeKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_proposalTreeKeyReleased
+    } //GEN-LAST:event_locationChangeButtonActionPerformed
+
+    private void proposalTreeKeyReleased(java.awt.event.KeyEvent evt) { //GEN-FIRST:event_proposalTreeKeyReleased
         if (evt.getKeyCode() == KeyEvent.VK_DELETE) {
 
@@ -186,10 +188,10 @@
                 } else if (path.getLastPathComponent() instanceof ProposalContainer) {
                     ((ProposalDatabase) proposalTree.getModel())
-                            .removeContainer( (ProposalContainer)
-                                                    path.getLastPathComponent() );
+                            .removeContainer((ProposalContainer)
+                                                    path.getLastPathComponent());
                 }
             }
         }
-    }//GEN-LAST:event_proposalTreeKeyReleased
+    } //GEN-LAST:event_proposalTreeKeyReleased
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
@@ -203,4 +205,5 @@
     // End of variables declaration//GEN-END:variables
 
+    @Override
     public void elementChanged(AddressElement elem) {
         for (ProposalContainer container : database.getContainers()) {
@@ -212,4 +215,5 @@
     }
 
+    @Override
     public void primitiveChanged(OsmPrimitive prim) {
         for (ProposalContainer container : database.getContainers()) {
@@ -221,4 +225,5 @@
     }
 
+    @Override
     public void resonerReseted() {
         recreateProposals();
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 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui;
 
@@ -30,5 +31,5 @@
  * @author Libor Pechacek, lpechacek@gmx.com
  */
-public class LocationSelector extends ExtendedDialog {
+public final class LocationSelector extends ExtendedDialog {
 
     protected ElementWithStreets selectedElement;
@@ -39,5 +40,4 @@
     protected ArrayList<AddressElement> hlSuburbs = new ArrayList<>();
 
-
     public static ElementWithStreets selectLocation() {
         LocationSelector ls = (LocationSelector) new LocationSelector().showDialog();
@@ -51,5 +51,5 @@
     private LocationSelector() {
         super(Main.parent, "Výběr umístění",
-                            new String[] { "OK", "Zrušit"}, true);
+                            new String[] {"OK", "Zrušit"}, true);
 
         initComponents();
@@ -211,4 +211,5 @@
 
         oblastComboBox.addItemListener(new java.awt.event.ItemListener() {
+            @Override
             public void itemStateChanged(java.awt.event.ItemEvent evt) {
                 oblastComboBoxItemStateChanged(evt);
@@ -217,4 +218,5 @@
 
         suburbComboBox.addItemListener(new java.awt.event.ItemListener() {
+            @Override
             public void itemStateChanged(java.awt.event.ItemEvent evt) {
                 suburbComboBoxItemStateChanged(evt);
@@ -223,4 +225,5 @@
 
         vitociComboBox.addItemListener(new java.awt.event.ItemListener() {
+            @Override
             public void itemStateChanged(java.awt.event.ItemEvent evt) {
                 vitociComboBoxItemStateChanged(evt);
@@ -267,5 +270,5 @@
 
         getContentPane().add(mainPanel);
-    }// </editor-fold>//GEN-END:initComponents
+    } // </editor-fold>//GEN-END:initComponents
 
     /**
@@ -292,5 +295,5 @@
     }*/
 
-    private void oblastComboBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_oblastComboBoxItemStateChanged
+    private void oblastComboBoxItemStateChanged(java.awt.event.ItemEvent evt) { //GEN-FIRST:event_oblastComboBoxItemStateChanged
 
         Region oblast = (Region) oblastComboBox.getSelectedItem();
@@ -303,7 +306,7 @@
         vitociComboBox.setEnabled(vitociComboBox.getModel().getSize() > 1);
         vitociComboBoxItemStateChanged(null);
-    }//GEN-LAST:event_oblastComboBoxItemStateChanged
-
-    private void vitociComboBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_vitociComboBoxItemStateChanged
+    } //GEN-LAST:event_oblastComboBoxItemStateChanged
+
+    private void vitociComboBoxItemStateChanged(java.awt.event.ItemEvent evt) { //GEN-FIRST:event_vitociComboBoxItemStateChanged
 
         ViToCi obec = (ViToCi) vitociComboBox.getSelectedItem();
@@ -312,5 +315,5 @@
         if (obec.getSuburbs().size() > 0) {
             ElementWithStreets[] suburbs = new ElementWithStreets[obec.getSuburbs().size() + 1];
-            for (int i=0; i<obec.getSuburbs().size(); i++)
+            for (int i = 0; i < obec.getSuburbs().size(); i++)
                 suburbs[i] = obec.getSuburbs().get(i);
             suburbs[obec.getSuburbs().size()] = obec;
@@ -324,7 +327,7 @@
         suburbComboBox.setEnabled(suburbComboBox.getModel().getSize() > 1);
         suburbComboBoxItemStateChanged(null);
-    }//GEN-LAST:event_vitociComboBoxItemStateChanged
-
-        private void suburbComboBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_suburbComboBoxItemStateChanged
+    } //GEN-LAST:event_vitociComboBoxItemStateChanged
+
+        private void suburbComboBoxItemStateChanged(java.awt.event.ItemEvent evt) { //GEN-FIRST:event_suburbComboBoxItemStateChanged
 
         /*if (castObceComboBox.getSelectedItem() != null)
@@ -346,5 +349,5 @@
             selectedElement = ((ElementWithStreets) oblastComboBox.getSelectedItem());
 
-        }//GEN-LAST:event_suburbComboBoxItemStateChanged
+        } //GEN-LAST:event_suburbComboBoxItemStateChanged
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
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 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui;
 
@@ -66,7 +67,7 @@
 
         renameTable.setModel(streetModel);
-        renameTable.setDefaultRenderer( AddressElement.class,
+        renameTable.setDefaultRenderer(AddressElement.class,
                                         new AddressElementRenderer());
-        renameTable.setDefaultRenderer( String.class,
+        renameTable.setDefaultRenderer(String.class,
                                         new AddressElementRenderer());
 
@@ -90,4 +91,5 @@
         }
 
+        @Override
         public Object getChild(Object parent, int index) {
 
@@ -101,10 +103,10 @@
                 Suburb suburb = (Suburb) parent;
 
-                if (index< suburb.getHouses().size())
+                if (index < suburb.getHouses().size())
                     return suburb.getHouses().get(index);
                 else
                     index -= suburb.getHouses().size();
 
-                if (index< suburb.getStreets().size())
+                if (index < suburb.getStreets().size())
                     return suburb.getStreets().get(index);
                 else
@@ -115,15 +117,15 @@
                 ViToCi vitoci = (ViToCi) parent;
 
-                if (index< vitoci.getHouses().size())
+                if (index < vitoci.getHouses().size())
                     return vitoci.getHouses().get(index);
                 else
                     index -= vitoci.getHouses().size();
 
-                if (index< vitoci.getStreets().size())
+                if (index < vitoci.getStreets().size())
                     return vitoci.getStreets().get(index);
                 else
                     index -= vitoci.getStreets().size();
 
-                if (index< vitoci.getSuburbs().size())
+                if (index < vitoci.getSuburbs().size())
                     return vitoci.getSuburbs().get(index);
                 else
@@ -134,15 +136,15 @@
                 Region region = (Region) parent;
 
-                if (index< region.getHouses().size())
+                if (index < region.getHouses().size())
                     return region.getHouses().get(index);
                 else
                     index -= region.getHouses().size();
 
-                if (index< region.getStreets().size())
+                if (index < region.getStreets().size())
                     return region.getStreets().get(index);
                 else
                     index -= region.getStreets().size();
 
-                if (index< region.getViToCis().size())
+                if (index < region.getViToCis().size())
                     return region.getViToCis().get(index);
                 else
@@ -156,4 +158,5 @@
         }
 
+        @Override
         public int getChildCount(Object parent) {
 
@@ -184,4 +187,5 @@
         }
 
+        @Override
         public int getIndexOfChild(Object parent, Object child) {
             return 0;
@@ -215,5 +219,5 @@
 
         renameTable.setModel(new javax.swing.table.DefaultTableModel(
-            new Object [][] {
+            new Object[][] {
                 {null, null},
                 {null, null},
@@ -221,21 +225,23 @@
                 {null, null}
             },
-            new String [] {
+            new String[] {
                 "Původní název", "Návrh z mapy"
             }
         ) {
-            Class<?>[] types = new Class [] {
+            Class<?>[] types = new Class[] {
                 java.lang.Object.class, java.lang.String.class
             };
-            boolean[] canEdit = new boolean [] {
+            boolean[] canEdit = new boolean[] {
                 false, true
             };
 
+            @Override
             public Class<?> getColumnClass(int columnIndex) {
-                return types [columnIndex];
-            }
-
+                return types[columnIndex];
+            }
+
+            @Override
             public boolean isCellEditable(int rowIndex, int columnIndex) {
-                return canEdit [columnIndex];
+                return canEdit[columnIndex];
             }
         });
@@ -245,4 +251,5 @@
         renamerButton.setText("Použít navržené změny");
         renamerButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 renamerButtonActionPerformed(evt);
@@ -272,4 +279,5 @@
 
         dbTree.addTreeSelectionListener(new javax.swing.event.TreeSelectionListener() {
+            @Override
             public void valueChanged(javax.swing.event.TreeSelectionEvent evt) {
                 dbTreeValueChanged(evt);
@@ -281,4 +289,5 @@
         dbEditButton.setEnabled(false);
         dbEditButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 dbEditButtonActionPerformed(evt);
@@ -312,7 +321,7 @@
 
         pack();
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void renamerButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_renamerButtonActionPerformed
+    } // </editor-fold>//GEN-END:initComponents
+
+    private void renamerButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_renamerButtonActionPerformed
         assert streetModel.elems.size() == streetModel.names.size();
         Reasoner r = Reasoner.getInstance();
@@ -320,5 +329,5 @@
         synchronized (r) {
             r.openTransaction();
-            for(int i=0; i<streetModel.elems.size(); i++) {
+            for (int i = 0; i < streetModel.elems.size(); i++) {
                 streetModel.elems.get(i).setName(streetModel.names.get(i));
                 r.update(streetModel.elems.get(i));
@@ -330,9 +339,9 @@
         streetModel.names.clear();
         jPanel1.setVisible(false);
-    }//GEN-LAST:event_renamerButtonActionPerformed
+    } //GEN-LAST:event_renamerButtonActionPerformed
 
     private AddressElement dbTreeValue = null;
 
-    private void dbTreeValueChanged(javax.swing.event.TreeSelectionEvent evt) {//GEN-FIRST:event_dbTreeValueChanged
+    private void dbTreeValueChanged(javax.swing.event.TreeSelectionEvent evt) { //GEN-FIRST:event_dbTreeValueChanged
         try {
             dbTreeValue = (AddressElement) dbTree.getSelectionPath().getLastPathComponent();
@@ -343,8 +352,8 @@
             except.printStackTrace();
         }
-        dbEditButton.setEnabled( EditorFactory.isEditable(dbTreeValue) );
-    }//GEN-LAST:event_dbTreeValueChanged
-
-    private void dbEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_dbEditButtonActionPerformed
+        dbEditButton.setEnabled(EditorFactory.isEditable(dbTreeValue));
+    } //GEN-LAST:event_dbTreeValueChanged
+
+    private void dbEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_dbEditButtonActionPerformed
         if (EditorFactory.isEditable(dbTreeValue)) {
             if (EditorFactory.edit(dbTreeValue))
@@ -352,5 +361,5 @@
         } else
             dbEditButton.setEnabled(false);
-    }//GEN-LAST:event_dbEditButtonActionPerformed
+    } //GEN-LAST:event_dbEditButtonActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
@@ -369,5 +378,5 @@
     private class AddressElementRenderer extends DefaultTableCellRenderer {
 
-        public AddressElementRenderer() {}
+        AddressElementRenderer() {}
 
         @Override
@@ -376,5 +385,5 @@
 
             if (value instanceof AddressElement)
-                setText(((AddressElement) value).getName() );
+                setText(((AddressElement) value).getName());
         }
     }
@@ -383,6 +392,7 @@
 
         List<Element> elems = new ArrayList<>();
-        List<String>  names = new ArrayList<>();
-
+        List<String> names = new ArrayList<>();
+
+        @Override
         public int getRowCount() {
             assert elems.size() == names.size();
@@ -390,8 +400,10 @@
         }
 
+        @Override
         public int getColumnCount() {
             return 2;
         }
 
+        @Override
         public String getColumnName(int columnIndex) {
             if (columnIndex == 0) return "Původní název";
@@ -401,4 +413,5 @@
         }
 
+        @Override
         public Class<?> getColumnClass(int columnIndex) {
             if (columnIndex == 0) return AddressElement.class;
@@ -408,8 +421,10 @@
         }
 
+        @Override
         public boolean isCellEditable(int rowIndex, int columnIndex) {
             return columnIndex == 1;
         }
 
+        @Override
         public Object getValueAt(int rowIndex, int columnIndex) {
             if (columnIndex == 0) return elems.get(rowIndex);
@@ -419,4 +434,5 @@
         }
 
+        @Override
         public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
             assert columnIndex == 1;
@@ -424,8 +440,10 @@
         }
 
+        @Override
         public void addTableModelListener(TableModelListener l) {
 
         }
 
+        @Override
         public void removeTableModelListener(TableModelListener l) {
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui;
 
@@ -51,9 +52,10 @@
 
         super(Main.parent, "Adresní bod",
-                            new String[] { "OK", "Zrušit" }, true);
+                            new String[] {"OK", "Zrušit"}, true);
         initComponents();
 
         // Create action for delaying the database query...
         updateMatchesAction = new AbstractAction() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 updateMatches();
@@ -81,5 +83,5 @@
         // And finalize initializing the form.
         setContent(mainPanel, false);
-        setButtonIcons(new String[] { "ok.png", "cancel.png" });
+        setButtonIcons(new String[] {"ok.png", "cancel.png"});
         setDefaultButton(1);
         setCancelButton(2);
@@ -140,8 +142,9 @@
 
         synchronized (r) {
-            Map<String,String> backup = prim.getKeys();
+            Map<String, String> backup = prim.getKeys();
             r.openTransaction();
-            for (AddressElement elem : r.getCandidates(prim))
+            for (AddressElement elem : r.getCandidates(prim)) {
                 r.unOverwrite(prim, elem);
+            }
             prim.setKeys(null);
             prim.put(PrimUtils.KEY_ADDR_CP, alternateNumberEdit.getText());
@@ -170,4 +173,5 @@
     }
 
+    @Override
     public void pluginStatusChanged(int message) {
 
@@ -223,4 +227,5 @@
         changeLocationButton.setFocusable(false);
         changeLocationButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 changeLocationButtonActionPerformed(evt);
@@ -238,4 +243,5 @@
         //matchesComboBox.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "" }));
         matchesComboBox.addItemListener(new java.awt.event.ItemListener() {
+            @Override
             public void itemStateChanged(java.awt.event.ItemEvent evt) {
                 matchChanged(evt);
@@ -290,11 +296,11 @@
 
         getContentPane().add(mainPanel);
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void changeLocationButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_changeLocationButtonActionPerformed
+    } // </editor-fold>//GEN-END:initComponents
+
+    private void changeLocationButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_changeLocationButtonActionPerformed
         CzechAddressPlugin.changeLocation();
-    }//GEN-LAST:event_changeLocationButtonActionPerformed
-
-    private void keyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_keyReleased
+    } //GEN-LAST:event_changeLocationButtonActionPerformed
+
+    private void keyReleased(java.awt.event.KeyEvent evt) { //GEN-FIRST:event_keyReleased
         if (updateMatchesTimer != null)
             updateMatchesTimer.stop();
@@ -303,14 +309,14 @@
         updateMatchesTimer.setRepeats(false);
         updateMatchesTimer.start();
-    }//GEN-LAST:event_keyReleased
-
-    private void proposalListKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_proposalListKeyReleased
+    } //GEN-LAST:event_keyReleased
+
+    private void proposalListKeyReleased(java.awt.event.KeyEvent evt) { //GEN-FIRST:event_proposalListKeyReleased
         if (evt.getKeyCode() == KeyEvent.VK_DELETE) {
             for (Object o : proposalList.getSelectedValuesList())
                 proposalContainer.removeProposal((Proposal) o);
         }
-    }//GEN-LAST:event_proposalListKeyReleased
-
-    private void matchChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_matchChanged
+    } //GEN-LAST:event_proposalListKeyReleased
+
+    private void matchChanged(java.awt.event.ItemEvent evt) { //GEN-FIRST:event_matchChanged
 
         if (matchesComboBox.getSelectedItem() == null) return;
@@ -328,5 +334,5 @@
 
 
-    }//GEN-LAST:event_matchChanged
+    } //GEN-LAST:event_matchChanged
 
 
@@ -360,4 +366,5 @@
         }
 
+        @Override
         public void setSelectedItem(Object anItem) {
             if (matches == null) return;
@@ -370,8 +377,10 @@
         }
 
+        @Override
         public Object getSelectedItem() {
             return selected;
         }
 
+        @Override
         public int getSize() {
             if (matches == null) return 0;
@@ -379,4 +388,5 @@
         }
 
+        @Override
         public AddressElement getElementAt(int index) {
             if (matches == null) return null;
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/EditorFactory.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/EditorFactory.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/EditorFactory.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors;
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java	(revision 32566)
@@ -1,3 +1,9 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
 
 import org.openstreetmap.josm.Main;
@@ -44,4 +50,5 @@
         return coField.getText();
     }
+
     public String getCP() {
         return cpField.getText();
@@ -56,13 +63,13 @@
     private void initComponents() {
 
-        mainPanel = new javax.swing.JPanel();
-        jLabel1 = new javax.swing.JLabel();
-        jTextField1 = new javax.swing.JTextField();
-        parentField = new javax.swing.JTextField();
-        jLabel2 = new javax.swing.JLabel();
-        cpField = new javax.swing.JTextField();
-        coField = new javax.swing.JTextField();
-        jLabel3 = new javax.swing.JLabel();
-        parentEditButton = new javax.swing.JButton();
+        mainPanel = new JPanel();
+        jLabel1 = new JLabel();
+        jTextField1 = new JTextField();
+        parentField = new JTextField();
+        jLabel2 = new JLabel();
+        cpField = new JTextField();
+        coField = new JTextField();
+        jLabel3 = new JLabel();
+        parentEditButton = new JButton();
 
         setLayout(new java.awt.GridLayout());
@@ -80,4 +87,5 @@
         parentEditButton.setText("    ");
         parentEditButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 parentEditButtonActionPerformed(evt);
@@ -123,11 +131,11 @@
 
         add(mainPanel);
-    }// </editor-fold>//GEN-END:initComponents
+    } // </editor-fold>//GEN-END:initComponents
 
-    private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_parentEditButtonActionPerformed
+    private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_parentEditButtonActionPerformed
         assert parent != null;
         if (EditorFactory.edit(parent))
             parentField.setText(parent.getName());
-    }//GEN-LAST:event_parentEditButtonActionPerformed
+    } //GEN-LAST:event_parentEditButtonActionPerformed
 
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors;
 
@@ -89,4 +90,5 @@
 
         houseList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
+            @Override
             public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
                 houseListChanged(evt);
@@ -97,4 +99,5 @@
         parentEditButton.setText("    ");
         parentEditButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 parentEditButtonActionPerformed(evt);
@@ -104,4 +107,5 @@
         houseEditButton.setText("    ");
         houseEditButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 houseEditButtonActionPerformed(evt);
@@ -151,24 +155,24 @@
 
         getContentPane().add(mainPanel);
-    }// </editor-fold>//GEN-END:initComponents
+    } // </editor-fold>//GEN-END:initComponents
 
     private House selectedHouse = null;
 
-    private void houseListChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_houseListChanged
-        selectedHouse = (House) houseList.getSelectedValue();
+    private void houseListChanged(javax.swing.event.ListSelectionEvent evt) { //GEN-FIRST:event_houseListChanged
+        selectedHouse = houseList.getSelectedValue();
         houseEditButton.setEnabled(EditorFactory.isEditable(selectedHouse));
-    }//GEN-LAST:event_houseListChanged
+    } //GEN-LAST:event_houseListChanged
 
-    private void houseEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_houseEditButtonActionPerformed
+    private void houseEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_houseEditButtonActionPerformed
         assert selectedHouse != null;
         if (EditorFactory.editHouse(selectedHouse))
             houseList.setModel(new DefaultComboBoxModel<>(street.getHouses().toArray(new House[0])));
-    }//GEN-LAST:event_houseEditButtonActionPerformed
+    } //GEN-LAST:event_houseEditButtonActionPerformed
 
-    private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_parentEditButtonActionPerformed
+    private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_parentEditButtonActionPerformed
         assert parent != null;
         if (EditorFactory.edit(parent))
             parentField.setText(parent.getName());
-    }//GEN-LAST:event_parentEditButtonActionPerformed
+    } //GEN-LAST:event_parentEditButtonActionPerformed
 
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors;
 
@@ -102,4 +103,5 @@
 
         houseList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
+            @Override
             public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
                 houseListChanged(evt);
@@ -110,4 +112,5 @@
         parentEditButton.setText("    ");
         parentEditButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 parentEditButtonActionPerformed(evt);
@@ -117,4 +120,5 @@
         houseEditButton.setText("    ");
         houseEditButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 houseEditButtonActionPerformed(evt);
@@ -123,4 +127,5 @@
 
         streetList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
+            @Override
             public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
                 streetListChanged(evt);
@@ -131,4 +136,5 @@
         streetEditButton.setText("    ");
         streetEditButton.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 streetEditButtonActionPerformed(evt);
@@ -193,36 +199,36 @@
 
         add(mainPanel);
-    }// </editor-fold>//GEN-END:initComponents
+    } // </editor-fold>//GEN-END:initComponents
 
     private House selectedHouse = null;
     private Street selectedStreet = null;
 
-    private void houseListChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_houseListChanged
-        selectedHouse = (House) houseList.getSelectedValue();
+    private void houseListChanged(javax.swing.event.ListSelectionEvent evt) { //GEN-FIRST:event_houseListChanged
+        selectedHouse = houseList.getSelectedValue();
         houseEditButton.setEnabled(EditorFactory.isEditable(selectedHouse));
-}//GEN-LAST:event_houseListChanged
-
-    private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_parentEditButtonActionPerformed
+} //GEN-LAST:event_houseListChanged
+
+    private void parentEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_parentEditButtonActionPerformed
         assert parent != null;
         if (EditorFactory.edit(parent))
             parentField.setText(parent.getName());
-}//GEN-LAST:event_parentEditButtonActionPerformed
-
-    private void houseEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_houseEditButtonActionPerformed
+} //GEN-LAST:event_parentEditButtonActionPerformed
+
+    private void houseEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_houseEditButtonActionPerformed
         assert selectedHouse != null;
         if (EditorFactory.editHouse(selectedHouse))
             houseList.setModel(new DefaultComboBoxModel<>(suburb.getHouses().toArray(new House[0])));
-}//GEN-LAST:event_houseEditButtonActionPerformed
-
-    private void streetListChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_streetListChanged
-        selectedStreet = (Street) streetList.getSelectedValue();
+} //GEN-LAST:event_houseEditButtonActionPerformed
+
+    private void streetListChanged(javax.swing.event.ListSelectionEvent evt) { //GEN-FIRST:event_streetListChanged
+        selectedStreet = streetList.getSelectedValue();
         streetEditButton.setEnabled(EditorFactory.isEditable(selectedStreet));
-    }//GEN-LAST:event_streetListChanged
-
-    private void streetEditButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_streetEditButtonActionPerformed
+    } //GEN-LAST:event_streetListChanged
+
+    private void streetEditButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_streetEditButtonActionPerformed
         assert selectedStreet != null;
         if (EditorFactory.editStreet(selectedStreet))
             streetList.setModel(new DefaultComboBoxModel<>(suburb.getStreets().toArray(new Street[0])));
-    }//GEN-LAST:event_streetEditButtonActionPerformed
+    } //GEN-LAST:event_streetEditButtonActionPerformed
 
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java	(revision 32566)
@@ -1,6 +1,8 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.swing.ComboBoxModel;
 import javax.swing.event.ListDataEvent;
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java	(revision 32566)
@@ -1,6 +1,8 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.swing.ListModel;
 import javax.swing.event.ListDataEvent;
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java	(revision 32566)
@@ -1,6 +1,8 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.swing.event.TreeModelEvent;
 import javax.swing.event.TreeModelListener;
@@ -23,20 +25,25 @@
 
     protected String root;
+    @Override
     public Object getRoot() {
         return root;
     }
 
+    @Override
     public void addTreeModelListener(TreeModelListener l) {
         listeneres.add(l);
     }
 
+    @Override
     public void removeTreeModelListener(TreeModelListener l) {
         listeneres.remove(l);
     }
 
+    @Override
     public boolean isLeaf(Object node) {
         return getChildCount(node) == 0;
     }
 
+    @Override
     public void valueForPathChanged(TreePath path, Object newValue) {
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalListRenderer.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalListRenderer.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalListRenderer.java	(revision 32566)
@@ -1,5 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
 
 import java.awt.Component;
+
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JList;
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java	(revision 32566)
@@ -1,5 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
 
 import javax.swing.ImageIcon;
+
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalTreeRenderer.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalTreeRenderer.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalTreeRenderer.java	(revision 32566)
@@ -1,7 +1,10 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.gui.utils;
 
 import java.awt.Component;
+
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement;
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 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.intelligence;
 
@@ -27,5 +28,5 @@
 
     Map<Street, OsmPrimitive> map;
-    Logger logger =  Logger.getLogger(Capitalizator.class.getName());
+    Logger logger = Logger.getLogger(Capitalizator.class.getName());
 
     public Capitalizator(Collection<OsmPrimitive> prims, List<Street> elems) {
@@ -33,11 +34,12 @@
         int expResults = elems.size()/2;
 
-        map  = new HashMap<>(expResults);
+        map = new HashMap<>(expResults);
         ExecutorService serv = Executors.newCachedThreadPool();
         Map<Street, Future<OsmPrimitive>> results
                 = new HashMap<>(expResults);
 
-        for (Street elem : elems)
+        for (Street elem : elems) {
              results.put(elem, serv.submit(new StreetMatcher(elem, prims)));
+        }
 
         for (Street elem : results.keySet()) {
@@ -62,9 +64,10 @@
         private Collection<OsmPrimitive> prims;
 
-        public StreetMatcher(AddressElement elem, Collection<OsmPrimitive> prims) {
+        StreetMatcher(AddressElement elem, Collection<OsmPrimitive> prims) {
             this.elem = elem;
             this.prims = prims;
         }
 
+        @Override
         public OsmPrimitive call() throws Exception {
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.intelligence;
 
@@ -8,4 +9,5 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement;
@@ -35,6 +37,7 @@
  * @author Radomír Černoch radomir.cernoch@gmail.com
  */
-public class Reasoner {
-
+public final class Reasoner {
+
+    // CHECKSTYLE.OFF: SingleSpaceSeparator
     public static final int MATCH_OVERWRITE = 4;
     public static final int MATCH_ROCKSOLID = 3;
@@ -43,22 +46,20 @@
     public static final int MATCH_NOMATCH   = 0;
 
-    private     Map<OsmPrimitive, AddressElement> primBestIndex
-      = new HashMap<> ();
-    private     Map<AddressElement, OsmPrimitive> elemBestIndex
-      = new HashMap<> ();
-
-    private     Map<OsmPrimitive,   Map<AddressElement, Integer>> primMatchIndex
-      = new HashMap<> ();
-    private     Map<AddressElement, Map<OsmPrimitive,   Integer>> elemMatchIndex
-      = new HashMap<> ();
+    private Map<OsmPrimitive, AddressElement> primBestIndex = new HashMap<>();
+    private Map<AddressElement, OsmPrimitive> elemBestIndex = new HashMap<>();
+    private Map<OsmPrimitive,   Map<AddressElement, Integer>> primMatchIndex = new HashMap<>();
+    private Map<AddressElement, Map<OsmPrimitive,   Integer>> elemMatchIndex = new HashMap<>();
 
     private Set<OsmPrimitive>   primToUpdate = new HashSet<>();
     private Set<AddressElement> elemToUpdate = new HashSet<>();
+    // CHECKSTYLE.ON: SingleSpaceSeparator
 
     public static Logger logger = Logger.getLogger(Reasoner.class.getName());
 
     private Reasoner() {}
+
     private static Reasoner singleton = null;
-    public  static Reasoner getInstance() {
+
+    public static Reasoner getInstance() {
         if (singleton == null)
             singleton = new Reasoner();
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/ReasonerListener.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/ReasonerListener.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/ReasonerListener.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.intelligence;
 
@@ -11,7 +12,8 @@
 public interface ReasonerListener {
 
-    public void elementChanged(AddressElement elem);
-    public void primitiveChanged(OsmPrimitive prim);
-    public void resonerReseted();
+    void elementChanged(AddressElement elem);
 
+    void primitiveChanged(OsmPrimitive prim);
+
+    void resonerReseted();
 }
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java	(revision 32566)
@@ -1,5 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.intelligence;
 
 import java.util.Collection;
+
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -18,11 +20,13 @@
  * @author Radomír Černoch, radomir.cernoch@gmail.com
  */
-public class SelectionMonitor implements SelectionChangedListener {
+public final class SelectionMonitor implements SelectionChangedListener {
 
     Collection<OsmPrimitive> lastSelection = new NotNullList<>();
 
     private SelectionMonitor() {}
+
     private static SelectionMonitor singleton = null;
-    public  static SelectionMonitor getInstance() {
+
+    public static SelectionMonitor getInstance() {
         if (singleton == null) {
             singleton = new SelectionMonitor();
@@ -32,9 +36,10 @@
     }
 
+    @Override
     public void selectionChanged(Collection<? extends OsmPrimitive>
                                                                  newSelection) {
         Reasoner r = Reasoner.getInstance();
 
-        synchronized(r) {
+        synchronized (r) {
             r.openTransaction();
             for (OsmPrimitive selectedPrim :newSelection)
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/DatabaseParser.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/DatabaseParser.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/DatabaseParser.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.parser;
 
@@ -16,7 +17,6 @@
  * General superclass for any parser capable of filling the database.
  *
+ * @author Radomír Černoch, raodmir.cernoch@gmail.com
  * @see Database
- *
- * @author Radomír Černoch, raodmir.cernoch@gmail.com
  */
 public abstract class DatabaseParser {
@@ -96,5 +96,5 @@
 
             URL url = new URL(getDatabaseUrl());
-            HttpURLConnection con = (HttpURLConnection)url.openConnection();
+            HttpURLConnection con = (HttpURLConnection) url.openConnection();
 
             //Set timeout for 30 seconds.
@@ -108,5 +108,5 @@
             if (con.getResponseCode() != 200)
                 throw new DatabaseLoadException(
-                        "Požadavek na server selhal, číslo chyby: " + String.valueOf( con.getResponseCode() ));
+                        "Požadavek na server selhal, číslo chyby: " + String.valueOf(con.getResponseCode()));
 
             try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(getDatabasePath()))) {
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.parser;
 
@@ -180,18 +181,26 @@
     @Override
     public void setDocumentLocator(Locator locator) {}
+
     @Override
     public void startDocument() throws SAXException {}
+
     @Override
     public void endDocument() throws SAXException {}
+
     @Override
     public void startPrefixMapping(String prefix, String uri) throws SAXException {}
+
     @Override
     public void endPrefixMapping(String prefix) throws SAXException {}
+
     @Override
     public void characters(char[] ch, int start, int length) throws SAXException {}
+
     @Override
     public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {}
+
     @Override
     public void processingInstruction(String target, String data) throws SAXException {}
+
     @Override
     public void skippedEntity(String name) throws SAXException {}
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/XMLParser.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/XMLParser.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/XMLParser.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.parser;
 
@@ -17,7 +18,6 @@
  * but parsing the actual document must be done by subclasses.</p>
  *
+ * @author Radomír Černoch, raodmir.cernoch@gmail.com
  * @see Database
- *
- * @author Radomír Černoch, raodmir.cernoch@gmail.com
  */
 public abstract class XMLParser extends DatabaseParser
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/AddKeyValueProposal.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/AddKeyValueProposal.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/AddKeyValueProposal.java	(revision 32566)
@@ -1,5 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.proposal;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin;
 
 /**
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.proposal;
 
@@ -26,11 +27,12 @@
      * @return true if this proposal is applicable
      */
-    static public boolean isApplicable(OsmPrimitive primitive) {
+    public static boolean isApplicable(OsmPrimitive primitive) {
         if (!(primitive instanceof Way))
             return false;
 
-        for (String key : primitive.keySet())
+        for (String key : primitive.keySet()) {
             if (key.startsWith("addr:"))
                 return true;
+        }
 
         return false;
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/KeyValueChangeProposal.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/KeyValueChangeProposal.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/KeyValueChangeProposal.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.proposal;
 
@@ -35,5 +36,3 @@
             return "Nahradit '" + oldKey + "=" + oldVal + "' za '" + newKey + "=" + newVal + "'";
     }
-
-
 }
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/Proposal.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/Proposal.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/Proposal.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.proposal;
 
@@ -16,5 +17,5 @@
  * @see ExtractAddressIntoNodeProposal
  */
-abstract public class Proposal {
+public abstract class Proposal {
 
     /**
@@ -32,5 +33,4 @@
      */
     @Override
-    abstract public String toString();
-
+    public abstract String toString();
 }
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.proposal;
 
@@ -4,9 +5,12 @@
 import java.util.Collection;
 import java.util.List;
+
 import javax.swing.JTree;
 import javax.swing.ListModel;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin;
 import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalDatabase.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalDatabase.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalDatabase.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.proposal;
 
@@ -4,8 +5,10 @@
 import java.util.Collection;
 import java.util.List;
+
 import javax.swing.event.TreeModelEvent;
 import javax.swing.event.TreeModelListener;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
@@ -40,5 +43,4 @@
     /**
      * Adds a new {@link ProposalContainer} to the internal database.
-     * @param pac
      */
     public void addContainer(ProposalContainer newContainer) {
@@ -51,5 +53,4 @@
     /**
      * Removes the given {@link ProposalContainer} from the internal list.
-     * @param containerToAdd
      */
     public void removeContainer(ProposalContainer containerToAdd) {
@@ -68,7 +69,8 @@
      */
     public ProposalContainer findContainer(OsmPrimitive primitive) {
-        for (ProposalContainer pac : changeSet)
+        for (ProposalContainer pac : changeSet) {
             if (pac.getTarget().equals(primitive))
                     return pac;
+        }
         return null;
     }
@@ -79,7 +81,4 @@
      * <p>If the primitive is already in the database, the proposal
      * is added to its container. If not, a new container is created.</p>
-     *
-     * @param primitive
-     * @param proposal
      */
     public void addProposals(OsmPrimitive primitive,
@@ -133,8 +132,10 @@
 //==============================================================================
 
+    @Override
     public Object getRoot() {
         return root;
     }
 
+    @Override
     public Object getChild(Object parent, int index) {
         if (parent.equals(root))
@@ -147,4 +148,5 @@
     }
 
+    @Override
     public int getChildCount(Object parent) {
         if (parent.equals(root))
@@ -157,4 +159,5 @@
     }
 
+    @Override
     public boolean isLeaf(Object node) {
         if (node.equals(root))
@@ -167,8 +170,10 @@
     }
 
+    @Override
     public void valueForPathChanged(TreePath path, Object newValue) {
         // We are a read-only model... Nothing to do here.
     }
 
+    @Override
     public int getIndexOfChild(Object parent, Object child) {
         if (parent.equals(root))
@@ -181,8 +186,10 @@
     }
 
+    @Override
     public void addTreeModelListener(TreeModelListener l) {
         listeners.add(l);
     }
 
+    @Override
     public void removeTreeModelListener(TreeModelListener l) {
         listeners.remove(l);
@@ -203,5 +210,5 @@
         // If path-length is 2, the whole ProposalContainer is deleted.
         if (path.getPathCount() == 2) {
-            changeSet.remove((ProposalContainer) path.getPathComponent(1));
+            changeSet.remove(path.getPathComponent(1));
 
             TreeModelEvent event = new TreeModelEvent(this, path);
@@ -215,5 +222,5 @@
         ProposalContainer ac = (ProposalContainer) path.getPathComponent(1);
         if (path.getPathCount() == 3) {
-            ac.getProposals().remove((Proposal) path.getPathComponent(2));
+            ac.getProposals().remove(path.getPathComponent(2));
 
             TreeModelEvent event = new TreeModelEvent(this, path);
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalFactory.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalFactory.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalFactory.java	(revision 32566)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.proposal;
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/RemoveKeyProposal.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/RemoveKeyProposal.java	(revision 32565)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/RemoveKeyProposal.java	(revision 32566)
@@ -1,5 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.czechaddress.proposal;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin;
 
 /**
@@ -39,5 +41,3 @@
         return "Odstranit atribut '" + key + "'";
     }
-
-
 }