Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 6317)
@@ -10,5 +10,4 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -16,4 +15,5 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
@@ -427,5 +427,5 @@
         }
 
-        static public NodeGraph createUndirectedGraphFromNodeWays(Collection<Way> ways) {
+        public static NodeGraph createUndirectedGraphFromNodeWays(Collection<Way> ways) {
             NodeGraph graph = new NodeGraph();
             for (Way w: ways) {
@@ -437,6 +437,6 @@
         private Set<NodePair> edges;
         private int numUndirectedEges = 0;
-        private HashMap<Node, List<NodePair>> successors;
-        private HashMap<Node, List<NodePair>> predecessors;
+        private Map<Node, List<NodePair>> successors;
+        private Map<Node, List<NodePair>> predecessors;
 
         protected void rememberSuccessor(NodePair pair) {
Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 6317)
@@ -17,4 +17,5 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
@@ -71,5 +72,5 @@
      * Remember movements, so the user can later undo it for certain nodes
      */
-    private static final HashMap<Node, EastNorth> rememberMovements = new HashMap<Node, EastNorth>();
+    private static final Map<Node, EastNorth> rememberMovements = new HashMap<Node, EastNorth>();
 
     /**
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 6317)
@@ -301,5 +301,5 @@
     // events for crossplatform key holding processing
     // thanks to http://www.arco.in-berlin.de/keyevent.html
-    private final TreeSet<Integer> set = new TreeSet<Integer>();
+    private final Set<Integer> set = new TreeSet<Integer>();
     private KeyEvent releaseEvent;
     private Timer timer;
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 6317)
@@ -367,5 +367,5 @@
     }
 
-    private boolean repaintIfRequired(HashSet<OsmPrimitive> newHighlights) {
+    private boolean repaintIfRequired(Set<OsmPrimitive> newHighlights) {
         if(!drawTargetHighlight)
             return false;
Index: trunk/src/org/openstreetmap/josm/data/APIDataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/APIDataSet.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/APIDataSet.java	(revision 6317)
@@ -10,4 +10,5 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
@@ -35,7 +36,7 @@
  */
 public class APIDataSet {
-    private LinkedList<OsmPrimitive> toAdd;
-    private LinkedList<OsmPrimitive> toUpdate;
-    private LinkedList<OsmPrimitive> toDelete;
+    private List<OsmPrimitive> toAdd;
+    private List<OsmPrimitive> toUpdate;
+    private List<OsmPrimitive> toDelete;
 
     /**
@@ -267,5 +268,5 @@
      */
     private static class RelationUploadDependencyGraph {
-        private HashMap<Relation, Set<Relation>> children;
+        private Map<Relation, Set<Relation>> children;
         private Collection<Relation> relations;
         private Set<Relation> visited;
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6317)
@@ -476,6 +476,6 @@
     }
 
-    synchronized public TreeMap<String, String> getAllColors() {
-        final TreeMap<String,String> all = new TreeMap<String,String>();
+    synchronized public Map<String, String> getAllColors() {
+        final Map<String,String> all = new TreeMap<String,String>();
         for (final Entry<String,String> e : defaults.entrySet()) {
             if (e.getKey().startsWith("color.") && e.getValue() != null) {
Index: trunk/src/org/openstreetmap/josm/data/Version.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Version.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/Version.java	(revision 6317)
@@ -8,4 +8,5 @@
 import java.net.URL;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.regex.Matcher;
@@ -74,6 +75,6 @@
     private boolean isLocalBuild;
 
-    protected HashMap<String, String> parseManifestStyleFormattedString(String content) {
-        HashMap<String, String> properties = new HashMap<String, String>();
+    protected Map<String, String> parseManifestStyleFormattedString(String content) {
+        Map<String, String> properties = new HashMap<String, String>();
         if (content == null) return properties;
         Pattern p = Pattern.compile("^([^:]+):(.*)$");
@@ -106,5 +107,5 @@
         }
 
-        HashMap<String, String> properties = parseManifestStyleFormattedString(revisionInfo);
+        Map<String, String> properties = parseManifestStyleFormattedString(revisionInfo);
         String value = properties.get("Revision");
         if (value != null) {
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 6317)
@@ -15,4 +15,5 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.Lock;
@@ -432,5 +433,5 @@
     }
 
-    private LinkedHashSet<OsmPrimitive> selectedPrimitives = new LinkedHashSet<OsmPrimitive>();
+    private Set<OsmPrimitive> selectedPrimitives = new LinkedHashSet<OsmPrimitive>();
     private Collection<OsmPrimitive> selectionSnapshot;
 
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 6317)
@@ -140,6 +140,6 @@
      * @return the sub-set of OSM primitives of type <code>type</code>
      */
-    static public <T extends OsmPrimitive>  LinkedHashSet<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
-        LinkedHashSet<T> ret = new LinkedHashSet<T>();
+    static public <T extends OsmPrimitive> Set<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
+        Set<T> ret = new LinkedHashSet<T>();
         if (set != null) {
             for(OsmPrimitive p: set) {
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java	(revision 6317)
@@ -4,4 +4,5 @@
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Map;
 
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -9,5 +10,5 @@
 /** Comparator, comparing by type and objects display names */
 public class OsmPrimitiveComparator implements Comparator<OsmPrimitive> {
-    final private HashMap<OsmPrimitive, String> cache= new HashMap<OsmPrimitive, String>();
+    final private Map<OsmPrimitive, String> cache= new HashMap<OsmPrimitive, String>();
     final private DefaultNameFormatter df = DefaultNameFormatter.getInstance();
     public boolean relationsFirst = false;
Index: trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java	(revision 6317)
@@ -139,5 +139,5 @@
     }
 
-    private final HashSet<Tag> tags = new HashSet<Tag>();
+    private final Set<Tag> tags = new HashSet<Tag>();
 
     /**
Index: trunk/src/org/openstreetmap/josm/data/osm/User.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 6317)
@@ -8,4 +8,6 @@
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -28,5 +30,5 @@
      * the map of known users
      */
-    private static HashMap<Long,User> userMap = new HashMap<Long,User>();
+    private static Map<Long,User> userMap = new HashMap<Long,User>();
     private final static User anonymous = createLocalUser(tr("<anonymous>"));
 
@@ -118,5 +120,5 @@
 
     /** the user name */
-    private final HashSet<String> names = new HashSet<String>();
+    private final Set<String> names = new HashSet<String>();
     /** the user id */
     private final long uid;
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java	(revision 6317)
@@ -6,4 +6,5 @@
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -40,7 +41,10 @@
 
     /** the history data */
-    private HashMap<PrimitiveId, ArrayList<HistoryOsmPrimitive>> data;
+    private Map<PrimitiveId, ArrayList<HistoryOsmPrimitive>> data;
     private CopyOnWriteArrayList<HistoryDataSetListener> listeners;
 
+    /**
+     * Constructs a new {@code HistoryDataSet}.
+     */
     public HistoryDataSet() {
         data = new HashMap<PrimitiveId, ArrayList<HistoryOsmPrimitive>>();
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java	(revision 6317)
@@ -34,9 +34,10 @@
     private Date timestamp;
     private long version;
-    private HashMap<String, String> tags;
+    private Map<String, String> tags;
 
     protected void ensurePositiveLong(long value, String name) {
-        if (value <= 0)
+        if (value <= 0) {
             throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value));
+        }
     }
 
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java	(revision 6317)
@@ -70,6 +70,5 @@
      * @throws IllegalArgumentException thrown if preconditions are violated
      */
-    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId,
-            Date timestamp, ArrayList<RelationMemberData> members) {
+    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List<RelationMemberData> members) {
         this(id, version, visible, user, changesetId, timestamp);
         if (members != null) {
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java	(revision 6317)
@@ -68,5 +68,5 @@
      * @throws IllegalArgumentException if preconditions are violated
      */
-    public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, ArrayList<Long> nodeIdList) throws IllegalArgumentException {
+    public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List<Long> nodeIdList) throws IllegalArgumentException {
         this(id, version, visible, user, changesetId, timestamp);
         CheckParameterUtil.ensureParameterNotNull(nodeIdList, "nodeIdList");
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java	(revision 6317)
@@ -5,4 +5,5 @@
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -33,5 +34,5 @@
     private DataSet selectionBase;
     private DataSet hull;
-    private HashMap<OsmPrimitive, PrimitiveData> mappedPrimitives;
+    private Map<OsmPrimitive, PrimitiveData> mappedPrimitives;
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 6317)
@@ -1542,36 +1542,39 @@
     }
 
-    private LinkedList<CursorInfo> Cursors = new LinkedList<CursorInfo>();
+    private LinkedList<CursorInfo> cursors = new LinkedList<CursorInfo>();
+    
     /**
      * Set new cursor.
      */
     public void setNewCursor(Cursor cursor, Object reference) {
-        if(!Cursors.isEmpty()) {
-            CursorInfo l = Cursors.getLast();
+        if (!cursors.isEmpty()) {
+            CursorInfo l = cursors.getLast();
             if(l != null && l.cursor == cursor && l.object == reference)
                 return;
             stripCursors(reference);
         }
-        Cursors.add(new CursorInfo(cursor, reference));
+        cursors.add(new CursorInfo(cursor, reference));
         setCursor(cursor);
     }
+    
     public void setNewCursor(int cursor, Object reference) {
         setNewCursor(Cursor.getPredefinedCursor(cursor), reference);
     }
+    
     /**
      * Remove the new cursor and reset to previous
      */
     public void resetCursor(Object reference) {
-        if(Cursors.isEmpty()) {
+        if (cursors.isEmpty()) {
             setCursor(null);
             return;
         }
-        CursorInfo l = Cursors.getLast();
+        CursorInfo l = cursors.getLast();
         stripCursors(reference);
-        if(l != null && l.object == reference) {
-            if(Cursors.isEmpty()) {
+        if (l != null && l.object == reference) {
+            if (cursors.isEmpty()) {
                 setCursor(null);
             } else {
-                setCursor(Cursors.getLast().cursor);
+                setCursor(cursors.getLast().cursor);
             }
         }
@@ -1580,10 +1583,10 @@
     private void stripCursors(Object reference) {
         LinkedList<CursorInfo> c = new LinkedList<CursorInfo>();
-        for(CursorInfo i : Cursors) {
+        for(CursorInfo i : cursors) {
             if(i.object != reference) {
                 c.add(i);
             }
         }
-        Cursors = c;
+        cursors = c;
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 6317)
@@ -831,6 +831,6 @@
     public class ComparePairListModel extends AbstractListModel implements ComboBoxModel {
 
-        private  int selectedIdx;
-        private final ArrayList<ComparePairType> compareModes;
+        private int selectedIdx;
+        private final List<ComparePairType> compareModes;
 
         public ComparePairListModel() {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java	(revision 6317)
@@ -30,5 +30,5 @@
     public final static String CHANGESET_IN_DETAIL_VIEW_PROP = ChangesetCacheManagerModel.class.getName() + ".changesetInDetailView";
 
-    private final ArrayList<Changeset> data = new ArrayList<Changeset>();
+    private final List<Changeset> data = new ArrayList<Changeset>();
     private DefaultListSelectionModel selectionModel;
     private Changeset changesetInDetailView;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 6317)
@@ -424,5 +424,5 @@
 
     protected static class AvailableSourcesListModel extends DefaultListModel {
-        private ArrayList<ExtendedSourceEntry> data;
+        private List<ExtendedSourceEntry> data;
         private DefaultListSelectionModel selectionModel;
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 6317)
@@ -475,5 +475,5 @@
 
     public JToolBar control = new JToolBar();
-    private HashMap<Object, ActionDefinition> buttonActions = new HashMap<Object, ActionDefinition>(30);
+    private Map<Object, ActionDefinition> buttonActions = new HashMap<Object, ActionDefinition>(30);
 
     @Override
Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java	(revision 6317)
@@ -11,4 +11,5 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Observable;
 import java.util.Set;
@@ -21,11 +22,14 @@
 
 public class PluginPreferencesModel extends Observable{
-    private final ArrayList<PluginInformation> availablePlugins = new ArrayList<PluginInformation>();
-    private final ArrayList<PluginInformation> displayedPlugins = new ArrayList<PluginInformation>();
-    private final HashMap<PluginInformation, Boolean> selectedPluginsMap = new HashMap<PluginInformation, Boolean>();
+    private final List<PluginInformation> availablePlugins = new ArrayList<PluginInformation>();
+    private final List<PluginInformation> displayedPlugins = new ArrayList<PluginInformation>();
+    private final Map<PluginInformation, Boolean> selectedPluginsMap = new HashMap<PluginInformation, Boolean>();
     private Set<String> pendingDownloads = new HashSet<String>();
     private String filterExpression;
     private Set<String> currentActivePlugins;
 
+    /**
+     * Constructs a new {@code PluginPreferencesModel}.
+     */
     public PluginPreferencesModel() {
         currentActivePlugins = new HashSet<String>();
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java	(revision 6317)
@@ -31,5 +31,5 @@
 
     /** the bare list of AutoCompletionItems */
-    private ArrayList<AutoCompletionListItem> list = null;
+    private List<AutoCompletionListItem> list = null;
     /**  the filtered list of AutoCompletionItems */
     private ArrayList<AutoCompletionListItem> filtered = null;
Index: trunk/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java	(revision 6317)
@@ -11,5 +11,5 @@
 public class TableCellEditorSupport {
     private Object editor;
-    private LinkedList<CellEditorListener> listeners;
+    private List<CellEditorListener> listeners;
 
     public TableCellEditorSupport(Object editor) {
Index: trunk/src/org/openstreetmap/josm/io/Capabilities.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/Capabilities.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/io/Capabilities.java	(revision 6317)
@@ -8,4 +8,5 @@
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.openstreetmap.josm.Main;
@@ -42,5 +43,5 @@
 public class Capabilities {
 
-    private HashMap<String, HashMap<String,String>> capabilities;
+    private Map<String, HashMap<String,String>> capabilities;
     private List<String> imageryBlacklist;
 
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 6317)
@@ -24,4 +24,5 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -75,5 +76,5 @@
 
     // The collection of instantiated OSM APIs
-    private static HashMap<String, OsmApi> instances = new HashMap<String, OsmApi>();
+    private static Map<String, OsmApi> instances = new HashMap<String, OsmApi>();
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 6316)
+++ trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 6317)
@@ -103,5 +103,5 @@
     }
 
-    private static double parseDouble(HashMap<String, String> map, String key) {
+    private static double parseDouble(Map<String, String> map, String key) {
         if (map.containsKey(key))
             return Double.parseDouble(map.get(key));