Changeset 20839 in osm for applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsNameCommand.java

Timestamp:

2010-04-08T14:26:34+02:00 (14 years ago)

Author:

roland

Message:

Public Transport Plugin: Shelter

File:

• applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsNameCommand.java (modified) (2 diffs)

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

@@ -42 +42 @@
       waypointTM.nodes.elementAt(workingLine).put("name", name);
       waypointTM.nodes.elementAt(workingLine).put("shelter", shelter);
-      waypointTM.inEvent = true;
+    }
+    waypointTM.inEvent = true;
+    if (name == null)
+      waypointTM.setValueAt("", workingLine, 1);
+    else
       waypointTM.setValueAt(name, workingLine, 1);
-      if (shelter == null)
-        waypointTM.setValueAt("", workingLine, 2);
-      else
-        waypointTM.setValueAt(shelter, workingLine, 2);
-      waypointTM.inEvent = false;
-    }
+    if (shelter == null)
+      waypointTM.setValueAt("", workingLine, 2);
+    else
+      waypointTM.setValueAt(shelter, workingLine, 2);
+    waypointTM.inEvent = false;
     return true;
   }
@@ -59 +62 @@
       waypointTM.nodes.elementAt(workingLine).put("name", oldName);
       waypointTM.nodes.elementAt(workingLine).put("shelter", oldShelter);
-      waypointTM.inEvent = true;
+    }
+    waypointTM.inEvent = true;
+    if (oldName == null)
+      waypointTM.setValueAt("", workingLine, 1);
+    else
       waypointTM.setValueAt(oldName, workingLine, 1);
-      if (oldShelter == null)
-        waypointTM.setValueAt("", workingLine, 2);
-      else
-        waypointTM.setValueAt(oldShelter, workingLine, 2);
-      waypointTM.inEvent = false;
-    }
+    if (oldShelter == null)
+      waypointTM.setValueAt("", workingLine, 2);
+    else
+      waypointTM.setValueAt(oldShelter, workingLine, 2);
+    waypointTM.inEvent = false;
   }