Changeset 29517 in osm for applications

Timestamp:

2013-04-19T23:52:11+02:00 (11 years ago)

Author:

donvip

Message:

fix #josm8620 - Breaking changes in jmapviewer

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• Demo.java (modified) (1 diff)
• MapMarkerCircle.java (modified) (3 diffs)
• MapMarkerDot.java (modified) (2 diffs)
• MapObjectImpl.java (modified) (5 diffs)
• MapRectangleImpl.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java

@@ -188 +188 @@
         Layer franceLayer = treeMap.addLayer("France");
         map().addMapMarker(new MapMarkerDot(franceLayer, "La Gallerie", 48.71, -1));
+        map().addMapMarker(new MapMarkerDot(43.604, 1.444));
+        map().addMapMarker(new MapMarkerCircle(53.343, -6.267, 0.666));
+        map().addMapRectangle(new MapRectangleImpl(new Coordinate(53.343, -6.267), new Coordinate(43.604, 1.444)));
         map().addMapMarker(darmstadt);
         treeMap.addLayer(germanyWestLayer);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java

@@ -26 +26 @@
     STYLE markerStyle;
 
+    public MapMarkerCircle(Coordinate coord, double radius) {
+        this(null, null, coord, radius);
+    }
     public MapMarkerCircle(String name, Coordinate coord, double radius) {
         this(null, name, coord, radius);
@@ -31 +34 @@
     public MapMarkerCircle(Layer layer, Coordinate coord, double radius) {
         this(layer, null, coord, radius);
+    }
+    public MapMarkerCircle(double lat, double lon, double radius) {
+        this(null, null, new Coordinate(lat,lon), radius);
     }
     public MapMarkerCircle(Layer layer, double lat, double lon, double radius) {
@@ -99 +105 @@
         else coord.setLon(lon);
     }
-
 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java

@@ -19 +19 @@
     public static final int DOT_RADIUS = 5;
 
+    public MapMarkerDot(Coordinate coord) {
+        this(null, null, coord);
+    }
     public MapMarkerDot(String name, Coordinate coord) {
         this(null, name, coord);
@@ -27 +30 @@
     public MapMarkerDot(Layer layer, String name, Coordinate coord) {
         this(layer, name, coord, getDefaultStyle());
+    }
+    public MapMarkerDot(Color color, double lat, double lon) {
+        this(null, null, lat, lon);
+        setColor(color);
+    }
+    public MapMarkerDot(double lat, double lon) {
+        this(null, null, lat, lon);
     }
     public MapMarkerDot(Layer layer, double lat, double lon) {

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapObjectImpl.java

@@ -37 +37 @@
     }
     public Style getStyleAssigned(){
-        return style==null?layer.getStyle():style;
+        return style == null ? (layer == null ? null : layer.getStyle()) : style;
     }
     public void setStyle(Style style){
@@ -43 +43 @@
     }
     public Color getColor() {
-        return getStyleAssigned().getColor();
+        Style styleAssigned = getStyleAssigned();
+        return styleAssigned == null ? null : getStyleAssigned().getColor();
     }
     public void setColor(Color color) {
@@ -51 +52 @@
 
     public Color getBackColor() {
-        return getStyleAssigned().getBackColor();
+        Style styleAssigned = getStyleAssigned();
+        return styleAssigned == null ? null : getStyleAssigned().getBackColor();
     }
     public void setBackColor(Color backColor) {
@@ -59 +61 @@
 
     public Stroke getStroke() {
-        return getStyleAssigned().getStroke();
+        Style styleAssigned = getStyleAssigned();
+        return styleAssigned == null ? null : getStyleAssigned().getStroke();
     }
     public void setStroke(Stroke stroke) {
@@ -67 +70 @@
     
     public Font getFont() {
-        return getStyleAssigned().getFont();
+        Style styleAssigned = getStyleAssigned();
+        return styleAssigned == null ? null : getStyleAssigned().getFont();
     }
     public void setFont(Font font) {

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapRectangleImpl.java

@@ -20 +20 @@
     private Coordinate bottomRight;
 
+    public MapRectangleImpl(Coordinate topLeft, Coordinate bottomRight) {
+        this(null, null, topLeft, bottomRight);
+    }
     public MapRectangleImpl(String name, Coordinate topLeft, Coordinate bottomRight) {
         this(null, name, topLeft, bottomRight);