Changeset 30737 in osm for applications/editors/josm/plugins/proj4j/src

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/proj4j/src/org

Files:

• openstreetmap/josm/plugins/proj4j/Proj4JProjectionChoice.java (modified) (2 diffs)
• osgeo/proj4j/CoordinateTransform.java (modified) (1 diff)
• osgeo/proj4j/CoordinateTransformFactory.java (modified) (1 diff)
• osgeo/proj4j/cmd/MetaCRSTestCmd.java (modified) (1 diff)
• osgeo/proj4j/io/MetaCRSTestFileReader.java (modified) (1 diff)
• osgeo/proj4j/parser/Proj4Keyword.java (modified) (1 diff)
• osgeo/proj4j/parser/Proj4Parser.java (modified) (1 diff)
• osgeo/proj4j/proj/ObliqueStereographicAlternativeProjection.java (modified) (1 diff)
• osgeo/proj4j/proj/SwissObliqueMercatorProjection.java (modified) (1 diff)
• osgeo/proj4j/util/CRSCache.java (modified) (1 diff)

applications/editors/josm/plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/Proj4JProjectionChoice.java

@@ -62 +62 @@
         }
 
-        sorter = new TableRowSorter<CRSTableModel>(model);
+        sorter = new TableRowSorter<>(model);
     }
     
@@ -254 +254 @@
 
         private String[] columnNames = {tr("Code"), tr("Description")};
-        private ArrayList<CRSEntry> crsList = new ArrayList<CRSEntry>();
+        private ArrayList<CRSEntry> crsList = new ArrayList<>();
 
         public CRSTableModel() throws java.io.IOException {

applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/CoordinateTransform.java

@@ -1 +1 @@
 package org.osgeo.proj4j;
-
-import org.osgeo.proj4j.datum.*;
 
 /**

applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/CoordinateTransformFactory.java

@@ -1 +1 @@
 package org.osgeo.proj4j;
-
-import org.osgeo.proj4j.datum.Datum;
 
 /**

applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/cmd/MetaCRSTestCmd.java

@@ -44 +44 @@
   private static CRSFactory csFactory = new CRSFactory();
 
-  private List<String> filenames = new ArrayList<String>();
+  private List<String> filenames = new ArrayList<>();
   private boolean verbose = false;
   

applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/MetaCRSTestFileReader.java

@@ -48 +48 @@
   throws IOException
   {
-    List<MetaCRSTestCase> tests = new ArrayList<MetaCRSTestCase>();
+    List<MetaCRSTestCase> tests = new ArrayList<>();
     boolean isHeaderRead = false;
     while (true) {

applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Keyword.java

@@ -57 +57 @@
   {
     if (supportedParams == null) {
-      supportedParams = new TreeSet<String>();
+      supportedParams = new TreeSet<>();
       
       supportedParams.add(a);

applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Parser.java

@@ -10 +10 @@
 import org.osgeo.proj4j.proj.TransverseMercatorProjection;
 import org.osgeo.proj4j.units.Angle;
-import org.osgeo.proj4j.units.AngleFormat;
 import org.osgeo.proj4j.units.Unit;
 import org.osgeo.proj4j.units.Units;

applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/proj/ObliqueStereographicAlternativeProjection.java

@@ -21 +21 @@
 
 import org.osgeo.proj4j.ProjCoordinate;
-import org.osgeo.proj4j.ProjectionException;
-import org.osgeo.proj4j.util.ProjectionMath;
 
 public class ObliqueStereographicAlternativeProjection extends GaussProjection {

applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/proj/SwissObliqueMercatorProjection.java

@@ -22 +22 @@
 import org.osgeo.proj4j.ProjCoordinate;
 import org.osgeo.proj4j.ProjectionException;
-import org.osgeo.proj4j.datum.Ellipsoid;
 import org.osgeo.proj4j.util.ProjectionMath;
 

applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/util/CRSCache.java

@@ -7 +7 @@
 public class CRSCache 
 {
-  private static Map<String, CoordinateReferenceSystem> projCache = new HashMap<String, CoordinateReferenceSystem>();
+  private static Map<String, CoordinateReferenceSystem> projCache = new HashMap<>();
   private static CRSFactory crsFactory = new CRSFactory();