You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/12/05 06:57:29 UTC
groovy git commit: Make comparators serializable
Repository: groovy
Updated Branches:
refs/heads/master e1ce48241 -> be1f59035
Make comparators serializable
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/be1f5903
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/be1f5903
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/be1f5903
Branch: refs/heads/master
Commit: be1f590359e4052529e421104de3dca8479f0e59
Parents: e1ce482
Author: sunlan <su...@apache.org>
Authored: Tue Dec 5 14:57:23 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Dec 5 14:57:23 2017 +0800
----------------------------------------------------------------------
src/main/org/codehaus/groovy/reflection/CachedMethod.java | 5 ++++-
.../org/codehaus/groovy/runtime/NumberAwareComparator.java | 5 ++++-
.../groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java | 7 +++++--
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/be1f5903/src/main/org/codehaus/groovy/reflection/CachedMethod.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/reflection/CachedMethod.java b/src/main/org/codehaus/groovy/reflection/CachedMethod.java
index 952e5b2..58314e2 100644
--- a/src/main/org/codehaus/groovy/reflection/CachedMethod.java
+++ b/src/main/org/codehaus/groovy/reflection/CachedMethod.java
@@ -30,6 +30,7 @@ import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite;
import org.codehaus.groovy.runtime.callsite.StaticMetaMethodSite;
import org.codehaus.groovy.runtime.metaclass.MethodHelper;
+import java.io.Serializable;
import java.lang.ref.SoftReference;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -321,7 +322,9 @@ public class CachedMethod extends MetaMethod implements Comparable {
return new StaticMetaMethodSite.StaticMetaMethodSiteNoUnwrapNoCoerce(site, metaClass, this, params);
}
- private static class MyComparator implements Comparator {
+ private static class MyComparator implements Comparator, Serializable {
+ private static final long serialVersionUID = 8909277090690131302L;
+
public int compare(Object o1, Object o2) {
if (o1 instanceof CachedMethod)
return ((CachedMethod)o1).compareTo(o2);
http://git-wip-us.apache.org/repos/asf/groovy/blob/be1f5903/src/main/org/codehaus/groovy/runtime/NumberAwareComparator.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/NumberAwareComparator.java b/src/main/org/codehaus/groovy/runtime/NumberAwareComparator.java
index f8aff32..ee4c8c4 100644
--- a/src/main/org/codehaus/groovy/runtime/NumberAwareComparator.java
+++ b/src/main/org/codehaus/groovy/runtime/NumberAwareComparator.java
@@ -21,6 +21,7 @@ package org.codehaus.groovy.runtime;
import groovy.lang.GroovyRuntimeException;
import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import java.io.Serializable;
import java.util.Comparator;
/**
@@ -28,7 +29,9 @@ import java.util.Comparator;
* handles nulls gracefully (nul being less than everything else) and
* performs numeric type coercion if required.
*/
-public class NumberAwareComparator<T> implements Comparator<T> {
+public class NumberAwareComparator<T> implements Comparator<T>, Serializable {
+ private static final long serialVersionUID = 9017657289076651660L;
+
public int compare(T o1, T o2) {
try {
return DefaultTypeTransformation.compareTo(o1, o2);
http://git-wip-us.apache.org/repos/asf/groovy/blob/be1f5903/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
index 63f86ae..b763cd0 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
@@ -26,6 +26,7 @@ import javax.swing.text.Position;
import javax.swing.text.Segment;
import javax.swing.text.Style;
import javax.swing.text.StyleContext;
+import java.io.Serializable;
import java.nio.CharBuffer;
import java.util.ArrayList;
import java.util.Comparator;
@@ -557,8 +558,10 @@ public class StructuredSyntaxDocumentFilter extends DocumentFilter {
}
- private static class MLComparator implements Comparator {
-
+ private static class MLComparator implements Comparator, Serializable {
+
+ private static final long serialVersionUID = -4210196728719411217L;
+
public int compare(Object obj, Object obj1) {
return valueOf(obj) - valueOf(obj1);
}