* reparsed with new version of javapp that doesn't mark final static

    methods as "virtual" anymore (since they're not virtual, and the
    compiler now handles virtual class methods differently)

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

rtl/java/java_sys.inc

@@ -701,7 +701,7 @@
       public
         class function &of(para1: jchar): JLCharacter.InnerUnicodeBlock; static; overload;
         class function &of(para1: jint): JLCharacter.InnerUnicodeBlock; static; overload;
-        class function forName(para1: JLString): JLCharacter.InnerUnicodeBlock; static; overload; virtual; final;
+        class function forName(para1: JLString): JLCharacter.InnerUnicodeBlock; static; overload; final;
       end;
 
   public

rtl/java/jdk15.inc

@@ -2496,16 +2496,6 @@
     function invoke(para1: JLObject; para2: JLRMethod; var para3: array of JLObject): JLObject; overload;  // throws java.lang.Throwable
   end;
 
-  JLRMember = interface external 'java.lang.reflect' name 'Member' 
-    const
-      &PUBLIC = 0;
-      DECLARED = 1;
-    function getDeclaringClass(): JLClass; overload;
-    function getName(): JLString; overload;
-    function getModifiers(): jint; overload;
-    function isSynthetic(): jboolean; overload;
-  end;
-
   JLRModifier = class external 'java.lang.reflect' name 'Modifier' (JLObject)
   public
     const
@@ -3695,7 +3685,7 @@
     function getProvider(): JSProvider; overload; virtual; final;
     function getAlgorithm(): JLString; overload; virtual; final;
     function build(para1: JSCCertPathParameters): JSCCertPathBuilderResult; overload; virtual; final;  // throws java.security.cert.CertPathBuilderException, java.security.InvalidAlgorithmParameterException
-    class function getDefaultType(): JLString; static; overload; virtual; final;
+    class function getDefaultType(): JLString; static; overload; final;
   end;
 
   JSCCertPathBuilderSpi = class abstract external 'java.security.cert' name 'CertPathBuilderSpi' (JLObject)
@@ -3714,7 +3704,7 @@
     function getProvider(): JSProvider; overload; virtual; final;
     function getAlgorithm(): JLString; overload; virtual; final;
     function validate(para1: JSCCertPath; para2: JSCCertPathParameters): JSCCertPathValidatorResult; overload; virtual; final;  // throws java.security.cert.CertPathValidatorException, java.security.InvalidAlgorithmParameterException
-    class function getDefaultType(): JLString; static; overload; virtual; final;
+    class function getDefaultType(): JLString; static; overload; final;
   end;
 
   JSCCertPathValidatorSpi = class abstract external 'java.security.cert' name 'CertPathValidatorSpi' (JLObject)
@@ -3735,7 +3725,7 @@
     function getCertStoreParameters(): JSCCertStoreParameters; overload; virtual; final;
     function getType(): JLString; overload; virtual; final;
     function getProvider(): JSProvider; overload; virtual; final;
-    class function getDefaultType(): JLString; static; overload; virtual; final;
+    class function getDefaultType(): JLString; static; overload; final;
   end;
 
   JSCCertStoreSpi = class abstract external 'java.security.cert' name 'CertStoreSpi' (JLObject)
@@ -3749,9 +3739,9 @@
   strict protected
     constructor create(para1: JSCCertificateFactorySpi; para2: JSProvider; para3: JLString); overload;
   public
-    class function getInstance(para1: JLString): JSCCertificateFactory; static; overload; virtual; final;  // throws java.security.cert.CertificateException
-    class function getInstance(para1: JLString; para2: JLString): JSCCertificateFactory; static; overload; virtual; final;  // throws java.security.cert.CertificateException, java.security.NoSuchProviderException
-    class function getInstance(para1: JLString; para2: JSProvider): JSCCertificateFactory; static; overload; virtual; final;  // throws java.security.cert.CertificateException
+    class function getInstance(para1: JLString): JSCCertificateFactory; static; overload; final;  // throws java.security.cert.CertificateException
+    class function getInstance(para1: JLString; para2: JLString): JSCCertificateFactory; static; overload; final;  // throws java.security.cert.CertificateException, java.security.NoSuchProviderException
+    class function getInstance(para1: JLString; para2: JSProvider): JSCCertificateFactory; static; overload; final;  // throws java.security.cert.CertificateException
     function getProvider(): JSProvider; overload; virtual; final;
     function getType(): JLString; overload; virtual; final;
     function generateCertificate(para1: JIInputStream): JSCCertificate; overload; virtual; final;  // throws java.security.cert.CertificateException
@@ -4180,9 +4170,9 @@
     procedure reset(); overload; virtual;
     function next(): jint; overload; virtual;
     function previous(): jint; overload; virtual;
-    class function primaryOrder(para1: jint): jint; static; overload; virtual; final;
-    class function secondaryOrder(para1: jint): jshort; static; overload; virtual; final;
-    class function tertiaryOrder(para1: jint): jshort; static; overload; virtual; final;
+    class function primaryOrder(para1: jint): jint; static; overload; final;
+    class function secondaryOrder(para1: jint): jshort; static; overload; final;
+    class function tertiaryOrder(para1: jint): jshort; static; overload; final;
     procedure setOffset(para1: jint); overload; virtual;
     function getOffset(): jint; overload; virtual;
     function getMaxExpansion(para1: jint): jint; overload; virtual;
@@ -4576,9 +4566,9 @@
     class function checkedList(para1: JUList; para2: JLClass): JUList; static; overload;
     class function checkedMap(para1: JUMap; para2: JLClass; para3: JLClass): JUMap; static; overload;
     class function checkedSortedMap(para1: JUSortedMap; para2: JLClass; para3: JLClass): JUSortedMap; static; overload;
-    class function emptySet(): JUSet; static; overload; virtual; final;
-    class function emptyList(): JUList; static; overload; virtual; final;
-    class function emptyMap(): JUMap; static; overload; virtual; final;
+    class function emptySet(): JUSet; static; overload; final;
+    class function emptyList(): JUList; static; overload; final;
+    class function emptyMap(): JUMap; static; overload; final;
     class function singleton(para1: JLObject): JUSet; static; overload;
     class function singletonList(para1: JLObject): JUList; static; overload;
     class function singletonMap(para1: JLObject; para2: JLObject): JUMap; static; overload;
@@ -4727,8 +4717,8 @@
       strict protected
         constructor create(); overload;
       public
-        class function getControl(para1: JUList): JUResourceBundle.InnerControl; static; overload; virtual; final;
-        class function getNoFallbackControl(para1: JUList): JUResourceBundle.InnerControl; static; overload; virtual; final;
+        class function getControl(para1: JUList): JUResourceBundle.InnerControl; static; overload; final;
+        class function getNoFallbackControl(para1: JUList): JUResourceBundle.InnerControl; static; overload; final;
         function getFormats(para1: JLString): JUList; overload; virtual;
         function getCandidateLocales(para1: JLString; para2: JULocale): JUList; overload; virtual;
         function getFallbackLocale(para1: JLString; para2: JULocale): JULocale; overload; virtual;
@@ -4751,14 +4741,14 @@
   strict protected
     procedure setParent(para1: JUResourceBundle); overload; virtual;
   public
-    class function getBundle(para1: JLString): JUResourceBundle; static; overload; virtual; final;
-    class function getBundle(para1: JLString; para2: JUResourceBundle.InnerControl): JUResourceBundle; static; overload; virtual; final;
-    class function getBundle(para1: JLString; para2: JULocale): JUResourceBundle; static; overload; virtual; final;
-    class function getBundle(para1: JLString; para2: JULocale; para3: JUResourceBundle.InnerControl): JUResourceBundle; static; overload; virtual; final;
+    class function getBundle(para1: JLString): JUResourceBundle; static; overload; final;
+    class function getBundle(para1: JLString; para2: JUResourceBundle.InnerControl): JUResourceBundle; static; overload; final;
+    class function getBundle(para1: JLString; para2: JULocale): JUResourceBundle; static; overload; final;
+    class function getBundle(para1: JLString; para2: JULocale; para3: JUResourceBundle.InnerControl): JUResourceBundle; static; overload; final;
     class function getBundle(para1: JLString; para2: JULocale; para3: JLClassLoader): JUResourceBundle; static; overload;
     class function getBundle(para1: JLString; para2: JULocale; para3: JLClassLoader; para4: JUResourceBundle.InnerControl): JUResourceBundle; static; overload;
