Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2014-04-26T17:39:23+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• CustomizeColor.java (modified) (1 diff)
• GpxLayer.java (modified) (2 diffs)
• JumpToMarkerActions.java (modified) (1 diff)
• OsmDataLayer.java (modified) (6 diffs)
• TMSLayer.java (modified) (5 diffs)
• ValidatorLayer.java (modified) (1 diff)
• WMSLayer.java (modified) (3 diffs)
• geoimage/CorrelateGpxWithImages.java (modified) (6 diffs)
• geoimage/GeoImageLayer.java (modified) (8 diffs)
• geoimage/ThumbsLoader.java (modified) (1 diff)
• gpx/ChooseTrackVisibilityAction.java (modified) (1 diff)
• gpx/ConvertToDataLayerAction.java (modified) (1 diff)
• gpx/CustomizeDrawingAction.java (modified) (1 diff)
• gpx/DownloadAlongPanel.java (modified) (3 diffs)
• gpx/DownloadWmsAlongTrackAction.java (modified) (1 diff)
• gpx/ImportAudioAction.java (modified) (1 diff)
• gpx/ImportImagesAction.java (modified) (1 diff)
• markerlayer/Marker.java (modified) (3 diffs)
• markerlayer/MarkerLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java

@@ -32 +32 @@
     public CustomizeColor(Layer l) {
         this();
-        layers = new LinkedList<Layer>();
+        layers = new LinkedList<>();
         layers.add(l);
     }

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -72 +72 @@
     public boolean[] trackVisibility = new boolean[0];
 
-    private final List<GpxTrack> lastTracks = new ArrayList<GpxTrack>(); // List of tracks at last paint
+    private final List<GpxTrack> lastTracks = new ArrayList<>(); // List of tracks at last paint
     private int lastUpdateCount;
 
@@ -635 +635 @@
         }
 
-        LinkedList<WayPoint> visibleSegments = new LinkedList<WayPoint>();
+        LinkedList<WayPoint> visibleSegments = new LinkedList<>();
         WayPoint last = null;
         ensureTrackVisibilityLength();

trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java

