Unwildcard java.util in gc.java, update ACKNOWLEDGEMENTS with Java sizeof, and make sure we shadow the java sizeof in jarjar

darjus · darjus · commit 8aacbb4a7a8c · 2016-01-04T15:17:31.000+11:00
diff --git a/ACKNOWLEDGMENTS b/ACKNOWLEDGMENTS
@@ -35,6 +35,7 @@ Jython links the following libraries:
 * Mock Runner, licensed under the Apache 1.1 license
 * Netty 4, licensed under the Apache 2.0 license from the Netty project
 * PyPy datetime module, licensed under the MIT License from the PyPy project
+* Java sizeof, licensed under the Apache 2.0 License from the Apache Software Foundation
 
 Jython follows closely the Python language and its reference
 implementation CPython, as created by Guido van Rossum.
diff --git a/build.xml b/build.xml
@@ -583,8 +583,10 @@ The readme text for the next release will be like:
             <rule pattern="io.netty.**" result="org.python.netty.@1"/>
             <zipfileset src="extlibs/netty-transport-4.0.33.Final.jar" excludes="META-INF/**"/>
             <rule pattern="io.netty.**" result="org.python.netty.@1"/>
-	    <!-- these stub jars are pre-built in https://github.com/jnr/jffi/tree/master/archive
-	        and rarely if ever change -->
+            <zipfileset src="${extlibs.dir}/java-sizeof-0.0.5.jar"/>
+            <rule pattern="com.carrotsearch.sizeof.**" result="org.python.sizeof.@1"/>
+            <!-- these stub jars are pre-built in https://github.com/jnr/jffi/tree/master/archive
+                and rarely if ever change -->
             <zipfileset src="extlibs/jffi-arm-Linux.jar"/>
             <zipfileset src="extlibs/jffi-Darwin.jar"/>
             <zipfileset src="extlibs/jffi-i386-FreeBSD.jar"/>
@@ -605,7 +607,6 @@ The readme text for the next release will be like:
             <zipfileset src="extlibs/jffi-x86_64-Windows.jar"/>
 	    <!-- remainder of JNR, JFFI -->
             <zipfileset src="extlibs/jffi-1.2.10.jar"/>
-            <zipfileset src="${extlibs.dir}/java-sizeof-0.0.5.jar"/>
             <zipfileset src="${extlibs.dir}/jnr-ffi-2.0.7.jar"/>
             <zipfileset src="${extlibs.dir}/jnr-netdb-1.1.5.jar"/>
             <zipfileset src="${extlibs.dir}/jnr-posix-3.0.23.jar"/>
diff --git a/src/org/python/modules/gc.java b/src/org/python/modules/gc.java
@@ -1,6 +1,11 @@
 package org.python.modules;
 
-import java.util.*;
+import java.util.Set;
+import java.util.List;
+import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.IdentityHashMap;
+import java.util.HashSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
