Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/.settings/org.eclipse.core.resources.prefs =================================================================== --- /applications/editors/josm/plugins/HouseNumberTaggingTool/.settings/org.eclipse.core.resources.prefs (revision 29859) +++ /applications/editors/josm/plugins/HouseNumberTaggingTool/.settings/org.eclipse.core.resources.prefs (revision 29859) @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/src=UTF-8 Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/HouseNumberTaggingTool/.settings/org.eclipse.jdt.core.prefs (revision 29859) +++ /applications/editors/josm/plugins/HouseNumberTaggingTool/.settings/org.eclipse.jdt.core.prefs (revision 29859) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Index: /applications/editors/josm/plugins/buildings_tools/.project =================================================================== --- /applications/editors/josm/plugins/buildings_tools/.project (revision 29858) +++ /applications/editors/josm/plugins/buildings_tools/.project (revision 29859) @@ -1,5 +1,5 @@ - buildings_tools + JOSM-buildings_tools Index: /applications/editors/josm/plugins/dataimport/.project =================================================================== --- /applications/editors/josm/plugins/dataimport/.project (revision 29858) +++ /applications/editors/josm/plugins/dataimport/.project (revision 29859) @@ -1,5 +1,5 @@ - dataimport + JOSM-dataimport Index: /applications/editors/josm/plugins/editgpx/.project =================================================================== --- /applications/editors/josm/plugins/editgpx/.project (revision 29858) +++ /applications/editors/josm/plugins/editgpx/.project (revision 29859) @@ -1,5 +1,5 @@ - editgpx_svn + JOSM-editgpx @@ -19,5 +19,5 @@ src-common 2 - /Users/leo/dev/josm/core/src + C:/Users/leo/dev/josm/core/src Index: /applications/editors/josm/plugins/mapdust/.project =================================================================== --- /applications/editors/josm/plugins/mapdust/.project (revision 29858) +++ /applications/editors/josm/plugins/mapdust/.project (revision 29859) @@ -1,5 +1,5 @@ - mapdust + JOSM-mapdust Index: /applications/editors/josm/plugins/openstreetbugs/.project =================================================================== --- /applications/editors/josm/plugins/openstreetbugs/.project (revision 29858) +++ /applications/editors/josm/plugins/openstreetbugs/.project (revision 29859) @@ -1,5 +1,5 @@ - openstreetbugs + JOSM-openstreetbugs Index: /applications/editors/josm/plugins/public_transport/build.xml =================================================================== --- /applications/editors/josm/plugins/public_transport/build.xml (revision 29858) +++ /applications/editors/josm/plugins/public_transport/build.xml (revision 29859) @@ -5,5 +5,5 @@ - + Index: /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java (revision 29858) +++ /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java (revision 29859) @@ -1702,5 +1702,4 @@ { Vector< RelationMember > itemsToReflect = new Vector< RelationMember >(); - Vector< Double > distancesToReflect = new Vector< Double >(); int insPos = stoplistTable.getSelectedRow(); Index: /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java (revision 29858) +++ /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java (revision 29859) @@ -29,5 +29,4 @@ import org.openstreetmap.josm.data.gpx.GpxTrack; import org.openstreetmap.josm.data.gpx.WayPoint; -import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -77,6 +76,4 @@ public void actionPerformed(ActionEvent event) { - DataSet mainDataSet = Main.main.getCurrentDataSet(); - if (dialog == null) dialog = new StopImporterDialog(this); Index: /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterDialog.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterDialog.java (revision 29858) +++ /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterDialog.java (revision 29859) @@ -676,5 +676,4 @@ public static double parseTime(String s) { - double result = 0; if ((s.charAt(2) != ':') || (s.charAt(2) != ':') || (s.length() < 8)) Index: /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistNameCommand.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistNameCommand.java (revision 29858) +++ /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistNameCommand.java (revision 29859) @@ -10,90 +10,85 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive; -public class TrackStoplistNameCommand extends Command -{ - private int workingLine = 0; - private TrackReference trackref = null; - private String oldName = null; - private String name = null; - private String oldTime = null; - private String time = null; - private String oldShelter = null; - private TransText shelter = null; - private LatLon oldLatLon = null; +public class TrackStoplistNameCommand extends Command { + private int workingLine = 0; + private TrackReference trackref = null; + private String oldName = null; + private String name = null; + private String oldTime = null; + private String time = null; + private String oldShelter = null; + private TransText shelter = null; + private LatLon oldLatLon = null; - public TrackStoplistNameCommand(TrackReference trackref, int workingLine) - { - this.trackref = trackref; - this.workingLine = workingLine; - Node node = trackref.stoplistTM.nodeAt(workingLine); - if (node != null) - { - oldName = node.get("name"); - oldTime = trackref.stoplistTM.timeAt(workingLine); - oldShelter = node.get("shelter"); - oldLatLon = (LatLon)node.getCoor().clone(); - } - this.time = (String)trackref.stoplistTM.getValueAt(workingLine, 0); - this.name = (String)trackref.stoplistTM.getValueAt(workingLine, 1); - this.shelter = (TransText)trackref.stoplistTM.getValueAt(workingLine, 2); - if ("".equals(this.shelter.text)) - this.shelter = null; - } + public TrackStoplistNameCommand(TrackReference trackref, int workingLine) { + this.trackref = trackref; + this.workingLine = workingLine; + Node node = trackref.stoplistTM.nodeAt(workingLine); + if (node != null) { + oldName = node.get("name"); + oldTime = trackref.stoplistTM.timeAt(workingLine); + oldShelter = node.get("shelter"); + try { + oldLatLon = node.getCoor().clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + } + this.time = (String) trackref.stoplistTM.getValueAt(workingLine, 0); + this.name = (String) trackref.stoplistTM.getValueAt(workingLine, 1); + this.shelter = (TransText) trackref.stoplistTM.getValueAt(workingLine, 2); + if ("".equals(this.shelter.text)) + this.shelter = null; + } - public boolean executeCommand() - { - Node node = trackref.stoplistTM.nodeAt(workingLine); - if (node != null) - { - node.put("name", name); - node.put("shelter", shelter.text); - double dTime = StopImporterDialog.parseTime(time); - node.setCoor(trackref.computeCoor(dTime)); - } - trackref.inEvent = true; - if (time == null) - trackref.stoplistTM.setValueAt("", workingLine, 0); - else - trackref.stoplistTM.setValueAt(time, workingLine, 0); - if (name == null) - trackref.stoplistTM.setValueAt("", workingLine, 1); - else - trackref.stoplistTM.setValueAt(name, workingLine, 1); - trackref.stoplistTM.setValueAt(shelter, workingLine, 2); - trackref.inEvent = false; - return true; - } + public boolean executeCommand() { + Node node = trackref.stoplistTM.nodeAt(workingLine); + if (node != null) { + node.put("name", name); + node.put("shelter", shelter.text); + double dTime = StopImporterDialog.parseTime(time); + node.setCoor(trackref.computeCoor(dTime)); + } + trackref.inEvent = true; + if (time == null) + trackref.stoplistTM.setValueAt("", workingLine, 0); + else + trackref.stoplistTM.setValueAt(time, workingLine, 0); + if (name == null) + trackref.stoplistTM.setValueAt("", workingLine, 1); + else + trackref.stoplistTM.setValueAt(name, workingLine, 1); + trackref.stoplistTM.setValueAt(shelter, workingLine, 2); + trackref.inEvent = false; + return true; + } - public void undoCommand() - { - Node node = trackref.stoplistTM.nodeAt(workingLine); - if (node != null) - { - node.put("name", oldName); - node.put("shelter", oldShelter); - node.setCoor(oldLatLon); - } - trackref.inEvent = true; - if (oldTime == null) - trackref.stoplistTM.setValueAt("", workingLine, 0); - else - trackref.stoplistTM.setValueAt(oldTime, workingLine, 0); - if (oldName == null) - trackref.stoplistTM.setValueAt("", workingLine, 1); - else - trackref.stoplistTM.setValueAt(oldName, workingLine, 1); - trackref.stoplistTM.setValueAt(new TransText(oldShelter), workingLine, 2); - trackref.inEvent = false; - } + public void undoCommand() { + Node node = trackref.stoplistTM.nodeAt(workingLine); + if (node != null) { + node.put("name", oldName); + node.put("shelter", oldShelter); + node.setCoor(oldLatLon); + } + trackref.inEvent = true; + if (oldTime == null) + trackref.stoplistTM.setValueAt("", workingLine, 0); + else + trackref.stoplistTM.setValueAt(oldTime, workingLine, 0); + if (oldName == null) + trackref.stoplistTM.setValueAt("", workingLine, 1); + else + trackref.stoplistTM.setValueAt(oldName, workingLine, 1); + trackref.stoplistTM.setValueAt(new TransText(oldShelter), workingLine, 2); + trackref.inEvent = false; + } - public void fillModifiedData - (Collection< OsmPrimitive > modified, Collection< OsmPrimitive > deleted, - Collection< OsmPrimitive > added) - { - } + public void fillModifiedData(Collection modified, Collection deleted, + Collection added) { + } - @Override public String getDescriptionText() - { - return tr("Public Transport: Edit track stop list"); - } + @Override + public String getDescriptionText() { + return tr("Public Transport: Edit track stop list"); + } }; Index: /applications/editors/josm/plugins/turnlanes/.project =================================================================== --- /applications/editors/josm/plugins/turnlanes/.project (revision 29858) +++ /applications/editors/josm/plugins/turnlanes/.project (revision 29859) @@ -1,5 +1,5 @@ - turnlanes + JOSM-turnlanes Index: /applications/editors/josm/plugins/turnrestrictions/.classpath =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/.classpath (revision 29858) +++ /applications/editors/josm/plugins/turnrestrictions/.classpath (revision 29859) @@ -8,4 +8,5 @@ + Index: /applications/editors/josm/plugins/videomapping/.settings/org.eclipse.core.resources.prefs =================================================================== --- /applications/editors/josm/plugins/videomapping/.settings/org.eclipse.core.resources.prefs (revision 29858) +++ /applications/editors/josm/plugins/videomapping/.settings/org.eclipse.core.resources.prefs (revision 29859) @@ -5,2 +5,3 @@ encoding//uml/refactoring.uml=UTF-8 encoding//uml/refactoring.umlclass=UTF-8 +encoding/src=UTF-8 Index: /applications/editors/josm/plugins/waypoint_search/.project =================================================================== --- /applications/editors/josm/plugins/waypoint_search/.project (revision 29858) +++ /applications/editors/josm/plugins/waypoint_search/.project (revision 29859) @@ -1,5 +1,5 @@ - waypoint_search + JOSM-waypoint_search