You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2022/11/23 17:53:41 UTC
[sis] 04/06: Move `SensorType` together with other classes used as substitution for classes omitted in GeoAPI.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 59e73fa1b9dba0aa297e63d3b4b9605b90359822
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Nov 22 18:11:32 2022 +0100
Move `SensorType` together with other classes used as substitution for classes omitted in GeoAPI.
---
.../internal/{metadata => jaxb/metadata/replace}/SensorType.java | 6 +++---
core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java | 2 +-
.../test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/SensorType.java
similarity index 98%
rename from core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
rename to core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/SensorType.java
index 64a5eae861..94d7cc1408 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/SensorType.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.metadata;
+package org.apache.sis.internal.jaxb.metadata.replace;
-import java.util.ArrayList;
import java.util.List;
+import java.util.ArrayList;
import org.opengis.annotation.UML;
import org.opengis.annotation.Specification;
import org.opengis.util.CodeList;
@@ -29,7 +29,7 @@ import org.opengis.util.CodeList;
* For now GeoAPI does not yet provides it, but this choice may be revisited in a future GeoAPI version.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.7
+ * @version 1.3
* @since 0.7
* @module
*/
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java
index 70660c4c61..e0a9599dab 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java
@@ -565,7 +565,7 @@ public final class Types extends Static {
}
}
// Following code list is not defined in ISO 19115-2 but appears in XML schemas.
- typeForNames.putIfAbsent("MI_SensorTypeCode", "org.apache.sis.internal.metadata.SensorType");
+ typeForNames.putIfAbsent("MI_SensorTypeCode", "org.apache.sis.internal.jaxb.metadata.replace.SensorType");
}
/*
* Get the interface class for the given identifier, loading the class when first needed.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
index 78ab9b08b2..8614382ce0 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
@@ -23,8 +23,8 @@ import org.opengis.metadata.acquisition.Instrument;
import org.opengis.metadata.identification.DataIdentification;
import org.opengis.metadata.identification.InitiativeType;
import org.apache.sis.internal.jaxb.metadata.replace.ReferenceSystemMetadata;
+import org.apache.sis.internal.jaxb.metadata.replace.SensorType;
import org.apache.sis.internal.xml.LegacyNamespaces;
-import org.apache.sis.internal.metadata.SensorType;
import org.apache.sis.util.iso.Types;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;