Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java	(revision 36126)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java	(revision 36176)
@@ -20,9 +20,9 @@
 
 import org.geotools.coverage.grid.GridCoverage2D;
-import org.geotools.geometry.Envelope2D;
+import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.image.ImageWorker;
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -57,5 +57,5 @@
 
     // current bbox
-    private Envelope2D bbox;
+    private ReferencedEnvelope bbox;
 
     // Layer icon
@@ -144,6 +144,6 @@
         Logging.debug("ImportImagePlugin ImageLayer: Coverage created: {0}", coverage);
 
-        upperLeft = new EastNorth(coverage.getEnvelope2D().x,
-                coverage.getEnvelope2D().y + coverage.getEnvelope2D().height);
+        upperLeft = new EastNorth(coverage.getEnvelope2D().getMinX(),
+                coverage.getEnvelope2D().getMaxY());
         angle = 0;
         bbox = coverage.getEnvelope2D();
@@ -230,5 +230,5 @@
     }
 
-    public Envelope2D getBbox() {
+    public ReferencedEnvelope getBbox() {
         return bbox;
     }
@@ -301,7 +301,5 @@
         this.image = ((PlanarImage) coverage.getRenderedImage()).getAsBufferedImage();
 
-        upperLeft = new EastNorth(coverage.getEnvelope2D().x, coverage
-                .getEnvelope2D().y
-                + coverage.getEnvelope2D().height);
+        upperLeft = new EastNorth(coverage.getEnvelope2D().getMinX(), coverage.getEnvelope2D().getMaxY());
         angle = 0;
 
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java	(revision 36126)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java	(revision 36176)
@@ -31,6 +31,6 @@
 
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.openstreetmap.josm.tools.Logging;
 
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java	(revision 36126)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java	(revision 36176)
@@ -2,5 +2,4 @@
 package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
-import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.BufferedReader;
@@ -17,18 +16,18 @@
 import javax.imageio.ImageIO;
 
+import org.geotools.api.data.DataSourceException;
+import org.geotools.api.parameter.ParameterValueGroup;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CRSAuthorityFactory;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.util.InternationalString;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.coverage.grid.GridCoverageFactory;
 import org.geotools.coverage.processing.CoverageProcessor;
-import org.geotools.data.DataSourceException;
 import org.geotools.data.WorldFileReader;
 import org.geotools.gce.geotiff.GeoTiffReader;
-import org.geotools.geometry.Envelope2D;
+import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
 import org.geotools.util.factory.Hints;
-import org.opengis.parameter.ParameterValueGroup;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CRSAuthorityFactory;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.InternationalString;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -153,5 +152,5 @@
             double lowerLeft_x = tfwReader.getXULC();
             double lowerLeft_y = tfwReader.getYULC() - height;
-            Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
+            ReferencedEnvelope bbox = ReferencedEnvelope.rect(lowerLeft_x, lowerLeft_y, width, height, null);
             coverage = createGridCoverage(img, bbox, refSys);
 
@@ -185,5 +184,5 @@
             double lowerLeft_x = tfwReader.getXULC();
             double lowerLeft_y = tfwReader.getYULC() - height;
-            Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
+            ReferencedEnvelope bbox = ReferencedEnvelope.rect(lowerLeft_x, lowerLeft_y, width, height, null);
             coverage = createGridCoverage(img, bbox, refSys);
 
@@ -216,5 +215,5 @@
             double lowerLeft_x = tfwReader.getXULC();
             double lowerLeft_y = tfwReader.getYULC() - height;
-            Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
+            ReferencedEnvelope bbox = ReferencedEnvelope.rect(lowerLeft_x, lowerLeft_y, width, height, null);
             coverage = createGridCoverage(img, bbox, refSys);
 
@@ -248,5 +247,5 @@
             double lowerLeft_x = tfwReader.getXULC();
             double lowerLeft_y = tfwReader.getYULC() - height;
-            Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
+            ReferencedEnvelope bbox = ReferencedEnvelope.rect(lowerLeft_x, lowerLeft_y, width, height, null);
             coverage = createGridCoverage(img, bbox, refSys);
 
@@ -293,5 +292,5 @@
      * Method for external use.
      */
-    public static GridCoverage2D createGridCoverage(BufferedImage img, Envelope2D bbox, CoordinateReferenceSystem crs) {
+    public static GridCoverage2D createGridCoverage(BufferedImage img, ReferencedEnvelope bbox, CoordinateReferenceSystem crs) {
         bbox.setCoordinateReferenceSystem(crs);
         return new GridCoverageFactory().create("", img, bbox);