Changeset 30737 in osm for applications/editors/josm/plugins/print/src/org

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print

Files:

• PrintDialog.java (modified) (3 diffs)
• PrintableMapView.java (modified) (1 diff)

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java

@@ -475 +475 @@
         PrintService service = job.getPrintService();
         if (service != null) {
-            Collection<Collection<String>> serviceAttributes = new ArrayList<Collection<String>>();
+            Collection<Collection<String>> serviceAttributes = new ArrayList<>();
             for (Attribute a : service.getAttributes().toArray()) {
                 if ("printer-name".equals(a.getName()) && a instanceof TextSyntax) {
@@ -486 +486 @@
         // Save all request attributes
         Collection<String> ignoredAttributes = Arrays.asList("media-printable-area");
-        Collection<Collection<String>> requestAttributes = new ArrayList<Collection<String>>();
+        Collection<Collection<String>> requestAttributes = new ArrayList<>();
         for (Attribute a : attrs.toArray()) {
             Collection<String> setting = null;
@@ -507 +507 @@
     
     protected Collection<String> marshallPrintSetting(Attribute a, Class<?> syntaxClass, String value) {
-        return new ArrayList<String>(Arrays.asList(a.getCategory().getName(), a.getClass().getName(), syntaxClass.getName(), value));
+        return new ArrayList<>(Arrays.asList(a.getCategory().getName(), a.getClass().getName(), syntaxClass.getName(), value));
     }
     

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableMapView.java

@@ -412 +412 @@
     @Override
     protected List<Layer> getVisibleLayersInZOrder() {
-        ArrayList<Layer> layers = new ArrayList<Layer>();
+        ArrayList<Layer> layers = new ArrayList<>();
         for (Layer l: mapView.getAllLayersAsList()) {
             if (l.isVisible()) {