* fixed external name for inner classes (must not contain the name for

    the outer class)
  * migrated some types that will be required for set support from jdk15
    to java_sys

git-svn-id: branches/jvmbackend@18627 -

rtl/java/java_sys.inc

@@ -126,7 +126,7 @@
       Arr1InnerArrayList = array of InnerArrayList;
       Arr2InnerArrayList = array of Arr1InnerArrayList;
       Arr3InnerArrayList = array of Arr2InnerArrayList;
-      InnerArrayList = class external 'java.util' name 'Arrays$ArrayList' 
+      InnerArrayList = class external 'java.util' name 'ArrayList' 
       end;
 
   public
@@ -353,7 +353,7 @@
       Arr1InnerEntry = array of InnerEntry;
       Arr2InnerEntry = array of Arr1InnerEntry;
       Arr3InnerEntry = array of Arr2InnerEntry;
-      InnerEntry = interface external 'java.util' name 'Map$Entry' 
+      InnerEntry = interface external 'java.util' name 'Entry' 
         function getKey(): JLObject; overload;
         function getValue(): JLObject; overload;
         function setValue(para1: JLObject): JLObject; overload;
@@ -470,6 +470,38 @@
     function append(para1: JLCharSequence): JLAppendable; overload; virtual;  // throws java.io.IOException
   end;
 
+  JUBitSet = class external 'java.util' name 'BitSet' (JLObject, JLCloneable, JISerializable)
+  public
+    constructor create(); overload;
+    constructor create(para1: jint); overload;
+    procedure flip(para1: jint); overload; virtual;
+    procedure flip(para1: jint; para2: jint); overload; virtual;
+    procedure &set(para1: jint); overload; virtual;
+    procedure &set(para1: jint; para2: jboolean); overload; virtual;
+    procedure &set(para1: jint; para2: jint); overload; virtual;
+    procedure &set(para1: jint; para2: jint; para3: jboolean); overload; virtual;
+    procedure clear(para1: jint); overload; virtual;
+    procedure clear(para1: jint; para2: jint); overload; virtual;
+    procedure clear(); overload; virtual;
+    function get(para1: jint): jboolean; overload; virtual;
+    function get(para1: jint; para2: jint): JUBitSet; overload; virtual;
+    function nextSetBit(para1: jint): jint; overload; virtual;
+    function nextClearBit(para1: jint): jint; overload; virtual;
+    function length(): jint; overload; virtual;
+    function isEmpty(): jboolean; overload; virtual;
+    function intersects(para1: JUBitSet): jboolean; overload; virtual;
+    function cardinality(): jint; overload; virtual;
+    procedure &and(para1: JUBitSet); overload; virtual;
+    procedure &or(para1: JUBitSet); overload; virtual;
+    procedure &xor(para1: JUBitSet); overload; virtual;
+    procedure andNot(para1: JUBitSet); overload; virtual;
+    function hashCode(): jint; overload; virtual;
+    function size(): jint; overload; virtual;
+    function equals(para1: JLObject): jboolean; overload; virtual;
+    function clone(): JLObject; overload; virtual;
+    function toString(): JLString; overload; virtual;
+  end;
+
   JLBoolean = class sealed external 'java.lang' name 'Boolean' (JLObject, JISerializable, JLComparable)
   public
     final class var
@@ -499,7 +531,7 @@
       Arr1InnerCharacterCache = array of InnerCharacterCache;
       Arr2InnerCharacterCache = array of Arr1InnerCharacterCache;
       Arr3InnerCharacterCache = array of Arr2InnerCharacterCache;
-      InnerCharacterCache = class external 'java.lang' name 'Character$CharacterCache' 
+      InnerCharacterCache = class external 'java.lang' name 'CharacterCache' 
       end;
 
   public
@@ -512,7 +544,7 @@
       Arr1InnerUnicodeBlock = array of InnerUnicodeBlock;
       Arr2InnerUnicodeBlock = array of Arr1InnerUnicodeBlock;
       Arr3InnerUnicodeBlock = array of Arr2InnerUnicodeBlock;
-      InnerSubset = class external 'java.lang' name 'Character$Subset' (JLObject)
+      InnerSubset = class external 'java.lang' name 'Subset' (JLObject)
       strict protected
         constructor create(para1: JLString); overload;
       public
@@ -521,7 +553,7 @@
         function toString(): JLString; overload; virtual; final;
       end;
 
-      InnerUnicodeBlock = class sealed external 'java.lang' name 'Character$UnicodeBlock' (InnerSubset)
+      InnerUnicodeBlock = class sealed external 'java.lang' name 'UnicodeBlock' (InnerSubset)
       public
         final class var
           fBASIC_LATIN: JLCharacter.InnerUnicodeBlock; external name 'BASIC_LATIN';
@@ -845,7 +877,7 @@
       Arr1InnerCaseInsensitiveComparator = array of InnerCaseInsensitiveComparator;
       Arr2InnerCaseInsensitiveComparator = array of Arr1InnerCaseInsensitiveComparator;
       Arr3InnerCaseInsensitiveComparator = array of Arr2InnerCaseInsensitiveComparator;
