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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java (revision 30737) @@ -47,33 +47,33 @@ private Collection workingSet; /** The street dictionary collecting all streets to a set of unique street names. */ - private HashMap streetDict = new HashMap(100); + private HashMap streetDict = new HashMap<>(100); /** The unresolved (addresses without valid street name) addresses list. */ - private List unresolvedAddresses = new ArrayList(100); + private List unresolvedAddresses = new ArrayList<>(100); /** The incomplete addresses list. */ - private List incompleteAddresses = new ArrayList(100); + private List incompleteAddresses = new ArrayList<>(100); /** The shadow copy to assemble the street dict during update. */ - private HashMap shadowStreetDict = new HashMap(100); + private HashMap shadowStreetDict = new HashMap<>(100); /** The shadow copy to assemble the unresolved addresses during update. */ - private List shadowUnresolvedAddresses = new ArrayList(100); + private List shadowUnresolvedAddresses = new ArrayList<>(100); /** The shadow copy to assemble the incomplete addresses during update. */ - private List shadowIncompleteAddresses = new ArrayList(100); + private List shadowIncompleteAddresses = new ArrayList<>(100); /** The visited nodes cache to increase iteration speed. */ - private HashSet visitedNodes = new HashSet(); + private HashSet visitedNodes = new HashSet<>(); /** The visited ways cache to increase iteration speed. */ - private HashSet visitedWays = new HashSet(); + private HashSet visitedWays = new HashSet<>(); /** The tag list used within the data area. */ - private HashSet tags = new HashSet(); + private HashSet tags = new HashSet<>(); /** The tag list used within the data area. */ - private HashMap values = new HashMap(); + private HashMap values = new HashMap<>(); /** The list containing the problems */ - private List problems = new ArrayList(); + private List problems = new ArrayList<>(); /** The change listeners. */ - private List listeners = new ArrayList(); + private List listeners = new ArrayList<>(); /** @@ -115,5 +115,5 @@ protected void fireContainerChanged() { List shadowListeners = - new ArrayList(listeners); + new ArrayList<>(listeners); for (IAddressEditContainerListener listener : shadowListeners) { @@ -129,5 +129,5 @@ List shadowListeners = - new ArrayList(listeners); + new ArrayList<>(listeners); for (IAddressEditContainerListener listener : shadowListeners) { @@ -336,5 +336,5 @@ */ public List getStreetList() { - ArrayList sortedList = new ArrayList(streetDict.values()); + ArrayList sortedList = new ArrayList<>(streetDict.values()); Collections.sort(sortedList); return sortedList; @@ -417,5 +417,5 @@ */ public List getAllAddressesToFix() { - List all = new ArrayList(incompleteAddresses); + List all = new ArrayList<>(incompleteAddresses); for (OSMAddress aNode : unresolvedAddresses) { @@ -453,5 +453,5 @@ return true; } - + if (streetName != null && shadowStreetDict.containsKey(streetName)) { OSMStreet sNode = shadowStreetDict.get(streetName); @@ -467,5 +467,5 @@ */ public void resolveAddresses() { - List resolvedAddresses = new ArrayList(); + List resolvedAddresses = new ArrayList<>(); for (OSMAddress node : shadowUnresolvedAddresses) { if (assignAddressToStreet(node)) { @@ -513,5 +513,5 @@ } } - + // match streets with addresses... resolveAddresses(); @@ -521,7 +521,7 @@ // put results from shadow copy into real lists - incompleteAddresses = new ArrayList(shadowIncompleteAddresses); - unresolvedAddresses = new ArrayList(shadowUnresolvedAddresses); - streetDict = new HashMap(shadowStreetDict); + incompleteAddresses = new ArrayList<>(shadowIncompleteAddresses); + unresolvedAddresses = new ArrayList<>(shadowUnresolvedAddresses); + streetDict = new HashMap<>(shadowStreetDict); // remove temp data shadowStreetDict.clear(); @@ -568,5 +568,5 @@ public void attachToDataSet(Collection osmDataToWorkOn) { if (osmDataToWorkOn != null && !osmDataToWorkOn.isEmpty()) { - workingSet = new ArrayList(osmDataToWorkOn); + workingSet = new ArrayList<>(osmDataToWorkOn); } else { detachFromDataSet(); // drop old stuff, if present @@ -643,5 +643,5 @@ CheckParameterUtil.ensureParameterNotNull(entity, "entity"); - List problemsToRemove = new ArrayList(); + List problemsToRemove = new ArrayList<>(); for (IProblem problem : problems) { if (problem.getSource() == entity) { @@ -673,6 +673,6 @@ if (maxEntries < 1) maxEntries = 1; - List scores = new ArrayList(); - List matches = new ArrayList(); + List scores = new ArrayList<>(); + List matches = new ArrayList<>(); // Find the longest common sub string 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressProblem.java (revision 30737) @@ -56,5 +56,5 @@ private void lazyCreateSolutions() { if (solutions == null) { - solutions = new ArrayList(); + solutions = new ArrayList<>(); } } 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java (revision 30737) @@ -25,9 +25,9 @@ public class GuessAddressRunnable extends PleaseWaitRunnable { private List addressesToGuess; - private List finishListeners = new ArrayList(); + private List finishListeners = new ArrayList<>(); private boolean isRunning = false; private boolean canceled; - private GuessedValueHandler[] wayGuessers = new GuessedValueHandler[]{new GuessStreetValueHandler(TagUtils.ADDR_STREET_TAG)}; + private GuessedValueHandler[] wayGuessers = new GuessedValueHandler[]{new GuessStreetValueHandler(TagUtils.ADDR_STREET_TAG)}; private GuessedValueHandler[] nodeGuessers = new GuessedValueHandler[]{ new GuessedValueHandler(TagUtils.ADDR_POSTCODE_TAG, 500.0), @@ -99,5 +99,5 @@ protected void fireFinished() { for (IProgressMonitorFinishedListener l : finishListeners) { - l.finished(); + l.finished(); } // this event is fired only once, then we disconnect all listeners @@ -130,5 +130,5 @@ progressMonitor.setTicksCount(addressesToGuess.size()); - List shadowCopy = new ArrayList(addressesToGuess); + List shadowCopy = new ArrayList<>(addressesToGuess); for (OSMAddress aNode : shadowCopy) { if (!aNode.needsGuess()) { // nothing to do @@ -148,5 +148,5 @@ for (int i = 0; i < wayGuessers.length; i++) { GuessedValueHandler guesser = wayGuessers[i]; - + guesser.setAddressNode(aNode); @@ -156,7 +156,7 @@ break; } - way.accept(guesser); - } - + way.accept(guesser); + } + String guessedVal = guesser.getCurrentValue(); if (guessedVal != null) { @@ -164,9 +164,9 @@ } } - + // Run node-related guessers for (int i = 0; i < nodeGuessers.length; i++) { GuessedValueHandler guesser = nodeGuessers[i]; - + guesser.setAddressNode(aNode); @@ -176,7 +176,7 @@ break; } - node.accept(guesser); - } - + node.accept(guesser); + } + String guessedVal = guesser.getCurrentValue(); if (guessedVal != null) { @@ -214,8 +214,8 @@ OSMAddress aNode = getAddressNode(); String newVal = TagUtils.getNameValue(w); - + if (newVal != null) { double dist = OsmUtils.getMinimumDistanceToWay(aNode.getCoor(), w); - + if (dist < minDist && dist < getMaxDistance()) { minDist = dist; 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java (revision 30737) @@ -27,9 +27,9 @@ /** The dictionary containing guessed values. */ - private HashMap guessedValues = new HashMap(); + private HashMap guessedValues = new HashMap<>(); /** The dictionary containing guessed objects. */ - private HashMap guessedObjects = new HashMap(); + private HashMap guessedObjects = new HashMap<>(); /** The dictionary containing indirect values. */ - private HashMap derivedValues = new HashMap(); + private HashMap derivedValues = new HashMap<>(); public OSMAddress(OsmPrimitive osmObject) { @@ -49,5 +49,5 @@ * Checks if the underlying address node has all tags usually needed to * describe an address. - * + * * @return */ @@ -72,5 +72,5 @@ /** * Gets the name of the street associated with this address. - * + * * @return */ @@ -83,5 +83,5 @@ * this method looks for an appropriate guess. If both, real value and * guess, are missing, a question mark is returned. - * + * * @param tag * the tag @@ -115,5 +115,5 @@ /** * Returns true, if this address node has a street name. - * + * * @return */ @@ -124,5 +124,5 @@ /** * Returns the street name guessed by the nearest-neighbor search. - * + * * @return the guessedStreetName */ @@ -133,5 +133,5 @@ /** * Sets the guessed street name. - * + * * @param guessedStreetName * the guessedStreetName to set @@ -146,5 +146,5 @@ /** * Checks for a guessed street name. - * + * * @return true, if this instance has a guessed street name. */ @@ -162,5 +162,5 @@ /** * Sets the guessed post code. - * + * * @param guessedPostCode * the guessedPostCode to set @@ -174,5 +174,5 @@ /** * Checks for a guessed post code. - * + * * @return true, if this instance has a guessed post code. */ @@ -190,5 +190,5 @@ /** * Sets the guessed city. - * + * * @param guessedCity * the guessedCity to set @@ -202,5 +202,5 @@ /** * Checks for a guessed city name. - * + * * @return true, if this instance has a guessed city name. */ @@ -211,5 +211,5 @@ /** * Returns true, if this instance has guesses regarding address tags. - * + * * @return */ @@ -233,5 +233,5 @@ /** * Apply the guessed value for the given tag. - * + * * @param tag * the tag to apply the guessed value for. @@ -248,5 +248,5 @@ /** * Gets the name of the post code associated with this address. - * + * * @return */ @@ -263,5 +263,5 @@ /** * Checks if this instance has a valid postal code. - * + * * @return true, if successful */ @@ -272,5 +272,5 @@ /** * Checks for post code tag. - * + * * @return true, if successful */ @@ -281,5 +281,5 @@ /** * Gets the name of the house number associated with this address. - * + * * @return */ @@ -297,5 +297,5 @@ /** * Checks for house number. - * + * * @return true, if successful */ @@ -305,5 +305,6 @@ } - public String getName() { + @Override + public String getName() { String name = TagUtils.getNameValue(osmObject); if (!StringUtils.isNullOrEmpty(name)) { @@ -316,5 +317,5 @@ /** * Checks if this address is part of a address interpolation. - * + * * @return true, if is part of interpolation */ @@ -325,5 +326,5 @@ /** * Checks if this address is part of an 'associated street' relation. - * + * * @return true, if is part of interpolation */ @@ -334,5 +335,5 @@ /** * Gets the name of the city associated with this address. - * + * * @return */ @@ -343,5 +344,5 @@ /** * Checks for city tag. - * + * * @return true, if a city tag is present or available via referrer. */ @@ -352,5 +353,5 @@ /** * Gets the name of the state associated with this address. - * + * * @return */ @@ -361,5 +362,5 @@ /** * Checks for state tag. - * + * * @return true, if a state tag is present or available via referrer. */ @@ -370,5 +371,5 @@ /** * Gets the name of the country associated with this address. - * + * * @return */ @@ -379,5 +380,5 @@ /** * Checks for country tag. - * + * * @return true, if a country tag is present or available via referrer. */ @@ -401,5 +402,5 @@ * Checks if the associated OSM object has the given tag or if the tag is * available via a referrer. - * + * * @param tag * the tag to look for. @@ -467,5 +468,5 @@ /** * Applies the street name from the specified street node. - * + * * @param node */ @@ -483,5 +484,5 @@ /** * Gets the guessed value for the given tag. - * + * * @param tag * The tag to get the guessed value for. @@ -499,5 +500,5 @@ /** * Gets the guessed object. - * + * * @param tag * the guessed tag @@ -516,5 +517,5 @@ * Gets all guessed objects or an empty list, if no guesses have been made * yet. - * + * * @return the guessed objects. */ @@ -529,5 +530,5 @@ * Check if this instance needs guessed values. This is the case, if the * underlying OSM node has either no street name, post code or city. - * + * * @return true, if this instance needs at least one guessed value. */ @@ -542,5 +543,5 @@ /** * Check if this instance needs guessed value for a given tag. - * + * * @return true, if successful */ @@ -559,5 +560,5 @@ * Checks if given tag has a guessed value (tag exists and has a non-empty * value). - * + * * @param tag * the tag @@ -573,5 +574,5 @@ /** * Sets the guessed value with the given tag. - * + * * @param tag * the tag to set the guess for @@ -596,5 +597,5 @@ * Checks if given tag has a derived value (value is available via a * referrer). - * + * * @param tag * the tag @@ -610,5 +611,5 @@ /** * Returns true, if this instance has derived values from any referrer. - * + * * @return */ @@ -619,5 +620,5 @@ /** * Gets the derived value for the given tag. - * + * * @param tag * The tag to get the derived value for. @@ -633,5 +634,5 @@ /** * Sets the value known indirectly via a referrer with the given tag. - * + * * @param tag * the tag to set the derived value for @@ -645,5 +646,5 @@ /** * Sets the street name of the address node. - * + * * @param streetName */ @@ -657,5 +658,5 @@ /** * Sets the state of the address node. - * + * * @param state */ @@ -669,5 +670,5 @@ /** * Sets the country of the address node. - * + * * @param country */ @@ -681,5 +682,5 @@ /** * Sets the post code of the address node. - * + * * @param postCode */ @@ -755,5 +756,5 @@ /** * Adds the guess value solution to a problem. - * + * * @param p * the problem to add the solution to. @@ -771,5 +772,5 @@ /** * Adds the remove address tags solution entry to a problem. - * + * * @param problem * the problem @@ -790,5 +791,5 @@ /** * Gets the formatted string representation of the given node. - * + * * @param node * the node 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java (revision 30737) @@ -28,6 +28,6 @@ public class OSMEntityBase implements IOSMEntity, Comparable { public static final String ANONYMOUS = tr("No name"); - private static List containerListeners = new ArrayList(); - private List cmdListeners = new ArrayList(); + private static List containerListeners = new ArrayList<>(); + private List cmdListeners = new ArrayList<>(); protected OsmPrimitive osmObject; @@ -81,5 +81,6 @@ * @param listener */ - public void addCommandListener(ICommandListener listener) { + @Override + public void addCommandListener(ICommandListener listener) { CheckParameterUtil.ensureParameterNotNull(listener, "listener"); cmdListeners.add(listener); @@ -90,5 +91,6 @@ * @param listener */ - public void removeCommandListener(ICommandListener listener) { + @Override + public void removeCommandListener(ICommandListener listener) { CheckParameterUtil.ensureParameterNotNull(listener, "listener"); cmdListeners.remove(listener); @@ -112,5 +114,6 @@ } - public OsmPrimitive getOsmObject() { + @Override + public OsmPrimitive getOsmObject() { return osmObject; } @@ -148,5 +151,5 @@ protected void setOSMTag(String tag, String newValue) { CheckParameterUtil.ensureParameterNotNull(tag, "tag"); - + if (osmObject != null) { @@ -156,5 +159,5 @@ return; } - + if ((osmObject.hasKey(tag) && newValue == null) || newValue != null) { fireCommandIssued(new ChangePropertyCommand(osmObject, tag, newValue)); 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreet.java (revision 30737) @@ -26,5 +26,6 @@ } - public List getChildren() { + @Override + public List getChildren() { return children; } @@ -46,5 +47,5 @@ private void lazyCreateChildren() { if (children == null) { - children = new ArrayList(); + children = new ArrayList<>(); } } @@ -65,5 +66,5 @@ private void lazyCreateAddresses() { if (addresses == null) { - addresses = new ArrayList(); + addresses = new ArrayList<>(); } } @@ -118,5 +119,5 @@ */ public String getType() { - List types = new ArrayList(); + List types = new ArrayList<>(); for (IOSMEntity seg : getChildren()) { 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmFactory.java (revision 30737) @@ -8,5 +8,5 @@ public class OsmFactory { - private static HashMap addressCache = new HashMap(); + private static HashMap addressCache = new HashMap<>(); /** 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/PostalCodeChecker.java (revision 30737) @@ -11,5 +11,5 @@ */ public class PostalCodeChecker { - private static HashMap postalCodePatternMap = new HashMap(); + private static HashMap postalCodePatternMap = new HashMap<>(); static { 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java (revision 30737) @@ -10,6 +10,6 @@ import javax.swing.tree.TreeNode; +import org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity; import org.openstreetmap.josm.plugins.fixAddresses.OSMAddress; -import org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity; import org.openstreetmap.josm.plugins.fixAddresses.OSMStreet; @@ -17,5 +17,5 @@ private List streets; private List unresolvedAddresses; - private List incompleteAddresses = new ArrayList(); + private List incompleteAddresses = new ArrayList<>(); private DefaultMutableTreeNode streetRoot; private DefaultMutableTreeNode unresolvedRoot; 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java (revision 30737) @@ -153,5 +153,5 @@ int[] selRows = unresolvedAddressTable.getSelectedRows(); - unresolvedCache = new ArrayList(); + unresolvedCache = new ArrayList<>(); for (int i = 0; i < selRows.length; i++) { if (selRows[i] >= 0 && selRows[i] < addressContainer.getNumberOfUnresolvedAddresses()) { @@ -177,5 +177,5 @@ int[] selRows = incompleteAddressTable.getSelectedRows(); - incompleteCache = new ArrayList(); + incompleteCache = new ArrayList<>(); for (int i = 0; i < selRows.length; i++) { if (selRows[i] >= 0 && selRows[i] < addressContainer.getNumberOfIncompleteAddresses()) { Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java =================================================================== --- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java (revision 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java (revision 30737) @@ -64,5 +64,5 @@ incompleteAddr.getSelectionModel().addListSelectionListener(this); - LinkedList buttons = new LinkedList(); + LinkedList buttons = new LinkedList<>(); // Link actions with address container for (AbstractAddressEditAction action : actions) { 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java (revision 30737) @@ -166,5 +166,5 @@ } - commands = new ArrayList(); + commands = new ArrayList<>(); if (StringUtils.isNullOrEmpty(txName)) { throw new RuntimeException("Transaction must have a name"); 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java (revision 30737) @@ -13,6 +13,6 @@ import org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer; +import org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity; import org.openstreetmap.josm.plugins.fixAddresses.OSMAddress; -import org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity; import org.openstreetmap.josm.plugins.fixAddresses.StringUtils; import org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditSelectionEvent; @@ -70,5 +70,5 @@ private void applyGuesses(List addrToFix) { beginTransaction(tr("Applied guessed values")); - List addrToFixShadow = new ArrayList(addrToFix); + List addrToFixShadow = new ArrayList<>(addrToFix); for (OSMAddress aNode : addrToFixShadow) { beginObjectTransaction(aNode); 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 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java (revision 30737) @@ -62,5 +62,5 @@ if (addrToSel == null) return; - List sel = new ArrayList(); + List sel = new ArrayList<>(); getCurrentDataSet().clearSelection(); Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java =================================================================== --- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java (revision 30736) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java (revision 30737) @@ -30,5 +30,5 @@ if (addressEditContainer.getIncompleteAddresses() != null) { - List osms = new ArrayList(); + List osms = new ArrayList<>(); for (OSMAddress aNode : addressEditContainer.getIncompleteAddresses()) {