Changeset 30737 in osm for applications/editors/josm/plugins/OpeningHoursEditor

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe

Files:

• OhePlugin.java (modified) (4 diffs)
• OpeningTimeUtils.java (modified) (1 diff)
• gui/OheEditor.java (modified) (1 diff)

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java

@@ -121 +121 @@
             // copied from
             // org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog[rev4079][line802]
-            Map<String, Integer> keyCount = new HashMap<String, Integer>();
-            Map<String, Map<String, Integer>> valueCount = new TreeMap<String, Map<String, Integer>>();
+            Map<String, Integer> keyCount = new HashMap<>();
+            Map<String, Map<String, Integer>> valueCount = new TreeMap<>();
             for (OsmPrimitive osm : selection) {
                 for (String key : osm.keySet()) {
@@ -131 +131 @@
                         v.put(value, v.containsKey(value) ? v.get(value) + 1 : 1);
                     } else {
-                        TreeMap<String, Integer> v = new TreeMap<String, Integer>();
+                        TreeMap<String, Integer> v = new TreeMap<>();
                         v.put(value, 1);
                         valueCount.put(key, v);
@@ -325 +325 @@
                 Main.main.undoRedo.add(new ChangePropertyCommand(selection, newkey, value));
             } else {
-                Collection<Command> commands = new Vector<Command>();
+                Collection<Command> commands = new Vector<>();
                 commands.add(new ChangePropertyCommand(selection, key, null));
                 if (value.equals(tr("<different>"))) {
-                    HashMap<String, Vector<OsmPrimitive>> map = new HashMap<String, Vector<OsmPrimitive>>();
+                    HashMap<String, Vector<OsmPrimitive>> map = new HashMap<>();
                     for (OsmPrimitive osm : selection) {
                         String val = osm.get(key);
@@ -335 +335 @@
                                 map.get(val).add(osm);
                             } else {
-                                Vector<OsmPrimitive> v = new Vector<OsmPrimitive>();
+                                Vector<OsmPrimitive> v = new Vector<>();
                                 v.add(osm);
                                 map.put(val, v);

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OpeningTimeUtils.java

@@ -15 +15 @@
      */
     public static ArrayList<int[]> convert(ArrayList<DateTime> dateTimes) {
-        ArrayList<int[]> ret = new ArrayList<int[]>(); // the list which is
+        ArrayList<int[]> ret = new ArrayList<>(); // the list which is
         // returned
         for (int i = 0; i < dateTimes.size(); ++i) { // iterate over every entry
             DateTime dateTime = dateTimes.get(i);
-            ArrayList<DateTime> newDateTimes = new ArrayList<DateTime>();
+            ArrayList<DateTime> newDateTimes = new ArrayList<>();
 
             // test if the given entry is a single dayspan
             if (dateTime.daySpans.size() == 1 && dateTime.daySpans.get(0).isSpan()) {
-                ArrayList<DaySpan> partDaySpans = new ArrayList<DaySpan>();
+                ArrayList<DaySpan> partDaySpans = new ArrayList<>();
                 int start_day = dateTime.daySpans.get(0).startDay;
 

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheEditor.java

@@ -191 +191 @@
 
         setEnabled(true);
-        timeRects = new ArrayList<TimeRect>();
+        timeRects = new ArrayList<>();
         if (time != null) {
             for (int[] timeRectValues : time) {