-      InnerCaseInsensitiveComparator = class external 'java.lang' name 'String$CaseInsensitiveComparator' 
+      InnerCaseInsensitiveComparator = class external 'java.lang' name 'CaseInsensitiveComparator' 
       end;
 
   public
@@ -984,10 +1016,10 @@
       Arr1InnerEnclosingMethodInfo = array of InnerEnclosingMethodInfo;
       Arr2InnerEnclosingMethodInfo = array of Arr1InnerEnclosingMethodInfo;
       Arr3InnerEnclosingMethodInfo = array of Arr2InnerEnclosingMethodInfo;
-      InnerMethodArray = class external 'java.lang' name 'Class$MethodArray' 
+      InnerMethodArray = class external 'java.lang' name 'MethodArray' 
       end;
 
-      InnerEnclosingMethodInfo = class sealed external 'java.lang' name 'Class$EnclosingMethodInfo' 
+      InnerEnclosingMethodInfo = class sealed external 'java.lang' name 'EnclosingMethodInfo' 
       end;
 
   public
@@ -1061,7 +1093,7 @@
       Arr1InnerCollatorGetter = array of InnerCollatorGetter;
       Arr2InnerCollatorGetter = array of Arr1InnerCollatorGetter;
       Arr3InnerCollatorGetter = array of Arr2InnerCollatorGetter;
-      InnerCollatorGetter = class external 'java.text' name 'Collator$CollatorGetter' 
+      InnerCollatorGetter = class external 'java.text' name 'CollatorGetter' 
       end;
 
   public
@@ -1103,7 +1135,7 @@
       Arr1InnerSimpleEntry = array of InnerSimpleEntry;
       Arr2InnerSimpleEntry = array of Arr1InnerSimpleEntry;
       Arr3InnerSimpleEntry = array of Arr2InnerSimpleEntry;
-      InnerSimpleImmutableEntry = class external 'java.util' name 'AbstractMap$SimpleImmutableEntry' (JLObject, JUMap.InnerEntry, JISerializable)
+      InnerSimpleImmutableEntry = class external 'java.util' name 'SimpleImmutableEntry' (JLObject, JUMap.InnerEntry, JISerializable)
       public
         constructor create(para1: JLObject; para2: JLObject); overload;
         constructor create(para1: JUMap.InnerEntry); overload;
@@ -1115,7 +1147,7 @@
         function toString(): JLString; overload; virtual;
       end;
 
-      InnerSimpleEntry = class external 'java.util' name 'AbstractMap$SimpleEntry' (JLObject, JUMap.InnerEntry, JISerializable)
+      InnerSimpleEntry = class external 'java.util' name 'SimpleEntry' (JLObject, JUMap.InnerEntry, JISerializable)
       public
         constructor create(para1: JLObject; para2: JLObject); overload;
         constructor create(para1: JUMap.InnerEntry); overload;
@@ -1156,7 +1188,7 @@
       Arr1InnerByteCache = array of InnerByteCache;
       Arr2InnerByteCache = array of Arr1InnerByteCache;
       Arr3InnerByteCache = array of Arr2InnerByteCache;
-      InnerByteCache = class external 'java.lang' name 'Byte$ByteCache' 
+      InnerByteCache = class external 'java.lang' name 'ByteCache' 
       end;
 
   public
@@ -1288,7 +1320,7 @@
       Arr1InnerIntegerCache = array of InnerIntegerCache;
       Arr2InnerIntegerCache = array of Arr1InnerIntegerCache;
       Arr3InnerIntegerCache = array of Arr2InnerIntegerCache;
-      InnerIntegerCache = class external 'java.lang' name 'Integer$IntegerCache' 
+      InnerIntegerCache = class external 'java.lang' name 'IntegerCache' 
       end;
 
   public
@@ -1348,7 +1380,7 @@
       Arr1InnerLongCache = array of InnerLongCache;
       Arr2InnerLongCache = array of Arr1InnerLongCache;
       Arr3InnerLongCache = array of Arr2InnerLongCache;
-      InnerLongCache = class external 'java.lang' name 'Long$LongCache' 
+      InnerLongCache = class external 'java.lang' name 'LongCache' 
       end;
 
   public
@@ -1408,7 +1440,7 @@
       Arr1InnerShortCache = array of InnerShortCache;
       Arr2InnerShortCache = array of Arr1InnerShortCache;
       Arr3InnerShortCache = array of Arr2InnerShortCache;
-      InnerShortCache = class external 'java.lang' name 'Short$ShortCache' 
+      InnerShortCache = class external 'java.lang' name 'ShortCache' 
       end;
 
   public
@@ -1661,6 +1693,27 @@
     function append(para1: JLCharSequence): JLAppendable; overload; virtual;  // throws java.io.IOException
   end;
 