@@ -55 +55 @@
         
         protected final void setLastLayer(Layer l) {
-            lastLayer = new WeakReference<Layer>(l);
+            lastLayer = new WeakReference<>(l);
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -103 +103 @@
      * @since 3669
      */
-    public final List<TestError> validationErrors = new ArrayList<TestError>();
+    public final List<TestError> validationErrors = new ArrayList<>();
 
     protected void setRequiresSaveToFile(boolean newValue) {
@@ -183 +183 @@
     }
 
-    private final CopyOnWriteArrayList<LayerStateChangeListener> layerStateChangeListeners = new CopyOnWriteArrayList<LayerStateChangeListener>();
+    private final CopyOnWriteArrayList<LayerStateChangeListener> layerStateChangeListeners = new CopyOnWriteArrayList<>();
 
     /**
@@ -327 +327 @@
 
     @Override public String getToolTipText() {
-        int nodes = new FilteredCollection<Node>(data.getNodes(), OsmPrimitive.nonDeletedPredicate).size();
-        int ways = new FilteredCollection<Way>(data.getWays(), OsmPrimitive.nonDeletedPredicate).size();
+        int nodes = new FilteredCollection<>(data.getNodes(), OsmPrimitive.nonDeletedPredicate).size();
+        int ways = new FilteredCollection<>(data.getWays(), OsmPrimitive.nonDeletedPredicate).size();
 
         String tool = trn("{0} node", "{0} nodes", nodes, nodes)+", ";
@@ -505 +505 @@
                 SeparatorLayerAction.INSTANCE,
                 new LayerListPopup.InfoAction(this)};
-        List<Action> actions = new ArrayList<Action>();
+        List<Action> actions = new ArrayList<>();
         actions.addAll(Arrays.asList(new Action[]{
                 LayerListDialog.getInstance().createActivateLayerAction(this),
@@ -536 +536 @@
         GpxData gpxData = new GpxData();
         gpxData.storageFile = file;
-        HashSet<Node> doneNodes = new HashSet<Node>();
+        HashSet<Node> doneNodes = new HashSet<>();
         for (Way w : data.getWays()) {
             if (!w.isUsable()) {
                 continue;
             }
-            Collection<Collection<WayPoint>> trk = new ArrayList<Collection<WayPoint>>();
-            Map<String, Object> trkAttr = new HashMap<String, Object>();
+            Collection<Collection<WayPoint>> trk = new ArrayList<>();
+            Map<String, Object> trkAttr = new HashMap<>();
 
             if (w.get("name") != null) {
@@ -555 +555 @@
                 }
                 if (trkseg == null) {
-                    trkseg = new ArrayList<WayPoint>();
+                    trkseg = new ArrayList<>();
                     trk.add(trkseg);
                 }

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -155 +155 @@
     }
 
-    private Set<Tile> tileRequestsOutstanding = new HashSet<Tile>();
+    private Set<Tile> tileRequestsOutstanding = new HashSet<>();
 
     @Override
@@ -970 +970 @@
             borderRect = tileToRect(border);
         }
-        List<Tile> missedTiles = new LinkedList<Tile>();
+        List<Tile> missedTiles = new LinkedList<>();
         // The callers of this code *require* that we return any tiles
         // that we do not draw in missedTiles.  ts.allExistingTiles() by
@@ -1178 +1178 @@
             if (zoom == 0 || this.insane())
                 return Collections.emptyList();
-            List<Tile> ret = new ArrayList<Tile>();
+            List<Tile> ret = new ArrayList<>();
             for (int x = x0; x <= x1; x++) {
                 for (int y = y0; y <= y1; y++) {
@@ -1196 +1196 @@
 
         private List<Tile> allLoadedTiles() {
-            List<Tile> ret = new ArrayList<Tile>();
+            List<Tile> ret = new ArrayList<>();
             for (Tile t : this.allExistingTiles()) {
                 if (t.isLoaded())
@@ -1375 +1375 @@
                 break;
             }
-            List<Tile> newlyMissedTiles = new LinkedList<Tile>();
+            List<Tile> newlyMissedTiles = new LinkedList<>();
             for (Tile missed : missedTiles) {
                 if ("no-tile".equals(missed.getValue("tile-info")) && zoomOffset > 0) {

trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java

@@ -86 +86 @@
     @Override
     public String getToolTipText() {
-        MultiMap<Severity, TestError> errorTree = new MultiMap<Severity, TestError>();
+        MultiMap<Severity, TestError> errorTree = new MultiMap<>();
         List<TestError> errors = Main.map.validatorDialog.tree.getErrors();
         for (TestError e : errors) {

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -139 +139 @@
 
     // Request queue
-    private final List<WMSRequest> requestQueue = new ArrayList<WMSRequest>();
-    private final List<WMSRequest> finishedRequests = new ArrayList<WMSRequest>();
+    private final List<WMSRequest> requestQueue = new ArrayList<>();
+    private final List<WMSRequest> finishedRequests = new ArrayList<>();
     /**
      * List of request currently being processed by download threads
      */
-    private final List<WMSRequest> processingRequests = new ArrayList<WMSRequest>();
+    private final List<WMSRequest> processingRequests = new ArrayList<>();
     private final Lock requestQueueLock = new ReentrantLock();
     private final Condition queueEmpty = requestQueueLock.newCondition();
-    private final List<Grabber> grabbers = new ArrayList<Grabber>();
-    private final List<Thread> grabberThreads = new ArrayList<Thread>();
+    private final List<Grabber> grabbers = new ArrayList<>();
+    private final List<Thread> grabberThreads = new ArrayList<>();
     private boolean canceled;
 
@@ -235 +235 @@
 
     public void downloadAreaToCache(PrecacheTask precacheTask, List<LatLon> points, double bufferX, double bufferY) {
-        Set<Point> requestedTiles = new HashSet<Point>();
+        Set<Point> requestedTiles = new HashSet<>();
         for (LatLon point: points) {
             EastNorth minEn = Main.getProjection().latlon2eastNorth(new LatLon(point.lat() - bufferY, point.lon() - bufferX));
@@ -447 +447 @@
 
         gatherFinishedRequests();
-        Set<ProjectionBounds> areaToCache = new HashSet<ProjectionBounds>();
+        Set<ProjectionBounds> areaToCache = new HashSet<>();
 
         for(int x = bminx; x<=bmaxx; ++x) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -84 +84 @@
 public class CorrelateGpxWithImages extends AbstractAction {
 
-    private static List<GpxData> loadedGpxData = new ArrayList<GpxData>();
+    private static List<GpxData> loadedGpxData = new ArrayList<>();
 
     GeoImageLayer yLayer = null;
@@ -117 +117 @@
 
     ExtendedDialog syncDialog;
-    List<GpxDataWrapper> gpxLst = new ArrayList<GpxDataWrapper>();
+    List<GpxDataWrapper> gpxLst = new ArrayList<>();
     JPanel outerPanel;
     JosmComboBox cbGpx;
@@ -293 +293 @@
 
             String[] tmp = TimeZone.getAvailableIDs();
-            List<String> vtTimezones = new ArrayList<String>(tmp.length);
+            List<String> vtTimezones = new ArrayList<>(tmp.length);
 
             for (String tzStr : tmp) {
@@ -331 +331 @@
             panelLst.setLayout(new BorderLayout());
 
-            imgList = new JList<String>(new AbstractListModel<String>() {
+            imgList = new JList<>(new AbstractListModel<String>() {
                 @Override
                 public String getElementAt(int i) {
@@ -876 +876 @@
             final JSlider sldTimezone = new JSlider(-24, 24, 0);
             sldTimezone.setPaintLabels(true);
-            Dictionary<Integer,JLabel> labelTable = new Hashtable<Integer, JLabel>();
+            Dictionary<Integer,JLabel> labelTable = new Hashtable<>();
             labelTable.put(-24, new JLabel("-12:00"));
             labelTable.put(-12, new JLabel( "-6:00"));
@@ -1076 +1076 @@
      */
     private List<ImageEntry> getSortedImgList(boolean exif, boolean tagged) {
-        List<ImageEntry> dateImgLst = new ArrayList<ImageEntry>(yLayer.data.size());
+        List<ImageEntry> dateImgLst = new ArrayList<>(yLayer.data.size());
         for (ImageEntry e : yLayer.data) {
             if (!e.hasExifTime()) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -102 +102 @@
         private GeoImageLayer layer;
         private Collection<File> selection;
-        private Set<String> loadedDirectories = new HashSet<String>();
+        private Set<String> loadedDirectories = new HashSet<>();
         private Set<String> errorMessages;
         private GpxLayer gpxLayer;
@@ -114 +114 @@
             this.selection = selection;
             this.gpxLayer = gpxLayer;
-            errorMessages = new LinkedHashSet<String>();
+            errorMessages = new LinkedHashSet<>();
         }
 
@@ -120 +120 @@
 
             progressMonitor.subTask(tr("Starting directory scan"));
-            Collection<File> files = new ArrayList<File>();
+            Collection<File> files = new ArrayList<>();
             try {
                 addRecursiveFiles(files, selection);
@@ -136 +136 @@
 
             // read the image files
-            List<ImageEntry> data = new ArrayList<ImageEntry>(files.size());
+            List<ImageEntry> data = new ArrayList<>(files.size());
 
             for (File f : files) {
@@ -311 +311 @@
     }
 
-    private static List<Action> menuAdditions = new LinkedList<Action>();
+    private static List<Action> menuAdditions = new LinkedList<>();
     public static void registerMenuAddition(Action addition) {
         menuAdditions.add(addition);
@@ -319 +319 @@
     public Action[] getMenuEntries() {
 
-        List<Action> entries = new ArrayList<Action>();
+        List<Action> entries = new ArrayList<>();
         entries.add(LayerListDialog.getInstance().createShowHideLayerAction());
         entries.add(LayerListDialog.getInstance().createDeleteLayerAction());
@@ -831 +831 @@
     public static void registerSupportedMapMode(MapMode mapMode) {
         if (supportedMapModes == null) {
-            supportedMapModes = new ArrayList<MapMode>();
+            supportedMapModes = new ArrayList<>();
         }
         supportedMapModes.add(mapMode);
@@ -981 +981 @@
 
     public List<ImageEntry> getImages() {
-        List<ImageEntry> copy = new ArrayList<ImageEntry>(data.size());
+        List<ImageEntry> copy = new ArrayList<>(data.size());
         for (ImageEntry ie : data) {
             copy.add(ie.clone());

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -26 +26 @@
     public ThumbsLoader(GeoImageLayer layer) {
         this.layer = layer;
-        this.data = new ArrayList<ImageEntry>(layer.data);
+        this.data = new ArrayList<>(layer.data);
         if (!cacheOff) {
             cache = new CacheFiles("geoimage-thumbnails", false);

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -145 +145 @@
         };
         // define how to sort row
-        TableRowSorter<DefaultTableModel> rowSorter = new TableRowSorter<DefaultTableModel>();
+        TableRowSorter<DefaultTableModel> rowSorter = new TableRowSorter<>();
         t.setRowSorter(rowSorter);
         rowSorter.setModel(model);

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java

@@ -50 +50 @@
         for (GpxTrack trk : layer.data.tracks) {
             for (GpxTrackSegment segment : trk.getSegments()) {
-                List<Node> nodes = new ArrayList<Node>();
+                List<Node> nodes = new ArrayList<>();
                 for (WayPoint p : segment.getWayPoints()) {
                     Node n = new Node(p.getCoor());

trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java

@@ -38 +38 @@
     public CustomizeDrawingAction(Layer l) {
         this();
-        layers = new LinkedList<Layer>();
+        layers = new LinkedList<>();
         layers.add(l);
     }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java

@@ -74 +74 @@
             s[i] = tr("{0} meters", dist[i]);
         }
-        buffer = new JList<String>(s);
+        buffer = new JList<>(s);
         
         double distanceValue = Main.pref.getDouble(prefDist, dist[0]);
@@ -93 +93 @@
             s[i] = tr("{0} sq km", area[i]);
         }
-        maxRect = new JList<String>(s);
+        maxRect = new JList<>(s);
 
         double areaValue = Main.pref.getDouble(prefArea, area[0]);
@@ -109 +109 @@
         if (prefNear != null) {
             add(new JLabel(tr("Download near:")), GBC.eol());
-            downloadNear = new JList<String>(new String[]{tr("track only"), tr("waypoints only"), tr("track and waypoints")});
+            downloadNear = new JList<>(new String[]{tr("track only"), tr("waypoints only"), tr("track and waypoints")});
             downloadNear.setSelectedIndex(Main.pref.getInteger(prefNear, 0));
             add(downloadNear, GBC.eol());

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java

@@ -46 +46 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        final List<LatLon> points = new ArrayList<LatLon>();
+        final List<LatLon> points = new ArrayList<>();
         for (GpxTrack trk : data.tracks) {
             for (GpxTrackSegment segment : trk.getSegments()) {

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -128 +128 @@
         boolean hasTracks = layer.data.tracks != null && !layer.data.tracks.isEmpty();
         boolean hasWaypoints = layer.data.waypoints != null && !layer.data.waypoints.isEmpty();
-        Collection<WayPoint> waypoints = new ArrayList<WayPoint>();
+        Collection<WayPoint> waypoints = new ArrayList<>();
         boolean timedMarkersOmitted = false;
         boolean untimedMarkersOmitted = false;

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java

@@ -57 +57 @@
             File[] sel = fc.getSelectedFiles();
             if (sel != null && sel.length > 0) {
-                LinkedList<File> files = new LinkedList<File>();
+                LinkedList<File> files = new LinkedList<>();
                 addRecursiveFiles(files, sel);
                 importer.importDataHandleExceptions(files, NullProgressMonitor.INSTANCE);

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -88 +88 @@
         // will make gui for it so I'm keeping it here
 
-        private static final Map<String, TemplateEntryProperty> CACHE = new HashMap<String, TemplateEntryProperty>();
+        private static final Map<String, TemplateEntryProperty> CACHE = new HashMap<>();
 
         // Legacy code - convert label from int to template engine expression
@@ -185 +185 @@
      * stuff).
      */
-    public static final List<MarkerProducers> markerProducers = new LinkedList<MarkerProducers>();
+    public static final List<MarkerProducers> markerProducers = new LinkedList<>();
 
     // Add one Marker specifying the default behaviour.
@@ -468 +468 @@
             result = dataProvider.getTemplateKeys();
         } else {
-            result = new ArrayList<String>();
+            result = new ArrayList<>();
         }
         result.add(MARKER_FORMATTED_OFFSET);

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -75 +75 @@
         super(name);
         this.setAssociatedFile(associatedFile);
-        this.data = new ArrayList<Marker>();
+        this.data = new ArrayList<>();
         this.fromLayer = fromLayer;
         double firstTime = -1.0;
@@ -239 +239 @@
 
     @Override public Action[] getMenuEntries() {
-        Collection<Action> components = new ArrayList<Action>();
+        Collection<Action> components = new ArrayList<>();
         components.add(LayerListDialog.getInstance().createShowHideLayerAction());
         components.add(new ShowHideMarkerText(this));
@@ -324 +324 @@
 
         // insert it at the right place in a copy the collection
-        Collection<Marker> newData = new ArrayList<Marker>();
+        Collection<Marker> newData = new ArrayList<>();
         am = null;
         AudioMarker ret = newAudioMarker; // save to have return value