From: Leif Åstrand <legioth@gmail.com>
Date: Tue, 14 Feb 2017 13:00:06 +0000 (+0200)
Subject: Clarify set/addSortComparator parameter name (#8562)
X-Git-Tag: 8.0.0.rc2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bbfd470627c3ad15d987271689e82f7e38dde59a;p=vaadin-framework.git

Clarify set/addSortComparator parameter name (#8562)
---

diff --git a/server/src/main/java/com/vaadin/data/provider/ListDataProvider.java b/server/src/main/java/com/vaadin/data/provider/ListDataProvider.java
index 039366418a..2f1e17d673 100644
--- a/server/src/main/java/com/vaadin/data/provider/ListDataProvider.java
+++ b/server/src/main/java/com/vaadin/data/provider/ListDataProvider.java
@@ -74,7 +74,7 @@ public class ListDataProvider<T>
 
     /**
      * Returns the underlying data items.
-     * 
+     *
      * @return the underlying data items
      */
     public Collection<T> getItems() {
@@ -134,12 +134,12 @@ public class ListDataProvider<T>
      * @see #setSortOrder(ValueProvider, SortDirection)
      * @see #addSortComparator(SerializableComparator)
      *
-     * @param sortOrder
+     * @param comparator
      *            a comparator to use, or <code>null</code> to clear any
      *            previously set sort order
      */
-    public void setSortComparator(SerializableComparator<T> sortOrder) {
-        this.sortOrder = sortOrder;
+    public void setSortComparator(SerializableComparator<T> comparator) {
+        this.sortOrder = comparator;
         refreshAll();
     }
 
@@ -180,20 +180,20 @@ public class ListDataProvider<T>
      * @see #setSortComparator(SerializableComparator)
      * @see #addSortOrder(ValueProvider, SortDirection)
      *
-     * @param sortOrder
+     * @param comparator
      *            a comparator to add, not <code>null</code>
      */
-    public void addSortComparator(SerializableComparator<T> sortOrder) {
-        Objects.requireNonNull(sortOrder, "Sort order to add cannot be null");
+    public void addSortComparator(SerializableComparator<T> comparator) {
+        Objects.requireNonNull(comparator, "Sort order to add cannot be null");
 
         SerializableComparator<T> originalComparator = this.sortOrder;
         if (originalComparator == null) {
-            setSortComparator(sortOrder);
+            setSortComparator(comparator);
         } else {
             setSortComparator((a, b) -> {
                 int result = originalComparator.compare(a, b);
                 if (result == 0) {
-                    result = sortOrder.compare(a, b);
+                    result = comparator.compare(a, b);
                 }
                 return result;
             });