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 b1014029d203778f1981eef5dbcba9bafeac7a28
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Aug 20 13:17:26 2023 +0200
Rename the internal packages of the `org.apache.sis.cql` module.
Since they are not exported, the `internal` name convention is not needed
anymore.
---
.../sis/{internal/cql => cql/internal}/CQL.g4 | 2 +-
.../main/org/apache/sis/cql/CQL.java | 28 +++++++++++-----------
.../sis/{internal/cql => cql/internal}/.gitignore | 0
.../{internal/cql => cql/internal}/AntlrCQL.java | 2 +-
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/incubator/src/main/antlr/org/apache/sis/internal/cql/CQL.g4
b/incubator/src/main/antlr/org/apache/sis/cql/internal/CQL.g4
similarity index 99%
rename from incubator/src/main/antlr/org/apache/sis/internal/cql/CQL.g4
rename to incubator/src/main/antlr/org/apache/sis/cql/internal/CQL.g4
index 6860141030..91197f8538 100644
--- a/incubator/src/main/antlr/org/apache/sis/internal/cql/CQL.g4
+++ b/incubator/src/main/antlr/org/apache/sis/cql/internal/CQL.g4
@@ -20,7 +20,7 @@ options {
language = Java;
}
@header {
- package org.apache.sis.internal.cql;
+ package org.apache.sis.cql.internal;
}
//-----------------------------------------------------------------//
diff --git a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
index 600395eccc..aeaa0786ac 100644
--- a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
+++ b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
@@ -30,19 +30,19 @@ import org.apache.sis.measure.Quantities;
import org.apache.sis.filter.DefaultFilterFactory;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.internal.cql.AntlrCQL;
-import org.apache.sis.internal.cql.CQLParser.CoordinateContext;
-import org.apache.sis.internal.cql.CQLParser.CoordinateSerieContext;
-import org.apache.sis.internal.cql.CQLParser.CoordinateSeriesContext;
-import org.apache.sis.internal.cql.CQLParser.ExpressionContext;
-import org.apache.sis.internal.cql.CQLParser.ExpressionFctParamContext;
-import org.apache.sis.internal.cql.CQLParser.ExpressionGeometryContext;
-import org.apache.sis.internal.cql.CQLParser.ExpressionNumContext;
-import org.apache.sis.internal.cql.CQLParser.ExpressionTermContext;
-import org.apache.sis.internal.cql.CQLParser.ExpressionUnaryContext;
-import org.apache.sis.internal.cql.CQLParser.FilterContext;
-import org.apache.sis.internal.cql.CQLParser.FilterGeometryContext;
-import org.apache.sis.internal.cql.CQLParser.FilterTermContext;
+import org.apache.sis.cql.internal.AntlrCQL;
+import org.apache.sis.cql.internal.CQLParser.CoordinateContext;
+import org.apache.sis.cql.internal.CQLParser.CoordinateSerieContext;
+import org.apache.sis.cql.internal.CQLParser.CoordinateSeriesContext;
+import org.apache.sis.cql.internal.CQLParser.ExpressionContext;
+import org.apache.sis.cql.internal.CQLParser.ExpressionFctParamContext;
+import org.apache.sis.cql.internal.CQLParser.ExpressionGeometryContext;
+import org.apache.sis.cql.internal.CQLParser.ExpressionNumContext;
+import org.apache.sis.cql.internal.CQLParser.ExpressionTermContext;
+import org.apache.sis.cql.internal.CQLParser.ExpressionUnaryContext;
+import org.apache.sis.cql.internal.CQLParser.FilterContext;
+import org.apache.sis.cql.internal.CQLParser.FilterGeometryContext;
+import org.apache.sis.cql.internal.CQLParser.FilterTermContext;
import org.apache.sis.internal.util.StandardDateFormat;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.CoordinateSequence;
@@ -60,7 +60,7 @@ import org.opengis.filter.LogicalOperator;
import org.opengis.filter.LogicalOperatorName;
import org.opengis.filter.ValueReference;
-import static org.apache.sis.internal.cql.CQLParser.*;
+import static org.apache.sis.cql.internal.CQLParser.*;
import org.opengis.filter.Literal;
import org.opengis.filter.SortOrder;
import org.opengis.filter.SortProperty;
diff --git
a/incubator/src/org.apache.sis.cql/main/org/apache/sis/internal/cql/.gitignore
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/internal/.gitignore
similarity index 100%
rename from
incubator/src/org.apache.sis.cql/main/org/apache/sis/internal/cql/.gitignore
rename to
incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/internal/.gitignore
diff --git
a/incubator/src/org.apache.sis.cql/main/org/apache/sis/internal/cql/AntlrCQL.java
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/internal/AntlrCQL.java
similarity index 99%
rename from
incubator/src/org.apache.sis.cql/main/org/apache/sis/internal/cql/AntlrCQL.java
rename to
incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/internal/AntlrCQL.java
index afe6fd4b17..78d1d9d353 100644
---
a/incubator/src/org.apache.sis.cql/main/org/apache/sis/internal/cql/AntlrCQL.java
+++
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/internal/AntlrCQL.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.cql;
+package org.apache.sis.cql.internal;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CodePointCharStream;
