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

Timestamp:

2014-04-29T00:12:00+02:00 (11 years ago)

Author:

donvip

Message:

see #josm8465 - update code to Java 7

Location:

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

Files:

• AbstractLayer.java (modified) (1 diff)
• AttributionSupport.java (modified) (1 diff)
• Demo.java (modified) (2 diffs)
• JMapViewer.java (modified) (4 diffs)
• JobDispatcher.java (modified) (1 diff)
• MemoryTileCache.java (modified) (1 diff)
• OsmFileCacheTileLoader.java (modified) (1 diff)
• OsmTileLoader.java (modified) (1 diff)
• Tile.java (modified) (1 diff)
• tilesources/BingAerialTileSource.java (modified) (1 diff)
• tilesources/TemplatedTMSTileSource.java (modified) (1 diff)

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

@@ -72 +72 @@
     public static <E> List<E> add(List<E> list, E element) {
         if(element!=null){
-            if(list==null) list = new ArrayList<E>();
+            if(list==null) list = new ArrayList<>();
             if(!list.contains(element)) list.add(element);
         }

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

@@ -32 +32 @@
 
     static {
-        HashMap<TextAttribute, Integer> aUnderline = new HashMap<TextAttribute, Integer>();
+        HashMap<TextAttribute, Integer> aUnderline = new HashMap<>();
         aUnderline.put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
         ATTR_LINK_FONT = ATTR_FONT.deriveFont(aUnderline);

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

@@ -94 +94 @@
             }
         });
-        JComboBox tileSourceSelector = new JComboBox(new TileSource[] { new OsmTileSource.Mapnik(),
+        JComboBox<TileSource> tileSourceSelector = new JComboBox<>(new TileSource[] { new OsmTileSource.Mapnik(),
                 new OsmTileSource.CycleMap(), new BingAerialTileSource(), new MapQuestOsmTileSource(), new MapQuestOpenAerialTileSource() });
         tileSourceSelector.addItemListener(new ItemListener() {
@@ -101 +101 @@
             }
         });
-        JComboBox tileLoaderSelector;
+        JComboBox<TileLoader> tileLoaderSelector;
         try {
-            tileLoaderSelector = new JComboBox(new TileLoader[] { new OsmFileCacheTileLoader(map()),
-                    new OsmTileLoader(map()) });
+            tileLoaderSelector = new JComboBox<>(new TileLoader[] { new OsmFileCacheTileLoader(map()), new OsmTileLoader(map()) });
         } catch (IOException e) {
-            tileLoaderSelector = new JComboBox(new TileLoader[] { new OsmTileLoader(map()) });
+            tileLoaderSelector = new JComboBox<>(new TileLoader[] { new OsmTileLoader(map()) });
         }
         tileLoaderSelector.addItemListener(new ItemListener() {

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

@@ -110 +110 @@
         tileSource = new OsmTileSource.Mapnik();
         tileController = new TileController(tileSource, tileCache, this);
-        mapMarkerList = new LinkedList<MapMarker>();
-        mapPolygonList = new LinkedList<MapPolygon>();
-        mapRectangleList = new LinkedList<MapRectangle>();
+        mapMarkerList = new LinkedList<>();
+        mapPolygonList = new LinkedList<>();
+        mapRectangleList = new LinkedList<>();
         mapMarkersVisible = true;
         mapRectanglesVisible = true;
@@ -712 +712 @@
         List<? extends ICoordinate> coords = polygon.getPoints();
         if (coords != null && coords.size() >= 3) {
-            List<Point> points = new LinkedList<Point>();
+            List<Point> points = new LinkedList<>();
             for (ICoordinate c : coords) {
                 Point p = getMapPosition(c, false);
@@ -724 +724 @@
                 int tilesize = tileSource.getTileSize();
                 int mapSize = tilesize << zoom;
-                List<Point> pointsWrapped = new LinkedList<Point>(points);
+                List<Point> pointsWrapped = new LinkedList<>(points);
                 boolean keepWrapping = true;
                 while (keepWrapping) {
@@ -735 +735 @@
                     polygon.paint(g, pointsWrapped);
                 }
-                pointsWrapped = new LinkedList<Point>(points);
+                pointsWrapped = new LinkedList<>(points);
                 keepWrapping = true;
                 while (keepWrapping) {

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

@@ -32 +32 @@
     }
 
-    protected BlockingDeque<TileJob> jobQueue = new LinkedBlockingDeque<TileJob>();
+    protected BlockingDeque<TileJob> jobQueue = new LinkedBlockingDeque<>();
 
     protected static int workerThreadMaxCount = 8;

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

@@ -33 +33 @@
 
     public MemoryTileCache() {
-        hash = new HashMap<String, CacheEntry>(cacheSize);
+        hash = new HashMap<>(cacheSize);
         lruTiles = new CacheLinkedListElement();
     }

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

@@ -100 +100 @@
         log.finest("Tile cache directory: " + cacheDir);
         cacheDirBase = cacheDir.getAbsolutePath();
-        sourceCacheDirMap = new HashMap<TileSource, File>();
+        sourceCacheDirMap = new HashMap<>();
     }
 

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

@@ -25 +25 @@
      * Holds the HTTP headers. Insert e.g. User-Agent here when default should not be used.
      */
-    public Map<String, String> headers = new HashMap<String, String>();
+    public Map<String, String> headers = new HashMap<>();
 
     public int timeoutConnect = 0;

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

@@ -297 +297 @@
         }
         if (metadata == null) {
-            metadata = new HashMap<String,String>();
+            metadata = new HashMap<>();
         }
         metadata.put(key, value);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -108 +108 @@
 
             NodeList imageryProviderNodes = (NodeList) xpath.compile("//ImageryMetadata/ImageryProvider").evaluate(document, XPathConstants.NODESET);
-            List<Attribution> attributions = new ArrayList<Attribution>(imageryProviderNodes.getLength());
+            List<Attribution> attributions = new ArrayList<>(imageryProviderNodes.getLength());
             for (int i = 0; i < imageryProviderNodes.getLength(); i++) {
                 Node providerNode = imageryProviderNodes.item(i);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java

@@ -12 +12 @@
     private Random rand = null;
     private String[] randomParts = null;
-    private Map<String, String> headers = new HashMap<String, String>();
+    private Map<String, String> headers = new HashMap<>();
 
     public static final String PATTERN_ZOOM    = "\\{(?:(\\d+)-)?z(?:oom)?([+-]\\d+)?\\}";