Index: applications/editors/josm/plugins/00_plugin_dir_template/build.xml
===================================================================
--- applications/editors/josm/plugins/00_plugin_dir_template/build.xml (revision 26173)
+++ applications/editors/josm/plugins/00_plugin_dir_template/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
+
+
+ ************************************************
+ ** configure these properties. Most of them will be copied to the plugins
+ ** manifest file. Property values will also show up in the list available
+ ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
+ **
+ ************************************************
+ -->
@@ -111,5 +105,4 @@
-
-
@@ -130,5 +122,4 @@
-
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ -->
@@ -175,10 +162,7 @@
Building against core revision ${coreversion.info.entry.revision}.
Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
+
+
+
Commiting the plugin source with message '${commit.message}' ...
@@ -190,8 +174,5 @@
-
-
+
Updating plugin source ...
@@ -208,8 +189,5 @@
-
-
+
@@ -230,10 +208,9 @@
-
-
+
-
-
+
+
@@ -241,5 +218,5 @@
-
+
@@ -248,9 +225,8 @@
-
+
-
Index: applications/editors/josm/plugins/ColumbusCSV/build.xml
===================================================================
--- applications/editors/josm/plugins/ColumbusCSV/build.xml (revision 26173)
+++ applications/editors/josm/plugins/ColumbusCSV/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
+
+
+
+
-
+
-
-
+
-
+
-
-
+
@@ -71,12 +68,15 @@
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -104,5 +99,4 @@
-
-
-
+
+
@@ -215,5 +202,5 @@
-
+
@@ -222,9 +209,8 @@
-
+
-
Index: applications/editors/josm/plugins/Create_grid_of_ways/build.xml
===================================================================
--- applications/editors/josm/plugins/Create_grid_of_ways/build.xml (revision 26173)
+++ applications/editors/josm/plugins/Create_grid_of_ways/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/DirectDownload/build.xml
===================================================================
--- applications/editors/josm/plugins/DirectDownload/build.xml (revision 26173)
+++ applications/editors/josm/plugins/DirectDownload/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -132,5 +127,4 @@
-
-
-
+
+
@@ -243,5 +230,5 @@
-
+
@@ -250,9 +237,8 @@
-
+
-
Index: applications/editors/josm/plugins/DirectUpload/build.xml
===================================================================
--- applications/editors/josm/plugins/DirectUpload/build.xml (revision 26173)
+++ applications/editors/josm/plugins/DirectUpload/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
***** Properties of published ${plugin.jar} *****
Commit message : '${commit.message}'
@@ -151,35 +149,33 @@
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/ElevationProfile/build.xml
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/build.xml (revision 26173)
+++ applications/editors/josm/plugins/ElevationProfile/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/DrawnPolyLine.java
===================================================================
--- applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/DrawnPolyLine.java (revision 26174)
+++ applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/DrawnPolyLine.java (revision 26174)
@@ -0,0 +1,301 @@
+package org.openstreetmap.josm.plugins.fastdraw;
+
+import java.awt.Point;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MapView;
+
+public class DrawnPolyLine {
+ MapView mv;
+ private LinkedList points = new LinkedList();
+ private LinkedList simplePoints = new LinkedList();
+ private Set used;
+ private Set fixed = new HashSet();
+
+ private int lastIdx;
+ private boolean closedFlag;
+
+ public DrawnPolyLine() {
+ clear();
+ }
+ public void setMv(MapView mv) {
+ this.mv = mv;
+ }
+
+ boolean isFixed(LatLon pp2) {
+ return fixed.contains(pp2);
+ }
+
+ LinkedList getPoints() {
+ if (simplePoints!=null) return simplePoints; else return points;
+ }
+
+ boolean wasSimplified() {
+ return (simplePoints!=null && simplePoints.size()>0);
+ }
+
+ int findClosestPoint(Point p, double d) {
+ double x=p.x, y=p.y;
+ int n=points.size();
+ int idx=-1;
+ double dist,minD=1e10;
+ for (int i=0;i 0) points.removeLast();
+ if (lastIdx>0 && lastIdxpoints.size()-1) return;
+ if (lastIdx>=points.size()-1) {
+ //System.out.println("add last "+points.size());
+ points.addLast(coor);if (points.size()>1) lastIdx++;
+ //System.out.println("lastIdx="+lastIdx);
+ }
+ else {points.add(lastIdx+1, coor); lastIdx++;
+ //System.out.println("add at "+lastIdx+"/"+points.size());
+ }
+ }
+
+ Point getLastPoint() {
+ return getPoint(points.get(lastIdx));
+ }
+
+ Point getPoint(LatLon p) {
+ return mv.getPoint(p);
+ }
+
+ /**
+ * Simplified drawn line, not touching the nodes includes in "fixed" set.
+ */
+ void simplify(double epsilon) {
+ //System.out.println("Simplify polyline...");
+ int n = points.size();
+ if (n < 3) return;
+ used = new HashSet(n);
+ int start = 0;
+ for (int i = 0; i < n; i++) {
+ LatLon p = points.get(i);
+ if (fixed.contains(p) || i == n - 1) {
+ if (start < 0) {
+ start = i;
+ } else {
+ douglasPeucker(start, i, epsilon, 0);
+ }
+ }
+ }
+ simplePoints = new LinkedList();
+ simplePoints.addAll(points);
+ simplePoints.retainAll(used);
+ //Main.map.mapView.repaint();
+ used = null;
+ }
+
+ /**
+ * Simplification of the line specified by "points" field.
+ * Remainin points are included to "used" set.
+ * @param start - starting index
+ * @param end - ending index
+ * @param epsilon - min point-to line distance in pixels (tolerance)
+ * @param depth - recursion level
+ */
+ private void douglasPeucker(int start, int end, double epsilon, int depth) {
+ if (depth > 500) return;
+ if (end - start < 1) return; // incorrect invocation
+ LatLon first = points.get(start);
+ LatLon last = points.get(end);
+ Point firstp = getPoint(first);
+ Point lastp = getPoint(last);
+ used.add(first);
+ used.add(last);
+
+ if (end - start < 2) return;
+
+ int farthest_node = -1;
+ double farthest_dist = 0;
+
+ double d = 0;
+
+ for (int i = start + 1; i < end; i++) {
+ d = pointLineDistance(getPoint(points.get(i)), firstp, lastp);
+ if (d > farthest_dist) {
+ farthest_dist = d;
+ farthest_node = i;
+ }
+ }
+
+ if (farthest_dist > epsilon) {
+ douglasPeucker(start, farthest_node, epsilon, depth + 1);
+ douglasPeucker(farthest_node, end, epsilon, depth + 1);
+ }
+ }
+
+ /** Modfified funclion from LakeWalker
+ * Gets distance from point p1 to line p2-p3
+ */
+ public double pointLineDistance(Point p1, Point p2, Point p3) {
+ double x0 = p1.x; double y0 = p1.y;
+ double x1 = p2.x; double y1 = p2.y;
+ double x2 = p3.x; double y2 = p3.y;
+ if (x2 == x1 && y2 == y1) {
+ return Math.hypot(x1 - x0, y1 - y0);
+ } else {
+ return Math.abs((x2-x1)*(y1-y0)-(x1-x0)*(y2-y1))/Math.hypot(x2 - x1,y2 - y1);
+ }
+ }
+
+ void closeLine() {
+ points.add(points.getFirst());
+ closedFlag=true;
+ }
+ boolean isClosed() {
+ return closedFlag;
+ }
+
+ void deleteNode(int idx) {
+ if (idx<=lastIdx) lastIdx--;
+ fixed.remove(points.get(idx));
+ points.remove(idx);
+ }
+ void tryToDeleteSegment(Point p) {
+ if (points.size()<3) return;
+
+ LatLon start;
+ start = findBigSegment(p);
+ ListIterator it= points.listIterator();
+ LatLon pp;
+ boolean f=false;
+ int i=0,idx=-1;
+ while (it.hasNext()) {
+ pp=it.next();
+ if (f &&(fixed.contains(pp))) {
+ // if end of line fragment reached
+ lastIdx=idx;
+ return;
+ }if (f &&(!it.hasNext())) {
+ // if end of whole line reached
+ closedFlag=false;
+ it.remove();
+ lastIdx=points.size()-1;
+ return;
+ }
+
+ // if we are deleting this segment
+ if (f) it.remove();
+ if (pp == start) {f=true;idx=i;} // next node should be removed
+ i++;
+ }
+ lastIdx=points.size()-1;
+ }
+
+ /** find starting point of the polyline line fragment close to p
+ * line fragment = segments between two fixed (green) nodes
+ * @param p
+ * @return
+ */
+ LatLon findBigSegment(Point p) {
+ if (points.size()<2) return null;
+ Iterator it1 = points.listIterator(0);
+ Iterator it2 = points.listIterator(1);
+ Point p1,p2;
+ LatLon pp1,pp2,start=null;
+ start=points.getFirst();
+ do {
+ pp1=it1.next();
+ pp2=it2.next();
+ p1 = getPoint(pp1);
+ p2 = getPoint(pp2);
+ // maintain segment start end end
+ if (fixed.contains(pp1) ) { start=pp1; }
+ if (pointSegmentDistance(p,p1,p2) < 5) {
+ return start;
+ }
+ } while (it2.hasNext());
+ return null;
+
+ }
+
+ private double pointSegmentDistance(Point p, Point p1, Point p2) {
+ double a,b,x,y,l,h,kt,kn,dist;
+ x=p.x-p1.x; y=p.y-p1.y;
+ a=p2.x-p1.x; b=p2.y-p1.y;
+ l=Math.hypot(a,b);
+ if (l==0) return Math.hypot(x, y); // p1 = p2
+ kt=(x*a+y*b)/l;
+ kn=Math.abs((-x*b+y*a)/l);
+ if (kt>=0 && kt
+
+ @Override
+ public void enterMode() {
+ if (!isEnabled()) return;
+ super.enterMode();
+ loadPrefs();
+ mv = Main.map.mapView;
+ line.setMv(mv);
+
+ if (getCurrentDataSet() == null) return;
+
+ Main.map.mapView.addMouseListener(this);
+ Main.map.mapView.addMouseMotionListener(this);
+ Main.map.mapView.addTemporaryLayer(this);
+
+ Main.map.mapView.setCursor(cursorDraw);
+
+ try {
+ Toolkit.getDefaultToolkit().addAWTEventListener(this,
+ AWTEvent.KEY_EVENT_MASK);
+ } catch (SecurityException ex) {
+ }
+ }
+
+ @Override
+ public void exitMode() {
+ super.exitMode();
+
+ Main.map.mapView.removeMouseListener(this);
+ Main.map.mapView.removeMouseMotionListener(this);
+
+ Main.map.mapView.removeTemporaryLayer(this);
+
+ try {
+ Toolkit.getDefaultToolkit().removeAWTEventListener(this);
+ } catch (SecurityException ex) {
+ }
+ savePrefs();
+ Main.map.mapView.setCursor(cursorDraw);
+ repaint();
+ }
+
+ @Override
+ public boolean layerIsSupported(Layer l) {
+ return l instanceof OsmDataLayer;
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(getEditLayer() != null);
+ }
+
+ ////////// Event listener methods
+
+ @Override
+ public void paint(Graphics2D g, MapView mv, Bounds bbox) {
+ LinkedList pts=line.getPoints();
+ if (pts.isEmpty()) return;
+
+ if (line.wasSimplified()) {
+ // we are drawing simplified version, that exists
+ g.setStroke(strokeForSimplified);
+ } else {
+ g.setStroke(strokeForOriginal);
+ }
+
+ Point p1, p2;
+ LatLon pp1, pp2;
+ p1 = line.getPoint(pts.get(0));
+ g.setColor(COLOR_FIXED);
+ g.fillOval(p1.x - 3, p1.y - 3, 7, 7);
+ Color lineColor=COLOR_NORMAL;
+ if (pts.size() > 1) {
+ Iterator it1,it2;
+ it1=pts.listIterator(0);
+ it2=pts.listIterator(1);
+ for (int i = 0; i < pts.size() - 1; i++) {
+ pp1 = it1.next();
+ p1 = line.getPoint(pp1);
+ pp2 = it2.next();
+ p2 = line.getPoint(pp2);
+ if (shift && highlighted==pp1 && nearestIdx<0) {lineColor=COLOR_SELECTEDFRAGMENT;}
+ if (!shift && line.isLastPoint(i)) { lineColor=COLOR_EDITEDFRAGMENT; }
+ g.setColor(lineColor);
+ g.drawLine(p1.x, p1.y, p2.x, p2.y);
+ // g.fillOval(p2.x - 5, p2.y - 5, 11, 11);
+ if (line.isFixed(pp2)) {
+ lineColor=COLOR_NORMAL;
+ g.setColor(COLOR_FIXED);
+ g.fillOval(p2.x - 3, p2.y - 3, 7, 7);
+ } else {
+ g.fillRect(p2.x - 1, p2.y - 1, 3, 3);
+ }
+ if (!drawing) {
+ if (shift && !line.wasSimplified() && nearestIdx==i+1 ) {
+ // highlight node to delete
+ g.setStroke(strokeForDelete);
+ g.setColor(COLOR_DELETE);
+ g.drawLine(p2.x - 5, p2.y - 5,p2.x + 5, p2.y + 5);
+ g.drawLine(p2.x - 5, p2.y + 5,p2.x + 5, p2.y - 5);
+ g.setStroke(strokeForOriginal);
+ }
+ if (ctrl && !line.wasSimplified() && nearestIdx==i+1 ) {
+ // highlight node to toggle fixation
+ g.setStroke(strokeForDelete);
+ g.setColor( line.isFixed(pp2) ? COLOR_NORMAL: COLOR_FIXED);
+ g.drawOval(p2.x - 5, p2.y - 5, 11, 11);
+ g.setStroke(strokeForOriginal);
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public void eventDispatched(AWTEvent event) {
+ if (Main.map == null || Main.map.mapView == null
+ || !Main.map.mapView.isActiveLayerDrawable()) {
+ return;
+ }
+ updateKeyModifiers((InputEvent) event);
+ if (event.getID() == KeyEvent.KEY_PRESSED) {
+ doKeyEvent((KeyEvent) event);
+ }
+ updateCursor();
+// updateStatusLine();
+ repaint();
+ }
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+ if (!isEnabled()) return;
+ if (e.getButton() != MouseEvent.BUTTON1) return;
+
+
+ int idx=line.findClosestPoint(e.getPoint(),maxDist);
+ if (idx==0 && !line.isClosed()) {
+ line.closeLine();
+ // the way should become closed
+ drawing=false;
+ dragNode=0;
+ updateCursor();
+ return;
+ }
+
+ if (ctrl && shift) newDrawing();
+ if (!ctrl && shift) {
+ if (idx>=0) {line.deleteNode(idx); nearestIdx=-1;}
+ else line.tryToDeleteSegment(e.getPoint());
+ return;
+ }
+ if (idx>=0) {
+ if (ctrl) {
+ // toggle fixed point
+ line.toggleFixed(idx);
+ }
+ // node dragging
+ dragNode=idx;
+ return;
+ }
+
+ //if (line.isClosed()) { setStatusLine(tr(SIMPLIFYMODE_MESSAGE));return; }
+ drawing = true;
+
+ LatLon p = getLatLon(e);
+ Node nd1 = getNearestNode(e.getPoint(), maxDist);
+ if (nd1!=null) {
+ // found node, make it fixed point of the line
+ //System.out.println("node "+nd1);
+ p=nd1.getCoor();
+ line.fixPoint(p);
+ }
+
+ line.addLast(p);
+ if (ctrl) line.fixPoint(p);
+ line.clearSimplifiedVersion();
+
+ setStatusLine(tr("Please move the mouse to draw new way"));
+ repaint();
+
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ if (!isEnabled()) return;
+ if (e.getButton() != MouseEvent.BUTTON1) return;
+ dragNode = -1;
+ drawing = false;
+ highlighted=null;
+ if (!line.isClosed()) setStatusLine(DRAWINGMODE_MESSAGE);
+ repaint();
+ }
+
+ @Override
+ public void mouseDragged(MouseEvent e) {
+ mouseMoved(e);
+ }
+
+ @Override
+ public void mouseMoved(MouseEvent e) {
+ if (!isEnabled()) return;
+ Node nd1 = getNearestNode(e.getPoint(), maxDist);
+ boolean nearpoint2=nd1!=null;
+ if (nearpoint!=nearpoint2) {nearpoint=nearpoint2;updateCursor();}
+
+ nearestIdx=line.findClosestPoint(e.getPoint(),maxDist);
+
+ if (!drawing) {
+ if (dragNode>=0) {
+ line.moveNode(dragNode,getLatLon(e));
+ repaint();
+ return;
+ }
+
+ if (shift) {
+ // find line fragment to highlight
+ LatLon h2=line.findBigSegment(e.getPoint());
+ if (highlighted!=h2) {
+ highlighted=h2;
+ repaint();
+ }
+ }
+ return;
+ }
+ if (line.isClosed()) setStatusLine(SIMPLIFYMODE_MESSAGE);
+
+ // do not draw points close to existing points - we do not want self-intersections
+ if (nearestIdx>=0) { return; }
+
+ Point lastP = line.getLastPoint(); // last point of line fragment being edited
+
+ if (nearpoint){
+ if ( Math.hypot(e.getX() - lastP.x, e.getY() - lastP.y) > 1e-2) {
+ line.addFixed(nd1.getCoor()); // snap to node coords
+ repaint();
+ }
+ } else {
+ if (Math.hypot(e.getX() - lastP.x, e.getY() - lastP.y) > minPixelsBetweenPoints) {
+ line.addLast(getLatLon(e)); // free mouse-drawing
+ repaint();
+ }
+ }
+
+ //statusText = getLatLon(e).toString(); updateStatusLine();
+ }
+
+ private void doKeyEvent(KeyEvent e) {
+ /// System.out.println(e);
+ if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
+ if (line.wasSimplified()) {
+ line.clearSimplifiedVersion();
+ repaint();
+ eps=startingEps;
+ }
+ back();
+ }
+ if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+ // first Enter = simplify, second = save the way
+ if (!line.wasSimplified()) {
+ line.simplify(eps);
+ setStatusLine(SIMPLIFYMODE_MESSAGE);
+ } else saveAsWay();
+ }
+ if (e.getKeyCode() == KeyEvent.VK_DOWN) {
+ // more details
+ e.consume();
+ changeEpsilon(epsilonMult);
+ }
+ if (e.getKeyCode() == KeyEvent.VK_UP) {
+ // less details
+ e.consume();
+ changeEpsilon(1/epsilonMult);
+ }
+ if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+ // less details
+ e.consume();
+ line.moveToTheEnd();
+ }
+
+
+ }
+
+ /**
+ * Updates shift and ctrl key states
+ */
+ private void updateKeyModifiers(InputEvent e) {
+ oldCtrl = ctrl;
+ oldShift = shift;
+ ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
+ shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
+ }
+
+ @Override
+ protected void updateStatusLine() {
+ Main.map.statusLine.setHelpText(statusText);
+ Main.map.statusLine.repaint();
+ }
+//
+
+//
+ public void newDrawing() {
+ eps=startingEps;
+ line.clear();
+ }
+ private void saveAsWay() {
+ List pts=line.getPoints();
+ int n = pts.size();
+ if (n == 0) return;
+
+ Collection cmds = new LinkedList();
+ int i = 0;
+ Way w = new Way();
+ LatLon first=pts.get(0);
+ Node firstNode=null;
+
+ for (LatLon p : pts) {
+ Node nd=null;
+ if (line.isFixed(p)) {
+ // there may be a node with same ccoords!
+ nd = Main.map.mapView.getNearestNode(line.getPoint(p), OsmPrimitive.isUsablePredicate);
+ }
+ if (nd==null) {
+ if (i>0 && p.equals(first)) nd=firstNode; else {
+ nd = new Node(p);
+ cmds.add(new AddCommand(nd));
+ }
+ }
+ if (nd.getCoor().isOutSideWorld()) {
+ JOptionPane.showMessageDialog(Main.parent,
+ tr("Cannot place node outside of the world."));
+ return;
+ }
+ if (i==0) firstNode=nd;
+ w.addNode(nd);
+ i++;
+ }
+ if (ctrl) {
+ // paste tags - from ctrl-shift-v
+ Set ts = new HashSet();
+ ts.add(w);
+ TagPaster tp = new TagPaster(Main.pasteBuffer.getDirectlyAdded(), ts);
+ List execute = tp.execute();
+ Map tgs=new HashMap();
+ for (Tag t : execute) {
+ w.put(t.getKey(), t.getValue());
+ }
+ }
+ cmds.add(new AddCommand(w));
+ Command c = new SequenceCommand(tr("Draw the way by mouse"), cmds);
+ Main.main.undoRedo.add(c);
+ newDrawing(); // stop drawing
+ // Select this way and switch drawing mode off
+ exitMode();
+ getCurrentDataSet().setSelected(w);
+ Main.map.selectSelectTool(false);
+ }
+
+ private void repaint() {
+ Main.map.mapView.repaint();
+ }
+
+ public void back() {
+ line.undo();
+ repaint();
+ }
+
+ void changeEpsilon(double k) {
+ //System.out.println(tr("Eps={0}", eps));
+ eps*=k;
+ /* I18N: Eps = Epsilon, the tolerance parameter */ setStatusLine(tr("Eps={0}", eps));
+ line.simplify(eps);
+ repaint();
+ }
+
+ private void setStatusLine(String tr) {
+ statusText=tr;
+ updateStatusLine();
+ }
+
+ /*private Node findClosestNode(LatLon p, double d) {
+ Node nn=null;
+ double dist,minD=1e10,x,y;
+ Point pscreen=getPoint(p); x=pscreen.x; y=pscreen.y;
+ BBox b=new BBox(new LatLon(p.lat()-deltaLatLon,p.lon()-deltaLatLon),
+ new LatLon(p.lat()+deltaLatLon,p.lon()+deltaLatLon));
+ List nodes = getCurrentDataSet().searchNodes(b);
+ for (Node n: nodes) {
+ dist = Math.sqrt(getPoint(n.getCoor()).distanceSq(x,y));
+ if (dist
+
+//
+
+ private Node getNearestNode(Point point, double maxDist) {
+ Node nd = Main.map.mapView.getNearestNode(point, OsmPrimitive.isUsablePredicate);
+ if (nd!=null && line.getPoint(nd.getCoor()).distance(point)<=maxDist) return nd;
+ else return null;
+ }
+
+ LatLon getLatLon(MouseEvent e) {
+ return mv.getLatLon(e.getX(), e.getY());
+ }
+//
+
+}
Index: applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingPlugin.java
===================================================================
--- applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingPlugin.java (revision 26174)
+++ applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingPlugin.java (revision 26174)
@@ -0,0 +1,27 @@
+/*
+ * This file is part of ImproveWayAccuracy plugin for JOSM.
+ * http://wiki.openstreetmap.org/wiki/JOSM/Plugins/ImproveWayAccuracy
+ *
+ * Licence: GPL v2 or later
+ * Author: Alexei Kasatkin, 2011
+ */
+
+package org.openstreetmap.josm.plugins.fastdraw;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.IconToggleButton;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
+public class FastDrawingPlugin extends Plugin {
+
+ public FastDrawingPlugin(PluginInformation info) {
+ super(info);
+ }
+
+ @Override
+ public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+ if (oldFrame == null && newFrame != null) {
+ Main.map.addMapMode(new IconToggleButton(new FastDrawingMode(Main.map)));
+ }
+ }
+}
Index: applications/editors/josm/plugins/FixAddresses/build.xml
===================================================================
--- applications/editors/josm/plugins/FixAddresses/build.xml (revision 26173)
+++ applications/editors/josm/plugins/FixAddresses/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
+
+
+
+
-
+
-
-
+
-
+
-
-
+
@@ -71,13 +68,16 @@
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
@@ -72,40 +67,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -124,9 +118,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
@@ -287,8 +267,7 @@
-
-
-
-
-
+
+
+
+
Index: applications/editors/josm/plugins/ImproveWayAccuracy/build.xml
===================================================================
--- applications/editors/josm/plugins/ImproveWayAccuracy/build.xml (revision 26173)
+++ applications/editors/josm/plugins/ImproveWayAccuracy/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
***** Properties of published ${plugin.jar} *****
Commit message : '${commit.message}'
@@ -224,40 +212,37 @@
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/OpeningHoursEditor/build.xml
===================================================================
--- applications/editors/josm/plugins/OpeningHoursEditor/build.xml (revision 26173)
+++ applications/editors/josm/plugins/OpeningHoursEditor/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+ ** can be changed see http://www.engr.mun.ca/~theo/JavaCC-FAQ/javacc-faq-moz.htm#tth_sEc2.5
+ **********************************************************
+ -->
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
@@ -142,5 +134,4 @@
-
-
-
+
+
@@ -253,5 +237,5 @@
-
+
@@ -260,9 +244,8 @@
-
+
-
Index: applications/editors/josm/plugins/addrinterpolation/build.xml
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/build.xml (revision 26173)
+++ applications/editors/josm/plugins/addrinterpolation/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
***** Properties of published ${plugin.jar} *****
-Commit message : '${commit.message}'
+Commit message : '${commit.message}'
Plugin-Mainversion: ${plugin.main.version}
JOSM build version: ${coreversion.info.entry.revision}
Plugin-Version : ${version.entry.commit.revision}
-***** / Properties of published ${plugin.jar} *****
-
+***** / Properties of published ${plugin.jar} *****
+
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/alignways/build.xml
===================================================================
--- applications/editors/josm/plugins/alignways/build.xml (revision 26173)
+++ applications/editors/josm/plugins/alignways/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision
+ ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message
+ : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM
+ build version: ${coreversion.info.entry.revision}
+ Plugin-Version :
+ ${version.entry.commit.revision}
+ ***** / Properties of published
+ ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision
- ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message
- : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM
- build version: ${coreversion.info.entry.revision}
- Plugin-Version :
- ${version.entry.commit.revision}
- ***** / Properties of published
- ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/build.xml
===================================================================
--- applications/editors/josm/plugins/build.xml (revision 26173)
+++ applications/editors/josm/plugins/build.xml (revision 26174)
@@ -1,9 +1,10 @@
+
-
-
+
+
-
-
+
+
@@ -25,4 +26,5 @@
+
@@ -35,4 +37,5 @@
+
@@ -41,4 +44,5 @@
+
@@ -52,4 +56,5 @@
+
@@ -67,4 +72,5 @@
+
@@ -88,4 +94,5 @@
+
@@ -96,6 +103,9 @@
+
+
+
@@ -107,4 +117,5 @@
+
@@ -113,4 +124,5 @@
+
@@ -124,4 +136,5 @@
+
@@ -129,5 +142,5 @@
-
+
@@ -141,4 +154,5 @@
+
@@ -152,5 +166,5 @@
-
-
+
+
Index: applications/editors/josm/plugins/buildings_tools/build.xml
===================================================================
--- applications/editors/josm/plugins/buildings_tools/build.xml (revision 26173)
+++ applications/editors/josm/plugins/buildings_tools/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/cadastre-fr/build.xml
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/build.xml (revision 26173)
+++ applications/editors/josm/plugins/cadastre-fr/build.xml (revision 26174)
@@ -1,2 +1,3 @@
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
@@ -49,4 +46,7 @@
+
+
+
@@ -87,80 +87,75 @@
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/colorscheme/build.xml
===================================================================
--- applications/editors/josm/plugins/colorscheme/build.xml (revision 26173)
+++ applications/editors/josm/plugins/colorscheme/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
***** Properties of published ${plugin.jar} *****
-Commit message : '${commit.message}'
+Commit message : '${commit.message}'
Plugin-Mainversion: ${plugin.main.version}
JOSM build version: ${coreversion.info.entry.revision}
Plugin-Version : ${version.entry.commit.revision}
-***** / Properties of published ${plugin.jar} *****
-
+***** / Properties of published ${plugin.jar} *****
+
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/conflation/build.xml
===================================================================
--- applications/editors/josm/plugins/conflation/build.xml (revision 26173)
+++ applications/editors/josm/plugins/conflation/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -130,5 +125,4 @@
-
-
-
+
+
@@ -241,5 +228,5 @@
-
+
@@ -248,9 +235,8 @@
-
+
-
Index: applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- applications/editors/josm/plugins/czechaddress/build.xml (revision 26173)
+++ applications/editors/josm/plugins/czechaddress/build.xml (revision 26174)
@@ -1,42 +1,29 @@
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
@@ -48,17 +35,8 @@
-
-
-
-
-
+
-
-
-
@@ -68,23 +46,16 @@
-
+
-
-
-
-
-
+
+
+
+
-
-
-
@@ -103,9 +74,5 @@
-
-
-
-
+
This target can only run inside the NetBeans IDE.
@@ -129,10 +96,6 @@
-
-
-
+
+
@@ -150,4 +113,3 @@
-
Index: applications/editors/josm/plugins/dataimport/build.xml
===================================================================
--- applications/editors/josm/plugins/dataimport/build.xml (revision 26173)
+++ applications/editors/josm/plugins/dataimport/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/download_along/build.xml
===================================================================
--- applications/editors/josm/plugins/download_along/build.xml (revision 26173)
+++ applications/editors/josm/plugins/download_along/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/editgpx/build.xml
===================================================================
--- applications/editors/josm/plugins/editgpx/build.xml (revision 26173)
+++ applications/editors/josm/plugins/editgpx/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
***** Properties of published ${plugin.jar} *****
Commit message : '${commit.message}'
@@ -155,35 +150,33 @@
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/epsg31287/build.xml
===================================================================
--- applications/editors/josm/plugins/epsg31287/build.xml (revision 26173)
+++ applications/editors/josm/plugins/epsg31287/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
+
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
@@ -135,5 +130,4 @@
-
-
-
+
+
@@ -254,5 +241,5 @@
-
+
@@ -261,9 +248,8 @@
-
+
-
Index: applications/editors/josm/plugins/ext_tools/build.xml
===================================================================
--- applications/editors/josm/plugins/ext_tools/build.xml (revision 26173)
+++ applications/editors/josm/plugins/ext_tools/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/globalsat/build.xml
===================================================================
--- applications/editors/josm/plugins/globalsat/build.xml (revision 26173)
+++ applications/editors/josm/plugins/globalsat/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/gpxfilter/build.xml
===================================================================
--- applications/editors/josm/plugins/gpxfilter/build.xml (revision 26173)
+++ applications/editors/josm/plugins/gpxfilter/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -129,5 +124,4 @@
-
-
-
+
+
@@ -240,5 +227,5 @@
-
+
@@ -247,9 +234,8 @@
-
+
-
Index: applications/editors/josm/plugins/graphview/build.xml
===================================================================
--- applications/editors/josm/plugins/graphview/build.xml (revision 26173)
+++ applications/editors/josm/plugins/graphview/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
+
+
-
@@ -111,5 +107,4 @@
-
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.core.access;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
@@ -120,5 +122,5 @@
if (currentSection != Section.NONE) {
- throw new SAXException("classes element below root child level");
+ throw new SAXException(tr("Classes element below root child level"));
}
@@ -130,7 +132,7 @@
if (currentSection != Section.CLASSES) {
- throw new SAXException("class element (" + className + ") outside classes element");
+ throw new SAXException(tr("Class element ({0}) outside classes element", className));
} else if (className == null) {
- throw new SAXException("class element without name");
+ throw new SAXException(tr("Class element without name"));
}
@@ -144,5 +146,5 @@
if (currentSection != Section.NONE) {
- throw new SAXException("classes element below root child level");
+ throw new SAXException(tr("Classes element below root child level"));
}
@@ -154,5 +156,5 @@
baseTags.add(readTag(attributes));
} else {
- throw new SAXException("tag element outside basetag and implication elements");
+ throw new SAXException(tr("Tag element outside basetag and implication elements"));
}
@@ -160,5 +162,5 @@
if (currentSection != Section.NONE) {
- throw new SAXException("implications element below root child level");
+ throw new SAXException(tr("Implications element below root child level"));
}
@@ -176,7 +178,7 @@
if (key == null) {
- throw new SAXException("tag without key");
+ throw new SAXException(tr("Tag without key"));
} else if (value == null) {
- throw new SAXException("tag without value (key is " + key + ")");
+ throw new SAXException(tr("Tag without value (key is {0})", key));
}
@@ -195,7 +197,7 @@
if (currentSection != Section.CLASSES) {
- throw new SAXException("closed classes while it wasn't open");
+ throw new SAXException(tr("Closed classes while it was not open"));
} else if (currentAccessClass != null) {
- throw new SAXException("closed classes element before all class elements were closed");
+ throw new SAXException(tr("Closed classes element before all class elements were closed"));
}
@@ -205,5 +207,5 @@
if (currentAccessClass == null) {
- throw new SAXException("closed class element while none was open");
+ throw new SAXException(tr("Closed class element while none was open"));
}
@@ -213,5 +215,5 @@
if (currentSection != Section.BASETAGS) {
- throw new SAXException("closed basetags while it wasn't open");
+ throw new SAXException(tr("Closed basetags while it was not open"));
}
@@ -221,5 +223,5 @@
if (currentSection != Section.IMPLICATIONS) {
- throw new SAXException("closed implications while it wasn't open");
+ throw new SAXException(tr("Closed implications while it was not open"));
}
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.core.access;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
@@ -67,5 +69,5 @@
if ("tag".equals(name)) {
if (tagOpen) {
- throw new SAXException("tag element inside other tag element");
+ throw new SAXException(tr("Tag element inside other tag element"));
}
currentImpliedTags.add(readTag(attributes));
@@ -78,5 +80,5 @@
//all vaild paths end with return; reaching this indicates an invalid tag
- throw new SAXException("invalid opening xml tag <" + name + "> in state " + state);
+ throw new SAXException(tr("Invalid opening xml tag <{0}> in state {1}", name, state));
}
@@ -91,5 +93,5 @@
if (name.equals("condition")) {
if (!currentConditionReader.isFinished()) {
- throw new SAXException("condition isn't finished at tag");
+ throw new SAXException(tr("Condition isn't finished at tag"));
} else {
currentCondition = currentConditionReader.getCondition();
@@ -110,5 +112,5 @@
} else if (name.equals("tag")) {
if (!tagOpen) {
- throw new SAXException("closing tag element that was not open");
+ throw new SAXException(tr("Closing tag element that was not open"));
}
tagOpen = false;
@@ -131,5 +133,5 @@
//all vaild paths end with return; reaching this indicates an invalid tag
- throw new SAXException("invalid closing xml tag in state " + state);
+ throw new SAXException(tr("Invalid closing xml tag in state {1}", name, state));
}
@@ -138,5 +140,5 @@
if (state != State.BEFORE_IMPLICATION) {
- throw new SAXException("some tags not been closed; now in state " + state);
+ throw new SAXException(tr("Some tags not been closed; now in state {0}", state));
} else {
return new ArrayList(implications);
@@ -150,7 +152,7 @@
if (key == null) {
- throw new SAXException("tag without key");
+ throw new SAXException(tr("Tag without key"));
} else if (value == null) {
- throw new SAXException("tag without value (key is " + key + ")");
+ throw new SAXException(tr("Tag without value (key is {0})", key));
}
@@ -163,5 +165,5 @@
if (key == null) {
- throw new SAXException("key element without attribute k");
+ throw new SAXException(tr("Key element without attribute k"));
}
@@ -185,5 +187,5 @@
if (finished) {
- throw new SAXException("condition is already finished at <" + name + ">");
+ throw new SAXException(tr("Condition is already finished at <{0}>", name));
}
@@ -203,5 +205,5 @@
condition = TagConditionLogic.key(readKey(attributes));
} else if (!("or".equals(name)) && !("and".equals(name)) && !("not".equals(name))) {
- throw new SAXException("unknown tag for condition: " + name);
+ throw new SAXException(tr("Unknown tag for condition: {0}", name));
}
@@ -210,5 +212,5 @@
if ("tag".equals(openingName) || "key".equals(openingName)) {
- throw new SAXException("element must not have childs: " + openingName);
+ throw new SAXException(tr("Element must not have childs: {0}", openingName));
}
@@ -224,5 +226,5 @@
if (finished) {
- throw new SAXException("condition is already finished at ");
+ throw new SAXException(tr("Condition is already finished at ", name));
}
@@ -250,5 +252,5 @@
condition = TagConditionLogic.and(childConditions);
} else {
- throw new SAXException(" needs at least one child");
+ throw new SAXException(tr(" needs at least one child"));
}
} else if ("or".equals(openingName)) {
@@ -256,5 +258,5 @@
condition = TagConditionLogic.or(childConditions);
} else {
- throw new SAXException(" needs at least one child");
+ throw new SAXException(tr(" needs at least one child"));
}
} else if ("not".equals(openingName)) {
@@ -262,5 +264,5 @@
condition = TagConditionLogic.not(childConditions.get(0));
} else {
- throw new SAXException(" needs at least one child");
+ throw new SAXException(tr(" needs at least one child"));
}
}
@@ -269,6 +271,5 @@
} else {
- throw new SAXException("wrong closing tag " + name +
- " ( expected");
+ throw new SAXException(tr("Wrong closing tag {0} ( expected)", name, openingName));
}
@@ -283,5 +284,5 @@
public TagCondition getCondition() {
if (!finished) {
- throw new IllegalStateException("condition " + openingName + " not yet finished");
+ throw new IllegalStateException(tr("Condition {0} not yet finished", openingName));
} else {
assert condition != null;
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/ConnectorEvaluationGroup.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/ConnectorEvaluationGroup.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/ConnectorEvaluationGroup.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.core.graph;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
@@ -60,5 +62,5 @@
assert targetNode != null && borderNodes.contains(targetNode);
- if (!evaluated) { throw new IllegalStateException("group not yet evaluated"); }
+ if (!evaluated) { throw new IllegalStateException(tr("Group not yet evaluated")); }
int inboundIndex = borderNodes.indexOf(startNode);
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/JunctionEvaluationGroup.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/JunctionEvaluationGroup.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/JunctionEvaluationGroup.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.core.graph;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
@@ -36,5 +38,5 @@
*/
public Collection getInboundSegments() {
- if (!evaluated) { throw new IllegalStateException("group not yet evaluated"); }
+ if (!evaluated) { throw new IllegalStateException(tr("Group not yet evaluated")); }
return inboundSegments;
}
@@ -47,5 +49,5 @@
*/
public Collection getOutboundSegments() {
- if (!evaluated) { throw new IllegalStateException("group not yet evaluated"); }
+ if (!evaluated) { throw new IllegalStateException(tr("Group not yet evaluated")); }
return outboundSegments;
}
@@ -66,5 +68,5 @@
assert outboundSegment != null && outboundSegments.contains(outboundSegment);
- if (!evaluated) { throw new IllegalStateException("group not yet evaluated"); }
+ if (!evaluated) { throw new IllegalStateException(tr("Group not yet evaluated")); }
int inboundIndex = inboundSegments.indexOf(inboundSegment);
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadValueLimit.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadValueLimit.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadValueLimit.java (revision 26174)
@@ -67,5 +67,5 @@
case MINIMUM: return vehicleValue >= (Float) propertyValue;
case MAXIMUM: return vehicleValue <= (Float) propertyValue;
- default: throw new Error("unhandled LimitType");
+ default: throw new Error("Unhandled LimitType");
}
} else {
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogic.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogic.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogic.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.core.util;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Collection;
@@ -88,5 +90,5 @@
public static TagCondition and(final Collection conditions) {
if (conditions.size() == 0) {
- throw new IllegalArgumentException("collection must contain at least one condition");
+ throw new IllegalArgumentException(tr("Collection must contain at least one condition"));
}
return new TagCondition() {
@@ -155,5 +157,5 @@
public static TagCondition or(final Collection conditions) {
if (conditions.size() == 0) {
- throw new IllegalArgumentException("collection must contain at least one condition");
+ throw new IllegalArgumentException(tr("Collection must contain at least one condition"));
}
return new TagCondition() {
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.plugin;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.File;
@@ -92,5 +94,5 @@
if (accessRuleset == null) {
- JOptionPane.showMessageDialog(Main.parent, "No ruleset has been selected!", "No ruleset", JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(Main.parent, tr("No ruleset has been selected!"), tr("No ruleset"), JOptionPane.ERROR_MESSAGE);
} else {
transitionStructure.setAccessParametersAndRuleset(preferences.getCurrentParameterBookmark(), accessRuleset);
@@ -103,6 +105,6 @@
if (accessRuleset == null) {
- JOptionPane.showMessageDialog(Main.parent, "No ruleset has been selected!",
- "No ruleset", JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(Main.parent, tr("No ruleset has been selected!"),
+ tr("No ruleset"), JOptionPane.ERROR_MESSAGE);
} else {
@@ -126,11 +128,11 @@
} catch (AccessRulesetSyntaxException e) {
- JOptionPane.showMessageDialog(Main.parent, "syntax exception in access ruleset:\n" + e);
+ JOptionPane.showMessageDialog(Main.parent, tr("Syntax exception in access ruleset:\n{0}", e));
e.printStackTrace();
} catch (FileNotFoundException e) {
- JOptionPane.showMessageDialog(Main.parent, "file not found:\n" + e);
+ JOptionPane.showMessageDialog(Main.parent, tr("File not found:\n{0}", e));
e.printStackTrace();
} catch (IOException e) {
- JOptionPane.showMessageDialog(Main.parent, "problem when accessing a file:\n" + e);
+ JOptionPane.showMessageDialog(Main.parent, tr("Problem when accessing a file:\n{0}", e));
e.printStackTrace();
}
@@ -148,6 +150,6 @@
if (accessRuleset == null) {
- JOptionPane.showMessageDialog(Main.parent, "No ruleset has been selected!",
- "No ruleset", JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(Main.parent, tr("No ruleset has been selected!"),
+ tr("No ruleset"), JOptionPane.ERROR_MESSAGE);
} else {
transitionStructure.setAccessParametersAndRuleset(
@@ -159,11 +161,11 @@
} catch (AccessRulesetSyntaxException e) {
- JOptionPane.showMessageDialog(Main.parent, "syntax exception in access ruleset:\n" + e);
+ JOptionPane.showMessageDialog(Main.parent, tr("Syntax exception in access ruleset:\n{0}", e));
e.printStackTrace();
} catch (FileNotFoundException e) {
- JOptionPane.showMessageDialog(Main.parent, "file not found:\n" + e);
+ JOptionPane.showMessageDialog(Main.parent, tr("File not found:\n", e));
e.printStackTrace();
} catch (IOException e) {
- JOptionPane.showMessageDialog(Main.parent, "problem when accessing a file:\n" + e);
+ JOptionPane.showMessageDialog(Main.parent, tr("Problem when accessing a file:\n{0}", e));
e.printStackTrace();
}
@@ -206,5 +208,5 @@
rulesetInputStream = rulesetURL.openStream();
} else {
- throw new FileNotFoundException("couldn't find built-in ruleset " + ruleset);
+ throw new FileNotFoundException(tr("Couldn't find built-in ruleset {0}", ruleset));
}
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.plugin.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.plugins.graphview.core.property.VehiclePropertyTypes.MAX_INCLINE_DOWN;
@@ -50,10 +52,10 @@
static {
FLOAT_PROPERTIES = new LinkedHashMap, String>();
- FLOAT_PROPERTIES.put(VehiclePropertyTypes.HEIGHT, "height (m)");
- FLOAT_PROPERTIES.put(VehiclePropertyTypes.WIDTH, "width (m)");
- FLOAT_PROPERTIES.put(VehiclePropertyTypes.LENGTH, "length (m)");
- FLOAT_PROPERTIES.put(VehiclePropertyTypes.SPEED, "speed (km/h)");
- FLOAT_PROPERTIES.put(VehiclePropertyTypes.WEIGHT, "weight (t)");
- FLOAT_PROPERTIES.put(VehiclePropertyTypes.AXLELOAD, "axleload (t)");
+ FLOAT_PROPERTIES.put(VehiclePropertyTypes.HEIGHT, tr("height (m)"));
+ FLOAT_PROPERTIES.put(VehiclePropertyTypes.WIDTH, tr("width (m)"));
+ FLOAT_PROPERTIES.put(VehiclePropertyTypes.LENGTH, tr("length (m)"));
+ FLOAT_PROPERTIES.put(VehiclePropertyTypes.SPEED, tr("speed (km/h)"));
+ FLOAT_PROPERTIES.put(VehiclePropertyTypes.WEIGHT, tr("weight (t)"));
+ FLOAT_PROPERTIES.put(VehiclePropertyTypes.AXLELOAD, tr("axleload (t)"));
}
@@ -67,5 +69,5 @@
public BookmarkNamePanel(String initialName) {
super();
- this.setBorder(BorderFactory.createTitledBorder("bookmark name"));
+ this.setBorder(BorderFactory.createTitledBorder(tr("Bookmark name")));
this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
@@ -81,5 +83,5 @@
if (existingBookmarkNames.contains(name)) {
- JOptionPane.showMessageDialog(this, "Bookmark name already exists!");
+ JOptionPane.showMessageDialog(this, tr("Bookmark name already exists!"));
return null;
}
@@ -87,6 +89,5 @@
for (char nameChar : name.toCharArray()) {
if (FORBIDDEN_CHARS.contains(nameChar)) {
- JOptionPane.showMessageDialog(this, "Bookmark name must not contain '" +
- nameChar + "'!");
+ JOptionPane.showMessageDialog(this, tr("Bookmark name must not contain ''{0}''!", nameChar));
return null;
}
@@ -103,5 +104,5 @@
public AccessClassPanel(PreferenceAccessParameters initialParameters) {
super();
- this.setBorder(BorderFactory.createTitledBorder("access class"));
+ this.setBorder(BorderFactory.createTitledBorder(tr("Access class")));
this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
@@ -118,6 +119,5 @@
for (char nameChar : name.toCharArray()) {
if (FORBIDDEN_CHARS.contains(nameChar)) {
- JOptionPane.showMessageDialog(this, "Access class must not contain '" +
- nameChar + "'!");
+ JOptionPane.showMessageDialog(this, tr("Access class must not contain ''{0}''!", nameChar));
return null;
}
@@ -137,5 +137,5 @@
public AccessTypesPanel(PreferenceAccessParameters initialParameters) {
super();
- this.setBorder(BorderFactory.createTitledBorder("access types"));
+ this.setBorder(BorderFactory.createTitledBorder(tr("Access types")));
this.setLayout(
@@ -174,5 +174,5 @@
public VehiclePropertiesPanel(PreferenceAccessParameters initialParameters) {
super();
- this.setBorder(BorderFactory.createTitledBorder("vehicle properties"));
+ this.setBorder(BorderFactory.createTitledBorder(tr("Vehicle properties")));
this.setLayout(new GridLayout(((COLS-1 + FLOAT_PROPERTIES.size()) / COLS),
@@ -223,5 +223,5 @@
public RoadQualityPanel(PreferenceAccessParameters initialParameters) {
super();
- this.setBorder(BorderFactory.createTitledBorder("road requirements"));
+ this.setBorder(BorderFactory.createTitledBorder(tr("Road requirements")));
@@ -230,6 +230,6 @@
/* incline up */
{
- JLabel inclineUpLabel = new JLabel("max. incline up (%, pos.)");
- inclineUpLabel.setToolTipText("maximum incline the vehicle can go up");
+ JLabel inclineUpLabel = new JLabel(tr("Max. incline up (%, pos.)"));
+ inclineUpLabel.setToolTipText(tr("Maximum incline the vehicle can go up"));
this.add(inclineUpLabel);
@@ -241,5 +241,5 @@
inclineUpTextField.setText(vehiclePropertyString);
}
- inclineUpTextField.setToolTipText("maximum incline the vehicle can go up");
+ inclineUpTextField.setToolTipText(tr("Maximum incline the vehicle can go up"));
this.add(inclineUpTextField);
@@ -248,6 +248,6 @@
/* incline down */
{
- JLabel inclineDownLabel = new JLabel("max. incline down (%, pos.)");
- inclineDownLabel.setToolTipText("maximum incline the vehicle can go down");
+ JLabel inclineDownLabel = new JLabel(tr("Max. incline down (%, pos.)"));
+ inclineDownLabel.setToolTipText(tr("Maximum incline the vehicle can go down"));
this.add(inclineDownLabel);
@@ -259,5 +259,5 @@
inclineDownTextField.setText(vehiclePropertyString);
}
- inclineDownTextField.setToolTipText("maximum incline the vehicle can go down");
+ inclineDownTextField.setToolTipText(tr("Maximum incline the vehicle can go down"));
this.add(inclineDownTextField);
@@ -266,7 +266,7 @@
/* surface */
{
- JLabel surfaceLabel = new JLabel("surface blacklist");
- surfaceLabel.setToolTipText("list of surfaces the vehicle cannot use, "
- + "values are separated by semicolons (;)");
+ JLabel surfaceLabel = new JLabel(tr("Surface blacklist"));
+ surfaceLabel.setToolTipText(tr("List of surfaces the vehicle cannot use, "
+ + "values are separated by semicolons (;)"));
this.add(surfaceLabel);
@@ -280,6 +280,6 @@
}
- surfaceTextField.setToolTipText("list of surfaces the vehicle cannot use, "
- + "values are separated by semicolons (;)");
+ surfaceTextField.setToolTipText(tr("List of surfaces the vehicle cannot use, "
+ + "values are separated by semicolons (;)"));
this.add(surfaceTextField);
@@ -288,7 +288,7 @@
/* tracktype */
{
- JLabel tracktypeLabel = new JLabel("max. tracktype grade");
- tracktypeLabel.setToolTipText("worst tracktype (1-5) the vehicle can still use,"
- + " 0 for none");
+ JLabel tracktypeLabel = new JLabel(tr("max. tracktype grade"));
+ tracktypeLabel.setToolTipText(tr("Worst tracktype (1-5) the vehicle can still use,"
+ + " 0 for none"));
this.add(tracktypeLabel);
@@ -300,6 +300,6 @@
tracktypeTextField.setText(vehiclePropertyString);
}
- tracktypeTextField.setToolTipText("worst tracktype (1-5) the vehicle can still use,"
- + " 0 for none");
+ tracktypeTextField.setToolTipText(tr("Worst tracktype (1-5) the vehicle can still use,"
+ + " 0 for none"));
this.add(tracktypeTextField);
@@ -343,5 +343,5 @@
new BoxLayout(this, BoxLayout.X_AXIS);
- JButton okButton = new JButton(existingBookmark?"Change bookmark":"Create bookmark");
+ JButton okButton = new JButton(existingBookmark?tr("Change bookmark"):tr("Create bookmark"));
okButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -358,5 +358,5 @@
this.add(okButton);
- JButton cancelButton = new JButton("Cancel");
+ JButton cancelButton = new JButton(tr("Cancel"));
cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -384,5 +384,5 @@
Collection existingBookmarkNames,
PreferenceAccessParameters initialAccessParameters, BookmarkAction okAction) {
- super(owner, "edit access parameters", true);
+ super(owner, tr("Edit access parameters"), true);
this.existingBookmark = existingBookmark;
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.plugin.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.BorderLayout;
@@ -65,6 +67,6 @@
public GraphViewDialog(final GraphViewPlugin plugin) {
- super("Graph View Dialog", "graphview",
- "Open the dialog for graph view configuration.", (Shortcut)null, HEIGHT);
+ super(tr("Graph View Dialog"), "graphview",
+ tr("Open the dialog for graph view configuration."), (Shortcut)null, HEIGHT);
this.preferences = GraphViewPreferences.getInstance();
@@ -73,15 +75,15 @@
availableColorSchemes = new LinkedHashMap();
- availableColorSchemes.put("default",
+ availableColorSchemes.put(tr("default"),
new PreferencesColorScheme(preferences));
- availableColorSchemes.put("end nodes",
+ availableColorSchemes.put(tr("end nodes"),
new EndNodeColorScheme(Color.GRAY, Color.RED, Color.GRAY));
- availableColorSchemes.put("maxspeed",
+ availableColorSchemes.put(tr("maxspeed"),
new MaxspeedColorScheme());
- availableColorSchemes.put("maxweight",
+ availableColorSchemes.put(tr("maxweight"),
new MaxweightColorScheme());
- availableColorSchemes.put("maxheight",
+ availableColorSchemes.put(tr("maxheight"),
new MaxheightColorScheme());
- availableColorSchemes.put("incline",
+ availableColorSchemes.put(tr("incline"),
new InclineColorScheme());
@@ -103,5 +105,5 @@
/* create ruleset label and combo box */
{
- JLabel rulesetLabel = new JLabel("ruleset:");
+ JLabel rulesetLabel = new JLabel(tr("Ruleset:"));
gbcLabel.gridy = 0;
selectionLayout.setConstraints(rulesetLabel, gbcLabel);
@@ -117,5 +119,5 @@
/* create bookmark label and combo box */
{
- JLabel bookmarkLabel = new JLabel("parameters:");
+ JLabel bookmarkLabel = new JLabel(tr("Parameters:"));
gbcLabel.gridy = 1;
selectionLayout.setConstraints(bookmarkLabel, gbcLabel);
@@ -131,5 +133,5 @@
/* create color scheme label and combo box */
{
- JLabel colorSchemeLabel = new JLabel("coloring:");
+ JLabel colorSchemeLabel = new JLabel(tr("Coloring:"));
gbcLabel.gridy = 2;
selectionLayout.setConstraints(colorSchemeLabel, gbcLabel);
@@ -154,5 +156,5 @@
JPanel buttonPanel = new JPanel();
- JButton showLayerButton = new JButton("create/update graph");
+ JButton showLayerButton = new JButton(tr("Create/update graph"));
showLayerButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.plugin.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
@@ -59,6 +61,6 @@
readPreferences();
- preferencePanel = gui.createPreferenceTab("graphview", "Graphview",
- "Settings for the Graphview plugin that visualizes routing graphs.");
+ preferencePanel = gui.createPreferenceTab("graphview", tr("Graphview"),
+ tr("Settings for the Graphview plugin that visualizes routing graphs."));
JPanel mainPanel = createMainPanel();
@@ -123,13 +125,13 @@
JPanel rulesetPanel = new JPanel();
- rulesetPanel.setBorder(BorderFactory.createTitledBorder("ruleset"));
+ rulesetPanel.setBorder(BorderFactory.createTitledBorder(tr("Ruleset")));
rulesetPanel.setLayout(new BoxLayout(rulesetPanel, BoxLayout.Y_AXIS));
- internalRulesetCheckBox = new JCheckBox("use built-in rulesets");
+ internalRulesetCheckBox = new JCheckBox(tr("Use built-in rulesets"));
internalRulesetCheckBox.setSelected(GraphViewPreferences.getInstance().getUseInternalRulesets());
internalRulesetCheckBox.addActionListener(internalRulesetActionListener);
rulesetPanel.add(internalRulesetCheckBox);
- rulesetFolderLabel = new JLabel("external ruleset directory:");
+ rulesetFolderLabel = new JLabel(tr("Wxternal ruleset directory:"));
rulesetPanel.add(rulesetFolderLabel);
@@ -139,5 +141,5 @@
rulesetPanel.add(rulesetFolderTextField);
- selectRulesetFolderButton = new JButton("select directory");
+ selectRulesetFolderButton = new JButton(tr("Select directory"));
selectRulesetFolderButton.addActionListener(selectRulesetFolderActionListener);
rulesetPanel.add(selectRulesetFolderButton);
@@ -151,5 +153,5 @@
JPanel vehiclePanel = new JPanel();
- vehiclePanel.setBorder(BorderFactory.createTitledBorder("vehicle"));
+ vehiclePanel.setBorder(BorderFactory.createTitledBorder(tr("Vehicle")));
vehiclePanel.setLayout(new BoxLayout(vehiclePanel, BoxLayout.Y_AXIS));
@@ -160,17 +162,17 @@
buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS));
- JButton createButton = new JButton("create");
+ JButton createButton = new JButton(tr("Create"));
createButton.addActionListener(createVehicleActionListener);
buttonPanel.add(createButton);
- editBookmarkButton = new JButton("edit");
+ editBookmarkButton = new JButton(tr("Edit"));
editBookmarkButton.addActionListener(editVehicleActionListener);
buttonPanel.add(editBookmarkButton);
- deleteBookmarkButton = new JButton("delete");
+ deleteBookmarkButton = new JButton(tr("Delete"));
deleteBookmarkButton.addActionListener(deleteVehicleActionListener);
buttonPanel.add(deleteBookmarkButton);
- JButton restoreDefaultsButton = new JButton("restore defaults");
+ JButton restoreDefaultsButton = new JButton(tr("Restore defaults"));
restoreDefaultsButton.addActionListener(restoreVehicleDefaultsActionListener);
buttonPanel.add(restoreDefaultsButton);
@@ -184,8 +186,8 @@
JPanel visualizationPanel = new JPanel();
- visualizationPanel.setBorder(BorderFactory.createTitledBorder("visualization"));
+ visualizationPanel.setBorder(BorderFactory.createTitledBorder(tr("Visualization")));
visualizationPanel.setLayout(new BoxLayout(visualizationPanel, BoxLayout.Y_AXIS));
- separateDirectionsCheckBox = new JCheckBox("draw directions separately");
+ separateDirectionsCheckBox = new JCheckBox(tr("Draw directions separately"));
separateDirectionsCheckBox.setSelected(GraphViewPreferences.getInstance().getSeparateDirections());
visualizationPanel.add(separateDirectionsCheckBox);
@@ -198,5 +200,5 @@
Color nodeColor = GraphViewPreferences.getInstance().getNodeColor();
- nodeColorButton = new JButton("node color");
+ nodeColorButton = new JButton(tr("Node color"));
nodeColorButton.addActionListener(chooseNodeColorActionListener);
colorPanel.add(nodeColorButton);
@@ -207,5 +209,5 @@
Color segmentColor = GraphViewPreferences.getInstance().getSegmentColor();
- segmentColorButton = new JButton("arrow color");
+ segmentColorButton = new JButton(tr("Arrow color"));
segmentColorButton.addActionListener(chooseSegmentColorActionListener);
colorPanel.add(segmentColorButton);
@@ -280,5 +282,5 @@
null,
false,
- "new bookmark",
+ tr("New bookmark"),
parameterBookmarks.keySet(),
defaultBookmarkParameters,
@@ -337,6 +339,6 @@
int userChoice = JOptionPane.showConfirmDialog(
preferencePanel,
- "Really delete \"" + selectedBookmarkName + "\"?",
- "Bookmark deletion",
+ tr("Really delete \"{0}\"?", selectedBookmarkName),
+ tr("Bookmark deletion"),
JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
@@ -355,7 +357,7 @@
int userChoice = JOptionPane.showConfirmDialog(
preferencePanel,
- "Really restore default bookmarks?\n"
- + "All manually added or edited bookmarks will be lost!",
- "Bookmark reset",
+ tr("Really restore default bookmarks?\n"
+ + "All manually added or edited bookmarks will be lost!"),
+ tr("Bookmark reset"),
JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
@@ -374,5 +376,5 @@
Color selectedColor = JColorChooser.showDialog(
- preferencePanel, "Choose node color", nodeColorField.getBackground());
+ preferencePanel, tr("Choose node color"), nodeColorField.getBackground());
if (selectedColor != null) {
@@ -387,5 +389,5 @@
Color selectedColor = JColorChooser.showDialog(
- preferencePanel, "Choose arrow color", segmentColorField.getBackground());
+ preferencePanel, tr("Choose arrow color"), segmentColorField.getBackground());
if (selectedColor != null) {
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.plugin.layer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.BasicStroke;
@@ -251,5 +253,5 @@
private Point getNodePoint(LatLonCoords coords, MapView mv) {
LatLon latLon = new LatLon(coords.getLat(), coords.getLon());
- EastNorth eastNorth = Main.proj.latlon2eastNorth(latLon);
+ EastNorth eastNorth = Main.getProjection().latlon2eastNorth(latLon);
return mv.getPoint(eastNorth);
}
@@ -300,10 +302,10 @@
@Override
public String getToolTipText() {
- return "routing graph calculated by the GraphView plugin";
+ return tr("Routing graph calculated by the GraphView plugin");
}
@Override
public void mergeFrom(Layer from) {
- throw new AssertionError("GraphView layer is not mergable");
+ throw new AssertionError(tr("GraphView layer is not mergable"));
}
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.plugin.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.plugins.graphview.core.property.VehiclePropertyTypes.AXLELOAD;
@@ -216,6 +218,4 @@
currentInternalRuleset = null;
- nodeColor = Color.WHITE;
- segmentColor = Color.WHITE;
currentColorScheme = new PreferencesColorScheme(this);
@@ -244,6 +244,6 @@
}
- Main.pref.put("graphview.defaultNodeColor", createColorString(nodeColor));
- Main.pref.put("graphview.defaultSegmentColor", createColorString(segmentColor));
+ Main.pref.putColor(marktr("GraphView default node"), nodeColor);
+ Main.pref.putColor(marktr("Graphview default segment"), segmentColor);
Main.pref.put("graphview.separateDirections", separateDirections);
@@ -289,17 +289,6 @@
}
- if (Main.pref.hasKey("graphview.defaultNodeColor")) {
- Color color = parseColorString(Main.pref.get("graphview.defaultNodeColor"));
- if (color != null) {
- nodeColor = color;
- }
- }
- if (Main.pref.hasKey("graphview.defaultSegmentColor")) {
- Color color = parseColorString(Main.pref.get("graphview.defaultSegmentColor"));
- if (color != null) {
- segmentColor = color;
- }
- }
-
+ nodeColor = Main.pref.getColor(marktr("GraphView default node"), Color.white);
+ segmentColor = Main.pref.getColor(marktr("Graphview default segment"), Color.white);
separateDirections = Main.pref.getBoolean("graphview.separateDirections", false);
@@ -471,22 +460,3 @@
}
}
-
- private static final Pattern COLOR_PATTERN =
- Pattern.compile("^(\\d{1,3}),\\s*(\\d{1,3}),\\s*(\\d{1,3})$");
- private String createColorString(Color color) {
- return color.getRed() + ", " + color.getGreen() + ", " + color.getBlue();
- }
-
- private Color parseColorString(String string) {
- Matcher matcher = COLOR_PATTERN.matcher(string);
- if (!matcher.matches()) {
- return null;
- } else {
- int r = Integer.parseInt(matcher.group(1));
- int g = Integer.parseInt(matcher.group(2));
- int b = Integer.parseInt(matcher.group(3));
- return new Color(r, g, b);
- }
- }
-
}
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java (revision 26173)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java (revision 26174)
@@ -1,3 +1,5 @@
package org.openstreetmap.josm.plugins.graphview.plugin.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.security.InvalidParameterException;
@@ -31,17 +33,17 @@
public static final String ERROR_WEIGHT =
- "Weights must be given as positive decimal numbers with unit \"t\" or without unit.";
+ tr("Weights must be given as positive decimal numbers with unit \"t\" or without unit.");
public static final String ERROR_LENGTH =
- "Lengths must be given as positive decimal numbers with unit \"m\", \"km\", \"mi\"" +
- " or without unit.\nAlternatively, the format FEET' INCHES\" can be used.";
+ tr("Lengths must be given as positive decimal numbers with unit \"m\", \"km\", \"mi\"" +
+ " or without unit.\nAlternatively, the format FEET' INCHES\" can be used.");
public static final String ERROR_SPEED =
- "Speeds should be given as numbers without unit or "
- + "as numbers followed by \"mph\".";
+ tr("Speeds should be given as numbers without unit or "
+ + "as numbers followed by \"mph\".");
public static final String ERROR_INCLINE =
- "Inclines must be given as positive decimal numbers with followed by \"%\".";
+ tr("Inclines must be given as positive decimal numbers with followed by \"%\".");
public static final String ERROR_TRACKTYPE =
- "Tracktype grades must be given as integers between 0 and 5.";
+ tr("Tracktype grades must be given as integers between 0 and 5.");
public static final String ERROR_SURFACE =
- "Surface values must not contain any of the following characters: ',' '{' '}' '=' '|";
+ tr("Surface values must not contain any of the following characters: ',' '{' '}' '=' '|");
private static final List FORBIDDEN_SURFACE_CHARS =
@@ -145,5 +147,5 @@
} else {
- throw new InvalidParameterException("unknown property type: " + propertyType);
+ throw new InvalidParameterException("Unknown property type: " + propertyType);
}
Index: applications/editors/josm/plugins/imageryadjust/build.xml
===================================================================
--- applications/editors/josm/plugins/imageryadjust/build.xml (revision 26173)
+++ applications/editors/josm/plugins/imageryadjust/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -130,5 +125,4 @@
-
-
-
+
+
@@ -241,5 +228,5 @@
-
+
@@ -248,9 +235,8 @@
-
+
-
Index: applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/build.xml (revision 26173)
+++ applications/editors/josm/plugins/imagewaypoint/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/importvec/build.xml
===================================================================
--- applications/editors/josm/plugins/importvec/build.xml (revision 26173)
+++ applications/editors/josm/plugins/importvec/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -130,5 +125,4 @@
-
-
-
+
+
@@ -241,5 +228,5 @@
-
+
@@ -248,9 +235,8 @@
-
+
-
Index: applications/editors/josm/plugins/irsrectify/build.xml
===================================================================
--- applications/editors/josm/plugins/irsrectify/build.xml (revision 26173)
+++ applications/editors/josm/plugins/irsrectify/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -128,5 +123,4 @@
-
-
-
+
+
@@ -239,5 +226,5 @@
-
+
@@ -246,9 +233,8 @@
-
+
-
Index: applications/editors/josm/plugins/junctionchecking/build.xml
===================================================================
--- applications/editors/josm/plugins/junctionchecking/build.xml (revision 26173)
+++ applications/editors/josm/plugins/junctionchecking/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -115,128 +111,119 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/lakewalker/build.xml
===================================================================
--- applications/editors/josm/plugins/lakewalker/build.xml (revision 26173)
+++ applications/editors/josm/plugins/lakewalker/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/licensechange/build.xml
===================================================================
--- applications/editors/josm/plugins/licensechange/build.xml (revision 26173)
+++ applications/editors/josm/plugins/licensechange/build.xml (revision 26174)
@@ -1,4 +1,3 @@
-remove this line if you want to build the plugin
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
***** Properties of published ${plugin.jar} *****
Commit message : '${commit.message}'
@@ -153,26 +148,24 @@
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- applications/editors/josm/plugins/livegps/build.xml (revision 26173)
+++ applications/editors/josm/plugins/livegps/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/mapdust/build.xml
===================================================================
--- applications/editors/josm/plugins/mapdust/build.xml (revision 26173)
+++ applications/editors/josm/plugins/mapdust/build.xml (revision 26174)
@@ -1,172 +1,142 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
***** Properties of published ${plugin.jar} *****
Commit message : '${commit.message}'
@@ -178,42 +148,34 @@
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/measurement/build.xml
===================================================================
--- applications/editors/josm/plugins/measurement/build.xml (revision 26173)
+++ applications/editors/josm/plugins/measurement/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/michigan_left/build.xml
===================================================================
--- applications/editors/josm/plugins/michigan_left/build.xml (revision 26173)
+++ applications/editors/josm/plugins/michigan_left/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/multipoly-convert/build.xml
===================================================================
--- applications/editors/josm/plugins/multipoly-convert/build.xml (revision 26173)
+++ applications/editors/josm/plugins/multipoly-convert/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/namemanager/build.xml
===================================================================
--- applications/editors/josm/plugins/namemanager/build.xml (revision 26173)
+++ applications/editors/josm/plugins/namemanager/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/nearclick/build.xml
===================================================================
--- applications/editors/josm/plugins/nearclick/build.xml (revision 26173)
+++ applications/editors/josm/plugins/nearclick/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/build.xml (revision 26173)
+++ applications/editors/josm/plugins/openstreetbugs/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/openvisible/build.xml
===================================================================
--- applications/editors/josm/plugins/openvisible/build.xml (revision 26173)
+++ applications/editors/josm/plugins/openvisible/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/osmarender/build.xml
===================================================================
--- applications/editors/josm/plugins/osmarender/build.xml (revision 26173)
+++ applications/editors/josm/plugins/osmarender/build.xml (revision 26174)
@@ -1,2 +1,3 @@
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/pdfimport/build.xml
===================================================================
--- applications/editors/josm/plugins/pdfimport/build.xml (revision 26173)
+++ applications/editors/josm/plugins/pdfimport/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/photo_geotagging/build.xml
===================================================================
--- applications/editors/josm/plugins/photo_geotagging/build.xml (revision 26173)
+++ applications/editors/josm/plugins/photo_geotagging/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/piclayer/build.xml
===================================================================
--- applications/editors/josm/plugins/piclayer/build.xml (revision 26173)
+++ applications/editors/josm/plugins/piclayer/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/plastic_laf/build.xml
===================================================================
--- applications/editors/josm/plugins/plastic_laf/build.xml (revision 26173)
+++ applications/editors/josm/plugins/plastic_laf/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/proj4j/build.xml
===================================================================
--- applications/editors/josm/plugins/proj4j/build.xml (revision 26173)
+++ applications/editors/josm/plugins/proj4j/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
+
-
+
-
-
-
-
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -140,5 +135,4 @@
-
-
-
+
+
@@ -259,5 +246,5 @@
-
+
@@ -266,9 +253,8 @@
-
+
-
Index: applications/editors/josm/plugins/public_transport/build.xml
===================================================================
--- applications/editors/josm/plugins/public_transport/build.xml (revision 26173)
+++ applications/editors/josm/plugins/public_transport/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -110,5 +108,4 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/reltoolbox/manifest.mf
===================================================================
--- applications/editors/josm/plugins/reltoolbox/manifest.mf (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/manifest.mf (revision 26174)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java (revision 26174)
@@ -0,0 +1,175 @@
+package relcontext;
+
+import java.awt.*;
+import java.awt.geom.GeneralPath;
+import java.util.*;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.*;
+import org.openstreetmap.josm.data.osm.event.*;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+
+/**
+ * Chosen relation; is used for all actions and is highlighted on the map.
+ *
+ * @author Zverik
+ */
+public class ChosenRelation implements EditLayerChangeListener, MapViewPaintable, DataSetListener {
+ protected Relation chosenRelation = null;
+ private Set chosenRelationListeners = new HashSet();
+
+ public void set( Relation rel ) {
+ if( rel == chosenRelation || (rel != null && chosenRelation != null && rel.equals(chosenRelation)) ) {
+ return; // new is the same as old
+ }
+ Relation oldRel = chosenRelation;
+ chosenRelation = rel;
+ analyse();
+ Main.map.mapView.repaint();
+ fireRelationChanged(oldRel);
+ }
+
+ protected void fireRelationChanged( Relation oldRel ) {
+ for( ChosenRelationListener listener : chosenRelationListeners )
+ listener.chosenRelationChanged(oldRel, chosenRelation);
+ }
+
+ public Relation get() {
+ return chosenRelation;
+ }
+
+ public void clear() {
+ set(null);
+ }
+
+ public boolean isSame( Object r ) {
+ if( r == null )
+ return chosenRelation == null;
+ else if( !(r instanceof Relation) )
+ return false;
+ else
+ return chosenRelation != null && r.equals(chosenRelation);
+ }
+
+ private final static String[] MULTIPOLYGON_TYPES = new String[] {
+ "multipolygon", "boundary"
+ };
+
+ /**
+ * Check if the relation type assumes all ways inside it form a multipolygon.
+ */
+ public boolean isMultipolygon() {
+ return isMultipolygon(chosenRelation);
+ }
+
+ public static boolean isMultipolygon( Relation r ) {
+ if( r == null )
+ return false;
+ String type = r.get("type");
+ if( type == null )
+ return false;
+ for( String t : MULTIPOLYGON_TYPES )
+ if( t.equals(type) )
+ return true;
+ return false;
+ }
+
+ public int getSegmentsCount() {
+ return 0;
+ }
+
+ public int getCirclesCount() {
+ return 0;
+ }
+
+ protected void analyse() {
+ // todo
+ }
+
+ public void addChosenRelationListener( ChosenRelationListener listener ) {
+ chosenRelationListeners.add(listener);
+ }
+
+ public void removeChosenRelationListener( ChosenRelationListener listener ) {
+ chosenRelationListeners.remove(listener);
+ }
+
+ public void editLayerChanged( OsmDataLayer oldLayer, OsmDataLayer newLayer ) {
+ // todo: dim chosen relation when changing layer
+ // todo: check this WTF!
+ clear();
+ if( newLayer != null && oldLayer == null ) {
+ Main.map.mapView.addTemporaryLayer(this);
+ } else if( oldLayer != null ) {
+ Main.map.mapView.removeTemporaryLayer(this);
+ }
+ }
+
+ public void paint( Graphics2D g, MapView mv, Bounds bbox ) {
+ if( chosenRelation == null ) {
+ return;
+ }
+
+ Stroke oldStroke = g.getStroke();
+ Composite oldComposite = g.getComposite();
+ g.setColor(Color.yellow);
+ g.setStroke(new BasicStroke(9, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+ g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f));
+ for( OsmPrimitive element : chosenRelation.getMemberPrimitives() ) {
+ if( element.getType() == OsmPrimitiveType.NODE ) {
+ Node node = (Node)element;
+ Point center = mv.getPoint(node);
+ g.drawOval(center.x - 4, center.y - 4, 9, 9);
+ } else if( element.getType() == OsmPrimitiveType.WAY ) {
+ Way way = (Way)element;
+ if( way.getNodesCount() >= 2 ) {
+ GeneralPath b = new GeneralPath();
+ Point p = mv.getPoint(way.getNode(0));
+ b.moveTo(p.x, p.y);
+ for( int i = 1; i < way.getNodesCount(); i++ ) {
+ p = mv.getPoint(way.getNode(i));
+ b.lineTo(p.x, p.y);
+ }
+ g.draw(b);
+ }
+ } else if( element.getType() == OsmPrimitiveType.RELATION ) {
+ // todo: draw all relation members (recursion?)
+ }
+ // todo: closedway, multipolygon - ?
+ }
+ g.setStroke(oldStroke);
+ g.setComposite(oldComposite);
+ }
+
+ public void relationMembersChanged( RelationMembersChangedEvent event ) {
+ if( chosenRelation != null && event.getRelation().equals(chosenRelation) )
+ fireRelationChanged(chosenRelation);
+ }
+
+ public void tagsChanged( TagsChangedEvent event ) {
+ if( chosenRelation != null && event.getPrimitive().equals(chosenRelation) )
+ fireRelationChanged(chosenRelation);
+ }
+
+ public void dataChanged( DataChangedEvent event ) {
+ if( chosenRelation != null )
+ fireRelationChanged(chosenRelation);
+ }
+
+ public void primtivesRemoved( PrimitivesRemovedEvent event ) {
+ if( chosenRelation != null && event.getPrimitives().contains(chosenRelation) )
+ clear();
+ }
+
+ public void wayNodesChanged( WayNodesChangedEvent event ) {
+ if( chosenRelation != null )
+ fireRelationChanged(chosenRelation); // download incomplete primitives doesn't cause dataChanged event
+ }
+
+ public void primtivesAdded( PrimitivesAddedEvent event ) {}
+ public void nodeMoved( NodeMovedEvent event ) {}
+ public void otherDatasetChange( AbstractDatasetChangedEvent event ) {}
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelationComponent.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelationComponent.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelationComponent.java (revision 26174)
@@ -0,0 +1,74 @@
+package relcontext;
+
+import java.awt.Color;
+import javax.swing.JLabel;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.LineBorder;
+import org.openstreetmap.josm.data.osm.Relation;
+
+/**
+ * Renderer for chosen relation.
+ * [Icon] na=wood U
+ * key is 2-letter; type = icon; to the right — symbol of relation topology (closed, lines, broken).
+ *
+ * @author Zverik
+ */
+public class ChosenRelationComponent extends JLabel implements ChosenRelationListener {
+
+ private ChosenRelation chRel;
+
+ public ChosenRelationComponent(ChosenRelation rel) {
+ super("");
+/* setBackground(Color.white);
+ setOpaque(true);
+ setBorder(new LineBorder(Color.black, 1, true));*/
+ this.chRel = rel;
+ rel.addChosenRelationListener(this);
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setText(prepareText(newRelation));
+ repaint();
+ }
+
+ private final static String[] TYPE_KEYS = new String[] {
+ "natural", "landuse", "place", "waterway", "leisure", "amenity", "restriction", "public_transport", "route", "enforcement"
+ };
+
+ private final static String[] NAMING_TAGS = new String[] {
+ "name", "place_name", "ref", "destination", "note"
+ };
+
+ protected String prepareText( Relation rel ) {
+ if( rel == null )
+ return "";
+
+ String type = rel.get("type");
+ if( type == null || type.length() == 0 )
+ type = "-";
+
+ String tag = null;
+ for( int i = 0; i < TYPE_KEYS.length && tag == null; i++ )
+ if( rel.hasKey(TYPE_KEYS[i]))
+ tag = TYPE_KEYS[i];
+ if( tag != null )
+ tag = tag.substring(0, 2) + "=" + rel.get(tag);
+
+ String name = null;
+ for( int i = 0; i < NAMING_TAGS.length && name == null; i++ )
+ if( rel.hasKey(NAMING_TAGS[i]) )
+ name = rel.get(NAMING_TAGS[i]);
+
+ StringBuilder sb = new StringBuilder();
+ sb.append(type.substring(0, 1));
+ if( type.equals("boundary") && rel.hasKey("admin_level") )
+ sb.append(rel.get("admin_level"));
+ if( name != null )
+ sb.append(" \"").append(name).append('"');
+ if( tag != null )
+ sb.append("; ").append(tag);
+ sb.append(" (").append(rel.getMembersCount()).append(')');
+
+ return sb.toString();
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelationListener.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelationListener.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelationListener.java (revision 26174)
@@ -0,0 +1,12 @@
+package relcontext;
+
+import org.openstreetmap.josm.data.osm.Relation;
+
+/**
+ * Listener for {@link RelContextDialog}'s chosen relation field.
+ *
+ * @author Zverik
+ */
+public interface ChosenRelationListener {
+ void chosenRelationChanged( Relation oldRelation, Relation newRelation );
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (revision 26174)
@@ -0,0 +1,672 @@
+package relcontext;
+
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.command.Command;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.awt.Point;
+import java.awt.Component;
+import java.awt.Dimension;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.data.osm.NameFormatter;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.table.TableColumnModel;
+import javax.swing.table.DefaultTableModel;
+import java.awt.event.*;
+import java.util.*;
+import javax.swing.*;
+import relcontext.actions.*;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dialog.ModalityType;
+import java.awt.GridBagLayout;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableCellRenderer;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
+import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.command.ChangeRelationMemberRoleCommand;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+/**
+ * The new, advanced relation editing panel.
+ *
+ * @author Zverik
+ */
+public class RelContextDialog extends ToggleDialog implements EditLayerChangeListener, ChosenRelationListener, SelectionChangedListener {
+
+ public final static String PREF_PREFIX = "reltoolbox";
+
+ private final DefaultTableModel relationsData;
+ private ChosenRelation chosenRelation;
+ private JPanel chosenRelationPanel;
+ private ChosenRelationPopupMenu popupMenu;
+ private MultipolygonSettingsPopup multiPopupMenu;
+ private RoleComboBoxModel roleBoxModel;
+ private SortAndFixAction sortAndFixAction;
+
+ public RelContextDialog() {
+ super(tr("Relation Toolbox"), PREF_PREFIX, tr("Open relation/multipolygon editor panel"), null, 150, true);
+
+ chosenRelation = new ChosenRelation();
+ chosenRelation.addChosenRelationListener(this);
+ MapView.addEditLayerChangeListener(chosenRelation);
+
+ popupMenu = new ChosenRelationPopupMenu(chosenRelation);
+ multiPopupMenu = new MultipolygonSettingsPopup();
+
+ JPanel rcPanel = new JPanel(new BorderLayout());
+
+ relationsData = new RelationTableModel();
+ relationsData.setColumnIdentifiers(new String[] {tr("Member Of"), tr("Role")});
+ final JTable relationsTable = new JTable(relationsData);
+ configureRelationsTable(relationsTable);
+ rcPanel.add(new JScrollPane(relationsTable, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER);
+
+ final MouseListener relationMouseAdapter = new ChosenRelationMouseAdapter();
+ final JComboBox roleBox = new JComboBox();
+ roleBoxModel = new RoleComboBoxModel(roleBox);
+ roleBox.setModel(roleBoxModel);
+ roleBox.addMouseListener(relationMouseAdapter);
+ roleBox.addItemListener(new ItemListener() {
+ public void itemStateChanged( ItemEvent e ) {
+ if( e.getStateChange() == ItemEvent.DESELECTED ) return;
+ String memberRole = roleBoxModel.getSelectedMembersRole();
+ String selectedRole = roleBoxModel.isAnotherRoleSelected() ? askForRoleName() : roleBoxModel.getSelectedRole();
+ if( memberRole != null && selectedRole != null && !memberRole.equals(selectedRole) ) {
+ applyRoleToSelection(selectedRole.trim());
+ }
+ }
+ });
+ roleBox.setVisible(false);
+ final Action enterRoleAction = new EnterRoleAction(); // just for the shorcut
+
+ // [±][X] relation U [AZ][Down][Edit]
+ chosenRelationPanel = new JPanel(new GridBagLayout());
+ chosenRelationPanel.add(new JButton(new AddRemoveMemberAction(chosenRelation)), GBC.std());
+ chosenRelationPanel.add(sizeButton(new JButton(new ClearChosenRelationAction(chosenRelation)), 32, 0), GBC.std());
+ final ChosenRelationComponent chosenRelationComponent = new ChosenRelationComponent(chosenRelation);
+ chosenRelationComponent.addMouseListener(relationMouseAdapter);
+ chosenRelationPanel.add(chosenRelationComponent, GBC.std().fill().insets(5, 0, 5, 0));
+ chosenRelationPanel.add(roleBox, GBC.std().fill().insets(5, 0, 5, 0));
+ sortAndFixAction = new SortAndFixAction(chosenRelation);
+ final JButton sortAndFixButton = (JButton) sizeButton(new JButton(sortAndFixAction), 32, 0);
+ chosenRelationPanel.add(sortAndFixButton, GBC.std().fill(GBC.VERTICAL));
+ final Action downloadChosenRelationAction = new DownloadChosenRelationAction(chosenRelation);
+ final JButton downloadButton = (JButton) sizeButton(new JButton(downloadChosenRelationAction), 32, 0);
+ chosenRelationPanel.add(downloadButton, GBC.std().fill(GBC.VERTICAL));
+ chosenRelationPanel.add(new JButton(new EditChosenRelationAction(chosenRelation)), GBC.eol().fill(GBC.VERTICAL));
+
+ rcPanel.add(chosenRelationPanel, BorderLayout.NORTH);
+
+ roleBox.addPropertyChangeListener("enabled", new PropertyChangeListener() {
+ public void propertyChange( PropertyChangeEvent evt ) {
+ boolean showRoleBox = roleBox.isEnabled();
+ roleBox.setVisible(showRoleBox);
+ chosenRelationComponent.setVisible(!showRoleBox);
+ }
+ });
+
+ sortAndFixAction.addPropertyChangeListener(new PropertyChangeListener() {
+ public void propertyChange( PropertyChangeEvent evt ) {
+ sortAndFixButton.setVisible(sortAndFixAction.isEnabled());
+ }
+ });
+ sortAndFixButton.setVisible(false);
+
+ downloadChosenRelationAction.addPropertyChangeListener(new PropertyChangeListener() {
+ public void propertyChange( PropertyChangeEvent evt ) {
+ downloadButton.setVisible(downloadChosenRelationAction.isEnabled());
+ }
+ });
+ downloadButton.setVisible(false);
+ if( Main.pref.getBoolean(PREF_PREFIX + ".hidetopline", false) )
+ chosenRelationPanel.setVisible(false);
+
+ // [+][Multi] [X]Adm [X]Tags [X]1
+ JPanel bottomLine = new JPanel(new GridBagLayout());
+ bottomLine.add(new JButton(new CreateRelationAction(chosenRelation)), GBC.std());
+ final JButton multipolygonButton = new JButton(new CreateMultipolygonAction(chosenRelation));
+ bottomLine.add(multipolygonButton, GBC.std());
+// bottomLine.add(sizeButton(new JButton(new MultipolygonSettingsAction()), 16, 0), GBC.std().fill(GBC.VERTICAL));
+ bottomLine.add(Box.createHorizontalGlue(), GBC.std().fill());
+ bottomLine.add(new JButton(new FindRelationAction(chosenRelation)), GBC.eol());
+ rcPanel.add(sizeButton(bottomLine, 0, 24), BorderLayout.SOUTH);
+
+ multipolygonButton.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mousePressed( MouseEvent e ) {
+ checkPopup(e);
+ }
+
+ @Override
+ public void mouseReleased( MouseEvent e ) {
+ checkPopup(e);
+ }
+
+ private void checkPopup( MouseEvent e ) {
+ if( e.isPopupTrigger() )
+ multiPopupMenu.show(e.getComponent(), e.getX(), e.getY());
+ }
+ });
+
+ add(rcPanel, BorderLayout.CENTER);
+ }
+
+ private static final Color CHOSEN_RELATION_COLOR = new Color(255, 255, 128);
+
+ private void configureRelationsTable( final JTable relationsTable ) {
+ relationsTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ relationsTable.setTableHeader(null);
+ relationsTable.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked( MouseEvent e ) {
+ Point p = e.getPoint();
+ int row = relationsTable.rowAtPoint(p);
+ if( SwingUtilities.isLeftMouseButton(e) && row >= 0 ) {
+ Relation relation = (Relation)relationsData.getValueAt(row, 0);
+ if( e.getClickCount() > 1 ) {
+ Main.map.mapView.getEditLayer().data.setSelected(relation);
+ }
+ }
+ }
+
+ @Override
+ public void mousePressed( MouseEvent e ) {
+ checkPopup(e);
+ }
+
+ @Override
+ public void mouseReleased( MouseEvent e ) {
+ checkPopup(e);
+ }
+
+ public void checkPopup( MouseEvent e ) {
+ if( e.isPopupTrigger() ) {
+ Point p = e.getPoint();
+ int row = relationsTable.rowAtPoint(p);
+ if (row > -1) {
+ Relation relation = (Relation)relationsData.getValueAt(row, 0);
+ JPopupMenu menu = chosenRelation.isSame(relation) ? popupMenu
+ : new ChosenRelationPopupMenu(new StaticChosenRelation(relation));
+ menu.show(relationsTable, p.x, p.y-5);
+ }
+ }
+ }
+ });
+
+ TableColumnModel columns = relationsTable.getColumnModel();
+ columns.getColumn(0).setCellRenderer(new OsmPrimitivRenderer() {
+ @Override
+ protected String getComponentToolTipText( OsmPrimitive value ) {
+ return null;
+ }
+
+ @Override
+ public Component getTableCellRendererComponent( JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column ) {
+ Component c = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+ if( !isSelected && value instanceof Relation && chosenRelation.isSame(value) )
+ c.setBackground(CHOSEN_RELATION_COLOR);
+ else
+ c.setBackground(table.getBackground());
+ return c;
+ }
+
+ });
+ columns.getColumn(1).setCellRenderer(new DefaultTableCellRenderer() {
+ @Override
+ public Component getTableCellRendererComponent( JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column ) {
+ Component c = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+ if( !isSelected && chosenRelation.isSame(table.getValueAt(row, 0)) )
+ c.setBackground(CHOSEN_RELATION_COLOR);
+ else
+ c.setBackground(table.getBackground());
+ return c;
+ }
+ });
+ columns.getColumn(1).setPreferredWidth(40);
+ columns.getColumn(0).setPreferredWidth(220);
+ relationsTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+ public void valueChanged( ListSelectionEvent e ) {
+ int selectedRow = relationsTable.getSelectedRow();
+ if( selectedRow >= 0 ) {
+ chosenRelation.set((Relation)relationsData.getValueAt(selectedRow, 0));
+ relationsTable.clearSelection();
+ }
+ }
+ });
+ }
+
+ private JComponent sizeButton( JComponent b, int width, int height ) {
+ Dimension pref = b.getPreferredSize();
+ b.setPreferredSize(new Dimension(width <= 0 ? pref.width : width, height <= 0 ? pref.height : height));
+ return b;
+ }
+
+ @Override
+ public void hideNotify() {
+ SelectionEventManager.getInstance().removeSelectionListener(this);
+ MapView.removeEditLayerChangeListener(this);
+ DatasetEventManager.getInstance().removeDatasetListener(chosenRelation);
+ chosenRelation.clear();
+ }
+
+ @Override
+ public void showNotify() {
+ SelectionEventManager.getInstance().addSelectionListener(this, FireMode.IN_EDT_CONSOLIDATED);
+ MapView.addEditLayerChangeListener(this);
+ DatasetEventManager.getInstance().addDatasetListener(chosenRelation, FireMode.IN_EDT);
+ }
+
+ public ChosenRelation getChosenRelation() {
+ return chosenRelation;
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ if( chosenRelationPanel != null && Main.pref.getBoolean(PREF_PREFIX + ".hidetopline", false) )
+ chosenRelationPanel.setVisible(newRelation != null);
+ if( Main.main.getCurrentDataSet() != null )
+ selectionChanged(Main.main.getCurrentDataSet().getSelected());
+ roleBoxModel.update();
+ // ?
+ }
+
+ public void selectionChanged( Collection newSelection ) {
+ if( !isVisible() || relationsData == null )
+ return;
+ roleBoxModel.update();
+ // repopulate relations table
+ relationsData.setRowCount(0);
+ sortAndFixAction.chosenRelationChanged(chosenRelation.get(), chosenRelation.get());
+ if( newSelection == null )
+ return;
+
+ final NameFormatter formatter = DefaultNameFormatter.getInstance();
+ Set relations = new TreeSet(new Comparator() {
+ public int compare( Relation r1, Relation r2 ) {
+ int diff = r1.getDisplayName(formatter).compareTo(r2.getDisplayName(formatter));
+ return diff != 0 ? diff : r1.compareTo(r2);
+ }
+ });
+ for( OsmPrimitive element : newSelection ) {
+ for( OsmPrimitive ref : element.getReferrers() ) {
+ if( ref instanceof Relation && !ref.isIncomplete() && !ref.isDeleted() ) {
+ relations.add((Relation) ref);
+ }
+ }
+ }
+
+ for( Relation rel : relations ) {
+ String role = null;
+ for( RelationMember m : rel.getMembers() ) {
+ for( OsmPrimitive element : newSelection ) {
+ if( m.getMember().equals(element) ) {
+ if( role == null )
+ role = m.getRole();
+ else if( !role.equals(m.getRole()) ) {
+ role = tr("");
+ break;
+ }
+ }
+ }
+ }
+ relationsData.addRow(new Object[] {rel, role == null ? "" : role});
+ }
+ for( OsmPrimitive element : newSelection )
+ if( element instanceof Relation && !chosenRelation.isSame(element) )
+ relationsData.addRow(new Object[] {element, ""});
+ }
+
+ private void updateSelection() {
+ if (Main.main.getCurrentDataSet() == null) {
+ selectionChanged(Collections.emptyList());
+ } else {
+ selectionChanged(Main.main.getCurrentDataSet().getSelected());
+ }
+ }
+
+ public void editLayerChanged( OsmDataLayer oldLayer, OsmDataLayer newLayer ) {
+ updateSelection();
+ }
+
+ private static final String POSSIBLE_ROLES_FILE = "relcontext/possible_roles.txt";
+ private static final Map> possibleRoles = loadRoles();
+
+ private static Map> loadRoles() {
+ Map> result = new HashMap>();
+ try {
+ ClassLoader classLoader = RelContextDialog.class.getClassLoader();
+ final InputStream possibleRolesStream = classLoader.getResourceAsStream(POSSIBLE_ROLES_FILE);
+ BufferedReader r = new BufferedReader(new InputStreamReader(possibleRolesStream));
+ while( r.ready() ) {
+ String line = r.readLine();
+ StringTokenizer t = new StringTokenizer(line, " ,;:\"");
+ if( t.hasMoreTokens() ) {
+ String type = t.nextToken();
+ List roles = new ArrayList();
+ while( t.hasMoreTokens() )
+ roles.add(t.nextToken());
+ result.put(type, roles);
+ }
+ }
+ r.close();
+ } catch( Exception e ) {
+ System.err.println("[RelToolbox] Error reading possible roles file.");
+ e.printStackTrace();
+ }
+ return result;
+ }
+
+ private String askForRoleName() {
+ JPanel panel = new JPanel(new GridBagLayout());
+
+ List items = new ArrayList();
+ for( String role : roleBoxModel.getRoles() ) {
+ if( role.length() > 1 )
+ items.add(role);
+ }
+ final AutoCompletingComboBox role = new AutoCompletingComboBox();
+ role.setPossibleItems(items);
+ role.setEditable(true);
+
+ panel.add(new JLabel(tr("Role")), GBC.std());
+ panel.add(Box.createHorizontalStrut(10), GBC.std());
+ panel.add(role, GBC.eol().fill(GBC.HORIZONTAL));
+
+ final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION) {
+ @Override
+ public void selectInitialValue() {
+ role.requestFocusInWindow();
+ role.getEditor().selectAll();
+ }
+ };
+ final JDialog dlg = optionPane.createDialog(Main.parent, tr("Specify role"));
+ dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
+
+ role.getEditor().addActionListener(new ActionListener() {
+ public void actionPerformed( ActionEvent e ) {
+ dlg.setVisible(false);
+ optionPane.setValue(JOptionPane.OK_OPTION);
+ }
+ });
+
+ dlg.setVisible(true);
+
+ Object answer = optionPane.getValue();
+ if( answer == null || answer == JOptionPane.UNINITIALIZED_VALUE
+ || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION) ) {
+ return null;
+ }
+
+ return role.getEditor().getItem().toString().trim();
+ }
+
+ private class ChosenRelationMouseAdapter extends MouseAdapter {
+ @Override
+ public void mouseClicked( MouseEvent e ) {
+ if( e.isControlDown() || !(e.getComponent() instanceof JComboBox ) ) // do not use left click handler on combo box
+ if( SwingUtilities.isLeftMouseButton(e) && chosenRelation.get() != null && Main.map.mapView.getEditLayer() != null ) {
+ Main.map.mapView.getEditLayer().data.setSelected(chosenRelation.get());
+ }
+ }
+
+ @Override
+ public void mousePressed( MouseEvent e ) {
+ checkPopup(e);
+ }
+
+ @Override
+ public void mouseReleased( MouseEvent e ) {
+ checkPopup(e);
+ }
+
+ private void checkPopup( MouseEvent e ) {
+ if( e.isPopupTrigger() && chosenRelation.get() != null ) {
+ popupMenu.show(e.getComponent(), e.getX(), e.getY() - 5);
+ }
+ }
+ }
+
+ private class ChosenRelationPopupMenu extends JPopupMenu {
+ public ChosenRelationPopupMenu( ChosenRelation chosenRelation ) {
+ add(new SelectMembersAction(chosenRelation));
+ add(new SelectRelationAction(chosenRelation));
+ add(new DeleteChosenRelationAction(chosenRelation));
+ add(new DownloadParentsAction(chosenRelation));
+ addSeparator();
+ add(new SelectInRelationPanelAction(chosenRelation));
+ add(new RelationHelpAction(chosenRelation));
+ }
+ }
+
+ protected void applyRoleToSelection( String role ) {
+ if( chosenRelation != null && chosenRelation.get() != null && Main.main.getCurrentDataSet() != null && !Main.main.getCurrentDataSet().selectionEmpty() ) {
+ Collection selected = Main.main.getCurrentDataSet().getSelected();
+ Relation r = chosenRelation.get();
+ List commands = new ArrayList();
+ for( int i = 0; i < r.getMembersCount(); i++ ) {
+ RelationMember m = r.getMember(i);
+ if( selected.contains(m.getMember()) ) {
+ if( !role.equals(m.getRole()) ) {
+// r.setMember(i, new RelationMember(role, m.getMember()));
+ commands.add(new ChangeRelationMemberRoleCommand(r, i, role));
+ }
+ }
+ }
+ if( !commands.isEmpty() ) {
+// Main.main.undoRedo.add(new ChangeCommand(chosenRelation.get(), r));
+ Main.main.undoRedo.add(new SequenceCommand(tr("Change relation member roles to {0}", role), commands));
+ }
+ }
+ }
+
+ private static class RelationTableModel extends DefaultTableModel {
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ return false;
+ }
+
+ @Override
+ public Class getColumnClass(int columnIndex) {
+ return columnIndex == 0 ? Relation.class : String.class;
+ }
+ }
+
+ private class MultipolygonSettingsAction extends AbstractAction {
+ public MultipolygonSettingsAction() {
+ super();
+ putValue(SMALL_ICON, ImageProvider.get("svpRight"));
+ putValue(SHORT_DESCRIPTION, tr("Change multipolygon creation settings"));
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ Component c = e.getSource() instanceof Component ? (Component)e.getSource() : Main.parent;
+ Point p = getMousePosition();
+ multiPopupMenu.show(c, 0, 0);
+ }
+ }
+
+ private class MultipolygonSettingsPopup extends JPopupMenu implements ActionListener {
+ public MultipolygonSettingsPopup() {
+ super();
+ addMenuItem("boundary", tr("Create administrative boundary relations"));
+ addMenuItem("boundaryways", tr("Add tags boundary and admin_level to boundary relation ways"));
+ addMenuItem("tags", tr("Move area tags from contour to relation"));
+ }
+
+ protected final JCheckBoxMenuItem addMenuItem( String property, String title ) {
+ String fullProperty = PREF_PREFIX + ".multipolygon." + property;
+ JCheckBoxMenuItem item = new JCheckBoxMenuItem(tr(title));
+ item.setSelected(Main.pref.getBoolean(fullProperty, CreateMultipolygonAction.getDefaultPropertyValue(property)));
+ item.setActionCommand(fullProperty);
+ item.addActionListener(this);
+ add(item);
+ return item;
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ String property = e.getActionCommand();
+ if( property != null && property.length() > 0 && e.getSource() instanceof JCheckBoxMenuItem ) {
+ boolean value = ((JCheckBoxMenuItem)e.getSource()).isSelected();
+ Main.pref.put(property, value);
+ show(getInvoker(), getX(), getY());
+ }
+ }
+ }
+
+ private class EnterRoleAction extends JosmAction implements ChosenRelationListener {
+
+ public EnterRoleAction() {
+ super("…", null, tr("Enter role for selected members"),
+ Shortcut.registerShortcut("reltoolbox:changerole", tr("Relation Toolbox: {0}", tr("Enter role for selected members")),
+ KeyEvent.VK_R, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+ chosenRelation.addChosenRelationListener(this);
+ updateEnabledState();
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ if( roleBoxModel.membersRole != null ) {
+ String role = askForRoleName();
+ if( role != null )
+ applyRoleToSelection(role);
+ }
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setEnabled(newRelation != null);
+ }
+ }
+
+ private class RoleComboBoxModel extends AbstractListModel implements ComboBoxModel {
+ private List roles = new ArrayList();
+ private int selectedIndex = -1;
+ private JComboBox combobox;
+ private String membersRole;
+ private final String EMPTY_ROLE = tr("");
+ private final String ANOTHER_ROLE = tr("another...");
+
+ public RoleComboBoxModel( JComboBox combobox ) {
+ super();
+ this.combobox = combobox;
+ update();
+ }
+
+ public void update() {
+ membersRole = getSelectedMembersRoleIntl();
+ if( membersRole == null ) {
+ if( combobox.isEnabled() )
+ combobox.setEnabled(false);
+ return;
+ }
+ if( !combobox.isEnabled() )
+ combobox.setEnabled(true);
+
+ List items = new ArrayList();
+ if( chosenRelation != null && chosenRelation.get() != null ) {
+ if( chosenRelation.isMultipolygon() ) {
+ items.add("outer");
+ items.add("inner");
+ }
+ if( chosenRelation.get().get("type") != null ) {
+ List values = possibleRoles.get(chosenRelation.get().get("type"));
+ if( values != null )
+ items.addAll(values);
+ }
+ for( RelationMember m : chosenRelation.get().getMembers() )
+ if( m.getRole().length() > 0 && !items.contains(m.getRole()) )
+ items.add(m.getRole());
+ }
+ items.add(EMPTY_ROLE);
+ if( !items.contains(membersRole) )
+ items.add(0, membersRole);
+ items.add(ANOTHER_ROLE);
+ roles = Collections.unmodifiableList(items);
+
+ if( membersRole != null )
+ setSelectedItem(membersRole);
+ else
+ fireContentsChanged(this, -1, -1);
+ combobox.repaint();
+ }
+
+ public String getSelectedMembersRole() {
+ return membersRole == EMPTY_ROLE ? "" : membersRole;
+ }
+
+ public boolean isAnotherRoleSelected() {
+ return getSelectedRole() != null && getSelectedRole().equals(ANOTHER_ROLE);
+ }
+
+ private String getSelectedMembersRoleIntl() {
+ String role = null;
+ if( chosenRelation != null && chosenRelation.get() != null && Main.main.getCurrentDataSet() != null && !Main.main.getCurrentDataSet().selectionEmpty() ) {
+ Collection selected = Main.main.getCurrentDataSet().getSelected();
+ for( RelationMember m : chosenRelation.get().getMembers() ) {
+ if( selected.contains(m.getMember()) ) {
+ if( role == null )
+ role = m.getRole();
+ else if( m.getRole() != null && !role.equals(m.getRole()) ) {
+ role = tr("");
+ break;
+ }
+ }
+ }
+ }
+ return role == null ? null : role.length() == 0 ? EMPTY_ROLE : role;
+ }
+
+ public List getRoles() {
+ return roles;
+ }
+
+ public int getSize() {
+ return roles.size();
+ }
+
+ public Object getElementAt( int index ) {
+ return getRole(index);
+ }
+
+ public String getRole( int index ) {
+ return roles.get(index);
+ }
+
+ public void setSelectedItem( Object anItem ) {
+ int newIndex = anItem == null ? -1 : roles.indexOf(anItem);
+ if( newIndex != selectedIndex ) {
+ selectedIndex = newIndex;
+ fireContentsChanged(this, -1, -1);
+ }
+ }
+
+ public Object getSelectedItem() {
+ return selectedIndex < 0 || selectedIndex >= getSize() ? null : getRole(selectedIndex);
+ }
+
+ public String getSelectedRole() {
+ String role = selectedIndex < 0 || selectedIndex >= getSize() ? null : getRole(selectedIndex);
+ return role != null && role.equals(EMPTY_ROLE) ? "" : role;
+ }
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextPlugin.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextPlugin.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextPlugin.java (revision 26174)
@@ -0,0 +1,21 @@
+package relcontext;
+
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
+
+public class RelContextPlugin extends Plugin {
+ private RelContextDialog dialog;
+
+ public RelContextPlugin( PluginInformation info ) {
+ super(info);
+ }
+
+ @Override
+ public void mapFrameInitialized( MapFrame oldFrame, MapFrame newFrame ) {
+ if( oldFrame == null && newFrame != null ) {
+ dialog = new RelContextDialog();
+ newFrame.addToggleDialog(dialog);
+ }
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/StaticChosenRelation.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/StaticChosenRelation.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/StaticChosenRelation.java (revision 26174)
@@ -0,0 +1,21 @@
+package relcontext;
+
+import org.openstreetmap.josm.data.osm.Relation;
+
+/**
+ * A chosen relation that is only a container for one relation and does not listen to anything.
+ *
+ * @author Zverik
+ */
+public class StaticChosenRelation extends ChosenRelation {
+
+ public StaticChosenRelation( Relation rel ) {
+ chosenRelation = rel;
+ analyse();
+ }
+
+ @Override
+ public void set( Relation rel ) {
+// throw new UnsupportedOperationException("Changing static relation is not supported.");
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java (revision 26174)
@@ -0,0 +1,154 @@
+package relcontext.actions;
+
+import java.util.*;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+/**
+ * An action to add or remove (or both) member(s) from the chosen relation.
+ * In time should be able to determine correct position for new members.
+ * Also, there should be some support for entering a role for new members.
+ *
+ * @author Zverik
+ */
+public class AddRemoveMemberAction extends JosmAction implements ChosenRelationListener {
+ private static final String ACTION_NAME = "Add/remove member";
+ private ChosenRelation rel;
+
+ public AddRemoveMemberAction( ChosenRelation rel ) {
+ super(null, "relcontext/addremove", tr("Add/remove members from the chosen relation"),
+ Shortcut.registerShortcut("reltoolbox:addremove", tr("Relation Toolbox: {0}", tr("Add/remove members from the chosen relation")),
+ KeyEvent.VK_EQUALS, Shortcut.GROUP_EDIT), true);
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ updateEnabledState();
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ if( rel.get() == null )
+ return;
+
+ Relation r = new Relation(rel.get());
+
+ Collection toAdd = new ArrayList(getCurrentDataSet().getSelected());
+ toAdd.remove(rel.get());
+ toAdd.removeAll(r.getMemberPrimitives());
+
+ // 0. check if relation is broken (temporary)
+ boolean isBroken = !toAdd.isEmpty() && SortAndFixAction.needsFixing(r);
+
+ // 1. remove all present members
+ r.removeMembersFor(getCurrentDataSet().getSelected());
+
+ // 2. add all new members
+ for( OsmPrimitive p : toAdd ) {
+ int pos = -1; //p instanceof Way ? findAdjacentMember(p, r) : -1;
+ if( pos < 0 )
+ r.addMember(new RelationMember("", p));
+ else
+ r.addMember(pos, new RelationMember("", p));
+ }
+
+ // 3. check for roles again (temporary)
+ Command roleFix = !isBroken && SortAndFixAction.needsFixing(r) ? SortAndFixAction.fixRelation(r) : null;
+ if( roleFix != null )
+ roleFix.executeCommand();
+
+ if( !r.getMemberPrimitives().equals(rel.get().getMemberPrimitives()) )
+ Main.main.undoRedo.add(new ChangeCommand(rel.get(), r));
+ }
+
+ /**
+ * Finds two relation members between which to place given way. Incomplete.
+ * @see org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel#determineDirection
+ */
+ protected int findAdjacentMember( Way w, Relation r ) {
+ Node firstNode = w.firstNode();
+ Node lastNode = w.lastNode();
+
+ if( firstNode != null && !firstNode.equals(lastNode) ) {
+ for( int i = 0; i < r.getMembersCount(); i++ ) {
+ if( r.getMember(i).getType().equals(OsmPrimitiveType.WAY) ) {
+ Way rw = (Way)r.getMember(i).getMember();
+ Node firstNodeR = rw.firstNode();
+ Node lastNodeR = rw.lastNode();
+ if( firstNode.equals(firstNodeR) || firstNode.equals(lastNodeR) || lastNode.equals(firstNodeR) || lastNode.equals(lastNodeR) )
+ return i + 1;
+ }
+ }
+ }
+ return -1;
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ updateEnabledState();
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ updateEnabledState(getCurrentDataSet() == null ? null : getCurrentDataSet().getSelected());
+ }
+
+ @Override
+ protected void updateEnabledState( Collection selection ) {
+ updateIcon();
+ if( rel == null || rel.get() == null || selection == null || selection.isEmpty() ) {
+ setEnabled(false);
+ return;
+ }
+ if( selection.size() == 1 && selection.contains(rel.get()) ) {
+ setEnabled(false);
+ return;
+ }
+ setEnabled(true);
+ }
+
+ protected void updateIcon() {
+ // todo: change icon based on selection
+ int state = 0; // 0=unknown, 1=add, 2=remove, 3=both
+ if( getCurrentDataSet() == null || getCurrentDataSet().getSelected() == null
+ || getCurrentDataSet().getSelected().isEmpty() || rel == null || rel.get() == null )
+ state = 0;
+ else {
+ Collection toAdd = new ArrayList(getCurrentDataSet().getSelected());
+ toAdd.remove(rel.get());
+ int selectedSize = toAdd.size();
+ if( selectedSize == 0 )
+ state = 0;
+ else {
+ toAdd.removeAll(rel.get().getMemberPrimitives());
+ if( toAdd.isEmpty() )
+ state = 2;
+ else if( toAdd.size() < selectedSize )
+ state = 3;
+ else
+ state = 1;
+ }
+ }
+// String name = state == 0 ? "?" : state == 1 ? "+" : state == 2 ? "-" : "±";
+// putValue(Action.NAME, name);
+ if( state == 0 ) {
+// putValue(NAME, "?");
+ putValue(SMALL_ICON, ImageProvider.get("relcontext", "addremove"));
+ } else {
+ String iconName = state == 1 ? "add" : state == 2 ? "remove" : "addremove";
+ putValue(NAME, null);
+ putValue(SMALL_ICON, ImageProvider.get("relcontext", iconName));
+ }
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ClearChosenRelationAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ClearChosenRelationAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ClearChosenRelationAction.java (revision 26174)
@@ -0,0 +1,32 @@
+package relcontext.actions;
+
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.tools.ImageProvider;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+public class ClearChosenRelationAction extends AbstractAction implements ChosenRelationListener {
+ private ChosenRelation rel;
+
+ public ClearChosenRelationAction( ChosenRelation rel ) {
+ super();
+// putValue(Action.NAME, "X");
+ putValue(Action.SMALL_ICON, ImageProvider.get("relcontext", "clear"));
+ putValue(Action.SHORT_DESCRIPTION, tr("Clear the chosen relation"));
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ setEnabled(false);
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ rel.clear();
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setEnabled(newRelation != null);
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java (revision 26174)
@@ -0,0 +1,372 @@
+package relcontext.actions;
+
+import java.awt.Dialog.ModalityType;
+import java.awt.GridBagLayout;
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.util.*;
+import javax.swing.*;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.command.*;
+import org.openstreetmap.josm.data.osm.*;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Shortcut;
+import relcontext.ChosenRelation;
+
+/**
+ * Creates new multipolygon from selected ways.
+ * Choose relation afterwards.
+ *
+ * @author Zverik
+ */
+public class CreateMultipolygonAction extends JosmAction {
+ private static final String ACTION_NAME = "Create relation";
+ private static final String PREF_MULTIPOLY = "reltoolbox.multipolygon.";
+ protected ChosenRelation chRel;
+
+ public CreateMultipolygonAction( ChosenRelation chRel ) {
+ super("Multi", "data/multipolygon", tr("Create a multipolygon from selected objects"),
+ Shortcut.registerShortcut("reltoolbox:multipolygon", tr("Relation Toolbox: {0}", tr("Create multipolygon")),
+ KeyEvent.VK_B, Shortcut.GROUP_HOTKEY), true);
+ this.chRel = chRel;
+ updateEnabledState();
+ }
+
+ public CreateMultipolygonAction() {
+ this(null);
+ }
+
+ public static boolean getDefaultPropertyValue( String property ) {
+ if( property.equals("boundary") ) return false;
+ else if( property.equals("boundaryways") ) return true;
+ else if( property.equals("tags") ) return true;
+ else if( property.equals("single") ) return true;
+ throw new IllegalArgumentException(property);
+ }
+
+ private boolean getPref( String property ) {
+ return Main.pref.getBoolean(PREF_MULTIPOLY + property, getDefaultPropertyValue(property));
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ // for now, just copying standard action
+ MultipolygonCreate mpc = new MultipolygonCreate();
+ String error = mpc.makeFromWays(getCurrentDataSet().getSelectedWays());
+ if( error != null ) {
+ JOptionPane.showMessageDialog(Main.parent, error);
+ return;
+ }
+ Relation rel = new Relation();
+ boolean isBoundary = getPref("boundary");
+ if( isBoundary ) {
+ rel.put("type", "boundary");
+ rel.put("boundary", "administrative");
+ } else
+ rel.put("type", "multipolygon");
+ for( MultipolygonCreate.JoinedPolygon poly : mpc.outerWays )
+ for( Way w : poly.ways )
+ rel.addMember(new RelationMember("outer", w));
+ for( MultipolygonCreate.JoinedPolygon poly : mpc.innerWays )
+ for( Way w : poly.ways )
+ rel.addMember(new RelationMember("inner", w));
+ List list = removeTagsFromInnerWays(rel);
+ if( isBoundary ) {
+ if( !askForAdminLevelAndName(rel) )
+ return;
+ addBoundaryMembers(rel);
+ if( getPref("boundaryways") )
+ list.addAll(fixWayTagsForBoundary(rel));
+ }
+ list.add(new AddCommand(rel));
+ Main.main.undoRedo.add(new SequenceCommand(tr("Create multipolygon"), list));
+
+ if( chRel != null )
+ chRel.set(rel);
+
+ getCurrentDataSet().setSelected(rel);
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ if( getCurrentDataSet() == null ) {
+ setEnabled(false);
+ } else {
+ updateEnabledState(getCurrentDataSet().getSelected());
+ }
+ }
+
+ @Override
+ protected void updateEnabledState( Collection selection ) {
+ boolean enabled = true;
+ if( selection == null || selection.isEmpty() )
+ enabled = false;
+ else {
+ if( !getPref("boundary") ) {
+ for( OsmPrimitive p : selection ) {
+ if( !(p instanceof Way) ) {
+ enabled = false;
+ break;
+ }
+ }
+ }
+ }
+ setEnabled(enabled);
+ }
+
+ /**
+ * Add selected nodes and relations with corresponding roles.
+ */
+ private void addBoundaryMembers( Relation rel ) {
+ for( OsmPrimitive p : getCurrentDataSet().getSelected() ) {
+ String role = null;
+ if( p.getType().equals(OsmPrimitiveType.RELATION) ) {
+ role = "subarea";
+ } else if( p.getType().equals(OsmPrimitiveType.NODE) ) {
+ Node n = (Node)p;
+ if( !n.isIncomplete() ) {
+ if( n.hasKey("place") )
+ role = "admin_centre";
+ else
+ role = "label";
+ }
+ }
+ if( role != null )
+ rel.addMember(new RelationMember(role, p));
+ }
+ }
+
+ /**
+ * For all untagged ways in relation, add tags boundary and admin_level.
+ */
+ private List fixWayTagsForBoundary( Relation rel ) {
+ List commands = new ArrayList();
+ if( !rel.hasKey("boundary") || !rel.hasKey("admin_level") )
+ return commands;
+ String adminLevelStr = rel.get("admin_level");
+ int adminLevel = 0;
+ try {
+ adminLevel = Integer.parseInt(adminLevelStr);
+ } catch( NumberFormatException e ) {
+ return commands;
+ }
+ Set waysBoundary = new HashSet();
+ Set waysAdminLevel = new HashSet();
+ for( OsmPrimitive p : rel.getMemberPrimitives() ) {
+ if( p instanceof Way ) {
+ int count = 0;
+ if( p.hasKey("boundary") && p.get("boundary").equals("administrative") )
+ count++;
+ if( p.hasKey("admin_level") )
+ count++;
+ if( p.keySet().size() - count == 0 ) {
+ if( !p.hasKey("boundary") )
+ waysBoundary.add(p);
+ if( !p.hasKey("admin_level") ) {
+ waysAdminLevel.add(p);
+ } else {
+ try {
+ int oldAdminLevel = Integer.parseInt(p.get("admin_level"));
+ if( oldAdminLevel > adminLevel )
+ waysAdminLevel.add(p);
+ } catch( NumberFormatException e ) {
+ waysAdminLevel.add(p); // some garbage, replace it
+ }
+ }
+ }
+ }
+ }
+ if( !waysBoundary.isEmpty() )
+ commands.add(new ChangePropertyCommand(waysBoundary, "boundary", "administrative"));
+ if( !waysAdminLevel.isEmpty() )
+ commands.add(new ChangePropertyCommand(waysAdminLevel, "admin_level", adminLevelStr));
+ return commands;
+ }
+
+ static public final String[] DEFAULT_LINEAR_TAGS = {"barrier", "source"};
+
+ private static final Set REMOVE_FROM_BOUNDARY_TAGS = new TreeSet(Arrays.asList(new String[] {
+ "boundary", "boundary_type", "type", "admin_level"
+ }));
+
+ /**
+ * This method removes tags/value pairs from inner ways that are present in relation or outer ways.
+ * It was copypasted from the standard {@link org.openstreetmap.josm.actions.CreateMultipolygonAction}.
+ * Todo: rewrite it.
+ */
+ private List removeTagsFromInnerWays(Relation relation) {
+ Map values = new HashMap();
+
+ if (relation.hasKeys()){
+ for(String key: relation.keySet()) {
+ values.put(key, relation.get(key));
+ }
+ }
+
+ List innerWays = new ArrayList();
+ List outerWays = new ArrayList();
+
+ Set conflictingKeys = new TreeSet();
+
+ for (RelationMember m: relation.getMembers()) {
+
+ if (m.hasRole() && m.getRole() == "inner" && m.isWay() && m.getWay().hasKeys()) {
+ innerWays.add(m.getWay());
+ }
+
+ if (m.hasRole() && m.getRole() == "outer" && m.isWay() && m.getWay().hasKeys()) {
+ Way way = m.getWay();
+ outerWays.add(way);
+ for (String key: way.keySet()) {
+ if (!values.containsKey(key)) { //relation values take precedence
+ values.put(key, way.get(key));
+ } else if( !relation.hasKey(key) && !values.get(key).equals(way.get(key)) ) {
+ conflictingKeys.add(key);
+ }
+ }
+ }
+ }
+
+ // filter out empty key conflicts - we need second iteration
+ for( RelationMember m: relation.getMembers() )
+ if( m.hasRole() && m.getRole().equals("outer") && m.isWay() )
+ for( String key : values.keySet() )
+ if( !m.getWay().hasKey(key) && !relation.hasKey(key) )
+ conflictingKeys.add(key);
+
+ for( String key : conflictingKeys )
+ values.remove(key);
+
+ for( String linearTag : Main.pref.getCollection(PREF_MULTIPOLY + "lineartags", Arrays.asList(DEFAULT_LINEAR_TAGS)))
+ values.remove(linearTag);
+
+ if( values.containsKey("natural") && values.get("natural").equals("coastline") )
+ values.remove("natural");
+
+ boolean isBoundary = getPref("boundary");
+ String name = values.get("name");
+ String adminLevel = values.get("admin_level");
+ if( isBoundary ) {
+ Set keySet = new TreeSet(values.keySet());
+ for( String key : keySet )
+ if( !REMOVE_FROM_BOUNDARY_TAGS.contains(key) )
+ values.remove(key);
+ }
+
+ values.put("area", "yes");
+
+ List commands = new ArrayList();
+ boolean moveTags = getPref("tags");
+
+ for(String key: values.keySet()) {
+ List affectedWays = new ArrayList();
+ String value = values.get(key);
+
+ for (Way way: innerWays) {
+ if( way.hasKey(key) && (isBoundary || value.equals(way.get(key))) ) {
+ affectedWays.add(way);
+ }
+ }
+
+ if( moveTags ) {
+ // remove duplicated tags from outer ways
+ for (Way way: outerWays) {
+ if (way.hasKey(key)) {
+ affectedWays.add(way);
+ }
+ }
+ }
+
+ if (affectedWays.size() > 0) {
+ commands.add(new ChangePropertyCommand(affectedWays, key, null));
+ }
+ }
+
+ if( moveTags ) {
+ // add those tag values to the relation
+ if( isBoundary )
+ values.put("name", name);
+ boolean fixed = false;
+ Relation r2 = new Relation(relation);
+ for( String key : values.keySet() ) {
+ if( !r2.hasKey(key) && !key.equals("area")
+ && (!isBoundary || key.equals("admin_level") || key.equals("name"))) {
+ if( relation.isNew() )
+ relation.put(key, values.get(key));
+ else
+ r2.put(key, values.get(key));
+ fixed = true;
+ }
+ }
+ if( fixed && !relation.isNew() )
+ commands.add(new ChangeCommand(relation, r2));
+ }
+
+ return commands;
+ }
+
+ /**
+ *
+ * @param rel
+ * @return false if user pressed "cancel".
+ */
+ private boolean askForAdminLevelAndName( Relation rel ) {
+ String relAL = rel.get("admin_level");
+ String relName = rel.get("name");
+ if( relAL != null && relName != null )
+ return true;
+
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.add(new JLabel(tr("Enter admin level and name for the border relation:")), GBC.eol().insets(0, 0, 0, 5));
+
+ final JTextField admin = new JTextField();
+ admin.setText(relAL != null ? relAL : Main.pref.get(PREF_MULTIPOLY + "lastadmin", ""));
+ panel.add(new JLabel(tr("Admin level")), GBC.std());
+ panel.add(Box.createHorizontalStrut(10), GBC.std());
+ panel.add(admin, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 5));
+
+ final JTextField name = new JTextField();
+ if( relName != null )
+ name.setText(relName);
+ panel.add(new JLabel(tr("Name")), GBC.std());
+ panel.add(Box.createHorizontalStrut(10), GBC.std());
+ panel.add(name, GBC.eol().fill(GBC.HORIZONTAL));
+
+ final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION) {
+ @Override
+ public void selectInitialValue() {
+ admin.requestFocusInWindow();
+ admin.selectAll();
+ }
+ };
+ final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create a new relation"));
+ dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
+
+ name.addActionListener(new ActionListener() {
+ public void actionPerformed( ActionEvent e ) {
+ dlg.setVisible(false);
+ optionPane.setValue(JOptionPane.OK_OPTION);
+ }
+ });
+
+ dlg.setVisible(true);
+
+ Object answer = optionPane.getValue();
+ if( answer == null || answer == JOptionPane.UNINITIALIZED_VALUE
+ || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION) ) {
+ return false;
+ }
+
+ String admin_level = admin.getText().trim();
+ String new_name = name.getText().trim();
+ if( admin_level.equals("10") || (admin_level.length() == 1 && Character.isDigit(admin_level.charAt(0))) ) {
+ rel.put("admin_level", admin_level);
+ Main.pref.put(PREF_MULTIPOLY + "lastadmin", admin_level);
+ }
+ if( new_name.length() > 0 )
+ rel.put("name", new_name);
+ return true;
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java (revision 26174)
@@ -0,0 +1,131 @@
+package relcontext.actions;
+
+import java.awt.Dialog.ModalityType;
+import java.awt.GridBagLayout;
+import java.util.Collection;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.util.Arrays;
+import java.util.List;
+import javax.swing.Box;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Shortcut;
+import relcontext.ChosenRelation;
+
+/**
+ * Simple create relation with no tags and all selected objects in it with no roles.
+ * Choose relation afterwards.
+ *
+ * @author Zverik
+ */
+public class CreateRelationAction extends JosmAction {
+ private static final String PREF_LASTTYPE = "reltoolbox.createrelation.lasttype";
+ protected ChosenRelation chRel;
+
+ public CreateRelationAction( ChosenRelation chRel ) {
+ super(tr("New"), "data/relation", tr("Create a relation from selected objects"),
+ Shortcut.registerShortcut("reltoolbox:create", tr("Relation Toolbox: {0}", tr("Create a new relation")),
+ KeyEvent.VK_C, Shortcut.GROUP_HOTKEY, Shortcut.SHIFT_DEFAULT), true);
+ this.chRel = chRel;
+ updateEnabledState();
+ }
+
+ public CreateRelationAction() {
+ this(null);
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ String type = askForType();
+ if( type == null )
+ return;
+
+ Relation rel = new Relation();
+ if( type.length() > 0 )
+ rel.put("type", type);
+ for( OsmPrimitive selected : getCurrentDataSet().getSelected() )
+ rel.addMember(new RelationMember("", selected));
+
+ Main.main.undoRedo.add(new AddCommand(rel));
+
+ if( chRel != null ) {
+ chRel.set(rel);
+ }
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ if( getCurrentDataSet() == null ) {
+ setEnabled(false);
+ } else {
+ updateEnabledState(getCurrentDataSet().getSelected());
+ }
+ }
+
+ @Override
+ protected void updateEnabledState( Collection selection ) {
+ setEnabled(selection != null && !selection.isEmpty());
+ }
+
+ // Thanks to TagInfo for the list
+ private static final List RELATION_TYPES = Arrays.asList(new String[] {
+ "multipolygon", "boundary", "route", "site", "restriction", "associatedStreet", "public_transport",
+ "street", "collection", "address", "enforcement", "destination_sign", "route_master", "junction",
+ "waterway", "bridge", "tunnel", "surveillance"
+ });
+
+ private String askForType() {
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.add(new JLabel(tr("Choose a type for the relation:")), GBC.eol().insets(0, 0, 0, 5));
+
+ final AutoCompletingComboBox keys = new AutoCompletingComboBox();
+ keys.setPossibleItems(RELATION_TYPES);
+ keys.setEditable(true);
+ keys.getEditor().setItem(Main.pref.get(PREF_LASTTYPE, "multipolygon"));
+
+ panel.add(new JLabel(tr("Type")), GBC.std());
+ panel.add(Box.createHorizontalStrut(10), GBC.std());
+ panel.add(keys, GBC.eol().fill(GBC.HORIZONTAL));
+
+ final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION) {
+ @Override
+ public void selectInitialValue() {
+ keys.requestFocusInWindow();
+ keys.getEditor().selectAll();
+ }
+ };
+ final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create a new relation"));
+ dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
+
+ keys.getEditor().addActionListener(new ActionListener() {
+ public void actionPerformed( ActionEvent e ) {
+ dlg.setVisible(false);
+ optionPane.setValue(JOptionPane.OK_OPTION);
+ }
+ });
+
+ dlg.setVisible(true);
+
+ Object answer = optionPane.getValue();
+ if( answer == null || answer == JOptionPane.UNINITIALIZED_VALUE
+ || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION) ) {
+ return null;
+ }
+
+ String result = keys.getEditor().getItem().toString().trim();
+ Main.pref.put(PREF_LASTTYPE, result);
+ return result;
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DeleteChosenRelationAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DeleteChosenRelationAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DeleteChosenRelationAction.java (revision 26174)
@@ -0,0 +1,33 @@
+package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.tools.ImageProvider;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+public class DeleteChosenRelationAction extends AbstractAction implements ChosenRelationListener {
+ private ChosenRelation rel;
+
+ public DeleteChosenRelationAction( ChosenRelation rel ) {
+ super(tr("Delete relation"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ setEnabled(rel.get() != null);
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ Relation r = rel.get();
+ rel.clear();
+ Main.main.undoRedo.add(new DeleteCommand(r));
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setEnabled(newRelation != null);
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java (revision 26174)
@@ -0,0 +1,75 @@
+package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import javax.swing.AbstractAction;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
+import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
+import org.openstreetmap.josm.tools.ImageProvider;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+/**
+ * Downloads or updates chosen relation members, depending on completeness.
+ *
+ * @author Zverik
+ */
+public class DownloadChosenRelationAction extends AbstractAction implements ChosenRelationListener {
+ private ChosenRelation rel;
+
+ public DownloadChosenRelationAction( ChosenRelation rel ) {
+ super();
+// putValue(NAME, "D");
+ putValue(SMALL_ICON, ImageProvider.get("relcontext", "download"));
+ putValue(SHORT_DESCRIPTION, tr("Download incomplete members for the chosen relation"));
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ setEnabled(false);
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ Relation relation = rel.get();
+ if( relation == null || relation.isNew() ) return;
+ int total = relation.getMembersCount();
+ int incomplete = relation.getIncompleteMembers().size();
+// if( incomplete <= 5 || (incomplete <= 10 && incomplete * 3 < total) )
+ if( incomplete <= 10 && incomplete * 3 < total )
+ downloadIncomplete(relation);
+ else
+ downloadMembers(relation);
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ boolean incomplete = false;
+ if( newRelation != null ) {
+ for( RelationMember m : newRelation.getMembers()) {
+ if( m.getMember().isIncomplete() ) {
+ incomplete = true;
+ break;
+ }
+ }
+ }
+ setEnabled(newRelation != null && incomplete);
+ }
+
+ protected void downloadMembers( Relation rel ) {
+ if( !rel.isNew() ) {
+ Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.map.mapView.getEditLayer()));
+ }
+ }
+
+ protected void downloadIncomplete( Relation rel ) {
+ if( rel.isNew() ) return;
+ Set ret = new HashSet();
+ ret.addAll(rel.getIncompleteMembers());
+ if( ret.isEmpty() ) return;
+ Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.map.mapView.getEditLayer()));
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java (revision 26174)
@@ -0,0 +1,65 @@
+package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.swing.AbstractAction;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadReferrersTask;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
+import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
+import org.openstreetmap.josm.tools.ImageProvider;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+/**
+ * Downloads parent relations for this relation and all parent objects for its members.
+ *
+ * @author Zverik
+ */
+public class DownloadParentsAction extends AbstractAction implements ChosenRelationListener {
+ private ChosenRelation rel;
+
+ public DownloadParentsAction( ChosenRelation rel ) {
+ super(tr("Download referrers"));
+ putValue(SMALL_ICON, ImageProvider.get("downloadreferrers"));
+ putValue(SHORT_DESCRIPTION, tr("Download referrers for the the chosen relation and its members"));
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ setEnabled(rel.get() != null && Main.map.mapView.getEditLayer() != null);
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ Relation relation = rel.get();
+ if( relation == null ) return;
+ List objects = new ArrayList();
+ objects.add(relation);
+ objects.addAll(relation.getMemberPrimitives());
+ Main.worker.submit(new DownloadReferrersTask(Main.map.mapView.getEditLayer(), objects));
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setEnabled(newRelation != null && Main.map.mapView.getEditLayer() != null);
+ }
+
+ protected void downloadMembers( Relation rel ) {
+ if( !rel.isNew() ) {
+ Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.map.mapView.getEditLayer()));
+ }
+ }
+
+ protected void downloadIncomplete( Relation rel ) {
+ if( rel.isNew() ) return;
+ Set ret = new HashSet();
+ ret.addAll(rel.getIncompleteMembers());
+ if( ret.isEmpty() ) return;
+ Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.map.mapView.getEditLayer()));
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/EditChosenRelationAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/EditChosenRelationAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/EditChosenRelationAction.java (revision 26174)
@@ -0,0 +1,40 @@
+package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.tools.ImageProvider;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+/**
+ * Opens an editor for chosen relation.
+ *
+ * @author Zverik
+ */
+public class EditChosenRelationAction extends AbstractAction implements ChosenRelationListener {
+ private ChosenRelation rel;
+
+ public EditChosenRelationAction( ChosenRelation rel ) {
+ super();
+// putValue(NAME, "E");
+ putValue(SMALL_ICON, ImageProvider.get("dialogs/mappaint", "pencil"));
+ putValue(SHORT_DESCRIPTION, tr("Open relation editor for the chosen relation"));
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ setEnabled(rel.get() != null);
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ Relation relation = rel.get();
+ if( relation == null ) return;
+ RelationEditor.getEditor(Main.map.mapView.getEditLayer(), relation, null).setVisible(true);
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setEnabled(newRelation != null);
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java (revision 26174)
@@ -0,0 +1,223 @@
+package relcontext.actions;
+
+import java.awt.BorderLayout;
+import java.awt.Dialog.ModalityType;
+import java.awt.Dimension;
+import java.awt.event.*;
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.util.*;
+import java.util.ArrayList;
+import javax.swing.*;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.osm.NameFormatter;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.tools.Shortcut;
+import relcontext.ChosenRelation;
+
+/**
+ * Opens a list of all relations with keyword search field. Choose selected relation.
+ *
+ * @author Zverik
+ */
+public class FindRelationAction extends JosmAction {
+ protected ChosenRelation chRel;
+
+ public FindRelationAction( ChosenRelation chRel ) {
+ super("Find", "relcontext/find", tr("Find a relation"),
+ Shortcut.registerShortcut("reltoolbox:find", tr("Relation Toolbox: {0}", tr("Find a relation")),
+ KeyEvent.VK_F, Shortcut.GROUP_HOTKEY), true);
+ this.chRel = chRel;
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ JPanel panel = new JPanel(new BorderLayout());
+ final JTextField searchField = new JTextField();
+ panel.add(searchField, BorderLayout.NORTH);
+ final FindRelationListModel relationsData = new FindRelationListModel();
+ final JList relationsList = new JList(relationsData);
+ relationsList.setSelectionModel(relationsData.getSelectionModel());
+ relationsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ relationsList.setCellRenderer(new OsmPrimitivRenderer());
+ panel.add(new JScrollPane(relationsList, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER);
+ panel.setPreferredSize(new Dimension(400, 400));
+
+ final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION) {
+ @Override
+ public void selectInitialValue() {
+ searchField.requestFocusInWindow();
+ }
+ };
+ final JDialog dlg = optionPane.createDialog(Main.parent, tr("Find a relation"));
+ dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
+
+ relationsList.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked( MouseEvent e ) {
+ if( e.getClickCount() >= 2 && !relationsList.isSelectionEmpty() ) {
+ dlg.setVisible(false);
+ optionPane.setValue(JOptionPane.OK_OPTION);
+ }
+ }
+ });
+
+ searchField.addActionListener(new ActionListener() {
+ public void actionPerformed( ActionEvent e ) {
+ if( !relationsList.isSelectionEmpty() ) {
+ dlg.setVisible(false);
+ optionPane.setValue(JOptionPane.OK_OPTION);
+ }
+ }
+ });
+
+ searchField.addKeyListener(new KeyAdapter() {
+ @Override
+ public void keyTyped( KeyEvent e ) {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ updateRelationData(relationsData, searchField.getText());
+ }
+ });
+ }
+
+ @Override
+ public void keyPressed( KeyEvent e ) {
+ if( shouldForward(e) )
+ relationsList.dispatchEvent(e);
+ }
+
+ @Override
+ public void keyReleased( KeyEvent e ) {
+ if( shouldForward(e) )
+ relationsList.dispatchEvent(e);
+ }
+
+ private boolean shouldForward( KeyEvent e ) {
+ return e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_DOWN
+ || e.getKeyCode() == KeyEvent.VK_PAGE_DOWN || e.getKeyCode() == KeyEvent.VK_PAGE_UP
+ || e.getKeyCode() == KeyEvent.VK_HOME || e.getKeyCode() == KeyEvent.VK_END;
+ }
+ });
+
+ updateRelationData(relationsData, null);
+ dlg.setVisible(true);
+
+ Object answer = optionPane.getValue();
+ if( answer == null || answer == JOptionPane.UNINITIALIZED_VALUE
+ || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION) ) {
+ return;
+ }
+
+ Relation r = (Relation)relationsList.getSelectedValue();
+ if( r != null )
+ chRel.set(r);
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(getCurrentDataSet() != null);
+ }
+
+ protected void updateRelationData( FindRelationListModel data, String filter ) {
+ String[] keywords = filter == null ? new String[0] : filter.split("\\s+");
+ if( keywords.length > 0 ) {
+ List filteredKeywords = new ArrayList(keywords.length);
+ for( String s : keywords )
+ if( s.length() > 0 )
+ filteredKeywords.add(s.trim().toLowerCase());
+ keywords = filteredKeywords.toArray(new String[0]);
+ }
+
+ System.out.println("keywords.length = " + keywords.length);
+ for( int i = 0; i < keywords.length; i++ )
+ System.out.println("keyword["+i+"] = " + keywords[i]);
+
+ List relations = new ArrayList();
+ if( getEditLayer() != null ) {
+ for( Relation r : getEditLayer().data.getRelations() ) {
+ if( !r.isDeleted() && r.isVisible() && !r.isIncomplete() ) {
+ boolean add = true;
+ for( int i = 0; i < keywords.length && add; i++ ) {
+ boolean ok = false;
+ if( String.valueOf(r.getPrimitiveId().getUniqueId()).contains(keywords[i]) )
+ ok = true;
+ else {
+ for( String key : r.keySet() ) {
+ if( key.contains(keywords[i]) || r.get(key).toLowerCase().contains(keywords[i])
+ || tr(r.get(key)).toLowerCase().contains(keywords[i]) ) {
+ ok = true;
+ break;
+ }
+ }
+ }
+ if( !ok ) add = false;
+ }
+ if( add )
+ relations.add(r);
+ }
+ }
+ }
+
+ final NameFormatter formatter = DefaultNameFormatter.getInstance();
+ Collections.sort(relations, new Comparator() {
+ public int compare( Relation r1, Relation r2 ) {
+ return r1.getDisplayName(formatter).compareTo(r2.getDisplayName(formatter));
+ }
+ });
+ data.setRelations(relations);
+ }
+
+ /**
+ * I admit, some of it was copypasted from {@link org.openstreetmap.josm.gui.dialogs.RelationListDialog.RelationListModel}.
+ */
+ protected class FindRelationListModel extends AbstractListModel {
+ private final ArrayList relations = new ArrayList();
+ private DefaultListSelectionModel selectionModel;
+
+ public FindRelationListModel( DefaultListSelectionModel selectionModel ) {
+ super();
+ this.selectionModel = selectionModel;
+ }
+
+ public FindRelationListModel() {
+ this(new DefaultListSelectionModel());
+ }
+
+ public DefaultListSelectionModel getSelectionModel() {
+ return selectionModel;
+ }
+
+ public Relation getRelation( int idx ) {
+ return relations.get(idx);
+ }
+
+ public int getSize() {
+ return relations.size();
+ }
+
+ public Object getElementAt( int index ) {
+ return getRelation(index);
+ }
+
+ public void setRelations(Collection relations) {
+ int selectedIndex = selectionModel.getMinSelectionIndex();
+ Relation sel = selectedIndex < 0 ? null : getRelation(selectedIndex);
+
+ this.relations.clear();
+ selectionModel.clearSelection();
+ if( relations != null )
+ this.relations.addAll(relations);
+ fireIntervalAdded(this, 0, getSize());
+
+ if( sel != null ) {
+ selectedIndex = this.relations.indexOf(sel);
+ if( selectedIndex >= 0 )
+ selectionModel.addSelectionInterval(selectedIndex, selectedIndex);
+ }
+ if( selectionModel.isSelectionEmpty() && !this.relations.isEmpty() )
+ selectionModel.addSelectionInterval(0, 0);
+ }
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java (revision 26174)
@@ -0,0 +1,103 @@
+package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.AbstractAction;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.OpenBrowser;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+public class RelationHelpAction extends AbstractAction implements ChosenRelationListener {
+ private ChosenRelation rel;
+
+ public RelationHelpAction( ChosenRelation rel ) {
+ super();
+ putValue(NAME, tr("Open relation wiki page"));
+ putValue(SHORT_DESCRIPTION, tr("Launch browser with wiki help for selected object"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ setEnabled(rel.get() != null);
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setEnabled(newRelation != null);
+ }
+
+ /**
+ * Copypasted from {@link org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog.HelpAction}.
+ */
+ public void actionPerformed( ActionEvent e ) {
+ if( rel.get() == null )
+ return;
+ try {
+ String base = Main.pref.get("url.openstreetmap-wiki", "http://wiki.openstreetmap.org/wiki/");
+ String lang = LanguageInfo.getWikiLanguagePrefix();
+ final List uris = new ArrayList();
+ String type = URLEncoder.encode(rel.get().get("type"), "UTF-8");
+
+ if (type != null && !type.equals("")) {
+ uris.add(new URI(String.format("%s%sRelation:%s", base, lang, type)));
+ uris.add(new URI(String.format("%sRelation:%s", base, type)));
+ }
+
+ uris.add(new URI(String.format("%s%sRelations", base, lang)));
+ uris.add(new URI(String.format("%sRelations", base)));
+
+ Main.worker.execute(new Runnable(){
+ public void run() {
+ try {
+ // find a page that actually exists in the wiki
+ HttpURLConnection conn;
+ for (URI u : uris) {
+ conn = (HttpURLConnection) u.toURL().openConnection();
+ conn.setConnectTimeout(5000);
+
+ if (conn.getResponseCode() != 200) {
+ System.out.println("INFO: " + u + " does not exist");
+ conn.disconnect();
+ } else {
+ int osize = conn.getContentLength();
+ conn.disconnect();
+
+ conn = (HttpURLConnection) new URI(u.toString()
+ .replace("=", "%3D") /* do not URLencode whole string! */
+ .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
+ ).toURL().openConnection();
+ conn.setConnectTimeout(5000);
+
+ /* redirect pages have different content length, but retrieving a "nonredirect"
+ * page using index.php and the direct-link method gives slightly different
+ * content lengths, so we have to be fuzzy.. (this is UGLY, recode if u know better)
+ */
+ if (Math.abs(conn.getContentLength() - osize) > 200) {
+ System.out.println("INFO: " + u + " is a mediawiki redirect");
+ conn.disconnect();
+ } else {
+ System.out.println("INFO: browsing to " + u);
+ conn.disconnect();
+
+ OpenBrowser.displayUrl(u.toString());
+ break;
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java (revision 26174)
@@ -0,0 +1,35 @@
+package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.tools.ImageProvider;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+public class SelectInRelationPanelAction extends AbstractAction implements ChosenRelationListener {
+ private ChosenRelation rel;
+
+ public SelectInRelationPanelAction( ChosenRelation rel ) {
+ super();
+ putValue(NAME, tr("Select in relation list"));
+ putValue(SHORT_DESCRIPTION, tr("Select relation in relation list."));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "relationlist"));
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ setEnabled(rel.get() != null);
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ if( rel.get() != null ) {
+ Main.map.relationListDialog.selectRelation(rel.get());
+ Main.map.relationListDialog.unfurlDialog();
+ }
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setEnabled(newRelation != null);
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java (revision 26174)
@@ -0,0 +1,30 @@
+package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.tools.ImageProvider;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+public class SelectMembersAction extends AbstractAction implements ChosenRelationListener {
+ private ChosenRelation rel;
+
+ public SelectMembersAction( ChosenRelation rel ) {
+ super(tr("Select members"));
+ putValue(SMALL_ICON, ImageProvider.get("selectall"));
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ setEnabled(rel.get() != null);
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ Main.map.mapView.getEditLayer().data.setSelected(rel.get() == null ? null : rel.get().getMemberPrimitives());
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setEnabled(newRelation != null);
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java (revision 26174)
@@ -0,0 +1,31 @@
+package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.tools.ImageProvider;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+public class SelectRelationAction extends AbstractAction implements ChosenRelationListener {
+ private ChosenRelation rel;
+
+ public SelectRelationAction( ChosenRelation rel ) {
+ super(tr("Select relation"));
+ putValue(SHORT_DESCRIPTION, tr("Select relation in main selection."));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ setEnabled(rel.get() != null);
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ Main.map.mapView.getEditLayer().data.setSelected(rel.get() == null ? null : rel.get());
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setEnabled(newRelation != null);
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SortAndFixAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SortAndFixAction.java (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SortAndFixAction.java (revision 26174)
@@ -0,0 +1,164 @@
+package relcontext.actions;
+
+import java.awt.event.ActionEvent;
+import java.util.*;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.*;
+import org.openstreetmap.josm.tools.ImageProvider;
+import relcontext.ChosenRelation;
+import relcontext.ChosenRelationListener;
+
+public class SortAndFixAction extends AbstractAction implements ChosenRelationListener {
+ private ChosenRelation rel;
+
+ public SortAndFixAction( ChosenRelation rel ) {
+ super();
+// putValue(Action.NAME, "AZ");
+ putValue(Action.SMALL_ICON, ImageProvider.get("data", "warning"));
+ putValue(Action.SHORT_DESCRIPTION, tr("Fix roles of the chosen relation members"));
+ this.rel = rel;
+ rel.addChosenRelationListener(this);
+ setEnabled(false);
+ }
+
+ public void actionPerformed( ActionEvent e ) {
+ Command c = fixRelation(rel.get());
+ if( c != null )
+ Main.main.undoRedo.add(c);
+ }
+
+ public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+ setEnabled(newRelation != null && needsFixing( newRelation));
+ }
+
+ public static boolean needsFixing( Relation rel ) {
+ return !isIncomplete(rel) && (areMultipolygonTagsEmpty(rel) || areBoundaryTagsNotRight(rel));
+ }
+
+ public static Command fixRelation( Relation rel ) {
+ Relation r = rel;
+ boolean fixed = false;
+ // todo: sort members
+ // todo: set roles for multipolygon members
+ Relation rr = fixMultipolygonRoles(r);
+ if( rr != null ) {
+ r = rr;
+ fixed = true;
+ }
+ // todo: set roles for boundary members
+ rr= fixBoundaryRoles(r);
+ if( rr != null ) {
+ r = rr;
+ fixed = true;
+ }
+
+ return fixed ? new ChangeCommand(rel, r) : null;
+ }
+
+ protected static boolean isIncomplete( Relation r ) {
+ if( r == null || r.isIncomplete() || r.isDeleted() )
+ return true;
+ for( RelationMember m : r.getMembers())
+ if( m.getMember().isIncomplete() )
+ return true;
+ return false;
+ }
+
+ /**
+ * Check for ways that have roles different from "outer" and "inner".
+ */
+ private static boolean areMultipolygonTagsEmpty( Relation r ) {
+ if( r == null || r.getMembersCount() == 0 || !ChosenRelation.isMultipolygon(r) )
+ return false;
+ for( RelationMember m : r.getMembers() ) {
+ if( m.getType().equals(OsmPrimitiveType.WAY) && (m.getRole() == null || (!m.getRole().equals("outer") && !m.getRole().equals("inner"))) )
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Check for nodes and relations without needed roles.
+ */
+ private static boolean areBoundaryTagsNotRight( Relation r ) {
+ if( r == null || r.getMembersCount() == 0 || !r.hasKey("type") || !r.get("type").equals("boundary") )
+ return false;
+ for( RelationMember m : r.getMembers() ) {
+ if( m.getType().equals(OsmPrimitiveType.RELATION) && (m.getRole() == null || !m.getRole().equals("subarea")) )
+ return true;
+ else if(m.getType().equals(OsmPrimitiveType.NODE) && (m.getRole() == null || (!m.getRole().equals("label") && !m.getRole().equals("admin_centre"))) )
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Basically, created multipolygon from scratch, and if successful, replace roles with new ones.
+ */
+ private static Relation fixMultipolygonRoles( Relation source ) {
+ Collection ways = new ArrayList();
+ for( OsmPrimitive p : source.getMemberPrimitives() )
+ if( p instanceof Way )
+ ways.add((Way)p);
+ MultipolygonCreate mpc = new MultipolygonCreate();
+ String error = mpc.makeFromWays(ways);
+ if( error != null )
+ return null;
+
+ Relation r = new Relation(source);
+ boolean fixed = false;
+ Set outerWays = new HashSet();
+ for( MultipolygonCreate.JoinedPolygon poly : mpc.outerWays )
+ for( Way w : poly.ways )
+ outerWays.add(w);
+ Set innerWays = new HashSet();
+ for( MultipolygonCreate.JoinedPolygon poly : mpc.innerWays )
+ for( Way w : poly.ways )
+ innerWays.add(w);
+ for( int i = 0; i < r.getMembersCount(); i++ ) {
+ RelationMember m = r.getMember(i);
+ if( m.isWay() ) {
+ String role = null;
+ if( outerWays.contains((Way)m.getMember()) )
+ role = "outer";
+ else if( innerWays.contains((Way)m.getMember()) )
+ role = "inner";
+ if( role != null && !role.equals(m.getRole()) ) {
+ r.setMember(i, new RelationMember(role, m.getMember()));
+ fixed = true;
+ }
+ }
+ }
+ return fixed ? r : null;
+ }
+
+ private static Relation fixBoundaryRoles( Relation source ) {
+ Relation r = new Relation(source);
+ boolean fixed = false;
+ for( int i = 0; i < r.getMembersCount(); i++ ) {
+ RelationMember m = r.getMember(i);
+ String role = null;
+ if( m.isRelation() )
+ role = "subarea";
+ else if( m.isNode() ) {
+ Node n = (Node)m.getMember();
+ if( !n.isIncomplete() ) {
+ if( n.hasKey("place") )
+ role = "admin_centre";
+ else
+ role = "label";
+ }
+ }
+ if( role != null && !role.equals(m.getRole()) ) {
+ r.setMember(i, new RelationMember(role, m.getMember()));
+ fixed = true;
+ }
+ }
+ return fixed ? r : null;
+ }
+}
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/possible_roles.txt
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/possible_roles.txt (revision 26174)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/possible_roles.txt (revision 26174)
@@ -0,0 +1,11 @@
+boundary: admin_centre, label, subarea
+route: stop, platform, forward, backward, stop_exit_only, stop_entry_only, platform_exit_only, platform_entry_only
+restriction: from, to, via, location_hint
+enforcement: device, from, to, force
+destination_sign: to, from, intersection, sign
+site: perimeter, entrance, label
+bridge: across, under, outline, edge
+tunnel: through, outline, edge
+surveillance: camera, extent, visible, hidden
+street: street, address, house, associated
+collection: member, street, river, railway, address, associated
Index: applications/editors/josm/plugins/restart/build.xml
===================================================================
--- applications/editors/josm/plugins/restart/build.xml (revision 26173)
+++ applications/editors/josm/plugins/restart/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -122,5 +117,4 @@
-
-
-
+
+
@@ -233,5 +220,5 @@
-
+
@@ -240,9 +227,8 @@
-
+
-
Index: applications/editors/josm/plugins/reverter/build.xml
===================================================================
--- applications/editors/josm/plugins/reverter/build.xml (revision 26173)
+++ applications/editors/josm/plugins/reverter/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/rgisopen/build.xml
===================================================================
--- applications/editors/josm/plugins/rgisopen/build.xml (revision 26173)
+++ applications/editors/josm/plugins/rgisopen/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -131,5 +126,4 @@
-
-
-
+
+
@@ -242,5 +229,5 @@
-
+
@@ -249,9 +236,8 @@
-
+
-
Index: applications/editors/josm/plugins/roadsigns/build.xml
===================================================================
--- applications/editors/josm/plugins/roadsigns/build.xml (revision 26173)
+++ applications/editors/josm/plugins/roadsigns/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/routes/build.xml
===================================================================
--- applications/editors/josm/plugins/routes/build.xml (revision 26173)
+++ applications/editors/josm/plugins/routes/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/routing/build.xml
===================================================================
--- applications/editors/josm/plugins/routing/build.xml (revision 26173)
+++ applications/editors/josm/plugins/routing/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/simplifyarea/build.xml
===================================================================
--- applications/editors/josm/plugins/simplifyarea/build.xml (revision 26173)
+++ applications/editors/josm/plugins/simplifyarea/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/smed/build.xml
===================================================================
--- applications/editors/josm/plugins/smed/build.xml (revision 26173)
+++ applications/editors/josm/plugins/smed/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
Index: applications/editors/josm/plugins/smed/plugs/harbour/build.xml
===================================================================
--- applications/editors/josm/plugins/smed/plugs/harbour/build.xml (revision 26173)
+++ applications/editors/josm/plugins/smed/plugs/harbour/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- No normal josm-plugin, publishing over smed !!!
- 1. ant - dist to each subplugin
- 2. ant publish to smed
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No normal josm-plugin, publishing over smed !!!
+ 1. ant - dist to each subplugin
+ 2. ant publish to smed
+
+
-
Index: applications/editors/josm/plugins/smed/plugs/oseam/build.xml
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/build.xml (revision 26173)
+++ applications/editors/josm/plugins/smed/plugs/oseam/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- No normal josm-plugin, publishing over smed !!!
- 1. ant - dist to each subplugin
- 2. ant publish to smed
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No normal josm-plugin, publishing over smed !!!
+ 1. ant - dist to each subplugin
+ 2. ant publish to smed
+
+
-
Index: applications/editors/josm/plugins/smed/plugs/smed_about/build.xml
===================================================================
--- applications/editors/josm/plugins/smed/plugs/smed_about/build.xml (revision 26173)
+++ applications/editors/josm/plugins/smed/plugs/smed_about/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- No normal josm-plugin, publishing over smed !!!
- 1. ant - dist to each subplugin
- 2. ant publish to smed
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No normal josm-plugin, publishing over smed !!!
+ 1. ant - dist to each subplugin
+ 2. ant publish to smed
+
+
Index: applications/editors/josm/plugins/smed_bfw/smed_bfw/build.xml
===================================================================
--- applications/editors/josm/plugins/smed_bfw/smed_bfw/build.xml (revision 26173)
+++ applications/editors/josm/plugins/smed_bfw/smed_bfw/build.xml (revision 26174)
@@ -1,4 +1,4 @@
-
-
-
+
+
+
Index: applications/editors/josm/plugins/smed_fw/build.xml
===================================================================
--- applications/editors/josm/plugins/smed_fw/build.xml (revision 26173)
+++ applications/editors/josm/plugins/smed_fw/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
Index: applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- applications/editors/josm/plugins/surveyor/build.xml (revision 26173)
+++ applications/editors/josm/plugins/surveyor/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/tageditor/build.xml
===================================================================
--- applications/editors/josm/plugins/tageditor/build.xml (revision 26173)
+++ applications/editors/josm/plugins/tageditor/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
***** Properties of published ${plugin.jar} *****
-Commit message : '${commit.message}'
+Commit message : '${commit.message}'
Plugin-Mainversion: ${plugin.main.version}
JOSM build version: ${coreversion.info.entry.revision}
Plugin-Version : ${version.entry.commit.revision}
-***** / Properties of published ${plugin.jar} *****
-
+***** / Properties of published ${plugin.jar} *****
+
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/tagging-preset-tester/build.xml
===================================================================
--- applications/editors/josm/plugins/tagging-preset-tester/build.xml (revision 26173)
+++ applications/editors/josm/plugins/tagging-preset-tester/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
***** Properties of published ${plugin.jar} *****
Commit message : '${commit.message}'
@@ -154,35 +149,33 @@
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/terracer/build.xml
===================================================================
--- applications/editors/josm/plugins/terracer/build.xml (revision 26173)
+++ applications/editors/josm/plugins/terracer/build.xml (revision 26174)
@@ -1,2 +1,3 @@
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
@@ -49,4 +46,7 @@
+
+
+
@@ -86,62 +86,58 @@
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
***** Properties of published ${plugin.jar} *****
Commit message : '${commit.message}'
@@ -153,13 +149,12 @@
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/toms/build.xml
===================================================================
--- applications/editors/josm/plugins/toms/build.xml (revision 26173)
+++ applications/editors/josm/plugins/toms/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
Index: applications/editors/josm/plugins/touchscreenhelper/build.xml
===================================================================
--- applications/editors/josm/plugins/touchscreenhelper/build.xml (revision 26173)
+++ applications/editors/josm/plugins/touchscreenhelper/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/tracer/build.xml
===================================================================
--- applications/editors/josm/plugins/tracer/build.xml (revision 26173)
+++ applications/editors/josm/plugins/tracer/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/trustosm/build.xml
===================================================================
--- applications/editors/josm/plugins/trustosm/build.xml (revision 26173)
+++ applications/editors/josm/plugins/trustosm/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -165,5 +153,4 @@
-
-
-
+
+
@@ -276,5 +256,5 @@
-
+
@@ -283,9 +263,8 @@
-
+
-
Index: applications/editors/josm/plugins/turnlanes/build.xml
===================================================================
--- applications/editors/josm/plugins/turnlanes/build.xml (revision 26173)
+++ applications/editors/josm/plugins/turnlanes/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
+
+
***** Properties of published ${plugin.jar} *****
Commit message : '${commit.message}'
@@ -222,35 +211,33 @@
Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/turnrestrictions/build.xml
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/build.xml (revision 26173)
+++ applications/editors/josm/plugins/turnrestrictions/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/undelete/build.xml
===================================================================
--- applications/editors/josm/plugins/undelete/build.xml (revision 26173)
+++ applications/editors/josm/plugins/undelete/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/utilsplugin2/build.xml
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/build.xml (revision 26173)
+++ applications/editors/josm/plugins/utilsplugin2/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
@@ -129,5 +124,4 @@
-
-
-
+
+
@@ -240,5 +227,5 @@
-
+
@@ -247,9 +234,8 @@
-
+
-
Index: applications/editors/josm/plugins/videomapping/build.xml
===================================================================
--- applications/editors/josm/plugins/videomapping/build.xml (revision 26173)
+++ applications/editors/josm/plugins/videomapping/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/walkingpapers/build.xml
===================================================================
--- applications/editors/josm/plugins/walkingpapers/build.xml (revision 26173)
+++ applications/editors/josm/plugins/walkingpapers/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/waydownloader/build.xml
===================================================================
--- applications/editors/josm/plugins/waydownloader/build.xml (revision 26173)
+++ applications/editors/josm/plugins/waydownloader/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/waypoint_search/build.xml
===================================================================
--- applications/editors/josm/plugins/waypoint_search/build.xml (revision 26173)
+++ applications/editors/josm/plugins/waypoint_search/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
+
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
-
-
-
-
+
+
@@ -125,7 +119,6 @@
-
-
-
+
+
-
-
+
+
@@ -238,5 +224,5 @@
-
+
@@ -245,9 +231,8 @@
-
+
-
Index: applications/editors/josm/plugins/wayselector/build.xml
===================================================================
--- applications/editors/josm/plugins/wayselector/build.xml (revision 26173)
+++ applications/editors/josm/plugins/wayselector/build.xml (revision 26174)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/wms-turbo-challenge2/build.xml
===================================================================
--- applications/editors/josm/plugins/wms-turbo-challenge2/build.xml (revision 26173)
+++ applications/editors/josm/plugins/wms-turbo-challenge2/build.xml (revision 26174)
@@ -1,2 +1,3 @@
+
-
-
-
+
+
+
-
-
-
+
+
-
@@ -90,5 +89,4 @@
-