GUI -- Enhanced DefaultCellComparator to utilize Comparable implementation if available on the objects being compared, defaulting to string comparison otherwise.
- Deleted obsolete comparators.
Change-Id: Ifeb74c05f73bd974d1afb3dc27527a5c7ad1bc12
diff --git a/core/api/src/main/java/org/onosproject/ui/table/TableModel.java b/core/api/src/main/java/org/onosproject/ui/table/TableModel.java
index 91e23be..fd6095b 100644
--- a/core/api/src/main/java/org/onosproject/ui/table/TableModel.java
+++ b/core/api/src/main/java/org/onosproject/ui/table/TableModel.java
@@ -43,6 +43,9 @@
* The table also provides a mechanism for defining how cell values for a
* particular column should be formatted into strings, to help facilitate
* the encoding of the table data into a JSON structure.
+ * <p>
+ * Note that it is expected that all values for a particular column will
+ * be the same class.
*/
public class TableModel {
diff --git a/core/api/src/main/java/org/onosproject/ui/table/cell/DefaultCellComparator.java b/core/api/src/main/java/org/onosproject/ui/table/cell/DefaultCellComparator.java
index 238116a..093a20d 100644
--- a/core/api/src/main/java/org/onosproject/ui/table/cell/DefaultCellComparator.java
+++ b/core/api/src/main/java/org/onosproject/ui/table/cell/DefaultCellComparator.java
@@ -20,7 +20,11 @@
import org.onosproject.ui.table.CellComparator;
/**
- * A default cell comparator. Implements a lexicographical compare function
+ * A default cell comparator.
+ * <p>
+ * Verifies that the objects being compared are the same class.
+ * Looks to see if the objects being compared implement comparable and, if so,
+ * delegates to that; otherwise, implements a lexicographical compare function
* (i.e. string sorting). Uses the objects' toString() method and then
* compares the resulting strings. Note that null values are acceptable and
* are considered "smaller" than any non-null value.
@@ -31,7 +35,13 @@
private DefaultCellComparator() { }
@Override
+ @SuppressWarnings("unchecked")
protected int nonNullCompare(Object o1, Object o2) {
+ if (o1 instanceof Comparable) {
+ // if o2 is not the same class as o1, then compareTo will
+ // throw ClassCastException for us
+ return ((Comparable) o1).compareTo(o2);
+ }
return o1.toString().compareTo(o2.toString());
}
diff --git a/core/api/src/main/java/org/onosproject/ui/table/cell/IntComparator.java b/core/api/src/main/java/org/onosproject/ui/table/cell/IntComparator.java
deleted file mode 100644
index c0d81ec..0000000
--- a/core/api/src/main/java/org/onosproject/ui/table/cell/IntComparator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.onosproject.ui.table.cell;
-
-import org.onosproject.ui.table.CellComparator;
-
-/**
- * An integer-based cell comparator.
- * Note that null values are acceptable and are considered "smaller" than
- * any non-null value.
- */
-public final class IntComparator extends AbstractCellComparator {
-
- // non-instantiable
- private IntComparator() { }
-
- @Override
- protected int nonNullCompare(Object o1, Object o2) {
- return ((int) o1) - ((int) o2);
- }
-
- /**
- * An instance of this class.
- */
- public static final CellComparator INSTANCE = new IntComparator();
-}
diff --git a/core/api/src/main/java/org/onosproject/ui/table/cell/LongComparator.java b/core/api/src/main/java/org/onosproject/ui/table/cell/LongComparator.java
deleted file mode 100644
index e8a8986..0000000
--- a/core/api/src/main/java/org/onosproject/ui/table/cell/LongComparator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.onosproject.ui.table.cell;
-
-import org.onosproject.ui.table.CellComparator;
-
-/**
- * A long-based cell comparator.
- * Note that null values are acceptable and are considered "smaller" than
- * any non-null value.
- */
-public final class LongComparator extends AbstractCellComparator {
-
- // non-instantiable
- private LongComparator() { }
-
- @Override
- protected int nonNullCompare(Object o1, Object o2) {
- long diff = ((long) o1) - ((long) o2);
- return diff == 0 ? 0 : (diff < 0 ? -1 : 1);
- }
-
- /**
- * An instance of this class.
- */
- public static final CellComparator INSTANCE = new LongComparator();
-}