[Jython-checkins] SF.net SVN: jython:[5959] trunk/jython

[<cg...@us...>]

Revision: 5959
          http://jython.svn.sourceforge.net/jython/?rev=5959&view=rev
Author:   cgroves
Date:     2009-01-22 19:50:18 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
Expose rich comparision methods on Java classes implementing Comparable

Modified Paths:
--------------
    trunk/jython/Lib/test/test_java_integration.py
    trunk/jython/src/org/python/core/PyJavaType.java

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2009-01-22 04:38:25 UTC (rev 5958)
+++ trunk/jython/Lib/test/test_java_integration.py	2009-01-22 19:50:18 UTC (rev 5959)
@@ -7,9 +7,10 @@
  
 from test import test_support
 
-from java.lang import (ExceptionInInitializerError, String, Runnable, System, Runtime, Math, Byte)
+from java.lang import (ClassCastException, ExceptionInInitializerError, String, Runnable, System,
+        Runtime, Math, Byte)
 from java.math import BigDecimal, BigInteger
-from java.io import (FileInputStream, FileNotFoundException, FileOutputStream, FileWriter,
+from java.io import (File, FileInputStream, FileNotFoundException, FileOutputStream, FileWriter,
     OutputStreamWriter, UnsupportedEncodingException)
 from java.util import ArrayList, Date, HashMap, Hashtable, StringTokenizer, Vector
 
@@ -350,6 +351,39 @@
         for i in v:
             pass
 
+    def test_comparable_delegation(self):
+        first_file = File("a")
+        first_date = Date(100)
+        for a, b, c in [(first_file, File("b"), File("c")), (first_date, Date(1000), Date())]:
+            self.assertTrue(a.compareTo(b) < 0)
+            self.assertEquals(-1, cmp(a, b))
+            self.assertTrue(a.compareTo(c) < 0)
+            self.assertEquals(-1, cmp(a, c))
+            self.assertEquals(0, a.compareTo(a))
+            self.assertEquals(0, cmp(a, a))
+            self.assertTrue(b.compareTo(a) > 0)
+            self.assertEquals(1, cmp(b, a))
+            self.assertTrue(c.compareTo(b) > 0)
+            self.assertEquals(1, cmp(c, b))
+            self.assertTrue(a < b)
+            self.assertTrue(a <= a)
+            self.assertTrue(b > a)
+            self.assertTrue(c >= a)
+            self.assertTrue(a != b)
+            l = [b, c, a]
+            self.assertEquals(a, min(l))
+            self.assertEquals(c, max(l))
+            l.sort()
+            self.assertEquals([a, b, c], l)
+        # Check that we fall back to the default comparison(class name) instead of using compareTo
+        # on non-Comparable types
+        self.assertRaises(ClassCastException, first_file.compareTo, first_date)
+        self.assertEquals(-1, cmp(first_file, first_date))
+        self.assertTrue(first_file < first_date)
+        self.assertTrue(first_file <= first_date)
+        self.assertTrue(first_date > first_file)
+        self.assertTrue(first_date >= first_file)
+       
 class SecurityManagerTest(unittest.TestCase):
     def test_nonexistent_import_with_security(self):
         policy = test_support.findfile("python_home.policy")

Modified: trunk/jython/src/org/python/core/PyJavaType.java
===================================================================
--- trunk/jython/src/org/python/core/PyJavaType.java	2009-01-22 04:38:25 UTC (rev 5958)
+++ trunk/jython/src/org/python/core/PyJavaType.java	2009-01-22 19:50:18 UTC (rev 5959)
@@ -402,6 +402,14 @@
                     return proxy.equals(oAsJava) ? Py.True : Py.False;
                 }
             });
+            addMethod(new PyBuiltinMethodNarrow("__ne__", 1) {
+                @Override
+                public PyObject __call__(PyObject o) {
+                    Object proxy = self.getJavaProxy();
+                    Object oAsJava = o.__tojava__(proxy.getClass());
+                    return !proxy.equals(oAsJava) ? Py.True : Py.False;
+                }
+            });
             addMethod(new PyBuiltinMethodNarrow("__hash__") {
                 @Override
                 public PyObject __call__() {
@@ -415,6 +423,32 @@
                 }
             });
         }
+        if(forClass == Comparable.class) {
+            addMethod(new ComparableMethod("__lt__", 1) {
+                @Override
+                protected boolean getResult(int comparison) {
+                    return comparison < 0;
+                }
+            });
+            addMethod(new ComparableMethod("__le__", 1) {
+                @Override
+                protected boolean getResult(int comparison) {
+                    return comparison <= 0;
+                }
+            });
+            addMethod(new ComparableMethod("__gt__", 1) {
+                @Override
+                protected boolean getResult(int comparison) {
+                    return comparison > 0;
+                }
+            });
+            addMethod(new ComparableMethod("__ge__", 1) {
+                @Override
+                protected boolean getResult(int comparison) {
+                    return comparison >= 0;
+                }
+            });
+        }
     }
 
     /**
@@ -559,6 +593,25 @@
         }
     }
 
+    private static abstract class ComparableMethod extends PyBuiltinMethodNarrow {
+        protected ComparableMethod(String name, int numArgs) {
+            super(name, numArgs);
+        }
+        @Override
+        public PyObject __call__(PyObject arg) {
+            Object asjava = arg.__tojava__(Object.class);
+            int compare;
+            try {
+                compare = ((Comparable<Object>)self.getJavaProxy()).compareTo(asjava);
+            } catch(ClassCastException classCast) {
+                return Py.NotImplemented;
+            }
+            return getResult(compare) ? Py.True : Py.False;
+        }
+
+        protected abstract boolean getResult(int comparison);
+    }
+
     private static Map<Class<?>, PyBuiltinMethod[]> getCollectionProxies() {
         if (collectionProxies == null) {
             collectionProxies = Generic.map();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.