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 2021/09/08 16:39:56 UTC
[sis] 08/09: Rename `DefaultSortBy` as `DefaultSortProperty`.
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 ecae4861473e26b89da31f4183afa78d36f98382
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Sep 8 11:32:03 2021 +0200
Rename `DefaultSortBy` as `DefaultSortProperty`.
---
.../src/main/java/org/apache/sis/filter/DefaultFilterFactory.java | 2 +-
.../sis/filter/{DefaultSortBy.java => DefaultSortProperty.java} | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
index af653e5..ea9a6ff 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
@@ -1002,6 +1002,6 @@ public abstract class DefaultFilterFactory<R,G,T> extends AbstractFactory implem
*/
@Override
public SortProperty sort(final ValueReference<? super R, ?> property, final SortOrder order) {
- return new DefaultSortBy(property, order);
+ return new DefaultSortProperty(property, order);
}
}
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSortBy.java b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSortProperty.java
similarity index 91%
rename from core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSortBy.java
rename to core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSortProperty.java
index b1ebde8..af2bae3 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSortBy.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSortProperty.java
@@ -33,7 +33,7 @@ import org.opengis.filter.ValueReference;
* @since 1.1
* @module
*/
-final class DefaultSortBy implements SortProperty, Serializable {
+final class DefaultSortProperty implements SortProperty, Serializable {
/**
* For cross-version compatibility.
*/
@@ -56,7 +56,7 @@ final class DefaultSortBy implements SortProperty, Serializable {
* @param property property on which to apply sorting.
* @param order the desired order: {@code ASCENDING} or {@code DESCENDING}.
*/
- DefaultSortBy(final ValueReference<?,?> property, final SortOrder order) {
+ DefaultSortProperty(final ValueReference<?,?> property, final SortOrder order) {
this.property = property;
this.order = order;
ArgumentChecks.ensureNonNull("property", property);
@@ -95,8 +95,8 @@ final class DefaultSortBy implements SortProperty, Serializable {
if (this == obj) {
return true;
}
- if (obj instanceof DefaultSortBy) {
- final DefaultSortBy other = (DefaultSortBy) obj;
+ if (obj instanceof DefaultSortProperty) {
+ final DefaultSortProperty other = (DefaultSortProperty) obj;
return property.equals(other.property)
&& order.equals(other.order);
}