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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java (revision 23190) @@ -86,5 +86,5 @@ public CzechAddressPlugin(PluginInformation info) { - super(info); + super(info); /*boolean x; 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/DatabaseLoadException.java (revision 23190) @@ -6,5 +6,5 @@ /** * Exception occuring during parsing the database. - * + * *

This exception is used during download, extraction or * parsing of the database. It can set a message to be displayed 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/NotNullList.java (revision 23190) @@ -6,5 +6,5 @@ /** * ArrayList, which refuses to add {@code null}. - * + * * @author Radomír Černoch, radomir.cernoch@gmail.com */ @@ -39,5 +39,5 @@ if (c == null) return false; - + if (c instanceof NotNullList) return super.addAll(c); @@ -46,4 +46,4 @@ return true; } - + } 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java (revision 23190) @@ -6,5 +6,5 @@ /** * Utilities for handling {@link OsmPrimitive}s. - * + * * @author Radomír Černoch, radomir.cernoch@gmail.com */ 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StatusListener.java (revision 23190) @@ -21,5 +21,5 @@ * * @see CzechAddressPlugin - * + * * @author Radomír Černoch, radomir.cernoch@gmail.com */ 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java (revision 23190) @@ -107,5 +107,5 @@ return false; } - + return true; } 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java (revision 23190) @@ -11,5 +11,5 @@ * * @author Radomír Černoch, radomir.cernoch@gmail.com - * + * * @see ManagerDialog */ 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java (revision 23190) @@ -63,5 +63,5 @@ if (!(prim2 instanceof Way)) continue; if (prim2.equals(prim)) continue; - Way border = (Way) prim2; + Way border = (Way) prim2; if (border.getNodes().size() == 0) continue; if (border.keySet().size() > 0) continue; 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (revision 23190) @@ -14,5 +14,5 @@ * *

Every element must have a name and may have a parent.

