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 fa2bbbe54ef97551dff99f6e549c263896c92f6c Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Sun Aug 20 14:14:16 2023 +0200 Rename the internal packages of the `org.apache.sis.referencing.gazetteer` module. Since they are not exported, the `internal` name convention is not needed anymore. --- .../main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java | 2 +- .../main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java | 2 +- .../apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java | 2 +- .../org/apache/sis/referencing/gazetteer/ModifiableLocationType.java | 2 +- .../gazetteer => referencing/gazetteer/internal}/Resources.java | 2 +- .../gazetteer => referencing/gazetteer/internal}/Resources.properties | 0 .../gazetteer => referencing/gazetteer/internal}/Resources_en.java | 2 +- .../gazetteer => referencing/gazetteer/internal}/Resources_fr.java | 2 +- .../gazetteer/internal}/Resources_fr.properties | 0 9 files changed, 7 insertions(+), 7 deletions(-) diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java index c507de49b7..e16b1a8185 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.Objects; import java.util.IdentityHashMap; import java.util.Map; -import org.apache.sis.internal.gazetteer.Resources; +import org.apache.sis.referencing.gazetteer.internal.Resources; import org.apache.sis.util.collection.DefaultTreeTable; import org.apache.sis.util.collection.TableColumn; import org.apache.sis.util.collection.TreeTable; diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java index 4dd5a11a4b..11b8997893 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.LinkedHashSet; import java.util.Optional; import org.apache.sis.internal.util.Constants; -import org.apache.sis.internal.gazetteer.Resources; +import org.apache.sis.referencing.gazetteer.internal.Resources; import org.apache.sis.util.iso.AbstractFactory; import org.apache.sis.util.iso.DefaultNameSpace; diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java index 483b63a2a6..c7aef64020 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java @@ -47,7 +47,7 @@ import org.opengis.referencing.operation.Projection; import org.opengis.referencing.operation.TransformException; import org.apache.sis.internal.referencing.provider.TransverseMercator; import org.apache.sis.internal.referencing.provider.PolarStereographicA; -import org.apache.sis.internal.gazetteer.Resources; +import org.apache.sis.referencing.gazetteer.internal.Resources; import org.apache.sis.referencing.CRS; import org.apache.sis.referencing.CommonCRS; import org.apache.sis.referencing.NamedIdentifier; diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java index 9d10538e28..9b1030a7c7 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java @@ -26,7 +26,7 @@ import org.opengis.util.InternationalString; import org.opengis.metadata.extent.GeographicExtent; import org.apache.sis.metadata.iso.extent.DefaultGeographicDescription; import org.apache.sis.metadata.iso.citation.DefaultOrganisation; -import org.apache.sis.internal.gazetteer.Resources; +import org.apache.sis.referencing.gazetteer.internal.Resources; import org.apache.sis.util.CorruptedObjectException; import org.apache.sis.util.resources.Errors; import org.apache.sis.util.ArgumentChecks; diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources.java similarity index 99% rename from endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources.java rename to endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources.java index e8b9d073d6..6907dead59 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.gazetteer; +package org.apache.sis.referencing.gazetteer.internal; import java.io.InputStream; import java.util.Locale; diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources.properties b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources.properties similarity index 100% rename from endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources.properties rename to endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources.properties diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources_en.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources_en.java similarity index 95% rename from endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources_en.java rename to endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources_en.java index d8c7b5e73c..e6c91b1eb5 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources_en.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources_en.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.gazetteer; +package org.apache.sis.referencing.gazetteer.internal; /** diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources_fr.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources_fr.java similarity index 95% rename from endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources_fr.java rename to endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources_fr.java index 1c0575f0d0..92ab1735fd 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources_fr.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources_fr.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.gazetteer; +package org.apache.sis.referencing.gazetteer.internal; /** diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources_fr.properties b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources_fr.properties similarity index 100% rename from endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/internal/gazetteer/Resources_fr.properties rename to endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/internal/Resources_fr.properties