# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1108936943 -3600
# Node ID 3b608fcfbf344502caea53b63ef11d34f727ef82
# Parent  bea01a58e7d5eed6e614d30a7cb8ecea43059afc
Fixed multiple imports - the loaded_classes attribute was not removed.
Added interfaces as base classes.

diff -r bea01a58e7d5 -r 3b608fcfbf34 javaclass/classhook.py
--- a/javaclass/classhook.py	Sun Feb 20 23:02:23 2005 +0100
+++ b/javaclass/classhook.py	Sun Feb 20 23:02:23 2005 +0100
@@ -251,7 +251,7 @@
 
         if top_level:
             self._init_classes()
-            self.loaded_classes = {}
+            delattr(self, "loaded_classes")
 
         return main_module
 
@@ -350,18 +350,17 @@
 
         init_order = []
         for class_name, (module, translator) in self.loaded_classes.items():
-            super_class = translator.get_super_class()
 
-            # Insert the super class before any mention of the current class.
+            # Insert the base classes before any mention of the current class.
 
-            if super_class is not None:
-                super_class_name = str(super_class.get_name())
-                if super_class_name not in init_order:
+            for base_class in translator.get_base_class_references():
+                base_class_name = str(base_class.get_name())
+                if base_class_name not in init_order:
                     if class_name not in init_order:
-                        init_order.append(super_class_name)
+                        init_order.append(base_class_name)
                     else:
                         index = init_order.index(class_name)
-                        init_order.insert(index, super_class_name)
+                        init_order.insert(index, base_class_name)
 
             if class_name not in init_order:
                 init_order.append(class_name)