-    class procedure clearCache(); static; overload; virtual; final;
-    class procedure clearCache(para1: JLClassLoader); static; overload; virtual; final;
+    class procedure clearCache(); static; overload; final;
+    class procedure clearCache(para1: JLClassLoader); static; overload; final;
   strict protected
     function handleGetObject(para1: JLString): JLObject; overload; virtual; abstract;
   public
@@ -6068,9 +6058,9 @@
   strict protected
     constructor create(para1: JCCipherSpi; para2: JSProvider; para3: JLString); overload;
   public
-    class function getInstance(para1: JLString): JCCipher; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException, javax.crypto.NoSuchPaddingException
-    class function getInstance(para1: JLString; para2: JLString): JCCipher; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, javax.crypto.NoSuchPaddingException
-    class function getInstance(para1: JLString; para2: JSProvider): JCCipher; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException, javax.crypto.NoSuchPaddingException
+    class function getInstance(para1: JLString): JCCipher; static; overload; final;  // throws java.security.NoSuchAlgorithmException, javax.crypto.NoSuchPaddingException
+    class function getInstance(para1: JLString; para2: JLString): JCCipher; static; overload; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, javax.crypto.NoSuchPaddingException
+    class function getInstance(para1: JLString; para2: JSProvider): JCCipher; static; overload; final;  // throws java.security.NoSuchAlgorithmException, javax.crypto.NoSuchPaddingException
     function getProvider(): JSProvider; overload; virtual; final;
     function getAlgorithm(): JLString; overload; virtual; final;
     function getBlockSize(): jint; overload; virtual; final;
@@ -6110,8 +6100,8 @@
     function wrap(para1: JSKey): Arr1jbyte; overload; virtual; final;  // throws javax.crypto.IllegalBlockSizeException, java.security.InvalidKeyException
     function unwrap(para1: Arr1jbyte; para2: JLString; para3: jint): JSKey; overload; virtual; final;  // throws java.security.InvalidKeyException, java.security.NoSuchAlgorithmException
     function unwrap(var para1: array of jbyte; para2: JLString; para3: jint): JSKey; overload; virtual; final;  // throws java.security.InvalidKeyException, java.security.NoSuchAlgorithmException
-    class function getMaxAllowedKeyLength(para1: JLString): jint; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
-    class function getMaxAllowedParameterSpec(para1: JLString): JSSAlgorithmParameterSpec; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
+    class function getMaxAllowedKeyLength(para1: JLString): jint; static; overload; final;  // throws java.security.NoSuchAlgorithmException
+    class function getMaxAllowedParameterSpec(para1: JLString): JSSAlgorithmParameterSpec; static; overload; final;  // throws java.security.NoSuchAlgorithmException
   end;
 
   JCCipherSpi = class abstract external 'javax.crypto' name 'CipherSpi' (JLObject)
@@ -6166,9 +6156,9 @@
     constructor create(para1: JCExemptionMechanismSpi; para2: JSProvider; para3: JLString); overload;
   public
     function getName(): JLString; overload; virtual; final;
-    class function getInstance(para1: JLString): JCExemptionMechanism; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
-    class function getInstance(para1: JLString; para2: JLString): JCExemptionMechanism; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
-    class function getInstance(para1: JLString; para2: JSProvider): JCExemptionMechanism; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString): JCExemptionMechanism; static; overload; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString; para2: JLString): JCExemptionMechanism; static; overload; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
+    class function getInstance(para1: JLString; para2: JSProvider): JCExemptionMechanism; static; overload; final;  // throws java.security.NoSuchAlgorithmException
     function getProvider(): JSProvider; overload; virtual; final;
     function isCryptoAllowed(para1: JSKey): jboolean; overload; virtual; final;  // throws javax.crypto.ExemptionMechanismException
     function getOutputSize(para1: jint): jint; overload; virtual; final;  // throws java.lang.IllegalStateException
@@ -6202,9 +6192,9 @@
     constructor create(para1: JCKeyAgreementSpi; para2: JSProvider; para3: JLString); overload;
   public
     function getAlgorithm(): JLString; overload; virtual; final;
-    class function getInstance(para1: JLString): JCKeyAgreement; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
-    class function getInstance(para1: JLString; para2: JLString): JCKeyAgreement; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
-    class function getInstance(para1: JLString; para2: JSProvider): JCKeyAgreement; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString): JCKeyAgreement; static; overload; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString; para2: JLString): JCKeyAgreement; static; overload; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
+    class function getInstance(para1: JLString; para2: JSProvider): JCKeyAgreement; static; overload; final;  // throws java.security.NoSuchAlgorithmException
     function getProvider(): JSProvider; overload; virtual; final;
     procedure init(para1: JSKey); overload; virtual; final;  // throws java.security.InvalidKeyException
     procedure init(para1: JSKey; para2: JSSecureRandom); overload; virtual; final;  // throws java.security.InvalidKeyException
@@ -6235,9 +6225,9 @@
     constructor create(para1: JCKeyGeneratorSpi; para2: JSProvider; para3: JLString); overload;
   public
     function getAlgorithm(): JLString; overload; virtual; final;
-    class function getInstance(para1: JLString): JCKeyGenerator; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
-    class function getInstance(para1: JLString; para2: JLString): JCKeyGenerator; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
-    class function getInstance(para1: JLString; para2: JSProvider): JCKeyGenerator; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString): JCKeyGenerator; static; overload; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString; para2: JLString): JCKeyGenerator; static; overload; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
+    class function getInstance(para1: JLString; para2: JSProvider): JCKeyGenerator; static; overload; final;  // throws java.security.NoSuchAlgorithmException
     function getProvider(): JSProvider; overload; virtual; final;
     procedure init(para1: JSSecureRandom); overload; virtual; final;
     procedure init(para1: JSSAlgorithmParameterSpec); overload; virtual; final;  // throws java.security.InvalidAlgorithmParameterException
@@ -6277,9 +6267,9 @@
   strict protected
     constructor create(para1: JCSecretKeyFactorySpi; para2: JSProvider; para3: JLString); overload;
   public
-    class function getInstance(para1: JLString): JCSecretKeyFactory; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
-    class function getInstance(para1: JLString; para2: JLString): JCSecretKeyFactory; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
-    class function getInstance(para1: JLString; para2: JSProvider): JCSecretKeyFactory; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString): JCSecretKeyFactory; static; overload; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString; para2: JLString): JCSecretKeyFactory; static; overload; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
+    class function getInstance(para1: JLString; para2: JSProvider): JCSecretKeyFactory; static; overload; final;  // throws java.security.NoSuchAlgorithmException
     function getProvider(): JSProvider; overload; virtual; final;
     function getAlgorithm(): JLString; overload; virtual; final;
     function generateSecret(para1: JSSKeySpec): JCSecretKey; overload; virtual; final;  // throws java.security.spec.InvalidKeySpecException
@@ -7722,14 +7712,14 @@
 
   JNSKeyManagerFactory = class external 'javax.net.ssl' name 'KeyManagerFactory' (JLObject)
   public
-    class function getDefaultAlgorithm(): JLString; static; overload; virtual; final;
+    class function getDefaultAlgorithm(): JLString; static; overload; final;
   strict protected
     constructor create(para1: JNSKeyManagerFactorySpi; para2: JSProvider; para3: JLString); overload;
   public
     function getAlgorithm(): JLString; overload; virtual; final;
