Revision: 19660
http://sourceforge.net/p/gate/code/19660
Author: markagreenwood
Date: 2016-10-10 07:57:55 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
made comparators serializable so that if they are ever used in a sorted
collection (inside or outside the core API) the collection will remain
serializable
Modified Paths:
--------------
gate/branches/sawdust2/gate-core/src/main/java/gate/corpora/DocumentImpl.java
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/ontology/OntologyItemComparator.java
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/teamware/InputOutputAnnotationSetsDialog.java
gate/branches/sawdust2/gate-core/src/main/java/gate/sgml/Sgml2Xml.java
gate/branches/sawdust2/gate-core/src/main/java/gate/util/AnnotationDiffer.java
gate/branches/sawdust2/gate-core/src/main/java/gate/util/NameComparator.java
gate/branches/sawdust2/gate-core/src/main/java/gate/util/ObjectComparator.java
gate/branches/sawdust2/gate-core/src/main/java/gate/util/OffsetComparator.java
gate/branches/sawdust2/gate-core/src/main/java/gate/util/VersionComparator.java
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java
gate/branches/sawdust2/gate-core/src/main/java/gate/util/reporting/PRTimeReporter.java
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/corpora/DocumentImpl.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/corpora/DocumentImpl.java
2016-10-10 07:57:13 UTC (rev 19659)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/corpora/DocumentImpl.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -50,6 +50,7 @@
import gate.util.Strings;
import java.io.IOException;
+import java.io.Serializable;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -2366,7 +2367,10 @@
static final long serialVersionUID = -8456893608311510260L;
/** Inner class needed to compare annotations */
- static class AnnotationComparator implements Comparator<Annotation> {
+ static class AnnotationComparator implements Comparator<Annotation>,
Serializable {
+
+ private static final long serialVersionUID = -2405379880205707461L;
+
int orderOn = -1;
int orderType = ASC;
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/ontology/OntologyItemComparator.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/ontology/OntologyItemComparator.java
2016-10-10 07:57:13 UTC (rev 19659)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/ontology/OntologyItemComparator.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -8,16 +8,21 @@
package gate.gui.ontology;
-import gate.creole.ontology.OResource;
+import java.io.Serializable;
import java.util.Comparator;
+import gate.creole.ontology.OResource;
+
/**
* A Comparator that sorts the resources in ontology based on their URIs
*
* @author niraj
*
*/
-public class OntologyItemComparator implements Comparator<OResource> {
+public class OntologyItemComparator implements Comparator<OResource>,
Serializable {
+
+ private static final long serialVersionUID = 4652904428995140296L;
+
@Override
public int compare(OResource resource1, OResource resource2) {
if (resource1 == null) return (resource2 != null) ? -1 : 0;
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/teamware/InputOutputAnnotationSetsDialog.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/teamware/InputOutputAnnotationSetsDialog.java
2016-10-10 07:57:13 UTC (rev 19659)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/teamware/InputOutputAnnotationSetsDialog.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -15,13 +15,12 @@
package gate.gui.teamware;
-import gate.Controller;
-
import java.awt.Component;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
@@ -39,6 +38,8 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import gate.Controller;
+
/**
* Dialog box to edit the lists of input and output annotation set names
* for the "export to teamware" option.
@@ -135,7 +136,7 @@
* input or output.
*/
@SuppressWarnings("serial")
- class AnnotationSetsList extends JPanel {
+ static class AnnotationSetsList extends JPanel {
private JList<String> annotationSetsList;
private DefaultListModel<String> listModel;
@@ -259,7 +260,10 @@
* A comparator for strings that uses their natural order, treating
* <code>null</code> as less than anything non-<code>null</code>.
*/
- protected static class NaturalComparator implements Comparator<String> {
+ protected static class NaturalComparator implements Comparator<String>,
Serializable {
+
+ private static final long serialVersionUID = -7376222886417999334L;
+
@Override
public int compare(String a, String b) {
if(a == null) {
Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/sgml/Sgml2Xml.java
===================================================================
--- gate/branches/sawdust2/gate-core/src/main/java/gate/sgml/Sgml2Xml.java
2016-10-10 07:57:13 UTC (rev 19659)
+++ gate/branches/sawdust2/gate-core/src/main/java/gate/sgml/Sgml2Xml.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -18,6 +18,7 @@
import java.io.File;
import java.io.IOException;
+import java.io.Serializable;
import java.net.MalformedURLException;
import java.util.*;
@@ -727,8 +728,10 @@
} // CustomObject
-class MyComparator implements Comparator<CustomObject> {
+class MyComparator implements Comparator<CustomObject>, Serializable {
+ private static final long serialVersionUID = -3559488985426858804L;
+
public MyComparator() {
}
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/util/AnnotationDiffer.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/util/AnnotationDiffer.java
2016-10-10 07:57:13 UTC (rev 19659)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/util/AnnotationDiffer.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -14,6 +14,7 @@
*/
package gate.util;
+import java.io.Serializable;
import java.math.RoundingMode;
import java.text.NumberFormat;
import java.util.*;
@@ -723,7 +724,10 @@
* for the same score the better type is preferred (exact matches are
* preffered to partial ones).
*/
- protected static class PairingScoreComparator implements
Comparator<Pairing> {
+ protected static class PairingScoreComparator implements
Comparator<Pairing>, Serializable {
+
+ private static final long serialVersionUID = 7386841422038756873L;
+
/**
* Compares two choices:
* the better score is preferred;
@@ -755,7 +759,10 @@
* Compares two choices based on start offset of key (or response
* if key not present) and type if offsets are equal.
*/
- public static class PairingOffsetComparator implements
Comparator<Pairing> {
+ public static class PairingOffsetComparator implements
Comparator<Pairing>, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
/**
* Compares two choices based on start offset of key (or response
* if key not present) and type if offsets are equal.
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/util/NameComparator.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/util/NameComparator.java
2016-10-10 07:57:13 UTC (rev 19659)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/util/NameComparator.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -14,13 +14,16 @@
*/
package gate.util;
+import java.io.Serializable;
import java.util.Comparator;
/**
* Compares {@link NameBearer}s by name (string comparation)
*/
-public class NameComparator implements Comparator<NameBearer> {
+public class NameComparator implements Comparator<NameBearer>, Serializable {
+ private static final long serialVersionUID = -8248579892793888133L;
+
@Override
public int compare(NameBearer nb1, NameBearer nb2){
return nb1.getName().compareTo(nb2.getName());
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/util/ObjectComparator.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/util/ObjectComparator.java
2016-10-10 07:57:13 UTC (rev 19659)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/util/ObjectComparator.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -16,6 +16,7 @@
package gate.util;
+import java.io.Serializable;
import java.util.Comparator;
/**
@@ -24,8 +25,10 @@
* and the String values are compared.
* This utility is useful for GUI components that need to sort their contents.
*/
-public class ObjectComparator implements Comparator<Object>{
+public class ObjectComparator implements Comparator<Object>, Serializable {
+ private static final long serialVersionUID = 8692612164609360477L;
+
/**
* Compares two objects.
*/
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/util/OffsetComparator.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/util/OffsetComparator.java
2016-10-10 07:57:13 UTC (rev 19659)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/util/OffsetComparator.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -14,6 +14,7 @@
*/
package gate.util;
+import java.io.Serializable;
import java.util.Comparator;
import gate.Annotation;
@@ -23,8 +24,10 @@
* offset if the start offsets are equal.
* Example: [5,9] < [6,7] < [6,9] < [7,8]
*/
-public class OffsetComparator implements Comparator<Annotation> {
+public class OffsetComparator implements Comparator<Annotation>, Serializable {
+ private static final long serialVersionUID = -8201745469767435557L;
+
@Override
public int compare(Annotation a1, Annotation a2){
int result;
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/util/VersionComparator.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/util/VersionComparator.java
2016-10-10 07:57:13 UTC (rev 19659)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/util/VersionComparator.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -14,12 +14,13 @@
package gate.util;
-import gate.Main;
-
+import java.io.Serializable;
import java.util.Comparator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import gate.Main;
+
/**
* A comparator that can be used for comparing GATE version strings. This
* includes comparing SNAPSHOT versions as well as releases. This is needed to
@@ -28,8 +29,10 @@
*
* @author Mark A. Greenwood
*/
-public class VersionComparator implements Comparator<String> {
+public class VersionComparator implements Comparator<String>, Serializable {
+ private static final long serialVersionUID = 6108998766086857918L;
+
// this pattern matches any dot separated sequence of digits
private static final Pattern VERSION_PATTERN = Pattern
.compile("(\\d+)(?:\\.(\\d+))*");
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java
2016-10-10 07:57:13 UTC (rev 19659)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -582,7 +582,10 @@
} // class URLHolder
- public static class ClassComparator implements Comparator<Class<?>> {
+ public static class ClassComparator implements Comparator<Class<?>>,
Serializable {
+
+ private static final long serialVersionUID = 6632907018933862733L;
+
/**
* Compares two {@link Class} values in terms of specificity; the
* more specific class is said to be "smaller" than the
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/util/reporting/PRTimeReporter.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/util/reporting/PRTimeReporter.java
2016-10-10 07:57:13 UTC (rev 19659)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/util/reporting/PRTimeReporter.java
2016-10-10 07:57:55 UTC (rev 19660)
@@ -20,6 +20,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.RandomAccessFile;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -1223,7 +1224,10 @@
* A Comparator class to compare the values of the LinkedHashMaps containing
* processing elements and time taken by them.
*/
-class ValueComparator implements Comparator<String> {
+class ValueComparator implements Comparator<String>, Serializable {
+
+ private static final long serialVersionUID = -1767153293265172453L;
+
/**
* Provides the comparison logic between the processing time taken by
* processing elements
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs
