This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit 7a0d5360995efc25cb142eb3e72c797b59e66121 Merge: f70b0f2ffd 46b78f7ff5 Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri Apr 17 16:31:19 2026 +0200 Merge of automatic reorganization of imports order. .../main/org/apache/sis/util/internal/shared/CodeLists.java | 2 +- .../test/org/apache/sis/util/collection/LargeCodeList.java | 4 +--- .../org.apache.sis.gui/main/org/apache/sis/gui/map/MultiCanvas.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/CodeLists.java index acf6741ad3,f3b1200830..a8baafce8b --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/CodeLists.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/CodeLists.java @@@ -16,15 -16,17 +16,15 @@@ */ package org.apache.sis.util.internal.shared; -import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.UndeclaredThrowableException; ++import java.lang.reflect.Array; import org.opengis.util.CodeList; import org.apache.sis.util.CharSequences; import org.apache.sis.util.Characters.Filter; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.lang.reflect.InaccessibleObjectException; -import org.opengis.util.ControlledVocabulary; -import org.apache.sis.util.resources.Errors; +// Specific to the main branch: - import java.lang.reflect.Array; +import java.util.function.Predicate; /** diff --cc endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java index 1b05dce77e,6eeae02463..f69d45ee1a --- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java +++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java @@@ -19,11 -19,8 +19,9 @@@ package org.apache.sis.util.collection import java.util.List; import org.opengis.util.CodeList; - // Test dependencies - import static org.junit.jupiter.api.Assertions.*; - -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.util.Arrays; +// Specific to the main branch: +import java.util.ArrayList; ++import static org.junit.jupiter.api.Assertions.*; /**
