Changeset 30532 in osm for applications/editors/josm/plugins/public_transport/src

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix compilation warnings

Location:

applications/editors/josm/plugins/public_transport/src/public_transport

Files:

• GTFSImporterDialog.java (modified) (3 diffs)
• RoutePatternAction.java (modified) (10 diffs)
• StopImporterAction.java (modified) (2 diffs)
• StopImporterDialog.java (modified) (5 diffs)

applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterDialog.java

@@ -28 +28 @@
   private JDialog jDialog = null;
   private JTabbedPane tabbedPane = null;
-  private JComboBox cbStoptype = null;
+  private JComboBox<TransText> cbStoptype = null;
   private JList tracksList = null;
   private JTextField tfGPSTimeStart = null;
@@ -68 +68 @@
     contentPane.add(label);
 
-    cbStoptype = new JComboBox();
+    cbStoptype = new JComboBox<>();
     cbStoptype.setEditable(false);
     for(String type : stoptypes)
@@ -481 +481 @@
   public static double parseTime(String s)
   {
-    double result = 0;
     if ((s.charAt(2) != ':') || (s.charAt(2) != ':')
      || (s.length() < 8))

applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java

@@ -398 +398 @@
   private static JDialog jDialog = null;
   private static JTabbedPane tabbedPane = null;
-  private static DefaultListModel relsListModel = null;
+  private static DefaultListModel<RouteReference> relsListModel = null;
   private static TagTableModel requiredTagsData = null;
   private static CustomCellEditorTable requiredTagsTable = null;
@@ -410 +410 @@
   private static StoplistTableModel stoplistData = null;
   private static JTable stoplistTable = null;
-  private static JList relsList = null;
+  private static JList<RouteReference> relsList = null;
   private static JCheckBox cbRight = null;
   private static JCheckBox cbLeft = null;
@@ -418 +418 @@
   private static Vector< RelationMember > markedWays = new Vector< RelationMember >();
   private static Vector< RelationMember > markedNodes = new Vector< RelationMember >();
-
-  private static Relation copy = null;
 
   public RoutePatternAction() {
@@ -470 +468 @@
       contentPane.add(headline);
 
-      relsListModel = new DefaultListModel();
-      relsList = new JList(relsListModel);
+      relsListModel = new DefaultListModel<>();
+      relsList = new JList<>(relsListModel);
       JScrollPane rpListSP = new JScrollPane(relsList);
       String[] data = {"1", "2", "3", "4", "5", "6"};
@@ -584 +582 @@
       rowContent.add("route");
       requiredTagsData.addRow(rowContent);
-      JComboBox comboBox = new JComboBox();
+      JComboBox<String> comboBox = new JComboBox<>();
       comboBox.addItem("route");
       requiredTagsTable.setCellEditor(0, 1, new DefaultCellEditor(comboBox));
@@ -592 +590 @@
       rowContent.add(1, "bus");
       requiredTagsData.addRow(rowContent);
-      /*JComboBox*/ comboBox = new JComboBox();
+      /*JComboBox*/ comboBox = new JComboBox<>();
       comboBox.addItem("bus");
       comboBox.addItem("trolleybus");
@@ -743 +741 @@
       itineraryTable.setModel(itineraryData);
       /*JScrollPane*/ tableSP = new JScrollPane(itineraryTable);
-      /*JComboBox*/ comboBox = new JComboBox();
+      /*JComboBox*/ comboBox = new JComboBox<>();
       comboBox.addItem("");
       comboBox.addItem("forward");
@@ -867 +865 @@
       stoplistTable.setModel(stoplistData);
       /*JScrollPane*/ tableSP = new JScrollPane(stoplistTable);
-      /*JComboBox*/ comboBox = new JComboBox();
+      /*JComboBox*/ comboBox = new JComboBox<>();
       comboBox.addItem("");
       comboBox.addItem("forward_stop");
@@ -1109 +1107 @@
       Vector< RelationMember > itemsToReflect = new Vector< RelationMember >();
       Vector< RelationMember > otherItems = new Vector< RelationMember >();
-      int insPos = itineraryTable.getSelectedRow();
 
       // Temp
       Node firstNode = null;
-      Node lastNode = null;
+      //Node lastNode = null;
 
       for (int i = 0; i < currentRoute.getMembersCount(); ++i)
@@ -1136 +1133 @@
               firstNode = item.getWay().getNode(0);
           }
-          lastNode = item.getWay().getNode(item.getWay().getNodesCount() - 1);
+          //lastNode = item.getWay().getNode(item.getWay().getNodesCount() - 1);
         }
         else if (item.isNode())

applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java

@@ -38 +38 @@
 {
   private static StopImporterDialog dialog = null;
-  private static DefaultListModel tracksListModel = null;
+  private static DefaultListModel<TrackReference> tracksListModel = null;
   private static GpxData data = null;
   private static TrackReference currentTrack = null;
@@ -62 +62 @@
   }
 
-  public DefaultListModel getTracksListModel()
+  public DefaultListModel<TrackReference> getTracksListModel()
   {
     if (tracksListModel == null)
-      tracksListModel = new DefaultListModel();
+      tracksListModel = new DefaultListModel<>();
     return tracksListModel;
   }

applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterDialog.java

@@ -33 +33 @@
   private JDialog jDialog = null;
   private JTabbedPane tabbedPane = null;
-  private JComboBox cbStoptype = null;
-  private JList tracksList = null;
+  private JComboBox<TransText> cbStoptype = null;
+  private JList<TrackReference> tracksList = null;
   private JTextField tfGPSTimeStart = null;
   private JTextField tfStopwatchStart = null;
@@ -80 +80 @@
     contentPane.add(label);
 
-    DefaultListModel tracksListModel = controller.getTracksListModel();
-    tracksList = new JList(tracksListModel);
+    DefaultListModel<TrackReference> tracksListModel = controller.getTracksListModel();
+    tracksList = new JList<>(tracksListModel);
     JScrollPane rpListSP = new JScrollPane(tracksList);
     String[] data = {"1", "2", "3", "4", "5", "6"};
@@ -114 +114 @@
     contentPane.add(label);
 
-    cbStoptype = new JComboBox();
+    cbStoptype = new JComboBox<>();
     cbStoptype.setEditable(false);
     for(String type : stoptypes)
@@ -640 +640 @@
   {
     stoplistTable.setModel(model);
-    JComboBox comboBox = new JComboBox();
+    JComboBox<TransText> comboBox = new JComboBox<>();
     comboBox.addItem(new TransText(null));
     comboBox.addItem(new TransText(marktr("yes")));
@@ -661 +661 @@
   {
     waypointTable.setModel(model);
-    JComboBox comboBox = new JComboBox();
+    JComboBox<TransText> comboBox = new JComboBox<>();
     comboBox.addItem(new TransText(null));
     comboBox.addItem(new TransText(marktr("yes")));