-    class function getInstance(para1: JLString): JNSKeyManagerFactory; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
-    class function getInstance(para1: JLString; para2: JLString): JNSKeyManagerFactory; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
-    class function getInstance(para1: JLString; para2: JSProvider): JNSKeyManagerFactory; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString): JNSKeyManagerFactory; static; overload; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString; para2: JLString): JNSKeyManagerFactory; static; overload; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
+    class function getInstance(para1: JLString; para2: JSProvider): JNSKeyManagerFactory; static; overload; final;  // throws java.security.NoSuchAlgorithmException
     function getProvider(): JSProvider; overload; virtual; final;
     procedure init(para1: JSKeyStore; para2: Arr1jchar); overload; virtual; final;  // throws java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException
     procedure init(para1: JSKeyStore; var para2: array of jchar); overload; virtual; final;  // throws java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException
@@ -7847,14 +7837,14 @@
 
   JNSTrustManagerFactory = class external 'javax.net.ssl' name 'TrustManagerFactory' (JLObject)
   public
-    class function getDefaultAlgorithm(): JLString; static; overload; virtual; final;
+    class function getDefaultAlgorithm(): JLString; static; overload; final;
   strict protected
     constructor create(para1: JNSTrustManagerFactorySpi; para2: JSProvider; para3: JLString); overload;
   public
     function getAlgorithm(): JLString; overload; virtual; final;
-    class function getInstance(para1: JLString): JNSTrustManagerFactory; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
-    class function getInstance(para1: JLString; para2: JLString): JNSTrustManagerFactory; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
-    class function getInstance(para1: JLString; para2: JSProvider): JNSTrustManagerFactory; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString): JNSTrustManagerFactory; static; overload; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString; para2: JLString): JNSTrustManagerFactory; static; overload; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
+    class function getInstance(para1: JLString; para2: JSProvider): JNSTrustManagerFactory; static; overload; final;  // throws java.security.NoSuchAlgorithmException
     function getProvider(): JSProvider; overload; virtual; final;
     procedure init(para1: JSKeyStore); overload; virtual; final;  // throws java.security.KeyStoreException
     procedure init(para1: JNSManagerFactoryParameters); overload; virtual; final;  // throws java.security.InvalidAlgorithmParameterException
@@ -7934,10 +7924,10 @@
 
   public
     constructor create(); overload;
-    class function lookupPrintServices(para1: JPDocFlavor; para2: JPAAttributeSet): Arr1JPPrintService; static; overload; virtual; final;
-    class function lookupMultiDocPrintServices(para1: Arr1JPDocFlavor; para2: JPAAttributeSet): Arr1JPMultiDocPrintService; static; overload; virtual; final;
-    class function lookupMultiDocPrintServices(var para1: array of JPDocFlavor; para2: JPAAttributeSet): Arr1JPMultiDocPrintService; static; overload; virtual; final;
-    class function lookupDefaultPrintService(): JPPrintService; static; overload; virtual; final;
+    class function lookupPrintServices(para1: JPDocFlavor; para2: JPAAttributeSet): Arr1JPPrintService; static; overload; final;
+    class function lookupMultiDocPrintServices(para1: Arr1JPDocFlavor; para2: JPAAttributeSet): Arr1JPMultiDocPrintService; static; overload; final;
+    class function lookupMultiDocPrintServices(var para1: array of JPDocFlavor; para2: JPAAttributeSet): Arr1JPMultiDocPrintService; static; overload; final;
+    class function lookupDefaultPrintService(): JPPrintService; static; overload; final;
     class function registerServiceProvider(para1: JPPrintServiceLookup): jboolean; static; overload;
     class function registerService(para1: JPPrintService): jboolean; static; overload;
     function getPrintServices(para1: JPDocFlavor; para2: JPAAttributeSet): Arr1JPPrintService; overload; virtual; abstract;
@@ -10590,20 +10580,20 @@
   JSTUtilities = class external 'javax.swing.text' name 'Utilities' (JLObject)
   public
     constructor create(); overload;
-    class function drawTabbedText(para1: JSTSegment; para2: jint; para3: jint; para4: JAGraphics; para5: JSTTabExpander; para6: jint): jint; static; overload; virtual; final;
-    class function getTabbedTextWidth(para1: JSTSegment; para2: JAFontMetrics; para3: jint; para4: JSTTabExpander; para5: jint): jint; static; overload; virtual; final;
-    class function getTabbedTextOffset(para1: JSTSegment; para2: JAFontMetrics; para3: jint; para4: jint; para5: JSTTabExpander; para6: jint): jint; static; overload; virtual; final;
-    class function getTabbedTextOffset(para1: JSTSegment; para2: JAFontMetrics; para3: jint; para4: jint; para5: JSTTabExpander; para6: jint; para7: jboolean): jint; static; overload; virtual; final;
-    class function getBreakLocation(para1: JSTSegment; para2: JAFontMetrics; para3: jint; para4: jint; para5: JSTTabExpander; para6: jint): jint; static; overload; virtual; final;
-    class function getRowStart(para1: JSTJTextComponent; para2: jint): jint; static; overload; virtual; final;  // throws javax.swing.text.BadLocationException
-    class function getRowEnd(para1: JSTJTextComponent; para2: jint): jint; static; overload; virtual; final;  // throws javax.swing.text.BadLocationException
-    class function getPositionAbove(para1: JSTJTextComponent; para2: jint; para3: jint): jint; static; overload; virtual; final;  // throws javax.swing.text.BadLocationException
-    class function getPositionBelow(para1: JSTJTextComponent; para2: jint; para3: jint): jint; static; overload; virtual; final;  // throws javax.swing.text.BadLocationException
-    class function getWordStart(para1: JSTJTextComponent; para2: jint): jint; static; overload; virtual; final;  // throws javax.swing.text.BadLocationException
-    class function getWordEnd(para1: JSTJTextComponent; para2: jint): jint; static; overload; virtual; final;  // throws javax.swing.text.BadLocationException
-    class function getNextWord(para1: JSTJTextComponent; para2: jint): jint; static; overload; virtual; final;  // throws javax.swing.text.BadLocationException
-    class function getPreviousWord(para1: JSTJTextComponent; para2: jint): jint; static; overload; virtual; final;  // throws javax.swing.text.BadLocationException
-    class function getParagraphElement(para1: JSTJTextComponent; para2: jint): JSTElement; static; overload; virtual; final;
+    class function drawTabbedText(para1: JSTSegment; para2: jint; para3: jint; para4: JAGraphics; para5: JSTTabExpander; para6: jint): jint; static; overload; final;
+    class function getTabbedTextWidth(para1: JSTSegment; para2: JAFontMetrics; para3: jint; para4: JSTTabExpander; para5: jint): jint; static; overload; final;
+    class function getTabbedTextOffset(para1: JSTSegment; para2: JAFontMetrics; para3: jint; para4: jint; para5: JSTTabExpander; para6: jint): jint; static; overload; final;
+    class function getTabbedTextOffset(para1: JSTSegment; para2: JAFontMetrics; para3: jint; para4: jint; para5: JSTTabExpander; para6: jint; para7: jboolean): jint; static; overload; final;
+    class function getBreakLocation(para1: JSTSegment; para2: JAFontMetrics; para3: jint; para4: jint; para5: JSTTabExpander; para6: jint): jint; static; overload; final;
+    class function getRowStart(para1: JSTJTextComponent; para2: jint): jint; static; overload; final;  // throws javax.swing.text.BadLocationException
+    class function getRowEnd(para1: JSTJTextComponent; para2: jint): jint; static; overload; final;  // throws javax.swing.text.BadLocationException
+    class function getPositionAbove(para1: JSTJTextComponent; para2: jint; para3: jint): jint; static; overload; final;  // throws javax.swing.text.BadLocationException
+    class function getPositionBelow(para1: JSTJTextComponent; para2: jint; para3: jint): jint; static; overload; final;  // throws javax.swing.text.BadLocationException
+    class function getWordStart(para1: JSTJTextComponent; para2: jint): jint; static; overload; final;  // throws javax.swing.text.BadLocationException
+    class function getWordEnd(para1: JSTJTextComponent; para2: jint): jint; static; overload; final;  // throws javax.swing.text.BadLocationException
+    class function getNextWord(para1: JSTJTextComponent; para2: jint): jint; static; overload; final;  // throws javax.swing.text.BadLocationException
+    class function getPreviousWord(para1: JSTJTextComponent; para2: jint): jint; static; overload; final;  // throws javax.swing.text.BadLocationException
+    class function getParagraphElement(para1: JSTJTextComponent; para2: jint): JSTElement; static; overload; final;
   end;
 
   JSTViewFactory = interface external 'javax.swing.text' name 'ViewFactory' 
