category change
authorClaus Gittinger <cg@exept.de>
Fri, 22 Nov 2002 21:14:07 +0100
changeset 2108 ca8c4e7db2e8
parent 2107 f4509f6767fa
child 2109 65148d6ba068
category change
Java.st
JavaAppletComponentSpec.st
JavaBuiltInClassPointerRef.st
JavaByteCodeEnumerator.st
JavaClassPointerRef.st
JavaClassReader.st
JavaClassRef.st
JavaConstantPool.st
JavaContext.st
JavaDecompiler.st
JavaEmbeddedFrameView.st
JavaExceptionTableEntry.st
JavaField.st
JavaFieldref.st
JavaInterfaceMethodref.st
JavaLocalVariableTable.st
JavaLocalVariableTableEntry.st
JavaMethodref.st
JavaNameandType.st
JavaPopUpView.st
JavaRef.st
JavaSlotIndexCache.st
JavaTopView.st
JavaUnresolvedClassConstant.st
JavaUnresolvedConstant.st
JavaUnresolvedFieldrefConstant.st
JavaUnresolvedInterfaceMethodrefConstant.st
JavaUnresolvedMethodrefConstant.st
JavaUnresolvedNameandTypeConstant.st
JavaUnresolvedRefConstant.st
JavaUnresolvedSTArrayConstant.st
JavaUnresolvedStringConstant.st
JavaVM.st
JavaView.st
SmalltalkAppletContext.st
SmalltalkAppletStub.st
--- a/Java.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/Java.st	Fri Nov 22 21:14:07 2002 +0100
@@ -20,7 +20,7 @@
 		InternedStrings Java_lang_String Java_lang_Class PrettyPrintStyle
 		LastArgumentString Threads ExcludedClassPath FailedToLoadClasses'
 	poolDictionaries:''
-	category:'Java-Support'
+	category:'Languages-Java-Support'
 !
 
 !Java class methodsFor:'documentation'!
@@ -1547,6 +1547,7 @@
 !Java class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/Java.st,v 1.130 2001-11-06 16:25:38 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/Java.st,v 1.131 2002-11-22 20:12:44 cg Exp $'
 ! !
+
 Java initialize!
--- a/JavaAppletComponentSpec.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaAppletComponentSpec.st	Fri Nov 22 21:14:07 2002 +0100
@@ -752,5 +752,5 @@
 !JavaAppletComponentSpec class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaAppletComponentSpec.st,v 1.14 2002-11-22 20:13:57 cg Exp $'
 ! !
--- a/JavaBuiltInClassPointerRef.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaBuiltInClassPointerRef.st	Fri Nov 22 21:14:07 2002 +0100
@@ -189,5 +189,5 @@
 !JavaBuiltInClassPointerRef class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaBuiltInClassPointerRef.st,v 1.14 2002-11-22 20:11:28 cg Exp $'
 ! !
--- a/JavaByteCodeEnumerator.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaByteCodeEnumerator.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,44 +1,3 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice.   This software may not
- be provided or otherwise made available to, or used by, any
- other person.  No title to or ownership of the software is
- hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 JavaDecompiler subclass:#JavaByteCodeEnumerator
@@ -48,52 +7,6 @@
 	category:'Languages-Java-Support-Decompiling'
 !
 
-!JavaByteCodeEnumerator class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice.   This software may not
- be provided or otherwise made available to, or used by, any
- other person.  No title to or ownership of the software is
- hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
-! !
 
 !JavaByteCodeEnumerator methodsFor:'accessing'!
 
@@ -182,9 +95,5 @@
 !JavaByteCodeEnumerator class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaByteCodeEnumerator.st,v 1.4 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaByteCodeEnumerator.st,v 1.4 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaByteCodeEnumerator.st,v 1.3 2002-11-22 20:13:48 cg Exp $'
+! !
--- a/JavaClassPointerRef.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaClassPointerRef.st	Fri Nov 22 21:14:07 2002 +0100
@@ -106,5 +106,5 @@
 !JavaClassPointerRef class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaClassPointerRef.st,v 1.10 2002-11-22 20:12:00 cg Exp $'
 ! !
--- a/JavaClassReader.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaClassReader.st	Fri Nov 22 21:14:07 2002 +0100
@@ -20,7 +20,7 @@
 	classVariableNames:'Verbose Silent AbsolutelySilent LazyClassLoading
 		InvalidClassFormatSignal ClassLoaderQuerySignal'
 	poolDictionaries:''
-	category:'Java-Support'
+	category:'Languages-Java-Support'
 !
 
 !JavaClassReader class methodsFor:'documentation'!
@@ -2196,6 +2196,7 @@
 !JavaClassReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassReader.st,v 1.88 2000-12-18 14:34:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaClassReader.st,v 1.89 2002-11-22 20:13:04 cg Exp $'
 ! !
+
 JavaClassReader initialize!
--- a/JavaClassRef.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaClassRef.st	Fri Nov 22 21:14:07 2002 +0100
@@ -50,5 +50,5 @@
 !JavaClassRef class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaClassRef.st,v 1.5 2002-11-22 20:11:34 cg Exp $'
 ! !
--- a/JavaConstantPool.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaConstantPool.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,38 +8,15 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 Array variableSubclass:#JavaConstantPool
 	instanceVariableNames:'owner'
-	classVariableNames:'ConstantPools'
+	classVariableNames:''
 	poolDictionaries:''
 	category:'Languages-Java-Reader-Support'
 !
@@ -52,12 +25,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,95 +34,60 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
 "
-! !
-
-!JavaConstantPool class methodsFor:'initialization'!
-
-initialize
-    ConstantPools := OrderedCollection new: 1000.
 
-    "Modified: / 08-04-2011 / 17:28:07 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 09-04-2011 / 09:25:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
 
-!JavaConstantPool class methodsFor:'instance creation'!
-
-new: size 
-    "return an initialized instance"
-    
-    ^ ConstantPools add: ((super new: size)
-                initialize;
-                yourself).
-
-    "Created: / 08-04-2011 / 16:56:18 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 09-04-2011 / 09:24:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 11-04-2011 / 18:46:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-! !
-
-!JavaConstantPool class methodsFor:'accessing'!
-
-allConstantPools
-    "linked list of all constant pools in system"
-    ^ ConstantPools.
-
-    "Created: / 08-04-2011 / 16:53:58 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 09-04-2011 / 09:24:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-allConstantPools: anOorderedCollection 
-    "linked list of all constant pools in system"
-    
-    ConstantPools := anOorderedCollection.
-
-    "Created: / 08-04-2011 / 17:07:28 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 09-04-2011 / 09:24:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 11-04-2011 / 18:47:58 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaConstantPool class methodsFor:'special'!
 
