Index: applications/editors/josm/plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/Proj4JProjectionChoice.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/Proj4JProjectionChoice.java	(revision 30197)
+++ applications/editors/josm/plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/Proj4JProjectionChoice.java	(revision 30737)
@@ -62,5 +62,5 @@
         }
 
-        sorter = new TableRowSorter<CRSTableModel>(model);
+        sorter = new TableRowSorter<>(model);
     }
     
@@ -254,5 +254,5 @@
 
         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 {
Index: applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/CoordinateTransform.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/CoordinateTransform.java	(revision 30197)
+++ applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/CoordinateTransform.java	(revision 30737)
@@ -1,5 +1,3 @@
 package org.osgeo.proj4j;
-
-import org.osgeo.proj4j.datum.*;
 
 /**
Index: applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/CoordinateTransformFactory.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/CoordinateTransformFactory.java	(revision 30197)
+++ applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/CoordinateTransformFactory.java	(revision 30737)
@@ -1,5 +1,3 @@
 package org.osgeo.proj4j;
-
-import org.osgeo.proj4j.datum.Datum;
 
 /**
Index: applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/cmd/MetaCRSTestCmd.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/cmd/MetaCRSTestCmd.java	(revision 30197)
+++ applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/cmd/MetaCRSTestCmd.java	(revision 30737)
@@ -44,5 +44,5 @@
   private static CRSFactory csFactory = new CRSFactory();
 
-  private List<String> filenames = new ArrayList<String>();
+  private List<String> filenames = new ArrayList<>();
   private boolean verbose = false;
   
Index: applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/MetaCRSTestFileReader.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/MetaCRSTestFileReader.java	(revision 30197)
+++ applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/MetaCRSTestFileReader.java	(revision 30737)
@@ -48,5 +48,5 @@
   throws IOException
   {
-    List<MetaCRSTestCase> tests = new ArrayList<MetaCRSTestCase>();
+    List<MetaCRSTestCase> tests = new ArrayList<>();
     boolean isHeaderRead = false;
     while (true) {
Index: applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Keyword.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Keyword.java	(revision 30197)
+++ applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Keyword.java	(revision 30737)
@@ -57,5 +57,5 @@
   {
     if (supportedParams == null) {
-      supportedParams = new TreeSet<String>();
+      supportedParams = new TreeSet<>();
       
       supportedParams.add(a);
Index: applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Parser.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Parser.java	(revision 30197)
+++ applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Parser.java	(revision 30737)
@@ -10,5 +10,4 @@
 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;
Index: applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/proj/ObliqueStereographicAlternativeProjection.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/proj/ObliqueStereographicAlternativeProjection.java	(revision 30197)
+++ applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/proj/ObliqueStereographicAlternativeProjection.java	(revision 30737)
@@ -21,6 +21,4 @@
 
 import org.osgeo.proj4j.ProjCoordinate;
-import org.osgeo.proj4j.ProjectionException;
-import org.osgeo.proj4j.util.ProjectionMath;
 
 public class ObliqueStereographicAlternativeProjection extends GaussProjection {
Index: applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/proj/SwissObliqueMercatorProjection.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/proj/SwissObliqueMercatorProjection.java	(revision 30197)
+++ applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/proj/SwissObliqueMercatorProjection.java	(revision 30737)
@@ -22,5 +22,4 @@
 import org.osgeo.proj4j.ProjCoordinate;
 import org.osgeo.proj4j.ProjectionException;
-import org.osgeo.proj4j.datum.Ellipsoid;
 import org.osgeo.proj4j.util.ProjectionMath;
 
Index: applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/util/CRSCache.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/util/CRSCache.java	(revision 30197)
+++ applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/util/CRSCache.java	(revision 30737)
@@ -7,5 +7,5 @@
 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();