+  JUAbstractCollection = class abstract external 'java.util' name 'AbstractCollection' (JLObject, JUCollection)
+  strict protected
+    constructor create(); overload;
+  public
+    function iterator(): JUIterator; overload; virtual; abstract;
+    function size(): jint; overload; virtual; abstract;
+    function isEmpty(): jboolean; overload; virtual;
+    function contains(para1: JLObject): jboolean; overload; virtual;
+    function toArray(): Arr1JLObject; overload; virtual;
+    function toArray(para1: Arr1JLObject): Arr1JLObject; overload; virtual;
+    function toArray(var para1: array of JLObject): Arr1JLObject; overload; virtual;
+    function add(para1: JLObject): jboolean; overload; virtual;
+    function remove(para1: JLObject): jboolean; overload; virtual;
+    function containsAll(para1: JUCollection): jboolean; overload; virtual;
+    function addAll(para1: JUCollection): jboolean; overload; virtual;
+    function removeAll(para1: JUCollection): jboolean; overload; virtual;
+    function retainAll(para1: JUCollection): jboolean; overload; virtual;
+    procedure clear(); overload; virtual;
+    function toString(): JLString; overload; virtual;
+  end;
+
   JUSet = interface external 'java.util' name 'Set' (JUCollection)
     function size(): jint; overload;
     function isEmpty(): jboolean; overload;
@@ -1715,28 +1768,28 @@
       Arr1InnerHashIterator = array of InnerHashIterator;
       Arr2InnerHashIterator = array of Arr1InnerHashIterator;
       Arr3InnerHashIterator = array of Arr2InnerHashIterator;
-      InnerEntrySet = class sealed external 'java.util' name 'HashMap$EntrySet' 
+      InnerEntrySet = class sealed external 'java.util' name 'EntrySet' 
       end;
 
-      InnerKeySet = class sealed external 'java.util' name 'HashMap$KeySet' 
+      InnerKeySet = class sealed external 'java.util' name 'KeySet' 
       end;
 
-      InnerValues = class sealed external 'java.util' name 'HashMap$Values' 
+      InnerValues = class sealed external 'java.util' name 'Values' 
       end;
 
-      InnerKeyIterator = class sealed external 'java.util' name 'HashMap$KeyIterator' 
+      InnerKeyIterator = class sealed external 'java.util' name 'KeyIterator' 
       end;
 
-      InnerValueIterator = class sealed external 'java.util' name 'HashMap$ValueIterator' 
+      InnerValueIterator = class sealed external 'java.util' name 'ValueIterator' 
       end;
 
-      InnerEntryIterator = class sealed external 'java.util' name 'HashMap$EntryIterator' 
+      InnerEntryIterator = class sealed external 'java.util' name 'EntryIterator' 
       end;
 
-      InnerEntry = class external 'java.util' name 'HashMap$Entry' 
+      InnerEntry = class external 'java.util' name 'Entry' 
       end;
 
-      InnerHashIterator = class abstract external 'java.util' name 'HashMap$HashIterator' 
+      InnerHashIterator = class abstract external 'java.util' name 'HashIterator' 
       end;
 
   public
@@ -1773,6 +1826,15 @@
     constructor create(para1: JLThrowable); overload;
   end;
 
+  JUAbstractSet = class abstract external 'java.util' name 'AbstractSet' (JUAbstractCollection, JUSet)
+  strict protected
+    constructor create(); overload;
+  public
+    function equals(para1: JLObject): jboolean; overload; virtual;
+    function hashCode(): jint; overload; virtual;
+    function removeAll(para1: JUCollection): jboolean; overload; virtual;
+  end;
+
   JLIllegalArgumentException = class external 'java.lang' name 'IllegalArgumentException' (JLRuntimeException)
   public
     constructor create(); overload;
@@ -1787,3 +1849,31 @@
     constructor create(para1: JLString); overload;
   end;
 
+  JUEnumSet = class abstract external 'java.util' name 'EnumSet' (JUAbstractSet, JLCloneable, JISerializable)
+  public
+    type
+      InnerSerializationProxy = class;
+      Arr1InnerSerializationProxy = array of InnerSerializationProxy;
+      Arr2InnerSerializationProxy = array of Arr1InnerSerializationProxy;
+      Arr3InnerSerializationProxy = array of Arr2InnerSerializationProxy;
+      InnerSerializationProxy = class external 'java.util' name 'SerializationProxy' 
+      end;
+
+  public
+    class function noneOf(para1: JLClass): JUEnumSet; static; overload;
+    class function allOf(para1: JLClass): JUEnumSet; static; overload;
+    class function copyOf(para1: JUEnumSet): JUEnumSet; static; overload;
+    class function copyOf(para1: JUCollection): JUEnumSet; static; overload;
+    class function complementOf(para1: JUEnumSet): JUEnumSet; static; overload;
+    class function &of(para1: JLEnum): JUEnumSet; static; overload;
+    class function &of(para1: JLEnum; para2: JLEnum): JUEnumSet; static; overload;
+    class function &of(para1: JLEnum; para2: JLEnum; para3: JLEnum): JUEnumSet; static; overload;
+    class function &of(para1: JLEnum; para2: JLEnum; para3: JLEnum; para4: JLEnum): JUEnumSet; static; overload;
+    class function &of(para1: JLEnum; para2: JLEnum; para3: JLEnum; para4: JLEnum; para5: JLEnum): JUEnumSet; static; overload;
+    class function &of(para1: JLEnum; para2: Arr1JLEnum): JUEnumSet; static; overload;
+    class function &of(para1: JLEnum; var para2: array of JLEnum): JUEnumSet; static; overload;
+    class function range(para1: JLEnum; para2: JLEnum): JUEnumSet; static; overload;
+    function clone(): JUEnumSet; overload; virtual;
+    function clone(): JLObject; overload; virtual;  // throws java.lang.CloneNotSupportedException
+  end;
+

