Merge pull request #72 from bgilbert/lints

Enable more compiler lints
openslide · Apr 9, 2024 · f78c135 · f78c135
2 parents 873615c + f10a254
commit f78c135
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/meson.build b/meson.build
@@ -27,7 +27,7 @@ jar = find_program(
 add_project_arguments(
   '-source', java_ver,
   '-target', java_ver,
-  '-Xlint:-options',
+  '-Xlint:all,-serial',
   language : 'java',
 )
 

diff --git a/org/openslide/OpenSlideFFM.java b/org/openslide/OpenSlideFFM.java
@@ -25,6 +25,7 @@
 import static java.lang.foreign.ValueLayout.*;
 import java.lang.invoke.*;
 
+@SuppressWarnings("restricted")
 class OpenSlideFFM {
     private static final Arena LIBRARY_ARENA = Arena.ofAuto();
 

diff --git a/org/openslide/gui/DefaultSelectionListModel.java b/org/openslide/gui/DefaultSelectionListModel.java
@@ -27,8 +27,8 @@
 
 import javax.swing.AbstractListModel;
 
-public class DefaultSelectionListModel extends AbstractListModel implements
-        SelectionListModel {
+public class DefaultSelectionListModel extends AbstractListModel<Annotation>
+        implements SelectionListModel {
 
     private final List<Annotation> list = new ArrayList<Annotation>();
 

diff --git a/org/openslide/gui/OpenSlideView.java b/org/openslide/gui/OpenSlideView.java
@@ -84,6 +84,7 @@ public OpenSlideView(OpenSlide w, boolean startWithZoomFit) {
         this(w, 1.2, 40, startWithZoomFit);
     }
 
+    @SuppressWarnings("this-escape")
     public OpenSlideView(OpenSlide w, double downsampleBase,
             int maxDownsampleExponent, boolean startWithZoomFit) {
         // TODO support w > 2^31 and h > 2^31

diff --git a/org/openslide/gui/SelectionListModel.java b/org/openslide/gui/SelectionListModel.java
@@ -23,7 +23,8 @@
 
 import javax.swing.ListModel;
 
-public interface SelectionListModel extends ListModel, Iterable<Annotation> {
+public interface SelectionListModel extends ListModel<Annotation>,
+        Iterable<Annotation> {
     void add(Annotation annotation);
 
     boolean isEmpty();