-invalidateForClass: internalJavaClassName 
-    "Only alias, everybody calls invalidateForClass so why not me :)"
-    
-    ^self invalidateReferencesToClass: internalJavaClassName.
+compressPools
+    "unify all constants"
+
+    |strings nameandTypes jStrings|
+
+    strings := Set new.
+    nameandTypes := Set new.
+
+    self allInstancesDo:[:aPool |
+        aPool keysAndValuesDo:[:idx :aConst |
+            |existing nt|
 
-    "Created: / 08-04-2011 / 16:52:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
+            aConst isString ifTrue:[
+                existing := strings elementAt:aConst ifAbsent:nil.
+                existing isNil ifTrue:[
+                    strings add:aConst
+                ] ifFalse:[
+                    aPool at:idx put:existing
+                ]
+            ] ifFalse:[
+                (aConst isMemberOf:JavaFieldref) ifTrue:[
+                    nt := aConst nameandType.
+                    existing := nameandTypes elementAt:nt ifAbsent:nil.
+                    existing isNil ifTrue:[
+                        nameandTypes add:nt
+                    ] ifFalse:[
+                        aConst nameandType:existing
+                    ]
+                ] ifFalse:[
+                    (aConst isMemberOf:JavaNameandType) ifTrue:[
+                        existing := nameandTypes elementAt:aConst ifAbsent:nil.
+                        existing isNil ifTrue:[
+                            nameandTypes add:aConst
+                        ] ifFalse:[
+                            aPool at:idx put:existing
+                        ]
+                    ]
+                ]
+            ]
+        ].
+    ]
 
-invalidateReferencesToClass: internalJavaClassName 
-    "Go over all constant pools and call invalidateForClass on all 
-     references. (usable when given class was unloaded etc)"
-    ConstantPools do: [:each | each invalidateForClass: internalJavaClassName].
+    "
+     self compressPools
+    "
 
-    "Created: / 08-04-2011 / 16:09:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: 19.8.1997 / 14:04:25 / cg"
 ! !
 
 !JavaConstantPool methodsFor:'accessing'!
@@ -174,60 +108,6 @@
     "Created: 28.6.1996 / 21:12:22 / cg"
 ! !
 
-!JavaConstantPool methodsFor:'adding'!
-
-at: classRefIndex putClassRefWithNameAt: classNameIndex 
-    self at: classRefIndex
-        put: (JavaClassRef2 in: self withNameAt: classNameIndex).
-
-    "Created: / 13-05-2011 / 09:48:01 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-at: fieldRefIndex putFieldRefWithClassAt: classRefIndex andNameAndTypeAt: nameAndTypeIndex 
-    self at: fieldRefIndex
-        put: (JavaFieldRef2 
-                in: self
-                withNameAndTypeAt: nameAndTypeIndex
-                andClassAt: classRefIndex).
-
-    "Created: / 13-05-2011 / 09:08:18 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-at: interfaceMethodRefIndex putInterfaceMethodRefWithClassAt: classRefIndex andNameAndTypeAt: nameAndTypeIndex 
-    self at: interfaceMethodRefIndex
-        put: (JavaInterfaceMethodRef2 
-                in: self
-                withNameAndTypeAt: nameAndTypeIndex
-                andClassAt: classRefIndex).
-
-    "Created: / 13-05-2011 / 09:08:50 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-at: methodRefIndex putMethodRefWithClassAt: classRefIndex andNameAndTypeAt: nameAndTypeIndex
-    self at: methodRefIndex
-        put: (JavaMethodRef2 in: self withNameAndTypeAt: nameAndTypeIndex andClassAt:classRefIndex).
-
-    "Created: / 13-05-2011 / 09:07:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-at: nameAndTypeIndex putNameAndTypeWithNameAt: nameIndex andDescriptorAt: descriptorIndex
-    self at: nameAndTypeIndex
-        put: (JavaNameAndType2 in: self withNameAt: nameIndex andDescriptorAt: descriptorIndex).
-
-    "Created: / 13-05-2011 / 09:05:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-! !
-
-!JavaConstantPool methodsFor:'initialization'!
-
-initialize
-    "Invoked when a new instance is created."
-
-    "/ please change as required (and remove this comment)
-    "/ owner := nil.
-
-    "/ super initialize.   -- commented since inherited method does nothing
-! !
-
 !JavaConstantPool methodsFor:'printing & storing'!
 
 displayString
@@ -243,35 +123,38 @@
 !JavaConstantPool methodsFor:'queries'!
 
 refersToMethod:aJavaMethod
-
-    self error: 'JV@2011-07-26: Update to new resolving scheme!!'.
-
     self do:[:constItem |
         (constItem == aJavaMethod) ifTrue:[^ true].
-
+        (constItem isMemberOf:JavaMethodref) ifTrue:[
+            self halt.
+        ].
+        (constItem isMemberOf:JavaUnresolvedMethodrefConstant) ifTrue:[
+            self halt.
+        ]
     ].
     ^ false
 
-    "Created: / 29-07-1997 / 17:39:19 / cg"
-    "Modified: / 26-07-2011 / 18:00:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: 29.7.1997 / 17:36:49 / cg"
+    "Created: 29.7.1997 / 17:39:19 / cg"
 !
 
 refersToMethodNamed:aJavaMethodName
-
-    self error: 'JV@2011-07-26: Update to new resolving scheme!!'.
-    
     self do:[:constItem |
         (constItem isKindOf:JavaMethod) ifTrue:[
             constItem name = aJavaMethodName ifTrue:[^ true].
         ] ifFalse:[
-            
+            (constItem isMemberOf:JavaMethodref) ifTrue:[
+                constItem name = aJavaMethodName ifTrue:[^ true].
+            ].
+            (constItem isMemberOf:JavaUnresolvedMethodrefConstant) ifTrue:[
+                self halt.
+            ]
         ]
     ].
     ^ false
 
-    "Created: / 29-07-1997 / 17:39:24 / cg"
-    "Modified: / 16-10-1998 / 01:22:02 / cg"
-    "Modified: / 26-07-2011 / 17:54:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 29.7.1997 / 17:39:24 / cg"
+    "Modified: / 16.10.1998 / 01:22:02 / cg"
 ! !
 
 !JavaConstantPool methodsFor:'special'!
@@ -287,25 +170,6 @@
     "Created: / 4.1.1998 / 00:40:11 / cg"
 !
 