@@ -11300,10 +11290,10 @@
     class function trim(para1: JLCharSequence): JLCharSequence; static; overload;
     class function collapse(para1: JLString): JLString; static; overload;
     class function collapse(para1: JLCharSequence): JLCharSequence; static; overload;
-    class function isWhiteSpace(para1: JLCharSequence): jboolean; static; overload; virtual; final;
-    class function isWhiteSpace(para1: jchar): jboolean; static; overload; virtual; final;
+    class function isWhiteSpace(para1: JLCharSequence): jboolean; static; overload; final;
+    class function isWhiteSpace(para1: jchar): jboolean; static; overload; final;
   strict protected
-    class function isWhiteSpaceExceptSpace(para1: jchar): jboolean; static; overload; virtual; final;
+    class function isWhiteSpaceExceptSpace(para1: jchar): jboolean; static; overload; final;
   end;
 
   JXBADomHandler = interface external 'javax.xml.bind.annotation' name 'DomHandler' 
@@ -12244,7 +12234,7 @@
   strict protected
     constructor create(); overload;
   public
-    class function newInstance(para1: JLString): JXVSchemaFactory; static; overload; virtual; final;
+    class function newInstance(para1: JLString): JXVSchemaFactory; static; overload; final;
     class function newInstance(para1: JLString; para2: JLString; para3: JLClassLoader): JXVSchemaFactory; static; overload;
     function isSchemaLanguageSupported(para1: JLString): jboolean; overload; virtual; abstract;
     function getFeature(para1: JLString): jboolean; overload; virtual;  // throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException
@@ -12518,8 +12508,8 @@
   strict protected
     constructor create(); overload;
   public
-    class function newInstance(): JXXXPathFactory; static; overload; virtual; final;
-    class function newInstance(para1: JLString): JXXXPathFactory; static; overload; virtual; final;  // throws javax.xml.xpath.XPathFactoryConfigurationException
+    class function newInstance(): JXXXPathFactory; static; overload; final;
+    class function newInstance(para1: JLString): JXXXPathFactory; static; overload; final;  // throws javax.xml.xpath.XPathFactoryConfigurationException
     class function newInstance(para1: JLString; para2: JLString; para3: JLClassLoader): JXXXPathFactory; static; overload;  // throws javax.xml.xpath.XPathFactoryConfigurationException
     function isObjectModelSupported(para1: JLString): jboolean; overload; virtual; abstract;
     procedure setFeature(para1: JLString; para2: jboolean); overload; virtual; abstract;  // throws javax.xml.xpath.XPathFactoryConfigurationException
@@ -19711,7 +19701,7 @@
   public
     constructor create(); overload;
     class function getAllAttributeKeys(): JSTHCSS.Arr1InnerAttribute; static; overload;
-    class function getAttribute(para1: JLString): JSTHCSS.InnerAttribute; static; overload; virtual; final;
+    class function getAttribute(para1: JLString): JSTHCSS.InnerAttribute; static; overload; final;
   end;
 
   JSTHHTML = class external 'javax.swing.text.html' name 'HTML' (JLObject)
@@ -20756,8 +20746,8 @@
     constructor create(); overload;
     constructor create(para1: JULocale); overload;
     class function getAvailableLocales(): Arr1JULocale; static; overload;
-    class function getInstance(): JTDateFormatSymbols; static; overload; virtual; final;
-    class function getInstance(para1: JULocale): JTDateFormatSymbols; static; overload; virtual; final;
+    class function getInstance(): JTDateFormatSymbols; static; overload; final;
+    class function getInstance(para1: JULocale): JTDateFormatSymbols; static; overload; final;
     function getEras(): Arr1JLString; overload; virtual;
     procedure setEras(para1: Arr1JLString); overload; virtual;
     procedure setEras(var para1: array of JLString); overload; virtual;
@@ -20799,8 +20789,8 @@
     constructor create(); overload;
     constructor create(para1: JULocale); overload;
     class function getAvailableLocales(): Arr1JULocale; static; overload;
-    class function getInstance(): JTDecimalFormatSymbols; static; overload; virtual; final;
-    class function getInstance(para1: JULocale): JTDecimalFormatSymbols; static; overload; virtual; final;
+    class function getInstance(): JTDecimalFormatSymbols; static; overload; final;
+    class function getInstance(para1: JULocale): JTDecimalFormatSymbols; static; overload; final;
     function getZeroDigit(): jchar; overload; virtual;
     procedure setZeroDigit(para1: jchar); overload; virtual;
     function getGroupingSeparator(): jchar; overload; virtual;
@@ -20990,9 +20980,9 @@
     constructor create(para1: JCMacSpi; para2: JSProvider; para3: JLString); overload;
   public
     function getAlgorithm(): JLString; overload; virtual; final;
-    class function getInstance(para1: JLString): JCMac; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
-    class function getInstance(para1: JLString; para2: JLString): JCMac; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
-    class function getInstance(para1: JLString; para2: JSProvider): JCMac; static; overload; virtual; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString): JCMac; static; overload; final;  // throws java.security.NoSuchAlgorithmException
+    class function getInstance(para1: JLString; para2: JLString): JCMac; static; overload; final;  // throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException
+    class function getInstance(para1: JLString; para2: JSProvider): JCMac; static; overload; final;  // throws java.security.NoSuchAlgorithmException
     function getProvider(): JSProvider; overload; virtual; final;
     function getMacLength(): jint; overload; virtual; final;
     procedure init(para1: JSKey); overload; virtual; final;  // throws java.security.InvalidKeyException
@@ -24040,18 +24030,61 @@
     function getDeclaredAnnotations(): Arr1JLAAnnotation; overload; virtual;
   end;
 
-  JLRAccessibleObject = class external 'java.lang.reflect' name 'AccessibleObject' (JLObject, JLRAnnotatedElement)
+  JLRConstructor = class sealed external 'java.lang.reflect' name 'Constructor' (JLRAccessibleObject, JLRGenericDeclaration, JLRMember)
   public
-    class procedure setAccessible(para1: Arr1JLRAccessibleObject; para2: jboolean); static; overload;  // throws java.lang.SecurityException
-    class procedure setAccessible(var para1: array of JLRAccessibleObject; para2: jboolean); static; overload;  // throws java.lang.SecurityException
-    procedure setAccessible(para1: jboolean); overload; virtual;  // throws java.lang.SecurityException
-    function isAccessible(): jboolean; overload; virtual;
-  strict protected
-    constructor create(); overload;
+    function getDeclaringClass(): JLClass; overload; virtual;
+    function getName(): JLString; overload; virtual;
+    function getModifiers(): jint; overload; virtual;
+    function getTypeParameters(): Arr1JLRTypeVariable; overload; virtual;
+    function getParameterTypes(): Arr1JLClass; overload; virtual;
+    function getGenericParameterTypes(): Arr1JLRType; overload; virtual;
+    function getExceptionTypes(): Arr1JLClass; overload; virtual;
+    function getGenericExceptionTypes(): Arr1JLRType; overload; virtual;
+    function equals(para1: JLObject): jboolean; overload; virtual;
+    function hashCode(): jint; overload; virtual;
+    function toString(): JLString; overload; virtual;
+    function toGenericString(): JLString; overload; virtual;
+    function newInstance(para1: Arr1JLObject): JLObject; overload; virtual;  // throws java.lang.InstantiationException, java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException
+    function newInstance(const para1: array of JLObject): JLObject; overload; virtual;  // throws java.lang.InstantiationException, java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException
+    function isVarArgs(): jboolean; overload; virtual;
+    function isSynthetic(): jboolean; overload; virtual;
+    function getAnnotation(para1: JLClass): JLAAnnotation; overload; virtual;
+    function getDeclaredAnnotations(): Arr1JLAAnnotation; overload; virtual;
+    function getParameterAnnotations(): Arr2JLAAnnotation; overload; virtual;
+  end;
+
+  JLRField = class sealed external 'java.lang.reflect' name 'Field' (JLRAccessibleObject, JLRMember)
   public
