Changeset 29516 in osm for applications/viewer/jmapviewer/src/org

Timestamp:

2013-04-19T23:14:55+02:00 (12 years ago)

Author:

donvip

Message:

[jmapviewer] fix some stuff causing compilation problems in JOSM

Location:

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

Files:

• JMapViewer.java (modified) (1 diff)
• MapPolygonImpl.java (modified) (4 diffs)
• MapRectangleImpl.java (modified) (1 diff)
• OsmFileCacheTileLoader.java (modified) (1 diff)
• OsmTileLoader.java (modified) (1 diff)
• checkBoxTree/CheckBoxNodeRenderer.java (modified) (1 diff)
• interfaces/MapPolygon.java (modified) (2 diffs)
• interfaces/TileSource.java (modified) (1 diff)

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

@@ -714 +714 @@
      */
     protected void paintPolygon(Graphics g, MapPolygon polygon) {
-        List<ICoordinate> coords = polygon.getPoints();
+        List<? extends ICoordinate> coords = polygon.getPoints();
         if (coords != null && coords.size() >= 3) {
             List<Point> points = new LinkedList<Point>();

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

@@ -24 +24 @@
 public class MapPolygonImpl extends MapObjectImpl implements MapPolygon {
 
-    private List<ICoordinate> points;
+    private List<? extends ICoordinate> points;
 
     public MapPolygonImpl(ICoordinate ... points) {
         this(null, null, points);
     }
-    public MapPolygonImpl(String name, List<ICoordinate> points) {
+    public MapPolygonImpl(List<? extends ICoordinate> points) {
+        this(null, null, points);
+    }
+    public MapPolygonImpl(String name, List<? extends ICoordinate> points) {
         this(null, name, points);
     }
@@ -35 +38 @@
         this(null, name, points);
     }
-    public MapPolygonImpl(Layer layer, List<ICoordinate> points) {
+    public MapPolygonImpl(Layer layer, List<? extends ICoordinate> points) {
         this(layer, null, points);
     }
-    public MapPolygonImpl(Layer layer, String name, List<ICoordinate> points) {
+    public MapPolygonImpl(Layer layer, String name, List<? extends ICoordinate> points) {
         this(layer, name, points, getDefaultStyle());
     }
@@ -44 +47 @@
         this(layer, name, Arrays.asList(points), getDefaultStyle());
     }
-    public MapPolygonImpl(Layer layer, String name, List<ICoordinate> points, Style style) {
+    public MapPolygonImpl(Layer layer, String name, List<? extends ICoordinate> points, Style style) {
         super(layer, name, style);
         this.points = points;
@@ -53 +56 @@
      */
     @Override
-    public List<ICoordinate> getPoints() {
+    public List<? extends ICoordinate> getPoints() {
         return this.points;
     }

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

@@ -7 +7 @@
 import java.awt.Graphics2D;
 import java.awt.Point;
-import java.awt.Rectangle;
 import java.awt.Stroke;
 

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

@@ -15 +15 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.lang.Thread;
 import java.net.HttpURLConnection;
 import java.net.URL;

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

@@ -8 +8 @@
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.HashMap;
 
 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 
 /**

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeRenderer.java

@@ -7 +7 @@
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 
 import javax.swing.JMenuItem;

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java

@@ -6 +6 @@
 import java.awt.Polygon;
 import java.util.List;
-
-import org.openstreetmap.gui.jmapviewer.Coordinate;
 
 /**
@@ -19 +17 @@
      * @return Latitude/Longitude of each point of polygon
      */
-    public List<ICoordinate> getPoints();
+    public List<? extends ICoordinate> getPoints();
 
     /**

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java

@@ -1 +1 @@
 package org.openstreetmap.gui.jmapviewer.interfaces;
 
-import java.awt.Image;
 import java.io.IOException;
 
-import org.openstreetmap.gui.jmapviewer.Coordinate;
 import org.openstreetmap.gui.jmapviewer.JMapViewer;