-invalidateAll 
-    "go over all entries and call invalidate on all references"
-    
-    self do: 
-            [:entry | 
-            entry isJavaRef 
-                ifTrue: [ entry invalidate] ].
-
-    "Created: / 13-05-2011 / 09:37:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-invalidateForClass: internalJavaClassName
-"go over all entries and call invalidateForClass on all references"
-
-self do: [:entry | entry isJavaRef ifTrue:[entry invalidateForClass: internalJavaClassName]].
-
-    "Created: / 08-04-2011 / 16:11:36 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
 updateClassRefsFrom:oldClass to:newClass
 owner == oldClass ifTrue:[
     self halt.
@@ -359,11 +223,5 @@
 !JavaConstantPool class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaConstantPool.st,v 1.15 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaConstantPool.st,v 1.15 2011/08/18 18:42:48 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaConstantPool.st,v 1.14 2002-11-22 20:11:58 cg Exp $'
 ! !
-
-JavaConstantPool initialize!
\ No newline at end of file
--- a/JavaContext.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaContext.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+	      All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,37 +8,14 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 Context variableSubclass:#JavaContext
-	instanceVariableNames:'exArg exPC byteCode constPool'
+	instanceVariableNames:'exArg exPC byteCode constPool method'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Languages-Java-Support'
@@ -52,12 +25,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+	      All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,54 +34,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
-! !
-
-!JavaContext methodsFor:'* As yet uncategorized *'!
-
-markForException
-    "set the exception handler flag in the receiver.
-     The JVM needs this to enter an exception handler instead of restarting
-     from the beginning (when the context is restarted).
-     - a highly internal mechanism and not for public use."
-"
-%{  /* NOCONTEXT */
-#ifdef __JAVA_EX_PEND
-     /* actually no longer - only a non-nil exPC is now used as marker */
-     __INST(flags) = (OBJ)((INT)__INST(flags) | __MASKSMALLINT(__JAVA_EX_PEND));
-#endif
-%}
 "
 
-    "Modified: / 13-12-1995 / 19:05:22 / cg"
-    "Modified: / 25-10-2010 / 17:19:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+
 ! !
 
 !JavaContext methodsFor:'ST context mimicri'!
@@ -190,7 +114,7 @@
 	nr notNil ifTrue:[
 	    ^ nr
 	].
-	" '-> 0 [a]' printCR. "
+	" '-> 0 [a]' printCR. " 
 	^0
     ].
 
@@ -200,7 +124,7 @@
 	nr notNil ifTrue:[
 	    ^ nr
 	].
-	" '-> 0 [b]' printCR. "
+	" '-> 0 [b]' printCR. " 
 	^ 0
     ].
 "/ '-> ' print. nr printCR.
@@ -339,7 +263,7 @@
     "Modified: / 13.1.1998 / 17:22:54 / cg"
 !
 
-vars
+vars 
     "return an array filled with the local variables of this context"
 
     |nonVars mySize|
@@ -355,15 +279,6 @@
     "Created: / 13.1.1998 / 16:48:16 / cg"
 ! !
 
-!JavaContext methodsFor:'accessing'!
-
-programmingLanguage
-
-    ^JavaLanguage instance
-
-    "Created: / 17-03-2011 / 10:17:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
 !JavaContext methodsFor:'exception handler support'!
 
 exceptionArg:aJavaException
@@ -377,12 +292,27 @@
     exPC := newPc.
 
     "Created: / 7.1.1998 / 21:36:56 / cg"
+!
+
+markForException
+    "set the exception handler flag in the receiver.
+     The JVM needs this to enter an exception handler instead of restarting
+     from the beginning (when the context is restarted).
+     - a highly internal mechanism and not for public use."
+
+    flags := flags bitOr:16r08000000.
+
+"/ %{  /* NOCONTEXT */
+"/      __INST(flags) = (OBJ)((INT)__INST(flags) | __MASKSMALLINT(__JAVA_EX_PEND));
+"/ %}
+
+    "Modified: 13.12.1995 / 19:05:22 / cg"
 ! !
 
 !JavaContext methodsFor:'printing & storing'!
 
 receiverPrintString
-    "return a string describing the receiver of the context"
+    "return a string describing the receiver of the context" 
 
     |receiverClass receiverClassName newString implementorClass searchClass|
 
@@ -391,7 +321,7 @@
 "/      * special handling for (invalid) free objects.
 "/      * these only appear if some primitiveCode does not correctly use SEND macros,
 "/      * which may lead to sends to free objects. In normal operation, this 'cannot' happen.
-"/      */
+"/      */ 
 "/     if (__isNonNilObject(__INST(receiver)) && (__qClass(__INST(receiver))==nil)) {
 "/         receiverClassName = __MKSTRING("FreeObject");
 "/     }
