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 27608)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 27609)
@@ -1,8 +1,6 @@
 package org.openstreetmap.josm.plugins.czechaddress.gui;
 
-import java.util.Set;
-import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedListModel;
-import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedComboBoxModel;
-import org.openstreetmap.josm.plugins.czechaddress.StringUtils;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.Component;
 import java.awt.Font;
@@ -14,7 +12,9 @@
 import java.util.Collections;
 import java.util.List;
+
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.ImageIcon;
 import javax.swing.JList;
+
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -24,4 +24,5 @@
 import org.openstreetmap.josm.plugins.czechaddress.MapUtils;
 import org.openstreetmap.josm.plugins.czechaddress.StatusListener;
+import org.openstreetmap.josm.plugins.czechaddress.StringUtils;
 import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement;
 import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.ElementWithHouses;
@@ -29,4 +30,6 @@
 import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.House;
 import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.Street;
+import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedComboBoxModel;
+import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedListModel;
 import org.openstreetmap.josm.plugins.czechaddress.intelligence.Reasoner;
 import org.openstreetmap.josm.plugins.czechaddress.intelligence.ReasonerListener;
@@ -81,5 +84,6 @@
     }
 
-    public void pluginStatusChanged(int message) {
+    @Override
+	public void pluginStatusChanged(int message) {
 
         if (message == MESSAGE_DATABASE_LOADED) {
@@ -195,5 +199,6 @@
 
     public boolean selectionListenerActivated = true;
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+    @Override
+	public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
 
         if (!selectionListenerActivated) return;
@@ -260,6 +265,8 @@
         houseList.setModel(new javax.swing.AbstractListModel() {
             String[] strings = { " " };
-            public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
+            @Override
+			public int getSize() { return strings.length; }
+            @Override
+			public Object getElementAt(int i) { return strings[i]; }
         });
         houseList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
@@ -267,5 +274,6 @@
         houseList.setFocusable(false);
         houseList.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
+            @Override
+			public void mouseClicked(java.awt.event.MouseEvent evt) {
                 houseListClicked(evt);
             }
@@ -280,5 +288,6 @@
         relocateButton.setEnabled(false);
         relocateButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
+            @Override
+			public void actionPerformed(java.awt.event.ActionEvent evt) {
                 relocateButtonActionPerformed(evt);
             }
@@ -342,9 +351,12 @@
     // End of variables declaration//GEN-END:variables
 
-    public void elementChanged(AddressElement elem) {
+    @Override
+	public void elementChanged(AddressElement elem) {
         houseModel.notifyAllListeners();
     }
-    public void primitiveChanged(OsmPrimitive prim) {}
-    public void resonerReseted() {}
+    @Override
+	public void primitiveChanged(OsmPrimitive prim) {}
+    @Override
+	public void resonerReseted() {}
 
 //==============================================================================
@@ -427,7 +439,10 @@
         }
 
-        public void resonerReseted() { houses.clear(); }
-        public void primitiveChanged(OsmPrimitive prim) {}
-        public void elementChanged(AddressElement elem) {
+        @Override
+		public void resonerReseted() { houses.clear(); }
+        @Override
+		public void primitiveChanged(OsmPrimitive prim) {}
+        @Override
+		public void elementChanged(AddressElement elem) {
             if (!(elem instanceof House)) return;
             House house = (House) elem;
@@ -460,5 +475,6 @@
         }
 
-        public int getSize() {
+        @Override
+		public int getSize() {
             if (parent == null) return 0;
             return parent.getStreets().size() + metaElem.size();
@@ -476,5 +492,6 @@
         }
 
-        public Object getElementAt(int index) {
+        @Override
+		public Object getElementAt(int index) {
             if (parent == null) return null;
 
@@ -490,5 +507,6 @@
         }
 
-        public void setSelectedItem(Object anItem) {
+        @Override
+		public void setSelectedItem(Object anItem) {
             assert anItem instanceof ElementWithHouses;
             selected = (ElementWithHouses) anItem;
@@ -496,5 +514,6 @@
         }
 
-        public Object getSelectedItem() {
+        @Override
+		public Object getSelectedItem() {
             return selected;
         }
@@ -510,5 +529,6 @@
         }
 
-        public int getSize() {
+        @Override
+		public int getSize() {
             if (streetComboBox.getSelectedItem() == null) return 0;
             ElementWithHouses selected
@@ -528,14 +548,18 @@
         }
 
-        public Object getElementAt(int index) {
+        @Override
+		public Object getElementAt(int index) {
             return getHouseAt(index);
         }
 
-        public void primitiveChanged(OsmPrimitive prim) {}
-        public void elementChanged(AddressElement elem) {
+        @Override
+		public void primitiveChanged(OsmPrimitive prim) {}
+        @Override
+		public void elementChanged(AddressElement elem) {
             notifyAllListeners();
         }
 
-        public void resonerReseted() {
+        @Override
+		public void resonerReseted() {
             notifyAllListeners();
         }