+    function getDeclaringClass(): JLClass; overload; virtual;
+    function getName(): JLString; overload; virtual;
+    function getModifiers(): jint; overload; virtual;
+    function isEnumConstant(): jboolean; overload; virtual;
+    function isSynthetic(): jboolean; overload; virtual;
+    function getType(): JLClass; overload; virtual;
+    function getGenericType(): JLRType; overload; virtual;
+    function equals(para1: JLObject): jboolean; overload; virtual;
+    function hashCode(): jint; overload; virtual;
+    function toString(): JLString; overload; virtual;
+    function toGenericString(): JLString; overload; virtual;
+    function get(para1: JLObject): JLObject; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    function getBoolean(para1: JLObject): jboolean; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    function getByte(para1: JLObject): jbyte; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    function getChar(para1: JLObject): jchar; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    function getShort(para1: JLObject): jshort; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    function getInt(para1: JLObject): jint; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    function getLong(para1: JLObject): jlong; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    function getFloat(para1: JLObject): jfloat; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    function getDouble(para1: JLObject): jdouble; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    procedure &set(para1: JLObject; para2: JLObject); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    procedure setBoolean(para1: JLObject; para2: jboolean); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    procedure setByte(para1: JLObject; para2: jbyte); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    procedure setChar(para1: JLObject; para2: jchar); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    procedure setShort(para1: JLObject; para2: jshort); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    procedure setInt(para1: JLObject; para2: jint); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    procedure setLong(para1: JLObject; para2: jlong); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    procedure setFloat(para1: JLObject; para2: jfloat); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
+    procedure setDouble(para1: JLObject; para2: jdouble); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
     function getAnnotation(para1: JLClass): JLAAnnotation; overload; virtual;
-    function isAnnotationPresent(para1: JLClass): jboolean; overload; virtual;
-    function getAnnotations(): Arr1JLAAnnotation; overload; virtual;
     function getDeclaredAnnotations(): Arr1JLAAnnotation; overload; virtual;
   end;
 
@@ -33945,7 +33978,7 @@
     class function getInstance(para1: JLString): JSKeyStore; static; overload;  // throws java.security.KeyStoreException
     class function getInstance(para1: JLString; para2: JLString): JSKeyStore; static; overload;  // throws java.security.KeyStoreException, java.security.NoSuchProviderException
     class function getInstance(para1: JLString; para2: JSProvider): JSKeyStore; static; overload;  // throws java.security.KeyStoreException
-    class function getDefaultType(): JLString; static; overload; virtual; final;
+    class function getDefaultType(): JLString; static; overload; final;
     function getProvider(): JSProvider; overload; virtual; final;
     function getType(): JLString; overload; virtual; final;
     function getKey(para1: JLString; para2: Arr1jchar): JSKey; overload; virtual; final;  // throws java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException
@@ -34132,9 +34165,9 @@
   JxSCX509Certificate = class abstract external 'javax.security.cert' name 'X509Certificate' (JxSCCertificate)
   public
     constructor create(); overload;
-    class function getInstance(para1: JIInputStream): JxSCX509Certificate; static; overload; virtual; final;  // throws javax.security.cert.CertificateException
-    class function getInstance(para1: Arr1jbyte): JxSCX509Certificate; static; overload; virtual; final;  // throws javax.security.cert.CertificateException
-    class function getInstance(var para1: array of jbyte): JxSCX509Certificate; static; overload; virtual; final;  // throws javax.security.cert.CertificateException
+    class function getInstance(para1: JIInputStream): JxSCX509Certificate; static; overload; final;  // throws javax.security.cert.CertificateException
+    class function getInstance(para1: Arr1jbyte): JxSCX509Certificate; static; overload; final;  // throws javax.security.cert.CertificateException
+    class function getInstance(var para1: array of jbyte): JxSCX509Certificate; static; overload; final;  // throws javax.security.cert.CertificateException
     procedure checkValidity(); overload; virtual; abstract;  // throws javax.security.cert.CertificateExpiredException, javax.security.cert.CertificateNotYetValidException
     procedure checkValidity(para1: JUDate); overload; virtual; abstract;  // throws javax.security.cert.CertificateExpiredException, javax.security.cert.CertificateNotYetValidException
     function getVersion(): jint; overload; virtual; abstract;
@@ -34848,7 +34881,7 @@
       end;
 
   public
-    class function isRectangleContainingRectangle(para1: JARectangle; para2: JARectangle): jboolean; static; overload; virtual; final;
+    class function isRectangleContainingRectangle(para1: JARectangle; para2: JARectangle): jboolean; static; overload; final;
     class function getLocalBounds(para1: JAComponent): JARectangle; static; overload;
     class function getWindowAncestor(para1: JAComponent): JAWindow; static; overload;
     class function convertPoint(para1: JAComponent; para2: JAPoint; para3: JAComponent): JAPoint; static; overload;
@@ -39772,7 +39805,7 @@
       javaJVMLocalObjectMimeType = 'application/x-java-jvm-local-objectref';
       javaRemoteObjectMimeType = 'application/x-java-remote-object';
   strict protected
-    class function tryToLoadClass(para1: JLString; para2: JLClassLoader): JLClass; static; overload; virtual; final;  // throws java.lang.ClassNotFoundException
+    class function tryToLoadClass(para1: JLString; para2: JLClassLoader): JLClass; static; overload; final;  // throws java.lang.ClassNotFoundException
   public
     constructor create(); overload;
     constructor create(para1: JLClass; para2: JLString); overload;
@@ -39780,9 +39813,9 @@
     constructor create(para1: JLString; para2: JLString; para3: JLClassLoader); overload;  // throws java.lang.ClassNotFoundException
     constructor create(para1: JLString); overload;  // throws java.lang.ClassNotFoundException
     function toString(): JLString; overload; virtual;
-    class function getTextPlainUnicodeFlavor(): JADDataFlavor; static; overload; virtual; final;
-    class function selectBestTextFlavor(para1: Arr1JADDataFlavor): JADDataFlavor; static; overload; virtual; final;
-    class function selectBestTextFlavor(var para1: array of JADDataFlavor): JADDataFlavor; static; overload; virtual; final;
+    class function getTextPlainUnicodeFlavor(): JADDataFlavor; static; overload; final;
+    class function selectBestTextFlavor(para1: Arr1JADDataFlavor): JADDataFlavor; static; overload; final;
+    class function selectBestTextFlavor(var para1: array of JADDataFlavor): JADDataFlavor; static; overload; final;
     function getReaderForText(para1: JADTransferable): JIReader; overload; virtual;  // throws java.awt.datatransfer.UnsupportedFlavorException, java.io.IOException
     function getMimeType(): JLString; overload; virtual;
     function getRepresentationClass(): JLClass; overload; virtual;
@@ -42071,7 +42104,7 @@
     function next(): jint; overload; virtual;
     function previous(): jint; overload; virtual;
   strict protected
-    class procedure checkOffset(para1: jint; para2: JTCharacterIterator); static; overload; virtual; final;
+    class procedure checkOffset(para1: jint; para2: JTCharacterIterator); static; overload; final;
   public
     function following(para1: jint): jint; overload; virtual;
     function preceding(para1: jint): jint; overload; virtual;
@@ -44036,91 +44069,6 @@
     function getMessage(): JLString; overload; virtual;
   end;
 
