Changeset 30532 in osm for applications/editors/josm/plugins/graphview

Timestamp:

2014-07-14T04:18:06+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix compilation warnings

Location:

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs

Files:

• GraphViewDialog.java (modified) (5 diffs)
• GraphViewPreferenceEditor.java (modified) (2 diffs)

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java

@@ -52 +52 @@
     private final LinkedHashMap<String, ColorScheme> availableColorSchemes;
 
-
     private final GraphViewPreferences preferences;
     private final GraphViewPlugin plugin;
 
-    private final JComboBox rulesetComboBox;
-    private final JComboBox bookmarkComboBox;
-    private final JComboBox colorSchemeComboBox;
+    private final JComboBox<String> rulesetComboBox;
+    private final JComboBox<String> bookmarkComboBox;
+    private final JComboBox<String> colorSchemeComboBox;
 
     /**
@@ -111 +110 @@
             selectionPanel.add(rulesetLabel);
 
-            rulesetComboBox = new JComboBox();
+            rulesetComboBox = new JComboBox<>();
             rulesetComboBox.addActionListener(rulesetActionListener);
             gbcComboBox.gridy = 0;
@@ -125 +124 @@
             selectionPanel.add(bookmarkLabel);
 
-            bookmarkComboBox = new JComboBox();
+            bookmarkComboBox = new JComboBox<>();
             bookmarkComboBox.addActionListener(bookmarkActionListener);
             gbcComboBox.gridy = 1;
@@ -139 +138 @@
             selectionPanel.add(colorSchemeLabel);
 
-            colorSchemeComboBox = new JComboBox();
+            colorSchemeComboBox = new JComboBox<>();
             for (String colorSchemeName : availableColorSchemes.keySet()) {
                 colorSchemeComboBox.addItem(colorSchemeName);
@@ -285 +284 @@
 
         bookmarkComboBox.addActionListener(bookmarkActionListener);
-
     }
-
 }

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java

@@ -57 +57 @@
     private JButton selectRulesetFolderButton;
 
-    private JComboBox bookmarkComboBox;
+    private JComboBox<String> bookmarkComboBox;
     private JButton editBookmarkButton;
     private JButton deleteBookmarkButton;
@@ -174 +174 @@
         vehiclePanel.setLayout(new BoxLayout(vehiclePanel, BoxLayout.Y_AXIS));
 
-        bookmarkComboBox = new JComboBox();
+        bookmarkComboBox = new JComboBox<>();
         vehiclePanel.add(bookmarkComboBox);