Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -121 +121 @@
     public static <T extends OsmPrimitive>  List<T> getFilteredList(Collection<OsmPrimitive> list, Class<T> type) {
         if (list == null) return Collections.emptyList();
-        List<T> ret = new LinkedList<T>();
+        List<T> ret = new LinkedList<>();
         for(OsmPrimitive p: list) {
             if (type.isInstance(p)) {
@@ -142 +142 @@
      */
     public static <T extends OsmPrimitive> Set<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
-        Set<T> ret = new LinkedHashSet<T>();
+        Set<T> ret = new LinkedHashSet<>();
         if (set != null) {
             for(OsmPrimitive p: set) {
@@ -161 +161 @@
      */
     public static Set<OsmPrimitive> getReferrer(Collection<? extends OsmPrimitive> primitives) {
-        HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+        HashSet<OsmPrimitive> ret = new HashSet<>();
         if (primitives == null || primitives.isEmpty()) return ret;
         for (OsmPrimitive p: primitives) {
@@ -632 +632 @@
     public static Collection<String> getUninterestingKeys() {
         if (uninteresting == null) {
-            LinkedList<String> l = new LinkedList<String>(Arrays.asList(
+            LinkedList<String> l = new LinkedList<>(Arrays.asList(
                 "source", "source_ref", "source:", "comment",
                 "converted_by", "watch", "watch:",
@@ -731 +731 @@
      */
     public Map<String, String> getInterestingTags() {
-        Map<String, String> result = new HashMap<String, String>();
+        Map<String, String> result = new HashMap<>();
         String[] keys = this.keys;
         if (keys != null) {
@@ -997 +997 @@
         checkDataset();
         Object referrers = this.referrers;
-        List<OsmPrimitive> result = new ArrayList<OsmPrimitive>();
+        List<OsmPrimitive> result = new ArrayList<>();
         if (referrers != null) {
             if (referrers instanceof OsmPrimitive) {
@@ -1298 +1298 @@
     public Collection<String> getTemplateKeys() {
         Collection<String> keySet = keySet();
-        List<String> result = new ArrayList<String>(keySet.size() + 2);
+        List<String> result = new ArrayList<>(keySet.size() + 2);
         result.add(SPECIAL_VALUE_ID);
         result.add(SPECIAL_VALUE_LOCAL_NAME);
@@ -1331 +1331 @@
      */
     public static Set<Relation> getParentRelations(Collection<? extends OsmPrimitive> primitives) {
-        HashSet<Relation> ret = new HashSet<Relation>();
+        HashSet<Relation> ret = new HashSet<>();
         for (OsmPrimitive w : primitives) {
             ret.addAll(OsmPrimitive.getFilteredList(w.getReferrers(), Relation.class));