-  JLRConstructor = class sealed external 'java.lang.reflect' name 'Constructor' (JLRAccessibleObject, JLRGenericDeclaration, JLRMember)
-  public
-    function getDeclaringClass(): JLClass; overload; virtual;
-    function getName(): JLString; overload; virtual;
-    function getModifiers(): jint; overload; virtual;
-    function getTypeParameters(): Arr1JLRTypeVariable; overload; virtual;
-    function getParameterTypes(): Arr1JLClass; overload; virtual;
-    function getGenericParameterTypes(): Arr1JLRType; overload; virtual;
-    function getExceptionTypes(): Arr1JLClass; overload; virtual;
-    function getGenericExceptionTypes(): Arr1JLRType; overload; virtual;
-    function equals(para1: JLObject): jboolean; overload; virtual;
-    function hashCode(): jint; overload; virtual;
-    function toString(): JLString; overload; virtual;
-    function toGenericString(): JLString; overload; virtual;
-    function newInstance(para1: Arr1JLObject): JLObject; overload; virtual;  // throws java.lang.InstantiationException, java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException
-    function newInstance(const para1: array of JLObject): JLObject; overload; virtual;  // throws java.lang.InstantiationException, java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException
-    function isVarArgs(): jboolean; overload; virtual;
-    function isSynthetic(): jboolean; overload; virtual;
-    function getAnnotation(para1: JLClass): JLAAnnotation; overload; virtual;
-    function getDeclaredAnnotations(): Arr1JLAAnnotation; overload; virtual;
-    function getParameterAnnotations(): Arr2JLAAnnotation; overload; virtual;
-  end;
-
-  JLRField = class sealed external 'java.lang.reflect' name 'Field' (JLRAccessibleObject, JLRMember)
-  public
-    function getDeclaringClass(): JLClass; overload; virtual;
-    function getName(): JLString; overload; virtual;
-    function getModifiers(): jint; overload; virtual;
-    function isEnumConstant(): jboolean; overload; virtual;
-    function isSynthetic(): jboolean; overload; virtual;
-    function getType(): JLClass; overload; virtual;
-    function getGenericType(): JLRType; overload; virtual;
-    function equals(para1: JLObject): jboolean; overload; virtual;
-    function hashCode(): jint; overload; virtual;
-    function toString(): JLString; overload; virtual;
-    function toGenericString(): JLString; overload; virtual;
-    function get(para1: JLObject): JLObject; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    function getBoolean(para1: JLObject): jboolean; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    function getByte(para1: JLObject): jbyte; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    function getChar(para1: JLObject): jchar; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    function getShort(para1: JLObject): jshort; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    function getInt(para1: JLObject): jint; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    function getLong(para1: JLObject): jlong; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    function getFloat(para1: JLObject): jfloat; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    function getDouble(para1: JLObject): jdouble; overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    procedure &set(para1: JLObject; para2: JLObject); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    procedure setBoolean(para1: JLObject; para2: jboolean); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    procedure setByte(para1: JLObject; para2: jbyte); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    procedure setChar(para1: JLObject; para2: jchar); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    procedure setShort(para1: JLObject; para2: jshort); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    procedure setInt(para1: JLObject; para2: jint); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    procedure setLong(para1: JLObject; para2: jlong); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    procedure setFloat(para1: JLObject; para2: jfloat); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    procedure setDouble(para1: JLObject; para2: jdouble); overload; virtual;  // throws java.lang.IllegalArgumentException, java.lang.IllegalAccessException
-    function getAnnotation(para1: JLClass): JLAAnnotation; overload; virtual;
-    function getDeclaredAnnotations(): Arr1JLAAnnotation; overload; virtual;
-  end;
-
-  JLRMethod = class sealed external 'java.lang.reflect' name 'Method' (JLRAccessibleObject, JLRGenericDeclaration, JLRMember)
-  public
-    function getDeclaringClass(): JLClass; overload; virtual;
-    function getName(): JLString; overload; virtual;
-    function getModifiers(): jint; overload; virtual;
-    function getTypeParameters(): Arr1JLRTypeVariable; overload; virtual;
-    function getReturnType(): JLClass; overload; virtual;
-    function getGenericReturnType(): JLRType; overload; virtual;
-    function getParameterTypes(): Arr1JLClass; overload; virtual;
-    function getGenericParameterTypes(): Arr1JLRType; overload; virtual;
-    function getExceptionTypes(): Arr1JLClass; overload; virtual;
-    function getGenericExceptionTypes(): Arr1JLRType; overload; virtual;
-    function equals(para1: JLObject): jboolean; overload; virtual;
-    function hashCode(): jint; overload; virtual;
-    function toString(): JLString; overload; virtual;
-    function toGenericString(): JLString; overload; virtual;
-    function invoke(para1: JLObject; para2: Arr1JLObject): JLObject; overload; virtual;  // throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException
-    function invoke(para1: JLObject; const para2: array of JLObject): JLObject; overload; virtual;  // throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException
-    function isBridge(): jboolean; overload; virtual;
-    function isVarArgs(): jboolean; overload; virtual;
-    function isSynthetic(): jboolean; overload; virtual;
-    function getAnnotation(para1: JLClass): JLAAnnotation; overload; virtual;
-    function getDeclaredAnnotations(): Arr1JLAAnnotation; overload; virtual;
-    function getDefaultValue(): JLObject; overload; virtual;
-    function getParameterAnnotations(): Arr2JLAAnnotation; overload; virtual;
-  end;
-
   JSBatchUpdateException = class external 'java.sql' name 'BatchUpdateException' (JSSQLException)
   public
     constructor create(para1: JLString; para2: JLString; para3: jint; para4: Arr1jint); overload;
@@ -58391,7 +58339,7 @@
     function readDouble(): jdouble; overload; virtual; final;  // throws java.io.IOException
     function readLine(): JLString; overload; virtual; final;  // throws java.io.IOException
     function readUTF(): JLString; overload; virtual; final;  // throws java.io.IOException
-    class function readUTF(para1: JIDataInput): JLString; static; overload; virtual; final;  // throws java.io.IOException
+    class function readUTF(para1: JIDataInput): JLString; static; overload; final;  // throws java.io.IOException
   end;
 
   JILineNumberInputStream = class external 'java.io' name 'LineNumberInputStream' (JIFilterInputStream)
@@ -61626,7 +61574,7 @@
     const
       DEFAULT_STYLE = 'default';
   public
-    class function getDefaultStyleContext(): JSTStyleContext; static; overload; virtual; final;
+    class function getDefaultStyleContext(): JSTStyleContext; static; overload; final;
     constructor create(); overload;
     function addStyle(para1: JLString; para2: JSTStyle): JSTStyle; overload; virtual;
     procedure removeStyle(para1: JLString); overload; virtual;
@@ -63606,16 +63554,16 @@
     function parse(para1: JLString): JUDate; overload; virtual;  // throws java.text.ParseException
     function parse(para1: JLString; para2: JTParsePosition): JUDate; overload; virtual; abstract;
     function parseObject(para1: JLString; para2: JTParsePosition): JLObject; overload; virtual;
-    class function getTimeInstance(): JTDateFormat; static; overload; virtual; final;
-    class function getTimeInstance(para1: jint): JTDateFormat; static; overload; virtual; final;
-    class function getTimeInstance(para1: jint; para2: JULocale): JTDateFormat; static; overload; virtual; final;
-    class function getDateInstance(): JTDateFormat; static; overload; virtual; final;
-    class function getDateInstance(para1: jint): JTDateFormat; static; overload; virtual; final;
-    class function getDateInstance(para1: jint; para2: JULocale): JTDateFormat; static; overload; virtual; final;
-    class function getDateTimeInstance(): JTDateFormat; static; overload; virtual; final;
-    class function getDateTimeInstance(para1: jint; para2: jint): JTDateFormat; static; overload; virtual; final;
-    class function getDateTimeInstance(para1: jint; para2: jint; para3: JULocale): JTDateFormat; static; overload; virtual; final;
-    class function getInstance(): JTDateFormat; static; overload; virtual; final;
+    class function getTimeInstance(): JTDateFormat; static; overload; final;
+    class function getTimeInstance(para1: jint): JTDateFormat; static; overload; final;
+    class function getTimeInstance(para1: jint; para2: JULocale): JTDateFormat; static; overload; final;
+    class function getDateInstance(): JTDateFormat; static; overload; final;
+    class function getDateInstance(para1: jint): JTDateFormat; static; overload; final;
+    class function getDateInstance(para1: jint; para2: JULocale): JTDateFormat; static; overload; final;
+    class function getDateTimeInstance(): JTDateFormat; static; overload; final;
+    class function getDateTimeInstance(para1: jint; para2: jint): JTDateFormat; static; overload; final;
+    class function getDateTimeInstance(para1: jint; para2: jint; para3: JULocale): JTDateFormat; static; overload; final;
+    class function getInstance(): JTDateFormat; static; overload; final;
     class function getAvailableLocales(): Arr1JULocale; static; overload;
     procedure setCalendar(para1: JUCalendar); overload; virtual;
     function getCalendar(): JUCalendar; overload; virtual;
