Changeset 26116 in osm for applications/editors

Timestamp:

2011-06-10T16:37:51+02:00 (13 years ago)

Author:

roland

Message:

Added a 'ref' column to the stoplist.

Location:

applications/editors/josm

Files:

• dist/public_transport.jar (modified) ( previous)
• plugins/public_transport/src/public_transport/RoutePatternAction.java (modified) (5 diffs)

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

@@ -61 +61 @@
 public class RoutePatternAction extends JosmAction {
 
+  public static int STOPLIST_ROLE_COLUMN = 2;
+
   private class RoutesLSL implements ListSelectionListener {
     RoutePatternAction root = null;
@@ -261 +263 @@
 
   private class StoplistTableModel extends DefaultTableModel {
+
     public Vector<Node> nodes = new Vector<Node>();
 
     public boolean isCellEditable(int row, int column) {
-      if (column != 1)
-    return false;
+      if (column != STOPLIST_ROLE_COLUMN)
+        return false;
       return true;
     }
@@ -282 +285 @@
 
     public void insertRow(int insPos, Node node, String role) {
-      String[] buf = { "", "" };
+      String[] buf = { "", "", "" };
       String curName = node.get("name");
       if (curName != null)
       {
-    buf[0] = curName;
+        buf[0] = curName;
       }
       else
       {
-    buf[0] = "[ID] " + (new Long(node.getId())).toString();
-      }
-      buf[1] = role;
+        buf[0] = "[ID] " + (new Long(node.getId())).toString();
+      }
+      String curRef = node.get("ref");
+      if (curRef != null)
+      {
+        buf[1] = curRef;
+      }
+      buf[STOPLIST_ROLE_COLUMN] = role;
       if (insPos == -1)
       {
-    nodes.addElement(node);
-    super.addRow(buf);
+        nodes.addElement(node);
+        super.addRow(buf);
       }
       else
       {
-    nodes.insertElementAt(node, insPos);
-    super.insertRow(insPos, buf);
+        nodes.insertElementAt(node, insPos);
+        super.insertRow(insPos, buf);
       }
     }
@@ -839 +847 @@
       stoplistData = new StoplistTableModel();
       stoplistData.addColumn("Name/Id");
+      stoplistData.addColumn("Ref");
       stoplistData.addColumn("Role");
       stoplistTable.setModel(stoplistData);
@@ -846 +855 @@
       comboBox.addItem("forward_stop");
       comboBox.addItem("backward_stop");
-      stoplistTable.getColumnModel().getColumn(1)
-      .setCellEditor(new DefaultCellEditor(comboBox));
+      stoplistTable.getColumnModel().getColumn(STOPLIST_ROLE_COLUMN)
+                   .setCellEditor(new DefaultCellEditor(comboBox));
       stoplistData.addTableModelListener(new StoplistTableModelListener());