@@ -404,27 +334,27 @@
 
     receiverClassName := receiverClass nameInBrowser.
     (receiverClass == SmallInteger) ifTrue:[
-	newString := '(' , receiver printString , ') ' , receiverClassName
+        newString := '(' , receiver printString , ') ' , receiverClassName
     ] ifFalse:[
-	newString := receiverClassName
+        newString := receiverClassName
     ].
 
     "
      kludge to avoid slow search for containing class
     "
     (selector ~~ #doIt and:[selector ~~ #doIt:]) ifTrue:[
-	implementorClass := self methodClass.
+        implementorClass := self methodClass. 
     ].
     implementorClass notNil ifTrue: [
-	(implementorClass ~~ receiverClass) ifTrue: [
-	    newString := newString , '>>>',
-			 implementorClass nameInBrowser printString
-	]
+        (implementorClass ~~ receiverClass) ifTrue: [
+            newString := newString , '>>>',
+                         implementorClass nameInBrowser printString
+        ]
     ] ifFalse:[
-	searchClass := self searchClass.
-	searchClass ~~ receiverClass ifTrue:[
-	    newString := newString , '>>>' , searchClass nameInBrowser
-	].
+        searchClass := self searchClass.
+        searchClass ~~ receiverClass ifTrue:[
+            newString := newString , '>>>' , searchClass nameInBrowser
+        ].
 "/        "
 "/         kludge for doIt - these unbound methods are not
 "/         found in the classes methodDictionary
@@ -469,9 +399,5 @@
 !JavaContext class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaContext.st,v 1.36 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaContext.st,v 1.36 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaContext.st,v 1.34 2002-11-22 20:12:40 cg Exp $'
+! !
--- a/JavaDecompiler.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaDecompiler.st	Fri Nov 22 21:14:07 2002 +0100
@@ -19,7 +19,7 @@
 		accessedStaticVars modifiedStaticVars sentMessages'
 	classVariableNames:'DecoderTable'
 	poolDictionaries:''
-	category:'Java-Support-Decompiling'
+	category:'Languages-Java-Support-Decompiling'
 !
 
 !JavaDecompiler class methodsFor:'documentation'!
@@ -1244,6 +1244,7 @@
 !JavaDecompiler class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaDecompiler.st,v 1.48 2000-12-18 16:43:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaDecompiler.st,v 1.49 2002-11-22 20:13:46 cg Exp $'
 ! !
+
 JavaDecompiler initialize!
--- a/JavaEmbeddedFrameView.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaEmbeddedFrameView.st	Fri Nov 22 21:14:07 2002 +0100
@@ -20,7 +20,7 @@
 		autoDestroyApplet isNS40 attributeHashTable appletIsPreloaded'
 	classVariableNames:'NextSequentialAppletID'
 	poolDictionaries:''
-	category:'Java-Views-Support'
+	category:'Languages-Java-Views-Support'
 !
 
 !JavaEmbeddedFrameView class methodsFor:'documentation'!
@@ -653,5 +653,5 @@
 !JavaEmbeddedFrameView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaEmbeddedFrameView.st,v 1.23 2000-12-11 16:23:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaEmbeddedFrameView.st,v 1.24 2002-11-22 20:14:01 cg Exp $'
 ! !
--- a/JavaExceptionTableEntry.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaExceptionTableEntry.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,33 +8,10 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#JavaExceptionTableEntry
@@ -52,12 +25,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,34 +34,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 ! !
 
 !JavaExceptionTableEntry class methodsFor:'instance creation'!
@@ -146,18 +90,6 @@
                                   handlerPC printString , ')'
 
     "Modified: 15.8.1997 / 03:33:51 / cg"
-!
-
-printOn: aStream
-    super printOn: aStream.
-    aStream nextPut:$(.
-    catchType printOn: aStream.
-    aStream nextPutAll:' in ' , startPC printString , '..' ,
-                                  endPC printString , '->' ,
-                                  handlerPC printString , ')'
-
-    "Modified: / 15-08-1997 / 03:33:51 / cg"
-    "Created: / 25-02-2011 / 09:08:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaExceptionTableEntry methodsFor:'private accessing'!
@@ -167,25 +99,14 @@
      return the handler-PC; otherwise, return nil."
 
     |cls|
-    "JV+MH@2011-02-25: You may wonder why there is endPC - 1:
-    The Java VM Spec, 3rd edition, sec 4.7.3, page 78:
 
-    The fact that end_pc is exclusive is a historical mistake in the design of the
-    Java virtual machine: if the Java virtual machine code for a method is exactly
-    65535 bytes long and ends with an instruction that is 1 byte long, then that
-    instruction cannot be protected by an exception handler. A compiler writer can
-    work around this bug by limiting the maximum size of the generated Java
-    virtual machine code for any method, instance initialization method, or static
-    initializer (the size of any code array) to 65534 bytes.
-
-    "
-
-    (pc between:startPC and:endPC - 1) ifTrue:[
+    (pc between:startPC and:endPC) ifTrue:[
         (catchType == 0) ifTrue:[^ handlerPC].
         (catchType isNil) ifTrue:[^ handlerPC].
         cls := aMethod javaClass.
-        catchType := catchType javaClass.
-
+        catchType isUnresolved ifTrue:[
+            catchType := catchType preResolve.
+        ].
         (catchType isKindOf:JavaClass) ifFalse:[
             self halt.
             ^ nil
@@ -197,8 +118,7 @@
     ].
     ^ nil
 
-    "Modified: / 07-01-1998 / 15:30:14 / cg"
-    "Modified: / 31-05-2011 / 09:53:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 7.1.1998 / 15:30:14 / cg"
 !
 
 startPC:start_pc endPC:end_pc handlerPC:handler_pc catchType:catch_type
@@ -213,9 +133,5 @@
 !JavaExceptionTableEntry class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaExceptionTableEntry.st,v 1.16 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaExceptionTableEntry.st,v 1.16 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaExceptionTableEntry.st,v 1.15 2002-11-22 20:12:59 cg Exp $'
+! !
--- a/JavaField.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaField.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,40 +8,16 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
-Object subclass:#JavaField
-	instanceVariableNames:'accessFlags class name descriptor signature index constantValue
-		annotations constantPool'
+JavaRef subclass:#JavaField
+	instanceVariableNames:'accessFlags name signature constantValue'
 	classVariableNames:'A_FINAL A_PRIVATE A_PROTECTED A_PUBLIC A_STATIC A_TRANSIENT
-		A_VOLATILE A_SMALLTALK A_SYBTHETIC A_ENUM FieldTypeClasses'
+		A_VOLATILE A_SMALLTALK'
 	poolDictionaries:''
 	category:'Languages-Java-Reader-Support'
 !
@@ -54,12 +26,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -67,34 +35,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 ! !
 
 !JavaField class methodsFor:'class initialization'!
@@ -107,46 +50,12 @@
     A_FINAL     := 16r0010. "/ JavaClass A_FINAL
     A_VOLATILE  := 16r0040.
     A_TRANSIENT := 16r0080.
-    A_SYBTHETIC := 16r1000.
-    A_ENUM      := 16r4000.
-
-    FieldTypeClasses := IdentityDictionary new
-        "Base types"
-        "/WARNING: If you change something here, you MUST also
-        "/         change JavaDescriptor class>>#initialize !!!!!!
-
-        at: #B  put: Byte;
-        at: #C  put: Character;
-        at: #D  put: Float;
-        at: #F  put: ShortFloat;
-        at: #I  put: Integer;       "Kludge: instances of java int are in fact SmallIntegers"
-        at: #J  put: LargeInteger;
-        at: #S  put: Short;
-        at: #Z  put: Boolean;
-
-        "Array types"
-        "/WARNING: If you change something here, you MUST also
-        "/         change JavaDescriptor class>>#initialize !!!!!!
-        at: #'[B'  put: ByteArray;
-        at: #'[C'  put: Unicode16String;
-        at: #'[D'  put: DoubleArray;
-        at: #'[F'  put: FloatArray;
-        at: #'[I'  put: SignedIntegerArray;       "Kludge: instances of java int are in fact SmallIntegers"
-        at: #'[J'  put: SignedLongIntegerArray;
-        at: #'[S'  put: WordArray;
-        at: #'[Z'  put: BooleanArray;
-
-        yourself
-        
-
-        
 
     "
      self initialize
     "
 
-    "Modified: / 13-05-1998 / 14:44:43 / cg"
-    "Modified: / 10-08-2011 / 00:48:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13.5.1998 / 14:44:43 / cg"
 ! !
 
 !JavaField class methodsFor:'constants'!
@@ -195,26 +104,6 @@
 
 !JavaField methodsFor:'accessing'!
 
-accessFlags
-    ^ accessFlags
-!
-
-annotations
-    ^ annotations
-!
-
-annotations:something
-    annotations := something.
-!
-
-constantPool
-
-    ^ constantPool
-
-    "Created: / 17-12-2010 / 18:40:23 / Marcel Hlopko <hlopik@gmail.com>"
-    "Modified: / 27-07-2011 / 09:38:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 constantValue
     ^ constantValue
 !
@@ -223,35 +112,6 @@
     constantValue := aValue
 !
 
-ensureHasAnnotations
-    annotations ifNil: [ annotations := JavaAnnotationContainer for:self ].
-    ^ annotations
-
-    "Created: / 25-02-2011 / 16:04:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 16-03-2011 / 17:13:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-index
-
-    index ifNil:[
-        self isStatic ifTrue:[
-            index := class class instVarOffsetOf: name
-        ] ifFalse:[
-            index := class instVarOffsetOf: name
-        ].
-    ].
-    ^ index
-
-    "Modified: / 17-08-2011 / 09:26:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-javaClass
-
-    ^ class
-
-    "Created: / 27-07-2011 / 09:17:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 name
     ^ name
 !
@@ -262,7 +122,15 @@
     "Created: / 15.10.1998 / 10:37:06 / cg"
 ! !
 
-!JavaField methodsFor:'initialization'!
+!JavaField methodsFor:'printing & storing'!
+
+displayString
+    ^ self class name , '(name: ' , name displayString , ')'
+
+
+! !
+
+!JavaField methodsFor:'private accessing'!
 
 setAccessFlags:flags
     accessFlags := flags.
@@ -270,41 +138,12 @@
     "Created: 16.4.1996 / 13:04:25 / cg"
 !
 
-setClass: aClass
-
-    class := aClass
-
-    "Created: / 27-07-2011 / 09:27:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-setConstantPool:aJavaContantPool
-
-    constantPool := aJavaContantPool.
-
-    "Created: / 17-12-2010 / 18:41:59 / Marcel Hlopko <hlopik@gmail.com>"
-    "Created: / 27-07-2011 / 09:30:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 setConstantValue:something
     constantValue := something.
 
     "Created: 16.4.1996 / 13:04:58 / cg"
 !
 
-setDescriptor:aString
-
-    descriptor := aString.
-
-    "Created: / 16-04-1996 / 13:04:43 / cg"
-    "Created: / 14-08-2011 / 19:40:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-setIndex:anInteger
-    index := anInteger.
-
-    "Created: / 22-11-2010 / 17:13:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 setName:aString
     name := aString.
 
@@ -317,28 +156,12 @@
     "Created: 16.4.1996 / 13:04:43 / cg"
 ! !
 
-!JavaField methodsFor:'printing & storing'!
-
-printOn: aStream
-
-    super printOn: aStream.
-    aStream 
-        nextPutAll:'(name: ';
-        nextPutAll: name;
-        nextPut:$,; space;
-        nextPutAll:'descriptor: ';
-        nextPutAll: signature;
-        nextPut:$)
-
-    "Created: / 22-05-2011 / 16:07:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
 !JavaField methodsFor:'queries'!
 
 initialValue
-    ^ JavaClass initialValueFromSignature: descriptor
+    ^ JavaClass initialValueFromSignature:signature
 
-    "Modified: / 14-08-2011 / 19:59:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+
 !
 
 isFinal
@@ -384,32 +207,15 @@
 !
 
 type
-    ^ JavaMethod typeFromSignature:descriptor in:nil
-
-    "Modified: / 08-01-1998 / 19:13:22 / cg"
-    "Modified: / 14-08-2011 / 19:43:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
+    ^ JavaMethod typeFromSignature:signature in:nil
 
-typeClass
-
-    ^(JavaDescriptor fromString: descriptor) javaClass.
-
-    "Created: / 23-11-2010 / 17:02:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 14-08-2011 / 19:59:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 8.1.1998 / 19:13:22 / cg"
 ! !
 
 !JavaField class methodsFor:'documentation'!
 
 version
-    ^ '$Id: /cvs/stx/stx/libjava/JavaField.st,v 1.18 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_CVS
-    ^ '§Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaField.st,v 1.17 2009/10/09 14:04:34 cg Exp §'
-!
-
-version_SVN
-    ^ '$Id: JavaField.st,v 1.18 2011/08/18 18:42:48 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaField.st,v 1.16 2002-11-22 20:11:30 cg Exp $'
 ! !
 
-JavaField initialize!
\ No newline at end of file
+JavaField initialize!
--- a/JavaFieldref.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaFieldref.st	Fri Nov 22 21:14:07 2002 +0100
@@ -190,7 +190,7 @@
 !JavaFieldref class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaFieldref.st,v 1.23 2002-11-22 20:11:56 cg Exp $'
 ! !
 
 JavaFieldref initialize!
--- a/JavaInterfaceMethodref.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaInterfaceMethodref.st	Fri Nov 22 21:14:07 2002 +0100
@@ -51,5 +51,5 @@
 !JavaInterfaceMethodref class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaInterfaceMethodref.st,v 1.7 2002-11-22 20:11:26 cg Exp $'
 ! !
--- a/JavaLocalVariableTable.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaLocalVariableTable.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,33 +8,10 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 Array variableSubclass:#JavaLocalVariableTable
@@ -52,12 +25,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,34 +34,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 ! !
 
 !JavaLocalVariableTable methodsFor:'queries'!
@@ -129,9 +73,5 @@
 !JavaLocalVariableTable class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaLocalVariableTable.st,v 1.8 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaLocalVariableTable.st,v 1.8 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaLocalVariableTable.st,v 1.7 2002-11-22 20:12:55 cg Exp $'
+! !
--- a/JavaLocalVariableTableEntry.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaLocalVariableTableEntry.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,33 +8,10 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#JavaLocalVariableTableEntry
@@ -52,12 +25,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,34 +34,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 ! !
 
 !JavaLocalVariableTableEntry methodsFor:'accessing'!
@@ -131,13 +75,6 @@
       , ']'
 
     "Created: / 8.1.1998 / 18:32:30 / cg"
-!
-
-printOn: aStream
-
-    aStream nextPutAll: self displayString
-
-    "Created: / 23-11-2010 / 19:45:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaLocalVariableTableEntry methodsFor:'private accessing'!
@@ -155,9 +92,5 @@
 !JavaLocalVariableTableEntry class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaLocalVariableTableEntry.st,v 1.8 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaLocalVariableTableEntry.st,v 1.8 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaLocalVariableTableEntry.st,v 1.7 2002-11-22 20:12:57 cg Exp $'
+! !
--- a/JavaMethodref.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaMethodref.st	Fri Nov 22 21:14:07 2002 +0100
@@ -250,5 +250,5 @@
 !JavaMethodref class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaMethodref.st,v 1.36 2002-11-22 20:11:44 cg Exp $'
 ! !
--- a/JavaNameandType.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaNameandType.st	Fri Nov 22 21:14:07 2002 +0100
@@ -140,5 +140,5 @@
 !JavaNameandType class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaNameandType.st,v 1.12 2002-11-22 20:11:50 cg Exp $'
 ! !
--- a/JavaPopUpView.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaPopUpView.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1999 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,33 +8,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 PopUpView subclass:#JavaPopUpView
@@ -52,12 +24,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1999 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,34 +33,8 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 !
 
 documentation
@@ -198,9 +140,5 @@
 !JavaPopUpView class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaPopUpView.st,v 1.4 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaPopUpView.st,v 1.4 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaPopUpView.st,v 1.3 2002-11-22 20:13:55 cg Exp $'
+! !
--- a/JavaRef.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaRef.st	Fri Nov 22 21:14:07 2002 +0100
@@ -151,5 +151,5 @@
 !JavaRef class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaRef.st,v 1.19 2002-11-22 20:11:46 cg Exp $'
 ! !
--- a/JavaSlotIndexCache.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaSlotIndexCache.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,33 +8,10 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#JavaSlotIndexCache
@@ -58,12 +31,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -71,34 +40,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 ! !
 
 !JavaSlotIndexCache class methodsFor:'queries'!
@@ -363,9 +307,5 @@
 !JavaSlotIndexCache class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaSlotIndexCache.st,v 1.4 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaSlotIndexCache.st,v 1.4 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaSlotIndexCache.st,v 1.3 2002-11-22 20:13:02 cg Exp $'
+! !
--- a/JavaTopView.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaTopView.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1999 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,33 +8,10 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 StandardSystemView subclass:#JavaTopView
@@ -52,12 +25,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1999 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,34 +34,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 !
 
 documentation
@@ -189,9 +133,5 @@
 !JavaTopView class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaTopView.st,v 1.8 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaTopView.st,v 1.8 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaTopView.st,v 1.7 2002-11-22 20:14:03 cg Exp $'
+! !
--- a/JavaUnresolvedClassConstant.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaUnresolvedClassConstant.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,33 +8,10 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 JavaUnresolvedConstant subclass:#JavaUnresolvedClassConstant
@@ -52,12 +25,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,34 +34,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 ! !
 
 !JavaUnresolvedClassConstant class methodsFor:'instance creation'!
@@ -125,15 +69,6 @@
     "Modified: / 4.2.1998 / 22:13:38 / cg"
 ! !
 
-!JavaUnresolvedClassConstant methodsFor:'* As yet uncategorized *'!
-
-javaClassForNew
-
-    ^self javaClass
-
-    "Created: / 16-03-2011 / 16:09:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
 !JavaUnresolvedClassConstant methodsFor:'accessing'!
 
 className
@@ -179,9 +114,7 @@
 !
 
 javaClass
-    | cls clsName |
-
-    "/fullName first == $[ ifTrue:[self halt].
+    |clsName|
 
     fullName isNil ifTrue:[
         self preResolve.
@@ -189,41 +122,14 @@
             self halt.
         ]
     ].
-    (fullName first = $[) 
-        ifTrue:
-            [cls := (JavaDescriptor fromString: fullName) javaClass]
-        ifFalse:
-            [cls := Java classForName:fullName].
-    constantPool at: constantPoolIndex put: cls.
-    ^cls
-
-    "old code:"
-    "
     (fullName startsWith:$[) ifTrue:[
-        self halt.
-        clsName := self className.
-        (Java classForName:clsName) ifNil:
-            [self error: 'Cannot resolve class ' , clsName].
-        cls := (JavaDescriptor fromString: fullName) javaClass.
+        clsName := self className
     ] ifFalse:[
         clsName := fullName
     ].
-    cls := Java classForName:clsName.
-    constantPool at: constantPoolIndex put: cls.
-    ^cls
-    "
+    ^ Java classForName:clsName.
 
-    "Modified: / 10-11-1998 / 19:29:28 / cg"
-    "Modified: / 11-02-2011 / 07:53:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-lastName
-
-    | idx |
-    idx := fullName lastIndexOf: $/.
-    ^idx ifNil:[fullName] ifNotNil:[fullName copyFrom: idx + 1].
-
-    "Created: / 18-10-2010 / 22:20:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 10.11.1998 / 19:29:28 / cg"
 !
 
 name
@@ -332,7 +238,7 @@
 !JavaUnresolvedClassConstant methodsFor:'resolving'!
 
 preResolve
-    |clsName cls nm ref|
+    |clsName cls nm s ref|
 
     fullName isNil ifTrue:[
         "/ first, resolve my name ...
@@ -342,62 +248,198 @@
         clsName isString ifFalse:[
             self halt:'oops - no class name string in const pool'.
         ].
+
         fullName := clsName
     ].
 
     "/ try to resolve the class
 
-    (fullName size == 1) ifTrue:[
-            "/ good - this is a primitive
-            ref := JavaBuiltInClassPointerRef class:(JavaDescriptor fromString: fullName) javaClass nameandType:fullName.
-            constantPool at:constantPoolIndex put:ref.
-            ^ ref
+    "/ 'resolve: ' print. fullName printCR.
+
+    cls := Java classNamed:fullName.
+    cls notNil ifTrue:[
+        "/ good - the class is already loaded.
+
+        constantPool at:constantPoolIndex put:cls.
+        ^ cls
     ].
 
-    (fullName includes:$[) ifFalse:[
-        cls := Java classNamed:fullName.
-        cls notNil ifTrue:[
-            "/ good - the class is already loaded.
-            constantPool at:constantPoolIndex put:cls.
-            ^ cls
+    fullName size == 2 ifTrue:[
+        "/ look for specials like byte[], int[] etc.
+        "/ there are only a few of them - forgive me nameing them here ...
+        fullName = '[B' ifTrue:[    "/ byte[]
+            ref := JavaBuiltInClassPointerRef class:ByteArray nameandType:fullName.
+            constantPool at:constantPoolIndex put:ref.
+            ^ ref
+        ].
+        fullName = '[Z' ifTrue:[    "/ boolean[]
+            ref := JavaBuiltInClassPointerRef class:ByteArray nameandType:fullName.
+            constantPool at:constantPoolIndex put:ref.
+            ^ ref
+        ].
+        fullName = '[I' ifTrue:[     "/ int[]
+            ref := JavaBuiltInClassPointerRef class:SignedIntegerArray nameandType:fullName.
+            constantPool at:constantPoolIndex put:ref.
+            ^ ref
         ].
-    ] ifTrue:[
-        "
-            Deal with Sun's malformed class refs generated by
-            sun.misc.ProxyGenerator -  it generates
-            java/lang/annotation/ElementType[] instead of
-            [Ljava/lang/annotation/ElementType[];
-            as the spec requires!!
-        "
-        (fullName last == $] and:[(fullName at: fullName size - 1) == $[]) ifTrue:
-            [fullName := '[L', (fullName copyTo: fullName size - 2) , ';'].
-
-        (fullName includes: $L) ifFalse:[
-            "/ good - this is a primitive array
-            ref := JavaBuiltInClassPointerRef class:(JavaDescriptor fromString: fullName) javaClass nameandType:fullName.
+        fullName = '[J' ifTrue:[     "/ long[]
+            ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+            constantPool at:constantPoolIndex put:ref.
+            ^ ref
+        ].
+        fullName = '[S' ifTrue:[     "/ short[]
+            ref := JavaBuiltInClassPointerRef class:SignedWordArray nameandType:fullName.
+            constantPool at:constantPoolIndex put:ref.
+            ^ ref
+        ].
+        fullName = '[C' ifTrue:[     "/ char[]
+            "/ should be TwoByteString ...
+            ref := JavaBuiltInClassPointerRef class:String nameandType:fullName.
+            constantPool at:constantPoolIndex put:ref.
+            ^ ref
+        ].
+        fullName = '[F' ifTrue:[     "/ float[]
+            ref := JavaBuiltInClassPointerRef class:FloatArray nameandType:fullName.
+            constantPool at:constantPoolIndex put:ref.
+            ^ ref
+        ].
+        fullName = '[D' ifTrue:[     "/ double[]
+            ref := JavaBuiltInClassPointerRef class:DoubleArray nameandType:fullName.
             constantPool at:constantPoolIndex put:ref.
             ^ ref
         ].
     ].
 
+    (fullName startsWith:$[) ifTrue:[
+        "/ a ref for newarray or new
 
-    (fullName startsWith:$[) ifFalse:[
+        s := fullName readStream.
+        [s peek == $[ ] whileTrue:[
+            s next
+        ].
+        nm := s upToEnd.
+
+        (nm startsWith:$L) ifFalse:[
+            nm = 'F' ifTrue:[    "/ float[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            nm = 'D' ifTrue:[    "/ double[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            nm = 'I' ifTrue:[    "/ int[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            nm = 'C' ifTrue:[    "/ char[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            nm = 'B' ifTrue:[    "/ byte[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            nm = 'Z' ifTrue:[    "/ bool[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            nm = 'S' ifTrue:[    "/ short[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            self halt.
+        ].
+        nm := nm copyFrom:2.
+        (nm endsWith:$;) ifFalse:[
+            self halt.
+        ].
+        nm := nm copyWithoutLast:1.
+
+        cls := Java classNamed:nm.
+        cls notNil ifTrue:[
+            ref := JavaClassPointerRef class:cls nameandType:fullName.
+            constantPool at:constantPoolIndex put:ref.
+            ^ ref
+        ].
+        self rememberForResolveWith:nm.
+        ^ self.
+
+        nm := JavaMethod retvalSpecFromStream:(ReadStream on:fullName) in:nil.
+        [nm endsWith:'[]'] whileTrue:[
+            nm := nm copyWithoutLast:2
+        ].
+
+        cls := Java classNamed:nm.
+        cls notNil ifTrue:[
+            ref := JavaClassPointerRef class:cls nameandType:fullName.
+            constantPool at:constantPoolIndex put:ref.
+            ^ ref
+        ].
+
+        (fullName startsWith:'[[') ifTrue:[
+            fullName = '[[F' ifTrue:[    "/ float[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            fullName = '[[D' ifTrue:[    "/ double[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            fullName = '[[I' ifTrue:[    "/ int[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            fullName = '[[C' ifTrue:[    "/ char[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            fullName = '[[B' ifTrue:[    "/ byte[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            fullName = '[[Z' ifTrue:[    "/ bool[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+            fullName = '[[S' ifTrue:[    "/ short[][]
+                ref := JavaBuiltInClassPointerRef class:Array nameandType:fullName.
+                constantPool at:constantPoolIndex put:ref.
+                ^ ref
+            ].
+        ].
+        (fullName startsWith:'[L') ifFalse:[
+            (fullName startsWith:'[[L') ifFalse:[
+                ('JAVA: oops - unresolvable funny class: ' , fullName) errorPrintCR.
+                self halt.
+            ]
+        ]
+    ] ifFalse:[
         nm := self className.
-        self rememberForResolveWith:nm.            
     ].
+
+    self rememberForResolveWith:nm.
     ^ self
 
-    "Created: / 15-04-1996 / 15:51:42 / cg"
-    "Modified: / 06-07-1999 / 23:41:04 / cg"
-    "Modified: / 11-02-2011 / 10:41:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 15.4.1996 / 15:51:42 / cg"
+    "Modified: / 6.7.1999 / 23:41:04 / cg"
 ! !
 
 !JavaUnresolvedClassConstant class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaUnresolvedClassConstant.st,v 1.44 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaUnresolvedClassConstant.st,v 1.44 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaUnresolvedClassConstant.st,v 1.43 2002-11-22 20:11:24 cg Exp $'
+! !
--- a/JavaUnresolvedConstant.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaUnresolvedConstant.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,33 +8,10 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#JavaUnresolvedConstant
@@ -52,12 +25,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,34 +34,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 ! !
 
 !JavaUnresolvedConstant class methodsFor:'instance creation'!
@@ -302,9 +246,5 @@
 !JavaUnresolvedConstant class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaUnresolvedConstant.st,v 1.13 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaUnresolvedConstant.st,v 1.13 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaUnresolvedConstant.st,v 1.12 2002-11-22 20:11:32 cg Exp $'
+! !
--- a/JavaUnresolvedFieldrefConstant.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaUnresolvedFieldrefConstant.st	Fri Nov 22 21:14:07 2002 +0100
@@ -158,5 +158,5 @@
 !JavaUnresolvedFieldrefConstant class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaUnresolvedFieldrefConstant.st,v 1.13 2002-11-22 20:11:42 cg Exp $'
 ! !
--- a/JavaUnresolvedInterfaceMethodrefConstant.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaUnresolvedInterfaceMethodrefConstant.st	Fri Nov 22 21:14:07 2002 +0100
@@ -42,5 +42,5 @@
 !JavaUnresolvedInterfaceMethodrefConstant class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaUnresolvedInterfaceMethodrefConstant.st,v 1.5 2002-11-22 20:11:52 cg Exp $'
 ! !
--- a/JavaUnresolvedMethodrefConstant.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaUnresolvedMethodrefConstant.st	Fri Nov 22 21:14:07 2002 +0100
@@ -18,7 +18,7 @@
 	instanceVariableNames:'classIndex'
 	classVariableNames:''
 	poolDictionaries:''
-	category:'Java-Reader-Support'
+	category:'Languages-Java-Reader-Support'
 !
 
 !JavaUnresolvedMethodrefConstant class methodsFor:'documentation'!
@@ -252,5 +252,5 @@
 !JavaUnresolvedMethodrefConstant class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaUnresolvedMethodrefConstant.st,v 1.15 2001-04-24 14:23:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaUnresolvedMethodrefConstant.st,v 1.16 2002-11-22 20:11:36 cg Exp $'
 ! !
--- a/JavaUnresolvedNameandTypeConstant.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaUnresolvedNameandTypeConstant.st	Fri Nov 22 21:14:07 2002 +0100
@@ -86,5 +86,5 @@
 !JavaUnresolvedNameandTypeConstant class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaUnresolvedNameandTypeConstant.st,v 1.6 2002-11-22 20:11:38 cg Exp $'
 ! !
--- a/JavaUnresolvedRefConstant.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaUnresolvedRefConstant.st	Fri Nov 22 21:14:07 2002 +0100
@@ -50,5 +50,5 @@
 !JavaUnresolvedRefConstant class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaUnresolvedRefConstant.st,v 1.6 2002-11-22 20:11:40 cg Exp $'
 ! !
--- a/JavaUnresolvedSTArrayConstant.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaUnresolvedSTArrayConstant.st	Fri Nov 22 21:14:07 2002 +0100
@@ -60,5 +60,5 @@
 !JavaUnresolvedSTArrayConstant class methodsFor:'documentation'!
 
 version
-    ^ '$Id$'
+    ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaUnresolvedSTArrayConstant.st,v 1.2 2002-11-22 20:11:54 cg Exp $'
 ! !
--- a/JavaUnresolvedStringConstant.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaUnresolvedStringConstant.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,33 +8,10 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 JavaUnresolvedConstant subclass:#JavaUnresolvedStringConstant
@@ -52,12 +25,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,34 +34,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 ! !
 
 !JavaUnresolvedStringConstant class methodsFor:'instance creation'!
@@ -123,7 +67,7 @@
         chars isString ifFalse:[
             self halt:'should not happen'
         ].
-        jString := JavaVM javaStringObjectForString:chars interned:true.
+        jString := Java as_String:chars.
 
 "/constantPool owner == (Java at:'java/awt/Container') ifTrue:[
 "/self halt
@@ -136,16 +80,11 @@
     self rememberForResolveWith:'java/lang/String'.
     ^ self
 
-    "Modified: / 07-08-1997 / 21:17:23 / cg"
-    "Modified: / 10-08-2011 / 23:28:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: 7.8.1997 / 21:17:23 / cg"
 ! !
 
 !JavaUnresolvedStringConstant class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaUnresolvedStringConstant.st,v 1.9 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaUnresolvedStringConstant.st,v 1.9 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaUnresolvedStringConstant.st,v 1.8 2002-11-22 20:11:48 cg Exp $'
+! !
--- a/JavaVM.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaVM.st	Fri Nov 22 21:14:07 2002 +0100
@@ -39,7 +39,7 @@
 		NullPointerExceptionDebug DivisionByZeroExceptionDebug
 		IOExceptionDebug StdinReplacementFileQuerySignal'
 	poolDictionaries:''
-	category:'Java-Support'
+	category:'Languages-Java-Support'
 !
 
 !JavaVM class methodsFor:'documentation'!
@@ -12847,6 +12847,7 @@
 !JavaVM class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaVM.st,v 1.180 2000-12-31 12:27:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaVM.st,v 1.181 2002-11-22 20:12:48 cg Exp $'
 ! !
+
 JavaVM initialize!
--- a/JavaView.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaView.st	Fri Nov 22 21:14:07 2002 +0100
@@ -18,7 +18,7 @@
 	instanceVariableNames:'eventReceiver updateRegions javaPeer'
 	classVariableNames:''
 	poolDictionaries:''
-	category:'Java-Views-Support'
+	category:'Languages-Java-Views-Support'
 !
 
 !JavaView class methodsFor:'documentation'!
@@ -255,5 +255,5 @@
 !JavaView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaView.st,v 1.22 2001-07-20 12:17:59 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaView.st,v 1.23 2002-11-22 20:14:05 cg Exp $'
 ! !
--- a/SmalltalkAppletContext.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/SmalltalkAppletContext.st	Fri Nov 22 21:14:07 2002 +0100
@@ -9,6 +9,10 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
+
+
+
+
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#SmalltalkAppletContext
@@ -108,9 +112,5 @@
 !SmalltalkAppletContext class methodsFor:'documentation'!
 
 version
-    ^ '$Id: SmalltalkAppletContext.st,v 1.10 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: SmalltalkAppletContext.st,v 1.10 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/SmalltalkAppletContext.st,v 1.9 2002-11-22 20:13:53 cg Exp $'
+! !
--- a/SmalltalkAppletStub.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/SmalltalkAppletStub.st	Fri Nov 22 21:14:07 2002 +0100
@@ -9,6 +9,10 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
+
+
+
+
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#SmalltalkAppletStub
@@ -182,9 +186,5 @@
 !SmalltalkAppletStub class methodsFor:'documentation'!
 
 version
-    ^ '$Id: SmalltalkAppletStub.st,v 1.10 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: SmalltalkAppletStub.st,v 1.10 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/SmalltalkAppletStub.st,v 1.9 2002-11-22 20:14:07 cg Exp $'
+! !