Index: /applications/editors/josm/plugins/FixAddresses/.checkstyle =================================================================== --- /applications/editors/josm/plugins/FixAddresses/.checkstyle (revision 32970) +++ /applications/editors/josm/plugins/FixAddresses/.checkstyle (revision 32970) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/FixAddresses/.project =================================================================== --- /applications/editors/josm/plugins/FixAddresses/.project (revision 32969) +++ /applications/editors/josm/plugins/FixAddresses/.project (revision 32970) @@ -26,7 +26,13 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs (revision 32969) +++ /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs (revision 32970) @@ -3,6 +3,9 @@ org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled @@ -85,4 +88,5 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning Index: /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.ui.prefs (revision 32970) +++ /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.ui.prefs (revision 32970) @@ -0,0 +1,59 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java (revision 32970) @@ -40,5 +40,5 @@ * {@see AddressEditTableModel} * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ @@ -96,5 +96,5 @@ /** * Adds a change listener. - * @param listener + * @param listener change listener */ public void addChangedListener(IAddressEditContainerListener listener) { @@ -104,5 +104,5 @@ /** * Removes a change listener. - * @param listener + * @param listener change listener */ public void removeChangedListener(IAddressEditContainerListener listener) { @@ -305,6 +305,6 @@ /** - * Gets the dictionary contains the collected streets. - * @return + * Gets the dictionary containing the collected streets. + * @return dictionary containing the collected streets */ public HashMap getStreetDict() { @@ -343,5 +343,5 @@ /** * Gets all addresses without valid street. - * @return + * @return all addresses without valid street */ public List getUnresolvedItems() { @@ -351,5 +351,5 @@ /** * Gets the tags used in the data layer. - * @return + * @return the tags used in the data layer */ public HashSet getTags() { @@ -366,5 +366,5 @@ /** * Gets the number of streets in the container. - * @return + * @return the number of streets in the container */ public int getNumberOfStreets() { @@ -374,5 +374,5 @@ /** * Get the number of incomplete addresses. - * @return + * @return the number of incomplete addresses */ public int getNumberOfIncompleteAddresses() { @@ -382,5 +382,5 @@ /** * Gets the number of unresolved addresses. - * @return + * @return the number of unresolved addresses */ public int getNumberOfUnresolvedAddresses() { @@ -399,5 +399,5 @@ /** * Gets the number of guessed tags. - * @return + * @return the number of guessed tags */ public int getNumberOfGuesses() { @@ -414,5 +414,5 @@ /** * Gets all (incomplete and/or unresolved) address nodes to fix. - * @return + * @return all (incomplete and/or unresolved) address nodes to fix */ public List getAllAddressesToFix() { @@ -444,5 +444,5 @@ /** * Tries to assign an address to a street. - * @param aNode + * @param aNode address */ private boolean assignAddressToStreet(OSMAddress aNode) { @@ -716,5 +716,5 @@ * @param score Score of the street (length of longest common substring) */ - public StreetScore(String name, int score) { + StreetScore(String name, int score) { super(); this.name = name; 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressProblem.java (revision 32970) @@ -99,5 +99,5 @@ @Override public void removeSolution(ISolution solution) { - if (solutions == null ) throw new RuntimeException("Solution list is null"); + if (solutions == null) throw new RuntimeException("Solution list is null"); if (solutions.size() == 0) throw new RuntimeException("Solution list is empty"); @@ -110,4 +110,3 @@ return source; } - } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPreferences.java (revision 32970) @@ -13,8 +13,8 @@ import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane; -public class FixAddressesPreferences extends DefaultTabPreferenceSetting { +public final class FixAddressesPreferences extends DefaultTabPreferenceSetting { private static final String FIX_ADDRESSES_IGNORE_POST_CODE_KEY = "fixAddresses.ignorePostCode"; private static final String FIX_ADDRESSES_SELECT_GUESSED_OBJECTS_KEY = "fixAddresses.selectGuessedObjects"; - + private JCheckBox cbSelectGuessedObjects = new JCheckBox(tr("Include objects used for guesses")); private JCheckBox cbIgnorePostCode = new JCheckBox(); @@ -22,5 +22,5 @@ /** * Internal factory class. Call FixAddressesPreferences.Factory().createPreferenceSetting() to - * create the preference setting instance. + * create the preference setting instance. */ public static class Factory implements PreferenceSettingFactory { @@ -30,5 +30,5 @@ } } - + /** * Internal constructor. @@ -37,5 +37,5 @@ loadFromPrefs(); } - + /** * Loads the (initial) preference settings. @@ -45,5 +45,5 @@ setIgnorePostCode(Main.pref.getBoolean(FIX_ADDRESSES_IGNORE_POST_CODE_KEY, false)); } - + /** * Save the preference settings. @@ -92,5 +92,5 @@ * Checks if invalid post codes should be ignored. If yes, post codes are neither * checked for existence nor for correctness. - * @return + * @return {@code true} if invalid post codes should be ignored */ public boolean isIgnorePostCode() { 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java (revision 32970) @@ -19,5 +19,5 @@ * instance of {@link AddressEditDialog}. * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ @SuppressWarnings("serial") @@ -76,16 +76,14 @@ for (String tag : addrVisitor.getTags()) { String methodName = createMethodName(tag); - System.out - .println(String - .format( - "/** Check if OSM primitive has a tag '%s'.\n * @param osmPrimitive The OSM entity to check.*/\npublic static boolean has%sTag(OsmPrimitive osmPrimitive) {\n return osmPrimitive != null ? osmPrimitive.hasKey(%s_TAG) : false;\n}\n", - tag, methodName, tag.toUpperCase() - .replaceAll(":", "_"))); - System.out - .println(String - .format( - "/** Gets the value of tag '%s'.\n * @param osmPrimitive The OSM entity to check.*/\npublic static String get%sValue(OsmPrimitive osmPrimitive) {\n return osmPrimitive != null ? osmPrimitive.get(%s_TAG) : null;\n}\n", - tag, methodName, tag.toUpperCase() - .replaceAll(":", "_"))); + // CHECKSTYLE.OFF: LineLength + System.out.println(String.format( + "/** Check if OSM primitive has a tag '%s'.\n * @param osmPrimitive The OSM entity to check.*/\npublic static boolean has%sTag(OsmPrimitive osmPrimitive) {\n return osmPrimitive != null ? osmPrimitive.hasKey(%s_TAG) : false;\n}\n", + tag, methodName, tag.toUpperCase() + .replaceAll(":", "_"))); + System.out.println(String.format( + "/** Gets the value of tag '%s'.\n * @param osmPrimitive The OSM entity to check.*/\npublic static String get%sValue(OsmPrimitive osmPrimitive) {\n return osmPrimitive != null ? osmPrimitive.get(%s_TAG) : null;\n}\n", + tag, methodName, tag.toUpperCase() + .replaceAll(":", "_"))); + // CHECKSTYLE.ON: LineLength } @@ -102,6 +100,5 @@ String values = value.toUpperCase().replaceAll(":", "_"); System.out.println(String.format( - "public static final String %s_%s_VALUE = \"%s\";", tags, values - , value)); + "public static final String %s_%s_VALUE = \"%s\";", tags, values, value)); } } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java (revision 32970) @@ -29,11 +29,11 @@ private boolean canceled; - private GuessedValueHandler[] wayGuessers = new GuessedValueHandler[]{new GuessStreetValueHandler(TagUtils.ADDR_STREET_TAG)}; + private GuessedValueHandler[] wayGuessers = new GuessedValueHandler[]{new GuessStreetValueHandler(TagConstants.ADDR_STREET_TAG)}; private GuessedValueHandler[] nodeGuessers = new GuessedValueHandler[]{ - new GuessedValueHandler(TagUtils.ADDR_POSTCODE_TAG, 500.0), - new GuessedValueHandler(TagUtils.ADDR_CITY_TAG, 5000.0), - new GuessedValueHandler(TagUtils.ADDR_STATE_TAG, 5000.0), - new GuessedValueHandler(TagUtils.ADDR_COUNTRY_TAG, 5000.0), - new GuessedValueHandler(TagUtils.ADDR_CITY_TAG, 2000.0) + new GuessedValueHandler(TagConstants.ADDR_POSTCODE_TAG, 500.0), + new GuessedValueHandler(TagConstants.ADDR_CITY_TAG, 5000.0), + new GuessedValueHandler(TagConstants.ADDR_STATE_TAG, 5000.0), + new GuessedValueHandler(TagConstants.ADDR_COUNTRY_TAG, 5000.0), + new GuessedValueHandler(TagConstants.ADDR_CITY_TAG, 2000.0) }; @@ -69,4 +69,5 @@ return addressesToGuess; } + /** * @return the isRunning @@ -194,11 +195,10 @@ } - // TODO: Put in separate file private static class GuessStreetValueHandler extends GuessedValueHandler { - public GuessStreetValueHandler(String tag) { + GuessStreetValueHandler(String tag) { this(tag, null); } - public GuessStreetValueHandler(String tag, OSMAddress aNode) { + GuessStreetValueHandler(String tag, OSMAddress aNode) { super(tag, aNode, 200.0); } @@ -222,7 +222,4 @@ currentValue = newVal; srcNode = w; - //aNode.setGuessedValue(getTag(), currentValue, w); - } else { - //System.out.println(String.format("Skipped %s: %4.2f m", TagUtils.getNameValue(w), dist)); } } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java (revision 32970) @@ -36,5 +36,5 @@ this(tag, null, DEFAULT_MAX_DIST); } - + /** * Instantiates a new guessed value handler without node. @@ -46,5 +46,5 @@ this(tag, null, maxDist); } - + /** * Instantiates a new guessed value handler. @@ -75,8 +75,8 @@ maxDist = 1.0; } - + this.tag = tag; this.maxDist = maxDist; - setAddressNode(aNode); + setAddressNode(aNode); } @@ -89,16 +89,16 @@ return aNode; } - + /** * Sets the address node to make the guess for. - * @param aNode + * @param aNode address node */ - public void setAddressNode(OSMAddress aNode) { + public void setAddressNode(OSMAddress aNode) { this.aNode = aNode; // reset search results minDist = Double.MAX_VALUE; srcNode = null; - currentValue = null; + currentValue = null; } @@ -140,6 +140,6 @@ return currentValue; } - - + + /** * Gets the node/way which has been selected for the guess. @@ -162,5 +162,5 @@ public void visit(Node n) { assert aNode != null; - + if (n.hasKey(tag)) { double dist = n.getCoor().greatCircleDistance(aNode.getCoor()); @@ -176,5 +176,5 @@ public void visit(Way w) { assert aNode != null; - + if (w.hasKey(tag)) { double dist = OsmUtils.getMinimumDistanceToWay(aNode.getCoor(), 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IAddressEditContainerListener.java (revision 32970) @@ -5,11 +5,11 @@ /** * Notifies clients that the container has been changed. - * @param container + * @param container container */ - public void containerChanged(AddressEditContainer container); + void containerChanged(AddressEditContainer container); /** * Notifies clients that an entity has been changed. */ - public void entityChanged(IOSMEntity node); + void entityChanged(IOSMEntity node); } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IAllKnowingTrashHeap.java (revision 32970) @@ -13,5 +13,5 @@ * @return the closest street names */ - public List getClosestStreetNames(String name, int maxEntries); + List getClosestStreetNames(String name, int maxEntries); /** @@ -21,5 +21,5 @@ * @return the closest street name */ - public String getClosestStreetName(String name); + String getClosestStreetName(String name); /** @@ -29,4 +29,4 @@ * @return true, if street name is valid; otherwise false. */ - public boolean isValidStreetName(String name); + boolean isValidStreetName(String name); } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ICommandListener.java (revision 32970) @@ -11,4 +11,4 @@ * @param command The command instance to process by the enclosing command listener. */ - public void commandIssued(IOSMEntity entity, Command command); + void commandIssued(IOSMEntity entity, Command command); } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java (revision 32970) @@ -10,31 +10,30 @@ * Base interface for all node entities. A node entity is a lightweight wrapper * around OSM objects in order to ease up some tasks like tag handling. - * @author Oliver Wieland - * + * @author Oliver Wieland <oliver.wieland@online.de> */ public interface IOSMEntity extends Comparable { /** * Gets the underlying OSM object. - * @return + * @return the underlying OSM object */ - public OsmPrimitive getOsmObject(); + OsmPrimitive getOsmObject(); /** * Checks if underlying OSM object has a name. - * @return + * @return {@code true} if underlying OSM object has a name */ - public boolean hasName(); + boolean hasName(); /** * Gets the name of the entity node. - * @return + * @return the name of the entity node */ - public String getName(); + String getName(); /** * Gets the children of the entity node. - * @return + * @return the children of the entity node */ - public List getChildren(); + List getChildren(); /** @@ -42,19 +41,19 @@ * node, it just returns the node coordinate. For ways and areas, this * method returns the coordinate of the center (balance point). - * @return + * @return the coordinate of the node */ - public LatLon getCoor(); + LatLon getCoor(); /** * Adds a command listener. - * @param listener + * @param listener command listener */ - public void addCommandListener(ICommandListener listener); + void addCommandListener(ICommandListener listener); /** * Removes a command listener. - * @param listener + * @param listener command listener */ - public void removeCommandListener(ICommandListener listener); + void removeCommandListener(ICommandListener listener); /** @@ -64,5 +63,5 @@ * @param visitor the problem visitor */ - public void visit(IAllKnowingTrashHeap trashHeap, IProblemVisitor visitor); + void visit(IAllKnowingTrashHeap trashHeap, IProblemVisitor visitor); @Override 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProblem.java (revision 32970) @@ -11,5 +11,5 @@ * @return the source */ - public IOSMEntity getSource(); + IOSMEntity getSource(); /** @@ -18,5 +18,5 @@ * @return the description */ - public String getDescription(); + String getDescription(); /** @@ -25,5 +25,5 @@ * @return the type */ - public ProblemType getType(); + ProblemType getType(); /** @@ -32,5 +32,5 @@ * @return the solutions */ - public List getSolutions(); + List getSolutions(); /** @@ -39,5 +39,5 @@ * @param solution the solution */ - public void addSolution(ISolution solution); + void addSolution(ISolution solution); /** @@ -46,10 +46,10 @@ * @param solution the solution */ - public void removeSolution(ISolution solution); + void removeSolution(ISolution solution); /** * Removes all solutions from this problem. */ - public void clearSolutions(); + void clearSolutions(); /** @@ -58,4 +58,4 @@ * @param solution the solution */ - public void applySolution(ISolution solution); + void applySolution(ISolution solution); } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProblemVisitor.java (revision 32970) @@ -8,9 +8,9 @@ * @param problem the problem to add */ - public void addProblem(IProblem problem); + void addProblem(IProblem problem); /** * Removes the problems of the given source. */ - public void removeProblemsOfSource(IOSMEntity entity); + void removeProblemsOfSource(IOSMEntity entity); } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IProgressMonitorFinishedListener.java (revision 32970) @@ -3,4 +3,4 @@ public interface IProgressMonitorFinishedListener { - public void finished(); + void finished(); } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ISolution.java (revision 32970) @@ -11,5 +11,5 @@ * @return the description */ - public String getDescription(); + String getDescription(); /** @@ -18,5 +18,5 @@ * @return the action */ - public JosmAction getAction(); + JosmAction getAction(); /** @@ -25,9 +25,9 @@ * @return the type */ - public SolutionType getType(); + SolutionType getType(); /** * Executes one or more actions to solve a problem. */ - public void solve(); + void solve(); } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java (revision 32970) @@ -34,14 +34,13 @@ public OSMAddress(OsmPrimitive osmObject) { - super(osmObject); + super(osmObject); } @Override public void setOsmObject(OsmPrimitive osmObject) { - super.setOsmObject(osmObject); - - isPartOfInterpolation = OsmUtils - .getValuesFromAddressInterpolation(this); - isPartOfAssocStreetRel = OsmUtils.getValuesFromRelation(this); + super.setOsmObject(osmObject); + + isPartOfInterpolation = OsmUtils.getValuesFromAddressInterpolation(this); + isPartOfAssocStreetRel = OsmUtils.getValuesFromRelation(this); } @@ -50,22 +49,21 @@ * describe an address. * - * @return + * @return {@code true} if the underlying address node has all tags usually needed to describe an address */ public boolean isComplete() { - boolean isComplete = hasCity() && hasHouseNumber() && hasCity() - && hasStreetName(); - - // Check, if "addr:state" is required (US and AU) - if (TagUtils.isStateRequired()) { - isComplete = isComplete && hasState(); - } - - // Check, if user checked "ignore post code" - if (!FixAddressesPlugin.getPreferences().isIgnorePostCode()) { - isComplete = isComplete && hasPostalCode() - && PostalCodeChecker.hasValidPostalCode(this); - } - - return isComplete; + boolean isComplete = hasCity() && hasHouseNumber() && hasCity() && hasStreetName(); + + // Check, if "addr:state" is required (US and AU) + if (TagUtils.isStateRequired()) { + isComplete = isComplete && hasState(); + } + + // Check, if user checked "ignore post code" + if (!FixAddressesPlugin.getPreferences().isIgnorePostCode()) { + isComplete = isComplete && hasPostalCode() + && PostalCodeChecker.hasValidPostalCode(this); + } + + return isComplete; } @@ -73,8 +71,8 @@ * Gets the name of the street associated with this address. * - * @return + * @return the name of the street associated with this address */ public String getStreetName() { - return getTagValueWithGuess(TagUtils.ADDR_STREET_TAG); + return getTagValueWithGuess(TagConstants.ADDR_STREET_TAG); } @@ -89,26 +87,26 @@ */ private String getTagValueWithGuess(String tag) { - 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)) { - // object does not have this tag -> check for guess - if (hasGuessedValue(tag)) { - return "*" + getGuessedValue(tag); - } else { - // give up + if (StringUtils.isNullOrEmpty(tag)) return MISSING_TAG; - } - } else { // ok, use derived value known via associated relation or - // way - return getDerivedValue(tag); - } - } else { // get existing tag value - return osmObject.get(tag); - } + if (osmObject == null) + return MISSING_TAG; + + if (!osmObject.hasKey(tag) + || StringUtils.isNullOrEmpty(osmObject.get(tag))) { + if (!hasDerivedValue(tag)) { + // object does not have this tag -> check for guess + if (hasGuessedValue(tag)) { + return "*" + getGuessedValue(tag); + } else { + // give up + return MISSING_TAG; + } + } else { // ok, use derived value known via associated relation or + // way + return getDerivedValue(tag); + } + } else { // get existing tag value + return osmObject.get(tag); + } } @@ -116,8 +114,8 @@ * Returns true, if this address node has a street name. * - * @return + * @return true, if this address node has a street name */ public boolean hasStreetName() { - return hasTag(TagUtils.ADDR_STREET_TAG) || isPartOfRelation(); + return hasTag(TagConstants.ADDR_STREET_TAG) || isPartOfRelation(); } @@ -128,5 +126,5 @@ */ public String getGuessedStreetName() { - return getGuessedValue(TagUtils.ADDR_STREET_TAG); + return getGuessedValue(TagConstants.ADDR_STREET_TAG); } @@ -139,7 +137,6 @@ * the source object of the guess. */ - public void setGuessedStreetName(String guessedStreetName, - OsmPrimitive srcObj) { - setGuessedValue(TagUtils.ADDR_STREET_TAG, guessedStreetName, srcObj); + public void setGuessedStreetName(String guessedStreetName, OsmPrimitive srcObj) { + setGuessedValue(TagConstants.ADDR_STREET_TAG, guessedStreetName, srcObj); } @@ -150,5 +147,5 @@ */ public boolean hasGuessedStreetName() { - return hasGuessedValue(TagUtils.ADDR_STREET_TAG); + return hasGuessedValue(TagConstants.ADDR_STREET_TAG); } @@ -157,5 +154,5 @@ */ public String getGuessedPostalCode() { - return getGuessedValue(TagUtils.ADDR_POSTCODE_TAG); + return getGuessedValue(TagConstants.ADDR_POSTCODE_TAG); } @@ -169,5 +166,5 @@ */ public void setGuessedPostalCode(String guessedPostCode, OsmPrimitive srcObj) { - setGuessedValue(TagUtils.ADDR_POSTCODE_TAG, guessedPostCode, srcObj); + setGuessedValue(TagConstants.ADDR_POSTCODE_TAG, guessedPostCode, srcObj); } @@ -178,5 +175,5 @@ */ public boolean hasGuessedPostalCode() { - return hasGuessedValue(TagUtils.ADDR_POSTCODE_TAG); + return hasGuessedValue(TagConstants.ADDR_POSTCODE_TAG); } @@ -185,5 +182,5 @@ */ public String getGuessedCity() { - return getGuessedValue(TagUtils.ADDR_CITY_TAG); + return getGuessedValue(TagConstants.ADDR_CITY_TAG); } @@ -197,5 +194,5 @@ */ public void setGuessedCity(String guessedCity, OsmPrimitive srcObj) { - setGuessedValue(TagUtils.ADDR_CITY_TAG, guessedCity, srcObj); + setGuessedValue(TagConstants.ADDR_CITY_TAG, guessedCity, srcObj); } @@ -206,5 +203,5 @@ */ public boolean hasGuessedCity() { - return hasGuessedValue(TagUtils.ADDR_CITY_TAG); + return hasGuessedValue(TagConstants.ADDR_CITY_TAG); } @@ -212,8 +209,8 @@ * Returns true, if this instance has guesses regarding address tags. * - * @return + * @return true, if this instance has guesses regarding address tags */ public boolean hasGuesses() { - return guessedValues.size() > 0; + return guessedValues.size() > 0; } @@ -222,11 +219,11 @@ */ public void applyAllGuesses() { - for (String tag : guessedValues.keySet()) { - applyGuessForTag(tag); - } - - // Clear all guesses - guessedValues.clear(); - guessedObjects.clear(); + for (String tag : guessedValues.keySet()) { + applyGuessForTag(tag); + } + + // Clear all guesses + guessedValues.clear(); + guessedObjects.clear(); } @@ -238,10 +235,10 @@ */ public void applyGuessForTag(String tag) { - if (guessedValues.containsKey(tag)) { - String val = guessedValues.get(tag); - if (!StringUtils.isNullOrEmpty(val)) { - setOSMTag(tag, val); - } - } + if (guessedValues.containsKey(tag)) { + String val = guessedValues.get(tag); + if (!StringUtils.isNullOrEmpty(val)) { + setOSMTag(tag, val); + } + } } @@ -249,14 +246,14 @@ * Gets the name of the post code associated with this address. * - * @return + * @return the name of the post code associated with this address */ public String getPostalCode() { - String pc = getTagValueWithGuess(TagUtils.ADDR_POSTCODE_TAG); - - if (!MISSING_TAG.equals(pc) - && !PostalCodeChecker.hasValidPostalCode(getCountry(), pc)) { - pc = "(!)" + pc; - } - return pc; + String pc = getTagValueWithGuess(TagConstants.ADDR_POSTCODE_TAG); + + if (!MISSING_TAG.equals(pc) + && !PostalCodeChecker.hasValidPostalCode(getCountry(), pc)) { + pc = "(!)" + pc; + } + return pc; } @@ -267,5 +264,5 @@ */ public boolean hasValidPostalCode() { - return PostalCodeChecker.hasValidPostalCode(this); + return PostalCodeChecker.hasValidPostalCode(this); } @@ -276,5 +273,5 @@ */ public boolean hasPostalCode() { - return hasTag(TagUtils.ADDR_POSTCODE_TAG); + return hasTag(TagConstants.ADDR_POSTCODE_TAG); } @@ -282,15 +279,15 @@ * Gets the name of the house number associated with this address. * - * @return + * @return the name of the house number associated with this address */ public String getHouseNumber() { - if (!TagUtils.hasAddrHousenumberTag(osmObject)) { - if (!isPartOfInterpolation) { - return MISSING_TAG; - } else { - return INTERPOLATION_TAG; - } - } - return TagUtils.getAddrHousenumberValue(osmObject); + if (!TagUtils.hasAddrHousenumberTag(osmObject)) { + if (!isPartOfInterpolation) { + return MISSING_TAG; + } else { + return INTERPOLATION_TAG; + } + } + return TagUtils.getAddrHousenumberValue(osmObject); } @@ -301,16 +298,15 @@ */ public boolean hasHouseNumber() { - return TagUtils.hasAddrHousenumberTag(osmObject) - || isPartOfInterpolation; + return TagUtils.hasAddrHousenumberTag(osmObject) || isPartOfInterpolation; } @Override - public String getName() { - String name = TagUtils.getNameValue(osmObject); - if (!StringUtils.isNullOrEmpty(name)) { - return TagUtils.getAddrHousenameValue(osmObject); - } - - return ""; + public String getName() { + String name = TagUtils.getNameValue(osmObject); + if (!StringUtils.isNullOrEmpty(name)) { + return TagUtils.getAddrHousenameValue(osmObject); + } + + return ""; } @@ -321,5 +317,5 @@ */ protected boolean isPartOfInterpolation() { - return isPartOfInterpolation; + return isPartOfInterpolation; } @@ -330,5 +326,5 @@ */ protected boolean isPartOfRelation() { - return isPartOfAssocStreetRel; + return isPartOfAssocStreetRel; } @@ -336,8 +332,8 @@ * Gets the name of the city associated with this address. * - * @return + * @return the name of the city associated with this address */ public String getCity() { - return getTagValueWithGuess(TagUtils.ADDR_CITY_TAG); + return getTagValueWithGuess(TagConstants.ADDR_CITY_TAG); } @@ -348,5 +344,5 @@ */ public boolean hasCity() { - return hasTag(TagUtils.ADDR_CITY_TAG); + return hasTag(TagConstants.ADDR_CITY_TAG); } @@ -354,8 +350,8 @@ * Gets the name of the state associated with this address. * - * @return + * @return the name of the state associated with this address */ public String getState() { - return getTagValueWithGuess(TagUtils.ADDR_STATE_TAG); + return getTagValueWithGuess(TagConstants.ADDR_STATE_TAG); } @@ -366,5 +362,5 @@ */ public boolean hasState() { - return hasTag(TagUtils.ADDR_STATE_TAG); + return hasTag(TagConstants.ADDR_STATE_TAG); } @@ -372,8 +368,8 @@ * Gets the name of the country associated with this address. * - * @return + * @return the name of the country associated with this address */ public String getCountry() { - return getTagValueWithGuess(TagUtils.ADDR_COUNTRY_TAG); + return getTagValueWithGuess(TagConstants.ADDR_COUNTRY_TAG); } @@ -384,5 +380,5 @@ */ public boolean hasCountry() { - return hasTag(TagUtils.ADDR_COUNTRY_TAG); + return hasTag(TagConstants.ADDR_COUNTRY_TAG); } @@ -391,10 +387,10 @@ */ public void removeAllAddressTags() { - removeOSMTag(TagUtils.ADDR_CITY_TAG); - removeOSMTag(TagUtils.ADDR_COUNTRY_TAG); - removeOSMTag(TagUtils.ADDR_POSTCODE_TAG); - removeOSMTag(TagUtils.ADDR_HOUSENUMBER_TAG); - removeOSMTag(TagUtils.ADDR_STATE_TAG); - removeOSMTag(TagUtils.ADDR_STREET_TAG); + removeOSMTag(TagConstants.ADDR_CITY_TAG); + removeOSMTag(TagConstants.ADDR_COUNTRY_TAG); + removeOSMTag(TagConstants.ADDR_POSTCODE_TAG); + removeOSMTag(TagConstants.ADDR_HOUSENUMBER_TAG); + removeOSMTag(TagConstants.ADDR_STATE_TAG); + removeOSMTag(TagConstants.ADDR_STREET_TAG); } @@ -469,15 +465,15 @@ * Applies the street name from the specified street node. * - * @param node + * @param node street node */ public void assignStreet(OSMStreet node) { - if (node == null || !node.hasName()) - return; - - if (!node.getName().equals(getStreetName())) { - setStreetName(node.getName()); - node.addAddress(this); - fireEntityChanged(this); - } + if (node == null || !node.hasName()) + return; + + if (!node.getName().equals(getStreetName())) { + setStreetName(node.getName()); + node.addAddress(this); + fireEntityChanged(this); + } } @@ -490,10 +486,10 @@ */ public String getGuessedValue(String tag) { - CheckParameterUtil.ensureParameterNotNull(tag, "tag"); - - if (!hasGuessedValue(tag)) { - return null; - } - return guessedValues.get(tag); + CheckParameterUtil.ensureParameterNotNull(tag, "tag"); + + if (!hasGuessedValue(tag)) { + return null; + } + return guessedValues.get(tag); } @@ -506,10 +502,10 @@ */ public OsmPrimitive getGuessedObject(String tag) { - CheckParameterUtil.ensureParameterNotNull(tag, "tag"); - - if (guessedObjects.containsKey(tag)) { - return guessedObjects.get(tag); - } - return null; + CheckParameterUtil.ensureParameterNotNull(tag, "tag"); + + if (guessedObjects.containsKey(tag)) { + return guessedObjects.get(tag); + } + return null; } @@ -521,8 +517,8 @@ */ public Collection getGuessedObjects() { - if (guessedObjects == null) - return null; - - return guessedObjects.values(); + if (guessedObjects == null) + return null; + + return guessedObjects.values(); } @@ -534,9 +530,9 @@ */ public boolean needsGuess() { - return needsGuessedValue(TagUtils.ADDR_CITY_TAG) - || needsGuessedValue(TagUtils.ADDR_POSTCODE_TAG) - || needsGuessedValue(TagUtils.ADDR_COUNTRY_TAG) || - // needsGuessedValue(TagUtils.ADDR_STATE_TAG) || - needsGuessedValue(TagUtils.ADDR_STREET_TAG); + return needsGuessedValue(TagConstants.ADDR_CITY_TAG) + || needsGuessedValue(TagConstants.ADDR_POSTCODE_TAG) + || needsGuessedValue(TagConstants.ADDR_COUNTRY_TAG) || + // needsGuessedValue(TagConstants.ADDR_STATE_TAG) || + needsGuessedValue(TagConstants.ADDR_STREET_TAG); } @@ -547,5 +543,5 @@ */ public boolean needsGuessedValue(String tag) { - return MISSING_TAG.equals(getTagValueWithGuess(tag)); + return MISSING_TAG.equals(getTagValueWithGuess(tag)); } @@ -554,5 +550,5 @@ */ public void clearAllGuesses() { - guessedValues.clear(); + guessedValues.clear(); } @@ -603,8 +599,8 @@ */ private boolean hasDerivedValue(String tag) { - CheckParameterUtil.ensureParameterNotNull(tag, "tag"); - - return derivedValues.containsKey(tag) - && !StringUtils.isNullOrEmpty(derivedValues.get(tag)); + CheckParameterUtil.ensureParameterNotNull(tag, "tag"); + + return derivedValues.containsKey(tag) + && !StringUtils.isNullOrEmpty(derivedValues.get(tag)); } @@ -612,8 +608,8 @@ * Returns true, if this instance has derived values from any referrer. * - * @return + * @return true, if this instance has derived values from any referrer */ public boolean hasDerivedValues() { - return derivedValues.size() > 0; + return derivedValues.size() > 0; } @@ -623,11 +619,11 @@ * @param tag * The tag to get the derived value for. - * @return + * @return the derived value for the given tag */ public String getDerivedValue(String tag) { - if (!hasDerivedValue(tag)) { - return null; - } - return derivedValues.get(tag); + if (!hasDerivedValue(tag)) { + return null; + } + return derivedValues.get(tag); } @@ -641,5 +637,5 @@ */ public void setDerivedValue(String tag, String value) { - derivedValues.put(tag, value); + derivedValues.put(tag, value); } @@ -647,11 +643,11 @@ * Sets the street name of the address node. * - * @param streetName + * @param streetName street name of the address node */ public void setStreetName(String streetName) { - if (streetName != null && streetName.length() == 0) - return; - - setOSMTag(TagUtils.ADDR_STREET_TAG, streetName); + if (streetName != null && streetName.length() == 0) + return; + + setOSMTag(TagConstants.ADDR_STREET_TAG, streetName); } @@ -659,11 +655,11 @@ * Sets the state of the address node. * - * @param state + * @param state state of the address node */ public void setState(String state) { - if (state != null && state.length() == 0) - return; - - setOSMTag(TagUtils.ADDR_STATE_TAG, state); + if (state != null && state.length() == 0) + return; + + setOSMTag(TagConstants.ADDR_STATE_TAG, state); } @@ -671,11 +667,11 @@ * Sets the country of the address node. * - * @param country + * @param country country of the address node */ public void setCountry(String country) { - if (country != null && country.length() == 0) - return; - - setOSMTag(TagUtils.ADDR_COUNTRY_TAG, country); + if (country != null && country.length() == 0) + return; + + setOSMTag(TagConstants.ADDR_COUNTRY_TAG, country); } @@ -683,73 +679,70 @@ * Sets the post code of the address node. * - * @param postCode + * @param postCode post code of the address node */ public void setPostCode(String postCode) { - if (postCode != null && postCode.length() == 0) - return; - - setOSMTag(TagUtils.ADDR_POSTCODE_TAG, postCode); + if (postCode != null && postCode.length() == 0) + return; + + setOSMTag(TagConstants.ADDR_POSTCODE_TAG, postCode); } @Override public void visit(IAllKnowingTrashHeap trashHeap, IProblemVisitor visitor) { - CheckParameterUtil.ensureParameterNotNull(visitor, "visitor"); - - // Check for street - if (!hasStreetName()) { - AddressProblem p = new AddressProblem(this, - tr("Address has no street")); - if (hasGuessedStreetName()) { // guess exists -> add solution entry - String tag = TagUtils.ADDR_STREET_TAG; - addGuessValueSolution(p, tag); - } - addRemoveAddressTagsSolution(p); - visitor.addProblem(p); - // Street name exists, but is invalid -> ask the all knowing trash - // heap - } else if (!trashHeap.isValidStreetName(getStreetName())) { - AddressProblem p = new AddressProblem(this, - tr("Address has no valid street")); - String match = trashHeap.getClosestStreetName(getStreetName()); - - if (!StringUtils.isNullOrEmpty(match)) { - setGuessedStreetName(match, null); - addGuessValueSolution(p, TagUtils.ADDR_STREET_TAG); - } - visitor.addProblem(p); - } - - // Check for postal code - if (!hasPostalCode()) { - AddressProblem p = new AddressProblem(this, - tr("Address has no post code")); - if (hasGuessedStreetName()) { - String tag = TagUtils.ADDR_POSTCODE_TAG; - addGuessValueSolution(p, tag); - } - addRemoveAddressTagsSolution(p); - visitor.addProblem(p); - } - - // Check for city - if (!hasCity()) { - AddressProblem p = new AddressProblem(this, - tr("Address has no city")); - if (hasGuessedStreetName()) { - String tag = TagUtils.ADDR_CITY_TAG; - addGuessValueSolution(p, tag); - } - addRemoveAddressTagsSolution(p); - visitor.addProblem(p); - } - - // Check for country - if (!hasCountry()) { - // TODO: Add guess for country - AddressProblem p = new AddressProblem(this, - tr("Address has no country")); - addRemoveAddressTagsSolution(p); - visitor.addProblem(p); - } + CheckParameterUtil.ensureParameterNotNull(visitor, "visitor"); + + // Check for street + if (!hasStreetName()) { + AddressProblem p = new AddressProblem(this, + tr("Address has no street")); + if (hasGuessedStreetName()) { // guess exists -> add solution entry + String tag = TagConstants.ADDR_STREET_TAG; + addGuessValueSolution(p, tag); + } + addRemoveAddressTagsSolution(p); + visitor.addProblem(p); + // Street name exists, but is invalid -> ask the all knowing trash + // heap + } else if (!trashHeap.isValidStreetName(getStreetName())) { + AddressProblem p = new AddressProblem(this, + tr("Address has no valid street")); + String match = trashHeap.getClosestStreetName(getStreetName()); + + if (!StringUtils.isNullOrEmpty(match)) { + setGuessedStreetName(match, null); + addGuessValueSolution(p, TagConstants.ADDR_STREET_TAG); + } + visitor.addProblem(p); + } + + // Check for postal code + if (!hasPostalCode()) { + AddressProblem p = new AddressProblem(this, tr("Address has no post code")); + if (hasGuessedStreetName()) { + String tag = TagConstants.ADDR_POSTCODE_TAG; + addGuessValueSolution(p, tag); + } + addRemoveAddressTagsSolution(p); + visitor.addProblem(p); + } + + // Check for city + if (!hasCity()) { + AddressProblem p = new AddressProblem(this, tr("Address has no city")); + if (hasGuessedStreetName()) { + String tag = TagConstants.ADDR_CITY_TAG; + addGuessValueSolution(p, tag); + } + addRemoveAddressTagsSolution(p); + visitor.addProblem(p); + } + + // Check for country + if (!hasCountry()) { + // TODO: Add guess for country + AddressProblem p = new AddressProblem(this, tr("Address has no country")); + addRemoveAddressTagsSolution(p); + visitor.addProblem(p); + } } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java (revision 32970) @@ -33,7 +33,4 @@ protected OsmPrimitive osmObject; - /** - * @param osmObject - */ public OSMEntityBase(OsmPrimitive osmObject) { super(); @@ -51,5 +48,5 @@ /** * Adds a change listener. - * @param listener + * @param listener change listener */ public static void addChangedListener(IAddressEditContainerListener listener) { @@ -60,5 +57,5 @@ /** * Removes a change listener. - * @param listener + * @param listener change listener */ public static void removeChangedListener(IAddressEditContainerListener listener) { @@ -79,8 +76,8 @@ /** * Adds a command listener. - * @param listener - */ - @Override - public void addCommandListener(ICommandListener listener) { + * @param listener command listener + */ + @Override + public void addCommandListener(ICommandListener listener) { CheckParameterUtil.ensureParameterNotNull(listener, "listener"); cmdListeners.add(listener); @@ -89,8 +86,8 @@ /** * Removes a command listener. - * @param listener - */ - @Override - public void removeCommandListener(ICommandListener listener) { + * @param listener command listener + */ + @Override + public void removeCommandListener(ICommandListener listener) { CheckParameterUtil.ensureParameterNotNull(listener, "listener"); cmdListeners.remove(listener); @@ -115,5 +112,5 @@ @Override - public OsmPrimitive getOsmObject() { + public OsmPrimitive getOsmObject() { return osmObject; } @@ -131,5 +128,5 @@ public String getName() { if (TagUtils.hasNameTag(osmObject)) { - return TagUtils.getNameValue(osmObject); + return TagUtils.getNameValue(osmObject); } return ""; @@ -202,5 +199,5 @@ if (osm instanceof Node) { - return ((Node)osm).getCoor(); + return ((Node) osm).getCoor(); // way: return center } else if (osm instanceof Way) { 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreet.java (revision 32970) @@ -13,5 +13,5 @@ * consists at least of one segment. * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ public class OSMStreet extends OSMEntityBase { @@ -19,7 +19,4 @@ private List addresses; - /** - * @param osmPrimitive - */ public OSMStreet(OsmPrimitive osmPrimitive) { super(osmPrimitive); @@ -27,5 +24,5 @@ @Override - public List getChildren() { + public List getChildren() { return children; } @@ -33,5 +30,5 @@ /** * Adds a street segment to the street node. - * @param segment + * @param segment street segment */ public void addStreetSegment(OSMStreetSegment segment) { @@ -89,5 +86,5 @@ /** * Gets the number of addresses associated with this street. - * @return + * @return number of addresses associated with this street */ public int getNumberOfAddresses() { @@ -99,5 +96,5 @@ /** * Gets the number of street segments of this street. - * @return + * @return number of street segments of this street */ public int getNumberOfSegments() { @@ -116,5 +113,5 @@ * Gets the road type(s) of this street. If the street has different types, * they are separated by comma. - * @return + * @return road type(s) of this street */ public String getType() { @@ -124,5 +121,5 @@ OsmPrimitive osmPrim = seg.getOsmObject(); if (TagUtils.hasHighwayTag(osmPrim)) { - String val = osmPrim.get(TagUtils.HIGHWAY_TAG); + String val = osmPrim.get(TagConstants.HIGHWAY_TAG); if (!types.contains(val)) { types.add(val); 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreetSegment.java (revision 32970) @@ -10,5 +10,5 @@ * sometimes a street is separated into many segments, e. g. due to different speed limits, bridges, etc.. * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmFactory.java (revision 32970) @@ -7,11 +7,15 @@ import org.openstreetmap.josm.data.osm.Way; -public class OsmFactory { +public final class OsmFactory { private static HashMap addressCache = new HashMap<>(); + + private OsmFactory() { + // Hide default constructor for utilities classes + } /** * Creates an address node from an OSM node, if possible. - * @param node - * @return + * @param node OSM node + * @return created address */ public static OSMAddress createNode(Node node) { @@ -34,5 +38,5 @@ /** * Creates an node entity from an OSM way, if possible. - * @param way + * @param way OSM way * @return The new node instance or null; if given way is inappropriate. */ @@ -43,5 +47,5 @@ // Check for building with address - if (way.isClosed() && TagUtils.hasBuildingTag(way) && TagUtils.isAddress(way)) { + if (way.isClosed() && TagUtils.hasBuildingTag(way) && TagUtils.isAddress(way)) { String aid = "" + way.getId(); 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmUtils.java (revision 32970) @@ -17,9 +17,8 @@ import org.openstreetmap.josm.tools.Pair; -// TODO: Auto-generated Javadoc /** * The Class OsmUtils provides some utilities not provided by the OSM data framework. */ -public class OsmUtils { +public final class OsmUtils { /** @@ -39,8 +38,9 @@ */ public static double getMinimumDistanceToWay(LatLon coor, Way w) { - if (coor == null || w == null) return Double.POSITIVE_INFINITY; + if (coor == null || w == null) + return Double.POSITIVE_INFINITY; double minDist = Double.MAX_VALUE; - List> x = w.getNodePairs(true); + List> x = w.getNodePairs(true); for (Pair pair : x) { @@ -126,5 +126,5 @@ if (!StringUtils.isNullOrEmpty(streetName)) { // street name found -> set property - address.setDerivedValue(TagUtils.ADDR_STREET_TAG, streetName); + address.setDerivedValue(TagConstants.ADDR_STREET_TAG, streetName); hasValuesFromRel = true; break; @@ -136,13 +136,13 @@ // Check for other address properties if (TagUtils.hasAddrCityTag(r)) { // city - address.setDerivedValue(TagUtils.ADDR_CITY_TAG, TagUtils.getAddrCityValue(r)); + address.setDerivedValue(TagConstants.ADDR_CITY_TAG, TagUtils.getAddrCityValue(r)); hasValuesFromRel = true; } if (TagUtils.hasAddrCountryTag(r)) { // country - address.setDerivedValue(TagUtils.ADDR_COUNTRY_TAG, TagUtils.getAddrCountryValue(r)); + address.setDerivedValue(TagConstants.ADDR_COUNTRY_TAG, TagUtils.getAddrCountryValue(r)); hasValuesFromRel = true; } if (TagUtils.hasAddrPostcodeTag(r)) { // postcode - address.setDerivedValue(TagUtils.ADDR_POSTCODE_TAG, TagUtils.getAddrPostcodeValue(r)); + address.setDerivedValue(TagConstants.ADDR_POSTCODE_TAG, TagUtils.getAddrPostcodeValue(r)); hasValuesFromRel = true; } @@ -167,9 +167,9 @@ Way w = (Way) osm; if (TagUtils.hasAddrInterpolationTag(w)) { - applyDerivedValue(address, w, TagUtils.ADDR_POSTCODE_TAG); - applyDerivedValue(address, w, TagUtils.ADDR_CITY_TAG); - applyDerivedValue(address, w, TagUtils.ADDR_COUNTRY_TAG); - applyDerivedValue(address, w, TagUtils.ADDR_STREET_TAG); - applyDerivedValue(address, w, TagUtils.ADDR_STATE_TAG); + applyDerivedValue(address, w, TagConstants.ADDR_POSTCODE_TAG); + applyDerivedValue(address, w, TagConstants.ADDR_CITY_TAG); + applyDerivedValue(address, w, TagConstants.ADDR_COUNTRY_TAG); + applyDerivedValue(address, w, TagConstants.ADDR_STREET_TAG); + applyDerivedValue(address, w, TagConstants.ADDR_STATE_TAG); return true; } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/PostalCodeChecker.java (revision 32970) @@ -10,9 +10,13 @@ * The Class PostcodeChecker. */ -public class PostalCodeChecker { +public final class PostalCodeChecker { private static HashMap postalCodePatternMap = new HashMap<>(); static { fillMap(); + } + + private PostalCodeChecker() { + // Hide default constructor for utilities classes } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StringUtils.java (revision 32970) @@ -4,5 +4,10 @@ import java.util.List; -public class StringUtils { +public final class StringUtils { + + private StringUtils() { + // Hide default constructor for utilities classes + } + /** * Checks, if a string is either null or empty. @@ -59,5 +64,6 @@ /* * if (i >= m || j >= n) { l[i][j] = 0; } else - */if (a.charAt(i) == b.charAt(j)) { + */ + if (a.charAt(i) == b.charAt(j)) { l[i][j] = 1 + l[i + 1][j + 1]; } else { @@ -74,5 +80,5 @@ * @param a The first string. * @param b The second string. - * @return + * @return the longest common substring of a and b */ public static String getLongestCommonSubstring(String a, String b) { @@ -102,5 +108,4 @@ } - l = null; return sb.toString(); } @@ -126,10 +131,9 @@ for (String curString : haystack) { int ll = lcsLength(needle, curString); - double ratio = ll / (double)lNeedle; + double ratio = ll / (double) lNeedle; if (ratio > maxRatio) { maxRatio = ratio; bestMatch = curString; } - } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/TagConstants.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/TagConstants.java (revision 32970) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/TagConstants.java (revision 32970) @@ -0,0 +1,137 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.plugins.fixAddresses; + +/** + * 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 <oliver.wieland@online.de> + */ +public final class TagConstants { + static String[] COUNTRIES_REQUIRE_STATE = { + "en_US", /* USA */ + "en_AU" /* Australia */ + }; + + private TagConstants() { + // Hide default constructor for utilities classes + } + + public static final String PARKING_TAG = "parking"; + public static final String SHOP_TAG = "shop"; + public static final String CRAFT_TAG = "craft"; + public static final String SURFACE_TAG = "surface"; + public static final String CUISINE_TAG = "cuisine"; + public static final String WOOD_TAG = "wood"; + public static final String FOOT_TAG = "foot"; + public static final String NAME_DE_TAG = "name:de"; + public static final String NAT_REF_TAG = "nat_ref"; + public static final String NOTE_DE_TAG = "note:de"; + public static final String ADDR_STREET_TAG = "addr:street"; + public static final String TYPE_TAG = "type"; + public static final String ADDR_CITY_TAG = "addr:city"; + public static final String BOUNDARY_TAG = "boundary"; + public static final String SMOOTHNESS_TAG = "smoothness"; + public static final String OPENING_HOURS_TAG = "opening_hours"; + public static final String BICYCLE_TAG = "bicycle"; + public static final String RELIGION_TAG = "religion"; + public static final String BARRIER_TAG = "barrier"; + public static final String POWER_TAG = "power"; + public static final String LANDUSE_TAG = "landuse"; + public static final String FIREPLACE_TAG = "fireplace"; + public static final String INT_REF_TAG = "int_ref"; + public static final String WHITEWATER_SECTION_GRADE_TAG = "whitewater:section_grade"; + public static final String DENOMINATION_TAG = "denomination"; + public static final String ADDR_POSTCODE_TAG = "addr:postcode"; + public static final String WIRES_TAG = "wires"; + public static final String LOC_REF_TAG = "loc_ref"; + public static final String WIDTH_TAG = "width"; + public static final String TOURISM_TAG = "tourism"; + public static final String LEISURE_TAG = "leisure"; + public static final String ELECTRIFIED_TAG = "electrified"; + public static final String JUNCTION_TAG = "junction"; + public static final String RAILWAY_TAG = "railway"; + public static final String VOLTAGE_TAG = "voltage"; + public static final String BRIDGE_TAG = "bridge"; + public static final String MOTOR_VEHICLE_TAG = "motor_vehicle"; + public static final String COMMENT_TAG = "comment"; + public static final String MAXSPEED_TAG = "maxspeed"; + public static final String NATURAL_TAG = "natural"; + public static final String BUILDING_HEIGHT_TAG = "building:height"; + public static final String SAC_SCALE_TAG = "sac_scale"; + public static final String TUNNEL_TAG = "tunnel"; + public static final String WATERWAY_TAG = "waterway"; + public static final String TRAIL_VISIBILITY_TAG = "trail_visibility"; + public static final String HIGHWAY_TAG = "highway"; + public static final String VEHICLE_TAG = "vehicle"; + public static final String HORSE_TAG = "horse"; + public static final String GOODS_TAG = "goods"; + public static final String FREQUENCY_TAG = "frequency"; + public static final String MAN_MADE_TAG = "man_made"; + public static final String ADDR_HOUSENUMBER_TAG = "addr:housenumber"; + public static final String AREA_TAG = "area"; + public static final String BUILDING_LEVELS_TAG = "building:levels"; + public static final String WHEELCHAIR_TAG = "wheelchair"; + public static final String NAME_TAG = "name"; + public static final String ONEWAY_TAG = "oneway"; + public static final String FIXME_TAG = "FIXME"; + public static final String CAPACITY_TAG = "capacity"; + public static final String MOTORCYCLE_TAG = "motorcycle"; + public static final String HGV_TAG = "hgv"; + public static final String CONSTRUCTION_TAG = "construction"; + public static final String ADDR_STATE_TAG = "addr:state"; + public static final String LANES_TAG = "lanes"; + public static final String NOTE_TAG = "note"; + public static final String LIT_TAG = "lit"; + public static final String BUILDING_TAG = "building"; + public static final String SEGREGATED_TAG = "segregated"; + public static final String ADDR_INCLUSION_TAG = "addr:inclusion"; + public static final String LAYER_TAG = "layer"; + public static final String SPORT_TAG = "sport"; + public static final String ADDR_INTERPOLATION_TAG = "addr:interpolation"; + public static final String CUTTING_TAG = "cutting"; + public static final String AMENITY_TAG = "amenity"; + public static final String ACCESS_TAG = "access"; + public static final String AGRICULTURAL_TAG = "agricultural"; + public static final String CAPACITY_DISABLED_TAG = "capacity:disabled"; + public static final String OPERATOR_TAG = "operator"; + public static final String REF_TAG = "ref"; + public static final String NOEXIT_TAG = "noexit"; + public static final String ADMIN_LEVEL_TAG = "admin_level"; + public static final String SOURCE_TAG = "source"; + public static final String TRACKTYPE_TAG = "tracktype"; + public static final String ADDR_COUNTRY_TAG = "addr:country"; + public static final String ROUTE_TAG = "route"; + public static final String CABLES_TAG = "cables"; + public static final String SERVICE_TAG = "service"; + public static final String MOTORCAR_TAG = "motorcar"; + public static final String WHITEWATER_TAG = "whitewater"; + 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"; + public static final String HIGHWAY_FOOTWAY_VALUE = "footway"; + public static final String HIGHWAY_MOTORWAY_LINK_VALUE = "motorway_link"; + public static final String HIGHWAY_MOTORWAY_VALUE = "motorway"; + public static final String HIGHWAY_PATH_VALUE = "path"; + public static final String HIGHWAY_RESIDENTIAL_VALUE = "residential"; + public static final String HIGHWAY_LIVING_STREET_VALUE = "living_street"; + public static final String HIGHWAY_ROAD_VALUE = "road"; + public static final String HIGHWAY_SECONDARY_VALUE = "secondary"; + public static final String HIGHWAY_SERVICE_VALUE = "service"; + public static final String HIGHWAY_STEPS_VALUE = "steps"; + public static final String HIGHWAY_TERTIARY_VALUE = "tertiary"; + public static final String HIGHWAY_TRACK_VALUE = "track"; + public static final String HIGHWAY_TRUNK_LINK_VALUE = "trunk_link"; + public static final String HIGHWAY_TRUNK_VALUE = "trunk"; + public static final String HIGHWAY_UNCLASSIFIED_VALUE = "unclassified"; + + /* Relation keys */ + + // Associated street: See http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern + public static final String RELATION_TYPE = "type"; + public static final String ASSOCIATEDSTREET_RELATION_TYPE = "associatedStreet"; + public static final String STREET_RELATION_ROLE = "street"; + public static final String HOUSE_RELATION_ROLE = "house"; +} 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/TagUtils.java (revision 32970) @@ -1,4 +1,99 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.fixAddresses; + +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ACCESS_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ADDR_CITY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ADDR_COUNTRY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ADDR_HOUSENAME_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ADDR_HOUSENUMBER_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ADDR_INCLUSION_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ADDR_INTERPOLATION_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ADDR_POSTCODE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ADDR_STATE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ADDR_STREET_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ADMIN_LEVEL_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.AGRICULTURAL_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.AMENITY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.AREA_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ASSOCIATEDSTREET_RELATION_TYPE; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.BARRIER_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.BICYCLE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.BOUNDARY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.BRIDGE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.BUILDING_LEVELS_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.BUILDING_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.CABLES_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.CAPACITY_DISABLED_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.CAPACITY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.COMMENT_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.CONSTRUCTION_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.COUNTRIES_REQUIRE_STATE; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.CRAFT_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.CUISINE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.CUTTING_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.DENOMINATION_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ELECTRIFIED_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.EMBANKMENT_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.FIREPLACE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.FIXME_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.FOOT_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.FREQUENCY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.GOODS_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.HGV_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.HIGHWAY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.HORSE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.INT_REF_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.JUNCTION_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.LANDUSE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.LANES_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.LAYER_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.LEISURE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.LIT_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.LOC_REF_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.MAN_MADE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.MAXSPEED_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.MOTORCAR_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.MOTORCYCLE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.MOTOR_VEHICLE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.NAME_DE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.NAME_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.NATURAL_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.NAT_REF_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.NOEXIT_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.NOTE_DE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.NOTE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ONEWAY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.OPENING_HOURS_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.OPERATOR_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.PARKING_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.POWER_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.RAILWAY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.REF_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.RELATION_TYPE; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.RELIGION_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.ROUTE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.SAC_SCALE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.SEGREGATED_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.SERVICE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.SHOP_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.SMOOTHNESS_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.SOURCE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.SPORT_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.STREET_RELATION_ROLE; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.SURFACE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.TOURISM_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.TRACKTYPE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.TRAIL_VISIBILITY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.TUNNEL_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.TYPE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.VEHICLE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.VOLTAGE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.WATERWAY_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.WHEELCHAIR_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.WHITEWATER_SECTION_GRADE_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.WHITEWATER_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.WIDTH_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.WIRES_TAG; +import static org.openstreetmap.josm.plugins.fixAddresses.TagConstants.WOOD_TAG; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -7,20 +102,20 @@ import org.openstreetmap.josm.data.osm.Way; +// CHECKSTYLE.OFF: MethodCountCheck + /** * 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 - * + * @author Oliver Wieland <oliver.wieland@online.de> */ public final class TagUtils { - private static String COUNTRIES_REQUIRE_STATE[] = { - "en_US", /* USA */ - "en_AU" /* Australia */ - }; + + private TagUtils() { + // Hide default constructor for utilities classes + } /** * Checks if the given OSM object has a (non-empty) value for the given tag. - * * @param osm the osm object to inspect. * @param tag the tag to look for. @@ -33,17 +128,15 @@ /** * Checks if the given OSM primitive is an address node. - * @return + * @return {@code true} if the given OSM primitive is an address node */ public static boolean isAddress(OsmPrimitive osmObject) { - return TagUtils.hasAddrCityTag(osmObject) || TagUtils.hasAddrCountryTag(osmObject) || - TagUtils.hasAddrHousenumberTag(osmObject) || TagUtils.hasAddrPostcodeTag(osmObject) || - TagUtils.hasAddrStateTag(osmObject) || TagUtils.hasAddrStreetTag(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. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasParkingTag(OsmPrimitive osmPrimitive) { @@ -53,7 +146,5 @@ /** * Gets the value of tag 'parking'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getParkingValue(OsmPrimitive osmPrimitive) { @@ -63,7 +154,5 @@ /** * Check if OSM primitive has a tag 'shop'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasShopTag(OsmPrimitive osmPrimitive) { @@ -73,7 +162,5 @@ /** * Gets the value of tag 'shop'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getShopValue(OsmPrimitive osmPrimitive) { @@ -83,7 +170,5 @@ /** * Check if OSM primitive has a tag 'craft'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasCraftTag(OsmPrimitive osmPrimitive) { @@ -93,7 +178,5 @@ /** * Gets the value of tag 'craft'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getCraftValue(OsmPrimitive osmPrimitive) { @@ -103,7 +186,5 @@ /** * Check if OSM primitive has a tag 'surface'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasSurfaceTag(OsmPrimitive osmPrimitive) { @@ -113,7 +194,5 @@ /** * Gets the value of tag 'surface'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getSurfaceValue(OsmPrimitive osmPrimitive) { @@ -123,7 +202,5 @@ /** * Check if OSM primitive has a tag 'cuisine'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasCuisineTag(OsmPrimitive osmPrimitive) { @@ -133,7 +210,5 @@ /** * Gets the value of tag 'cuisine'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getCuisineValue(OsmPrimitive osmPrimitive) { @@ -143,7 +218,5 @@ /** * Check if OSM primitive has a tag 'wood'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasWoodTag(OsmPrimitive osmPrimitive) { @@ -153,7 +226,5 @@ /** * Gets the value of tag 'wood'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getWoodValue(OsmPrimitive osmPrimitive) { @@ -163,7 +234,5 @@ /** * Check if OSM primitive has a tag 'foot'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasFootTag(OsmPrimitive osmPrimitive) { @@ -173,7 +242,5 @@ /** * Gets the value of tag 'foot'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getFootValue(OsmPrimitive osmPrimitive) { @@ -183,7 +250,5 @@ /** * Check if OSM primitive has a tag 'name:de'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasNameDeTag(OsmPrimitive osmPrimitive) { @@ -193,7 +258,5 @@ /** * Gets the value of tag 'name:de'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getNameDeValue(OsmPrimitive osmPrimitive) { @@ -203,7 +266,5 @@ /** * Check if OSM primitive has a tag 'nat_ref'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasNatRefTag(OsmPrimitive osmPrimitive) { @@ -213,7 +274,5 @@ /** * Gets the value of tag 'nat_ref'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getNatRefValue(OsmPrimitive osmPrimitive) { @@ -223,7 +282,5 @@ /** * Check if OSM primitive has a tag 'note:de'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasNoteDeTag(OsmPrimitive osmPrimitive) { @@ -233,7 +290,5 @@ /** * Gets the value of tag 'note:de'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getNoteDeValue(OsmPrimitive osmPrimitive) { @@ -243,7 +298,5 @@ /** * Check if OSM primitive has a tag 'addr:street'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAddrStreetTag(OsmPrimitive osmPrimitive) { @@ -254,7 +307,5 @@ /** * Gets the value of tag 'addr:street'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAddrStreetValue(OsmPrimitive osmPrimitive) { @@ -264,7 +315,5 @@ /** * Check if OSM primitive has a tag 'type'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasTypeTag(OsmPrimitive osmPrimitive) { @@ -274,7 +323,5 @@ /** * Gets the value of tag 'type'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getTypeValue(OsmPrimitive osmPrimitive) { @@ -284,7 +331,5 @@ /** * Check if OSM primitive has a tag 'addr:city'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAddrCityTag(OsmPrimitive osmPrimitive) { @@ -295,7 +340,5 @@ /** * Gets the value of tag 'addr:city'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAddrCityValue(OsmPrimitive osmPrimitive) { @@ -305,7 +348,5 @@ /** * Check if OSM primitive has a tag 'boundary'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasBoundaryTag(OsmPrimitive osmPrimitive) { @@ -315,7 +356,5 @@ /** * Gets the value of tag 'boundary'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getBoundaryValue(OsmPrimitive osmPrimitive) { @@ -325,7 +364,5 @@ /** * Check if OSM primitive has a tag 'smoothness'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasSmoothnessTag(OsmPrimitive osmPrimitive) { @@ -336,7 +373,5 @@ /** * Gets the value of tag 'smoothness'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getSmoothnessValue(OsmPrimitive osmPrimitive) { @@ -346,7 +381,5 @@ /** * Check if OSM primitive has a tag 'opening_hours'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasOpeningHoursTag(OsmPrimitive osmPrimitive) { @@ -357,7 +390,5 @@ /** * Gets the value of tag 'opening_hours'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getOpeningHoursValue(OsmPrimitive osmPrimitive) { @@ -368,7 +399,5 @@ /** * Check if OSM primitive has a tag 'bicycle'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasBicycleTag(OsmPrimitive osmPrimitive) { @@ -378,7 +407,5 @@ /** * Gets the value of tag 'bicycle'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getBicycleValue(OsmPrimitive osmPrimitive) { @@ -388,7 +415,5 @@ /** * Check if OSM primitive has a tag 'religion'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasReligionTag(OsmPrimitive osmPrimitive) { @@ -398,7 +423,5 @@ /** * Gets the value of tag 'religion'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getReligionValue(OsmPrimitive osmPrimitive) { @@ -408,7 +431,5 @@ /** * Check if OSM primitive has a tag 'barrier'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasBarrierTag(OsmPrimitive osmPrimitive) { @@ -418,7 +439,5 @@ /** * Gets the value of tag 'barrier'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getBarrierValue(OsmPrimitive osmPrimitive) { @@ -428,7 +447,5 @@ /** * Check if OSM primitive has a tag 'power'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasPowerTag(OsmPrimitive osmPrimitive) { @@ -438,7 +455,5 @@ /** * Gets the value of tag 'power'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getPowerValue(OsmPrimitive osmPrimitive) { @@ -448,7 +463,5 @@ /** * Check if OSM primitive has a tag 'landuse'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasLanduseTag(OsmPrimitive osmPrimitive) { @@ -458,7 +471,5 @@ /** * Gets the value of tag 'landuse'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getLanduseValue(OsmPrimitive osmPrimitive) { @@ -468,7 +479,5 @@ /** * Check if OSM primitive has a tag 'fireplace'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasFireplaceTag(OsmPrimitive osmPrimitive) { @@ -479,7 +488,5 @@ /** * Gets the value of tag 'fireplace'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getFireplaceValue(OsmPrimitive osmPrimitive) { @@ -489,7 +496,5 @@ /** * Check if OSM primitive has a tag 'int_ref'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasIntRefTag(OsmPrimitive osmPrimitive) { @@ -499,7 +504,5 @@ /** * Gets the value of tag 'int_ref'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getIntRefValue(OsmPrimitive osmPrimitive) { @@ -509,18 +512,13 @@ /** * Check if OSM primitive has a tag 'whitewater:section_grade'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasWhitewaterSectionGradeTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive - .hasKey(WHITEWATER_SECTION_GRADE_TAG) : false; + return osmPrimitive != null ? osmPrimitive.hasKey(WHITEWATER_SECTION_GRADE_TAG) : false; } /** * Gets the value of tag 'whitewater:section_grade'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getWhitewaterSectionGradeValue( @@ -532,18 +530,13 @@ /** * Check if OSM primitive has a tag 'denomination'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasDenominationTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(DENOMINATION_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(DENOMINATION_TAG) : false; } /** * Gets the value of tag 'denomination'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getDenominationValue(OsmPrimitive osmPrimitive) { @@ -553,29 +546,21 @@ /** * Check if OSM primitive has a tag 'addr:postcode'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAddrPostcodeTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_POSTCODE_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_POSTCODE_TAG) : false; } /** * Gets the value of tag 'addr:postcode'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAddrPostcodeValue(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.get(ADDR_POSTCODE_TAG) - : null; + return osmPrimitive != null ? osmPrimitive.get(ADDR_POSTCODE_TAG) : null; } /** * Check if OSM primitive has a tag 'wires'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasWiresTag(OsmPrimitive osmPrimitive) { @@ -585,7 +570,5 @@ /** * Gets the value of tag 'wires'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getWiresValue(OsmPrimitive osmPrimitive) { @@ -595,7 +578,5 @@ /** * Check if OSM primitive has a tag 'loc_ref'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasLocRefTag(OsmPrimitive osmPrimitive) { @@ -605,7 +586,5 @@ /** * Gets the value of tag 'loc_ref'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getLocRefValue(OsmPrimitive osmPrimitive) { @@ -615,7 +594,5 @@ /** * Check if OSM primitive has a tag 'width'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasWidthTag(OsmPrimitive osmPrimitive) { @@ -625,7 +602,5 @@ /** * Gets the value of tag 'width'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getWidthValue(OsmPrimitive osmPrimitive) { @@ -635,7 +610,5 @@ /** * Check if OSM primitive has a tag 'tourism'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasTourismTag(OsmPrimitive osmPrimitive) { @@ -645,7 +618,5 @@ /** * Gets the value of tag 'tourism'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getTourismValue(OsmPrimitive osmPrimitive) { @@ -655,7 +626,5 @@ /** * Check if OSM primitive has a tag 'leisure'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasLeisureTag(OsmPrimitive osmPrimitive) { @@ -665,7 +634,5 @@ /** * Gets the value of tag 'leisure'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getLeisureValue(OsmPrimitive osmPrimitive) { @@ -675,11 +642,8 @@ /** * Check if OSM primitive has a tag 'electrified'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasElectrifiedTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(ELECTRIFIED_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(ELECTRIFIED_TAG) : false; } @@ -687,6 +651,5 @@ * Gets the value of tag 'electrified'. * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getElectrifiedValue(OsmPrimitive osmPrimitive) { @@ -696,7 +659,5 @@ /** * Check if OSM primitive has a tag 'junction'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasJunctionTag(OsmPrimitive osmPrimitive) { @@ -706,7 +667,5 @@ /** * Gets the value of tag 'junction'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getJunctionValue(OsmPrimitive osmPrimitive) { @@ -716,7 +675,5 @@ /** * Check if OSM primitive has a tag 'railway'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasRailwayTag(OsmPrimitive osmPrimitive) { @@ -726,7 +683,5 @@ /** * Gets the value of tag 'railway'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getRailwayValue(OsmPrimitive osmPrimitive) { @@ -736,7 +691,5 @@ /** * Check if OSM primitive has a tag 'voltage'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasVoltageTag(OsmPrimitive osmPrimitive) { @@ -746,7 +699,5 @@ /** * Gets the value of tag 'voltage'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getVoltageValue(OsmPrimitive osmPrimitive) { @@ -756,7 +707,5 @@ /** * Check if OSM primitive has a tag 'bridge'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasBridgeTag(OsmPrimitive osmPrimitive) { @@ -766,7 +715,5 @@ /** * Gets the value of tag 'bridge'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getBridgeValue(OsmPrimitive osmPrimitive) { @@ -776,29 +723,21 @@ /** * Check if OSM primitive has a tag 'motor_vehicle'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasMotorVehicleTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(MOTOR_VEHICLE_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(MOTOR_VEHICLE_TAG) : false; } /** * Gets the value of tag 'motor_vehicle'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getMotorVehicleValue(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.get(MOTOR_VEHICLE_TAG) - : null; + return osmPrimitive != null ? osmPrimitive.get(MOTOR_VEHICLE_TAG) : null; } /** * Check if OSM primitive has a tag 'comment'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasCommentTag(OsmPrimitive osmPrimitive) { @@ -808,7 +747,5 @@ /** * Gets the value of tag 'comment'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getCommentValue(OsmPrimitive osmPrimitive) { @@ -818,7 +755,5 @@ /** * Check if OSM primitive has a tag 'maxspeed'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasMaxspeedTag(OsmPrimitive osmPrimitive) { @@ -828,7 +763,5 @@ /** * Gets the value of tag 'maxspeed'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getMaxspeedValue(OsmPrimitive osmPrimitive) { @@ -838,7 +771,5 @@ /** * Check if OSM primitive has a tag 'natural'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasNaturalTag(OsmPrimitive osmPrimitive) { @@ -848,7 +779,5 @@ /** * Gets the value of tag 'natural'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getNaturalValue(OsmPrimitive osmPrimitive) { @@ -858,18 +787,13 @@ /** * Check if OSM primitive has a tag 'sac_scale'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasSacScaleTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(SAC_SCALE_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(SAC_SCALE_TAG) : false; } /** * Gets the value of tag 'sac_scale'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getSacScaleValue(OsmPrimitive osmPrimitive) { @@ -879,7 +803,5 @@ /** * Check if OSM primitive has a tag 'tunnel'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasTunnelTag(OsmPrimitive osmPrimitive) { @@ -889,7 +811,5 @@ /** * Gets the value of tag 'tunnel'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getTunnelValue(OsmPrimitive osmPrimitive) { @@ -899,7 +819,5 @@ /** * Check if OSM primitive has a tag 'waterway'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasWaterwayTag(OsmPrimitive osmPrimitive) { @@ -909,7 +827,5 @@ /** * Gets the value of tag 'waterway'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getWaterwayValue(OsmPrimitive osmPrimitive) { @@ -919,29 +835,21 @@ /** * Check if OSM primitive has a tag 'trail_visibility'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasTrailVisibilityTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(TRAIL_VISIBILITY_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(TRAIL_VISIBILITY_TAG) : false; } /** * Gets the value of tag 'trail_visibility'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getTrailVisibilityValue(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.get(TRAIL_VISIBILITY_TAG) - : null; + return osmPrimitive != null ? osmPrimitive.get(TRAIL_VISIBILITY_TAG) : null; } /** * Check if OSM primitive has a tag 'highway'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasHighwayTag(OsmPrimitive osmPrimitive) { @@ -951,7 +859,5 @@ /** * Gets the value of tag 'highway'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getHighwayValue(OsmPrimitive osmPrimitive) { @@ -961,7 +867,5 @@ /** * Check if OSM primitive has a tag 'vehicle'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasVehicleTag(OsmPrimitive osmPrimitive) { @@ -971,7 +875,5 @@ /** * Gets the value of tag 'vehicle'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getVehicleValue(OsmPrimitive osmPrimitive) { @@ -981,7 +883,5 @@ /** * Check if OSM primitive has a tag 'horse'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasHorseTag(OsmPrimitive osmPrimitive) { @@ -991,7 +891,5 @@ /** * Gets the value of tag 'horse'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getHorseValue(OsmPrimitive osmPrimitive) { @@ -1001,7 +899,5 @@ /** * Check if OSM primitive has a tag 'goods'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasGoodsTag(OsmPrimitive osmPrimitive) { @@ -1011,7 +907,5 @@ /** * Gets the value of tag 'goods'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getGoodsValue(OsmPrimitive osmPrimitive) { @@ -1021,18 +915,13 @@ /** * Check if OSM primitive has a tag 'frequency'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasFrequencyTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(FREQUENCY_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(FREQUENCY_TAG) : false; } /** * Gets the value of tag 'frequency'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getFrequencyValue(OsmPrimitive osmPrimitive) { @@ -1042,7 +931,5 @@ /** * Check if OSM primitive has a tag 'man_made'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasManMadeTag(OsmPrimitive osmPrimitive) { @@ -1052,7 +939,5 @@ /** * Gets the value of tag 'man_made'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getManMadeValue(OsmPrimitive osmPrimitive) { @@ -1062,51 +947,37 @@ /** * Check if OSM primitive has a tag 'addr:housenumber'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAddrHousenumberTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_HOUSENUMBER_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_HOUSENUMBER_TAG) : false; } /** * Gets the value of tag 'addr:housenumber'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAddrHousenumberValue(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.get(ADDR_HOUSENUMBER_TAG) - : null; + return osmPrimitive != null ? osmPrimitive.get(ADDR_HOUSENUMBER_TAG) : null; } /** * Check if OSM primitive has a tag 'addr:housename'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAddrHousenameTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_HOUSENAME_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_HOUSENAME_TAG) : false; } /** * Gets the value of tag 'addr:housename'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAddrHousenameValue(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.get(ADDR_HOUSENAME_TAG) - : null; + return osmPrimitive != null ? osmPrimitive.get(ADDR_HOUSENAME_TAG) : null; } /** * Check if OSM primitive has a tag 'area'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAreaTag(OsmPrimitive osmPrimitive) { @@ -1116,7 +987,5 @@ /** * Gets the value of tag 'area'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAreaValue(OsmPrimitive osmPrimitive) { @@ -1126,40 +995,29 @@ /** * Check if OSM primitive has a tag 'building:levels'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasBuildingLevelsTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(BUILDING_LEVELS_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(BUILDING_LEVELS_TAG) : false; } /** * Gets the value of tag 'building:levels'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getBuildingLevelsValue(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.get(BUILDING_LEVELS_TAG) - : null; + return osmPrimitive != null ? osmPrimitive.get(BUILDING_LEVELS_TAG) : null; } /** * Check if OSM primitive has a tag 'wheelchair'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasWheelchairTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(WHEELCHAIR_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(WHEELCHAIR_TAG) : false; } /** * Gets the value of tag 'wheelchair'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getWheelchairValue(OsmPrimitive osmPrimitive) { @@ -1169,7 +1027,5 @@ /** * Check if OSM primitive has a tag 'name'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasNameTag(OsmPrimitive osmPrimitive) { @@ -1179,7 +1035,5 @@ /** * Gets the value of tag 'name'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getNameValue(OsmPrimitive osmPrimitive) { @@ -1189,7 +1043,5 @@ /** * Check if OSM primitive has a tag 'oneway'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasOnewayTag(OsmPrimitive osmPrimitive) { @@ -1199,7 +1051,5 @@ /** * Gets the value of tag 'oneway'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getOnewayValue(OsmPrimitive osmPrimitive) { @@ -1209,7 +1059,5 @@ /** * Check if OSM primitive has a tag 'FIXME'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasFIXMETag(OsmPrimitive osmPrimitive) { @@ -1219,7 +1067,5 @@ /** * Gets the value of tag 'FIXME'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getFIXMEValue(OsmPrimitive osmPrimitive) { @@ -1229,7 +1075,5 @@ /** * Check if OSM primitive has a tag 'capacity'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasCapacityTag(OsmPrimitive osmPrimitive) { @@ -1239,7 +1083,5 @@ /** * Gets the value of tag 'capacity'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getCapacityValue(OsmPrimitive osmPrimitive) { @@ -1249,18 +1091,13 @@ /** * Check if OSM primitive has a tag 'motorcycle'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasMotorcycleTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(MOTORCYCLE_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(MOTORCYCLE_TAG) : false; } /** * Gets the value of tag 'motorcycle'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getMotorcycleValue(OsmPrimitive osmPrimitive) { @@ -1270,7 +1107,5 @@ /** * Check if OSM primitive has a tag 'hgv'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasHgvTag(OsmPrimitive osmPrimitive) { @@ -1280,7 +1115,5 @@ /** * Gets the value of tag 'hgv'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getHgvValue(OsmPrimitive osmPrimitive) { @@ -1290,18 +1123,13 @@ /** * Check if OSM primitive has a tag 'construction'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasConstructionTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(CONSTRUCTION_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(CONSTRUCTION_TAG) : false; } /** * Gets the value of tag 'construction'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getConstructionValue(OsmPrimitive osmPrimitive) { @@ -1311,18 +1139,13 @@ /** * Check if OSM primitive has a tag 'addr:state'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAddrStateTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_STATE_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_STATE_TAG) : false; } /** * Gets the value of tag 'addr:state'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAddrStateValue(OsmPrimitive osmPrimitive) { @@ -1332,7 +1155,5 @@ /** * Check if OSM primitive has a tag 'lanes'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasLanesTag(OsmPrimitive osmPrimitive) { @@ -1342,7 +1163,5 @@ /** * Gets the value of tag 'lanes'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getLanesValue(OsmPrimitive osmPrimitive) { @@ -1352,7 +1171,5 @@ /** * Check if OSM primitive has a tag 'note'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasNoteTag(OsmPrimitive osmPrimitive) { @@ -1362,7 +1179,5 @@ /** * Gets the value of tag 'note'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getNoteValue(OsmPrimitive osmPrimitive) { @@ -1372,7 +1187,5 @@ /** * Check if OSM primitive has a tag 'lit'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasLitTag(OsmPrimitive osmPrimitive) { @@ -1382,7 +1195,5 @@ /** * Gets the value of tag 'lit'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getLitValue(OsmPrimitive osmPrimitive) { @@ -1392,7 +1203,5 @@ /** * Check if OSM primitive has a tag 'building'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasBuildingTag(OsmPrimitive osmPrimitive) { @@ -1402,7 +1211,5 @@ /** * Gets the value of tag 'building'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getBuildingValue(OsmPrimitive osmPrimitive) { @@ -1412,18 +1219,13 @@ /** * Check if OSM primitive has a tag 'segregated'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasSegregatedTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(SEGREGATED_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(SEGREGATED_TAG) : false; } /** * Gets the value of tag 'segregated'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getSegregatedValue(OsmPrimitive osmPrimitive) { @@ -1433,29 +1235,21 @@ /** * Check if OSM primitive has a tag 'addr:inclusion'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAddrInclusionTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_INCLUSION_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_INCLUSION_TAG) : false; } /** * Gets the value of tag 'addr:inclusion'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAddrInclusionValue(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.get(ADDR_INCLUSION_TAG) - : null; + return osmPrimitive != null ? osmPrimitive.get(ADDR_INCLUSION_TAG) : null; } /** * Check if OSM primitive has a tag 'layer'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasLayerTag(OsmPrimitive osmPrimitive) { @@ -1465,7 +1259,5 @@ /** * Gets the value of tag 'layer'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getLayerValue(OsmPrimitive osmPrimitive) { @@ -1475,7 +1267,5 @@ /** * Check if OSM primitive has a tag 'sport'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasSportTag(OsmPrimitive osmPrimitive) { @@ -1485,7 +1275,5 @@ /** * Gets the value of tag 'sport'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getSportValue(OsmPrimitive osmPrimitive) { @@ -1495,29 +1283,21 @@ /** * Check if OSM primitive has a tag 'addr:interpolation'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAddrInterpolationTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive - .hasKey(ADDR_INTERPOLATION_TAG) : false; + return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_INTERPOLATION_TAG) : false; } /** * Gets the value of tag 'addr:interpolation'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAddrInterpolationValue(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.get(ADDR_INTERPOLATION_TAG) - : null; + return osmPrimitive != null ? osmPrimitive.get(ADDR_INTERPOLATION_TAG) : null; } /** * Check if OSM primitive has a tag 'cutting'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasCuttingTag(OsmPrimitive osmPrimitive) { @@ -1527,7 +1307,5 @@ /** * Gets the value of tag 'cutting'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getCuttingValue(OsmPrimitive osmPrimitive) { @@ -1537,7 +1315,5 @@ /** * Check if OSM primitive has a tag 'amenity'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAmenityTag(OsmPrimitive osmPrimitive) { @@ -1547,7 +1323,5 @@ /** * Gets the value of tag 'amenity'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAmenityValue(OsmPrimitive osmPrimitive) { @@ -1557,7 +1331,5 @@ /** * Check if OSM primitive has a tag 'access'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAccessTag(OsmPrimitive osmPrimitive) { @@ -1567,7 +1339,5 @@ /** * Gets the value of tag 'access'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAccessValue(OsmPrimitive osmPrimitive) { @@ -1577,7 +1347,5 @@ /** * Check if OSM primitive has a tag 'agricultural'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAgriculturalTag(OsmPrimitive osmPrimitive) { @@ -1588,7 +1356,5 @@ /** * Gets the value of tag 'agricultural'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAgriculturalValue(OsmPrimitive osmPrimitive) { @@ -1598,7 +1364,5 @@ /** * Check if OSM primitive has a tag 'capacity:disabled'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasCapacityDisabledTag(OsmPrimitive osmPrimitive) { @@ -1609,18 +1373,13 @@ /** * Gets the value of tag 'capacity:disabled'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getCapacityDisabledValue(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.get(CAPACITY_DISABLED_TAG) - : null; + return osmPrimitive != null ? osmPrimitive.get(CAPACITY_DISABLED_TAG) : null; } /** * Check if OSM primitive has a tag 'operator'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasOperatorTag(OsmPrimitive osmPrimitive) { @@ -1630,7 +1389,5 @@ /** * Gets the value of tag 'operator'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getOperatorValue(OsmPrimitive osmPrimitive) { @@ -1640,7 +1397,5 @@ /** * Check if OSM primitive has a tag 'ref'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasRefTag(OsmPrimitive osmPrimitive) { @@ -1650,7 +1405,5 @@ /** * Gets the value of tag 'ref'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getRefValue(OsmPrimitive osmPrimitive) { @@ -1660,7 +1413,5 @@ /** * Check if OSM primitive has a tag 'noexit'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasNoexitTag(OsmPrimitive osmPrimitive) { @@ -1670,7 +1421,5 @@ /** * Gets the value of tag 'noexit'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getNoexitValue(OsmPrimitive osmPrimitive) { @@ -1680,18 +1429,13 @@ /** * Check if OSM primitive has a tag 'admin_level'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAdminLevelTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(ADMIN_LEVEL_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(ADMIN_LEVEL_TAG) : false; } /** * Gets the value of tag 'admin_level'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAdminLevelValue(OsmPrimitive osmPrimitive) { @@ -1701,7 +1445,5 @@ /** * Check if OSM primitive has a tag 'source'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasSourceTag(OsmPrimitive osmPrimitive) { @@ -1711,7 +1453,5 @@ /** * Gets the value of tag 'source'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getSourceValue(OsmPrimitive osmPrimitive) { @@ -1721,18 +1461,13 @@ /** * Check if OSM primitive has a tag 'tracktype'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasTracktypeTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(TRACKTYPE_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(TRACKTYPE_TAG) : false; } /** * Gets the value of tag 'tracktype'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getTracktypeValue(OsmPrimitive osmPrimitive) { @@ -1742,18 +1477,13 @@ /** * Check if OSM primitive has a tag 'addr:country'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasAddrCountryTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_COUNTRY_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_COUNTRY_TAG) : false; } /** * Gets the value of tag 'addr:country'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getAddrCountryValue(OsmPrimitive osmPrimitive) { @@ -1763,7 +1493,5 @@ /** * Check if OSM primitive has a tag 'route'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasRouteTag(OsmPrimitive osmPrimitive) { @@ -1773,7 +1501,5 @@ /** * Gets the value of tag 'route'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getRouteValue(OsmPrimitive osmPrimitive) { @@ -1783,7 +1509,5 @@ /** * Check if OSM primitive has a tag 'cables'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasCablesTag(OsmPrimitive osmPrimitive) { @@ -1793,7 +1517,5 @@ /** * Gets the value of tag 'cables'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getCablesValue(OsmPrimitive osmPrimitive) { @@ -1803,7 +1525,5 @@ /** * Check if OSM primitive has a tag 'service'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasServiceTag(OsmPrimitive osmPrimitive) { @@ -1813,7 +1533,5 @@ /** * Gets the value of tag 'service'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getServiceValue(OsmPrimitive osmPrimitive) { @@ -1823,7 +1541,5 @@ /** * Check if OSM primitive has a tag 'motorcar'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasMotorcarTag(OsmPrimitive osmPrimitive) { @@ -1833,7 +1549,5 @@ /** * Gets the value of tag 'motorcar'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getMotorcarValue(OsmPrimitive osmPrimitive) { @@ -1843,18 +1557,13 @@ /** * Check if OSM primitive has a tag 'whitewater'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasWhitewaterTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(WHITEWATER_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(WHITEWATER_TAG) : false; } /** * Gets the value of tag 'whitewater'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getWhitewaterValue(OsmPrimitive osmPrimitive) { @@ -1864,18 +1573,13 @@ /** * Check if OSM primitive has a tag 'embankment'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean hasEmbankmentTag(OsmPrimitive osmPrimitive) { - return osmPrimitive != null ? osmPrimitive.hasKey(EMBANKMENT_TAG) - : false; + return osmPrimitive != null ? osmPrimitive.hasKey(EMBANKMENT_TAG) : false; } /** * Gets the value of tag 'embankment'. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static String getEmbankmentValue(OsmPrimitive osmPrimitive) { @@ -1913,7 +1617,5 @@ /** * Check if OSM relation is a 'associatedStreet' relation. - * - * @param osmPrimitive - * The OSM entity to check. + * @param osmPrimitive The OSM entity to check. */ public static boolean isAssociatedStreetRelation(Relation rel) { @@ -1925,5 +1627,4 @@ /** * Checks if given relation member has role "street". - * * @param relMember the relation member * @return true, if is street member @@ -1935,5 +1636,4 @@ /** * Checks if given relation member has role "house". - * * @param relMember the relation member * @return true, if is street member @@ -1945,5 +1645,4 @@ /** * Checks if "addr:state" tag is required. - * * @return true, if is state required */ @@ -1959,121 +1658,3 @@ return false; } - - public static final String PARKING_TAG = "parking"; - public static final String SHOP_TAG = "shop"; - public static final String CRAFT_TAG = "craft"; - public static final String SURFACE_TAG = "surface"; - public static final String CUISINE_TAG = "cuisine"; - public static final String WOOD_TAG = "wood"; - public static final String FOOT_TAG = "foot"; - public static final String NAME_DE_TAG = "name:de"; - public static final String NAT_REF_TAG = "nat_ref"; - public static final String NOTE_DE_TAG = "note:de"; - public static final String ADDR_STREET_TAG = "addr:street"; - public static final String TYPE_TAG = "type"; - public static final String ADDR_CITY_TAG = "addr:city"; - public static final String BOUNDARY_TAG = "boundary"; - public static final String SMOOTHNESS_TAG = "smoothness"; - public static final String OPENING_HOURS_TAG = "opening_hours"; - public static final String BICYCLE_TAG = "bicycle"; - public static final String RELIGION_TAG = "religion"; - public static final String BARRIER_TAG = "barrier"; - public static final String POWER_TAG = "power"; - public static final String LANDUSE_TAG = "landuse"; - public static final String FIREPLACE_TAG = "fireplace"; - public static final String INT_REF_TAG = "int_ref"; - public static final String WHITEWATER_SECTION_GRADE_TAG = "whitewater:section_grade"; - public static final String DENOMINATION_TAG = "denomination"; - public static final String ADDR_POSTCODE_TAG = "addr:postcode"; - public static final String WIRES_TAG = "wires"; - public static final String LOC_REF_TAG = "loc_ref"; - public static final String WIDTH_TAG = "width"; - public static final String TOURISM_TAG = "tourism"; - public static final String LEISURE_TAG = "leisure"; - public static final String ELECTRIFIED_TAG = "electrified"; - public static final String JUNCTION_TAG = "junction"; - public static final String RAILWAY_TAG = "railway"; - public static final String VOLTAGE_TAG = "voltage"; - public static final String BRIDGE_TAG = "bridge"; - public static final String MOTOR_VEHICLE_TAG = "motor_vehicle"; - public static final String COMMENT_TAG = "comment"; - public static final String MAXSPEED_TAG = "maxspeed"; - public static final String NATURAL_TAG = "natural"; - public static final String BUILDING_HEIGHT_TAG = "building:height"; - public static final String SAC_SCALE_TAG = "sac_scale"; - public static final String TUNNEL_TAG = "tunnel"; - public static final String WATERWAY_TAG = "waterway"; - public static final String TRAIL_VISIBILITY_TAG = "trail_visibility"; - public static final String HIGHWAY_TAG = "highway"; - public static final String VEHICLE_TAG = "vehicle"; - public static final String HORSE_TAG = "horse"; - public static final String GOODS_TAG = "goods"; - public static final String FREQUENCY_TAG = "frequency"; - public static final String MAN_MADE_TAG = "man_made"; - public static final String ADDR_HOUSENUMBER_TAG = "addr:housenumber"; - public static final String AREA_TAG = "area"; - public static final String BUILDING_LEVELS_TAG = "building:levels"; - public static final String WHEELCHAIR_TAG = "wheelchair"; - public static final String NAME_TAG = "name"; - public static final String ONEWAY_TAG = "oneway"; - public static final String FIXME_TAG = "FIXME"; - public static final String CAPACITY_TAG = "capacity"; - public static final String MOTORCYCLE_TAG = "motorcycle"; - public static final String HGV_TAG = "hgv"; - public static final String CONSTRUCTION_TAG = "construction"; - public static final String ADDR_STATE_TAG = "addr:state"; - public static final String LANES_TAG = "lanes"; - public static final String NOTE_TAG = "note"; - public static final String LIT_TAG = "lit"; - public static final String BUILDING_TAG = "building"; - public static final String SEGREGATED_TAG = "segregated"; - public static final String ADDR_INCLUSION_TAG = "addr:inclusion"; - public static final String LAYER_TAG = "layer"; - public static final String SPORT_TAG = "sport"; - public static final String ADDR_INTERPOLATION_TAG = "addr:interpolation"; - public static final String CUTTING_TAG = "cutting"; - public static final String AMENITY_TAG = "amenity"; - public static final String ACCESS_TAG = "access"; - public static final String AGRICULTURAL_TAG = "agricultural"; - public static final String CAPACITY_DISABLED_TAG = "capacity:disabled"; - public static final String OPERATOR_TAG = "operator"; - public static final String REF_TAG = "ref"; - public static final String NOEXIT_TAG = "noexit"; - public static final String ADMIN_LEVEL_TAG = "admin_level"; - public static final String SOURCE_TAG = "source"; - public static final String TRACKTYPE_TAG = "tracktype"; - public static final String ADDR_COUNTRY_TAG = "addr:country"; - public static final String ROUTE_TAG = "route"; - public static final String CABLES_TAG = "cables"; - public static final String SERVICE_TAG = "service"; - public static final String MOTORCAR_TAG = "motorcar"; - public static final String WHITEWATER_TAG = "whitewater"; - 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"; - public static final String HIGHWAY_FOOTWAY_VALUE = "footway"; - public static final String HIGHWAY_MOTORWAY_LINK_VALUE = "motorway_link"; - public static final String HIGHWAY_MOTORWAY_VALUE = "motorway"; - public static final String HIGHWAY_PATH_VALUE = "path"; - public static final String HIGHWAY_RESIDENTIAL_VALUE = "residential"; - public static final String HIGHWAY_LIVING_STREET_VALUE = "living_street"; - public static final String HIGHWAY_ROAD_VALUE = "road"; - public static final String HIGHWAY_SECONDARY_VALUE = "secondary"; - public static final String HIGHWAY_SERVICE_VALUE = "service"; - public static final String HIGHWAY_STEPS_VALUE = "steps"; - public static final String HIGHWAY_TERTIARY_VALUE = "tertiary"; - public static final String HIGHWAY_TRACK_VALUE = "track"; - public static final String HIGHWAY_TRUNK_LINK_VALUE = "trunk_link"; - public static final String HIGHWAY_TRUNK_VALUE = "trunk"; - public static final String HIGHWAY_UNCLASSIFIED_VALUE = "unclassified"; - - /* Relation keys */ - - // Associated street: See http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern - public static final String RELATION_TYPE = "type"; - public static final String ASSOCIATEDSTREET_RELATION_TYPE = "associatedStreet"; - public static final String STREET_RELATION_ROLE = "street"; - public static final String HOUSE_RELATION_ROLE = "house"; } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (revision 32970) @@ -70,15 +70,10 @@ AddressActions.getConvertAllToRelationAction() }; - + private JLabel streetLabel; private JLabel unresolvedAddressesLabel; private JMapViewer mapViewer; - - /** - * @param arg0 - * @throws HeadlessException - */ - public AddressEditDialog(AddressEditContainer addressEditContainer) throws HeadlessException { + public AddressEditDialog(AddressEditContainer addressEditContainer) throws HeadlessException { super(JOptionPane.getFrameForComponent(Main.parent), tr("Fix unresolved addresses"), false); @@ -86,5 +81,5 @@ this.editContainer.addChangedListener(this); setLayout(new BorderLayout()); - setSize(1024,600); + setSize(1024, 600); setLocationRelativeTo(null); @@ -146,10 +141,9 @@ headerPanel2.setMinimumSize(new Dimension(100, 30)); headerPanel2.add(unresolvedAddressesLabel); - unresolvedPanel.add(headerPanel2 , BorderLayout.NORTH); + unresolvedPanel.add(headerPanel2, BorderLayout.NORTH); unresolvedPanel.setMinimumSize(new Dimension(500, 200)); - try { - JPanel unresolvedButtons = new JPanel(new GridLayout(2,5, 5, 5)); + JPanel unresolvedButtons = new JPanel(new GridLayout(2, 5, 5, 5)); SideButton assign = new SideButton(AddressActions.getResolveAction()); unresolvedButtons.add(assign); @@ -214,5 +208,5 @@ } - JPanel buttonPanel = new JPanel(new GridLayout(1,10)); + JPanel buttonPanel = new JPanel(new GridLayout(1, 10)); JButton ok = new JButton(OK_COMMAND, ImageProvider.getIfAvailable(null, "ok")); ok.addActionListener(this); @@ -236,10 +230,10 @@ * @param title The title of the header. * @param n The number to show in the header. - * @return + * @return created header label */ private JLabel createHeaderLabel(String fmtString, String title, int n) { JLabel label = new JLabel(String.format(fmtString, title, n)); label.setFont(label.getFont().deriveFont(Font.BOLD, label.getFont().getSize() + 2)); - label.setBorder(new EmptyBorder(5,2,4,5)); + label.setBorder(new EmptyBorder(5, 2, 4, 5)); return label; } @@ -347,5 +341,5 @@ * street name given in the address. * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ class IncompleteAddressListener implements ListSelectionListener { @@ -383,5 +377,5 @@ * event implements this interface, and the object created * with that class is registered with a component using the - * component's addJumpToEntryListener method. When + * component's {@code addJumpToEntryListener} method. When * the jumpToEntry event occurs, that object's appropriate * method is invoked. @@ -396,6 +390,5 @@ * @param column the column of the table to use for the comparison */ - public JumpToEntryListener(int column) { - super(); + JumpToEntryListener(int column) { this.column = column; } @@ -403,17 +396,13 @@ @Override public void keyPressed(KeyEvent arg0) { - // TODO Auto-generated method stub - } @Override public void keyReleased(KeyEvent arg0) { - // TODO Auto-generated method stub - } @Override public void keyTyped(KeyEvent arg0) { - JTable table = (JTable) arg0.getSource(); + JTable table = (JTable) arg0.getSource(); if (table == null) return; 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java (revision 32970) @@ -22,8 +22,4 @@ private DefaultMutableTreeNode incompleteRoot; - /** - * @param streets - * @param unresolvedAddresses - */ public AddressEditModel(List streets, List unresolvedAddresses) { @@ -70,5 +66,5 @@ /** * Gets the tree node containing all unresolved addresses. - * @return + * @return tree node containing all unresolved addresses */ public TreeNode getUnresolvedAddressesTree() { @@ -89,5 +85,5 @@ /** * Gets the tree node containing all incomplete addresses. - * @return + * @return tree node containing all incomplete addresses */ public TreeNode getIncompleteAddressesTree() { 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java (revision 32970) @@ -33,5 +33,6 @@ * @param container The address container instance holding the entities for streets and addresses. */ - public AddressEditSelectionEvent(Object source, JTable selStreet, JTable unresolvedAddresses, JTable incompleteAddresses, AddressEditContainer container) { + public AddressEditSelectionEvent(Object source, JTable selStreet, JTable unresolvedAddresses, JTable incompleteAddresses, + AddressEditContainer container) { super(source, -1, ""); this.streetTable = selStreet; @@ -43,5 +44,5 @@ /** * Gets the street table component. - * @return + * @return the street table component */ public JTable getStreetTable() { @@ -51,5 +52,5 @@ /** * Gets the 'unresolved addresses' table component. - * @return + * @return the 'unresolved addresses' table component */ public JTable getUnresolvedAddressTable() { @@ -75,5 +76,5 @@ /** * Gets the selected street of the street table. - * @return + * @return the selected street of the street table */ public OSMStreet getSelectedStreet() { @@ -144,5 +145,5 @@ /** * Gets the list containing the selected items of the 'unresolved addresses ' table. - * @return + * @return the list containing the selected items of the 'unresolved addresses ' table */ public List getSelectedUnresolvedAddresses() { 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java (revision 32970) @@ -37,8 +37,8 @@ } else { SwingUtilities.invokeLater(new Runnable() { - + @Override public void run() { - fireTableDataChanged(); // update model + fireTableDataChanged(); // update model } }); @@ -55,20 +55,18 @@ /** - * Gets the node entity for the given row or null; if row contains no - * entity. + * 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. - * @return + * @return the node entity for the given row or null; if row contains no entity */ public abstract IOSMEntity getEntityOfRow(int row); /** - * Gets the row for the given node entity or -1; if the model does not - * contain the entity. + * 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. - * @return + * @return the row for the given node entity or -1; if the model does not contain the entity */ public abstract int getRowOfEntity(IOSMEntity entity); @@ -90,5 +88,5 @@ * event implements this interface, and the object created * with that class is registered with a component using the - * component's addColumnListener method. When + * component's {@code addColumnListener} method. When * the column event occurs, that object's appropriate * method is invoked. @@ -104,5 +102,5 @@ * @param t the t */ - public ColumnListener(JTable t) { + ColumnListener(JTable t) { table = t; } @@ -142,5 +140,5 @@ * Internal base class to sort items by different columns. */ - protected static abstract class ColumnSorter implements Comparator { + protected abstract static class ColumnSorter implements Comparator { private int column; private boolean ascending; 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/BBoxMapRectangle.java (revision 32970) @@ -12,7 +12,4 @@ private BBox bbox; - /** - * @param bbox - */ public BBoxMapRectangle(BBox bbox) { super(null, null); 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java (revision 32970) @@ -11,5 +11,5 @@ import org.openstreetmap.josm.plugins.fixAddresses.OSMAddress; -public class IncompleteAddressesTableModel extends AddressEditTableModel { +public class IncompleteAddressesTableModel extends AddressEditTableModel { /** * @@ -19,6 +19,7 @@ // TODO: Add "state" column, if required private static final int NUMBER_OF_COLUMNS = 5; - private static final String[] COLUMN_NAMES = new String[]{tr("Country"), trc("address", "City" /* fix #8140 */), tr("Postcode"), tr("Street"), tr("Number")}; - private static final Class[] COLUMN_CLASSES = new Class[]{ + private static final String[] COLUMN_NAMES = new String[] { + tr("Country"), trc("address", "City" /* fix #8140 */), 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}; @@ -125,5 +126,5 @@ * @param asc sort ascending */ - public IncompleteAddressModelSorter(int column, boolean asc) { + IncompleteAddressModelSorter(int column, boolean asc) { super(column, asc); } @@ -135,17 +136,17 @@ switch (getColumn()) { case 0: - cc=arg0.getCountry().compareTo(arg1.getCountry()); + cc = arg0.getCountry().compareTo(arg1.getCountry()); break; case 1: - cc=arg0.getCity().compareTo(arg1.getCity()); + cc = arg0.getCity().compareTo(arg1.getCity()); break; case 2: - cc=arg0.getPostalCode().compareTo(arg1.getPostalCode()); + cc = arg0.getPostalCode().compareTo(arg1.getPostalCode()); break; case 3: - cc= arg0.getStreetName().compareTo(arg1.getStreetName()); + cc = arg0.getStreetName().compareTo(arg1.getStreetName()); break; case 4: - cc=arg0.getHouseNumber().compareTo(arg1.getHouseNumber()); + cc = arg0.getHouseNumber().compareTo(arg1.getHouseNumber()); break; default: @@ -160,5 +161,3 @@ } } - - } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java (revision 32970) @@ -15,7 +15,5 @@ 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}; - /** - * @param addressContainer - */ + public StreetTableModel(AddressEditContainer addressContainer) { super(addressContainer); @@ -24,5 +22,4 @@ @Override public int getColumnCount() { - // TODO Auto-generated method stub return NUMBER_OF_COLUMNS; } @@ -107,5 +104,5 @@ static class StreetModelSorter extends ColumnSorter { - public StreetModelSorter(int column, boolean asc) { + StreetModelSorter(int column, boolean asc) { super(column, asc); } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java (revision 32970) @@ -14,12 +14,11 @@ * Provides a table model to show unresolved addresses. * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ - public class UnresolvedAddressesTableModel extends AddressEditTableModel { private static final int NUMBER_OF_COLUMNS = 5; - private static final String[] COLUMN_NAMES = new String[] { tr("Street"), + private static final String[] COLUMN_NAMES = new String[] {tr("Street"), tr("Number"), trc("address", "City" /* fix #8140 */), tr("Postcode"), tr("Name") }; @@ -33,7 +32,4 @@ private static final long serialVersionUID = 424009321818130586L; - /** - * @param addressContainer - */ public UnresolvedAddressesTableModel(AddressEditContainer addressContainer) { super(addressContainer); @@ -130,5 +126,5 @@ static class UnresolvedAddressModelSorter extends ColumnSorter { - public UnresolvedAddressModelSorter(int column, boolean asc) { + UnresolvedAddressModelSorter(int column, boolean asc) { super(column, asc); } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java (revision 32970) @@ -26,7 +26,6 @@ * accepts a list of addresses or streets and executes the tasks to be done by this action. * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ - @SuppressWarnings("serial") public abstract class AbstractAddressEditAction extends JosmAction implements IAddressEditContainerListener, ICommandListener { @@ -36,8 +35,4 @@ private String txName; - /** - * @param name - * @param icon - */ public AbstractAddressEditAction(String name, String iconName, String tooltip, String toolbar) { super(name, iconName, tooltip, null, true, toolbar, true); @@ -46,7 +41,4 @@ } - /** - * @param name - */ public AbstractAddressEditAction(String name) { this(name, null, "", null); @@ -120,5 +112,4 @@ * Updates 'enabled' state depending on the given address container object. * @param container The address container (maybe null). - * @return */ protected abstract void updateEnabledState(AddressEditContainer container); @@ -127,5 +118,4 @@ * Updates 'enabled' state depending on the current selection. * @param container The selection event. - * @return */ protected abstract void updateEnabledState(AddressEditSelectionEvent event); @@ -133,5 +123,5 @@ /** * Redirected action handler for doing actions on a address selection. - * @param ev + * @param ev selection event */ public abstract void addressEditActionPerformed(AddressEditSelectionEvent ev); @@ -139,5 +129,5 @@ /** * Redirected action handler for doing actions on an address container. - * @param ev + * @param container address container */ public abstract void addressEditActionPerformed(AddressEditContainer container); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AddressActions.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AddressActions.java (revision 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AddressActions.java (revision 32970) @@ -3,23 +3,34 @@ public final class AddressActions { + + private AddressActions() { + // Hide default constructor for utilities classes + } + /* Global action objects */ public static SelectAddressesInMapAction getSelectAction() { return new SelectAddressesInMapAction(); } + public static GuessAddressDataAction getGuessAddressAction() { return new GuessAddressDataAction(); } + public static ApplyAllGuessesAction getApplyGuessesAction() { return new ApplyAllGuessesAction(); } + public static RemoveAddressTagsAction getRemoveTagsAction() { return new RemoveAddressTagsAction(); } + public static AssignAddressToStreetAction getResolveAction() { return new AssignAddressToStreetAction(); } + public static ConvertToRelationAction getConvertToRelationAction() { return new ConvertToRelationAction(); } + public static ConvertAllToRelationAction getConvertAllToRelationAction() { return new ConvertAllToRelationAction(); 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java (revision 32970) @@ -21,9 +21,9 @@ /** * Applies the guessed values for a set of addresses. - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ @SuppressWarnings("serial") -public class ApplyAllGuessesAction extends AbstractAddressEditAction implements MouseListener{ +public class ApplyAllGuessesAction extends AbstractAddressEditAction implements MouseListener { private String tag; /** @@ -102,7 +102,7 @@ @Override public void mouseClicked(MouseEvent e) { - JTable table = (JTable)e.getSource(); + 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) { 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java (revision 32970) @@ -12,8 +12,7 @@ * 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 - * + * @author Oliver Wieland <oliver.wieland@online.de> */ -public class AssignAddressToStreetAction extends AbstractAddressEditAction { +public class AssignAddressToStreetAction extends AbstractAddressEditAction { /** @@ -62,5 +61,3 @@ // we only accept a selection: nothing to do here } - - } 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java (revision 32970) @@ -11,5 +11,5 @@ import org.openstreetmap.josm.plugins.fixAddresses.OSMAddress; import org.openstreetmap.josm.plugins.fixAddresses.OSMStreet; -import org.openstreetmap.josm.plugins.fixAddresses.TagUtils; +import org.openstreetmap.josm.plugins.fixAddresses.TagConstants; import org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditSelectionEvent; @@ -56,13 +56,13 @@ Relation r = new Relation(); commands.add(new AddCommand(r)); - commands.add(new ChangePropertyCommand(r, TagUtils.NAME_TAG, streetNode.getName())); - commands.add(new ChangePropertyCommand(r, TagUtils.RELATION_TYPE, TagUtils.ASSOCIATEDSTREET_RELATION_TYPE)); + commands.add(new ChangePropertyCommand(r, TagConstants.NAME_TAG, streetNode.getName())); + commands.add(new ChangePropertyCommand(r, TagConstants.RELATION_TYPE, TagConstants.ASSOCIATEDSTREET_RELATION_TYPE)); // add street with role 'street' - r.addMember(new RelationMember(TagUtils.STREET_RELATION_ROLE, streetNode.getOsmObject())); + r.addMember(new RelationMember(TagConstants.STREET_RELATION_ROLE, streetNode.getOsmObject())); // add address members for (OSMAddress addrNode : streetNode.getAddresses()) { beginObjectTransaction(addrNode); - r.addMember(new RelationMember(TagUtils.HOUSE_RELATION_ROLE, addrNode.getOsmObject())); + r.addMember(new RelationMember(TagConstants.HOUSE_RELATION_ROLE, addrNode.getOsmObject())); addrNode.setStreetName(null); // remove street name finishObjectTransaction(addrNode); 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java (revision 32970) @@ -9,6 +9,6 @@ import org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer; import org.openstreetmap.josm.plugins.fixAddresses.GuessAddressRunnable; +import org.openstreetmap.josm.plugins.fixAddresses.IProgressMonitorFinishedListener; import org.openstreetmap.josm.plugins.fixAddresses.OSMAddress; -import org.openstreetmap.josm.plugins.fixAddresses.IProgressMonitorFinishedListener; import org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditSelectionEvent; @@ -17,5 +17,5 @@ * with city, post code, state,... However, I strongly encourage you to check the result. * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ @SuppressWarnings("serial") @@ -58,8 +58,8 @@ /** * Internal method to start several threads guessing tag values for the given list of addresses. - * @param addrNodes */ private void internalGuessAddresses(List nodes) { - if (nodes == null) return; + if (nodes == null) + return; // Launch address guessing thread 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 32969) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java (revision 32970) @@ -15,5 +15,5 @@ /** * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ @@ -57,5 +57,5 @@ /** * Internal helper to select the given addresses in the map. - * @param addrToSel + * @param addrToSel addresses */ private void internalSelectAddresses(List addrToSel) {