@@ -63754,15 +63702,15 @@
     function parse(para1: JLString): JLNumber; overload; virtual;  // throws java.text.ParseException
     function isParseIntegerOnly(): jboolean; overload; virtual;
     procedure setParseIntegerOnly(para1: jboolean); overload; virtual;
-    class function getInstance(): JTNumberFormat; static; overload; virtual; final;
+    class function getInstance(): JTNumberFormat; static; overload; final;
     class function getInstance(para1: JULocale): JTNumberFormat; static; overload;
-    class function getNumberInstance(): JTNumberFormat; static; overload; virtual; final;
+    class function getNumberInstance(): JTNumberFormat; static; overload; final;
     class function getNumberInstance(para1: JULocale): JTNumberFormat; static; overload;
-    class function getIntegerInstance(): JTNumberFormat; static; overload; virtual; final;
+    class function getIntegerInstance(): JTNumberFormat; static; overload; final;
     class function getIntegerInstance(para1: JULocale): JTNumberFormat; static; overload;
-    class function getCurrencyInstance(): JTNumberFormat; static; overload; virtual; final;
+    class function getCurrencyInstance(): JTNumberFormat; static; overload; final;
     class function getCurrencyInstance(para1: JULocale): JTNumberFormat; static; overload;
-    class function getPercentInstance(): JTNumberFormat; static; overload; virtual; final;
+    class function getPercentInstance(): JTNumberFormat; static; overload; final;
     class function getPercentInstance(para1: JULocale): JTNumberFormat; static; overload;
     class function getAvailableLocales(): Arr1JULocale; static; overload;
     function hashCode(): jint; overload; virtual;
@@ -64362,7 +64310,7 @@
     procedure showStatus(para1: JLString); overload; virtual;
     function getImage(para1: JNURL): JAImage; overload; virtual;
     function getImage(para1: JNURL; para2: JLString): JAImage; overload; virtual;
-    class function newAudioClip(para1: JNURL): JAAudioClip; static; overload; virtual; final;
+    class function newAudioClip(para1: JNURL): JAAudioClip; static; overload; final;
     function getAudioClip(para1: JNURL): JAAudioClip; overload; virtual;
     function getAudioClip(para1: JNURL; para2: JLString): JAAudioClip; overload; virtual;
     function getAppletInfo(): JLString; overload; virtual;
@@ -71396,8 +71344,8 @@
   strict protected
     function getTextComponent(para1: JAEActionEvent): JSTJTextComponent; overload; virtual; final;
   public
-    class function augmentList(para1: Arr1JSAction; para2: Arr1JSAction): Arr1JSAction; static; overload; virtual; final;
-    class function augmentList(var para1: array of JSAction; var para2: array of JSAction): Arr1JSAction; static; overload; virtual; final;
+    class function augmentList(para1: Arr1JSAction; para2: Arr1JSAction): Arr1JSAction; static; overload; final;
+    class function augmentList(var para1: array of JSAction; var para2: array of JSAction): Arr1JSAction; static; overload; final;
   strict protected
     function getFocusedComponent(): JSTJTextComponent; overload; virtual; final;
   end;
@@ -71489,17 +71437,17 @@
     function validatePendingRemove(para1: JLObject): jboolean; overload; virtual;
     procedure childJustAddedHook(para1: JLObject; para2: JBBBeanContextSupport.InnerBCSChild); overload; virtual;
     procedure childJustRemovedHook(para1: JLObject; para2: JBBBeanContextSupport.InnerBCSChild); overload; virtual;
-    class function getChildVisibility(para1: JLObject): JBVisibility; static; overload; virtual; final;
-    class function getChildSerializable(para1: JLObject): JISerializable; static; overload; virtual; final;
-    class function getChildPropertyChangeListener(para1: JLObject): JBPropertyChangeListener; static; overload; virtual; final;
-    class function getChildVetoableChangeListener(para1: JLObject): JBVetoableChangeListener; static; overload; virtual; final;
-    class function getChildBeanContextMembershipListener(para1: JLObject): JBBBeanContextMembershipListener; static; overload; virtual; final;
-    class function getChildBeanContextChild(para1: JLObject): JBBBeanContextChild; static; overload; virtual; final;
+    class function getChildVisibility(para1: JLObject): JBVisibility; static; overload; final;
+    class function getChildSerializable(para1: JLObject): JISerializable; static; overload; final;
+    class function getChildPropertyChangeListener(para1: JLObject): JBPropertyChangeListener; static; overload; final;
+    class function getChildVetoableChangeListener(para1: JLObject): JBVetoableChangeListener; static; overload; final;
+    class function getChildBeanContextMembershipListener(para1: JLObject): JBBBeanContextMembershipListener; static; overload; final;
+    class function getChildBeanContextChild(para1: JLObject): JBBBeanContextChild; static; overload; final;
     procedure fireChildrenAdded(para1: JBBBeanContextMembershipEvent); overload; virtual; final;
     procedure fireChildrenRemoved(para1: JBBBeanContextMembershipEvent); overload; virtual; final;
     procedure initialize(); overload; virtual;
     function copyChildren(): Arr1JLObject; overload; virtual; final;
-    class function classEquals(para1: JLClass; para2: JLClass): jboolean; static; overload; virtual; final;
+    class function classEquals(para1: JLClass; para2: JLClass): jboolean; static; overload; final;
   end;
 
   JUCScheduledThreadPoolExecutor = class external 'java.util.concurrent' name 'ScheduledThreadPoolExecutor' (JUCThreadPoolExecutor, JUCScheduledExecutorService)
@@ -72678,8 +72626,8 @@
     function format(para1: jlong; para2: JLStringBuffer; para3: JTFieldPosition): JLStringBuffer; overload; virtual;
     function format(para1: jdouble; para2: JLStringBuffer; para3: JTFieldPosition): JLStringBuffer; overload; virtual;
     function parse(para1: JLString; para2: JTParsePosition): JLNumber; overload; virtual;
-    class function nextDouble(para1: jdouble): jdouble; static; overload; virtual; final;
-    class function previousDouble(para1: jdouble): jdouble; static; overload; virtual; final;
+    class function nextDouble(para1: jdouble): jdouble; static; overload; final;
+    class function previousDouble(para1: jdouble): jdouble; static; overload; final;
     function clone(): JLObject; overload; virtual;
     function hashCode(): jint; overload; virtual;
     function equals(para1: JLObject): jboolean; overload; virtual;
@@ -76219,7 +76167,7 @@
     procedure serviceAvailable(para1: JBBBeanContextServiceAvailableEvent); overload; virtual;
     procedure serviceRevoked(para1: JBBBeanContextServiceRevokedEvent); overload; virtual;
   strict protected
-    class function getChildBeanContextServicesListener(para1: JLObject): JBBBeanContextServicesListener; static; overload; virtual; final;
+    class function getChildBeanContextServicesListener(para1: JLObject): JBBBeanContextServicesListener; static; overload; final;
     procedure childJustRemovedHook(para1: JLObject; para2: JBBBeanContextSupport.InnerBCSChild); overload; virtual;
     procedure releaseBeanContextResources(); overload; virtual;
     procedure initializeBeanContextResources(); overload; virtual;

rtl/java/jdk15.pas

@@ -5,16 +5,16 @@ unit jdk15;
 interface
 
 type