- * + * * @author Radomír Černoch radomir.cernoch@gmail.com */ @@ -99,5 +99,5 @@ Node node = (Node) prim; result += " " + StringUtils.latLonToString(node.getCoor()); - + } else if (prim instanceof Way) { Way way = (Way) prim; @@ -135,5 +135,5 @@ /** * Compares 2 elements. - * + * *

Basic criterion to comparing elements is their name and the * parent. Notice that this behaviour might be changed @@ -217,7 +217,7 @@ } - + protected int[] getFieldMatchList(OsmPrimitive primitive) { - int[] result = {0}; + int[] result = {0}; return result; } @@ -242,9 +242,9 @@ */ public int getQ(OsmPrimitive primitive) { - + // Firstly get integers representing a match of every matchable field. int[] fieldMatches = getFieldMatchList(primitive); assert fieldMatches.length > 0; - + // Now find the max and min of this array. int minVal = fieldMatches[0]; @@ -260,10 +260,10 @@ assert Math.abs(minVal) <= 1; assert Math.abs(maxVal) <= 1; - + // If the best among all fields is 'neutral' match, the given primitive // has nothing to do with our field. if (maxVal <= 0) return Reasoner.MATCH_NOMATCH; - + // If all fields are 1 --> ROCKSOLID MATCH // If some are 1, none -1 --> PARTIAL MATCH @@ -274,5 +274,5 @@ case +1 : return Reasoner.MATCH_ROCKSOLID; } - + return 0; // <-- just to make compilers happy. We cannot get here. } 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Database.java (revision 23190) @@ -9,5 +9,5 @@ *

Contains the tree of all regions, municipalities, suburbs, streets * and houses in the Czech republic.

- * + * * @see AddressElement * @see DatabaseParser 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithHouses.java (revision 23190) @@ -47,5 +47,5 @@ /** * Returns all houses directly contained in this element. - * + * * NOTICE: If a subclass element contains other data structured capable * of storing houses, they are not included in the returned set. 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithStreets.java (revision 23190) @@ -24,5 +24,5 @@ public void addStreet(Street streetToAdd) { //if (streetToAdd.getParent() instanceof ElementWithStreets) - + streetToAdd.setParent(this); streets.add(streetToAdd); @@ -79,10 +79,10 @@ // We make an conservative estimate... List result = new ArrayList(20 * streets.size()); - + result.addAll(this.houses); - + 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java (revision 23190) @@ -20,5 +20,5 @@ * {@link ElementWithHouses}. The {@code setParent()} method should * be called immediatelly after the constructor.

- * + * * @author Radomír Černoch, radomir.cernoch@gmail.com */ @@ -44,9 +44,9 @@ assert (co != null) || (cp != null); - + //... but the the name is overwritten. this.name = generateName(this.cp, this.co); } - + /** * Returns the number unique in a suburb (číslo popisné) @@ -128,5 +128,5 @@ super.setParent(parent); } - + /** * Returns the parent of this house with type-checking. @@ -159,5 +159,5 @@ result[0] = matchField(this.cp, prim.get(PrimUtils.KEY_ADDR_CP)); result[2] = matchField(name, prim.get(PrimUtils.KEY_ADDR_HOUSE_N)); - + // Second field is the Housenumber if (parent instanceof Street) @@ -178,5 +178,5 @@ } - + /** @@ -188,5 +188,5 @@ @Override public List getDiff(OsmPrimitive prim) { - + List props = new NotNullList(); ParentResolver resolver = new ParentResolver(this); 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java (revision 23190) @@ -10,8 +10,8 @@ */ public class Region extends ElementWithStreets { - + private ArrayList vitocis = new ArrayList(); - + /** * Adds a single municipality into this element. @@ -21,5 +21,5 @@ vitocis.add(municipality); } - + /** * Replaces the list of municipalities of this element. @@ -30,5 +30,5 @@ obec.setParent(this); } - + /** * Returns the list of all municipalities in this region. @@ -53,5 +53,5 @@ String nuts3name = null; String nuts4name = null; - + /** * Default constructor setting the name of this region. @@ -61,5 +61,5 @@ super(name); } - + /** * Constructor which sets the region's name together with higher @@ -71,13 +71,13 @@ if (nuts4name != null) this.nuts4name = nuts4name; } - + public String getNuts3Name() { return nuts3name; } - + public String getNuts4Name() { return nuts4name; } - + /** * Returns the name of this region. If the NUTS3 name was entered, @@ -86,10 +86,10 @@ @Override public String toString() { - + String thisString = name; - + if (nuts3name != null) thisString += " (kraj " + nuts3name + ")"; - + return thisString; } 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java (revision 23190) @@ -25,5 +25,5 @@ super.setParent(parent); } - + @Override public ElementWithStreets getParent() { @@ -36,5 +36,5 @@ int[] result = {0}; if (!isMatchable(primitive)) return result; - + result[0] = matchFieldAbbrev(name, primitive.get("name")); return result; @@ -44,5 +44,5 @@ public List getDiff(OsmPrimitive prim) { List props = new NotNullList(); - + props.add(getStringFieldDiff(PrimUtils.KEY_NAME, prim.get(PrimUtils.KEY_NAME), getName())); return props; 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Suburb.java (revision 23190) @@ -6,5 +6,5 @@ /** * Suburb is a part of a {@link Municipality}. - * + * * @author Radomír Černoch radomir.cernoch@gmail.com */ 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ViToCi.java (revision 23190) @@ -6,5 +6,5 @@ /** * ViToCi is either a village, town or a city. - * + * * @author Radomír Černoch radomir.cernoch@gmail.com */ 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java (revision 23190) @@ -234,5 +234,5 @@ if (r.translate(prim) != null) r.unOverwrite(prim, r.translate(prim)); - + ComboBoxModel model = candField.getModel(); for (int i = 0; i < model.getSize(); i++) { @@ -242,5 +242,5 @@ r.unOverwrite(r.translate(elem), elem); } - + r.doOverwrite(prim, (AddressElement) model.getSelectedItem()); } @@ -358,5 +358,5 @@ +AddressElement.getName(prim) + "“"); primitives.add(-index-1, prim); - + ListDataEvent evt = new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, @@ -364,5 +364,5 @@ for (ListDataListener listener : listeners) listener.intervalAdded(evt); - + if (mainField.getSelectedItem() == null) mainField.setSelectedIndex(-index-1); @@ -378,5 +378,5 @@ + elem.getName() + "“"); elements.remove(index); - + if (selected == elem) setSelectedItem(null); @@ -401,5 +401,5 @@ if (selected == prim) setSelectedItem(null); - + ListDataEvent evt = new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, @@ -419,9 +419,9 @@ elements.clear(); primitives.clear(); - + for (ListDataListener listener : listeners) listener.contentsChanged(evt); } - + public void setSelectedItem(Object anItem) { @@ -447,10 +447,10 @@ if (index< elements.size()) return elements.get(index); - + index -= elements.size(); if (index< primitives.size()) return primitives.get(index); - + return null; } @@ -466,5 +466,5 @@ private void updateCandidatesModel(Object selected) { - + if (selected instanceof AddressElement) { AddressElement selElem = (AddressElement) selected; 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java (revision 23190) @@ -52,5 +52,5 @@ private HouseListModel houseModel = new HouseListModel(); private StreetListModel streetModel = new StreetListModel(); - + private FactoryDialog() { @@ -89,5 +89,5 @@ return; } - + if (message == MESSAGE_LOCATION_CHANGED) { DataSet.selListeners.add(this); @@ -99,5 +99,5 @@ keepOddityCheckBox.setEnabled(true); return; - } + } } @@ -174,5 +174,5 @@ do { selectNextUnmatchedHouse(); - + String newStr = StringUtils.extractNumber(getSelectedHouse().getCO()); @@ -360,10 +360,10 @@ setFont(getFont().deriveFont(Font.PLAIN)); setText(((Street) value).getName()); - + } else if (value instanceof ElementWithHouses) { setFont(getFont().deriveFont(Font.BOLD)); setText("[" + ((ElementWithHouses) value).getName() + "]"); } - + return c; } @@ -435,5 +435,5 @@ House house = (House) elem; int index = Collections.binarySearch(houses, house); - + if (Reasoner.getInstance().translate(house) != null) { if (index >= 0) houses.remove(index); @@ -441,5 +441,5 @@ if (index < 0) houses.add(-index-1, house); } - + houseModel.notifyAllListeners(); } @@ -472,5 +472,5 @@ this.selected = parent; this.parent = parent; - + metaElem.set(0, parent); metaElem.get(1).setHouses(parent.getAllHouses()); 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java (revision 23190) @@ -124,5 +124,5 @@ proposalTree.addKeyListener(new java.awt.event.KeyAdapter() { - @Override + @Override public void keyReleased(java.awt.event.KeyEvent evt) { proposalTreeKeyReleased(evt); 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java (revision 23190) @@ -79,5 +79,5 @@ * */ - private void initLocationHints() { + private void initLocationHints() { boolean assertions = false; assert assertions = true; @@ -177,5 +177,5 @@ int curHlIndex = 0; - for (int i = 0; i < list.getSize(); i++) + for (int i = 0; i < list.getSize(); i++) for (int j = 0; j < hlList.size(); j++) { Object t = list.getElementAt(i); 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java (revision 23190) @@ -207,5 +207,5 @@ alternateNumberEdit.addKeyListener(new java.awt.event.KeyAdapter() { - @Override + @Override public void keyReleased(java.awt.event.KeyEvent evt) { PointManipulatorDialog.this.keyReleased(evt); @@ -228,5 +228,5 @@ proposalList.addKeyListener(new java.awt.event.KeyAdapter() { @Override - public void keyReleased(java.awt.event.KeyEvent evt) { + public void keyReleased(java.awt.event.KeyEvent evt) { proposalListKeyReleased(evt); } 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java (revision 23190) @@ -28,5 +28,5 @@ this.parent = suburb.getParent(); nameField.setText(suburb.getName()); - + if (parent != null) parentField.setText(parent.getName()); 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalListRenderer.java (revision 23190) @@ -15,5 +15,5 @@ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - + Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java (revision 23190) @@ -34,5 +34,5 @@ public static ImageIcon getIcon(Object value) { - + if (value instanceof AddKeyValueProposal) return iconAdd; else if (value instanceof KeyValueChangeProposal) return iconEdit; @@ -69,5 +69,5 @@ if (value instanceof AddressElement) return ((AddressElement) value).getName(); - + if (value instanceof OsmPrimitive) return AddressElement.getName(value); @@ -75,5 +75,5 @@ if (value == null) return ""; - + return value.toString(); } 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java (revision 23190) @@ -99,5 +99,5 @@ * modify the data in the reasoner. * The only exception is {@code reset()}.

- * + * *

When there's an open transaction, the result of most output methods * undefined. Exceptions to this rules are indicated.

@@ -387,5 +387,5 @@ if (getStrictlyBest(elem) == prim) return elem; - + return null; } @@ -417,5 +417,5 @@ if (getStrictlyBest(prim) == elem) return prim; - + return null; } @@ -515,5 +515,5 @@ best = cand; } - + for (OsmPrimitive prim : elemMatchIndex.get(elem).keySet()) { int cand = elemMatchIndex.get(elem).get(prim); @@ -542,5 +542,5 @@ */ public AddressElement getStrictlyBest(OsmPrimitive prim) { - + AddressElement result = null; try { @@ -563,5 +563,5 @@ } } - + } catch (NullPointerException except) { System.err.println("Strange exception occured." + @@ -601,5 +601,5 @@ return null; } - + int bestQ = MATCH_NOMATCH; for (OsmPrimitive prim : matches.keySet()) { @@ -683,5 +683,5 @@ ProposalContainer container = new ProposalContainer(prim); container.addProposals(elem.getDiff(prim)); - + if (container.getProposals().size() > 0) database.addContainer(container); 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/DatabaseParser.java (revision 23190) @@ -14,5 +14,5 @@ /** * General superclass for any parser capable of filling the database. - * + * * @see Database * @@ -43,5 +43,5 @@ /** * The ultimate method, which starts filling the database. - * + * * @throws DatabaseLoadException if anything goes wrong... */ @@ -60,5 +60,5 @@ /** * The internal method, which does the actual parsing. - * + * * @throws DatabaseLoadException should be thrown if anything gets wrong... */ @@ -87,5 +87,5 @@ * * The URL is provided by {@code getDatabaseUrl()} method. - * + * * @throws DatabaseLoadException if any error occurs during the download. */ 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java (revision 23190) @@ -57,5 +57,5 @@ return; } - + // ========== PARSING STREET ========== // if (name.equals("ulice")) { @@ -245,9 +245,9 @@ ZipEntry zipEntry = null; try { - zis = new ZipInputStream(new FileInputStream(getDatabasePath())); - - while ((zipEntry = zis.getNextEntry()) != null) - if (zipEntry.getName().equals("adresy.xml")) - break; + zis = new ZipInputStream(new FileInputStream(getDatabasePath())); + + while ((zipEntry = zis.getNextEntry()) != null) + if (zipEntry.getName().equals("adresy.xml")) + break; } catch (IOException ioexp) { @@ -256,5 +256,5 @@ if (zipEntry == null) - throw new DatabaseLoadException( + throw new DatabaseLoadException( "ZIP archiv s databází neobsahuje soubor 'adresy.xml'."); 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 22915) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalDatabase.java (revision 23190) @@ -85,5 +85,5 @@ public void addProposals(OsmPrimitive primitive, Collection proposal) { - + ProposalContainer container = findContainer(primitive); if (container == null) { @@ -114,5 +114,5 @@ /** * Gives a reference to the internal list of {@link ProposalContainer}s. - * + * * @return the refernence to internal changeset. */