Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java (revision 25373) @@ -1,26 +1,26 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ /** - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -58,29 +58,29 @@ * set of OSM primitives and checks for incomplete addresses (e. g. missing addr:... tags) or * addresses with unknown streets ("unresolved addresses"). - * - * It listens to changes within instances of {@link IOSMEntity} to notify clients on update. - * + * + * It listens to changes within instances of {@link IOSMEntity} to notify clients on update. + * * {@link AddressEditContainer} is the central class used within actions and UI models to show * and alter OSM data. - * + * * {@see AbstractAddressEditAction} * {@see AddressEditTableModel} - * + * * @author Oliver Wieland - * + * */ public class AddressEditContainer implements Visitor, DataSetListener, IAddressEditContainerListener, IProblemVisitor, IAllKnowingTrashHeap { - + private Collection workingSet; /** The street dictionary collecting all streets to a set of unique street names. */ private HashMap streetDict = new HashMap(100); - + /** The unresolved addresses list. */ private List unresolvedAddresses = new ArrayList(100); - + /** The incomplete addresses list. */ private List incompleteAddresses = new ArrayList(100); - + /** The shadow copy to assemble the street dict during update. */ private HashMap shadowStreetDict = new HashMap(100); @@ -89,22 +89,22 @@ /** The shadow copy to assemble the incomplete addresses during update. */ private List shadowIncompleteAddresses = new ArrayList(100); - + /** The visited nodes cache to increase iteration speed. */ private HashSet visitedNodes = new HashSet(); /** The visited ways cache to increase iteration speed. */ - private HashSet visitedWays = new HashSet(); + private HashSet visitedWays = new HashSet(); /** The tag list used within the data area. */ private HashSet tags = new HashSet(); /** The tag list used within the data area. */ private HashMap values = new HashMap(); - + /** The list containing the problems */ private List problems = new ArrayList(); - + /** The change listeners. */ private List listeners = new ArrayList(); - - /** - * Creates an empty container. + + /** + * Creates an empty container. */ public AddressEditContainer() { @@ -130,5 +130,5 @@ listeners.add(listener); } - + /** * Removes a change listener. @@ -138,17 +138,17 @@ listeners.remove(listener); } - + /** * Notifies clients that the address container changed. */ protected void fireContainerChanged() { - List shadowListeners = + List shadowListeners = new ArrayList(listeners); - + for (IAddressEditContainerListener listener : shadowListeners) { listener.containerChanged(this); } } - + /** * Notifies clients that an entity within the address container changed. @@ -156,13 +156,13 @@ protected void fireEntityChanged(IOSMEntity entity) { if (entity == null) throw new RuntimeException("Entity must not be null"); - - List shadowListeners = + + List shadowListeners = new ArrayList(listeners); - + for (IAddressEditContainerListener listener : shadowListeners) { listener.entityChanged(entity); } } - + /** * Marks an OSM node as visited. @@ -173,5 +173,5 @@ visitedNodes.add(n); } - + /** * Checks a node for been visited. @@ -183,5 +183,5 @@ return visitedNodes.contains(n); } - + /** * Marks a way as visited. @@ -192,5 +192,5 @@ visitedWays.add(w); } - + /** * Checks a way for been visited. @@ -202,5 +202,5 @@ return visitedWays.contains(w); } - + /* (non-Javadoc) * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Node) @@ -215,12 +215,12 @@ // Address nodes are recycled in order to keep instance variables like guessed names aNode = OsmFactory.createNode(n); - + if (aNode != null) { addAndClassifyAddress(aNode); aNode.visit(this, this); - } + } markNodeAsVisited(n); } - + /* (non-Javadoc) * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Way) @@ -228,11 +228,11 @@ @Override public void visit(Way w) { - // This doesn't matter, we just need the street name + // This doesn't matter, we just need the street name //if (w.isIncomplete()) return; - + if (hasBeenVisited(w)) { return; } - + createNodeFromWay(w); markWayAsVisited(w); @@ -246,5 +246,5 @@ private void addAndClassifyAddress(OSMAddress aNode) { if (!assignAddressToStreet(aNode)) { - // Assignment failed: Street is not known (yet) -> add to 'unresolved' list + // Assignment failed: Street is not known (yet) -> add to 'unresolved' list shadowUnresolvedAddresses.add(aNode); } @@ -262,5 +262,5 @@ private void createNodeFromWay(Way w) { IOSMEntity ne = OsmFactory.createNodeFromWay(w); - + if (!processNode(ne, w)) { // Look also into nodes for addresses (unlikely, but at least they @@ -274,5 +274,5 @@ tags.add(key); } - + String v = w.get(key); if (!values.containsKey(v)) { @@ -286,5 +286,5 @@ * Process an entity node depending on the type. A street segment is added as a child to the * corresponding street dictionary while an address is added to the incomplete/unresolved list - * depending of it's properties. + * depending of it's properties. * * @param ne the entity node. @@ -321,5 +321,5 @@ } - // Node is an address + // Node is an address if (ne instanceof OSMAddress) { OSMAddress aNode = (OSMAddress) ne; @@ -352,5 +352,5 @@ return streetDict; } - + /** * Gets the unresolved (addresses without valid street name) addresses. @@ -376,5 +376,5 @@ * @return the street list */ - public List getStreetList() { + public List getStreetList() { ArrayList sortedList = new ArrayList(streetDict.values()); Collections.sort(sortedList); @@ -397,5 +397,5 @@ return tags; } - + /** * @return the values @@ -412,5 +412,5 @@ return streetDict != null ? streetDict.size() : 0; } - + /** * Get the number of incomplete addresses. @@ -420,5 +420,5 @@ return incompleteAddresses != null ? incompleteAddresses.size() : 0; } - + /** * Gets the number of unresolved addresses. @@ -428,5 +428,5 @@ return unresolvedAddresses != null ? unresolvedAddresses.size() : 0; } - + /** * Gets the number of invalid (unresolved and/or incomplete) addresses. @@ -437,5 +437,5 @@ return getNumberOfIncompleteAddresses() + getNumberOfUnresolvedAddresses(); } - + /** * Gets the number of guessed tags. @@ -444,5 +444,5 @@ public int getNumberOfGuesses() { int sum = 0; - + for (OSMAddress aNode : getAllAddressesToFix()) { if (aNode.hasGuesses()) { @@ -452,5 +452,5 @@ return sum; } - + /** * Gets all (incomplete and/or unresolved) address nodes to fix. @@ -465,8 +465,8 @@ } } - - return all; - } - + + return all; + } + /** * @return the problems @@ -475,5 +475,5 @@ return problems; } - + /** * Clears the problem list. @@ -489,5 +489,5 @@ private boolean assignAddressToStreet(OSMAddress aNode) { String streetName = aNode.getStreetName(); - + if (streetName != null && shadowStreetDict.containsKey(streetName)) { OSMStreet sNode = shadowStreetDict.get(streetName); @@ -495,8 +495,8 @@ return true; } - + return false; } - + /** * Walks through the list of unassigned addresses and tries to assign them to streets. @@ -507,7 +507,7 @@ if (assignAddressToStreet(node)) { resolvedAddresses.add(node); - } - } - + } + } + /* Remove all resolves nodes from unresolved list */ for (OSMAddress resolved : resolvedAddresses) { @@ -515,9 +515,9 @@ } } - + /** * Rebuilds the street and address lists using the data set given - * in {@link AddressEditContainer#attachToDataSet(Collection)} or the - * full data set of the current data layer {@link Main#getCurrentDataSet()}. + * in {@link AddressEditContainer#attachToDataSet(Collection)} or the + * full data set of the current data layer {@link Main#getCurrentDataSet()}. */ public void invalidate() { @@ -530,5 +530,5 @@ } } - + /** * Invalidate using the given data collection. @@ -543,5 +543,5 @@ clearData(); clearProblems(); - + for (OsmPrimitive osmPrimitive : osmData) { osmPrimitive.visit(this); @@ -561,10 +561,10 @@ shadowUnresolvedAddresses.clear(); shadowIncompleteAddresses.clear(); - + // update clients fireContainerChanged(); } } - + /** * Clears the shadowed lists data and resets the 'visited' flag for every OSM object. @@ -577,17 +577,17 @@ visitedWays.clear(); } - + /** * Connects the listener to the given data set and revisits the data. This method should * be called immediately after an edit session finished. - * + * * If the given data set is not null, calls of {@link AddressEditContainer#invalidate()} will * only consider the data given within this set. This can be useful to keep out unimportant * areas. However, a side-effect could be that some streets are not included and leads to * false alarms regarding unresolved addresses. - * + * * Calling {@link AddressEditContainer#detachFromDataSet()} drops the explicit data set and uses * the full data set on subsequent updates.

- * + * * Example
* @@ -600,5 +600,5 @@ */ public void attachToDataSet(Collection osmDataToWorkOn) { - if (osmDataToWorkOn != null && !osmDataToWorkOn.isEmpty()) { + if (osmDataToWorkOn != null && !osmDataToWorkOn.isEmpty()) { workingSet = new ArrayList(osmDataToWorkOn); } else { @@ -607,12 +607,12 @@ invalidate(); // start our investigation... } - + /** * Disconnects the listener from the data set. This method should - * be called immediately before an edit session started in order to + * be called immediately before an edit session started in order to * prevent updates caused by e. g. a selection change within the map view. */ public void detachFromDataSet() { - //Main.main.getCurrentDataSet().removeDataSetListener(this); + //Main.main.getCurrentDataSet().removeDataSetListener(this); if (workingSet != null) { workingSet.clear(); @@ -633,5 +633,5 @@ @Override public void nodeMoved(NodeMovedEvent event) { - + } @@ -671,5 +671,5 @@ @Override public void tagsChanged(TagsChangedEvent event) { - invalidate(); + invalidate(); } @@ -694,7 +694,7 @@ @Override public void entityChanged(IOSMEntity entity) { - fireEntityChanged(entity); - } - + fireEntityChanged(entity); + } + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.fixAddresses.IProblemVisitor#addProblem(org.openstreetmap.josm.plugins.fixAddresses.IProblem) @@ -711,5 +711,5 @@ public void removeProblemsOfSource(IOSMEntity entity) { CheckParameterUtil.ensureParameterNotNull(entity, "entity"); - + List problemsToRemove = new ArrayList(); for (IProblem problem : problems) { @@ -718,5 +718,5 @@ } } - + for (IProblem iProblem : problemsToRemove) { problems.remove(iProblem); @@ -730,9 +730,9 @@ public String getClosestStreetName(String name) { List matches = getClosestStreetNames(name, 1); - + if (matches != null && matches.size() > 0) { return matches.get(0); } - + return null; } @@ -744,15 +744,15 @@ public List getClosestStreetNames(String name, int maxEntries) { CheckParameterUtil.ensureParameterNotNull(name, "name"); - + // ensure right number of entries if (maxEntries < 1) maxEntries = 1; - + List scores = new ArrayList(); List matches = new ArrayList(); - + // Find the longest common sub string - for (String streetName : streetDict.keySet()) { + for (String streetName : streetDict.keySet()) { int score = StringUtils.lcsLength(name, streetName); - + if (score > 3) { // reasonable value? StreetScore sc = new StreetScore(streetName, score); @@ -760,8 +760,8 @@ } } - + // sort by score Collections.sort(scores); - + // populate result list int n = Math.min(maxEntries, scores.size()); @@ -769,5 +769,5 @@ matches.add(scores.get(i).getName()); } - + return matches; } @@ -779,8 +779,8 @@ public boolean isValidStreetName(String name) { if (streetDict == null) return false; - + return streetDict.containsKey(name); } - + /** * Internal class to handle results of {@link AddressEditContainer#getClosestStreetNames(String, int)}. @@ -789,5 +789,5 @@ private String name; private int score; - + /** * @param name Name of the street. @@ -817,5 +817,5 @@ public int compareTo(StreetScore arg0) { if (arg0 == null) return 1; - + return new Integer(score).compareTo(new Integer(arg0.score)); } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressProblem.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressProblem.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressProblem.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -52,5 +52,5 @@ this(source, description, solutions, ProblemType.Warning); } - + /** * Instantiates a new problem with type 'warning' and without solutions. @@ -71,5 +71,5 @@ } } - + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.fixAddresses.IProblem#addSolution(org.openstreetmap.josm.plugins.fixAddresses.ISolution) @@ -78,5 +78,5 @@ public void addSolution(ISolution solution) { CheckParameterUtil.ensureParameterNotNull(solution, "solution"); - + lazyCreateSolutions(); solutions.add(solution); @@ -89,6 +89,6 @@ public void applySolution(ISolution solution) { CheckParameterUtil.ensureParameterNotNull(solution, "solution"); - - solution.solve(); + + solution.solve(); } @@ -99,5 +99,5 @@ public void clearSolutions() { if (solutions == null) return; - + solutions.clear(); } @@ -134,5 +134,5 @@ if (solutions == null ) throw new RuntimeException("Solution list is null"); if (solutions.size() == 0) throw new RuntimeException("Solution list is empty"); - + CheckParameterUtil.ensureParameterNotNull(solution, "solution"); solutions.remove(solution); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressSolution.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressSolution.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressSolution.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -23,5 +23,5 @@ private String description; private SolutionType type; - + /** * @param description The solution description. Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -26,10 +26,10 @@ public FixAddressesMapMode(MapFrame mapFrame) { - super(tr("Fix adresses"), "incompleteaddress_24", - tr("Show dialog with incomplete addresses"), - mapFrame, + super(tr("Fix adresses"), "incompleteaddress_24", + tr("Show dialog with incomplete addresses"), + mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); } - + } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java (revision 25373) @@ -1,13 +1,13 @@ /** - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -27,5 +27,5 @@ public class FixAddressesPlugin extends Plugin { private static IncompleteAddressesDialog incompleteAddrDlg; - private static FixAddressesPreferences preferences; + private static FixAddressesPreferences preferences; /** @@ -35,16 +35,16 @@ public FixAddressesPlugin(PluginInformation info) { super(info); - + // Create actions... - FixUnresolvedStreetsAction action = new FixUnresolvedStreetsAction(); + FixUnresolvedStreetsAction action = new FixUnresolvedStreetsAction(); SelectIncompleteAddressesAction incAddrAction = new SelectIncompleteAddressesAction(); - + // ... and add them to the tools menu in main Main.main.menu.toolsMenu.addSeparator(); - Main.main.menu.toolsMenu.add(action); - Main.main.menu.toolsMenu.add(incAddrAction); - - // create preferences instance - preferences = (FixAddressesPreferences) new FixAddressesPreferences.Factory().createPreferenceSetting(); + Main.main.menu.toolsMenu.add(action); + Main.main.menu.toolsMenu.add(incAddrAction); + + // create preferences instance + preferences = (FixAddressesPreferences) new FixAddressesPreferences.Factory().createPreferenceSetting(); } @@ -56,15 +56,15 @@ // TODO Auto-generated method stub super.mapFrameInitialized(oldFrame, newFrame); - + if (newFrame != null) { incompleteAddrDlg = new IncompleteAddressesDialog(); - FixAddressesMapMode faMode = new FixAddressesMapMode(Main.map); + FixAddressesMapMode faMode = new FixAddressesMapMode(Main.map); IconToggleButton faModeButton = new IconToggleButton(faMode); faModeButton.setVisible(true); - newFrame.addToggleDialog(incompleteAddrDlg); + newFrame.addToggleDialog(incompleteAddrDlg); } } - - + + /** @@ -74,5 +74,5 @@ return incompleteAddrDlg; } - + /** * Gets the preferences instance for this plugin. Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPreferences.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPreferences.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPreferences.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -23,13 +23,13 @@ public static class Factory implements PreferenceSettingFactory { - public PreferenceSetting createPreferenceSetting() { - return new FixAddressesPreferences(); - } - } - + public PreferenceSetting createPreferenceSetting() { + return new FixAddressesPreferences(); + } + } + @Override public void addGui(PreferenceTabbedPane gui) { // TODO Auto-generated method stub - + } @@ -59,6 +59,6 @@ this.selectGuessedObjects = selectGuessedObjects; } - - - + + + } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java (revision 25373) @@ -18,5 +18,5 @@ * Action to find and fix addresses without (valid) streets. It launches an dialog * instance of {@link AddressEditDialog}. - * + * * @author Oliver Wieland */ @@ -34,8 +34,8 @@ Shortcut.GROUP_MENU, InputEvent.ALT_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK), false); - - setEnabled(false); - addressEditContainer = new AddressEditContainer(); - DataSet.addSelectionListener(this); + + setEnabled(false); + addressEditContainer = new AddressEditContainer(); + DataSet.addSelectionListener(this); } @@ -53,5 +53,5 @@ */ @Override - public void actionPerformed(ActionEvent arg0) { + public void actionPerformed(ActionEvent arg0) { if (addressEditContainer != null) { addressEditContainer.attachToDataSet(newSelection); @@ -65,5 +65,5 @@ } } - + /* (non-Javadoc) @@ -79,5 +79,5 @@ Collection selection) { // Enable button if there is either a selection or at least a data set - setEnabled( selection != null && !selection.isEmpty() || + setEnabled( selection != null && !selection.isEmpty() || (getCurrentDataSet() != null)); } @@ -87,5 +87,5 @@ @SuppressWarnings("unused") private void generateTagCode(AddressEditContainer addrVisitor) { - + for (String tag : addrVisitor.getTags()) { String methodName = createMethodName(tag); @@ -109,9 +109,9 @@ .toUpperCase().replaceAll(":", "_"), tag)); } - + for (String value : addrVisitor.getValues().keySet()) { String tag = addrVisitor.getValues().get(value); - - String tags = tag.toUpperCase().replaceAll(":", "_"); + + String tags = tag.toUpperCase().replaceAll(":", "_"); String values = value.toUpperCase().replaceAll(":", "_"); System.out.println(String.format( Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -35,8 +35,8 @@ /** * The class GuessAddressRunnable scans the data set to find the best guess for a missing address field. - * - * The guessing procedure itself is implemented by defining "guessers" using the {@link GuessedValueHandler} - * class. A guessed field does not modify the corresponding property of {@link OSMAddress} itself, but - * adds the guessed value to a shadowed field by calling {@link OSMAddress#setGuessedValue(String, String)}. + * + * The guessing procedure itself is implemented by defining "guessers" using the {@link GuessedValueHandler} + * class. A guessed field does not modify the corresponding property of {@link OSMAddress} itself, but + * adds the guessed value to a shadowed field by calling {@link OSMAddress#setGuessedValue(String, String)}. */ public class GuessAddressRunnable extends PleaseWaitRunnable implements Visitor { @@ -45,8 +45,8 @@ private double minDist; private OSMAddress curAddressNode; - private boolean isRunning = false; + private boolean isRunning = false; private boolean cancelled; - - + + /** * Instantiates a new guess address runnable. @@ -57,5 +57,5 @@ public GuessAddressRunnable(List addresses, String title) { super(title != null ? title : tr("Searching")); - setAddressEditContainer(addresses); + setAddressEditContainer(addresses); } @@ -69,5 +69,5 @@ throw new ConcurrentModificationException(); } - this.addressesToGuess = nodes; + this.addressesToGuess = nodes; } @@ -86,5 +86,5 @@ return isRunning; } - + /** * Adds a finish listener. @@ -95,5 +95,5 @@ finishListeners.add(l); } - + /** * Removes a finish listener. @@ -127,7 +127,7 @@ LatLon ll = curAddressNode.getCoor(); if (ll == null) return; - + double dist = ll.greatCircleDistance(n.getCoor()); - + if (dist < minDist) { minDist = dist; @@ -141,10 +141,10 @@ public void visit(Way w) { // skip non-streets and streets without name - if (!TagUtils.hasHighwayTag(w)) return; + if (!TagUtils.hasHighwayTag(w)) return; if (!TagUtils.hasNameTag(w)) return; - + for (Node node : w.getNodes()) { visit(node); - } + } } @@ -154,5 +154,5 @@ @Override public void visit(Relation e) { - // nothing to do yet + // nothing to do yet } @@ -170,5 +170,5 @@ @Override protected void cancel() { - cancelled = true; + cancelled = true; } @@ -191,21 +191,21 @@ isRunning = true; cancelled = false; - + // Start progress monitor to guess address values progressMonitor.subTask(tr("Searching") + "..."); - + try { progressMonitor.setTicksCount(addressesToGuess.size()); - - - + + + List shadowCopy = new ArrayList(addressesToGuess); - for (OSMAddress aNode : shadowCopy) { + for (OSMAddress aNode : shadowCopy) { minDist = Double.MAX_VALUE; curAddressNode = aNode; - + // setup guessing handlers for address tags GuessedValueHandler[] guessers = new GuessedValueHandler[]{ - new GuessStreetValueHandler(TagUtils.ADDR_STREET_TAG, aNode), + new GuessStreetValueHandler(TagUtils.ADDR_STREET_TAG, aNode), new GuessedValueHandler(TagUtils.ADDR_POSTCODE_TAG, aNode, 500.0), new GuessedValueHandler(TagUtils.ADDR_CITY_TAG, aNode, 5000.0), @@ -214,10 +214,10 @@ new GuessedValueHandler(TagUtils.ADDR_CITY_TAG, aNode, 2000.0) }; - - if (!aNode.needsGuess()) { // nothing to do + + if (!aNode.needsGuess()) { // nothing to do progressMonitor.worked(1); continue; } - + // check for cancel if (cancelled) { @@ -232,9 +232,9 @@ break; } - - // guess values + + // guess values for (int i = 0; i < guessers.length; i++) { osmPrimitive.visit(guessers[i]); - + if (guessers[i].currentValue == null && i == 0) { //System.err.println("Guess #" + i + " failed for " + aNode); @@ -242,7 +242,7 @@ } } - + // report progress - progressMonitor.worked(1); + progressMonitor.worked(1); } } finally { @@ -251,5 +251,5 @@ } } - + private class GuessStreetValueHandler extends GuessedValueHandler { @@ -270,13 +270,13 @@ */ @Override - public void visit(Way w) { + public void visit(Way w) { if (TagUtils.isStreetSupportingHousenumbers(w)) { OSMAddress aNode = getAddressNode(); double dist = OsmUtils.getMinimumDistanceToWay(aNode.getCoor(), w); - + if (dist < minDist && dist < getMaxDistance()) { //System.out.println(String.format("New guess %s: %4.2f m", TagUtils.getNameValue(w), dist)); minDist = dist; - currentValue = TagUtils.getNameValue(w); + currentValue = TagUtils.getNameValue(w); aNode.setGuessedValue(getTag(), currentValue, w); } else { Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -24,12 +24,12 @@ * The guess is determined by finding the closest way/node with the given tag. If no appropriate node * is found within maximum distance, no guess is made. - * + * * The default maximum distance is 100m. */ public class GuessedValueHandler implements Visitor { - + /** Default maximum distance (100m) */ private static final double DEFAULT_MAX_DIST = 100.0; - + private String tag; protected double minDist; @@ -37,5 +37,5 @@ private OSMAddress aNode; private double maxDist = DEFAULT_MAX_DIST; - + /** * Instantiates a new guessed value handler. @@ -48,5 +48,5 @@ this(tag, aNode, DEFAULT_MAX_DIST); } - + /** * Instantiates a new guessed value handler. @@ -58,23 +58,23 @@ public GuessedValueHandler(String tag, OSMAddress aNode, double maxDist) { super(); - + if (StringUtils.isNullOrEmpty(tag)) { throw new RuntimeException("Tag must not be empty or null!"); } - + if (aNode == null) { - throw new RuntimeException("Address node must not be null!"); + throw new RuntimeException("Address node must not be null!"); } - + if (maxDist < 1.0) { // clip value maxDist = 1.0; } this.tag = tag; - + minDist = Double.MAX_VALUE; this.aNode = aNode; - this.maxDist = maxDist; + this.maxDist = maxDist; } - + /** * Gets the address node to make the guess for. @@ -87,6 +87,6 @@ /** - * Gets the max distance allowed to consider a node as guess. - * If the distance of the node is greater than maxDist, the + * Gets the max distance allowed to consider a node as guess. + * If the distance of the node is greater than maxDist, the * node/way will be ignored. * @@ -123,5 +123,5 @@ return currentValue; } - + /** * Check if we need to visit the OSM data @@ -132,5 +132,5 @@ return aNode.needsGuessedValue(tag); } - + /* (non-Javadoc) * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Node) @@ -142,5 +142,5 @@ if (dist < minDist && dist < maxDist) { minDist = dist; - currentValue = n.get(tag); + currentValue = n.get(tag); aNode.setGuessedValue(tag, currentValue, n); } @@ -157,5 +157,5 @@ if (dist < minDist && dist < maxDist) { minDist = dist; - currentValue = w.get(tag); + currentValue = w.get(tag); aNode.setGuessedValue(tag, currentValue, w); } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IAddressEditContainerListener.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IAddressEditContainerListener.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IAddressEditContainerListener.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -21,5 +21,5 @@ */ public void containerChanged(AddressEditContainer container); - + /** * Notifies clients that an entity has been changed. Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IAllKnowingTrashHeap.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IAllKnowingTrashHeap.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IAllKnowingTrashHeap.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -17,5 +17,5 @@ public interface IAllKnowingTrashHeap { - + /** * Gets the list containing the best matching (closest) street names. @@ -26,5 +26,5 @@ */ public List getClosestStreetNames(String name, int maxEntries); - + /** * Gets the closest street name to the given name. @@ -34,5 +34,5 @@ */ public String getClosestStreetName(String name); - + /** * Checks if the given street name is valid. Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ICommandListener.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ICommandListener.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ICommandListener.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -23,5 +23,5 @@ * around OSM objects in order to ease up some tasks like tag handling. * @author Oliver Wieland - * + * */ @@ -32,5 +32,5 @@ */ public OsmPrimitive getOsmObject(); - + /** * Checks if underlying OSM object has a name. @@ -38,5 +38,5 @@ */ public boolean hasName(); - + /** * Gets the name of the entity node. @@ -44,5 +44,5 @@ */ public String getName(); - + /** * Gets the children of the entity node. @@ -50,13 +50,13 @@ */ public List getChildren(); - + /** * Gets the coordinate of the node. If the the underlying object is a - * node, it just returns the node coordinate. For ways and areas, this - * method returns the coordinate of the center (balance point). + * node, it just returns the node coordinate. For ways and areas, this + * method returns the coordinate of the center (balance point). * @return */ public LatLon getCoor(); - + /** * Adds a command listener. @@ -64,5 +64,5 @@ */ public void addCommandListener(ICommandListener listener); - + /** * Removes a command listener. @@ -70,5 +70,5 @@ */ public void removeCommandListener(ICommandListener listener); - + /** * Collects problems and possible solutions. Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProblem.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProblem.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProblem.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -17,5 +17,5 @@ public interface IProblem { - + /** * Gets the OSM entity which causes the problem. @@ -24,5 +24,5 @@ */ public IOSMEntity getSource(); - + /** * Gets the problem description. @@ -31,5 +31,5 @@ */ public String getDescription(); - + /** * Gets the problem type. @@ -38,5 +38,5 @@ */ public ProblemType getType(); - + /** * Gets the available solutions for this problem. @@ -45,5 +45,5 @@ */ public List getSolutions(); - + /** * Adds a possible solution to the problem. @@ -52,5 +52,5 @@ */ public void addSolution(ISolution solution); - + /** * Removes a solution from this problem. @@ -59,10 +59,10 @@ */ public void removeSolution(ISolution solution); - + /** * Removes all solutions from this problem. */ public void clearSolutions(); - + /** * Applies a {@link ISolution} instance on the problem. Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProblemVisitor.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProblemVisitor.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProblemVisitor.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -22,5 +22,5 @@ */ public void addProblem(IProblem problem); - + /** * Removes the problems of the given source. Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProgressMonitorFinishedListener.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProgressMonitorFinishedListener.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProgressMonitorFinishedListener.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ISolution.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ISolution.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ISolution.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -17,5 +17,5 @@ public interface ISolution { - + /** * Gets the description of the solution. @@ -24,5 +24,5 @@ */ public String getDescription(); - + /** * Gets the action to execute for solving the problem. @@ -31,5 +31,5 @@ */ public JosmAction getAction(); - + /** * Gets the solution type. Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -24,5 +24,5 @@ /** - * The class OSMAddress represents a single address node of OSM. It is a lightweight + * The class OSMAddress represents a single address node of OSM. It is a lightweight * wrapper for a OSM node in order to simplify tag handling. */ @@ -30,13 +30,13 @@ public static final String MISSING_TAG = "?"; public static final String INTERPOLATION_TAG = "x..y"; - - - /** True, if address is part of an address interpolation. */ - private boolean isPartOfInterpolation; - /** - * True, if address has derived values from an associated street relation. + + + /** True, if address is part of an address interpolation. */ + private boolean isPartOfInterpolation; + /** + * True, if address has derived values from an associated street relation. */ private boolean isPartOfAssocStreetRel; - + /** The dictionary containing guessed values. */ private HashMap guessedValues = new HashMap(); @@ -49,5 +49,5 @@ super(osmObject); } - + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.addressEdit.NodeEntityBase#setOsmObject(org.openstreetmap.josm.data.osm.OsmPrimitive) @@ -56,9 +56,9 @@ public void setOsmObject(OsmPrimitive osmObject) { super.setOsmObject(osmObject); - - isPartOfInterpolation = OsmUtils.getValuesFromAddressInterpolation(this); + + isPartOfInterpolation = OsmUtils.getValuesFromAddressInterpolation(this); isPartOfAssocStreetRel = OsmUtils.getValuesFromRelation(this); } - + /** * Checks if the underlying address node has all tags usually needed to describe an address. @@ -66,19 +66,19 @@ */ public boolean isComplete() { - boolean isComplete = hasCity() && + boolean isComplete = hasCity() && hasHouseNumber() && - (hasPostalCode() && - PostalCodeChecker.hasValidPostalCode(this)) && - hasCity() && + (hasPostalCode() && + PostalCodeChecker.hasValidPostalCode(this)) && + hasCity() && hasStreetName(); - + // Check, if "addr:state" is required (US and AU) if (TagUtils.isStateRequired()) { isComplete = isComplete && hasState(); } - + return isComplete; } - + /** * Gets the name of the street associated with this address. @@ -88,5 +88,5 @@ return getTagValueWithGuess(TagUtils.ADDR_STREET_TAG); } - + /** * Gets the tag value with guess. If the object does not have the given tag, this method looks for @@ -99,5 +99,5 @@ if (StringUtils.isNullOrEmpty(tag)) return MISSING_TAG; if (osmObject == null) return MISSING_TAG; - + if (!osmObject.hasKey(tag) || StringUtils.isNullOrEmpty(osmObject.get(tag))) { if (!hasDerivedValue(tag)) { @@ -109,12 +109,12 @@ return MISSING_TAG; } - } else { // ok, use derived value known via associated relation or way + } else { // ok, use derived value known via associated relation or way return getDerivedValue(tag); } } else { // get existing tag value - return osmObject.get(tag); - } - } - + return osmObject.get(tag); + } + } + /** * Returns true, if this address node has a street name. @@ -124,5 +124,5 @@ return hasTag(TagUtils.ADDR_STREET_TAG); } - + /** * Returns the street name guessed by the nearest-neighbor search. @@ -142,5 +142,5 @@ setGuessedValue(TagUtils.ADDR_STREET_TAG, guessedStreetName, srcObj); } - + /** * Checks for a guessed street name. @@ -151,5 +151,5 @@ return hasGuessedValue(TagUtils.ADDR_STREET_TAG); } - + /** * @return the guessedPostCode @@ -168,5 +168,5 @@ setGuessedValue(TagUtils.ADDR_POSTCODE_TAG, guessedPostCode, srcObj); } - + /** * Checks for a guessed post code. @@ -209,7 +209,7 @@ */ public boolean hasGuesses() { - return guessedValues.size() > 0; - } - + return guessedValues.size() > 0; + } + /** * Applies all guessed tags for this node. @@ -219,10 +219,10 @@ applyGuessForTag(tag); } - + // Clear all guesses guessedValues.clear(); guessedObjects.clear(); } - + /** * Apply the guessed value for the given tag. @@ -234,5 +234,5 @@ String val = guessedValues.get(tag); if (!StringUtils.isNullOrEmpty(val)) { - setOSMTag(tag, val); + setOSMTag(tag, val); } } @@ -245,6 +245,6 @@ public String getPostalCode() { String pc = getTagValueWithGuess(TagUtils.ADDR_POSTCODE_TAG); - - + + if (!MISSING_TAG.equals(pc) && !PostalCodeChecker.hasValidPostalCode(getCountry(), pc)) { pc = "(!)" + pc; @@ -252,5 +252,5 @@ return pc; } - + /** * Checks if this instance has a valid postal code. @@ -261,5 +261,5 @@ return PostalCodeChecker.hasValidPostalCode(this); } - + /** * Checks for post code tag. @@ -270,5 +270,5 @@ return hasTag(TagUtils.ADDR_POSTCODE_TAG); } - + /** * Gets the name of the house number associated with this address. @@ -285,5 +285,5 @@ return TagUtils.getAddrHousenumberValue(osmObject); } - + /** * Checks for house number. @@ -294,5 +294,5 @@ return TagUtils.hasAddrHousenumberTag(osmObject) || isPartOfInterpolation; } - + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.fixAddresses.OSMEntityBase#getName() @@ -303,8 +303,8 @@ return TagUtils.getAddrHousenameValue(osmObject); } - + return ""; } - + /** * Checks if this address is part of a address interpolation. @@ -315,5 +315,5 @@ return isPartOfInterpolation; } - + /** * Checks if this address is part of an 'associated street' relation. @@ -332,5 +332,5 @@ return getTagValueWithGuess(TagUtils.ADDR_CITY_TAG); } - + /** * Checks for city tag. @@ -341,5 +341,5 @@ return hasTag(TagUtils.ADDR_CITY_TAG); } - + /** * Gets the name of the state associated with this address. @@ -349,5 +349,5 @@ return getTagValueWithGuess(TagUtils.ADDR_STATE_TAG); } - + /** * Checks for state tag. @@ -366,5 +366,5 @@ return getTagValueWithGuess(TagUtils.ADDR_COUNTRY_TAG); } - + /** * Checks for country tag. @@ -375,5 +375,5 @@ return hasTag(TagUtils.ADDR_COUNTRY_TAG); } - + /** * Removes all address-related tags from the node or way. @@ -387,5 +387,5 @@ removeOSMTag(TagUtils.ADDR_STREET_TAG); } - + /** * Checks if the associated OSM object has the given tag or if the tag is available via a referrer. @@ -396,8 +396,8 @@ public boolean hasTag(String tag) { if (StringUtils.isNullOrEmpty(tag)) return false; - + return TagUtils.hasTag(osmObject, tag) || hasDerivedValue(tag); } - + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.addressEdit.NodeEntityBase#compareTo(org.openstreetmap.josm.plugins.addressEdit.INodeEntity) @@ -409,15 +409,15 @@ } OSMAddress other = (OSMAddress) o; - + int cc = 0; cc = this.getCountry().compareTo(other.getCountry()); if ( cc == 0) { - cc = this.getState().compareTo(other.getState()); + cc = this.getState().compareTo(other.getState()); if (cc == 0) { - cc = this.getCity().compareTo(other.getCity()); + cc = this.getCity().compareTo(other.getCity()); if (cc == 0) { - cc = this.getStreetName().compareTo(other.getStreetName()); + cc = this.getStreetName().compareTo(other.getStreetName()); if (cc == 0) { - if (hasGuessedStreetName()) { + if (hasGuessedStreetName()) { if (other.hasStreetName()) { // Compare guessed name with the real name @@ -441,8 +441,8 @@ } } - + return cc; } - + /** * Applies the street name from the specified street node. @@ -451,12 +451,12 @@ public void assignStreet(OSMStreet node) { if (node == null || !node.hasName()) return; - + if (!node.getName().equals(getStreetName())) { - setStreetName(node.getName()); + setStreetName(node.getName()); node.addAddress(this); fireEntityChanged(this); } } - + /** * Gets the guessed value for the given tag. @@ -467,11 +467,11 @@ public String getGuessedValue(String tag) { CheckParameterUtil.ensureParameterNotNull(tag, "tag"); - + if (!hasGuessedValue(tag)) { - return null; + return null; } return guessedValues.get(tag); } - + /** * Gets the guessed object. @@ -482,5 +482,5 @@ public OsmPrimitive getGuessedObject(String tag) { CheckParameterUtil.ensureParameterNotNull(tag, "tag"); - + if (guessedObjects.containsKey(tag)) { return guessedObjects.get(tag); @@ -488,5 +488,5 @@ return null; } - + /** * Gets all guessed objects or an empty list, if no guesses have been made yet. @@ -496,8 +496,8 @@ public Collection getGuessedObjects() { if (guessedObjects == null) return null; - + return guessedObjects.values(); } - + /** * Check if this instance needs guessed values. This is the case, if the underlying OSM node @@ -506,6 +506,6 @@ * @return true, if this instance needs at least one guessed value. */ - public boolean needsGuess() { - return needsGuessedValue(TagUtils.ADDR_CITY_TAG) || + public boolean needsGuess() { + return needsGuessedValue(TagUtils.ADDR_CITY_TAG) || needsGuessedValue(TagUtils.ADDR_POSTCODE_TAG) || needsGuessedValue(TagUtils.ADDR_COUNTRY_TAG) || @@ -513,5 +513,5 @@ needsGuessedValue(TagUtils.ADDR_STREET_TAG); } - + /** * Check if this instance needs guessed value for a given tag. @@ -521,5 +521,5 @@ return MISSING_TAG.equals(getTagValueWithGuess(tag)); } - + /** * Clears all guessed values. @@ -528,5 +528,5 @@ guessedValues.clear(); } - + /** * Checks if given tag has a guessed value (tag exists and has a non-empty value). @@ -537,9 +537,9 @@ private boolean hasGuessedValue(String tag) { CheckParameterUtil.ensureParameterNotNull(tag, "tag"); - - return guessedValues.containsKey(tag) && + + return guessedValues.containsKey(tag) && !StringUtils.isNullOrEmpty(guessedValues.get(tag)); } - + /** * Sets the guessed value with the given tag. @@ -559,5 +559,5 @@ } } - + /** * Checks if given tag has a derived value (value is available via a referrer). @@ -568,9 +568,9 @@ private boolean hasDerivedValue(String tag) { CheckParameterUtil.ensureParameterNotNull(tag, "tag"); - - return derivedValues.containsKey(tag) && + + return derivedValues.containsKey(tag) && !StringUtils.isNullOrEmpty(derivedValues.get(tag)); } - + /** * Returns true, if this instance has derived values from any referrer. @@ -578,7 +578,7 @@ */ public boolean hasDerivedValues() { - return derivedValues.size() > 0; - } - + return derivedValues.size() > 0; + } + /** * Gets the derived value for the given tag. @@ -588,9 +588,9 @@ public String getDerivedValue(String tag) { if (!hasDerivedValue(tag)) { - return null; + return null; } return derivedValues.get(tag); } - + /** * Sets the value known indirectly via a referrer with the given tag. @@ -600,7 +600,7 @@ */ public void setDerivedValue(String tag, String value) { - derivedValues.put(tag, value); - } - + derivedValues.put(tag, value); + } + /** * Sets the street name of the address node. @@ -609,9 +609,9 @@ public void setStreetName(String streetName) { if (streetName != null && streetName.length() == 0) return; - + setOSMTag(TagUtils.ADDR_STREET_TAG, streetName); } - + /** * Sets the state of the address node. @@ -620,8 +620,8 @@ public void setState(String state) { if (state != null && state.length() == 0) return; - + setOSMTag(TagUtils.ADDR_STATE_TAG, state); } - + /** * Sets the country of the address node. @@ -630,8 +630,8 @@ public void setCountry(String country) { if (country != null && country.length() == 0) return; - + setOSMTag(TagUtils.ADDR_COUNTRY_TAG, country); } - + /** * Sets the post code of the address node. @@ -640,8 +640,8 @@ public void setPostCode(String postCode) { if (postCode != null && postCode.length() == 0) return; - + setOSMTag(TagUtils.ADDR_POSTCODE_TAG, postCode); } - + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.fixAddresses.OSMEntityBase#visit(org.openstreetmap.josm.plugins.fixAddresses.IProblemVisitor) @@ -650,5 +650,5 @@ public void visit(IAllKnowingTrashHeap trashHeap, IProblemVisitor visitor) { CheckParameterUtil.ensureParameterNotNull(visitor, "visitor"); - + // Check for street if (!hasStreetName()) { @@ -664,5 +664,5 @@ AddressProblem p = new AddressProblem(this, tr("Address has no valid street")); String match = trashHeap.getClosestStreetName(getStreetName()); - + if (!StringUtils.isNullOrEmpty(match)) { setGuessedStreetName(match, null); @@ -671,5 +671,5 @@ visitor.addProblem(p); } - + // Check for postal code if (!hasPostalCode()) { @@ -682,5 +682,5 @@ visitor.addProblem(p); } - + // Check for city if (!hasCity()) { @@ -693,5 +693,5 @@ visitor.addProblem(p); } - + // Check for country if (!hasCountry()) { @@ -711,11 +711,11 @@ private void addGuessValueSolution(AddressProblem p, String tag) { AddressSolution s = new AddressSolution( - String.format("%s '%s'", tr("Assign to"), getGuessedValue(tag)), + String.format("%s '%s'", tr("Assign to"), getGuessedValue(tag)), new ApplyAllGuessesAction(tag), SolutionType.Change); - + p.addSolution(s); } - + /** * Adds the remove address tags solution entry to a problem. @@ -725,12 +725,12 @@ private void addRemoveAddressTagsSolution(IProblem problem) { CheckParameterUtil.ensureParameterNotNull(problem, "problem"); - + AddressSolution s = new AddressSolution( - tr("Remove all address tags"), + tr("Remove all address tags"), new RemoveAddressTagsAction(), SolutionType.Remove); problem.addSolution(s); } - + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.fixAddresses.OSMEntityBase#toString() @@ -754,7 +754,7 @@ if (!StringUtils.isNullOrEmpty(guessed) && MISSING_TAG.equals(sName)) { sName = String.format("(%s)", guessed); - } - - return String.format("%s %s, %s-%s %s (%s) ", + } + + return String.format("%s %s, %s-%s %s (%s) ", sName, node.getHouseNumber(), Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -30,5 +30,5 @@ /** * The class OSMEntityBase provides a base implementation for the {@link IOSMEntity} interface. - * + * * The implementation comprises *

    @@ -42,7 +42,7 @@ private static List containerListeners = new ArrayList(); private List cmdListeners = new ArrayList(); - + protected OsmPrimitive osmObject; - + /** * @param osmObject @@ -52,5 +52,5 @@ this.osmObject = osmObject; } - + /** * @param osmObject the osmObject to set @@ -69,5 +69,5 @@ containerListeners.add(listener); } - + /** * Removes a change listener. @@ -78,5 +78,5 @@ containerListeners.remove(listener); } - + /** * Notifies clients that the address container changed. @@ -88,5 +88,5 @@ } } - + /** * Adds a command listener. @@ -97,5 +97,5 @@ cmdListeners.add(listener); } - + /** * Removes a command listener. @@ -106,5 +106,5 @@ cmdListeners.remove(listener); } - + /** * Notifies clients that an entity has issued a command. @@ -118,9 +118,9 @@ throw new RuntimeException("Object has no TX context: " + this); } - + for (ICommandListener l : cmdListeners) { l.commandIssued(this, command); } - } + } public OsmPrimitive getOsmObject() { @@ -144,5 +144,5 @@ return ""; } - + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.addressEdit.INodeEntity#hasName() @@ -152,5 +152,5 @@ return TagUtils.hasNameTag(osmObject); } - + /** * Internal helper method which changes the given property and @@ -162,15 +162,15 @@ */ protected void setOSMTag(String tag, String newValue) { - CheckParameterUtil.ensureParameterNotNull(tag, "tag"); + CheckParameterUtil.ensureParameterNotNull(tag, "tag"); if (StringUtils.isNullOrEmpty(tag)) return; - + if (osmObject != null) { - if ((osmObject.hasKey(tag) && newValue == null) || newValue != null) { + if ((osmObject.hasKey(tag) && newValue == null) || newValue != null) { fireCommandIssued(new ChangePropertyCommand(osmObject, tag, newValue)); fireEntityChanged(this); } - } - } - + } + } + /** * Removes the given tag from the OSM object. @@ -202,5 +202,5 @@ return this.getName().compareTo(o.getName()); } - + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity#visit(org.openstreetmap.josm.plugins.fixAddresses.IAllKnowingTrashHeap, org.openstreetmap.josm.plugins.fixAddresses.IProblemVisitor) @@ -218,5 +218,5 @@ OsmPrimitive osm = getOsmObject(); if (osm == null) return null; - + if (osm instanceof Node) { return ((Node)osm).getCoor(); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreet.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreet.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreet.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -24,5 +24,5 @@ * This class is the container for all street segments with the same name. Every street * consists at least of one segment. - * + * * @author Oliver Wieland */ @@ -30,5 +30,5 @@ private List children; private List addresses; - + /** * @param osmPrimitive @@ -41,5 +41,5 @@ return children; } - + /** * Adds a street segment to the street node. @@ -48,9 +48,9 @@ public void addStreetSegment(OSMStreetSegment segment) { lazyCreateChildren(); - + children.add(segment); Collections.sort(children); } - + /** * Lazy creation of children list. @@ -61,5 +61,5 @@ } } - + /** * Adds an associated address to the street. @@ -69,5 +69,5 @@ public void addAddress(OSMAddress aNode) { lazyCreateAddresses(); - addresses.add(aNode); + addresses.add(aNode); } @@ -80,5 +80,5 @@ } } - + /** * Checks for addresses. @@ -89,13 +89,13 @@ return addresses != null && addresses.size() > 0; } - + public List getAddresses() { return addresses; } - + public void setAddresses(List addresses) { this.addresses = addresses; } - + /** * Gets the number of addresses associated with this street. @@ -104,8 +104,8 @@ public int getNumberOfAddresses() { if (addresses == null) return 0; - + return addresses.size(); } - + /** * Gets the number of street segments of this street. @@ -114,5 +114,5 @@ public int getNumberOfSegments() { if (children == null) return 0; - + int sc = 0; for (IOSMEntity node : children) { @@ -123,13 +123,13 @@ return sc; } - + /** * Gets the road type(s) of this street. If the street has different types, - * they are separated by comma. + * they are separated by comma. * @return */ public String getType() { List types = new ArrayList(); - + for (IOSMEntity seg : getChildren()) { OsmPrimitive osmPrim = seg.getOsmObject(); @@ -141,5 +141,5 @@ } } - + StringBuffer sb = new StringBuffer(20); for (String string : types) { @@ -148,9 +148,9 @@ } sb.append(string); - + } return sb.toString(); } - + /** * Checks if the attached way has an associated street relation. @@ -170,5 +170,5 @@ return false; } - + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.addressEdit.NodeEntityBase#toString() @@ -177,13 +177,13 @@ public String toString() { StringBuffer sb = new StringBuffer(getName()); - + if (children != null) { sb.append(String.format(", %d segments", children.size())); } - + if (addresses != null) { sb.append(String.format(", %d address entries", addresses.size())); } - + return sb.toString(); } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreetSegment.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreetSegment.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreetSegment.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -21,7 +21,7 @@ * Represents a single segment of a street. In many cases a segment may represent the complete street, but * sometimes a street is separated into many segments, e. g. due to different speed limits, bridges, etc.. - * + * * @author Oliver Wieland - * + * */ Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmFactory.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmFactory.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmFactory.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -21,5 +21,5 @@ public class OsmFactory { private static HashMap addressCache = new HashMap(); - + /** * Creates an address node from an OSM node, if possible. @@ -30,5 +30,5 @@ if (TagUtils.isAddress(node)) { String aid = "" + node.getId(); - + OSMAddress aNode = lookup(aid); if (aNode == null) { @@ -40,8 +40,8 @@ return aNode; } - + return null; } - + /** * Creates an node entity from an OSM way, if possible. @@ -53,9 +53,9 @@ return new OSMStreetSegment(way); } - + // Check for building with address if (way.isClosed() && TagUtils.hasBuildingTag(way) && TagUtils.isAddress(way)) { String aid = "" + way.getId(); - + OSMAddress aNode = lookup(aid); if (aNode == null) { @@ -65,13 +65,13 @@ aNode.setOsmObject(way); } - - return aNode; + + return aNode; } return null; } - - private static OSMAddress lookup(String aid) { + + private static OSMAddress lookup(String aid) { if (addressCache.containsKey(aid)) { - return addressCache.get(aid); + return addressCache.get(aid); } return null; Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmUtils.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmUtils.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmUtils.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -34,13 +34,13 @@ */ public class OsmUtils { - + /** * Instantiates a new osm utils. */ private OsmUtils() {} - + /** The cached locale. */ private static String cachedLocale = null; - + /** * Gets the minimum distance of single coordinate to a way. @@ -52,12 +52,12 @@ public static double getMinimumDistanceToWay(LatLon coor, Way w) { if (coor == null || w == null) return Double.POSITIVE_INFINITY; - + double minDist = Double.MAX_VALUE; List> x = w.getNodePairs(true); - + for (Pair pair : x) { LatLon ap = pair.a.getCoor(); LatLon bp = pair.b.getCoor(); - + double dist = findMinimum(ap, bp, coor); if (dist < minDist) { @@ -67,5 +67,5 @@ return minDist; } - + /** * Find the minimum distance between a point and two way coordinates recursively. @@ -80,19 +80,19 @@ CheckParameterUtil.ensureParameterNotNull(b, "b"); CheckParameterUtil.ensureParameterNotNull(a, "a"); - + LatLon mid = new LatLon((a.lat() + b.lat()) / 2, (a.lon() + b.lon()) / 2); - + double ac = a.greatCircleDistance(c); double bc = b.greatCircleDistance(c); double mc = mid.greatCircleDistance(c); - + double min = Math.min(Math.min(ac, mc), bc); - - + + if (min < 5.0) { // close enough? return min; } - - if (mc < ac && mc < bc) { + + if (mc < ac && mc < bc) { // mid point has lower distance than a and b if (ac > bc) { // recurse @@ -105,10 +105,10 @@ } } - + /** * Checks, if the given address has a relation hosting the address values. This method looks * for a relation of type 'associatedStreet' and checks the members for address values, if present. * If the member has address values, this methods sets the derived properties of the address - * node accordingly. + * node accordingly. * * @param address The address to check. @@ -119,8 +119,8 @@ return false; } - + boolean hasValuesFromRel = false; /* true, if we applied some address props from the relation */ OsmPrimitive addrNode = address.getOsmObject(); - + // check all referrers of the node for (OsmPrimitive osm : addrNode.getReferrers()) { @@ -129,10 +129,10 @@ // Relation has the right type? if (!TagUtils.isAssociatedStreetRelation(r)) continue; - - // check for 'street' members + + // check for 'street' members for (RelationMember rm : r.getMembers()) { if (TagUtils.isStreetMember(rm)) { OsmPrimitive street = rm.getMember(); - if (TagUtils.hasHighwayTag(street)) { + if (TagUtils.hasHighwayTag(street)) { String streetName = TagUtils.getNameValue(street); if (!StringUtils.isNullOrEmpty(streetName)) { @@ -142,8 +142,8 @@ break; } // else: Street has no name: Ooops - } // else: Street member, but no highway tag: Ooops + } // else: Street member, but no highway tag: Ooops } } - + // Check for other address properties if (TagUtils.hasAddrCityTag(r)) { // city @@ -163,5 +163,5 @@ return hasValuesFromRel; } - + /** * Gets the tag values from an address interpolation ref, if present. @@ -172,7 +172,7 @@ public static boolean getValuesFromAddressInterpolation(OSMAddress address) { if (address == null) return false; - + OsmPrimitive osmAddr = address.getOsmObject(); - + for (OsmPrimitive osm : osmAddr.getReferrers()) { if (osm instanceof Way) { @@ -188,8 +188,8 @@ } } - + return false; } - + /** * Gets the local code as string. @@ -205,5 +205,5 @@ return cachedLocale; } - + /** * Zooms to the given addresses. @@ -213,20 +213,20 @@ public static void zoomAddresses(List addressList) { CheckParameterUtil.ensureParameterNotNull(addressList, "addressList"); - - if (Main.map == null && Main.map.mapView == null) return; // nothing to do - if (addressList.size() == 0) return; // dto. - + + if (Main.map == null && Main.map.mapView == null) return; // nothing to do + if (addressList.size() == 0) return; // dto. + // compute bounding box BoundingXYVisitor bbox = new BoundingXYVisitor(); - for (OSMAddress source : addressList) { - OsmPrimitive osm = source.getOsmObject(); - Bounds b = new Bounds(osm.getBBox().getTopLeft(), osm.getBBox().getBottomRight()); - bbox.visit(b); - } - - if (bbox.getBounds() != null) { - // zoom to calculated bounding box - Main.map.mapView.zoomTo(bbox.getBounds()); - } + for (OSMAddress source : addressList) { + OsmPrimitive osm = source.getOsmObject(); + Bounds b = new Bounds(osm.getBBox().getTopLeft(), osm.getBBox().getBottomRight()); + bbox.visit(b); + } + + if (bbox.getBounds() != null) { + // zoom to calculated bounding box + Main.map.mapView.zoomTo(bbox.getBounds()); + } } @@ -241,6 +241,6 @@ CheckParameterUtil.ensureParameterNotNull(address, "address"); CheckParameterUtil.ensureParameterNotNull(w, "way"); - - if (!address.hasTag(tag) && TagUtils.hasTag(w, tag)) { + + if (!address.hasTag(tag) && TagUtils.hasTag(w, tag)) { address.setDerivedValue(tag, w.get(tag)); } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/PostalCodeChecker.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/PostalCodeChecker.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/PostalCodeChecker.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -24,29 +24,29 @@ public class PostalCodeChecker { private static HashMap postalCodePatternMap = new HashMap(); - + static { fillMap(); } - + /** * Checks if given address has a valid postal code. * * @param address the address to check the postal code for - * @return true, if postal code is valid (this implies + * @return true, if postal code is valid (this implies * also that a country is NOT supported); otherwise false. */ public static boolean hasValidPostalCode(OSMAddress address) { CheckParameterUtil.ensureParameterNotNull(address, "address"); - + if (!address.hasPostalCode()) { return false; // no postal code available } - + String ctry = getCountry(address); String postalCode = address.getPostalCode(); - + return hasValidPostalCode(ctry, postalCode); } - + /** * Checks if postal code is valid for the country reported by the Java VM. @@ -68,5 +68,5 @@ public static boolean hasValidPostalCode(String country, String postalCode) { // Get country-specific pattern for postal code - if (postalCodePatternMap.containsKey(country)) { + if (postalCodePatternMap.containsKey(country)) { String pattern = postalCodePatternMap.get(country); // Check if postal code matches pattern @@ -74,8 +74,8 @@ } else { // we cannot validate; assume postal code as valid until we know better - return true; - } - } - + return true; + } + } + /** * Checks if validation for the given country is supported. @@ -88,5 +88,5 @@ return postalCodePatternMap.containsKey(country.toUpperCase()); } - + /** * Checks if validation for the given address is supported. @@ -97,9 +97,9 @@ public static boolean isValidationSupported(OSMAddress address) { CheckParameterUtil.ensureParameterNotNull(address, "address"); - + String ctry = getCountry(address); return postalCodePatternMap.containsKey(ctry); } - + /** * Gets the current country. @@ -126,5 +126,5 @@ return ctry; } - + /** * Fills the country-postal code pattern map. @@ -133,23 +133,23 @@ /* String[] countries = Locale.getISOCountries(); - + for (int i = 0; i < countries.length; i++) { System.out.println("//postalCodePatternMap.put(\"" + countries[i] + "\", \"[0-9]{5}\");"); } - + String x = "A9999AAA"; - + if (x.matches("[A-Z]{1}[0-9]{4}[A-Z]{3}")) { System.out.println("YES"); } - + String xx = "99999-999"; - // "[0-9]{5}\-[0-9]{3}"); // + // "[0-9]{5}\-[0-9]{3}"); // if (xx.matches("[0-9]{5}-[0-9]{3}")) { System.out.println("YES"); } - - - String[] xxx = new String[]{"A9 9AA", "A99 9AA", "A9A 9AA", "AA9 9AA", "AA99 9AA", "AA9A 9AA"}; + + + String[] xxx = new String[]{"A9 9AA", "A99 9AA", "A9A 9AA", "AA9 9AA", "AA99 9AA", "AA9A 9AA"}; for (int i = 0; i < xxx.length; i++) { if (!xxx[i].matches("[A-Z]{1,2}[0-9]{1,2}[A-Z]? [0-9]{1}[A-Z]{2}")) { @@ -158,6 +158,6 @@ }*/ // see http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html for country codes - // - + // + //postalCodePatternMap.put("AD", "[0-9]{5}"); //postalCodePatternMap.put("AE", "[0-9]{5}"); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ProblemType.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ProblemType.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ProblemType.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/SolutionType.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/SolutionType.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/SolutionType.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StringUtils.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StringUtils.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StringUtils.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -19,5 +19,5 @@ /** * Checks, if a string is either null or empty. - * + * * @param txt * Text to check @@ -30,5 +30,5 @@ /** * Gets the length of the longest common substring of a and b - * + * * @param a * First string @@ -83,5 +83,5 @@ /** * Gets the longest common substring of a and b. - * + * * @param a The first string. * @param b The second string. @@ -117,5 +117,5 @@ return sb.toString(); } - + /** * @param needle The string to find the best match for. @@ -127,5 +127,5 @@ String bestMatch = null; double maxRatio = Double.MIN_VALUE; - + if (StringUtils.isNullOrEmpty(needle)) { return null; @@ -134,5 +134,5 @@ return null; } - + int lNeedle = needle.length(); for (String curString : haystack) { @@ -143,7 +143,7 @@ bestMatch = curString; } - + } - + return bestMatch; } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/TagUtils.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/TagUtils.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/TagUtils.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -22,14 +22,14 @@ * Contains the tags used within OSM. FIXME: Maybe there is a class or similar * within JOSM which already defines them, but I have not found it so far. - * + * * @author Oliver Wieland - * + * */ public final class TagUtils { private static String COUNTRIES_REQUIRE_STATE[] = { - "en_US", /* USA */ - "en_AU" /* Australia */ + "en_US", /* USA */ + "en_AU" /* Australia */ }; - + /** * Checks if the given OSM object has a (non-empty) value for the given tag. @@ -37,10 +37,10 @@ * @param osm the osm object to inspect. * @param tag the tag to look for. - * @return true, if osm object has a non-empty value for this tag + * @return true, if osm object has a non-empty value for this tag */ public static boolean hasTag(OsmPrimitive osm, String tag) { return osm != null && !StringUtils.isNullOrEmpty(osm.get(tag)); } - + /** * Checks if the given OSM primitive is an address node. @@ -48,12 +48,12 @@ */ public static boolean isAddress(OsmPrimitive osmObject) { - return TagUtils.hasAddrCityTag(osmObject) || TagUtils.hasAddrCountryTag(osmObject) || + return TagUtils.hasAddrCityTag(osmObject) || TagUtils.hasAddrCountryTag(osmObject) || TagUtils.hasAddrHousenumberTag(osmObject) || TagUtils.hasAddrPostcodeTag(osmObject) || TagUtils.hasAddrStateTag(osmObject) || TagUtils.hasAddrStreetTag(osmObject); } - + /** * Check if OSM primitive has a tag 'parking'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -65,5 +65,5 @@ /** * Gets the value of tag 'parking'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -75,5 +75,5 @@ /** * Check if OSM primitive has a tag 'shop'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -85,5 +85,5 @@ /** * Gets the value of tag 'shop'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -95,5 +95,5 @@ /** * Check if OSM primitive has a tag 'craft'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -105,5 +105,5 @@ /** * Gets the value of tag 'craft'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -115,5 +115,5 @@ /** * Check if OSM primitive has a tag 'surface'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -125,5 +125,5 @@ /** * Gets the value of tag 'surface'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -135,5 +135,5 @@ /** * Check if OSM primitive has a tag 'cuisine'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -145,5 +145,5 @@ /** * Gets the value of tag 'cuisine'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -155,5 +155,5 @@ /** * Check if OSM primitive has a tag 'wood'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -165,5 +165,5 @@ /** * Gets the value of tag 'wood'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -175,5 +175,5 @@ /** * Check if OSM primitive has a tag 'foot'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -185,5 +185,5 @@ /** * Gets the value of tag 'foot'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -195,5 +195,5 @@ /** * Check if OSM primitive has a tag 'name:de'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -205,5 +205,5 @@ /** * Gets the value of tag 'name:de'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -215,5 +215,5 @@ /** * Check if OSM primitive has a tag 'nat_ref'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -225,5 +225,5 @@ /** * Gets the value of tag 'nat_ref'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -235,5 +235,5 @@ /** * Check if OSM primitive has a tag 'note:de'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -245,5 +245,5 @@ /** * Gets the value of tag 'note:de'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -255,5 +255,5 @@ /** * Check if OSM primitive has a tag 'addr:street'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -266,5 +266,5 @@ /** * Gets the value of tag 'addr:street'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -276,5 +276,5 @@ /** * Check if OSM primitive has a tag 'type'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -286,5 +286,5 @@ /** * Gets the value of tag 'type'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -296,5 +296,5 @@ /** * Check if OSM primitive has a tag 'addr:city'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -307,5 +307,5 @@ /** * Gets the value of tag 'addr:city'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -317,5 +317,5 @@ /** * Check if OSM primitive has a tag 'boundary'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -327,5 +327,5 @@ /** * Gets the value of tag 'boundary'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -337,5 +337,5 @@ /** * Check if OSM primitive has a tag 'smoothness'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -348,5 +348,5 @@ /** * Gets the value of tag 'smoothness'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -358,5 +358,5 @@ /** * Check if OSM primitive has a tag 'opening_hours'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -369,5 +369,5 @@ /** * Gets the value of tag 'opening_hours'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -380,5 +380,5 @@ /** * Check if OSM primitive has a tag 'bicycle'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -390,5 +390,5 @@ /** * Gets the value of tag 'bicycle'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -400,5 +400,5 @@ /** * Check if OSM primitive has a tag 'religion'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -410,5 +410,5 @@ /** * Gets the value of tag 'religion'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -420,5 +420,5 @@ /** * Check if OSM primitive has a tag 'barrier'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -430,5 +430,5 @@ /** * Gets the value of tag 'barrier'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -440,5 +440,5 @@ /** * Check if OSM primitive has a tag 'power'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -450,5 +450,5 @@ /** * Gets the value of tag 'power'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -460,5 +460,5 @@ /** * Check if OSM primitive has a tag 'landuse'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -470,5 +470,5 @@ /** * Gets the value of tag 'landuse'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -480,5 +480,5 @@ /** * Check if OSM primitive has a tag 'fireplace'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -491,5 +491,5 @@ /** * Gets the value of tag 'fireplace'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -501,5 +501,5 @@ /** * Check if OSM primitive has a tag 'int_ref'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -511,5 +511,5 @@ /** * Gets the value of tag 'int_ref'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -521,5 +521,5 @@ /** * Check if OSM primitive has a tag 'whitewater:section_grade'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -532,5 +532,5 @@ /** * Gets the value of tag 'whitewater:section_grade'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -544,5 +544,5 @@ /** * Check if OSM primitive has a tag 'denomination'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -555,5 +555,5 @@ /** * Gets the value of tag 'denomination'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -565,5 +565,5 @@ /** * Check if OSM primitive has a tag 'addr:postcode'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -576,5 +576,5 @@ /** * Gets the value of tag 'addr:postcode'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -587,5 +587,5 @@ /** * Check if OSM primitive has a tag 'wires'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -597,5 +597,5 @@ /** * Gets the value of tag 'wires'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -607,5 +607,5 @@ /** * Check if OSM primitive has a tag 'loc_ref'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -617,5 +617,5 @@ /** * Gets the value of tag 'loc_ref'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -627,5 +627,5 @@ /** * Check if OSM primitive has a tag 'width'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -637,5 +637,5 @@ /** * Gets the value of tag 'width'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -647,5 +647,5 @@ /** * Check if OSM primitive has a tag 'tourism'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -657,5 +657,5 @@ /** * Gets the value of tag 'tourism'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -667,5 +667,5 @@ /** * Check if OSM primitive has a tag 'leisure'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -677,5 +677,5 @@ /** * Gets the value of tag 'leisure'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -687,5 +687,5 @@ /** * Check if OSM primitive has a tag 'electrified'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -698,5 +698,5 @@ /** * Gets the value of tag 'electrified'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -708,5 +708,5 @@ /** * Check if OSM primitive has a tag 'junction'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -718,5 +718,5 @@ /** * Gets the value of tag 'junction'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -728,5 +728,5 @@ /** * Check if OSM primitive has a tag 'railway'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -738,5 +738,5 @@ /** * Gets the value of tag 'railway'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -748,5 +748,5 @@ /** * Check if OSM primitive has a tag 'voltage'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -758,5 +758,5 @@ /** * Gets the value of tag 'voltage'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -768,5 +768,5 @@ /** * Check if OSM primitive has a tag 'bridge'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -778,5 +778,5 @@ /** * Gets the value of tag 'bridge'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -788,5 +788,5 @@ /** * Check if OSM primitive has a tag 'motor_vehicle'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -799,5 +799,5 @@ /** * Gets the value of tag 'motor_vehicle'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -810,5 +810,5 @@ /** * Check if OSM primitive has a tag 'comment'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -820,5 +820,5 @@ /** * Gets the value of tag 'comment'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -830,5 +830,5 @@ /** * Check if OSM primitive has a tag 'maxspeed'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -840,5 +840,5 @@ /** * Gets the value of tag 'maxspeed'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -850,5 +850,5 @@ /** * Check if OSM primitive has a tag 'natural'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -860,5 +860,5 @@ /** * Gets the value of tag 'natural'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -870,5 +870,5 @@ /** * Check if OSM primitive has a tag 'sac_scale'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -881,5 +881,5 @@ /** * Gets the value of tag 'sac_scale'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -891,5 +891,5 @@ /** * Check if OSM primitive has a tag 'tunnel'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -901,5 +901,5 @@ /** * Gets the value of tag 'tunnel'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -911,5 +911,5 @@ /** * Check if OSM primitive has a tag 'waterway'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -921,5 +921,5 @@ /** * Gets the value of tag 'waterway'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -931,5 +931,5 @@ /** * Check if OSM primitive has a tag 'trail_visibility'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -942,5 +942,5 @@ /** * Gets the value of tag 'trail_visibility'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -953,5 +953,5 @@ /** * Check if OSM primitive has a tag 'highway'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -963,5 +963,5 @@ /** * Gets the value of tag 'highway'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -973,5 +973,5 @@ /** * Check if OSM primitive has a tag 'vehicle'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -983,5 +983,5 @@ /** * Gets the value of tag 'vehicle'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -993,5 +993,5 @@ /** * Check if OSM primitive has a tag 'horse'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1003,5 +1003,5 @@ /** * Gets the value of tag 'horse'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1013,5 +1013,5 @@ /** * Check if OSM primitive has a tag 'goods'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1023,5 +1023,5 @@ /** * Gets the value of tag 'goods'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1033,5 +1033,5 @@ /** * Check if OSM primitive has a tag 'frequency'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1044,5 +1044,5 @@ /** * Gets the value of tag 'frequency'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1054,5 +1054,5 @@ /** * Check if OSM primitive has a tag 'man_made'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1064,5 +1064,5 @@ /** * Gets the value of tag 'man_made'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1074,5 +1074,5 @@ /** * Check if OSM primitive has a tag 'addr:housenumber'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1085,5 +1085,5 @@ /** * Gets the value of tag 'addr:housenumber'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1093,8 +1093,8 @@ : null; } - + /** * Check if OSM primitive has a tag 'addr:housename'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1107,5 +1107,5 @@ /** * Gets the value of tag 'addr:housename'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1118,5 +1118,5 @@ /** * Check if OSM primitive has a tag 'area'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1128,5 +1128,5 @@ /** * Gets the value of tag 'area'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1138,5 +1138,5 @@ /** * Check if OSM primitive has a tag 'building:levels'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1149,5 +1149,5 @@ /** * Gets the value of tag 'building:levels'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1160,5 +1160,5 @@ /** * Check if OSM primitive has a tag 'wheelchair'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1171,5 +1171,5 @@ /** * Gets the value of tag 'wheelchair'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1181,5 +1181,5 @@ /** * Check if OSM primitive has a tag 'name'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1191,5 +1191,5 @@ /** * Gets the value of tag 'name'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1201,5 +1201,5 @@ /** * Check if OSM primitive has a tag 'oneway'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1211,5 +1211,5 @@ /** * Gets the value of tag 'oneway'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1221,5 +1221,5 @@ /** * Check if OSM primitive has a tag 'FIXME'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1231,5 +1231,5 @@ /** * Gets the value of tag 'FIXME'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1241,5 +1241,5 @@ /** * Check if OSM primitive has a tag 'capacity'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1251,5 +1251,5 @@ /** * Gets the value of tag 'capacity'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1261,5 +1261,5 @@ /** * Check if OSM primitive has a tag 'motorcycle'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1272,5 +1272,5 @@ /** * Gets the value of tag 'motorcycle'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1282,5 +1282,5 @@ /** * Check if OSM primitive has a tag 'hgv'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1292,5 +1292,5 @@ /** * Gets the value of tag 'hgv'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1302,5 +1302,5 @@ /** * Check if OSM primitive has a tag 'construction'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1313,5 +1313,5 @@ /** * Gets the value of tag 'construction'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1323,5 +1323,5 @@ /** * Check if OSM primitive has a tag 'addr:state'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1334,5 +1334,5 @@ /** * Gets the value of tag 'addr:state'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1344,5 +1344,5 @@ /** * Check if OSM primitive has a tag 'lanes'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1354,5 +1354,5 @@ /** * Gets the value of tag 'lanes'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1364,5 +1364,5 @@ /** * Check if OSM primitive has a tag 'note'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1374,5 +1374,5 @@ /** * Gets the value of tag 'note'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1384,5 +1384,5 @@ /** * Check if OSM primitive has a tag 'lit'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1394,5 +1394,5 @@ /** * Gets the value of tag 'lit'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1404,5 +1404,5 @@ /** * Check if OSM primitive has a tag 'building'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1414,5 +1414,5 @@ /** * Gets the value of tag 'building'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1424,5 +1424,5 @@ /** * Check if OSM primitive has a tag 'segregated'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1435,5 +1435,5 @@ /** * Gets the value of tag 'segregated'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1445,5 +1445,5 @@ /** * Check if OSM primitive has a tag 'addr:inclusion'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1456,5 +1456,5 @@ /** * Gets the value of tag 'addr:inclusion'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1467,5 +1467,5 @@ /** * Check if OSM primitive has a tag 'layer'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1477,5 +1477,5 @@ /** * Gets the value of tag 'layer'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1487,5 +1487,5 @@ /** * Check if OSM primitive has a tag 'sport'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1497,5 +1497,5 @@ /** * Gets the value of tag 'sport'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1507,5 +1507,5 @@ /** * Check if OSM primitive has a tag 'addr:interpolation'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1518,5 +1518,5 @@ /** * Gets the value of tag 'addr:interpolation'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1529,5 +1529,5 @@ /** * Check if OSM primitive has a tag 'cutting'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1539,5 +1539,5 @@ /** * Gets the value of tag 'cutting'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1549,5 +1549,5 @@ /** * Check if OSM primitive has a tag 'amenity'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1559,5 +1559,5 @@ /** * Gets the value of tag 'amenity'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1569,5 +1569,5 @@ /** * Check if OSM primitive has a tag 'access'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1579,5 +1579,5 @@ /** * Gets the value of tag 'access'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1589,5 +1589,5 @@ /** * Check if OSM primitive has a tag 'agricultural'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1600,5 +1600,5 @@ /** * Gets the value of tag 'agricultural'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1610,5 +1610,5 @@ /** * Check if OSM primitive has a tag 'capacity:disabled'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1621,5 +1621,5 @@ /** * Gets the value of tag 'capacity:disabled'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1632,5 +1632,5 @@ /** * Check if OSM primitive has a tag 'operator'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1642,5 +1642,5 @@ /** * Gets the value of tag 'operator'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1652,5 +1652,5 @@ /** * Check if OSM primitive has a tag 'ref'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1662,5 +1662,5 @@ /** * Gets the value of tag 'ref'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1672,5 +1672,5 @@ /** * Check if OSM primitive has a tag 'noexit'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1682,5 +1682,5 @@ /** * Gets the value of tag 'noexit'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1692,5 +1692,5 @@ /** * Check if OSM primitive has a tag 'admin_level'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1703,5 +1703,5 @@ /** * Gets the value of tag 'admin_level'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1713,5 +1713,5 @@ /** * Check if OSM primitive has a tag 'source'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1723,5 +1723,5 @@ /** * Gets the value of tag 'source'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1733,5 +1733,5 @@ /** * Check if OSM primitive has a tag 'tracktype'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1744,5 +1744,5 @@ /** * Gets the value of tag 'tracktype'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1754,5 +1754,5 @@ /** * Check if OSM primitive has a tag 'addr:country'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1765,5 +1765,5 @@ /** * Gets the value of tag 'addr:country'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1775,5 +1775,5 @@ /** * Check if OSM primitive has a tag 'route'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1785,5 +1785,5 @@ /** * Gets the value of tag 'route'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1795,5 +1795,5 @@ /** * Check if OSM primitive has a tag 'cables'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1805,5 +1805,5 @@ /** * Gets the value of tag 'cables'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1815,5 +1815,5 @@ /** * Check if OSM primitive has a tag 'service'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1825,5 +1825,5 @@ /** * Gets the value of tag 'service'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1835,5 +1835,5 @@ /** * Check if OSM primitive has a tag 'motorcar'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1845,5 +1845,5 @@ /** * Gets the value of tag 'motorcar'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1855,5 +1855,5 @@ /** * Check if OSM primitive has a tag 'whitewater'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1866,5 +1866,5 @@ /** * Gets the value of tag 'whitewater'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1876,5 +1876,5 @@ /** * Check if OSM primitive has a tag 'embankment'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1887,5 +1887,5 @@ /** * Gets the value of tag 'embankment'. - * + * * @param osmPrimitive * The OSM entity to check. @@ -1894,7 +1894,7 @@ return osmPrimitive != null ? osmPrimitive.get(EMBANKMENT_TAG) : null; } - - /** - * Checks if the given street supporting housenumbers. Usually motor ways and primary roads have + + /** + * Checks if the given street supporting housenumbers. Usually motor ways and primary roads have * no addresses, also no paths or tracks. * @@ -1907,32 +1907,32 @@ return false; } - + // TODO: Should be configurable - + /* Allow everything until this can be configured */ return true; /* String hwType = getHighwayValue(w); - return !(TagUtils.HIGHWAY_MOTORWAY_LINK_VALUE.equals(hwType) || + return !(TagUtils.HIGHWAY_MOTORWAY_LINK_VALUE.equals(hwType) || TagUtils.HIGHWAY_MOTORWAY_VALUE.equals(hwType) || TagUtils.HIGHWAY_FOOTWAY_VALUE.equals(hwType) || - TagUtils.HIGHWAY_TRACK_VALUE.equals(hwType) + TagUtils.HIGHWAY_TRACK_VALUE.equals(hwType) );*/ } - + // Relation support - + /** * Check if OSM relation is a 'associatedStreet' relation. - * + * * @param osmPrimitive * The OSM entity to check. */ public static boolean isAssociatedStreetRelation(Relation rel) { - return rel != null && - rel.hasKey(RELATION_TYPE) && + return rel != null && + rel.hasKey(RELATION_TYPE) && ASSOCIATEDSTREET_RELATION_TYPE.equals(rel.get(RELATION_TYPE)); } - + /** * Checks if given relation member has role "street". @@ -1944,5 +1944,5 @@ return relMember != null && STREET_RELATION_ROLE.equals(relMember.getRole()); } - + /** * Checks if given relation member has role "house". @@ -1954,7 +1954,7 @@ return relMember != null && STREET_RELATION_ROLE.equals(relMember.getRole()); } - - - + + + /** * Checks if "addr:state" tag is required. @@ -1964,11 +1964,11 @@ public static boolean isStateRequired() { String loc = OsmUtils.getLocale(); - - for (int i = 0; i < COUNTRIES_REQUIRE_STATE.length; i++) { + + for (int i = 0; i < COUNTRIES_REQUIRE_STATE.length; i++) { if (COUNTRIES_REQUIRE_STATE[i].equals(loc)) { return true; } } - + return false; } @@ -2065,5 +2065,5 @@ public static final String EMBANKMENT_TAG = "embankment"; public static final String ADDR_HOUSENAME_TAG = "addr:housename"; - + /* Highway types */ public static final String HIGHWAY_CYCLEWAY_VALUE = "cycleway"; @@ -2085,5 +2085,5 @@ /* Relation keys */ - + // Associated street: See http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern public static final String RELATION_TYPE = "type"; Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -74,9 +74,9 @@ private static final String OK_COMMAND = tr("Close"); private static final String SELECT_AND_CLOSE = tr("Select and close"); - + private AddressEditContainer editContainer; private JTable unresolvedTable; private JTable streetTable; - + /* Actions */ private AssignAddressToStreetAction resolveAction = new AssignAddressToStreetAction(); @@ -87,5 +87,5 @@ private ConvertToRelationAction convertToRelationAction = new ConvertToRelationAction(); private ConvertAllToRelationAction convertAllToRelationAction = new ConvertAllToRelationAction(); - + private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[] { resolveAction, @@ -100,6 +100,6 @@ private JLabel unresolvedAddressesLabel; private JMapViewer mapViewer; - - + + /** * @param arg0 @@ -108,11 +108,11 @@ public AddressEditDialog(AddressEditContainer addressEditContainer) throws HeadlessException { super(JOptionPane.getFrameForComponent(Main.parent), tr("Fix unresolved addresses"), false); - - this.editContainer = addressEditContainer; + + this.editContainer = addressEditContainer; this.editContainer.addChangedListener(this); setLayout(new BorderLayout()); setSize(1024,600); setLocationRelativeTo(null); - + if (addressEditContainer != null) { /* Panel for street table */ @@ -122,32 +122,32 @@ streetTable.getSelectionModel().addListSelectionListener(this); streetTable.addKeyListener(new JumpToEntryListener(1)); - + JScrollPane scroll1 = new JScrollPane(streetTable); streetPanel.add(scroll1, BorderLayout.CENTER); - + streetLabel = createHeaderLabel(STREET_HEADER_FMT, tr(STREETS), editContainer.getNumberOfStreets()); - + JPanel headerPanel = new JPanel(new GridLayout(1, 4)); headerPanel.setMinimumSize(new Dimension(100, 30)); headerPanel.add(streetLabel); - + /* JPanel streetButtonPanel = new JPanel(new GridLayout(1, 3)); - SideButton convertToRel = new SideButton(convertToRelationAction); + SideButton convertToRel = new SideButton(convertToRelationAction); streetButtonPanel.add(convertToRel); - // SideButton convertAllToRel = new SideButton(convertAllToRelationAction); + // SideButton convertAllToRel = new SideButton(convertAllToRelationAction); // streetButtonPanel.add(convertAllToRel); // add filler streetButtonPanel.add(new JPanel()); streetButtonPanel.add(new JPanel()); - - + + streetPanel.add(streetButtonPanel, BorderLayout.SOUTH); */ streetPanel.add(headerPanel, BorderLayout.NORTH); streetPanel.setMinimumSize(new Dimension(500, 200)); - + /* Panel for unresolved addresses table */ JPanel unresolvedPanel = new JPanel(new BorderLayout()); @@ -158,15 +158,15 @@ unresolvedTable.getSelectionModel().addListSelectionListener(new IncompleteAddressListener()); unresolvedTable.addMouseListener(applyAllGuessesAction); - + JTableHeader header = unresolvedTable.getTableHeader(); header.addMouseListener(uaModel.new ColumnListener(unresolvedTable)); - + JScrollPane scroll2 = new JScrollPane(unresolvedTable); unresolvedPanel.add(scroll2, BorderLayout.CENTER); unresolvedAddressesLabel = createHeaderLabel( - UNRESOLVED_HEADER_FMT, - tr(UNRESOLVED_ADDRESS), + UNRESOLVED_HEADER_FMT, + tr(UNRESOLVED_ADDRESS), editContainer.getNumberOfUnresolvedAddresses()); - + JPanel headerPanel2 = new JPanel(new GridLayout(1, 4)); headerPanel2.setMinimumSize(new Dimension(100, 30)); @@ -174,30 +174,30 @@ unresolvedPanel.add(headerPanel2 , BorderLayout.NORTH); unresolvedPanel.setMinimumSize(new Dimension(500, 200)); - - + + try { JPanel unresolvedButtons = new JPanel(new GridLayout(2,5, 5, 5)); - SideButton assign = new SideButton(resolveAction); + SideButton assign = new SideButton(resolveAction); unresolvedButtons.add(assign); - - SideButton guess = new SideButton(guessAddressAction); + + SideButton guess = new SideButton(guessAddressAction); unresolvedButtons.add(guess); - SideButton applyAllGuesses = new SideButton(applyAllGuessesAction); + SideButton applyAllGuesses = new SideButton(applyAllGuessesAction); unresolvedButtons.add(applyAllGuesses); - - SideButton removeAddressTags = new SideButton(removeAddressTagsAction); + + SideButton removeAddressTags = new SideButton(removeAddressTagsAction); unresolvedButtons.add(removeAddressTags); - + unresolvedButtons.add(new JPanel()); - - SideButton selectInMap = new SideButton(selectAddressesInMapAction); + + SideButton selectInMap = new SideButton(selectAddressesInMapAction); unresolvedButtons.add(selectInMap); headerPanel2.setMinimumSize(new Dimension(100, 70)); - - unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH); - } catch (Exception e) { + + unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH); + } catch (Exception e) { e.printStackTrace(); - } - + } + /* Map Panel */ JPanel mapPanel = new JPanel(new BorderLayout()); @@ -206,28 +206,28 @@ mapPanel.setMinimumSize(new Dimension(200, 200)); mapViewer.setVisible(false); - + JPanel mapControl = new JPanel(new GridLayout(1, 4)); JLabel mapL1 = new JLabel(tr("Complete Addresses")); mapL1.setForeground(Color.BLUE); mapControl.add(mapL1); - + JLabel mapL2 = new JLabel(tr("Incomplete Addresses")); mapL2.setForeground(Color.RED); mapControl.add(mapL2); - + JLabel mapL3 = new JLabel(tr("Selected Addresses")); mapL3.setForeground(Color.ORANGE); mapControl.add(mapL3); - + JLabel mapL4 = new JLabel(tr("Selected Street")); mapL4.setForeground(Color.GREEN); mapControl.add(mapL4); - + mapPanel.add(mapControl, BorderLayout.SOUTH); - + /* Combine panels */ - JSplitPane unresSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, streetPanel, unresolvedPanel); + JSplitPane unresSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, streetPanel, unresolvedPanel); JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, unresSplitPane, mapPanel); - + this.getContentPane().add(pane, BorderLayout.CENTER); //this.getContentPane().add(mapPanel, BorderLayout.SOUTH); @@ -235,9 +235,9 @@ this.getContentPane().add(new JLabel(tr("(No data)")), BorderLayout.CENTER); } - + for (int i = 0; i < actions.length; i++) { actions[i].setContainer(addressEditContainer); } - + JPanel buttonPanel = new JPanel(new GridLayout(1,10)); JButton ok = new JButton(OK_COMMAND, ImageProvider.getIfAvailable(null, "ok")); @@ -245,5 +245,5 @@ JButton selectAndClose = new JButton(SELECT_AND_CLOSE); selectAndClose.addActionListener(this); - + // Murks for (int i = 0; i < 8; i++) { @@ -252,11 +252,11 @@ buttonPanel.add(ok); - - + + this.getContentPane().add(buttonPanel, BorderLayout.SOUTH); } /** - * Creates a header label in the form "title (number)" with bold font. + * Creates a header label in the form "title (number)" with bold font. * @param fmtString The format string having a string and a numeric placeholder. * @param title The title of the header. @@ -270,5 +270,5 @@ return label; } - + /** * Updates the list headings. @@ -299,26 +299,26 @@ @Override public void valueChanged(ListSelectionEvent e) { - + AddressEditSelectionEvent ev = new AddressEditSelectionEvent(e.getSource(), streetTable, unresolvedTable, null, editContainer); - + for (AbstractAddressEditAction action : actions) { action.setEvent(ev); } - + clearMapViewer(); OSMStreet sNode = ev.getSelectedStreet(); if (sNode != null) { - + //mapViewer.addMapRectangle(new BBoxMapRectangle(bb)); for (IOSMEntity seg : sNode.getChildren()) { Way way = (Way) seg.getOsmObject(); //BBox bb = way.getBBox(); - + for (Node node : way.getNodes()) { mapViewer.addMapMarker(new MapMarkerDot(Color.GREEN, node.getCoor().lat(), node.getCoor().lon())); } - } - + } + // show addresses as blue marker if (sNode.hasAddresses()) { @@ -331,9 +331,9 @@ } } - } - + } + List unrAddresses = ev.getSelectedUnresolvedAddresses(); if (unrAddresses != null) { - for (OSMAddress aNode : unrAddresses) { + for (OSMAddress aNode : unrAddresses) { mapViewer.addMapMarker(new MapMarkerDot(Color.ORANGE, aNode.getCoor().lat(), aNode.getCoor().lon())); } @@ -356,5 +356,5 @@ public void containerChanged(AddressEditContainer container) { updateHeaders(); - + for (int i = 0; i < actions.length; i++) { actions[i].setEvent(null); @@ -367,12 +367,12 @@ updateHeaders(); } - - /** - * Special listener to react on selection changes in the incomplete address list. + + /** + * Special listener to react on selection changes in the incomplete address list. * It searches the street table for the streets which matches best matching to the * street name given in the address. - * - * @author Oliver Wieland - */ + * + * @author Oliver Wieland + */ class IncompleteAddressListener implements ListSelectionListener { @@ -382,16 +382,16 @@ String streetOfAddr = (String) unresolvedTable. getModel().getValueAt(unresolvedTable.getSelectedRow(), 0); - + int maxScore = 0, score = 0, row = -1; for (int i = 0; i < streetTable.getRowCount(); i++) { String streetName = (String) streetTable.getModel().getValueAt(i, 1); - + score = StringUtils.lcsLength(streetOfAddr, streetName); if (score > maxScore) { maxScore = score; - row = i; + row = i; } } - + if (row > 0) { streetTable.getSelectionModel().clearSelection(); @@ -399,9 +399,9 @@ streetTable.scrollRectToVisible(streetTable.getCellRect(row, 0, true)); } - } - } - - } - + } + } + + } + /** * The listener interface for receiving key events of a table. @@ -416,6 +416,6 @@ */ class JumpToEntryListener implements KeyListener { - private int column; - + private int column; + /** * Instantiates a new jump-to-entry listener. @@ -430,5 +430,5 @@ public void keyPressed(KeyEvent arg0) { // TODO Auto-generated method stub - + } @@ -436,5 +436,5 @@ public void keyReleased(KeyEvent arg0) { // TODO Auto-generated method stub - + } @@ -442,9 +442,9 @@ public void keyTyped(KeyEvent arg0) { JTable table = (JTable) arg0.getSource(); - + if (table == null) return; - + TableModel model = table.getModel(); - + if (model == null || model.getColumnCount() == 0) { return; @@ -452,7 +452,7 @@ // clip column if (column < 0 || column >= model.getColumnCount()) { - column = 0; // use the first column - } - + column = 0; // use the first column + } + char firstChar = Character.toLowerCase(arg0.getKeyChar()); @@ -469,5 +469,5 @@ } } - } + } } } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -33,5 +33,5 @@ private DefaultMutableTreeNode unresolvedRoot; private DefaultMutableTreeNode incompleteRoot; - + /** * @param streets @@ -44,26 +44,26 @@ this.unresolvedAddresses = unresolvedAddresses; } - + public TreeNode getStreetsTree() { if (streets == null) return new DefaultMutableTreeNode(tr("(No data)")); - + if (streetRoot == null) { streetRoot = new DefaultMutableTreeNode(); for (OSMStreet sNode : streets) { DefaultMutableTreeNode treeStreetNode = new DefaultMutableTreeNode(sNode); - + DefaultMutableTreeNode segmentsNode = new DefaultMutableTreeNode(tr("Segments")); treeStreetNode.add(segmentsNode); - + // Add street segment(s) for (IOSMEntity child : sNode.getChildren()) { segmentsNode.add(new DefaultMutableTreeNode(child)); } - + if (sNode.hasAddresses()) { // Add address nodes DefaultMutableTreeNode addressNode = new DefaultMutableTreeNode(tr("Addresses")); treeStreetNode.add(addressNode); - + for (OSMAddress addr : sNode.getAddresses()) { addressNode.add(new DefaultMutableTreeNode(addr)); @@ -76,8 +76,8 @@ } } - + return streetRoot; } - + /** * Gets the tree node containing all unresolved addresses. @@ -89,14 +89,14 @@ if (unresolvedRoot == null) { unresolvedRoot = new DefaultMutableTreeNode(); - + for (OSMAddress addr : unresolvedAddresses) { - // Add address nodes + // Add address nodes unresolvedRoot.add(new DefaultMutableTreeNode(addr)); } } - + return unresolvedRoot; } - + /** * Gets the tree node containing all incomplete addresses. @@ -108,11 +108,11 @@ if (incompleteRoot == null) { incompleteRoot = new DefaultMutableTreeNode(); - + for (OSMAddress addr : incompleteAddresses) { - // Add address nodes + // Add address nodes incompleteRoot.add(new DefaultMutableTreeNode(addr)); } } - + return incompleteRoot; } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -26,5 +26,5 @@ public class AddressEditSelectionEvent extends ActionEvent { /** - * + * */ private static final long serialVersionUID = -93034483427803409L; @@ -33,8 +33,8 @@ private JTable incompleteAddressTable; private AddressEditContainer addressContainer; - + private List unresolvedCache; private List incompleteCache; - + /** * Creates a new 'AddressEditSelectionEvent'. @@ -52,5 +52,5 @@ this.addressContainer = container; } - + /** * Gets the street table component. @@ -68,5 +68,5 @@ return unresolvedAddressTable; } - + /** * @return the incompleteAddressTable @@ -84,5 +84,5 @@ return addressContainer; } - + /** * Gets the selected street of the street table. @@ -92,14 +92,14 @@ if (streetTable != null && addressContainer != null && addressContainer.getStreetList() != null) { int selRows = streetTable.getSelectedRow(); - + if (selRows < 0 || selRows >= addressContainer.getNumberOfStreets()) { return null; } - + return addressContainer.getStreetList().get(selRows); } return null; } - + /** * Checks for addresses. @@ -110,5 +110,5 @@ return hasIncompleteAddresses() || hasUnresolvedAddresses(); } - + /** * Checks for incomplete addresses. @@ -119,5 +119,5 @@ return getSelectedIncompleteAddresses() != null; } - + /** * Checks for unresolved addresses. @@ -128,5 +128,5 @@ return getSelectedUnresolvedAddresses() != null; } - + /** * Checks for addresses with guesses. @@ -142,5 +142,5 @@ } } - + if (hasUnresolvedAddresses()) { for (OSMAddress addr : getSelectedUnresolvedAddresses()) { @@ -150,8 +150,8 @@ } } - + return false; } - + /** * Gets the list containing the selected items of the 'unresolved addresses ' table. @@ -159,10 +159,10 @@ */ public List getSelectedUnresolvedAddresses() { - if (unresolvedAddressTable != null && - addressContainer != null && + if (unresolvedAddressTable != null && + addressContainer != null && unresolvedCache == null) { - + int[] selRows = unresolvedAddressTable.getSelectedRows(); - + unresolvedCache = new ArrayList(); for (int i = 0; i < selRows.length; i++) { @@ -176,5 +176,5 @@ } } - + /** * Gets the selected incomplete addresses. @@ -183,10 +183,10 @@ */ public List getSelectedIncompleteAddresses() { - if (incompleteAddressTable != null && - addressContainer != null && + if (incompleteAddressTable != null && + addressContainer != null && incompleteCache == null) { - + int[] selRows = incompleteAddressTable.getSelectedRows(); - + incompleteCache = new ArrayList(); for (int i = 0; i < selRows.length; i++) { Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -31,5 +31,5 @@ public abstract class AddressEditTableModel extends DefaultTableModel implements IAddressEditContainerListener { - + protected AddressEditContainer addressContainer; protected int sortCol = 0; @@ -58,5 +58,5 @@ * Gets the node entity for the given row or null; if row contains no * entity. - * + * * @param row * The row to get the entity object for. @@ -68,5 +68,5 @@ * Gets the row for the given node entity or -1; if the model does not * contain the entity. - * + * * @param entity * The entity to get the row for. @@ -77,5 +77,5 @@ /** * Sorts the model data by the given column. - * + * * @param column * the column @@ -85,5 +85,5 @@ protected abstract void sortByColumn(int column, boolean ascending); - + /** * The listener interface for receiving column events. @@ -135,5 +135,5 @@ //Collections.sort(addressContainer, new MyComparator(isSortAsc)); - + sortByColumn(sortCol, isSortAsc); table.tableChanged(new TableModelEvent(AddressEditTableModel.this)); @@ -141,5 +141,5 @@ } } - + /** * Internal base class to sort items by different columns. @@ -148,5 +148,5 @@ private int column; private boolean ascending; - + /** * Instantiates a new address sorter. @@ -159,5 +159,5 @@ this.ascending = ascending; } - + /** * Gets the index of the column to sort. @@ -168,5 +168,5 @@ return column; } - + /** * Checks if sort mode is ascending or not. Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/BBoxMapRectangle.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/BBoxMapRectangle.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/BBoxMapRectangle.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -23,5 +23,5 @@ public class BBoxMapRectangle implements MapRectangle { private BBox bbox; - + /** * @param bbox Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -59,5 +59,5 @@ private ApplyAllGuessesAction applyGuessesAction = new ApplyAllGuessesAction(); private RemoveAddressTagsAction removeTagsAction = new RemoveAddressTagsAction(); - + // Array containing the available actions private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[]{ @@ -70,5 +70,5 @@ private JTable incompleteAddr; - + /** * Instantiates a new "incomplete addresses" dialog. @@ -77,5 +77,5 @@ public IncompleteAddressesDialog() { super(FIXED_DIALOG_TITLE, "incompleteaddress_24", tr("Show incomplete addresses"), null, 150); - + this.container = new AddressEditContainer(); container.addChangedListener(this); @@ -85,16 +85,16 @@ IncompleteAddressesTableModel model = new IncompleteAddressesTableModel(container); incompleteAddr = new JTable(model); - JTableHeader header = incompleteAddr.getTableHeader(); + JTableHeader header = incompleteAddr.getTableHeader(); header.addMouseListener(model.new ColumnListener(incompleteAddr)); incompleteAddr.getSelectionModel().addListSelectionListener(this); - + // Scroll pane hosting the table JScrollPane sp = new JScrollPane(incompleteAddr); p.add(sp, BorderLayout.CENTER); this.add(p); - + // Button panel containing the commands JPanel buttonPanel = getButtonPanel(actions.length); - + // Populate panel with actions for (int i = 0; i < actions.length; i++) { @@ -102,7 +102,7 @@ buttonPanel.add(sb); } - + this.add(buttonPanel, BorderLayout.SOUTH); - + // Link actions with address container for (AbstractAddressEditAction action : actions) { @@ -110,5 +110,5 @@ } } - + /* (non-Javadoc) * @see org.openstreetmap.josm.gui.dialogs.ToggleDialog#hideNotify() @@ -133,5 +133,5 @@ */ @Override - public void dataChanged(DataChangedEvent event) { + public void dataChanged(DataChangedEvent event) { container.invalidate(); } @@ -142,5 +142,5 @@ @Override public void nodeMoved(NodeMovedEvent event) { - + } @@ -151,5 +151,5 @@ public void otherDatasetChange(AbstractDatasetChangedEvent event) { // TODO Auto-generated method stub - + } @@ -160,5 +160,5 @@ public void primtivesAdded(PrimitivesAddedEvent event) { container.invalidate(); - + } @@ -168,5 +168,5 @@ @Override public void primtivesRemoved(PrimitivesRemovedEvent event) { - container.invalidate(); + container.invalidate(); } @@ -176,5 +176,5 @@ @Override public void relationMembersChanged(RelationMembersChangedEvent event) { - container.invalidate(); + container.invalidate(); } @@ -185,5 +185,5 @@ public void tagsChanged(TagsChangedEvent event) { container.invalidate(); - + } @@ -193,5 +193,5 @@ @Override public void wayNodesChanged(WayNodesChangedEvent event) { - container.invalidate(); + container.invalidate(); } @@ -202,9 +202,9 @@ public void valueChanged(ListSelectionEvent e) { AddressEditSelectionEvent event = new AddressEditSelectionEvent(e, null, null, incompleteAddr, container); - + for (AbstractAddressEditAction action : actions) { action.setEvent(event); - } - + } + OsmUtils.zoomAddresses(event.getSelectedIncompleteAddresses()); } @@ -218,5 +218,5 @@ setTitle(String.format("%s (%d %s)", FIXED_DIALOG_TITLE, container.getNumberOfIncompleteAddresses(), tr("items"))); } else { - setTitle(String.format("%s (%s)", FIXED_DIALOG_TITLE, tr("no items"))); + setTitle(String.format("%s (%s)", FIXED_DIALOG_TITLE, tr("no items"))); } } @@ -228,5 +228,5 @@ public void entityChanged(IOSMEntity node) { // TODO Auto-generated method stub - + } } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -24,15 +24,15 @@ public class IncompleteAddressesTableModel extends AddressEditTableModel { /** - * + * */ private static final long serialVersionUID = -5951629033395186324L; - + // TODO: Add "state" column, if required private static final int NUMBER_OF_COLUMNS = 5; - private static final String[] COLUMN_NAMES = new String[]{tr("Country"), tr("City"), tr("Postcode"), tr("Street"), tr("Number")}; + private static final String[] COLUMN_NAMES = new String[]{tr("Country"), tr("City"), tr("Postcode"), tr("Street"), tr("Number")}; private static final Class[] COLUMN_CLASSES = new Class[]{ String.class, String.class, String.class, String.class, String.class, String.class}; - - + + /** * Instantiates a new incomplete addresses table model. @@ -75,11 +75,11 @@ */ @Override - public Object getValueAt(int row, int column) { + public Object getValueAt(int row, int column) { OSMAddress aNode = (OSMAddress) getEntityOfRow(row); - + if (aNode == null) { return null; } - + switch (column) { case 0: @@ -90,5 +90,5 @@ return aNode.getPostalCode(); case 3: - return aNode.getStreetName(); + return aNode.getStreetName(); case 4: return aNode.getHouseNumber(); @@ -96,7 +96,7 @@ throw new RuntimeException("Invalid column index: " + column); } - - } - + + } + /* (non-Javadoc) * @see javax.swing.table.AbstractTableModel#getColumnClass(int) @@ -137,8 +137,8 @@ return -1; } - + return addressContainer.getIncompleteAddresses().indexOf(entity); } - + /* (non-Javadoc) @@ -148,9 +148,9 @@ protected void sortByColumn(int column, boolean ascending) { if (addressContainer.getNumberOfIncompleteAddresses() == 0) return; - - Collections.sort(addressContainer.getIncompleteAddresses(), + + Collections.sort(addressContainer.getIncompleteAddresses(), new IncompleteAddressModelSorter(column, ascending)); } - + /** * Internal class StreetModelSorter. @@ -174,7 +174,7 @@ public int compare(OSMAddress arg0, OSMAddress arg1) { int cc = 0; - + switch (getColumn()) { - case 0: + case 0: cc=arg0.getCountry().compareTo(arg1.getCountry()); break; @@ -193,14 +193,14 @@ default: throw new RuntimeException("Invalid column index: " + getColumn()); - } - + } + if (!isAscending()) { cc = -cc; } - + return cc; } } - - + + } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -25,5 +25,5 @@ public class StreetTableModel extends AddressEditTableModel { private static final int NUMBER_OF_COLUMNS = 3; - private static final String[] COLUMN_NAMES = new String[]{tr("Type"), tr("Name"), tr("Addresses")}; + private static final String[] COLUMN_NAMES = new String[]{tr("Type"), tr("Name"), tr("Addresses")}; private static final Class[] COLUMN_CLASSES = new Class[]{String.class, String.class, Integer.class}; /** @@ -50,5 +50,5 @@ return COLUMN_NAMES[column]; } - + /* (non-Javadoc) * @see javax.swing.table.AbstractTableModel#getColumnClass(int) @@ -74,11 +74,11 @@ */ @Override - public Object getValueAt(int row, int column) { + public Object getValueAt(int row, int column) { OSMStreet sNode = (OSMStreet) getEntityOfRow(row); - + if (sNode == null) { return null; } - + switch (column) { case 0: @@ -95,5 +95,5 @@ throw new RuntimeException("Invalid column index: " + column); } - + } @@ -112,7 +112,7 @@ return null; } - return addressContainer.getStreetList().get(row); + return addressContainer.getStreetList().get(row); } - + @Override public int getRowOfEntity(IOSMEntity entity) { @@ -120,5 +120,5 @@ return -1; } - + return addressContainer.getStreetList().indexOf(entity); } @@ -131,5 +131,5 @@ Collections.sort(addressContainer.getStreetList(), new StreetModelSorter(column, ascending)); } - + /** * Internal class StreetModelSorter. @@ -143,5 +143,5 @@ public int compare(OSMStreet arg0, OSMStreet arg1) { if (arg0 == null || arg1 == null) return 0; - + switch (getColumn()) { case 0: Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java (revision 25373) @@ -1,26 +1,26 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ /** - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -39,7 +39,7 @@ /** * Provides a table model to show unresolved addresses. - * + * * @author Oliver Wieland - * + * */ @@ -55,5 +55,5 @@ /** - * + * */ private static final long serialVersionUID = 424009321818130586L; @@ -68,5 +68,5 @@ /* * (non-Javadoc) - * + * * @see javax.swing.table.DefaultTableModel#getColumnCount() */ @@ -78,5 +78,5 @@ /* * (non-Javadoc) - * + * * @see javax.swing.table.DefaultTableModel#getColumnName(int) */ @@ -88,5 +88,5 @@ /* * (non-Javadoc) - * + * * @see javax.swing.table.DefaultTableModel#getRowCount() */ @@ -102,5 +102,5 @@ /* * (non-Javadoc) - * + * * @see javax.swing.table.DefaultTableModel#getValueAt(int, int) */ @@ -132,5 +132,5 @@ /* * (non-Javadoc) - * + * * @see javax.swing.table.AbstractTableModel#getColumnClass(int) */ @@ -142,5 +142,5 @@ /* * (non-Javadoc) - * + * * @see javax.swing.table.DefaultTableModel#isCellEditable(int, int) */ @@ -152,5 +152,5 @@ /* * (non-Javadoc) - * + * * @see * org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditTableModel @@ -181,5 +181,5 @@ /* * (non-Javadoc) - * + * * @see * org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditTableModel @@ -206,5 +206,5 @@ /* * (non-Javadoc) - * + * * @see * org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditTableModel Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -37,10 +37,10 @@ * Most actions will work in both cases, so it is recommended to have one single method which * accepts a list of addresses or streets and executes the tasks to be done by this action. - * + * * @author Oliver Wieland */ @SuppressWarnings("serial") -public abstract class AbstractAddressEditAction extends JosmAction implements IAddressEditContainerListener, ICommandListener { +public abstract class AbstractAddressEditAction extends JosmAction implements IAddressEditContainerListener, ICommandListener { private AddressEditSelectionEvent event; protected AddressEditContainer container; @@ -54,5 +54,5 @@ public AbstractAddressEditAction(String name, String iconName, String tooltip) { super(name, iconName, tooltip, null, true); - + setEnabled(false); } @@ -64,5 +64,5 @@ this(name, null, ""); } - + /** * Gets the current address container. @@ -101,5 +101,5 @@ updateEnabledState(); } - + /* (non-Javadoc) * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) @@ -108,10 +108,10 @@ public void actionPerformed(ActionEvent arg0) { if (event != null) { // use the event acquired previously. - addressEditActionPerformed(event); + addressEditActionPerformed(event); event = null; // consume event } else { if (container != null) { addressEditActionPerformed(container); - } else { + } else { throw new RuntimeException("AbstractAddressEditAction has no container or event"); } @@ -141,5 +141,5 @@ */ protected abstract void updateEnabledState(AddressEditContainer container); - + /** * Updates 'enabled' state depending on the current selection. @@ -154,5 +154,5 @@ */ public abstract void addressEditActionPerformed(AddressEditSelectionEvent ev); - + /** * Redirected action handler for doing actions on an address container. @@ -160,6 +160,6 @@ */ public abstract void addressEditActionPerformed(AddressEditContainer container); - - + + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.fixAddresses.IAddressEditContainerListener#containerChanged(org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer) @@ -176,8 +176,8 @@ public void entityChanged(IOSMEntity node) { container.removeProblemsOfSource(node); // clear problems of changed node... - node.visit(container, container); // .. and revisit it. - updateEnabledState(); - } - + node.visit(container, container); // .. and revisit it. + updateEnabledState(); + } + /** * Begins the transaction (command sequence). Must be called by every subclass before @@ -190,5 +190,5 @@ throw new RuntimeException("TX has not been closed (missing finishTransaction?)"); } - + commands = new ArrayList(); if (StringUtils.isNullOrEmpty(txName)) { @@ -197,5 +197,5 @@ this.txName = txName; } - + /** * Finishes the transaction and passes the command sequence to the framework. @@ -210,5 +210,5 @@ container.invalidate(); } - + /** * Begins the transaction for a single object. @@ -223,5 +223,5 @@ } } - + /** * Finishes the transaction for a single object. @@ -236,5 +236,5 @@ } } - + /* (non-Javadoc) * @see org.openstreetmap.josm.plugins.fixAddresses.ICommandListener#commandIssued(org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity, org.openstreetmap.josm.command.Command) Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -32,7 +32,7 @@ /** - * Applies the guessed values for a set of addresses. + * Applies the guessed values for a set of addresses. * @author Oliver Wieland - * + * */ @@ -43,13 +43,13 @@ * Instantiates a new "apply all guesses" action. */ - public ApplyAllGuessesAction(String tag) { + public ApplyAllGuessesAction(String tag) { super(tr("Apply"), "applyguesses_24", tr("Turns all guesses into the corresponding tag values.")); this.tag = tag; } - + /** * Instantiates a new "apply all guesses" action. */ - public ApplyAllGuessesAction() { + public ApplyAllGuessesAction() { this(null); } @@ -61,10 +61,10 @@ public void addressEditActionPerformed(AddressEditSelectionEvent ev) { if (ev == null) return; - + if (ev.getSelectedUnresolvedAddresses() != null) { List addrToFix = ev.getSelectedUnresolvedAddresses(); applyGuesses(addrToFix); } - + if (ev.getSelectedIncompleteAddresses() != null) { List addrToFix = ev.getSelectedIncompleteAddresses(); @@ -91,5 +91,5 @@ for (OSMAddress aNode : addrToFixShadow) { beginObjectTransaction(aNode); - + if (StringUtils.isNullOrEmpty(tag)) { // tag given? aNode.applyAllGuesses(); // no -> apply all guesses @@ -116,8 +116,8 @@ public void addressEditActionPerformed(AddressEditContainer container) { if (container == null || container.getNumberOfIncompleteAddresses() == 0) return; - + List addrToFix = container.getUnresolvedAddresses(); - applyGuesses(addrToFix); - + applyGuesses(addrToFix); + addrToFix = container.getIncompleteAddresses(); applyGuesses(addrToFix); @@ -131,5 +131,5 @@ JTable table = (JTable)e.getSource(); Point p = e.getPoint(); - if(e.getClickCount() == 2) { + if(e.getClickCount() == 2) { AddressEditTableModel model = (AddressEditTableModel) table.getModel(); if (model != null) { @@ -140,7 +140,7 @@ beginObjectTransaction(node); OSMAddress aNode = (OSMAddress) node; - + aNode.applyAllGuesses(); - + finishObjectTransaction(node); finishTransaction(); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -22,8 +22,8 @@ /** - * Assigns one or more selected addresses to a street, i. e. the name of the street is - * used as value for the addr:street tag. + * Assigns one or more selected addresses to a street, i. e. the name of the street is + * used as value for the addr:street tag. * @author Oliver Wieland - * + * */ public class AssignAddressToStreetAction extends AbstractAddressEditAction { @@ -33,10 +33,10 @@ */ public AssignAddressToStreetAction() { - super(tr("Assign address to street"), "assignstreet_24", + super(tr("Assign address to street"), "assignstreet_24", tr("Assign the selected address(es) to the selected street.")); } /** - * + * */ private static final long serialVersionUID = -6180491357232121384L; @@ -46,7 +46,7 @@ */ @Override - public void addressEditActionPerformed(AddressEditSelectionEvent ev) { + public void addressEditActionPerformed(AddressEditSelectionEvent ev) { OSMStreet streetNode = ev.getSelectedStreet(); - + if (streetNode != null && ev.getSelectedUnresolvedAddresses() != null) { beginTransaction(tr("Set street name") + " '" + streetNode.getName() + "'"); @@ -58,5 +58,5 @@ finishTransaction(); } - + } @@ -77,5 +77,5 @@ @Override public void addressEditActionPerformed(AddressEditContainer container) { - // we only accept a selection: nothing to do here + // we only accept a selection: nothing to do here } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -23,8 +23,8 @@ public class ConvertAllToRelationAction extends ConvertToRelationAction { public ConvertAllToRelationAction() { - super(tr("Convert ALL streets."), "convert2rel_24", + super(tr("Convert ALL streets."), "convert2rel_24", tr("Create relation between street and related addresses for ALL streets in the current layer.")); } - + @Override public void addressEditActionPerformed(AddressEditSelectionEvent ev) { @@ -50,5 +50,5 @@ setEnabled(hasStreetsToConvert()); } - + /** * Checks for streets to convert to a relation. Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -30,8 +30,8 @@ public ConvertToRelationAction() { - super(tr("Convert to relation."), "convert2rel_24", + super(tr("Convert to relation."), "convert2rel_24", tr("Create relation between street and related addresses.")); } - + /** * Instantiates a new convert to relation action. @@ -42,5 +42,5 @@ */ public ConvertToRelationAction(String name, String iconName, String tooltip) { - super(name, iconName, tooltip); + super(name, iconName, tooltip); } @@ -51,5 +51,5 @@ public void addressEditActionPerformed(AddressEditSelectionEvent ev) { OSMStreet streetNode = ev.getSelectedStreet(); - + if (streetNode != null) { createRelationForStreet(streetNode); @@ -65,5 +65,5 @@ protected void createRelationForStreet(OSMStreet streetNode) { if (streetNode == null || !streetNode.hasAddresses()) return; - + beginTransaction(tr("Create address relation for ") + " '" + streetNode.getName() + "'"); // Create the relation @@ -74,8 +74,8 @@ // add street with role 'street' r.addMember(new RelationMember(TagUtils.STREET_RELATION_ROLE, streetNode.getOsmObject())); - + // add address members for (OSMAddress addrNode : streetNode.getAddresses()) { - beginObjectTransaction(addrNode); + beginObjectTransaction(addrNode); r.addMember(new RelationMember(TagUtils.HOUSE_RELATION_ROLE, addrNode.getOsmObject())); addrNode.setStreetName(null); // remove street name @@ -107,5 +107,5 @@ protected void updateEnabledState(AddressEditSelectionEvent event) { if (event == null) return; - + OSMStreet street = event.getSelectedStreet(); setEnabled(street != null && street.hasAddresses() && !street.hasAssociatedStreetRelation()); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -28,5 +28,5 @@ * Guesses address tags by picking the closest street node with a name. The same is done * with city, post code, state,... However, I strongly encourage you to check the result. - * + * * @author Oliver Wieland */ @@ -64,5 +64,5 @@ public void addressEditActionPerformed(AddressEditContainer container) { if (container == null || container.getNumberOfInvalidAddresses() == 0) return; - + internalGuessAddresses(container.getAllAddressesToFix()); } @@ -74,10 +74,10 @@ public void addressEditActionPerformed(AddressEditSelectionEvent ev) { if (ev == null || !ev.hasAddresses()) return; - - // guess tags for selected addresses only + + // guess tags for selected addresses only internalGuessAddresses(ev.getSelectedIncompleteAddresses()); internalGuessAddresses(ev.getSelectedUnresolvedAddresses()); } - + /** * Internal method to start several threads guessing tag values for the given list of addresses. @@ -86,5 +86,5 @@ private void internalGuessAddresses(List nodes) { if (nodes == null) return; - + // Launch address guessing thread GuessAddressRunnable aft = new GuessAddressRunnable(nodes, tr("Guessing address values")); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -43,5 +43,5 @@ aNode.removeAllAddressTags(); finishObjectTransaction(aNode); - } + } } finishTransaction(); @@ -63,5 +63,5 @@ setEnabled(false); } - + setEnabled(event.hasAddresses()); } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java (revision 25373) @@ -1,26 +1,26 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ /** - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -43,5 +43,5 @@ * * @author Oliver Wieland - * + * */ @@ -62,5 +62,5 @@ public void addressEditActionPerformed(AddressEditSelectionEvent ev) { if (ev == null) return; - + if (ev.hasUnresolvedAddresses()) { internalSelectAddresses(ev.getSelectedUnresolvedAddresses()); @@ -72,5 +72,5 @@ @Override public void addressEditActionPerformed(AddressEditContainer container) { - // do nothing + // do nothing } @@ -92,16 +92,16 @@ /** - * Internal helper to select the given addresses in the map. + * Internal helper to select the given addresses in the map. * @param addrToSel */ private void internalSelectAddresses(List addrToSel) { if (addrToSel == null) return; - + List sel = new ArrayList(); - + getCurrentDataSet().clearSelection(); for (OSMAddress aNode : addrToSel) { sel.add(aNode.getOsmObject()); - + // Select also guessed objects, if wished if (FixAddressesPlugin.getPreferences().isSelectGuessedObjects()) { Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java (revision 25372) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java (revision 25373) @@ -1,13 +1,13 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. * If not, see . */ @@ -28,10 +28,10 @@ public class SelectIncompleteAddressesAction extends JosmAction { - + private AddressEditContainer addressEditContainer; - + public SelectIncompleteAddressesAction() { super(tr("Select incomplete addresses"), "select_invaddr_24", - tr("Selects all addresses with incomplete data."), null, false); + tr("Selects all addresses with incomplete data."), null, false); } @@ -40,8 +40,8 @@ addressEditContainer = new AddressEditContainer(); addressEditContainer.invalidate(); - + if (addressEditContainer.getIncompleteAddresses() != null) { List osms = new ArrayList(); - + for (OSMAddress aNode : addressEditContainer.getIncompleteAddresses()) { osms.add(aNode.getOsmObject());