rtl/java/java_sysh.inc

@@ -1,4 +1,4 @@
-{ Imports for Java packages/classes: java.io.Serializable, java.lang.AbstractStringBuilder, java.lang.Appendable, java.lang.Boolean, java.lang.Byte, java.lang.CharSequence, java.lang.Character, java.lang.Class, java.lang.Cloneable, java.lang.Comparable, java.lang.Double, java.lang.Enum, java.lang.Error, java.lang.Exception, java.lang.Float, java.lang.IllegalArgumentException, java.lang.IndexOutOfBoundsException, java.lang.Integer, java.lang.Iterable, java.lang.LinkageError, java.lang.Long, java.lang.Number, java.lang.Object, java.lang.RuntimeException, java.lang.Short, java.lang.String, java.lang.StringBuffer, java.lang.StringBuilder, java.lang.System, java.lang.Throwable, java.lang.reflect.AnnotatedElement, java.lang.reflect.Array, java.lang.reflect.GenericDeclaration, java.lang.reflect.Type, java.text.Collator, java.util.AbstractMap, java.util.Arrays, java.util.Collection, java.util.Comparator, java.util.HashMap, java.util.Map, java.util.Set }
+{ Imports for Java packages/classes: java.io.Serializable, java.lang.AbstractStringBuilder, java.lang.Appendable, java.lang.Boolean, java.lang.Byte, java.lang.CharSequence, java.lang.Character, java.lang.Class, java.lang.Cloneable, java.lang.Comparable, java.lang.Double, java.lang.Enum, java.lang.Error, java.lang.Exception, java.lang.Float, java.lang.IllegalArgumentException, java.lang.IndexOutOfBoundsException, java.lang.Integer, java.lang.Iterable, java.lang.LinkageError, java.lang.Long, java.lang.Number, java.lang.Object, java.lang.RuntimeException, java.lang.Short, java.lang.String, java.lang.StringBuffer, java.lang.StringBuilder, java.lang.System, java.lang.Throwable, java.lang.reflect.AnnotatedElement, java.lang.reflect.Array, java.lang.reflect.GenericDeclaration, java.lang.reflect.Type, java.text.Collator, java.util.AbstractCollection, java.util.AbstractMap, java.util.AbstractSet, java.util.Arrays, java.util.BitSet, java.util.Collection, java.util.Comparator, java.util.EnumSet, java.util.HashMap, java.util.Map, java.util.Set }
 type
   JLStringBuffer = class;
   Arr1JLStringBuffer = array of JLStringBuffer;
@@ -60,16 +60,16 @@ type
   Arr2JLShort = array of Arr1JLShort;
   Arr3JLShort = array of Arr2JLShort;
 
-  JLThrowable = class;
-  Arr1JLThrowable = array of JLThrowable;
-  Arr2JLThrowable = array of Arr1JLThrowable;
-  Arr3JLThrowable = array of Arr2JLThrowable;
-
   JLInteger = class;
   Arr1JLInteger = array of JLInteger;
   Arr2JLInteger = array of Arr1JLInteger;
   Arr3JLInteger = array of Arr2JLInteger;
 
+  JLThrowable = class;
+  Arr1JLThrowable = array of JLThrowable;
+  Arr2JLThrowable = array of Arr1JLThrowable;
+  Arr3JLThrowable = array of Arr2JLThrowable;
+
   JLLinkageError = class;
   Arr1JLLinkageError = array of JLLinkageError;
   Arr2JLLinkageError = array of Arr1JLLinkageError;
@@ -80,16 +80,26 @@ type
   Arr2JLByte = array of Arr1JLByte;
   Arr3JLByte = array of Arr2JLByte;
 
-  JLRArray = class;
-  Arr1JLRArray = array of JLRArray;
-  Arr2JLRArray = array of Arr1JLRArray;
-  Arr3JLRArray = array of Arr2JLRArray;
+  JUAbstractCollection = class;
+  Arr1JUAbstractCollection = array of JUAbstractCollection;
+  Arr2JUAbstractCollection = array of Arr1JUAbstractCollection;
+  Arr3JUAbstractCollection = array of Arr2JUAbstractCollection;
 
   JUAbstractMap = class;
   Arr1JUAbstractMap = array of JUAbstractMap;
   Arr2JUAbstractMap = array of Arr1JUAbstractMap;
   Arr3JUAbstractMap = array of Arr2JUAbstractMap;
 
