Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 6316) @@ -1047,5 +1047,5 @@ * created dataset as projection change listener. */ - private static final ArrayList> listeners = new ArrayList>(); + private static final List> listeners = new ArrayList>(); private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) { @@ -1127,5 +1127,5 @@ } - private static final ArrayList> windowSwitchListeners = new ArrayList>(); + private static final List> windowSwitchListeners = new ArrayList>(); /** Index: trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 6316) @@ -9,4 +9,5 @@ import java.util.Collection; import java.util.Iterator; +import java.util.List; import java.util.regex.Pattern; @@ -117,5 +118,5 @@ protected void launchInfoBrowsersForSelectedPrimitives() { - ArrayList primitivesToShow = new ArrayList(getCurrentDataSet().getAllSelected()); + List primitivesToShow = new ArrayList(getCurrentDataSet().getAllSelected()); // filter out new primitives which are not yet uploaded to the server Index: trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 6316) @@ -32,4 +32,7 @@ public final class AlignInLineAction extends JosmAction { + /** + * Constructs a new {@code AlignInLineAction}. + */ public AlignInLineAction() { super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes in to a line."), @@ -39,5 +42,5 @@ // the joy of single return values only... - private void nodePairFurthestApart(ArrayList nodes, Node[] resultOut) { + private void nodePairFurthestApart(List nodes, Node[] resultOut) { if(resultOut.length < 2) throw new IllegalArgumentException(); @@ -107,5 +110,5 @@ List selectedNodes = new ArrayList(getCurrentDataSet().getSelectedNodes()); Collection selectedWays = getCurrentDataSet().getSelectedWays(); - ArrayList nodes = new ArrayList(); + List nodes = new ArrayList(); //// Decide what to align based on selection: Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 6316) @@ -374,5 +374,5 @@ static public class NodeGraph { static public List buildNodePairs(Way way, boolean directed) { - ArrayList pairs = new ArrayList(); + List pairs = new ArrayList(); for (Pair pair: way.getNodePairs(false /* don't sort */)) { pairs.add(new NodePair(pair)); @@ -385,5 +385,5 @@ static public List buildNodePairs(List ways, boolean directed) { - ArrayList pairs = new ArrayList(); + List pairs = new ArrayList(); for (Way w: ways) { pairs.addAll(buildNodePairs(w, directed)); @@ -393,5 +393,5 @@ static public List eliminateDuplicateNodePairs(List pairs) { - ArrayList cleaned = new ArrayList(); + List cleaned = new ArrayList(); for(NodePair p: pairs) { if (!cleaned.contains(p) && !cleaned.contains(p.swap())) { @@ -446,5 +446,5 @@ } } else { - ArrayList l = new ArrayList(); + List l = new ArrayList(); l.add(pair); successors.put(pair.getA(), l); @@ -458,5 +458,5 @@ } } else { - ArrayList l = new ArrayList(); + List l = new ArrayList(); l.add(pair); predecessors.put(pair.getB(), l); Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 6316) @@ -457,5 +457,5 @@ commitCommands(marktr("Added node on all intersections")); - ArrayList relations = new ArrayList(); + List relations = new ArrayList(); // Remove ways from all relations so ways can be combined/split quietly @@ -467,18 +467,18 @@ boolean warnAboutRelations = !relations.isEmpty() && allStartingWays.size() > 1; - ArrayList preparedWays = new ArrayList(); + List preparedWays = new ArrayList(); for (Way way : outerStartingWays) { - ArrayList splitWays = splitWayOnNodes(way, nodes); + List splitWays = splitWayOnNodes(way, nodes); preparedWays.addAll(markWayInsideSide(splitWays, false)); } for (Way way : innerStartingWays) { - ArrayList splitWays = splitWayOnNodes(way, nodes); + List splitWays = splitWayOnNodes(way, nodes); preparedWays.addAll(markWayInsideSide(splitWays, true)); } // Find boundary ways - ArrayList discardedWays = new ArrayList(); + List discardedWays = new ArrayList(); List bounadries = findBoundaryPolygons(preparedWays, discardedWays); @@ -659,7 +659,7 @@ * @return list of parts, marked with the inside orientation. */ - private ArrayList markWayInsideSide(List parts, boolean isInner) { - - ArrayList result = new ArrayList(); + private List markWayInsideSide(List parts, boolean isInner) { + + List result = new ArrayList(); //prepare prev and next maps @@ -829,7 +829,7 @@ * @return list of split ways (or original ways if no splitting is done). */ - private ArrayList splitWayOnNodes(Way way, Set nodes) { - - ArrayList result = new ArrayList(); + private List splitWayOnNodes(Way way, Set nodes) { + + List result = new ArrayList(); List> chunks = buildNodeChunks(way, nodes); @@ -1344,6 +1344,6 @@ * @return List of relations with roles the primitives was part of */ - private ArrayList removeFromAllRelations(OsmPrimitive osm) { - ArrayList result = new ArrayList(); + private List removeFromAllRelations(OsmPrimitive osm) { + List result = new ArrayList(); for (Relation r : Main.main.getCurrentDataSet().getRelations()) { @@ -1383,8 +1383,8 @@ * @param relationsToDelete set of relations to delete. */ - private void fixRelations(ArrayList rels, Way outer, RelationRole ownMultipol, Set relationsToDelete) { - ArrayList multiouters = new ArrayList(); - - if (ownMultipol != null){ + private void fixRelations(List rels, Way outer, RelationRole ownMultipol, Set relationsToDelete) { + List multiouters = new ArrayList(); + + if (ownMultipol != null) { multiouters.add(ownMultipol); } Index: trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java (revision 6316) @@ -9,4 +9,5 @@ import java.awt.event.KeyEvent; import java.util.ArrayList; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -63,5 +64,5 @@ * List of available rectifier services. May be extended from the outside */ - public ArrayList services = new ArrayList(); + public List services = new ArrayList(); public MapRectifierWMSmenuAction() { Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 6316) @@ -198,5 +198,5 @@ for (Way w: OsmPrimitive.getFilteredList(OsmPrimitive.getReferrer(nodesToDelete), Way.class)) { - ArrayList newNodes = new ArrayList(w.getNodesCount()); + List newNodes = new ArrayList(w.getNodesCount()); for (Node n: w.getNodes()) { if (! nodesToDelete.contains(n) && n != targetNode) { Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 6316) @@ -44,5 +44,5 @@ "You can add two nodes to the selection. Then, the direction is fixed by these two reference nodes. "+ "(Afterwards, you can undo the movement for certain nodes:
"+ - "Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)"); + "Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)"); /** @@ -144,6 +144,6 @@ } - final ArrayList nodeList = new ArrayList(); - final ArrayList wayDataList = new ArrayList(); + final List nodeList = new ArrayList(); + final List wayDataList = new ArrayList(); final Collection sel = getCurrentDataSet().getSelected(); @@ -170,6 +170,6 @@ } else if (nodeList.isEmpty()) { - List> groups = buildGroups(wayDataList); - for (ArrayList g: groups) { + List> groups = buildGroups(wayDataList); + for (List g: groups) { commands.addAll(orthogonalize(g, nodeList)); } @@ -200,9 +200,9 @@ * Collect groups of ways with common nodes in order to orthogonalize each group separately. */ - private static List> buildGroups(ArrayList wayDataList) { - List> groups = new ArrayList>(); + private static List> buildGroups(List wayDataList) { + List> groups = new ArrayList>(); Set remaining = new HashSet(wayDataList); while (!remaining.isEmpty()) { - ArrayList group = new ArrayList(); + List group = new ArrayList(); groups.add(group); Iterator it = remaining.iterator(); @@ -247,7 +247,5 @@ * **/ - private static Collection orthogonalize(ArrayList wayDataList, ArrayList headingNodes) - throws InvalidUserInputException - { + private static Collection orthogonalize(List wayDataList, List headingNodes) throws InvalidUserInputException { // find average heading double headingAll; Index: trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 6316) @@ -297,5 +297,5 @@ cmds.add(new AddCommand(newNode)); - ArrayList nn = new ArrayList(); + List nn = new ArrayList(); for (Node pushNode : w.getNodes()) { if (originalNode == pushNode) { Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 6316) @@ -8,4 +8,5 @@ import java.awt.event.KeyEvent; import java.util.LinkedList; +import java.util.List; import javax.swing.JOptionPane; @@ -51,6 +52,6 @@ * however, a plugin might also want to insert something after that. */ - private static final LinkedList uploadHooks = new LinkedList(); - private static final LinkedList lateUploadHooks = new LinkedList(); + private static final List uploadHooks = new LinkedList(); + private static final List lateUploadHooks = new LinkedList(); static { /** Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java (revision 6316) @@ -141,5 +141,5 @@ */ protected void updatePotentiallyDeletedPrimitives(Set potentiallyDeleted) { - final ArrayList toSelect = new ArrayList(); + final List toSelect = new ArrayList(); for (OsmPrimitive primitive : potentiallyDeleted) { if (primitive != null) { Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 6316) @@ -424,5 +424,5 @@ Collection newSelection = new LinkedList(ds.getSelected()); - ArrayList reuseWays = new ArrayList(), + List reuseWays = new ArrayList(), replacedWays = new ArrayList(); boolean newNode = false; @@ -652,5 +652,5 @@ } - private void insertNodeIntoAllNearbySegments(List wss, Node n, Collection newSelection, Collection cmds, ArrayList replacedWays, ArrayList reuseWays) { + private void insertNodeIntoAllNearbySegments(List wss, Node n, Collection newSelection, Collection cmds, List replacedWays, List reuseWays) { Map> insertPoints = new HashMap>(); for (WaySegment ws : wss) { Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6316) @@ -613,6 +613,6 @@ */ private void updateStateByCurrentSelection() { - final ArrayList nodeList = new ArrayList(); - final ArrayList wayList = new ArrayList(); + final List nodeList = new ArrayList(); + final List wayList = new ArrayList(); final Collection sel = getCurrentDataSet().getSelected(); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 6316) @@ -3,4 +3,5 @@ import static org.openstreetmap.josm.gui.help.HelpUtil.ht; +import static org.openstreetmap.josm.tools.I18n.marktr; import static org.openstreetmap.josm.tools.I18n.tr; @@ -18,4 +19,5 @@ import java.util.Collection; import java.util.LinkedHashSet; +import java.util.Set; import javax.swing.JOptionPane; @@ -40,5 +42,4 @@ import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.tools.Geometry; -import static org.openstreetmap.josm.tools.I18n.marktr; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.Shortcut; @@ -122,5 +123,5 @@ private WaySegment referenceSegment; private ParallelWays pWays; - private LinkedHashSet sourceWays; + private Set sourceWays; private EastNorth helperLineStart; private EastNorth helperLineEnd; Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (revision 6316) @@ -178,5 +178,5 @@ private List makeAddWayAndNodesCommandList() { - ArrayList commands = new ArrayList(sortedNodes.size() + ways.size()); + List commands = new ArrayList(sortedNodes.size() + ways.size()); for (int i = 0; i < sortedNodes.size() - (isClosedPath() ? 1 : 0); i++) { commands.add(new AddCommand(sortedNodes.get(i))); Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 6316) @@ -111,5 +111,5 @@ public static List getSearchExpressionHistory() { - ArrayList ret = new ArrayList(getSearchHistory().size()); + List ret = new ArrayList(getSearchHistory().size()); for (SearchSetting ss: getSearchHistory()) { ret.add(ss.text); @@ -120,4 +120,7 @@ private static SearchSetting lastSearch = null; + /** + * Constructs a new {@code SearchAction}. + */ public SearchAction() { super(tr("Search..."), "dialogs/search", tr("Search for objects."), Index: trunk/src/org/openstreetmap/josm/command/RemoveNodesCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/RemoveNodesCommand.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/command/RemoveNodesCommand.java (revision 6316) @@ -7,4 +7,6 @@ import java.util.HashSet; import java.util.List; +import java.util.Set; + import javax.swing.Icon; @@ -26,5 +28,5 @@ private final Way way; - private final HashSet rmNodes; + private final Set rmNodes; public RemoveNodesCommand(Way way, List rmNodes) { Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 6316) @@ -196,5 +196,5 @@ new HashMap>(); - ArrayList tagCorrections = new ArrayList(); + List tagCorrections = new ArrayList(); for (String key : way.keySet()) { String value = way.get(key); @@ -221,5 +221,5 @@ Map> roleCorrectionMap = new HashMap>(); - ArrayList roleCorrections = new ArrayList(); + List roleCorrections = new ArrayList(); Collection referrers = oldway.getReferrers(); Index: trunk/src/org/openstreetmap/josm/data/APIDataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 6316) @@ -333,5 +333,5 @@ visit(path, relation); } - ArrayList ret = new ArrayList(relations); + List ret = new ArrayList(relations); Collections.sort( ret, Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 6316) @@ -206,5 +206,5 @@ */ public static void exportPreferencesKeysByPatternToFile(String fileName, boolean append, String pattern) { - ArrayList keySet = new ArrayList(); + List keySet = new ArrayList(); Map allSettings = Main.pref.getAllSettings(); for (String key: allSettings.keySet()) { @@ -750,5 +750,5 @@ // "lists" for (Entry>> entry : fragment.arrayProperties.entrySet()) { - ArrayList> array = new ArrayList>(); + List> array = new ArrayList>(); array.addAll(entry.getValue()); mainpref.putArray(entry.getKey(), array); Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 6316) @@ -22,6 +22,6 @@ public static final ImageryLayerInfo instance = new ImageryLayerInfo(); - ArrayList layers = new ArrayList(); - static ArrayList defaultLayers = new ArrayList(); + List layers = new ArrayList(); + static List defaultLayers = new ArrayList(); private final static String[] DEFAULT_LAYER_SITES = { @@ -92,5 +92,5 @@ Collection defaults = Main.pref.getCollection("imagery.layers.default"); - ArrayList defaultsSave = new ArrayList(); + List defaultsSave = new ArrayList(); for (ImageryInfo def : defaultLayers) { if (def.isDefaultEntry()) { Index: trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java (revision 6316) @@ -45,5 +45,5 @@ public OffsetBookmark(Collection list) { - ArrayList array = new ArrayList(list); + List array = new ArrayList(list); this.projectionCode = array.get(0); this.layerName = array.get(1); @@ -60,6 +60,6 @@ } - public ArrayList getInfoArray() { - ArrayList res = new ArrayList(7); + public List getInfoArray() { + List res = new ArrayList(7); if (projectionCode != null) { res.add(projectionCode); Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 6316) @@ -402,5 +402,5 @@ targetDataSet.beginUpdate(); try { - ArrayList candidates = new ArrayList(targetDataSet.getNodes()); + List candidates = new ArrayList(targetDataSet.getNodes()); for (Node node: sourceDataSet.getNodes()) { mergePrimitive(node, candidates); Index: trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java (revision 6316) @@ -4,13 +4,14 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.Locale; public class OsmUtils { - static ArrayList TRUE_VALUES = new ArrayList(Arrays + static List TRUE_VALUES = new ArrayList(Arrays .asList(new String[] { "true", "yes", "1", "on" })); - static ArrayList FALSE_VALUES = new ArrayList(Arrays + static List FALSE_VALUES = new ArrayList(Arrays .asList(new String[] { "false", "no", "0", "off" })); - static ArrayList REVERSE_VALUES = new ArrayList(Arrays + static List REVERSE_VALUES = new ArrayList(Arrays .asList(new String[] { "reverse", "-1" })); Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 6316) @@ -367,5 +367,5 @@ boolean locked = writeLock(); try { - ArrayList todelete = new ArrayList(); + List todelete = new ArrayList(); for (RelationMember member: members) { if (primitives.contains(member.getMember())) { Index: trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 6316) @@ -136,5 +136,5 @@ * @return list of names */ - public ArrayList getNames() { + public List getNames() { return new ArrayList(names); } Index: trunk/src/org/openstreetmap/josm/data/osm/history/History.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/History.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/osm/history/History.java (revision 6316) @@ -25,5 +25,5 @@ private static History filter(History history, FilterPredicate predicate) { - ArrayList out = new ArrayList(); + List out = new ArrayList(); for (HistoryOsmPrimitive primitive: history.versions) { if (predicate.matches(primitive)) { @@ -35,5 +35,5 @@ /** the list of object snapshots */ - private ArrayList versions; + private List versions; /** the object id */ private final long id; @@ -63,5 +63,5 @@ public History sortAscending() { - ArrayList copy = new ArrayList(versions); + List copy = new ArrayList(versions); Collections.sort( copy, @@ -77,5 +77,5 @@ public History sortDescending() { - ArrayList copy = new ArrayList(versions); + List copy = new ArrayList(versions); Collections.sort( copy, Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 6316) @@ -5,4 +5,5 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -87,5 +88,5 @@ SimplePrimitiveId pid = new SimplePrimitiveId(id, type); - ArrayList versions = data.get(pid); + List versions = data.get(pid); if (versions == null) return null; @@ -141,5 +142,5 @@ public History getHistory(PrimitiveId pid) throws IllegalArgumentException{ CheckParameterUtil.ensureParameterNotNull(pid, "pid"); - ArrayList versions = data.get(pid); + List versions = data.get(pid); if (versions == null) return null; Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (revision 6316) @@ -21,5 +21,5 @@ public class HistoryRelation extends HistoryOsmPrimitive{ - private ArrayList members = new ArrayList(); + private List members = new ArrayList(); /** Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (revision 6316) @@ -21,5 +21,5 @@ public class HistoryWay extends HistoryOsmPrimitive { - private ArrayList nodeIds = new ArrayList(); + private List nodeIds = new ArrayList(); /** Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6316) @@ -25,4 +25,5 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import org.openstreetmap.josm.tools.Utils; @@ -166,5 +167,5 @@ private NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) { int topLevelCount = 0; - HashMap> subGridMap = new HashMap>(); + HashMap> subGridMap = new HashMap>(); for (int i = 0; i < subGrid.length; i++) { if (subGrid[i].getParentSubGridName().equalsIgnoreCase("NONE")) { @@ -179,5 +180,5 @@ topLevelSubGrid[topLevelCount++] = subGrid[i]; } else { - ArrayList parent = subGridMap.get(subGrid[i].getParentSubGridName()); + List parent = subGridMap.get(subGrid[i].getParentSubGridName()); parent.add(subGrid[i]); } @@ -185,5 +186,5 @@ NTV2SubGrid[] nullArray = new NTV2SubGrid[0]; for (int i = 0; i < subGrid.length; i++) { - ArrayList subSubGrids = subGridMap.get(subGrid[i].getSubGridName()); + List subSubGrids = subGridMap.get(subGrid[i].getSubGridName()); if (!subSubGrids.isEmpty()) { NTV2SubGrid[] subGridArray = subSubGrids.toArray(nullArray); Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java (revision 6316) @@ -66,5 +66,5 @@ return; - ArrayList l = new ArrayList(); + List l = new ArrayList(); l.add(r); l.add(m.getMember()); Index: trunk/src/org/openstreetmap/josm/gui/BookmarkList.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (revision 6316) @@ -15,4 +15,5 @@ import java.util.Collections; import java.util.LinkedList; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -46,5 +47,5 @@ public Bookmark(Collection list) throws NumberFormatException, IllegalArgumentException { - ArrayList array = new ArrayList(list); + List array = new ArrayList(list); if(array.size() < 5) throw new IllegalArgumentException(tr("Wrong number of arguments for bookmark")); Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 6316) @@ -49,5 +49,5 @@ static private DefaultNameFormatter instance; - private static final LinkedList formatHooks = new LinkedList(); + private static final List formatHooks = new LinkedList(); /** @@ -507,5 +507,5 @@ .append(primitive.getId()) .append("
"); - ArrayList keyList = new ArrayList(primitive.keySet()); + List keyList = new ArrayList(primitive.keySet()); Collections.sort(keyList); for (int i = 0; i < keyList.size(); i++) { @@ -680,5 +680,5 @@ .append(primitive.getId()) .append("
"); - ArrayList keyList = new ArrayList(primitive.getTags().keySet()); + List keyList = new ArrayList(primitive.getTags().keySet()); Collections.sort(keyList); for (int i = 0; i < keyList.size(); i++) { Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 6316) @@ -104,5 +104,5 @@ // For easy access when inherited protected Insets contentInsets = new Insets(10,5,0,5); - protected ArrayList buttons = new ArrayList(); + protected List buttons = new ArrayList(); /** Index: trunk/src/org/openstreetmap/josm/gui/MainApplet.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainApplet.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/MainApplet.java (revision 6316) @@ -38,4 +38,7 @@ public static final class UploadPreferencesAction extends JosmAction { + /** + * Constructs a new {@code UploadPreferencesAction}. + */ public UploadPreferencesAction() { super(tr("Upload Preferences"), "upload-preferences", tr("Upload the current preferences to the server"), Index: trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 6316) @@ -210,5 +210,5 @@ public MouseEvent lastMEvent = new MouseEvent(this, 0, 0, 0, 0, 0, 0, false); // In case somebody reads it before first mouse move - private final LinkedList temporaryLayers = new LinkedList(); + private final List temporaryLayers = new LinkedList(); private BufferedImage nonChangedLayersBuffer; @@ -500,5 +500,5 @@ */ protected List getVisibleLayersInZOrder() { - ArrayList ret = new ArrayList(); + List ret = new ArrayList(); for (Layer l: layers) { if (l.isVisible()) { @@ -734,5 +734,5 @@ */ public List getLayersOfType(Class ofType) { - ArrayList ret = new ArrayList(); + List ret = new ArrayList(); for (Layer layer : getAllLayersAsList()) { if (ofType.isInstance(layer)) { Index: trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 6316) @@ -17,4 +17,5 @@ import java.util.Comparator; import java.util.HashSet; +import java.util.List; import java.util.Set; @@ -186,5 +187,5 @@ */ public static class RelationMemberTableModel extends DefaultTableModel { - private ArrayList data; + private List data; /** Index: trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 6316) @@ -17,4 +17,5 @@ import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; @@ -100,5 +101,5 @@ */ public static class TMSTileSourceProvider implements TileSourceProvider { - static final HashSet existingSlippyMapUrls = new HashSet(); + static final Set existingSlippyMapUrls = new HashSet(); static { // Urls that already exist in the slippymap chooser and shouldn't be copied from TMS layer list Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 6316) @@ -276,5 +276,5 @@ */ public Command buildResolveCommand() { - ArrayList commands = new ArrayList(); + List commands = new ArrayList(); if (tagMerger.getModel().getNumResolvedConflicts() > 0) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 6316) @@ -74,5 +74,5 @@ private static final int MAX_DELETED_PRIMITIVE_IN_DIALOG = 5; - protected HashMap> entries; + protected Map> entries; protected EntriesTableModel myEntriesTableModel; @@ -693,5 +693,5 @@ } - protected ArrayList getEntries() { + protected List getEntries() { return entries.get(role); } @@ -702,5 +702,5 @@ * @return the opposite list of entries */ - protected ArrayList getOppositeEntries() { + protected List getOppositeEntries() { ListRole opposite = getComparePairListModel().getSelectedComparePair().getOppositeRole(role); return entries.get(opposite); @@ -738,5 +738,5 @@ */ protected class EntriesSelectionModel extends DefaultListSelectionModel { - private final ArrayList entries; + private final List entries; public EntriesSelectionModel(ArrayList nodes) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 6316) @@ -6,4 +6,5 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.List; import javax.swing.BorderFactory; @@ -58,5 +59,5 @@ // show the key/value-pairs, sorted by key // - ArrayList keyList = new ArrayList(primitive.keySet()); + List keyList = new ArrayList(primitive.keySet()); Collections.sort(keyList); for (int i = 0; i < keyList.size(); i++) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 6316) @@ -6,4 +6,5 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.List; import javax.swing.BorderFactory; @@ -43,5 +44,5 @@ .append(primitive.getId()) .append("
"); - ArrayList keyList = new ArrayList(primitive.keySet()); + List keyList = new ArrayList(primitive.keySet()); Collections.sort(keyList); for (int i = 0; i < keyList.size(); i++) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 6316) @@ -14,4 +14,5 @@ import java.awt.event.MouseEvent; import java.util.ArrayList; +import java.util.List; import javax.swing.AbstractAction; @@ -333,5 +334,5 @@ */ static class AdjustmentSynchronizer implements AdjustmentListener { - private final ArrayList synchronizedAdjustables; + private final List synchronizedAdjustables; public AdjustmentSynchronizer() { Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (revision 6316) @@ -148,5 +148,5 @@ */ public List getValues() { - ArrayList ret = new ArrayList(tags.getValues()); + List ret = new ArrayList(tags.getValues()); ret.remove(""); ret.remove(null); Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 6316) @@ -10,4 +10,5 @@ import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; @@ -24,5 +25,5 @@ private List displayedKeys; private Set keysWithConflicts; - private HashMap decisions; + private Map decisions; private int numConflicts; private PropertyChangeSupport support; @@ -30,4 +31,7 @@ private boolean showTagsWithMultiValuesOnly = false; + /** + * Constructs a new {@code TagConflictResolverModel}. + */ public TagConflictResolverModel() { numConflicts = 0; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (revision 6316) @@ -62,4 +62,7 @@ protected ReloadAction reloadAction; + /** + * Constructs a new {@code HistoryDialog}. + */ public HistoryDialog() { super(tr("History"), "history", tr("Display the history of all selected items."), @@ -149,5 +152,5 @@ */ static class HistoryItemTableModel extends DefaultTableModel implements SelectionChangedListener{ - private ArrayList data; + private List data; private DefaultListSelectionModel selectionModel; @@ -175,5 +178,5 @@ protected List getSelectedPrimitives() { - ArrayList ret = new ArrayList(); + List ret = new ArrayList(); for (int i=0; i< data.size(); i++) { if (selectionModel.isSelectedIndex(i)) { @@ -227,5 +230,5 @@ public List getPrimitives(int [] rows) { if (rows == null || rows.length == 0) return Collections.emptyList(); - ArrayList ret = new ArrayList(rows.length); + List ret = new ArrayList(rows.length); for (int row: rows) { ret.add(data.get(row)); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 6316) @@ -1205,5 +1205,5 @@ */ public List getSelectedLayers() { - ArrayList selected = new ArrayList(); + List selected = new ArrayList(); for (int i=0; i getSelectedRows() { - ArrayList selected = new ArrayList(); + List selected = new ArrayList(); for (int i=0; i getPossibleMergeTargets(Layer source) { - ArrayList targets = new ArrayList(); + List targets = new ArrayList(); if (source == null) return targets; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 6316) @@ -382,6 +382,6 @@ */ private class RelationListModel extends AbstractListModel { - private final ArrayList relations = new ArrayList(); - private ArrayList filteredRelations; + private final List relations = new ArrayList(); + private List filteredRelations; private DefaultListSelectionModel selectionModel; private SearchCompiler.Match filter; @@ -538,5 +538,5 @@ */ public List getSelectedRelations() { - ArrayList ret = new ArrayList(); + List ret = new ArrayList(); for (int i=0; i data; + private List data; public UserTableModel() { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 6316) @@ -76,5 +76,5 @@ */ public List getSelectedChangesets() { - ArrayList ret = new ArrayList(); + List ret = new ArrayList(); for (int i =0; i< data.size();i++) { Changeset cs = data.get(i); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 6316) @@ -230,5 +230,5 @@ protected List filterPrimitivesWithUnloadedHistory(Collection primitives) { - ArrayList ret = new ArrayList(primitives.size()); + List ret = new ArrayList(primitives.size()); for (HistoryOsmPrimitive p: primitives) { if (HistoryDataSet.getInstance().getHistory(p.getPrimitiveId()) == null) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 6316) @@ -7,4 +7,5 @@ import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Set; @@ -23,5 +24,5 @@ public class ChangesetContentTableModel extends AbstractTableModel { - private final ArrayList data = new ArrayList(); + private final List data = new ArrayList(); private DefaultListSelectionModel selectionModel; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 6316) @@ -376,5 +376,5 @@ commands.add(new ChangePropertyCommand(sel, key, null)); if (value.equals(tr(""))) { - Map> map = new HashMap>(); + Map> map = new HashMap>(); for (OsmPrimitive osm: sel) { String val = osm.get(key); @@ -383,5 +383,5 @@ map.get(val).add(osm); } else { - ArrayList v = new ArrayList(); + List v = new ArrayList(); v.add(osm); map.put(val, v); @@ -389,5 +389,5 @@ } } - for (Map.Entry> e: map.entrySet()) { + for (Map.Entry> e: map.entrySet()) { commands.add(new ChangePropertyCommand(e.getValue(), newkey, e.getKey())); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 6316) @@ -648,5 +648,5 @@ */ protected void cleanSelfReferences() { - ArrayList toCheck = new ArrayList(); + List toCheck = new ArrayList(); toCheck.add(getRelation()); if (memberTableModel.hasMembersReferringTo(toCheck)) { @@ -769,5 +769,5 @@ if (primitives == null || primitives.isEmpty()) return primitives; - ArrayList ret = new ArrayList(); + List ret = new ArrayList(); for (OsmPrimitive primitive : primitives) { if (primitive instanceof Relation && getRelation() != null && getRelation().equals(primitive)) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 6316) @@ -12,4 +12,5 @@ import java.util.Arrays; import java.util.Collection; +import java.util.List; import javax.swing.AbstractAction; @@ -124,5 +125,5 @@ if (Main.isDisplayingMapView()) { Collection sel = getMemberTableModel().getSelectedMembers(); - final ArrayList toHighlight = new ArrayList(); + final List toHighlight = new ArrayList(); for (RelationMember r: sel) { if (r.getMember().isUsable()) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 6316) @@ -387,5 +387,5 @@ protected List getSelectedIndices() { - ArrayList selectedIndices = new ArrayList(); + List selectedIndices = new ArrayList(); for (int i = 0; i < members.size(); i++) { if (getSelectionModel().isSelectedIndex(i)) { @@ -471,5 +471,5 @@ */ public Collection getSelectedMembers() { - ArrayList selectedMembers = new ArrayList(); + List selectedMembers = new ArrayList(); for (int i : getSelectedIndices()) { selectedMembers.add(members.get(i)); @@ -721,5 +721,5 @@ Collections.reverse(selectedIndicesReversed); - ArrayList newMembers = new ArrayList(members); + List newMembers = new ArrayList(members); for (int i=0; i < selectedIndices.size(); i++) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 6316) @@ -58,5 +58,5 @@ private OsmDataLayer layer; private Relation child; - private ArrayList parents; + private List parents; private Runnable continuation; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (revision 6316) @@ -15,5 +15,5 @@ /** the relation */ private Relation relation; - private ArrayList referrers; + private List referrers; public ReferringRelationsBrowserModel() { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 6316) @@ -7,4 +7,5 @@ import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import java.util.Map.Entry; @@ -92,5 +93,5 @@ /** the map of open dialogs */ - private final HashMap openDialogs; + private final Map openDialogs; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 6316) @@ -10,4 +10,5 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.List; import org.openstreetmap.josm.Main; @@ -31,5 +32,5 @@ /** the list of registered relation editor classes */ - private static ArrayList> editors = new ArrayList>(); + private static List> editors = new ArrayList>(); /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 6316) @@ -20,5 +20,5 @@ /** this selection table model only displays selected primitives in this layer */ private OsmDataLayer layer; - private ArrayList cache; + private List cache; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java (revision 6316) @@ -73,5 +73,5 @@ */ public List sortMembers(List relationMembers) { - ArrayList newMembers = new ArrayList(); + List newMembers = new ArrayList(); // Sort members with custom mechanisms (relation-dependent) Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6316) @@ -386,5 +386,5 @@ static class NamedResultTableModel extends DefaultTableModel { - private ArrayList data; + private List data; private ListSelectionModel selectionModel; Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 6316) @@ -4,9 +4,10 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.List; import java.util.Observable; public class HelpBrowserHistory extends Observable { private HelpBrowser browser; - private ArrayList history; + private List history; private int historyPos = 0; Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 6316) @@ -9,4 +9,5 @@ import java.util.Collection; import java.util.HashMap; +import java.util.List; import java.util.Map; @@ -102,5 +103,5 @@ */ public void hideAll() { - ArrayList dialogs = new ArrayList(); + List dialogs = new ArrayList(); dialogs.addAll(this.dialogs.values()); for (HistoryBrowserDialog dialog: dialogs) { Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 6316) @@ -8,4 +8,5 @@ import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Observable; @@ -553,5 +554,5 @@ public class TagTableModel extends AbstractTableModel { - private ArrayList keys; + private List keys; private PointInTimeType pointInTimeType; Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 6316) @@ -10,4 +10,5 @@ import java.util.Collection; import java.util.HashSet; +import java.util.Set; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -48,5 +49,5 @@ private boolean canceled = false; private Exception lastException = null; - private HashSet toLoad; + private Set toLoad; private HistoryDataSet loadedData; private OsmServerHistoryReader reader = null; Index: trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 6316) @@ -7,4 +7,5 @@ import java.awt.Component; import java.util.HashMap; +import java.util.Map; import javax.swing.ImageIcon; @@ -30,5 +31,5 @@ public final static Color BGCOLOR_SELECTED = new Color(143,170,255); - private HashMap icons; + private Map icons; public RelationMemberListTableCellRenderer(){ Index: trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (revision 6316) @@ -3,4 +3,5 @@ import java.util.ArrayList; +import java.util.List; import javax.swing.DefaultListSelectionModel; @@ -11,6 +12,9 @@ public class SelectionSynchronizer implements ListSelectionListener { - private ArrayList participants; + private List participants; + /** + * Constructs a new {@code SelectionSynchronizer}. + */ public SelectionSynchronizer() { participants = new ArrayList(); Index: trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (revision 6316) @@ -5,4 +5,5 @@ import java.awt.Color; import java.util.ArrayList; +import java.util.List; import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item.DiffItemType; @@ -50,6 +51,6 @@ } - public ArrayList referenceDiff; - public ArrayList currentDiff; + public List referenceDiff; + public List currentDiff; Object[] reference; Object[] current; Index: trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 6316) @@ -13,4 +13,5 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.List; import javax.swing.AbstractAction; @@ -214,5 +215,5 @@ public Collection getSelectedChangesets() { Object [] sel = lstOpenChangesets.getSelectedValues(); - ArrayList ret = new ArrayList(sel.length); + List ret = new ArrayList(sel.length); for (Object o: sel) { ret.add((Changeset)o); Index: trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 6316) @@ -7,4 +7,5 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.List; import javax.swing.SwingUtilities; @@ -26,5 +27,5 @@ private Exception lastException; private Collection changesets; - private ArrayList closedChangesets; + private List closedChangesets; /** Index: trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 6316) @@ -6,4 +6,5 @@ import java.util.Collection; import java.util.HashSet; +import java.util.Set; import org.openstreetmap.josm.Main; @@ -45,5 +46,5 @@ private Changeset changeset; private Collection toUpload; - private HashSet processedPrimitives; + private Set processedPrimitives; private UploadStrategySpecification strategy; Index: trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 6316) @@ -10,4 +10,5 @@ import java.lang.reflect.InvocationTargetException; import java.util.HashSet; +import java.util.Set; import javax.swing.JOptionPane; @@ -50,5 +51,5 @@ private OsmDataLayer layer; private Changeset changeset; - private HashSet processedPrimitives; + private Set processedPrimitives; private UploadStrategySpecification strategy; Index: trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 6316) @@ -150,5 +150,5 @@ public List getSelectedPrimitives() { - ArrayList ret = new ArrayList(); + List ret = new ArrayList(); ret.addAll(lstSelectedPrimitives.getOsmPrimitiveListModel().getPrimitives(lstSelectedPrimitives.getSelectedIndices())); ret.addAll(lstDeletedPrimitives.getOsmPrimitiveListModel().getPrimitives(lstDeletedPrimitives.getSelectedIndices())); @@ -247,5 +247,5 @@ if (indices == null || indices.length == 0) return Collections.emptyList(); - ArrayList ret = new ArrayList(indices.length); + List ret = new ArrayList(indices.length); for (int i: indices) { if (i < 0) { Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6316) @@ -501,5 +501,5 @@ SeparatorLayerAction.INSTANCE, new LayerListPopup.InfoAction(this)}; - ArrayList actions = new ArrayList(); + List actions = new ArrayList(); actions.addAll(Arrays.asList(new Action[]{ LayerListDialog.getInstance().createActivateLayerAction(this), Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6316) @@ -28,4 +28,5 @@ import java.util.Map.Entry; import java.util.Scanner; +import java.util.Set; import java.util.concurrent.Callable; import java.util.regex.Matcher; @@ -154,5 +155,6 @@ } - HashSet tileRequestsOutstanding = new HashSet(); + private Set tileRequestsOutstanding = new HashSet(); + @Override public synchronized void tileLoadingFinished(Tile tile, boolean success) { Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6316) @@ -810,5 +810,5 @@ // Construct a list of images that have a date, and sort them on the date. - ArrayList dateImgLst = getSortedImgList(); + List dateImgLst = getSortedImgList(); // Create a temporary copy for each image for (ImageEntry ie : dateImgLst) { @@ -988,5 +988,5 @@ GpxData gpx = gpxW.data; - ArrayList imgs = getSortedImgList(); + List imgs = getSortedImgList(); PrimaryDateParser dateParser = new PrimaryDateParser(); @@ -1060,5 +1060,5 @@ } - private ArrayList getSortedImgList() { + private List getSortedImgList() { return getSortedImgList(cbExifImg.isSelected(), cbTaggedImg.isSelected()); } @@ -1071,6 +1071,6 @@ * @return matching images */ - private ArrayList getSortedImgList(boolean exif, boolean tagged) { - ArrayList dateImgLst = new ArrayList(yLayer.data.size()); + private List getSortedImgList(boolean exif, boolean tagged) { + List dateImgLst = new ArrayList(yLayer.data.size()); for (ImageEntry e : yLayer.data) { if (e.getExifTime() == null) { @@ -1120,5 +1120,5 @@ * All images need a exifTime attribute and the List must be sorted according to these times. */ - private int matchGpxTrack(ArrayList images, GpxData selectedGpx, long offset) { + private int matchGpxTrack(List images, GpxData selectedGpx, long offset) { int ret = 0; @@ -1159,5 +1159,5 @@ } - private int matchPoints(ArrayList images, WayPoint prevWp, long prevWpTime, + private int matchPoints(List images, WayPoint prevWp, long prevWpTime, WayPoint curWp, long curWpTime, long offset) { // Time between the track point and the previous one, 5 sec if first point, i.e. photos take @@ -1246,5 +1246,5 @@ } - private int getLastIndexOfListBefore(ArrayList images, long searchedTime) { + private int getLastIndexOfListBefore(List images, long searchedTime) { int lstSize= images.size(); Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 6316) @@ -29,4 +29,5 @@ import java.util.LinkedList; import java.util.List; +import java.util.Set; import javax.swing.Action; @@ -97,6 +98,6 @@ private GeoImageLayer layer; private Collection selection; - private HashSet loadedDirectories = new HashSet(); - private LinkedHashSet errorMessages; + private Set loadedDirectories = new HashSet(); + private Set errorMessages; private GpxLayer gpxLayer; Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java (revision 6316) @@ -8,4 +8,5 @@ import java.io.File; import java.util.LinkedList; +import java.util.List; import javax.swing.AbstractAction; @@ -35,5 +36,5 @@ } - private void addRecursiveFiles(LinkedList files, File[] sel) { + private void addRecursiveFiles(List files, File[] sel) { for (File f : sel) { if (f.isDirectory()) { Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 6316) @@ -21,7 +21,7 @@ public class StyleCache { /* list of boundaries for the scale ranges */ - ArrayList bd; + private final List bd; /* styles for each scale range */ - ArrayList data; + private final List data; private final static Storage internPool = new Storage(); // TODO: clean up the intern pool from time to time (after purge or layer removal) Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6316) @@ -12,4 +12,5 @@ import java.util.LinkedList; import java.util.List; +import java.util.Map; import org.openstreetmap.josm.Main; @@ -34,12 +35,12 @@ public class XmlStyleSource extends StyleSource implements StyleKeys { - protected final HashMap icons = new HashMap(); - protected final HashMap lines = new HashMap(); - protected final HashMap modifiers = new HashMap(); - protected final HashMap areas = new HashMap(); - protected final LinkedList iconsList = new LinkedList(); - protected final LinkedList linesList = new LinkedList(); - protected final LinkedList modifiersList = new LinkedList(); - protected final LinkedList areasList = new LinkedList(); + protected final Map icons = new HashMap(); + protected final Map lines = new HashMap(); + protected final Map modifiers = new HashMap(); + protected final Map areas = new HashMap(); + protected final List iconsList = new LinkedList(); + protected final List linesList = new LinkedList(); + protected final List modifiersList = new LinkedList(); + protected final List areasList = new LinkedList(); public XmlStyleSource(String url, String name, String shortdescription) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 6316) @@ -465,5 +465,5 @@ public List getSelected() { - ArrayList ret = new ArrayList(); + List ret = new ArrayList(); for(int i=0; i data; + private List data; private DefaultListSelectionModel selectionModel; Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 6316) @@ -200,5 +200,5 @@ private void exportSelectedToXML() { - ArrayList keys = new ArrayList(); + List keys = new ArrayList(); boolean hasLists = false; Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java (revision 6316) @@ -7,4 +7,5 @@ import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.Map; @@ -37,5 +38,5 @@ @Override public void actionPerformed(ActionEvent ae) { - ArrayList keys = new ArrayList(); + List keys = new ArrayList(); Map all = prefs.getAllSettings(); for (String key: all.keySet()) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 6316) @@ -12,4 +12,5 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -60,5 +61,5 @@ private DefaultTableModel tableModel; private JTable colors; - private ArrayList del = new ArrayList(); + private List del = new ArrayList(); JButton colorEdit; Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 6316) @@ -110,5 +110,5 @@ @Override public String[] allCodes() { - ArrayList projections = new ArrayList(60*4); + List projections = new ArrayList(60*4); for (int zone = 1;zone <= 60; zone++) { for (Hemisphere hemisphere : Hemisphere.values()) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 6316) @@ -16,4 +16,5 @@ import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.regex.PatternSyntaxException; @@ -373,5 +374,5 @@ expr = expr.replace("+", "\\+"); // split search string on whitespace, do case-insensitive AND search - ArrayList> andFilters = new ArrayList>(); + List> andFilters = new ArrayList>(); for (String word : expr.split("\\s+")) { andFilters.add(RowFilter.regexFilter("(?i)" + word)); Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 6316) @@ -36,5 +36,5 @@ /** the list holding the tags */ - protected final ArrayList tags =new ArrayList(); + protected final List tags =new ArrayList(); /** indicates whether the model is dirty */ Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java (revision 6316) @@ -11,5 +11,5 @@ /** the list of values */ - private ArrayList values = null; + private List values = null; /** Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 6316) @@ -79,5 +79,5 @@ * Last value of each key used in presets, used for prefilling corresponding fields */ - private static final HashMap lastValue = new HashMap(); + private static final Map lastValue = new HashMap(); public static class PresetListEntry { Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java (revision 6316) @@ -10,4 +10,5 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.List; import javax.swing.Action; @@ -16,6 +17,6 @@ import javax.swing.JPopupMenu; import javax.swing.JSeparator; + import org.openstreetmap.josm.Main; - import org.openstreetmap.josm.tools.PresetTextComparator; @@ -80,5 +81,5 @@ Component[] items = menu.getMenuComponents(); PresetTextComparator comp = new PresetTextComparator(); - ArrayList sortarray = new ArrayList(); + List sortarray = new ArrayList(); int lastSeparator = 0; for (int i = 0; i < items.length; i++) { Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java (revision 6316) @@ -39,5 +39,5 @@ private static File zipIcons = null; - public static LinkedList getPresetSources() { + public static List getPresetSources() { LinkedList sources = new LinkedList(); Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 6316) @@ -258,5 +258,5 @@ } - ArrayList getList() { + List getList() { return list; } Index: trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java (revision 6316) @@ -11,4 +11,6 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Observable; import java.util.Observer; @@ -26,6 +28,6 @@ public class AdjustmentSynchronizer implements AdjustmentListener { - private final ArrayList synchronizedAdjustables; - private final HashMap enabledMap; + private final List synchronizedAdjustables; + private final Map enabledMap; private final Observable observable; Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 6316) @@ -12,4 +12,5 @@ import java.util.Arrays; import java.util.Collection; +import java.util.List; import javax.accessibility.Accessible; @@ -80,5 +81,5 @@ public JosmComboBox(ComboBoxModel aModel) { super(aModel); - ArrayList list = new ArrayList(aModel.getSize()); + List list = new ArrayList(aModel.getSize()); for (int i = 0; i> capabilities; - private ArrayList imageryBlacklist; + private List imageryBlacklist; + /** + * Constructs new {@code Capabilities}. + */ public Capabilities() { clear(); Index: trunk/src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 6316) @@ -9,4 +9,5 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -54,5 +55,5 @@ /** Used by plugins to register themselves as data postprocessors. */ - public static ArrayList postprocessors; + public static List postprocessors; /** register a new postprocessor */ Index: trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 6316) @@ -37,5 +37,5 @@ private Collection processed; - private static ArrayList postprocessors; + private static List postprocessors; public static void registerPostprocessor(OsmServerWritePostprocessor pp) { if (postprocessors == null) { Index: trunk/src/org/openstreetmap/josm/io/XmlWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/XmlWriter.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/io/XmlWriter.java (revision 6316) @@ -6,4 +6,5 @@ import java.io.PrintWriter; import java.util.HashMap; +import java.util.Map; /** @@ -65,5 +66,5 @@ * The output writer to save the values to. */ - final private static HashMap encoding = new HashMap(); + private static final Map encoding = new HashMap(); static { encoding.put('<', "<"); Index: trunk/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java (revision 6316) @@ -9,4 +9,5 @@ import java.text.MessageFormat; import java.util.ArrayList; +import java.util.List; import java.util.StringTokenizer; @@ -32,5 +33,5 @@ Main.info("Grabbing HTML " + (attempt > 1? "(attempt " + attempt + ") ":"") + url); - ArrayList cmdParams = new ArrayList(); + List cmdParams = new ArrayList(); StringTokenizer st = new StringTokenizer(MessageFormat.format(PROP_BROWSER.get(), urlstring)); while (st.hasMoreTokens()) { Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 6316) @@ -79,5 +79,5 @@ static class ExistingValues { String tag; - HashMap valueCount; + Map valueCount; public ExistingValues(String tag) { this.tag=tag; valueCount=new HashMap(); Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java (revision 6316) @@ -5,5 +5,5 @@ import java.awt.Point; -import java.util.HashMap; +import java.util.Map; import org.openstreetmap.josm.Main; @@ -74,5 +74,5 @@ * @param args */ - private void addNode(HashMap args){ + private void addNode(Map args){ // Parse the arguments Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 6316) @@ -10,4 +10,5 @@ import java.util.LinkedList; import java.util.List; +import java.util.Map; import org.openstreetmap.josm.Main; @@ -23,5 +24,4 @@ import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog; import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; -import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException; /** @@ -40,5 +40,5 @@ * The place to remeber already added nodes (they are reused if needed @since 5845 */ - HashMap addedNodes; + Map addedNodes; @Override Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 6316) @@ -12,4 +12,5 @@ import java.util.LinkedList; import java.util.List; +import java.util.Map; import javax.swing.JLabel; @@ -33,5 +34,5 @@ /** The GET request arguments */ - protected HashMap args; + protected Map args; /** The request URL without "GET". */ Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 6316) @@ -51,5 +51,5 @@ int n = ways.size(); @SuppressWarnings("unchecked") - ArrayList[] newNodes = new ArrayList[n]; + List[] newNodes = new ArrayList[n]; BBox[] wayBounds = new BBox[n]; boolean[] changedWays = new boolean[n]; @@ -74,6 +74,6 @@ } - ArrayList way1Nodes = newNodes[seg1Way]; - ArrayList way2Nodes = newNodes[seg2Way]; + List way1Nodes = newNodes[seg1Way]; + List way2Nodes = newNodes[seg2Way]; //iterate over primary segmemt @@ -195,8 +195,8 @@ } - private static BBox getNodesBounds(ArrayList nodes) { + private static BBox getNodesBounds(List nodes) { BBox bounds = new BBox(nodes.get(0)); - for(Node n: nodes) { + for (Node n: nodes) { bounds.add(n.getCoor()); } Index: trunk/src/org/openstreetmap/josm/tools/I18n.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 6316) @@ -15,4 +15,5 @@ import java.util.HashMap; import java.util.Locale; +import java.util.Map; import java.util.jar.JarInputStream; import java.util.zip.ZipEntry; @@ -121,7 +122,7 @@ "OptionPane.cancelButtonText" }; - private static HashMap strings = null; - private static HashMap pstrings = null; - private static HashMap languages = new HashMap(); + private static Map strings = null; + private static Map pstrings = null; + private static Map languages = new HashMap(); /** @@ -476,15 +477,11 @@ } - private static boolean load(InputStream en, InputStream tr, boolean add) - { - HashMap s; - HashMap p; - if(add) - { + private static boolean load(InputStream en, InputStream tr, boolean add) { + Map s; + Map p; + if (add) { s = strings; p = pstrings; - } - else - { + } else { s = new HashMap(); p = new HashMap(); Index: trunk/src/org/openstreetmap/josm/tools/ImageResource.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ImageResource.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/tools/ImageResource.java (revision 6316) @@ -6,4 +6,5 @@ import java.awt.image.BufferedImage; import java.util.HashMap; +import java.util.Map; import javax.swing.ImageIcon; @@ -24,5 +25,5 @@ * Caches the image data for resized versions of the same image. */ - private HashMap imgCache = new HashMap(); + private Map imgCache = new HashMap(); private SVGDiagram svg; public static final Dimension DEFAULT_DIMENSION = new Dimension(-1, -1); Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 6316) @@ -156,5 +156,5 @@ // create a shortcut object from an string as saved in the preferences private Shortcut(String prefString) { - ArrayList s = (new ArrayList(Main.pref.getCollection(prefString))); + List s = (new ArrayList(Main.pref.getCollection(prefString))); this.shortText = prefString.substring(15); this.longText = s.get(0); Index: trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 6315) +++ trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 6316) @@ -12,4 +12,5 @@ import java.util.Iterator; import java.util.LinkedList; +import java.util.List; import java.util.Locale; import java.util.Map; @@ -46,4 +47,7 @@ private int lineNumber; + /** + * Constructs a new {@code PresetParsingException}. + */ public PresetParsingException() { super(); @@ -274,5 +278,5 @@ * The queue of already parsed items from the parsing thread. */ - private LinkedList queue = new LinkedList(); + private List queue = new LinkedList(); private Iterator queueIterator = null;