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

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/src/org/openstreetmap/josm/corrector

Files:

• ReverseWayTagCorrector.java (modified) (4 diffs)
• TagCorrector.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -46 +46 @@
     }
 
-    private static final Collection<Pattern> ignoredKeys = new ArrayList<Pattern>();
+    private static final Collection<Pattern> ignoredKeys = new ArrayList<>();
     static {
         for (String s : OsmPrimitive.getUninterestingKeys()) {
@@ -176 +176 @@
 
     public static List<Way> irreversibleWays(List<Way> ways) {
-        List<Way> newWays = new ArrayList<Way>(ways);
+        List<Way> newWays = new ArrayList<>(ways);
         for (Way way : ways) {
             if (isReversible(way)) {
@@ -197 +197 @@
     @Override
     public Collection<Command> execute(Way oldway, Way way) throws UserCancelException {
-        Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap =
-            new HashMap<OsmPrimitive, List<TagCorrection>>();
-
-        List<TagCorrection> tagCorrections = new ArrayList<TagCorrection>();
+        Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap = new HashMap<>();
+
+        List<TagCorrection> tagCorrections = new ArrayList<>();
         for (String key : way.keySet()) {
             String value = way.get(key);
@@ -223 +222 @@
         }
 
-        Map<OsmPrimitive, List<RoleCorrection>> roleCorrectionMap =
-            new HashMap<OsmPrimitive, List<RoleCorrection>>();
-        List<RoleCorrection> roleCorrections = new ArrayList<RoleCorrection>();
+        Map<OsmPrimitive, List<RoleCorrection>> roleCorrectionMap = new HashMap<>();
+        List<RoleCorrection> roleCorrections = new ArrayList<>();
 
         Collection<OsmPrimitive> referrers = oldway.getReferrers();

trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java

@@ -57 +57 @@
 
         if (!tagCorrectionsMap.isEmpty() || !roleCorrectionMap.isEmpty()) {
-            Collection<Command> commands = new ArrayList<Command>();
-            Map<OsmPrimitive, TagCorrectionTable> tagTableMap =
-                new HashMap<OsmPrimitive, TagCorrectionTable>();
-            Map<OsmPrimitive, RoleCorrectionTable> roleTableMap =
-                new HashMap<OsmPrimitive, RoleCorrectionTable>();
+            Collection<Command> commands = new ArrayList<>();
+            Map<OsmPrimitive, TagCorrectionTable> tagTableMap = new HashMap<>();
+            Map<OsmPrimitive, RoleCorrectionTable> roleTableMap = new HashMap<>();
 
             final JPanel p = new JPanel(new GridBagLayout());
@@ -108 +106 @@
                 }
 
-                final JLabel rolesLabel = new JLabel(
-                        tr("Roles in relations referring to"));
+                final JLabel rolesLabel = new JLabel(tr("Roles in relations referring to"));
                 p.add(rolesLabel, GBC.std());
 
@@ -119 +116 @@
                 p.add(primitiveLabel, GBC.eol());
 
-                final RoleCorrectionTable table = new RoleCorrectionTable(
-                        roleCorrections);
+                final RoleCorrectionTable table = new RoleCorrectionTable(roleCorrections);
                 final JScrollPane scrollPane = new JScrollPane(table);
                 p.add(scrollPane, GBC.eop().fill(GBC.HORIZONTAL));
@@ -156 +152 @@
                     // use this structure to remember keys that have been set already so that
                     // they're not dropped by a later step
-                    Set<String> keysChanged = new HashSet<String>();
+                    Set<String> keysChanged = new HashSet<>();
 
                     // apply all changes to this clone