[Jython-checkins] SF.net SVN: jython:[5944] trunk/jython/src/org/python/core/Py.java

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

Revision: 5944
          http://jython.svn.sourceforge.net/jython/?rev=5944&view=rev
Author:   cgroves
Date:     2009-01-18 00:53:10 +0000 (Sun, 18 Jan 2009)

Log Message:
-----------
ecj likes this, but javac disputes that it's compilable, so go back to the old way

Modified Paths:
--------------
    trunk/jython/src/org/python/core/Py.java

Modified: trunk/jython/src/org/python/core/Py.java
===================================================================
--- trunk/jython/src/org/python/core/Py.java	2009-01-17 23:57:54 UTC (rev 5943)
+++ trunk/jython/src/org/python/core/Py.java	2009-01-18 00:53:10 UTC (rev 5944)
@@ -84,10 +84,13 @@
     public static long TPFLAGS_BASETYPE = 1L << 10;
 
     /** Builtin types that are used to setup PyObject. */
-    static final Set<Class<?>> BOOTSTRAP_TYPES = Generic.set(PyObject.class,
-                                                             PyType.class,
-                                                             PyBuiltinCallable.class,
-                                                             PyDataDescr.class);
+    static final Set<Class<?>> BOOTSTRAP_TYPES = Generic.set();
+    static {
+        BOOTSTRAP_TYPES.add(PyObject.class);
+        BOOTSTRAP_TYPES.add(PyType.class);
+        BOOTSTRAP_TYPES.add(PyBuiltinCallable.class);
+        BOOTSTRAP_TYPES.add(PyDataDescr.class);
+    }
 
     /** A unique object to indicate no conversion is possible
     in __tojava__ methods **/


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