commit e78eaa893386ecf37e9711760d44b87afc27cde1
author Martin Desruisseaux <martin.desruisseaux@geomatys.com> Sat Oct 28 18:17:06 2023 +0200
committer Martin Desruisseaux <martin.desruisseaux@geomatys.com> Sat Oct 28 18:17:06 2023 +0200
tree 9051e99e049b19958d32aca63584881791b74bb7
parent e230c88533659a15e86b073686fb90d9cdf6a4a4

Fix compilation of visual tests.

pom.xml

diff --git a/pom.xml b/pom.xml
index 463807f..68e5570 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>core</artifactId>
+    <artifactId>parent</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
 
@@ -82,6 +82,18 @@
       <artifactId>sis-feature</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.9.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>5.9.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

src/main/java/org/apache/sis/swing/DoubleDimension2D.java

diff --git a/src/main/java/org/apache/sis/swing/DoubleDimension2D.java b/src/main/java/org/apache/sis/swing/DoubleDimension2D.java
index d8f1ea3..b78e25e 100644
--- a/src/main/java/org/apache/sis/swing/DoubleDimension2D.java
+++ b/src/main/java/org/apache/sis/swing/DoubleDimension2D.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 import java.awt.geom.Dimension2D;
 import static java.lang.Double.doubleToLongBits;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**

src/main/java/org/apache/sis/swing/ZoomPane.java

diff --git a/src/main/java/org/apache/sis/swing/ZoomPane.java b/src/main/java/org/apache/sis/swing/ZoomPane.java
index d8f6e88..f84f5ae 100644
--- a/src/main/java/org/apache/sis/swing/ZoomPane.java
+++ b/src/main/java/org/apache/sis/swing/ZoomPane.java
@@ -74,7 +74,6 @@
 import javax.swing.event.ChangeListener;
 
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.util.NullArgumentException;
 import org.apache.sis.referencing.operation.matrix.AffineTransforms2D;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.swing.internal.Resources;
@@ -1353,7 +1352,7 @@
          *       because some classes use it for updating scrollbars.
          */
         if (change == null) {
-            throw new NullArgumentException();
+            throw new NullPointerException();
         }
         ZoomChangeEvent event = null;
         final Object[] listeners = listenerList.getListenerList();

src/main/java/org/apache/sis/test/visual/IsolinesView.java

diff --git a/src/main/java/org/apache/sis/test/visual/IsolinesView.java b/src/main/java/org/apache/sis/test/visual/IsolinesView.java
index e778d69..e66e0fc 100644
--- a/src/main/java/org/apache/sis/test/visual/IsolinesView.java
+++ b/src/main/java/org/apache/sis/test/visual/IsolinesView.java
@@ -34,8 +34,8 @@
 import java.awt.image.DataBuffer;
 import javax.swing.JComponent;
 import org.apache.sis.referencing.operation.matrix.AffineTransforms2D;
-import org.apache.sis.internal.coverage.j2d.RasterFactory;
-import org.apache.sis.internal.processing.isoline.Isolines;
+import org.apache.sis.coverage.grid.j2d.RasterFactory;
+import org.apache.sis.image.processing.isoline.Isolines;
 import org.apache.sis.swing.ZoomPane;
 import org.apache.sis.util.Classes;