+  JLRArray = class;
+  Arr1JLRArray = array of JLRArray;
+  Arr2JLRArray = array of Arr1JLRArray;
+  Arr3JLRArray = array of Arr2JLRArray;
+
+  JUEnumSet = class;
+  Arr1JUEnumSet = array of JUEnumSet;
+  Arr2JUEnumSet = array of Arr1JUEnumSet;
+  Arr3JUEnumSet = array of Arr2JUEnumSet;
+
   JLException = class;
   Arr1JLException = array of JLException;
   Arr2JLException = array of Arr1JLException;
@@ -115,6 +125,11 @@ type
   Arr2JTCollator = array of Arr1JTCollator;
   Arr3JTCollator = array of Arr2JTCollator;
 
+  JUBitSet = class;
+  Arr1JUBitSet = array of JUBitSet;
+  Arr2JUBitSet = array of Arr1JUBitSet;
+  Arr3JUBitSet = array of Arr2JUBitSet;
+
   JLIllegalArgumentException = class;
   Arr1JLIllegalArgumentException = array of JLIllegalArgumentException;
   Arr2JLIllegalArgumentException = array of Arr1JLIllegalArgumentException;
@@ -130,6 +145,11 @@ type
   Arr2JLClass = array of Arr1JLClass;
   Arr3JLClass = array of Arr2JLClass;
 
+  JUAbstractSet = class;
+  Arr1JUAbstractSet = array of JUAbstractSet;
+  Arr2JUAbstractSet = array of Arr1JUAbstractSet;
+  Arr3JUAbstractSet = array of Arr2JUAbstractSet;
+
   JLFloat = class;
   Arr1JLFloat = array of JLFloat;
   Arr2JLFloat = array of Arr1JLFloat;

rtl/java/jdk15.pas

@@ -4305,16 +4305,16 @@ type
   Arr2JCKeyGeneratorSpi = array of Arr1JCKeyGeneratorSpi;
   Arr3JCKeyGeneratorSpi = array of Arr2JCKeyGeneratorSpi;
 
-  JSCX509CertSelector = class;
-  Arr1JSCX509CertSelector = array of JSCX509CertSelector;
-  Arr2JSCX509CertSelector = array of Arr1JSCX509CertSelector;
-  Arr3JSCX509CertSelector = array of Arr2JSCX509CertSelector;
-
   JUGregorianCalendar = class;
   Arr1JUGregorianCalendar = array of JUGregorianCalendar;
   Arr2JUGregorianCalendar = array of Arr1JUGregorianCalendar;
   Arr3JUGregorianCalendar = array of Arr2JUGregorianCalendar;
 
+  JSCX509CertSelector = class;
+  Arr1JSCX509CertSelector = array of JSCX509CertSelector;
+  Arr2JSCX509CertSelector = array of Arr1JSCX509CertSelector;
+  Arr3JSCX509CertSelector = array of Arr2JSCX509CertSelector;
+
   JSSECFieldFp = class;
   Arr1JSSECFieldFp = array of JSSECFieldFp;
   Arr2JSSECFieldFp = array of Arr1JSSECFieldFp;
@@ -4375,11 +4375,6 @@ type
   Arr2JNCCharacterCodingException = array of Arr1JNCCharacterCodingException;
   Arr3JNCCharacterCodingException = array of Arr2JNCCharacterCodingException;
 
-  JUEnumSet = class;
-  Arr1JUEnumSet = array of JUEnumSet;
-  Arr2JUEnumSet = array of Arr1JUEnumSet;
-  Arr3JUEnumSet = array of Arr2JUEnumSet;
-
   JIIIOParam = class;
   Arr1JIIIOParam = array of JIIIOParam;
   Arr2JIIIOParam = array of Arr1JIIIOParam;
@@ -5000,16 +4995,16 @@ type
   Arr2JUFormatter = array of Arr1JUFormatter;
   Arr3JUFormatter = array of Arr2JUFormatter;
 
-  JSBTitledBorder = class;
-  Arr1JSBTitledBorder = array of JSBTitledBorder;
-  Arr2JSBTitledBorder = array of Arr1JSBTitledBorder;
-  Arr3JSBTitledBorder = array of Arr2JSBTitledBorder;
-
   JBSimpleBeanInfo = class;
   Arr1JBSimpleBeanInfo = array of JBSimpleBeanInfo;
   Arr2JBSimpleBeanInfo = array of Arr1JBSimpleBeanInfo;
   Arr3JBSimpleBeanInfo = array of Arr2JBSimpleBeanInfo;
 
+  JSBTitledBorder = class;
+  Arr1JSBTitledBorder = array of JSBTitledBorder;
+  Arr2JSBTitledBorder = array of Arr1JSBTitledBorder;
+  Arr3JSBTitledBorder = array of Arr2JSBTitledBorder;
+
   JNDirectShortBufferRU = class;
   Arr1JNDirectShortBufferRU = array of JNDirectShortBufferRU;
   Arr2JNDirectShortBufferRU = array of Arr1JNDirectShortBufferRU;