-  JSPComponentUI = class;
-  Arr1JSPComponentUI = array of JSPComponentUI;
-  Arr2JSPComponentUI = array of Arr1JSPComponentUI;
-  Arr3JSPComponentUI = array of Arr2JSPComponentUI;
-
   JNHeapIntBuffer = class;
   Arr1JNHeapIntBuffer = array of JNHeapIntBuffer;
   Arr2JNHeapIntBuffer = array of Arr1JNHeapIntBuffer;
   Arr3JNHeapIntBuffer = array of Arr2JNHeapIntBuffer;
 
+  JSPComponentUI = class;
+  Arr1JSPComponentUI = array of JSPComponentUI;
+  Arr2JSPComponentUI = array of Arr1JSPComponentUI;
+  Arr3JSPComponentUI = array of Arr2JSPComponentUI;
+
   JSTTableView = class;
   Arr1JSTTableView = array of JSTTableView;
   Arr2JSTTableView = array of Arr1JSTTableView;
@@ -5295,11 +5295,6 @@ type
   Arr2JSTRRTFParser = array of Arr1JSTRRTFParser;
   Arr3JSTRRTFParser = array of Arr2JSTRRTFParser;
 
-  JLRMethod = class;
-  Arr1JLRMethod = array of JLRMethod;
-  Arr2JLRMethod = array of Arr1JLRMethod;
-  Arr3JLRMethod = array of Arr2JLRMethod;
-
   JIIOException = class;
   Arr1JIIOException = array of JIIOException;
   Arr2JIIOException = array of Arr1JIIOException;
@@ -6690,11 +6685,6 @@ type
   Arr2JSCPKIXParameters = array of Arr1JSCPKIXParameters;
   Arr3JSCPKIXParameters = array of Arr2JSCPKIXParameters;
 
-  JLRAccessibleObject = class;
-  Arr1JLRAccessibleObject = array of JLRAccessibleObject;
-  Arr2JLRAccessibleObject = array of Arr1JLRAccessibleObject;
-  Arr3JLRAccessibleObject = array of Arr2JLRAccessibleObject;
-
   OOCOBJ_ADAPTER = class;
   Arr1OOCOBJ_ADAPTER = array of OOCOBJ_ADAPTER;
   Arr2OOCOBJ_ADAPTER = array of Arr1OOCOBJ_ADAPTER;
@@ -6935,16 +6925,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;
@@ -11585,6 +11575,11 @@ type
   Arr2JISIIORegistry = array of Arr1JISIIORegistry;
   Arr3JISIIORegistry = array of Arr2JISIIORegistry;
 
+  JUDate = class;
+  Arr1JUDate = array of JUDate;
+  Arr2JUDate = array of Arr1JUDate;
+  Arr3JUDate = array of Arr2JUDate;
+
   JACICC_Profile = class;
   Arr1JACICC_Profile = array of JACICC_Profile;
   Arr2JACICC_Profile = array of Arr1JACICC_Profile;
@@ -11595,11 +11590,6 @@ type
   Arr2JLRFinalReference = array of Arr1JLRFinalReference;
   Arr3JLRFinalReference = array of Arr2JLRFinalReference;
 
-  JUDate = class;
-  Arr1JUDate = array of JUDate;
-  Arr2JUDate = array of Arr1JUDate;
-  Arr3JUDate = array of Arr2JUDate;
-
   JBPersistenceDelegate = class;
   Arr1JBPersistenceDelegate = array of JBPersistenceDelegate;
   Arr2JBPersistenceDelegate = array of Arr1JBPersistenceDelegate;
@@ -17725,11 +17715,6 @@ type
   Arr2JMDescriptorAccess = array of Arr1JMDescriptorAccess;
   Arr3JMDescriptorAccess = array of Arr2JMDescriptorAccess;
 
-  OOCUNSUPPORTED_POLICY_VALUE = interface;
-  Arr1OOCUNSUPPORTED_POLICY_VALUE = array of OOCUNSUPPORTED_POLICY_VALUE;
-  Arr2OOCUNSUPPORTED_POLICY_VALUE = array of Arr1OOCUNSUPPORTED_POLICY_VALUE;
-  Arr3OOCUNSUPPORTED_POLICY_VALUE = array of Arr2OOCUNSUPPORTED_POLICY_VALUE;
-
   JAKeyEventPostProcessor = interface;
   Arr1JAKeyEventPostProcessor = array of JAKeyEventPostProcessor;
   Arr2JAKeyEventPostProcessor = array of Arr1JAKeyEventPostProcessor;
@@ -17740,6 +17725,11 @@ type
   Arr2JXSEEntityDeclaration = array of Arr1JXSEEntityDeclaration;
   Arr3JXSEEntityDeclaration = array of Arr2JXSEEntityDeclaration;
 
+  OOCUNSUPPORTED_POLICY_VALUE = interface;
+  Arr1OOCUNSUPPORTED_POLICY_VALUE = array of OOCUNSUPPORTED_POLICY_VALUE;
+  Arr2OOCUNSUPPORTED_POLICY_VALUE = array of Arr1OOCUNSUPPORTED_POLICY_VALUE;
+  Arr3OOCUNSUPPORTED_POLICY_VALUE = array of Arr2OOCUNSUPPORTED_POLICY_VALUE;
+
   JXWRequestWrapper = interface;
   Arr1JXWRequestWrapper = array of JXWRequestWrapper;
   Arr2JXWRequestWrapper = array of Arr1JXWRequestWrapper;
@@ -18680,11 +18670,6 @@ type
   Arr2JNURLStreamHandlerFactory = array of Arr1JNURLStreamHandlerFactory;
   Arr3JNURLStreamHandlerFactory = array of Arr2JNURLStreamHandlerFactory;
 
-  JLRMember = interface;
-  Arr1JLRMember = array of JLRMember;
-  Arr2JLRMember = array of Arr1JLRMember;
-  Arr3JLRMember = array of Arr2JLRMember;
-
   JRAActivationInstantiator = interface;
   Arr1JRAActivationInstantiator = array of JRAActivationInstantiator;
   Arr2JRAActivationInstantiator = array of Arr1JRAActivationInstantiator;
@@ -20715,6 +20700,11 @@ type
   Arr2JLNumber = array of Arr1JLNumber;
   Arr3JLNumber = array of Arr2JLNumber;
 
+  JLRMethod = class external 'java.lang.reflect' name 'Method';
+  Arr1JLRMethod = array of JLRMethod;
+  Arr2JLRMethod = array of Arr1JLRMethod;
+  Arr3JLRMethod = array of Arr2JLRMethod;
+
   JLCharacter = class external 'java.lang' name 'Character';
   Arr1JLCharacter = array of JLCharacter;
   Arr2JLCharacter = array of Arr1JLCharacter;
@@ -20815,6 +20805,11 @@ type
   Arr2JLRuntimeException = array of Arr1JLRuntimeException;
   Arr3JLRuntimeException = array of Arr2JLRuntimeException;
 
+  JLRAccessibleObject = class external 'java.lang.reflect' name 'AccessibleObject';
+  Arr1JLRAccessibleObject = array of JLRAccessibleObject;
+  Arr2JLRAccessibleObject = array of Arr1JLRAccessibleObject;
+  Arr3JLRAccessibleObject = array of Arr2JLRAccessibleObject;
+
   JLIterable = interface external 'java.lang' name 'Iterable';
   Arr1JLIterable = array of JLIterable;
   Arr2JLIterable = array of Arr1JLIterable;
@@ -20860,6 +20855,11 @@ type
   Arr2JLComparable = array of Arr1JLComparable;
   Arr3JLComparable = array of Arr2JLComparable;
 
+  JLRMember = interface external 'java.lang.reflect' name 'Member';
+  Arr1JLRMember = array of JLRMember;
+  Arr2JLRMember = array of Arr1JLRMember;
+  Arr3JLRMember = array of Arr2JLRMember;
+
   JLCharSequence = interface external 'java.lang' name 'CharSequence';
   Arr1JLCharSequence = array of JLCharSequence;
   Arr2JLCharSequence = array of Arr1JLCharSequence;