Changeset 30532 in osm for applications/editors/josm/plugins/routing/src/com/innovant

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix compilation warnings

Location:

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui

Files:

• RoutingDialog.java (modified) (3 diffs)
• RoutingPreferenceDialog.java (modified) (1 diff)

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java

@@ -52 +52 @@
 public class RoutingDialog extends ToggleDialog {
 
-    private final DefaultListModel model;
-    private JList jList = null;
+    private final DefaultListModel<String> model;
+    private JList<String> jList = null;
     private JScrollPane jScrollPane = null;
 
@@ -64 +64 @@
         super(tr("Routing"), "routing", tr("Open a list of routing nodes"),
                 Shortcut.registerShortcut("subwindow:routing", tr("Toggle: {0}", tr("Routing")), KeyEvent.VK_R, Shortcut.ALT_CTRL_SHIFT), 150);
-        model = new DefaultListModel();
+        model = new DefaultListModel<>();
         createLayout(getJScrollPane(), false, null);
     }
@@ -88 +88 @@
      * @return javax.swing.JList
      */
-    private JList getJList() {
+    private JList<String> getJList() {
         if (jList == null) {
-            jList = new JList();
+            jList = new JList<>();
             jList.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
             jList.setModel(model);

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java

@@ -110 +110 @@
                 JPanel p = new JPanel(new GridBagLayout());
                 p.add(new JLabel(tr("Weight")), GBC.std().insets(0, 0, 5, 0));
-                JComboBox key = new JComboBox();
+                JComboBox<String> key = new JComboBox<>();
                 for (OsmWayTypes pk : OsmWayTypes.values())
                     key.addItem(pk.getTag());