Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-04-26T17:39:23+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• CopyList.java (modified) (1 diff)
• Diff.java (modified) (1 diff)
• ExceptionUtil.java (modified) (1 diff)
• FallbackDateParser.java (modified) (1 diff)
• Geometry.java (modified) (2 diffs)
• I18n.java (modified) (3 diffs)
• ImageProvider.java (modified) (3 diffs)
• ImageResource.java (modified) (1 diff)
• MultiMap.java (modified) (5 diffs)
• MultikeyActionsHandler.java (modified) (1 diff)
• OsmUrlToBounds.java (modified) (3 diffs)
• Pair.java (modified) (2 diffs)
• Shortcut.java (modified) (4 diffs)
• TaggingPresetNameTemplateList.java (modified) (1 diff)
• TextTagParser.java (modified) (2 diffs)
• Utils.java (modified) (5 diffs)
• XmlObjectParser.java (modified) (4 diffs)
• template_engine/Condition.java (modified) (1 diff)
• template_engine/ContextSwitchTemplate.java (modified) (4 diffs)
• template_engine/TemplateParser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/CopyList.java

@@ -116 +116 @@
     @Override
     public Object clone() {
-        return new CopyList<E>(array, size);
+        return new CopyList<>(array, size);
     }
 

trunk/src/org/openstreetmap/josm/tools/Diff.java

@@ -96 +96 @@
      */
     public Diff(Object[] a, Object[] b) {
-        Map<Object,Integer> h = new HashMap<Object,Integer>(a.length + b.length);
+        Map<Object,Integer> h = new HashMap<>(a.length + b.length);
         filevec = new FileData[] { new FileData(a,h),new FileData(b,h) };
     }

trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

