This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch visual-test
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/visual-test by this push:
new e78eaa8933 Fix compilation of visual tests.
e78eaa8933 is described below
commit e78eaa893386ecf37e9711760d44b87afc27cde1
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Sat Oct 28 18:17:06 2023 +0200
Fix compilation of visual tests.
---
pom.xml | 14 +++++++++++++-
src/main/java/org/apache/sis/swing/DoubleDimension2D.java | 2 +-
src/main/java/org/apache/sis/swing/ZoomPane.java | 3 +--
src/main/java/org/apache/sis/test/visual/IsolinesView.java | 4 ++--
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 463807f31b..68e5570b61 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>
diff --git a/src/main/java/org/apache/sis/swing/DoubleDimension2D.java
b/src/main/java/org/apache/sis/swing/DoubleDimension2D.java
index d8f1ea301b..b78e25e9f7 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 @@ package org.apache.sis.swing;
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;
/**
diff --git a/src/main/java/org/apache/sis/swing/ZoomPane.java
b/src/main/java/org/apache/sis/swing/ZoomPane.java
index d8f6e885d4..f84f5ae65c 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.ChangeEvent;
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 @@ public abstract class ZoomPane extends JComponent
implements DeformableViewer {
* 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();
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 e778d69ed2..e66e0fcdaf 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.BufferedImage;
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;