Changeset 30737 in osm for applications/editors/josm/plugins/mapdust/src/org

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/mapdust/src/org/openstreetmap/josm/plugins/mapdust

Files:

• MapdustPlugin.java (modified) (2 diffs)
• gui/MapdustGUI.java (modified) (1 diff)
• gui/action/execute/ExecuteActionList.java (modified) (1 diff)
• gui/action/execute/ExecuteAddBug.java (modified) (1 diff)
• gui/action/execute/ExecuteCloseBug.java (modified) (1 diff)
• gui/action/execute/ExecuteCommentBug.java (modified) (1 diff)
• gui/action/execute/ExecuteFilterBug.java (modified) (1 diff)
• gui/action/execute/ExecuteInvalidateBug.java (modified) (1 diff)
• gui/action/execute/ExecuteReOpenBug.java (modified) (1 diff)
• gui/action/execute/ExecuteRefresh.java (modified) (1 diff)
• gui/action/execute/ExecuteWorkOffline.java (modified) (1 diff)
• gui/component/dialog/FilterBugDialog.java (modified) (2 diffs)
• gui/component/panel/MapdustBugListPanel.java (modified) (1 diff)
• gui/component/slider/RelevanceSlider.java (modified) (1 diff)
• gui/value/MapdustRelevanceValue.java (modified) (1 diff)
• service/MapdustConverter.java (modified) (2 diffs)
• service/connector/MapdustConnector.java (modified) (3 diffs)
• service/value/BugType.java (modified) (1 diff)
• service/value/MapdustRelevance.java (modified) (1 diff)
• service/value/RelevanceRange.java (modified) (1 diff)
• service/value/Status.java (modified) (1 diff)

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java