@@ -5715,11 +5710,6 @@ type
   Arr2OOCPERSIST_STORE = array of Arr1OOCPERSIST_STORE;
   Arr3OOCPERSIST_STORE = array of Arr2OOCPERSIST_STORE;
 
-  JUBitSet = class;
-  Arr1JUBitSet = array of JUBitSet;
-  Arr2JUBitSet = array of Arr1JUBitSet;
-  Arr3JUBitSet = array of Arr2JUBitSet;
-
   JLProcess = class;
   Arr1JLProcess = array of JLProcess;
   Arr2JLProcess = array of Arr1JLProcess;
@@ -6385,16 +6375,16 @@ type
   Arr2OOCNO_MEMORY = array of Arr1OOCNO_MEMORY;
   Arr3OOCNO_MEMORY = array of Arr2OOCNO_MEMORY;
 
-  JMMBeanParameterInfo = class;
-  Arr1JMMBeanParameterInfo = array of JMMBeanParameterInfo;
-  Arr2JMMBeanParameterInfo = array of Arr1JMMBeanParameterInfo;
-  Arr3JMMBeanParameterInfo = array of Arr2JMMBeanParameterInfo;
-
   JTPatternEntry = class;
   Arr1JTPatternEntry = array of JTPatternEntry;
   Arr2JTPatternEntry = array of Arr1JTPatternEntry;
   Arr3JTPatternEntry = array of Arr2JTPatternEntry;
 
+  JMMBeanParameterInfo = class;
+  Arr1JMMBeanParameterInfo = array of JMMBeanParameterInfo;
+  Arr2JMMBeanParameterInfo = array of Arr1JMMBeanParameterInfo;
+  Arr3JMMBeanParameterInfo = array of Arr2JMMBeanParameterInfo;
+
   JRCGetORBPropertiesFileAction = class;
   Arr1JRCGetORBPropertiesFileAction = array of JRCGetORBPropertiesFileAction;
   Arr2JRCGetORBPropertiesFileAction = array of Arr1JRCGetORBPropertiesFileAction;
@@ -6665,11 +6655,6 @@ type
   Arr2OODNameValuePairSeqHelper = array of Arr1OODNameValuePairSeqHelper;
   Arr3OODNameValuePairSeqHelper = array of Arr2OODNameValuePairSeqHelper;
 
-  JUAbstractSet = class;
-  Arr1JUAbstractSet = array of JUAbstractSet;
-  Arr2JUAbstractSet = array of Arr1JUAbstractSet;
-  Arr3JUAbstractSet = array of Arr2JUAbstractSet;
-
   JPASJobMessageFromOperator = class;
   Arr1JPASJobMessageFromOperator = array of JPASJobMessageFromOperator;
   Arr2JPASJobMessageFromOperator = array of Arr1JPASJobMessageFromOperator;
@@ -6950,16 +6935,16 @@ type
   Arr2JNByteBufferAsIntBufferRL = array of Arr1JNByteBufferAsIntBufferRL;
   Arr3JNByteBufferAsIntBufferRL = array of Arr2JNByteBufferAsIntBufferRL;
 
-  JTRuleBasedCollator = class;
-  Arr1JTRuleBasedCollator = array of JTRuleBasedCollator;
-  Arr2JTRuleBasedCollator = array of Arr1JTRuleBasedCollator;
-  Arr3JTRuleBasedCollator = array of Arr2JTRuleBasedCollator;
-
   JXVSchemaFactoryLoader = class;
   Arr1JXVSchemaFactoryLoader = array of JXVSchemaFactoryLoader;
   Arr2JXVSchemaFactoryLoader = array of Arr1JXVSchemaFactoryLoader;
   Arr3JXVSchemaFactoryLoader = array of Arr2JXVSchemaFactoryLoader;
 
+  JTRuleBasedCollator = class;
+  Arr1JTRuleBasedCollator = array of JTRuleBasedCollator;
+  Arr2JTRuleBasedCollator = array of Arr1JTRuleBasedCollator;
+  Arr3JTRuleBasedCollator = array of Arr2JTRuleBasedCollator;
+
   JSPBBasicTextPaneUI = class;
   Arr1JSPBBasicTextPaneUI = array of JSPBBasicTextPaneUI;
   Arr2JSPBBasicTextPaneUI = array of Arr1JSPBBasicTextPaneUI;
@@ -13025,16 +13010,16 @@ type
   Arr2JSPBorderUIResource = array of Arr1JSPBorderUIResource;
   Arr3JSPBorderUIResource = array of Arr2JSPBorderUIResource;
 
-  JSCX509CRLSelector = class;
-  Arr1JSCX509CRLSelector = array of JSCX509CRLSelector;
-  Arr2JSCX509CRLSelector = array of Arr1JSCX509CRLSelector;
-  Arr3JSCX509CRLSelector = array of Arr2JSCX509CRLSelector;
-
   JNLSortKey = class;
   Arr1JNLSortKey = array of JNLSortKey;
   Arr2JNLSortKey = array of Arr1JNLSortKey;
   Arr3JNLSortKey = array of Arr2JNLSortKey;
 