@@ -78 +78 @@
     public static Pair<OsmPrimitive, Collection<OsmPrimitive>> parsePreconditionFailed(String msg) {
         final String ids = "(\\d+(?:,\\d+)*)";
-        final Collection<OsmPrimitive> refs = new TreeSet<OsmPrimitive>(); // error message can contain several times the same way
+        final Collection<OsmPrimitive> refs = new TreeSet<>(); // error message can contain several times the same way
         Matcher m;
         m = Pattern.compile(".*Node (\\d+) is still used by relations " + ids + ".*").matcher(msg);

trunk/src/org/openstreetmap/josm/tools/FallbackDateParser.java

@@ -42 +42 @@
     public FallbackDateParser() {
         // Build a list of candidate date parsers.
-        dateParsers = new ArrayList<DateFormat>(formats.length);
+        dateParsers = new ArrayList<>(formats.length);
         for (String format : formats) {
             dateParsers.add(new SimpleDateFormat(format));

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -66 +66 @@
         boolean[] changedWays = new boolean[n];
 
-        Set<Node> intersectionNodes = new LinkedHashSet<Node>();
+        Set<Node> intersectionNodes = new LinkedHashSet<>();
 
         //copy node arrays for local usage.
         for (int pos = 0; pos < n; pos ++) {
-            newNodes[pos] = new ArrayList<Node>(ways.get(pos).getNodes());
+            newNodes[pos] = new ArrayList<>(ways.get(pos).getNodes());
             wayBounds[pos] = getNodesBounds(newNodes[pos]);
             changedWays[pos] = false;
@@ -828 +828 @@
 
     public static class MultiPolygonMembers {
-        public final Set<Way> outers = new HashSet<Way>();
-        public final Set<Way> inners = new HashSet<Way>();
+        public final Set<Way> outers = new HashSet<>();
+        public final Set<Way> inners = new HashSet<>();
 
         public MultiPolygonMembers(Relation multiPolygon) {

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -129 +129 @@
     private static Map<String, String> strings = null;
     private static Map<String, String[]> pstrings = null;
-    private static Map<String, PluralMode> languages = new HashMap<String, PluralMode>();
+    private static Map<String, PluralMode> languages = new HashMap<>();
 
     /**
@@ -324 +324 @@
      */
     public static final Locale[] getAvailableTranslations() {
-        Collection<Locale> v = new ArrayList<Locale>(languages.size());
+        Collection<Locale> v = new ArrayList<>(languages.size());
         if(getTranslationFile("en") != null)
         {
@@ -490 +490 @@
             p = pstrings;
         } else {
-            s = new HashMap<String, String>();
-            p = new HashMap<String, String[]>();
+            s = new HashMap<>();
+            p = new HashMap<>();
         }
         /* file format:

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -111 +111 @@
      * The icon cache
      */
-    private static final Map<String, ImageResource> cache = new HashMap<String, ImageResource>();
+    private static final Map<String, ImageResource> cache = new HashMap<>();
 
     /**
      * Caches the image data for rotated versions of the same image.
      */
-    private static final Map<Image, Map<Long, ImageResource>> ROTATE_CACHE = new HashMap<Image, Map<Long, ImageResource>>();
+    private static final Map<Image, Map<Long, ImageResource>> ROTATE_CACHE = new HashMap<>();
 
     private static final ExecutorService IMAGE_FETCHER = Executors.newSingleThreadExecutor();
@@ -677 +677 @@
         if (path != null && path.startsWith("resource://")) {
             String p = path.substring("resource://".length());
-            Collection<ClassLoader> classLoaders = new ArrayList<ClassLoader>(PluginHandler.getResourceClassLoaders());
+            Collection<ClassLoader> classLoaders = new ArrayList<>(PluginHandler.getResourceClassLoaders());
             if (additionalClassLoaders != null) {
                 classLoaders.addAll(additionalClassLoaders);
@@ -896 +896 @@
             Map<Long, ImageResource> cacheByAngle = ROTATE_CACHE.get(img);
             if (cacheByAngle == null) {
-                ROTATE_CACHE.put(img, cacheByAngle = new HashMap<Long, ImageResource>());
+                ROTATE_CACHE.put(img, cacheByAngle = new HashMap<>());
             }
 

trunk/src/org/openstreetmap/josm/tools/ImageResource.java

@@ -25 +25 @@
      * Caches the image data for resized versions of the same image.
      */
-    private Map<Dimension, Image> imgCache = new HashMap<Dimension, Image>();
+    private Map<Dimension, Image> imgCache = new HashMap<>();
     private SVGDiagram svg;
     public static final Dimension DEFAULT_DIMENSION = new Dimension(-1, -1);

trunk/src/org/openstreetmap/josm/tools/MultiMap.java

@@ -22 +22 @@
     private final Map<A, Set<B>> map;
 
+    /**
+     * Constructs a new {@code MultiMap}.
+     */
     public MultiMap() {
-        map = new HashMap<A, Set<B>>();
+        map = new HashMap<>();
     }
 
+    /**
+     * Constructs a new {@code MultiMap} with the specified initial capacity. 
+     * @param capacity the initial capacity
+     */
     public MultiMap(int capacity) {
-        map = new HashMap<A, Set<B>>(capacity);
+        map = new HashMap<>(capacity);
     }
 
@@ -38 +45 @@
         Set<B> vals = map.get(key);
         if (vals == null) {
-            vals = new LinkedHashSet<B>();
+            vals = new LinkedHashSet<>();
             map.put(key, vals);
         }
@@ -64 +71 @@
         Set<B> vals = map.get(key);
         if (vals == null) {
-            vals = new LinkedHashSet<B>(values);
+            vals = new LinkedHashSet<>(values);
             map.put(key, vals);
         }
@@ -93 +100 @@
     public Set<B> getValues(A key) {
         if (!map.containsKey(key))
-            return new LinkedHashSet<B>();
+            return new LinkedHashSet<>();
         return map.get(key);
     }
@@ -161 +168 @@
     @Override
     public String toString() {
-        List<String> entries = new ArrayList<String>(map.size());
+        List<String> entries = new ArrayList<>(map.size());
         for (A key : map.keySet()) {
             entries.add(key + "->{" + Utils.join(",", map.get(key)) + "}");

trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java

@@ -32 +32 @@
     private static final String STATUS_BAR_ID = "multikeyShortcut";
 
-    private Map<MultikeyShortcutAction, MyAction> myActions = new HashMap<MultikeyShortcutAction,MyAction>();
+    private Map<MultikeyShortcutAction, MyAction> myActions = new HashMap<>();
 
     private class MyKeyEventDispatcher implements KeyEventDispatcher {

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -44 +44 @@
         }
         String[] args = url.substring(i+1).split("&");
-        HashMap<String, String> map = new HashMap<String, String>();
+        HashMap<String, String> map = new HashMap<>();
         for (String arg : args) {
             int eq = arg.indexOf('=');
@@ -146 +146 @@
         final String shortLink = url.substring(SHORTLINK_PREFIX.length());
 
-        final Map<Character, Integer> array = new HashMap<Character, Integer>();
+        final Map<Character, Integer> array = new HashMap<>();
 
         for (int i=0; i<SHORTLINK_CHARS.length; ++i) {
@@ -229 +229 @@
         double y = Math.floor((1 - Math.log(Math.tan(Math.toRadians(lat)) + 1 / Math.cos(Math.toRadians(lat))) / Math.PI)
                 / 2 * Math.pow(2.0, zoom));
-        return new Pair<Double, Double>(x, y);
+        return new Pair<>(x, y);
     }
 

trunk/src/org/openstreetmap/josm/tools/Pair.java

@@ -44 +44 @@
 
     public static <T> ArrayList<T> toArrayList(Pair<T, T> p) {
-        ArrayList<T> l = new ArrayList<T>(2);
+        ArrayList<T> l = new ArrayList<>(2);
         l.add(p.a);
         l.add(p.b);
@@ -71 +71 @@
      */
     public static <U,V> Pair<U,V> create(U u, V v) {
-        return new Pair<U,V>(u,v);
+        return new Pair<>(u,v);
     }
 }

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -148 +148 @@
     // create a shortcut object from an string as saved in the preferences
     private Shortcut(String prefString) {
-        List<String> s = (new ArrayList<String>(Main.pref.getCollection(prefString)));
+        List<String> s = (new ArrayList<>(Main.pref.getCollection(prefString)));
         this.shortText = prefString.substring(15);
         this.longText = s.get(0);
@@ -232 +232 @@
 
     // here we store our shortcuts
-    private static Map<String, Shortcut> shortcuts = new LinkedHashMap<String, Shortcut>();
+    private static Map<String, Shortcut> shortcuts = new LinkedHashMap<>();
 
     // and here our modifier groups
-    private static Map<Integer, Integer> groups= new HashMap<Integer, Integer>();
+    private static Map<Integer, Integer> groups= new HashMap<>();
 
     // check if something collides with an existing shortcut
@@ -252 +252 @@
      */
     public static List<Shortcut> listAll() {
-        List<Shortcut> l = new ArrayList<Shortcut>();
+        List<Shortcut> l = new ArrayList<>();
         for(Shortcut c : shortcuts.values())
         {
@@ -299 +299 @@
         Main.platform.initSystemShortcuts();
         // (2) User defined shortcuts
-        LinkedList<Shortcut> newshortcuts = new LinkedList<Shortcut>();
+        LinkedList<Shortcut> newshortcuts = new LinkedList<>();
         for(String s : Main.pref.getAllPrefixCollectionKeys("shortcut.entry.")) {
             newshortcuts.add(new Shortcut(s));

trunk/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java

@@ -25 +25 @@
         return instance;
     }
-    private final List<TaggingPreset> presetsWithPattern = new LinkedList<TaggingPreset>();
+    private final List<TaggingPreset> presetsWithPattern = new LinkedList<>();
 
     private TaggingPresetNameTemplateList() {

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -58 +58 @@
         Map<String, String>  getFreeParsedTags() {
             String k, v;
-            Map<String, String> tags = new HashMap<String,String>();
+            Map<String, String> tags = new HashMap<>();
 
             while (true) {
@@ -164 +164 @@
          String[] lines = text.split(splitRegex);
          Pattern p = Pattern.compile(tagRegex);
-         Map<String, String> tags = new HashMap<String,String>();
+         Map<String, String> tags = new HashMap<>();
          String k=null, v=null;
          for (String  line: lines) {

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -122 +122 @@
 
     public static <T> Collection<T> filter(Collection<? extends T> collection, Predicate<? super T> predicate) {
-        return new FilteredCollection<T>(collection, predicate);
+        return new FilteredCollection<>(collection, predicate);
     }
 
@@ -142 +142 @@
      */
     public static <S, T extends S> SubclassFilteredCollection<S, T> filteredCollection(Collection<S> collection, final Class<T> klass) {
-        return new SubclassFilteredCollection<S, T>(collection, new Predicate<S>() {
+        return new SubclassFilteredCollection<>(collection, new Predicate<S>() {
             @Override
             public boolean evaluate(S o) {
@@ -523 +523 @@
      */
     public static <T> List<T> topologicalSort(final MultiMap<T,T> dependencies) {
-        MultiMap<T,T> deps = new MultiMap<T,T>();
+        MultiMap<T,T> deps = new MultiMap<>();
         for (T key : dependencies.keySet()) {
             deps.putVoid(key);
@@ -533 +533 @@
 
         int size = deps.size();
-        List<T> sorted = new ArrayList<T>();
+        List<T> sorted = new ArrayList<>();
         for (int i=0; i<size; ++i) {
             T parentless = null;
@@ -906 +906 @@
     public static List<String> getMatches(final Matcher m) {
         if (m.matches()) {
-            List<String> result = new ArrayList<String>(m.groupCount() + 1);
+            List<String> result = new ArrayList<>(m.groupCount() + 1);
             for (int i = 0; i <= m.groupCount(); i++) {
                 result.add(m.group(i));

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -66 +66 @@
 
     private class Parser extends DefaultHandler {
-        Stack<Object> current = new Stack<Object>();
+        Stack<Object> current = new Stack<>();
         StringBuilder characters = new StringBuilder(64);
 
@@ -186 +186 @@
         boolean onStart;
         boolean both;
-        private final Map<String, Field> fields = new HashMap<String, Field>();
-        private final Map<String, Method> methods = new HashMap<String, Method>();
+        private final Map<String, Field> fields = new HashMap<>();
+        private final Map<String, Method> methods = new HashMap<>();
 
         public Entry(Class<?> klass, boolean onStart, boolean both) {
@@ -226 +226 @@
     }
 
-    private Map<String, Entry> mapping = new HashMap<String, Entry>();
+    private Map<String, Entry> mapping = new HashMap<>();
     private DefaultHandler parser;
 
@@ -232 +232 @@
      * The queue of already parsed items from the parsing thread.
      */
-    private List<Object> queue = new LinkedList<Object>();
+    private List<Object> queue = new LinkedList<>();
     private Iterator<Object> queueIterator = null;
 

trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java

@@ -8 +8 @@
 public class Condition implements TemplateEntry {
 
-    private final List<TemplateEntry> entries = new ArrayList<TemplateEntry>();
+    private final List<TemplateEntry> entries = new ArrayList<>();
 
     public List<TemplateEntry> getEntries() {

trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java

@@ -66 +66 @@
             }
 
-            List<OsmPrimitive> result = new ArrayList<OsmPrimitive>();
+            List<OsmPrimitive> result = new ArrayList<>();
             for (OsmPrimitive child: children) {
                 for (OsmPrimitive parent: child.getReferrers(true)) {
@@ -100 +100 @@
                 parents = Collections.emptyList();
             }
-            List<OsmPrimitive> result = new ArrayList<OsmPrimitive>();
+            List<OsmPrimitive> result = new ArrayList<>();
             for (OsmPrimitive p: parents) {
                 if (p instanceof Way) {
@@ -137 +137 @@
         @Override
         List<OsmPrimitive> getPrimitives(OsmPrimitive root) {
-            List<OsmPrimitive> result = new ArrayList<OsmPrimitive>();
+            List<OsmPrimitive> result = new ArrayList<>();
             for (OsmPrimitive o: lhs.getPrimitives(root)) {
                 if (condition == null || condition.match(o)) {
@@ -168 +168 @@
         @Override
         List<OsmPrimitive> getPrimitives(OsmPrimitive root) {
-            List<OsmPrimitive> result = new ArrayList<OsmPrimitive>();
+            List<OsmPrimitive> result = new ArrayList<>();
             List<OsmPrimitive> lhsList = lhs.getPrimitives(root);
             for (OsmPrimitive o: rhs.getPrimitives(root)) {

trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java

@@ -39 +39 @@
 
     private TemplateEntry parseExpression(Collection<TokenType> endTokens) throws ParseError {
-        List<TemplateEntry> entries = new ArrayList<TemplateEntry>();
+        List<TemplateEntry> entries = new ArrayList<>();
         while (true) {
             TemplateEntry templateEntry;