@@ -214 +214 @@
     public synchronized void changedData(MapdustBug mapdustBug) {
         if (mapdustBugList == null) {
-            mapdustBugList = new ArrayList<MapdustBug>();
+            mapdustBugList = new ArrayList<>();
         }
         if (getMapdustGUI().isDialogShowing()) {
@@ -554 +554 @@
             } catch (MapdustServiceHandlerException e) {
                 wasError = true;
-                mapdustBugList = new ArrayList<MapdustBug>();
+                mapdustBugList = new ArrayList<>();
             }
             /* update the view */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustGUI.java

@@ -69 +69 @@
     /** The list of MapDust bug details observers */
     private final ArrayList<MapdustBugDetailsObserver> bugDetailsObservers =
-            new ArrayList<MapdustBugDetailsObserver>();
+            new ArrayList<>();
 
     /** The list of MapDust initial update observers */
     private final ArrayList<MapdustUpdateObserver> initialUpdateObservers =
-            new ArrayList<MapdustUpdateObserver>();
+            new ArrayList<>();
 
     /** The <code>MapdustPlugin</code> plug-in */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java

@@ -58 +58 @@
     /** List of MapdustRefreshObserver objects */
     private final ArrayList<MapdustUpdateObserver> observers =
-            new ArrayList<MapdustUpdateObserver>();
+            new ArrayList<>();
 
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java

@@ -71 +71 @@
     /** The list of MapDust bug observers */
     private final ArrayList<MapdustBugObserver> bugObservers =
-            new ArrayList<MapdustBugObserver>();
+            new ArrayList<>();
 
     /** The list of MapDust action observers */
     private final ArrayList<MapdustActionObserver> actionObservers =
-            new ArrayList<MapdustActionObserver>();
+            new ArrayList<>();
 
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java

@@ -67 +67 @@
     /** The list of Mapdust bug observers */
     private final ArrayList<MapdustBugObserver> bugObservers =
-            new ArrayList<MapdustBugObserver>();
+            new ArrayList<>();
 
     /** The list of Mapdust action observers */
     private final ArrayList<MapdustActionObserver> actionObservers =
-            new ArrayList<MapdustActionObserver>();
+            new ArrayList<>();
 
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java

@@ -69 +69 @@
     /** The list of MapDust bug observers */
     private final ArrayList<MapdustBugObserver> bugObservers =
-            new ArrayList<MapdustBugObserver>();
+            new ArrayList<>();
 
     /** The list of mapdust action observers */
     private final ArrayList<MapdustActionObserver> actionObservers =
-            new ArrayList<MapdustActionObserver>();
+            new ArrayList<>();
 
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteFilterBug.java

@@ -60 +60 @@
     /** The list MapDustBug filter observers */
     private final ArrayList<MapdustUpdateObserver> observers =
-            new ArrayList<MapdustUpdateObserver>();
+            new ArrayList<>();
 
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java

@@ -71 +71 @@
     /** The list of mapdust bug observers */
     private final ArrayList<MapdustBugObserver> bugObservers =
-            new ArrayList<MapdustBugObserver>();
+            new ArrayList<>();
 
     /** The list of mapdust action observers */
     private final ArrayList<MapdustActionObserver> actionObservers =
-            new ArrayList<MapdustActionObserver>();
+            new ArrayList<>();
 
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java

@@ -71 +71 @@
     /** The list of MapDust bug observers */
     private final ArrayList<MapdustBugObserver> bugObservers =
-            new ArrayList<MapdustBugObserver>();
+            new ArrayList<>();
 
     /** The list of MapDust action observers */
     private final ArrayList<MapdustActionObserver> actionObservers =
-            new ArrayList<MapdustActionObserver>();
+            new ArrayList<>();
 
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteRefresh.java

@@ -55 +55 @@
     /** The list of MapDust refresh observers */
     private final ArrayList<MapdustUpdateObserver> observers =
-            new ArrayList<MapdustUpdateObserver>();
+            new ArrayList<>();
 
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java

@@ -63 +63 @@
     /** The list of MapDust refresh observers */
     private final ArrayList<MapdustUpdateObserver> observers =
-            new ArrayList<MapdustUpdateObserver>();
+            new ArrayList<>();
 
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/FilterBugDialog.java

@@ -335 +335 @@
      */
     public List<Integer> getCheckedStatuses() {
-        List<Integer> statusList = new ArrayList<Integer>();
+        List<Integer> statusList = new ArrayList<>();
         for (FilterCheckBox filter : filterStatuses) {
             if (filter.getChbFilter().isSelected()) {
@@ -351 +351 @@
      */
     public List<String> getCheckedTypes() {
-        List<String> typeList = new ArrayList<String>();
+        List<String> typeList = new ArrayList<>();
         for (FilterCheckBox filter : filterTypes) {
             if (filter.getChbFilter().isSelected()) {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugListPanel.java

@@ -73 +73 @@
     /** The list of observers */
     private final ArrayList<MapdustBugDetailsObserver> observers =
-            new ArrayList<MapdustBugDetailsObserver>();
+            new ArrayList<>();
 
     /** The list of <code>MapdustBug</code> objects */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/slider/RelevanceSlider.java

@@ -91 +91 @@
         setFocusable(false);
         /* set label for the slider values */
-        Dictionary<Integer, JLabel> values = new Hashtable<Integer, JLabel>();
+        Dictionary<Integer, JLabel> values = new Hashtable<>();
         Font font = new Font("Times New Roman", Font.BOLD, 12);
         values.put(MapdustRelevanceValue.LOW.getSliderValue(), ComponentUtil

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/value/MapdustRelevanceValue.java

@@ -95 +95 @@
         if (MapdustRelevanceValue.map == null) {
             MapdustRelevanceValue.map =
-                    new HashMap<MapdustRelevance, Integer>();
+                    new HashMap<>();
         }
         MapdustRelevanceValue.map.put(relevance, sliderValue);

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/MapdustConverter.java

@@ -135 +135 @@
     static List<MapdustBug> buildMapdustBugList(
             MapdustGetBugsResponse bugsResponse) {
-        List<MapdustBug> bugsList = new ArrayList<MapdustBug>();
+        List<MapdustBug> bugsList = new ArrayList<>();
         if (bugsResponse != null) {
             MapdustBugContent[] bugContent = bugsResponse.getFeatures();
@@ -251 +251 @@
     private static MapdustComment[] buildMapdustCommentArray(Long bugId,
             MapdustCommentProperties[] commentProperties) {
-        List<MapdustComment> commentList = new ArrayList<MapdustComment>();
+        List<MapdustComment> commentList = new ArrayList<>();
         if (bugId != null) {
             if (commentProperties != null) {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/MapdustConnector.java

@@ -372 +372 @@
         String mapdustApiKey = Configuration.getInstance().getMapdustKey();
         String urlString = null;
-        Map<String, String> requestParameters = new HashMap<String, String>();
+        Map<String, String> requestParameters = new HashMap<>();
         if (mapdustUri != null && mapdustApiKey != null) {
             urlString = mapdustUri;
@@ -409 +409 @@
         String mapdustApiKey = Configuration.getInstance().getMapdustKey();
         String urlString = null;
-        Map<String, String> requestParameters = new HashMap<String, String>();
+        Map<String, String> requestParameters = new HashMap<>();
         if (mapdustUri != null && mapdustApiKey != null) {
             urlString = mapdustUri;
@@ -445 +445 @@
         String mapdustApiKey = Configuration.getInstance().getMapdustKey();
         String urlString = null;
-        Map<String, String> requestParameters = new HashMap<String, String>();
+        Map<String, String> requestParameters = new HashMap<>();
         if (mapdustUri != null && mapdustApiKey != null) {
             urlString = mapdustUri;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/BugType.java

@@ -69 +69 @@
         this.value = value;
         if (BugType.table == null) {
-            BugType.table = new HashMap<String, BugType>();
+            BugType.table = new HashMap<>();
         }
         BugType.table.put(key, this);

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/MapdustRelevance.java

@@ -96 +96 @@
         if (MapdustRelevance.map == null) {
             MapdustRelevance.map =
-                    new HashMap<RelevanceRange, MapdustRelevance>();
+                    new HashMap<>();
         }
         MapdustRelevance.map.put(range, this);

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/RelevanceRange.java

@@ -92 +92 @@
         this.upperValue = upperValue;
         if (set == null) {
-            set = new HashSet<RelevanceRange>();
+            set = new HashSet<>();
         }
         set.add(this);

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/Status.java

@@ -67 +67 @@
         this.value = value;
         if (Status.table == null) {
-            Status.table = new HashMap<Integer, Status>();
+            Status.table = new HashMap<>();
         }
         Status.table.put(key, this);