+  JSCX509CRLSelector = class;
+  Arr1JSCX509CRLSelector = array of JSCX509CRLSelector;
+  Arr2JSCX509CRLSelector = array of Arr1JSCX509CRLSelector;
+  Arr3JSCX509CRLSelector = array of Arr2JSCX509CRLSelector;
+
   OOCINVALID_TRANSACTION = class;
   Arr1OOCINVALID_TRANSACTION = array of OOCINVALID_TRANSACTION;
   Arr2OOCINVALID_TRANSACTION = array of Arr1OOCINVALID_TRANSACTION;
@@ -14720,11 +14705,6 @@ type
   Arr2JBjava_awt_Dimension_PersistenceDelegate = array of Arr1JBjava_awt_Dimension_PersistenceDelegate;
   Arr3JBjava_awt_Dimension_PersistenceDelegate = array of Arr2JBjava_awt_Dimension_PersistenceDelegate;
 
-  JUAbstractCollection = class;
-  Arr1JUAbstractCollection = array of JUAbstractCollection;
-  Arr2JUAbstractCollection = array of Arr1JUAbstractCollection;
-  Arr3JUAbstractCollection = array of Arr2JUAbstractCollection;
-
   JUCAAtomicLongFieldUpdater = class;
   Arr1JUCAAtomicLongFieldUpdater = array of JUCAAtomicLongFieldUpdater;
   Arr2JUCAAtomicLongFieldUpdater = array of Arr1JUCAAtomicLongFieldUpdater;
@@ -20720,36 +20700,16 @@ type
   Arr2JLStringBuffer = array of Arr1JLStringBuffer;
   Arr3JLStringBuffer = array of Arr2JLStringBuffer;
 
-  JLThrowable = class external 'java.lang' name 'Throwable';
-  Arr1JLThrowable = array of JLThrowable;
-  Arr2JLThrowable = array of Arr1JLThrowable;
-  Arr3JLThrowable = array of Arr2JLThrowable;
-
-  JLInteger = class external 'java.lang' name 'Integer';
-  Arr1JLInteger = array of JLInteger;
-  Arr2JLInteger = array of Arr1JLInteger;
-  Arr3JLInteger = array of Arr2JLInteger;
-
   JLObject = class external 'java.lang' name 'Object';
   Arr1JLObject = array of JLObject;
   Arr2JLObject = array of Arr1JLObject;
   Arr3JLObject = array of Arr2JLObject;
 
-  JLLinkageError = class external 'java.lang' name 'LinkageError';
-  Arr1JLLinkageError = array of JLLinkageError;
-  Arr2JLLinkageError = array of Arr1JLLinkageError;
-  Arr3JLLinkageError = array of Arr2JLLinkageError;
-
   JLEnum = class external 'java.lang' name 'Enum';
   Arr1JLEnum = array of JLEnum;
   Arr2JLEnum = array of Arr1JLEnum;
   Arr3JLEnum = array of Arr2JLEnum;
 
-  JUAbstractMap = class external 'java.util' name 'AbstractMap';
-  Arr1JUAbstractMap = array of JUAbstractMap;
-  Arr2JUAbstractMap = array of Arr1JUAbstractMap;
-  Arr3JUAbstractMap = array of Arr2JUAbstractMap;
-
   JLError = class external 'java.lang' name 'Error';
   Arr1JLError = array of JLError;
   Arr2JLError = array of Arr1JLError;
@@ -20760,16 +20720,56 @@ type
   Arr2JLNumber = array of Arr1JLNumber;
   Arr3JLNumber = array of Arr2JLNumber;
 
-  JLException = class external 'java.lang' name 'Exception';
-  Arr1JLException = array of JLException;
-  Arr2JLException = array of Arr1JLException;
-  Arr3JLException = array of Arr2JLException;
-
   JLCharacter = class external 'java.lang' name 'Character';
   Arr1JLCharacter = array of JLCharacter;
   Arr2JLCharacter = array of Arr1JLCharacter;
   Arr3JLCharacter = array of Arr2JLCharacter;
 
+  JLBoolean = class external 'java.lang' name 'Boolean';
+  Arr1JLBoolean = array of JLBoolean;
+  Arr2JLBoolean = array of Arr1JLBoolean;
+  Arr3JLBoolean = array of Arr2JLBoolean;
+
+  JLLong = class external 'java.lang' name 'Long';
+  Arr1JLLong = array of JLLong;
+  Arr2JLLong = array of Arr1JLLong;
+  Arr3JLLong = array of Arr2JLLong;
+
+  JLInteger = class external 'java.lang' name 'Integer';
+  Arr1JLInteger = array of JLInteger;
+  Arr2JLInteger = array of Arr1JLInteger;
+  Arr3JLInteger = array of Arr2JLInteger;
+
+  JLThrowable = class external 'java.lang' name 'Throwable';
+  Arr1JLThrowable = array of JLThrowable;
+  Arr2JLThrowable = array of Arr1JLThrowable;
+  Arr3JLThrowable = array of Arr2JLThrowable;
+
+  JLLinkageError = class external 'java.lang' name 'LinkageError';
+  Arr1JLLinkageError = array of JLLinkageError;
+  Arr2JLLinkageError = array of Arr1JLLinkageError;
+  Arr3JLLinkageError = array of Arr2JLLinkageError;
+
+  JUAbstractCollection = class external 'java.util' name 'AbstractCollection';
+  Arr1JUAbstractCollection = array of JUAbstractCollection;
+  Arr2JUAbstractCollection = array of Arr1JUAbstractCollection;
+  Arr3JUAbstractCollection = array of Arr2JUAbstractCollection;
+
+  JUAbstractMap = class external 'java.util' name 'AbstractMap';
+  Arr1JUAbstractMap = array of JUAbstractMap;
+  Arr2JUAbstractMap = array of Arr1JUAbstractMap;
+  Arr3JUAbstractMap = array of Arr2JUAbstractMap;
+
+  JUEnumSet = class external 'java.util' name 'EnumSet';
+  Arr1JUEnumSet = array of JUEnumSet;
+  Arr2JUEnumSet = array of Arr1JUEnumSet;
+  Arr3JUEnumSet = array of Arr2JUEnumSet;
+
+  JLException = class external 'java.lang' name 'Exception';
+  Arr1JLException = array of JLException;
+  Arr2JLException = array of Arr1JLException;
+  Arr3JLException = array of Arr2JLException;
+
   JLIndexOutOfBoundsException = class external 'java.lang' name 'IndexOutOfBoundsException';
   Arr1JLIndexOutOfBoundsException = array of JLIndexOutOfBoundsException;
   Arr2JLIndexOutOfBoundsException = array of Arr1JLIndexOutOfBoundsException;
@@ -20785,36 +20785,36 @@ type
   Arr2JTCollator = array of Arr1JTCollator;
   Arr3JTCollator = array of Arr2JTCollator;
 
-  JLBoolean = class external 'java.lang' name 'Boolean';
-  Arr1JLBoolean = array of JLBoolean;
-  Arr2JLBoolean = array of Arr1JLBoolean;
-  Arr3JLBoolean = array of Arr2JLBoolean;
+  JUBitSet = class external 'java.util' name 'BitSet';
+  Arr1JUBitSet = array of JUBitSet;
+  Arr2JUBitSet = array of Arr1JUBitSet;
+  Arr3JUBitSet = array of Arr2JUBitSet;
 
-  JLClass = class external 'java.lang' name 'Class';
-  Arr1JLClass = array of JLClass;
-  Arr2JLClass = array of Arr1JLClass;
-  Arr3JLClass = array of Arr2JLClass;
+  JLIllegalArgumentException = class external 'java.lang' name 'IllegalArgumentException';
+  Arr1JLIllegalArgumentException = array of JLIllegalArgumentException;
+  Arr2JLIllegalArgumentException = array of Arr1JLIllegalArgumentException;
+  Arr3JLIllegalArgumentException = array of Arr2JLIllegalArgumentException;
+
+  JUAbstractSet = class external 'java.util' name 'AbstractSet';
+  Arr1JUAbstractSet = array of JUAbstractSet;
+  Arr2JUAbstractSet = array of Arr1JUAbstractSet;
+  Arr3JUAbstractSet = array of Arr2JUAbstractSet;
 
   JLString = class external 'java.lang' name 'String';
   Arr1JLString = array of JLString;
   Arr2JLString = array of Arr1JLString;
   Arr3JLString = array of Arr2JLString;
 
-  JLIllegalArgumentException = class external 'java.lang' name 'IllegalArgumentException';
-  Arr1JLIllegalArgumentException = array of JLIllegalArgumentException;
-  Arr2JLIllegalArgumentException = array of Arr1JLIllegalArgumentException;
-  Arr3JLIllegalArgumentException = array of Arr2JLIllegalArgumentException;
+  JLClass = class external 'java.lang' name 'Class';
+  Arr1JLClass = array of JLClass;
+  Arr2JLClass = array of Arr1JLClass;
+  Arr3JLClass = array of Arr2JLClass;
 
   JLFloat = class external 'java.lang' name 'Float';
   Arr1JLFloat = array of JLFloat;
   Arr2JLFloat = array of Arr1JLFloat;
   Arr3JLFloat = array of Arr2JLFloat;
 
-  JLLong = class external 'java.lang' name 'Long';
-  Arr1JLLong = array of JLLong;
-  Arr2JLLong = array of Arr1JLLong;
-  Arr3JLLong = array of Arr2JLLong;
-
   JLRuntimeException = class external 'java.lang' name 'RuntimeException';
   Arr1JLRuntimeException = array of JLRuntimeException;
   Arr2JLRuntimeException = array of Arr1JLRuntimeException;