Mainly fixes:
- JavaMonitor: fix for timeouting (0 timeout mans forever)
- JavaTestCaseProxy: readded lost method
- JavaMethodWrapperCompiler: initial version, not finished
- JavaFieldDescriptor>>#javaClassName
--- a/src/JavaFieldDescriptor.st Fri Nov 25 16:28:39 2011 +0000
+++ b/src/JavaFieldDescriptor.st Sat Nov 26 08:22:25 2011 +0000
@@ -79,9 +79,17 @@
!
javaClassName
- ^ javaClassName upTo: $<
- "Modified: / 13-08-2011 / 01:24:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ javaClassName notNil ifTrue:[
+ ^ javaClassName upTo: $<
+ ].
+ javaClass notNil ifTrue:[
+ ^ javaClass name
+ ].
+
+ self error:'javaClassName nor javaClass set'
+
+ "Modified: / 25-11-2011 / 23:43:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
javaClassObject
--- a/src/JavaLibraries.st Fri Nov 25 16:28:39 2011 +0000
+++ b/src/JavaLibraries.st Sat Nov 26 08:22:25 2011 +0000
@@ -98,7 +98,7 @@
(OperatingSystem
executeCommand:('svn update "%1" "%2"' bindWith: self url with: self directory asString))
ifFalse:
- [self error: 'Cannot update libraries!!'. ^self].
+ [self error: 'Cannot update libraries!!' mayProceed: true. ^self].
"Created: / 08-04-2011 / 16:38:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/JavaMethodWrapperCompiler.st Sat Nov 26 08:22:25 2011 +0000
@@ -0,0 +1,321 @@
+"
+ COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+ SWING Research Group, Czech Technical University in Prague
+
+ 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.
+
+ [1] Code written at SWING Research Group contains a signature
+ of one of the above copright owners. For exact set of such code,
+ see the differences between this version and version stx:libjava
+ as of 1.9.2010
+"
+"{ Package: 'stx:libjava' }"
+
+Java subclass:#JavaMethodWrapperCompiler
+ instanceVariableNames:'method source'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'Languages-Java-Lookup'
+!
+
+!JavaMethodWrapperCompiler class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+ SWING Research Group, Czech Technical University in Prague
+
+ 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.
+
+ [1] Code written at SWING Research Group contains a signature
+ of one of the above copright owners. For exact set of such code,
+ see the differences between this version and version stx:libjava
+ as of 1.9.2010
+
+"
+!
+
+documentation
+"
+ Helper class responsible for compiling wrapper methods
+ that wraps/unwraps java methods. It compiles both,
+ wrappers callable from smalltalk that calls Java method
+ and vice versa. For details, refer documentation in
+ #compileSmalltalk:toJava: and #compileJava:toSmalltalk:
+
+ NOTE: Experimental.
+
+ [author:]
+ Jan Vrany <jan.vrany@fit.cvut.cz>
+
+ [instance variables:]
+ method a __JAVA__ for which to compile a
+ wrapper.
+
+ [class variables:]
+
+ [see also:]
+
+"
+! !
+
+!JavaMethodWrapperCompiler class methodsFor:'instance creation'!
+
+new
+ "return an initialized instance"
+
+ ^ self basicNew initialize.
+! !
+
+!JavaMethodWrapperCompiler methodsFor:'accessing'!
+
+method
+ ^ method
+!
+
+method:aJavaMethod
+
+ self assert: aJavaMethod isJavaMethod
+ description:'Not a Java method'.
+ method := aJavaMethod.
+
+ "Modified: / 25-11-2011 / 20:15:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaMethodWrapperCompiler methodsFor:'coding'!
+
+codeArgument: index descriptor: descriptor
+
+ "Code one argument, whose type is described by
+ a descriptor"
+
+ | nm |
+ nm := descriptor javaClassName asSymbol.
+ nm == #'java.lang.Byte' ifTrue:[
+ self code:'(JavaByte javaBox: arg%1) .' with: index.
+ self codeCR.
+ ^self.
+ ].
+ nm == #'java.lang.Short' ifTrue:[
+ self code:'(JavaShort javaBox: arg%1) .' with: index.
+ self codeCR.
+ ^self.
+ ].
+ nm == #'java.lang.Integer' ifTrue:[
+ self code:'(Integer javaBox: arg%1) .' with: index.
+ self codeCR.
+ ^self.
+ ].
+ nm == #'java.lang.Long' ifTrue:[
+ self code:'(LargeInteger javaBox: arg%1) .' with: index.
+ self codeCR.
+ ^self.
+ ].
+ nm == #'java.lang.Character' ifTrue:[
+ self code:'(Character javaBox: arg%1) .' with: index.
+ self codeCR.
+ ^self.
+ ].
+ nm == #'java.lang.Boolean' ifTrue:[
+ self code:'(Boolean javaBox: arg%1) .' with: index.
+ self codeCR.
+ ^self.
+ ].
+ nm == #'LargeInteger' ifTrue:[
+ "long occupies two slots"
+ self code:'(arg%1) . nil .'.
+ self codeCR.
+ ^self.
+ ].
+ nm == #'Float' ifTrue:[
+ "long occupies two slots"
+ self code:'(arg%1) . nil .'.
+ self codeCR.
+ ^self.
+ ].
+ self code:'(arg%1) .'.
+
+ "Created: / 25-11-2011 / 23:36:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+codeArgumentTypeCheck: index descriptor: descriptor
+
+ self code:'"/ typecheck for arg%1 type %2' with: index with: descriptor javaClassName.
+ self code:'(JavaVM canCast: arg%1 class to: (JavaVM classForName: #''%2'') ifFalse:['
+ with: index with: descriptor javaClassName.
+ self codeTab; code: 'self error:''Invalid argument type''.^nil'.
+ self code: ']'.
+ self codeCRCR.
+
+ "Created: / 25-11-2011 / 23:10:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+codeMethodHeader: selector
+
+ selector isUnarySelector ifTrue:[
+ self code: selector.
+ ] ifFalse:[
+ selector keywords withIndexDo:[:kw :i|
+ self code: '%1: arg%2' with: kw with: i.
+ ].
+ ].
+ source cr; cr.
+
+ "Created: / 25-11-2011 / 20:38:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaMethodWrapperCompiler methodsFor:'coding-helpers'!
+
+code: string
+
+ source nextPutAll: string
+
+ "Created: / 25-11-2011 / 20:42:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+code: string with: arg
+
+ source nextPutAll: (string bindWith: arg)
+
+ "Created: / 25-11-2011 / 20:42:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+code: string with: arg1 with: arg2
+
+ source nextPutAll: (string bindWith: arg1 with: arg2)
+
+ "Created: / 25-11-2011 / 20:42:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+code: string with: arg1 with: arg2 with: arg3
+
+ source nextPutAll: (string bindWith: arg1 with: arg2 with: arg3)
+
+ "Created: / 25-11-2011 / 20:42:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+code: string with: arg1 with: arg2 with: arg3 with: arg4
+
+ source nextPutAll: (string bindWith: arg1 with: arg2 with: arg3 with: arg4)
+
+ "Created: / 25-11-2011 / 20:42:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+codeCR
+
+ source cr
+
+ "Created: / 25-11-2011 / 20:48:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+codeCRCR
+
+ source cr; cr.
+
+ "Created: / 25-11-2011 / 20:48:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+codeTab
+
+ source tab
+
+ "Created: / 25-11-2011 / 20:47:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaMethodWrapperCompiler methodsFor:'compiling'!
+
+compileJava: javaSelector toSmalltalk: smalltalkSelector
+
+ "Created: / 25-11-2011 / 20:09:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+compileSmalltalk: smalltalkSelector toJava: javaSelector
+
+ "Compiles a method with smalltalk selector that calls
+ java method is java object.
+
+ Compiled method looks like:
+ 1) check the type of each argument, if they do not
+ match, throw an error (for now, we can be smarter)
+ 2) box each argument, if neccessary
+ 3) self-send javaSelector
+ 4) unbox the return value (if it returns a wrapper object)
+ "
+
+ | mdescriptor |
+ mdescriptor := method descriptor.
+
+ self codeMethodHeader: smalltalkSelector.
+ self code:'| retval |'; codeCRCR.
+ "/code type checks
+ mdescriptor parameters withIndexDo:[:descriptor :index|
+ self codeArgumentTypeCheck: index descriptor: descriptor.
+ ].
+
+ "/code self send with inlined boxing
+ self code:'retval := self'; codeCR.
+ self codeTab; code:'perform: '; code: javaSelector asSymbol storeString; codeCR.
+ smalltalkSelector isUnarySelector ifFalse:[
+ self codeTab; code: 'withArguments: { '; codeCR.
+ mdescriptor parameters withIndexDo:[:descriptor :index|
+ self codeArgument: index descriptor: descriptor.
+ ].
+ self codeTab; code: '}'.
+ ].
+ self code:'.'; codeCR.
+ "TODO: Should code unbox here..."
+ self code:'^ retval'.
+
+ ^self compile
+
+ "Created: / 25-11-2011 / 20:09:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaMethodWrapperCompiler methodsFor:'compiling-private'!
+
+compile
+
+ "Actually compiles the source"
+
+ self halt:'Not yet implemented'
+
+ "Created: / 25-11-2011 / 20:25:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaMethodWrapperCompiler methodsFor:'initialization'!
+
+initialize
+ "Invoked when a new instance is created."
+
+ "/ please change as required (and remove this comment)
+ "/ method := nil.
+ source := (String new: 100) writeStream.
+
+ "/ super initialize. -- commented since inherited method does nothing
+
+ "Modified: / 25-11-2011 / 20:24:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaMethodWrapperCompiler class methodsFor:'documentation'!
+
+version_SVN
+ ^ '$Id$'
+! !
--- a/src/JavaMonitor.st Fri Nov 25 16:28:39 2011 +0000
+++ b/src/JavaMonitor.st Sat Nov 26 08:22:25 2011 +0000
@@ -269,11 +269,17 @@
self assert: (self isOwnedBy: thisProcess).
self processesWaitingAdd: thisProcess.
self releaseAll.
- waitingSema waitWithTimeoutMs: timeOut.
+ "JV@2011-11-25: zero timeout means wait without timeout!!!!!!"
+ timeOut == 0 ifTrue:[
+ waitingSema wait
+ ] ifFalse:[
+ waitingSema waitWithTimeoutMs: timeOut
+ ].
self acquire.
self processesWaitingRestore: thisProcess.
"Created: / 22-11-2011 / 12:52:45 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified (comment): / 25-11-2011 / 18:30:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaMonitor methodsFor:'queries'!
--- a/src/JavaTestCaseProxy.st Fri Nov 25 16:28:39 2011 +0000
+++ b/src/JavaTestCaseProxy.st Sat Nov 26 08:22:25 2011 +0000
@@ -64,8 +64,136 @@
"
! !
+!JavaTestCaseProxy class methodsFor:'initialization'!
+
+initialize
+
+ TestCases := Dictionary new.
+
+ "Created: / 01-03-2011 / 10:43:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+setJavaClassName: aSymbol
+
+ javaClassName ifNotNil:
+ [self error: 'Attempting to set java class name twice'].
+ javaClassName := aSymbol.
+
+ "Created: / 01-03-2011 / 10:43:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaTestCaseProxy class methodsFor:'accessing'!
+
+javaClass
+
+ ^Java classForName: javaClassName
+
+ "Created: / 01-03-2011 / 11:30:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 21-06-2011 / 17:09:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+javaClassName
+
+ ^javaClassName
+
+ "Created: / 01-03-2011 / 11:30:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+shouldFork
+ ^ shouldFork ? false
+
+ "Modified: / 13-06-2011 / 16:34:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+shouldFork:aBoolean
+ shouldFork := aBoolean.
+!
+
+sunitName
+
+ ^javaClassName
+
+ "Created: / 10-08-2011 / 21:21:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaTestCaseProxy class methodsFor:'private'!
+
+testSelectors
+ "raise an error: must be redefined in concrete subclass(es)"
+
+ ^ self subclassResponsibility
+! !
+
+!JavaTestCaseProxy class methodsFor:'queries'!
+
+isAbstract
+
+ ^self == JavaTestCaseProxy or:[self superclass == JavaTestCaseProxy]
+
+ "Created: / 21-06-2011 / 16:56:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isTestlet
+
+ ^false
+
+ "Created: / 21-06-2011 / 16:57:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaTestCaseProxy class methodsFor:'subclass creation'!
+
+for: javaClass
+
+ self subclassResponsibility
+
+ "Modified: / 21-06-2011 / 17:08:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+forClassNamed: name
+ "Answers a new (anonymous) testcase proxy for
+ given javaClass"
+
+ | meta cls |
+ TestCases at: name ifPresent: [:c | ^ c ].
+ meta := Metaclass new.
+ meta setSuperclass: self class.
+ meta instSize: self class instSize.
+ cls := meta new.
+ cls setSuperclass: self.
+ cls flags: self flags.
+ cls instSize: self instSize.
+ cls setJavaClassName: name.
+ cls
+ setName: (self name , ' for: (Java classForName: ' , name storeString
+ , ')') asSymbol.
+ cls setCategory: #'(java test case proxies)'.
+ TestCases at: name put: cls.
+ ^ cls
+
+ "Modified: / 03-03-2011 / 00:20:49 / Marcel Hlopko <hlopik@gmail.com>"
+ "Modified: / 29-04-2011 / 10:21:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Created: / 21-06-2011 / 17:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaTestCaseProxy methodsFor:'accessing'!
+
+javaClass
+
+ | javaClass |
+
+ self
+ assert: (javaClass := self class javaClass) isJavaClass
+ description: 'java class does not exists'.
+ ^javaClass
+
+ "Created: / 01-03-2011 / 14:48:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+
+! !
+
!JavaTestCaseProxy class methodsFor:'documentation'!
version_SVN
^ '$Id$'
! !
+
+JavaTestCaseProxy initialize!
--- a/src/JavaVM.st Fri Nov 25 16:28:39 2011 +0000
+++ b/src/JavaVM.st Sat Nov 26 08:22:25 2011 +0000
@@ -15676,7 +15676,9 @@
<javanative: 'sun/misc/Unsafe' name: 'pageSize'>
- ^ UnimplementedNativeMethodSignal raise
+ ^ 4096"4K is the page size on x86, I think... "
+
+ "Modified: / 25-11-2011 / 19:24:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
_sun_misc_Unsafe_park: nativeContext
@@ -15935,6 +15937,13 @@
"Created: / 25-10-2010 / 16:14:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+_sun_misc_Unsafe_setMemory: nativeContext
+
+ <javanative: 'sun/misc/Unsafe' name: 'setMemory(JJB)V'>
+
+ ^ UnimplementedNativeMethodSignal raise
+!
+
_sun_misc_Unsafe_staticFieldBase: nativeContext
<javanative: 'sun/misc/Unsafe' name: 'staticFieldBase(Ljava/lang/reflect/Field;)Ljava/lang/Object;'>
@@ -16069,11 +16078,17 @@
ctor := aJavaContext argAt: 1.
args := aJavaContext argAt: 2.
method := self reflection methodForJavaConstructorObject: ctor.
+
+ method numArgs ~~ args size ifTrue:[
+ self throwExceptionClassName: 'java.lang.InvocationTargetException'
+ withMessage: 'invalid number of parameters '
+ ].
+
descriptor := method descriptor.
"Possibly box/unbox arguments"
args notEmptyOrNil ifTrue:[
- adescriptors := descriptor parameters.
+ adescriptors := descriptor parameters.
bargs := Array new: args size.
1 to: args size do:[:i|
| cls |
@@ -16104,7 +16119,7 @@
"Created: / 26-11-2010 / 11:41:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 09-02-2011 / 01:12:10 / Marcel Hlopko <hlopik@gmail.com>"
- "Modified: / 22-11-2011 / 14:42:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 25-11-2011 / 19:21:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
_sun_reflect_NativeMethodAccessorImpl_invoke0: nativeContext
--- a/src/Make.proto Fri Nov 25 16:28:39 2011 +0000
+++ b/src/Make.proto Sat Nov 26 08:22:25 2011 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-11-25 09:04:48.880.
+# automagically generated from the projectDefinition: stx_libjava at 2011-11-26 09:22:10.069.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/squeak/petitparser -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libhtml
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/java/java/util/concurrent/locks -I$(INCLUDE_TOP)/java/gnu/testlet/java/io/Serializable -I$(INCLUDE_TOP)/java/java/lang/reflect -I$(INCLUDE_TOP)/java/java/util/concurrent/atomic -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/java/java/nio/charset -I$(INCLUDE_TOP)/java/gnu/testlet/java/lang/Class -I$(INCLUDE_TOP)/java/java/security -I$(INCLUDE_TOP)/java/java/nio -I$(INCLUDE_TOP)/java/sun/nio/cs -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/java/java/nio/charset/spi -I$(INCLUDE_TOP)/java/gnu/testlet/java/lang/reflect/sub -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/java/java/util -I$(INCLUDE_TOP)/java/gnu/testlet/java/io/LineNumberReader -I$(INCLUDE_TOP)/java/java/lang -I$(INCLUDE_TOP)/squeak/petitparser -I$(INCLUDE_TOP)/java/java/lang/ref -I$(INCLUDE_TOP)/java/java/util/logging -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/java/java/util/regex -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/java/gnu/testlet/java/lang/String -I$(INCLUDE_TOP)/stx/libhtml -I$(INCLUDE_TOP)/java/gnu/testlet/java/util/Scanner -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/java/java/net -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/java/junit/framework -I$(INCLUDE_TOP)/java/sun/reflect -I$(INCLUDE_TOP)/java/gnu/testlet/java/io/ObjectInputOutput -I$(INCLUDE_TOP)/java/gnu/testlet/java/nio/channels/FileChannel -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/java/gnu/testlet/java/lang/reflect/Method -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/java/gnu/testlet -I$(INCLUDE_TOP)/java/sun/util -I$(INCLUDE_TOP)/java/java/io -I$(INCLUDE_TOP)/java/gnu/testlet/java/lang/Character -I$(INCLUDE_TOP)/java/gnu/testlet/java/io/ObjectStreamClass
# if you need any additional defines for embedded C code,
@@ -163,7 +163,6 @@
$(OUTDIR)JavaNode.$(O) JavaNode.$(H): JavaNode.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaObject.$(O) JavaObject.$(H): JavaObject.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaObjectDictionary.$(O) JavaObjectDictionary.$(H): JavaObjectDictionary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaPackage.$(O) JavaPackage.$(H): JavaPackage.st $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaParseResult.$(O) JavaParseResult.$(H): JavaParseResult.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaPopUpView.$(O) JavaPopUpView.$(H): JavaPopUpView.st $(INCLUDE_TOP)/stx/libview/PopUpView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaProcess.$(O) JavaProcess.$(H): JavaProcess.st $(INCLUDE_TOP)/stx/libbasic/Process.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -220,7 +219,9 @@
$(OUTDIR)JavaMethodDeclaratorNode.$(O) JavaMethodDeclaratorNode.$(H): JavaMethodDeclaratorNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)/stx/libjava/JavaDescriptor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaMethodWrapperCompiler.$(O) JavaMethodWrapperCompiler.$(H): JavaMethodWrapperCompiler.st $(INCLUDE_TOP)/stx/libjava/Java.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaPackage.$(O) JavaPackage.$(H): JavaPackage.st $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/java/java/util/java/util/HashMap$HashIterator.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaObject.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__sun__nio.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__sun.$(H) $(INCLUDE_TOP)/java/java/io/java/io/ByteArrayOutputStream.$(H) $(INCLUDE_TOP)/java/java/io/java/io/OutputStream.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__sun__security.$(H) $(INCLUDE_TOP)/java/java/io/java/io/InputStream.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/LineNumberReader/gnu/testlet/java/io/LineNumberReader/Test2$LineReaderTest.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/ClassLoader.$(H) $(INCLUDE_TOP)/java/java/lang/reflect/java/lang/reflect/AccessibleObject.$(H) $(INCLUDE_TOP)/java/java/util/java/util/Properties.$(H) $(INCLUDE_TOP)/java/java/util/java/util/Hashtable.$(H) $(INCLUDE_TOP)/java/java/util/java/util/Dictionary.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__util.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu.$(H) $(INCLUDE_TOP)/java/java/security/java/security/BasicPermission.$(H) $(INCLUDE_TOP)/java/java/security/java/security/Permission.$(H) $(INCLUDE_TOP)/java/java/util/java/util/Vector.$(H) $(INCLUDE_TOP)/java/java/util/java/util/AbstractList.$(H) $(INCLUDE_TOP)/java/java/util/java/util/AbstractCollection.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__util__regex.$(H) $(INCLUDE_TOP)/java/java/io/java/io/ObjectOutputStream.$(H) $(INCLUDE_TOP)/java/java/net/java/net/URLStreamHandler.$(H) $(INCLUDE_TOP)/java/java/util/java/util/AbstractSequentialList.$(H) $(INCLUDE_TOP)/java/junit/framework/junit/framework/Assert.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__cz__cvut__fit__swing.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__cz__cvut__fit.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__cz__cvut.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__cz.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__java__nio__charset.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__java__nio.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__java.$(H) $(INCLUDE_TOP)/java/java/util/logging/java/util/logging/ErrorManager.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__util__zip.$(H) $(INCLUDE_TOP)/java/java/nio/java/nio/MappedByteBuffer.$(H) $(INCLUDE_TOP)/java/java/nio/java/nio/ByteBuffer.$(H) $(INCLUDE_TOP)/java/java/nio/java/nio/Buffer.$(H) $(INCLUDE_TOP)/java/java/util/concurrent/atomic/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__lang.$(H) $(INCLUDE_TOP)/java/java/io/java/io/Writer.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/Exception.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/Throwable.$(H) $(INCLUDE_TOP)/java/java/util/java/util/ResourceBundle.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/lang/Character/gnu/testlet/java/lang/Character/UnicodeBase.$(H) $(INCLUDE_TOP)/java/java/io/java/io/Reader.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/CharacterData.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/ThreadLocal.$(H) $(INCLUDE_TOP)/java/java/util/concurrent/locks/java/util/concurrent/locks/ReentrantLock$Sync.$(H) $(INCLUDE_TOP)/java/java/util/concurrent/locks/java/util/concurrent/locks/AbstractQueuedSynchronizer.$(H) $(INCLUDE_TOP)/java/java/util/concurrent/locks/java/util/concurrent/locks/AbstractOwnableSynchronizer.$(H) $(INCLUDE_TOP)/java/java/io/java/io/FilterInputStream.$(H) $(INCLUDE_TOP)/java/java/net/java/net/URLClassLoader.$(H) $(INCLUDE_TOP)/java/java/security/java/security/SecureClassLoader.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__nio__channels.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__nio.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__lang__reflect.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/Serializable/gnu/testlet/java/io/Serializable/ParentReadResolve$Foo.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__io.$(H) $(INCLUDE_TOP)/java/java/util/java/util/Calendar.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/IllegalStateException.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/RuntimeException.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/SecurityManager.$(H) $(INCLUDE_TOP)/java/java/nio/charset/java/nio/charset/CharsetEncoder.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/Number.$(H) $(INCLUDE_TOP)/java/sun/reflect/sun/reflect/ConstructorAccessorImpl.$(H) $(INCLUDE_TOP)/java/sun/reflect/sun/reflect/MagicAccessorImpl.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/VirtualMachineError.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/Error.$(H) $(INCLUDE_TOP)/java/java/util/java/util/AbstractMap.$(H) $(INCLUDE_TOP)/java/java/util/java/util/AbstractSet.$(H) $(INCLUDE_TOP)/java/gnu/testlet/gnu/testlet/TestSecurityManager.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/Serializable/gnu/testlet/java/io/Serializable/ParentWriteReplace$Foo.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__java__util.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__java__util__concurrent.$(H) $(INCLUDE_TOP)/java/java/util/concurrent/locks/java/util/concurrent/locks/ReentrantLock.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/Serializable/gnu/testlet/java/io/Serializable/ParentReadResolve$Singleton.$(H) $(INCLUDE_TOP)/java/sun/reflect/sun/reflect/AccessorGenerator.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__sun__net__www__protocol.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__sun__net__www.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__sun__net.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__lang__Class.$(H) $(INCLUDE_TOP)/java/java/util/logging/java/util/logging/Level.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/lang/Class/gnu/testlet/java/lang/Class/rf_help.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__sun__reflect.$(H) $(INCLUDE_TOP)/java/java/util/regex/java/util/regex/Pattern$BmpCharProperty.$(H) $(INCLUDE_TOP)/java/java/util/regex/java/util/regex/Pattern$CharProperty.$(H) $(INCLUDE_TOP)/java/java/util/regex/java/util/regex/Pattern$Node.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/Serializable/gnu/testlet/java/io/Serializable/ParentWriteReplace$Singleton.$(H) $(INCLUDE_TOP)/java/java/util/regex/java/util/regex/Pattern$CharPropertyNames$CloneableProperty.$(H) $(INCLUDE_TOP)/java/java/util/logging/java/util/logging/Handler.$(H) $(INCLUDE_TOP)/java/java/io/java/io/PrintStream.$(H) $(INCLUDE_TOP)/java/java/io/java/io/FilterOutputStream.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/Enum.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__junit.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__util__concurrent.$(H) $(INCLUDE_TOP)/java/java/io/java/io/FilterWriter.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/Thread.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__org.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__java__lang.$(H) $(INCLUDE_TOP)/java/java/io/java/io/CharArrayWriter.$(H) $(INCLUDE_TOP)/java/java/nio/charset/java/nio/charset/Charset.$(H) $(INCLUDE_TOP)/java/java/io/java/io/CharArrayReader.$(H) $(INCLUDE_TOP)/java/java/util/java/util/ArrayList.$(H) $(INCLUDE_TOP)/java/gnu/testlet/gnu/testlet/TestHarness.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__util__logging.$(H) $(INCLUDE_TOP)/java/java/nio/java/nio/ShortBuffer.$(H) $(INCLUDE_TOP)/java/java/io/java/io/BufferedOutputStream.$(H) $(INCLUDE_TOP)/java/java/io/java/io/PipedInputStream.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__stx__libjava.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__stx.$(H) $(INCLUDE_TOP)/java/java/io/java/io/PrintWriter.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/lang/String/gnu/testlet/java/lang/String/getBytes13.$(H) $(INCLUDE_TOP)/java/java/lang/ref/java/lang/ref/ReferenceQueue.$(H) $(INCLUDE_TOP)/java/java/util/java/util/ListResourceBundle.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__util__jar.$(H) $(INCLUDE_TOP)/java/sun/nio/cs/sun/nio/cs/Unicode.$(H) $(INCLUDE_TOP)/java/java/io/java/io/FilterReader.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/ObjectInputOutput/gnu/testlet/java/io/ObjectInputOutput/Test.$(H) $(INCLUDE_TOP)/java/java/nio/java/nio/LongBuffer.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/AbstractStringBuilder.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/util/Scanner/gnu/testlet/java/util/Scanner/Base.$(H) $(INCLUDE_TOP)/java/sun/reflect/sun/reflect/UnsafeFieldAccessorImpl.$(H) $(INCLUDE_TOP)/java/sun/reflect/sun/reflect/FieldAccessorImpl.$(H) $(INCLUDE_TOP)/java/java/io/java/io/StringBufferInputStream.$(H) $(INCLUDE_TOP)/java/java/util/java/util/TimerTask.$(H) $(INCLUDE_TOP)/java/java/util/java/util/LinkedHashMap.$(H) $(INCLUDE_TOP)/java/java/util/java/util/HashMap.$(H) $(INCLUDE_TOP)/java/java/io/java/io/ObjectInputStream.$(H) $(INCLUDE_TOP)/java/sun/util/sun/util/PreHashedMap.$(H) $(INCLUDE_TOP)/java/sun/nio/cs/sun/nio/cs/FastCharsetProvider.$(H) $(INCLUDE_TOP)/java/java/nio/charset/spi/java/nio/charset/spi/CharsetProvider.$(H) $(INCLUDE_TOP)/java/java/util/regex/java/util/regex/Pattern$CharPropertyNames$CharPropertyFactory.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/ObjectInputOutput/gnu/testlet/java/io/ObjectInputOutput/Deserializable$NotSerializable1.$(H) $(INCLUDE_TOP)/java/java/lang/java/lang/InheritableThreadLocal.$(H) $(INCLUDE_TOP)/java/sun/reflect/sun/reflect/MethodAccessorImpl.$(H) $(INCLUDE_TOP)/java/java/nio/java/nio/IntBuffer.$(H) $(INCLUDE_TOP)/java/java/nio/charset/java/nio/charset/CoderResult$Cache.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/nio/channels/FileChannel/gnu/testlet/java/nio/channels/FileChannel/multidirectbufferIO.$(H) $(INCLUDE_TOP)/java/java/lang/ref/java/lang/ref/Reference.$(H) $(INCLUDE_TOP)/java/java/lang/reflect/java/lang/reflect/InvocationTargetException.$(H) $(INCLUDE_TOP)/java/java/util/java/util/HashMap$Entry.$(H) $(INCLUDE_TOP)/java/java/nio/charset/java/nio/charset/CharsetDecoder.$(H) $(INCLUDE_TOP)/java/java/nio/java/nio/CharBuffer.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/lang/reflect/Method/gnu/testlet/java/lang/reflect/Method/invoke.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/ObjectInputOutput/gnu/testlet/java/io/ObjectInputOutput/HierarchyTest$Base.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__lang__ref.$(H) $(INCLUDE_TOP)/java/java/nio/java/nio/FloatBuffer.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/ObjectStreamClass/gnu/testlet/java/io/ObjectStreamClass/B.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/ObjectStreamClass/gnu/testlet/java/io/ObjectStreamClass/A.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/ObjectInputOutput/gnu/testlet/java/io/ObjectInputOutput/Test$NoCallDefault.$(H) $(INCLUDE_TOP)/nil/JavaPackage__JAVA__gnu__testlet__java__nio__charset.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/lang/Class/gnu/testlet/java/lang/Class/init$C4.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/lang/Class/gnu/testlet/java/lang/Class/init$C2.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/ObjectInputOutput/gnu/testlet/java/io/ObjectInputOutput/SerBase.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/lang/reflect/sub/gnu/testlet/java/lang/reflect/sub/Super.$(H) $(INCLUDE_TOP)/java/java/io/java/io/InputStreamReader.$(H) $(INCLUDE_TOP)/java/java/nio/java/nio/DoubleBuffer.$(H) $(INCLUDE_TOP)/java/gnu/testlet/java/io/ObjectInputOutput/gnu/testlet/java/io/ObjectInputOutput/Deserializable$NotSerializable2.$(H) $(INCLUDE_TOP)/java/java/util/logging/java/util/logging/Logger.$(H) $(INCLUDE_TOP)/java/java/lang/ref/java/lang/ref/WeakReference.$(H) $(INCLUDE_TOP)/java/java/io/java/io/FileSystem.$(H) $(INCLUDE_TOP)/java/java/io/java/io/PushbackInputStream.$(H) $(INCLUDE_TOP)/java/java/util/regex/java/util/regex/Pattern$SliceNode.$(H) $(INCLUDE_TOP)/java/java/io/java/io/BufferedInputStream.$(H) $(INCLUDE_TOP)/java/java/io/java/io/ByteArrayInputStream.$(H) $(INCLUDE_TOP)/java/java/util/java/util/GregorianCalendar.$(H) $(STCHDR)
+$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(STCHDR)
$(OUTDIR)JavaSelectorParser.$(O) JavaSelectorParser.$(H): JavaSelectorParser.st $(INCLUDE_TOP)/stx/libjava/SelectorParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaStringBox.$(O) JavaStringBox.$(H): JavaStringBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/src/Make.spec Fri Nov 25 16:28:39 2011 +0000
+++ b/src/Make.spec Sat Nov 26 08:22:25 2011 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-11-25 09:04:47.231.
+# automagically generated from the projectDefinition: stx_libjava at 2011-11-26 09:22:07.299.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -170,6 +170,7 @@
JavaClass \
JavaSocket \
JavaMonitor \
+ JavaMethodWrapperCompiler \
@@ -295,6 +296,7 @@
$(OUTDIR)JavaClass.$(O) \
$(OUTDIR)JavaSocket.$(O) \
$(OUTDIR)JavaMonitor.$(O) \
+ $(OUTDIR)JavaMethodWrapperCompiler.$(O) \
$(OUTDIR)extensions.$(O) \
--- a/src/abbrev.stc Fri Nov 25 16:28:39 2011 +0000
+++ b/src/abbrev.stc Sat Nov 26 08:22:25 2011 +0000
@@ -152,3 +152,4 @@
JavaSocket JavaSocket stx:libjava 'Languages-Java-Support' 0
JavaMonitor JavaMonitor stx:libjava 'Languages-Java-Support' 0
JavaMonitorsTests JavaMonitorsTests stx:libjava 'Languages-Java-Tests-Synchronization' 1
+JavaMethodWrapperCompiler JavaMethodWrapperCompiler stx:libjava 'Languages-Java-Lookup' 0
--- a/src/bc.mak Fri Nov 25 16:28:39 2011 +0000
+++ b/src/bc.mak Sat Nov 26 08:22:25 2011 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-11-25 09:04:49.708.
+# automagically generated from the projectDefinition: stx_libjava at 2011-11-26 09:22:11.699.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -33,7 +33,7 @@
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libwidg2 -I$(INCLUDE_TOP)\squeak\petitparser -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libhtml
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\java\java\util\concurrent\locks -I$(INCLUDE_TOP)\java\gnu\testlet\java\io\Serializable -I$(INCLUDE_TOP)\java\java\lang\reflect -I$(INCLUDE_TOP)\java\java\util\concurrent\atomic -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\java\java\nio\charset -I$(INCLUDE_TOP)\java\gnu\testlet\java\lang\Class -I$(INCLUDE_TOP)\java\java\security -I$(INCLUDE_TOP)\java\java\nio -I$(INCLUDE_TOP)\java\sun\nio\cs -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\java\java\nio\charset\spi -I$(INCLUDE_TOP)\java\gnu\testlet\java\lang\reflect\sub -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\java\java\util -I$(INCLUDE_TOP)\java\gnu\testlet\java\io\LineNumberReader -I$(INCLUDE_TOP)\java\java\lang -I$(INCLUDE_TOP)\squeak\petitparser -I$(INCLUDE_TOP)\java\java\lang\ref -I$(INCLUDE_TOP)\java\java\util\logging -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\java\java\util\regex -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\java\gnu\testlet\java\lang\String -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\java\gnu\testlet\java\util\Scanner -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\java\java\net -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\java\junit\framework -I$(INCLUDE_TOP)\java\sun\reflect -I$(INCLUDE_TOP)\java\gnu\testlet\java\io\ObjectInputOutput -I$(INCLUDE_TOP)\java\gnu\testlet\java\nio\channels\FileChannel -I$(INCLUDE_TOP)\stx\libwidg2 -I$(INCLUDE_TOP)\java\gnu\testlet\java\lang\reflect\Method -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\java\gnu\testlet -I$(INCLUDE_TOP)\java\sun\util -I$(INCLUDE_TOP)\java\java\io -I$(INCLUDE_TOP)\java\gnu\testlet\java\lang\Character -I$(INCLUDE_TOP)\java\gnu\testlet\java\io\ObjectStreamClass
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -120,7 +120,6 @@
$(OUTDIR)JavaNode.$(O) JavaNode.$(H): JavaNode.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaObject.$(O) JavaObject.$(H): JavaObject.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaObjectDictionary.$(O) JavaObjectDictionary.$(H): JavaObjectDictionary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaPackage.$(O) JavaPackage.$(H): JavaPackage.st $(INCLUDE_TOP)\stx\libbasic\NameSpace.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaParseResult.$(O) JavaParseResult.$(H): JavaParseResult.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaPopUpView.$(O) JavaPopUpView.$(H): JavaPopUpView.st $(INCLUDE_TOP)\stx\libview\PopUpView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaProcess.$(O) JavaProcess.$(H): JavaProcess.st $(INCLUDE_TOP)\stx\libbasic\Process.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -177,7 +176,9 @@
$(OUTDIR)JavaMethodDeclaratorNode.$(O) JavaMethodDeclaratorNode.$(H): JavaMethodDeclaratorNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)\stx\libjava\JavaDescriptor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaMethodWrapperCompiler.$(O) JavaMethodWrapperCompiler.$(H): JavaMethodWrapperCompiler.st $(INCLUDE_TOP)\stx\libjava\Java.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaPackage.$(O) JavaPackage.$(H): JavaPackage.st $(INCLUDE_TOP)\stx\libbasic\NameSpace.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\java\java\util\java/util/HashMap$HashIterator.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaObject.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__sun__nio.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__sun.$(H) $(INCLUDE_TOP)\java\java\io\java/io/ByteArrayOutputStream.$(H) $(INCLUDE_TOP)\java\java\io\java/io/OutputStream.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__sun__security.$(H) $(INCLUDE_TOP)\java\java\io\java/io/InputStream.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\LineNumberReader\gnu/testlet/java/io/LineNumberReader/Test2$LineReaderTest.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/ClassLoader.$(H) $(INCLUDE_TOP)\java\java\lang\reflect\java/lang/reflect/AccessibleObject.$(H) $(INCLUDE_TOP)\java\java\util\java/util/Properties.$(H) $(INCLUDE_TOP)\java\java\util\java/util/Hashtable.$(H) $(INCLUDE_TOP)\java\java\util\java/util/Dictionary.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__util.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu.$(H) $(INCLUDE_TOP)\java\java\security\java/security/BasicPermission.$(H) $(INCLUDE_TOP)\java\java\security\java/security/Permission.$(H) $(INCLUDE_TOP)\java\java\util\java/util/Vector.$(H) $(INCLUDE_TOP)\java\java\util\java/util/AbstractList.$(H) $(INCLUDE_TOP)\java\java\util\java/util/AbstractCollection.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__util__regex.$(H) $(INCLUDE_TOP)\java\java\io\java/io/ObjectOutputStream.$(H) $(INCLUDE_TOP)\java\java\net\java/net/URLStreamHandler.$(H) $(INCLUDE_TOP)\java\java\util\java/util/AbstractSequentialList.$(H) $(INCLUDE_TOP)\java\junit\framework\junit/framework/Assert.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__cz__cvut__fit__swing.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__cz__cvut__fit.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__cz__cvut.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__cz.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__java__nio__charset.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__java__nio.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__java.$(H) $(INCLUDE_TOP)\java\java\util\logging\java/util/logging/ErrorManager.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__util__zip.$(H) $(INCLUDE_TOP)\java\java\nio\java/nio/MappedByteBuffer.$(H) $(INCLUDE_TOP)\java\java\nio\java/nio/ByteBuffer.$(H) $(INCLUDE_TOP)\java\java\nio\java/nio/Buffer.$(H) $(INCLUDE_TOP)\java\java\util\concurrent\atomic\java/util/concurrent/atomic/AtomicReferenceFieldUpdater.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__lang.$(H) $(INCLUDE_TOP)\java\java\io\java/io/Writer.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/Exception.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/Throwable.$(H) $(INCLUDE_TOP)\java\java\util\java/util/ResourceBundle.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\lang\Character\gnu/testlet/java/lang/Character/UnicodeBase.$(H) $(INCLUDE_TOP)\java\java\io\java/io/Reader.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/CharacterData.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/ThreadLocal.$(H) $(INCLUDE_TOP)\java\java\util\concurrent\locks\java/util/concurrent/locks/ReentrantLock$Sync.$(H) $(INCLUDE_TOP)\java\java\util\concurrent\locks\java/util/concurrent/locks/AbstractQueuedSynchronizer.$(H) $(INCLUDE_TOP)\java\java\util\concurrent\locks\java/util/concurrent/locks/AbstractOwnableSynchronizer.$(H) $(INCLUDE_TOP)\java\java\io\java/io/FilterInputStream.$(H) $(INCLUDE_TOP)\java\java\net\java/net/URLClassLoader.$(H) $(INCLUDE_TOP)\java\java\security\java/security/SecureClassLoader.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__nio__channels.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__nio.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__lang__reflect.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\Serializable\gnu/testlet/java/io/Serializable/ParentReadResolve$Foo.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__io.$(H) $(INCLUDE_TOP)\java\java\util\java/util/Calendar.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/IllegalStateException.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/RuntimeException.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/SecurityManager.$(H) $(INCLUDE_TOP)\java\java\nio\charset\java/nio/charset/CharsetEncoder.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/Number.$(H) $(INCLUDE_TOP)\java\sun\reflect\sun/reflect/ConstructorAccessorImpl.$(H) $(INCLUDE_TOP)\java\sun\reflect\sun/reflect/MagicAccessorImpl.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/VirtualMachineError.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/Error.$(H) $(INCLUDE_TOP)\java\java\util\java/util/AbstractMap.$(H) $(INCLUDE_TOP)\java\java\util\java/util/AbstractSet.$(H) $(INCLUDE_TOP)\java\gnu\testlet\gnu/testlet/TestSecurityManager.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\Serializable\gnu/testlet/java/io/Serializable/ParentWriteReplace$Foo.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__java__util.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__java__util__concurrent.$(H) $(INCLUDE_TOP)\java\java\util\concurrent\locks\java/util/concurrent/locks/ReentrantLock.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\Serializable\gnu/testlet/java/io/Serializable/ParentReadResolve$Singleton.$(H) $(INCLUDE_TOP)\java\sun\reflect\sun/reflect/AccessorGenerator.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__sun__net__www__protocol.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__sun__net__www.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__sun__net.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__lang__Class.$(H) $(INCLUDE_TOP)\java\java\util\logging\java/util/logging/Level.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\lang\Class\gnu/testlet/java/lang/Class/rf_help.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__sun__reflect.$(H) $(INCLUDE_TOP)\java\java\util\regex\java/util/regex/Pattern$BmpCharProperty.$(H) $(INCLUDE_TOP)\java\java\util\regex\java/util/regex/Pattern$CharProperty.$(H) $(INCLUDE_TOP)\java\java\util\regex\java/util/regex/Pattern$Node.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\Serializable\gnu/testlet/java/io/Serializable/ParentWriteReplace$Singleton.$(H) $(INCLUDE_TOP)\java\java\util\regex\java/util/regex/Pattern$CharPropertyNames$CloneableProperty.$(H) $(INCLUDE_TOP)\java\java\util\logging\java/util/logging/Handler.$(H) $(INCLUDE_TOP)\java\java\io\java/io/PrintStream.$(H) $(INCLUDE_TOP)\java\java\io\java/io/FilterOutputStream.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/Enum.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__junit.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__util__concurrent.$(H) $(INCLUDE_TOP)\java\java\io\java/io/FilterWriter.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/Thread.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__org.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__java__lang.$(H) $(INCLUDE_TOP)\java\java\io\java/io/CharArrayWriter.$(H) $(INCLUDE_TOP)\java\java\nio\charset\java/nio/charset/Charset.$(H) $(INCLUDE_TOP)\java\java\io\java/io/CharArrayReader.$(H) $(INCLUDE_TOP)\java\java\util\java/util/ArrayList.$(H) $(INCLUDE_TOP)\java\gnu\testlet\gnu/testlet/TestHarness.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__util__logging.$(H) $(INCLUDE_TOP)\java\java\nio\java/nio/ShortBuffer.$(H) $(INCLUDE_TOP)\java\java\io\java/io/BufferedOutputStream.$(H) $(INCLUDE_TOP)\java\java\io\java/io/PipedInputStream.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__stx__libjava.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__stx.$(H) $(INCLUDE_TOP)\java\java\io\java/io/PrintWriter.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\lang\String\gnu/testlet/java/lang/String/getBytes13.$(H) $(INCLUDE_TOP)\java\java\lang\ref\java/lang/ref/ReferenceQueue.$(H) $(INCLUDE_TOP)\java\java\util\java/util/ListResourceBundle.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__util__jar.$(H) $(INCLUDE_TOP)\java\sun\nio\cs\sun/nio/cs/Unicode.$(H) $(INCLUDE_TOP)\java\java\io\java/io/FilterReader.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\ObjectInputOutput\gnu/testlet/java/io/ObjectInputOutput/Test.$(H) $(INCLUDE_TOP)\java\java\nio\java/nio/LongBuffer.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/AbstractStringBuilder.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\util\Scanner\gnu/testlet/java/util/Scanner/Base.$(H) $(INCLUDE_TOP)\java\sun\reflect\sun/reflect/UnsafeFieldAccessorImpl.$(H) $(INCLUDE_TOP)\java\sun\reflect\sun/reflect/FieldAccessorImpl.$(H) $(INCLUDE_TOP)\java\java\io\java/io/StringBufferInputStream.$(H) $(INCLUDE_TOP)\java\java\util\java/util/TimerTask.$(H) $(INCLUDE_TOP)\java\java\util\java/util/LinkedHashMap.$(H) $(INCLUDE_TOP)\java\java\util\java/util/HashMap.$(H) $(INCLUDE_TOP)\java\java\io\java/io/ObjectInputStream.$(H) $(INCLUDE_TOP)\java\sun\util\sun/util/PreHashedMap.$(H) $(INCLUDE_TOP)\java\sun\nio\cs\sun/nio/cs/FastCharsetProvider.$(H) $(INCLUDE_TOP)\java\java\nio\charset\spi\java/nio/charset/spi/CharsetProvider.$(H) $(INCLUDE_TOP)\java\java\util\regex\java/util/regex/Pattern$CharPropertyNames$CharPropertyFactory.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\ObjectInputOutput\gnu/testlet/java/io/ObjectInputOutput/Deserializable$NotSerializable1.$(H) $(INCLUDE_TOP)\java\java\lang\java/lang/InheritableThreadLocal.$(H) $(INCLUDE_TOP)\java\sun\reflect\sun/reflect/MethodAccessorImpl.$(H) $(INCLUDE_TOP)\java\java\nio\java/nio/IntBuffer.$(H) $(INCLUDE_TOP)\java\java\nio\charset\java/nio/charset/CoderResult$Cache.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\nio\channels\FileChannel\gnu/testlet/java/nio/channels/FileChannel/multidirectbufferIO.$(H) $(INCLUDE_TOP)\java\java\lang\ref\java/lang/ref/Reference.$(H) $(INCLUDE_TOP)\java\java\lang\reflect\java/lang/reflect/InvocationTargetException.$(H) $(INCLUDE_TOP)\java\java\util\java/util/HashMap$Entry.$(H) $(INCLUDE_TOP)\java\java\nio\charset\java/nio/charset/CharsetDecoder.$(H) $(INCLUDE_TOP)\java\java\nio\java/nio/CharBuffer.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\lang\reflect\Method\gnu/testlet/java/lang/reflect/Method/invoke.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\ObjectInputOutput\gnu/testlet/java/io/ObjectInputOutput/HierarchyTest$Base.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__lang__ref.$(H) $(INCLUDE_TOP)\java\java\nio\java/nio/FloatBuffer.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\ObjectStreamClass\gnu/testlet/java/io/ObjectStreamClass/B.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\ObjectStreamClass\gnu/testlet/java/io/ObjectStreamClass/A.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\ObjectInputOutput\gnu/testlet/java/io/ObjectInputOutput/Test$NoCallDefault.$(H) $(INCLUDE_TOP)\nil\JavaPackage__JAVA__gnu__testlet__java__nio__charset.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\lang\Class\gnu/testlet/java/lang/Class/init$C4.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\lang\Class\gnu/testlet/java/lang/Class/init$C2.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\ObjectInputOutput\gnu/testlet/java/io/ObjectInputOutput/SerBase.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\lang\reflect\sub\gnu/testlet/java/lang/reflect/sub/Super.$(H) $(INCLUDE_TOP)\java\java\io\java/io/InputStreamReader.$(H) $(INCLUDE_TOP)\java\java\nio\java/nio/DoubleBuffer.$(H) $(INCLUDE_TOP)\java\gnu\testlet\java\io\ObjectInputOutput\gnu/testlet/java/io/ObjectInputOutput/Deserializable$NotSerializable2.$(H) $(INCLUDE_TOP)\java\java\util\logging\java/util/logging/Logger.$(H) $(INCLUDE_TOP)\java\java\lang\ref\java/lang/ref/WeakReference.$(H) $(INCLUDE_TOP)\java\java\io\java/io/FileSystem.$(H) $(INCLUDE_TOP)\java\java\io\java/io/PushbackInputStream.$(H) $(INCLUDE_TOP)\java\java\util\regex\java/util/regex/Pattern$SliceNode.$(H) $(INCLUDE_TOP)\java\java\io\java/io/BufferedInputStream.$(H) $(INCLUDE_TOP)\java\java\io\java/io/ByteArrayInputStream.$(H) $(INCLUDE_TOP)\java\java\util\java/util/GregorianCalendar.$(H) $(STCHDR)
+$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(STCHDR)
$(OUTDIR)JavaSelectorParser.$(O) JavaSelectorParser.$(H): JavaSelectorParser.st $(INCLUDE_TOP)\stx\libjava\SelectorParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaStringBox.$(O) JavaStringBox.$(H): JavaStringBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/src/extensions.st Fri Nov 25 16:28:39 2011 +0000
+++ b/src/extensions.st Sat Nov 26 08:22:25 2011 +0000
@@ -16,7 +16,7 @@
"
examples:
- java.lang.String
+ java.lang.String
[[[Ljava/lang/Object; => java.lang.Object
"
@@ -24,10 +24,10 @@
| nm |
nm := self asJavaComponentClassName.
(nm startsWith: $L) ifTrue: [
- nm := nm copyFrom: 2 to: nm size - 1
+ nm := nm copyFrom: 2 to: nm size - 1
].
(nm includes: $/) ifTrue: [
- nm := nm asString copyReplaceAll: $/ with: $.
+ nm := nm asString copyReplaceAll: $/ with: $.
].
^ nm.
@@ -52,10 +52,10 @@
componentClassName := self utf8Encoded.
(componentClassName matches: '*\[*') ifTrue: [
- componentClassName := componentClassName
- copyFrom: (componentClassName lastIndexOf: $[) + 1
- to: componentClassName size.
- ].
+ componentClassName := componentClassName
+ copyFrom: (componentClassName lastIndexOf: $[) + 1
+ to: componentClassName size.
+ ].
^ componentClassName.
! !
!CharacterArray methodsFor:'java conversions'!
@@ -86,10 +86,10 @@
internalName := self asJavaComponentClassName.
(internalName startsWith: $L) ifTrue: [
- internalName := internalName copyFrom: 2 to: internalName size - 1
+ internalName := internalName copyFrom: 2 to: internalName size - 1
].
(internalName includes: $.) ifTrue: [
- internalName := internalName asString copyReplaceAll: $. with: $/
+ internalName := internalName asString copyReplaceAll: $. with: $/
].
^internalName.
! !
@@ -100,10 +100,10 @@
| internalName |
internalName := self asJavaComponentClassName.
(internalName startsWith: $L) ifTrue: [
- internalName := internalName copyFrom: 2 to: internalName size - 1
+ internalName := internalName copyFrom: 2 to: internalName size - 1
].
(internalName includes: $.) ifTrue: [
- internalName := internalName asString copyReplaceAll: $. with: $/
+ internalName := internalName asString copyReplaceAll: $. with: $/
].
^ internalName.
@@ -130,25 +130,25 @@
!Class methodsFor:'method lookup'!
perform:aMessage onReceiver:receiver from:sender ifNotFound:aBlock
- | method selector class args retval|
- selector := aMessage selector.
- args := aMessage arguments.
- class := receiver class.
+ | method selector class args retval|
+ selector := aMessage selector.
+ args := aMessage arguments.
+ class := receiver class.
- method := SmalltalkLookup instance lookupMethodForSelector: selector
- directedTo: class
- for: receiver
- withArguments: args
- from: sender
- ilc: nil.
+ method := SmalltalkLookup instance lookupMethodForSelector: selector
+ directedTo: class
+ for: receiver
+ withArguments: args
+ from: sender
+ ilc: nil.
- method ifNotNil:
- [ | unboxedArgs |
- unboxedArgs := self unbox: args to: method argTypes.
- retval := receiver perform: method selector withArguments: unboxedArgs.
- ^ self box: retval toType: method returnType.
- ].
- ^ aBlock value.
+ method ifNotNil:
+ [ | unboxedArgs |
+ unboxedArgs := self unbox: args to: method argTypes.
+ retval := receiver perform: method selector withArguments: unboxedArgs.
+ ^ self box: retval toType: method returnType.
+ ].
+ ^ aBlock value.
"Created: / 28-09-2011 / 11:31:33 / Jan Kurs <kursjan@fit.cvut.cz>"
"Modified: / 19-11-2011 / 12:38:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -176,7 +176,7 @@
isJavaNameAndType
"return true, if given object represents name and type struct in java constant pool"
-
+
^ false.
"Created: / 10-05-2011 / 12:21:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
@@ -211,7 +211,7 @@
isWaiting
"return true, iff the receiver is waiting on semaphore or something"
-
+
^ (state == #wait)
"Created: / 20-11-2011 / 20:55:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
@@ -219,27 +219,27 @@
!Set methodsFor:'javaProtocol'!
java__contains:anObject
- ^ self contains: [:el | anObject = el ]
+ ^ self contains: [:el | anObject = el ]
! !
!String methodsFor:'converting'!
-asArrayOfSubstringsSeparatedBy:aSeparator
+asArrayOfSubstringsSeparatedBy:aSeparator
"Modified version of asArrayOfSubstrings"
-
+
|substrings start end|
substrings := OrderedCollection new.
start := 1.
[start <= self size] whileTrue:[
- (self at:start) = aSeparator ifFalse:[
- end := start + 1.
- [
- end <= self size and:[(self at:end) ~= aSeparator]
- ] whileTrue:[end := end + 1].
- substrings add:(self copyFrom:start to:end - 1).
- start := end - 1
- ].
- start := start + 1
+ (self at:start) = aSeparator ifFalse:[
+ end := start + 1.
+ [
+ end <= self size and:[(self at:end) ~= aSeparator]
+ ] whileTrue:[end := end + 1].
+ substrings add:(self copyFrom:start to:end - 1).
+ start := end - 1
+ ].
+ start := start + 1
].
^ substrings asArray
@@ -250,39 +250,39 @@
javaTestsDirectory
^ self at: #javaTestsDirectory
- ifAbsent:
- [ | nm |
+ ifAbsent:
+ [ | nm |
- nm := OperatingSystem getLoginName.
- "Default path for Jan"
- (nm = 'jv' and:[OperatingSystem isUNIXlike])
- ifTrue:
- [ '/home/jv/Projects/libjava/sources/libjava/branches/jk_new_structure/tests' ]
- ifFalse:
- [ "Default path for Jan (the other one :-)"
- nm = 'jk'
- ifTrue: [ 'path for Jan' ]
- ifFalse:
- [ "Default path for Marcel"
- nm = 'm'
- ifTrue: [ '/home/m/Projects/libjava/branches/jk_new_structure/tests' ]
- ifFalse:
- [ | "Look into package dir" p |
+ nm := OperatingSystem getLoginName.
+ "Default path for Jan"
+ (nm = 'jv' and:[OperatingSystem isUNIXlike])
+ ifTrue:
+ [ '/home/jv/Projects/libjava/sources/libjava/branches/jk_new_structure/tests' ]
+ ifFalse:
+ [ "Default path for Jan (the other one :-)"
+ nm = 'jk'
+ ifTrue: [ 'path for Jan' ]
+ ifFalse:
+ [ "Default path for Marcel"
+ nm = 'm'
+ ifTrue: [ '/home/m/Projects/libjava/branches/jk_new_structure/tests' ]
+ ifFalse:
+ [ | "Look into package dir" p |
- (p := (Smalltalk getPackageDirectoryForPackage: 'stx:libjava') asFilename
- / 'tests') exists
- ifTrue: [ p pathName ]
- ifFalse:
- [ | "Try the environment variable (used by Hudson)" p |
+ (p := (Smalltalk getPackageDirectoryForPackage: 'stx:libjava') asFilename
+ / 'tests') exists
+ ifTrue: [ p pathName ]
+ ifFalse:
+ [ | "Try the environment variable (used by Hudson)" p |
- (p := OperatingSystem getEnvironment: 'LIBJAVA_TESTS') notNil
- ifTrue: [ p ]
- ifFalse:
- [ "No default, trigger an error"
- self error: 'No tests path specified' ] ] ] ] ] ]
+ (p := OperatingSystem getEnvironment: 'LIBJAVA_TESTS') notNil
+ ifTrue: [ p ]
+ ifFalse:
+ [ "No default, trigger an error"
+ self error: 'No tests path specified' ] ] ] ] ] ]
"
- UserPreferences current javaTestsDirectory"
+ UserPreferences current javaTestsDirectory"
"Created: / 07-05-2011 / 17:43:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 07-05-2011 / 20:21:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -322,7 +322,7 @@
! !
!Boolean class methodsFor:'autoboxing support'!
-javaBox: anObject
+javaBox: anObject
| wrapper |
wrapper := (JavaVM classForName: 'java.lang.Boolean') new.
@@ -413,7 +413,7 @@
javaComponentClass
- ^Byte
+ ^JavaByte
"Created: / 20-12-2010 / 22:05:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
@@ -442,11 +442,11 @@
! !
!Character class methodsFor:'autoboxing support'!
-javaBox: anObject
+javaBox: anObject
| wrapper |
wrapper := (JavaVM classForName: 'java.lang.Character') new.
- wrapper perform: #'<init>(C)V' with: anObject.
+ wrapper perform: #'<init>(C)V' with: anObject codePoint.
^ wrapper
"Created: / 16-08-2011 / 09:58:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -461,89 +461,89 @@
! !
!CharacterArray class methodsFor:'encoding & decoding'!
-decodeFromJavaUTF8: bytes
+decodeFromJavaUTF8: bytes
"Decodes a string from modified UTF8 encoding
as used in Java .class files. see
'The class file format specification', section 4.5.7"
-
+
| string i s b codePoint realLength |
string := String new: bytes size.
realLength := bytes size.
s := bytes readStream.
i := 1.
- [ s atEnd ] whileFalse:
- [ b := s next.
- (b & 2r10000000) == 0
- ifTrue: [ codePoint := b ]
- ifFalse:
- [ self assert: (b & 2r01000000) = 2r01000000.
- (b & 2r00100000) = 0
- ifTrue:
- [ "two byte utf char"
- realLength := realLength - 1.
- self assert: s size > 0.
- self assert: (b & 2r01000000) = 2r01000000.
- string bitsPerCharacter = 8
- ifTrue: [ string := Unicode16String fromString: string ].
- codePoint := (b & 2r00011111) << 6.
- b := s next.
- self assert: (b & 2r11000000) = 2r10000000.
- codePoint := codePoint + (b & 2r00111111). ]
- ifFalse:
- [ "at lease 3 byte utf char"
- realLength := realLength - 2.
- string bitsPerCharacter ~= 16"was: 32"
- ifTrue: [ string := Unicode16String"was: Unicode32String" fromString: string ].
- self assert: s size > 1.
- (b & 2r00010000) = 0
- ifTrue:
- [ | utf32Possible utf32Value |
+ [ s atEnd ] whileFalse:
+ [ b := s next.
+ (b & 2r10000000) == 0
+ ifTrue: [ codePoint := b ]
+ ifFalse:
+ [ self assert: (b & 2r01000000) = 2r01000000.
+ (b & 2r00100000) = 0
+ ifTrue:
+ [ "two byte utf char"
+ realLength := realLength - 1.
+ self assert: s size > 0.
+ self assert: (b & 2r01000000) = 2r01000000.
+ string bitsPerCharacter = 8
+ ifTrue: [ string := Unicode16String fromString: string ].
+ codePoint := (b & 2r00011111) << 6.
+ b := s next.
+ self assert: (b & 2r11000000) = 2r10000000.
+ codePoint := codePoint + (b & 2r00111111). ]
+ ifFalse:
+ [ "at lease 3 byte utf char"
+ realLength := realLength - 2.
+ string bitsPerCharacter ~= 16"was: 32"
+ ifTrue: [ string := Unicode16String"was: Unicode32String" fromString: string ].
+ self assert: s size > 1.
+ (b & 2r00010000) = 0
+ ifTrue:
+ [ | utf32Possible utf32Value |
- "3 or 6 byte utf char"
- self assert: s size > 1.
- s size < 5
- ifTrue: [ utf32Possible := false ]
- ifFalse: [ utf32Possible := true ].
- b ~= 2r11101101 ifTrue: [ utf32Possible := false ].
- codePoint := (b & 2r00001111) << 12.
- b := s next.
- self assert: (b & 2r11000000) = 2r10000000.
- ((b & 2r11110000) = 2r10100000 and: [ utf32Possible ])
- ifTrue: [ utf32Value := 2r00010000 + ((b & 2r00001111) << 16) ]
- ifFalse: [ utf32Possible := false ].
- codePoint := codePoint + ((b & 2r00111111) << 6).
- b := s next.
- self assert: (b & 2r11000000) = 2r10000000.
- utf32Possible
- ifTrue: [ utf32Value := utf32Value + ((b & 2r00111111) << 10) ].
- codePoint := codePoint + (b & 2r00111111).
- utf32Possible
- ifTrue:
- [ | tmpB |
+ "3 or 6 byte utf char"
+ self assert: s size > 1.
+ s size < 5
+ ifTrue: [ utf32Possible := false ]
+ ifFalse: [ utf32Possible := true ].
+ b ~= 2r11101101 ifTrue: [ utf32Possible := false ].
+ codePoint := (b & 2r00001111) << 12.
+ b := s next.
+ self assert: (b & 2r11000000) = 2r10000000.
+ ((b & 2r11110000) = 2r10100000 and: [ utf32Possible ])
+ ifTrue: [ utf32Value := 2r00010000 + ((b & 2r00001111) << 16) ]
+ ifFalse: [ utf32Possible := false ].
+ codePoint := codePoint + ((b & 2r00111111) << 6).
+ b := s next.
+ self assert: (b & 2r11000000) = 2r10000000.
+ utf32Possible
+ ifTrue: [ utf32Value := utf32Value + ((b & 2r00111111) << 10) ].
+ codePoint := codePoint + (b & 2r00111111).
+ utf32Possible
+ ifTrue:
+ [ | tmpB |
- tmpB := s copy.
- b := tmpB next.
- b = 2r11101101
- ifTrue:
- [ b := tmpB next.
- (b & 2r11110000) = 2r10110000
- ifTrue:
- [ utf32Value := utf32Value + ((b & 2r00001111) << 6).
- b := tmpB next.
- self assert: (b & 2r11000000) = 2r10000000.
- utf32Value := utf32Value + (b & 2r00111111).
- codePoint := utf32Value.
- realLength := realLength - 3. s position: tmpB position.] ] ] ]
- ifFalse:
- [ "should not happen, ask mh"
- self halt. ] ] ].
- string at: i put: (Character codePoint: codePoint).
- i := i + 1. ].
+ tmpB := s copy.
+ b := tmpB next.
+ b = 2r11101101
+ ifTrue:
+ [ b := tmpB next.
+ (b & 2r11110000) = 2r10110000
+ ifTrue:
+ [ utf32Value := utf32Value + ((b & 2r00001111) << 6).
+ b := tmpB next.
+ self assert: (b & 2r11000000) = 2r10000000.
+ utf32Value := utf32Value + (b & 2r00111111).
+ codePoint := utf32Value.
+ realLength := realLength - 3. s position: tmpB position.] ] ] ]
+ ifFalse:
+ [ "should not happen, ask mh"
+ self halt. ] ] ].
+ string at: i put: (Character codePoint: codePoint).
+ i := i + 1. ].
^ string subString: 1 to: realLength.
"
- String decodeFromJavaUTF8: 'Hello world' asByteArray"
+ String decodeFromJavaUTF8: 'Hello world' asByteArray"
"Created: / 22-12-2010 / 23:45:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 09-02-2011 / 01:12:25 / Marcel Hlopko <hlopik@gmail.com>"
@@ -554,7 +554,7 @@
fromJavaUTF8Bytes:aByteCollection
"return a new string which represents the characters as decoded
- from the modified utf8 encoded bytes as specified in
+ from the modified utf8 encoded bytes as specified in
The class file format specification, section 4.5.7"
^ self decodeFromJavaUTF8:aByteCollection.
@@ -658,7 +658,7 @@
! !
!Float class methodsFor:'autoboxing support'!
-javaBox: anObject
+javaBox: anObject
| wrapper |
wrapper := (JavaVM classForName: 'java.lang.Double') new.
@@ -732,8 +732,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaClassBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaClassBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
VU%YVU%YVU%YVU%YVU%YVU%YVU%YVU%YVU%YVU%YVU%YVU%YVU\OF@4YC5]YVU%YVU%YVP$MO4YFQ#<ABU%YVU%YVP$[R5YTUUQRQ0(IVU%YVU\MRUAXVE!!X
VD=H@U]YVU$GPEEXVEMMS%!!LR$@PVU%YASYBVDMAPTEEQDP>AU%YVPDVI5 (EALSEA\\H@1YVU$EGQ)XJQ8"H!!H.C"PEVU%YDBD3M5 /I!!=XOR4*@E%YVU\J
LC(4VE!!XMS02B%]YVU%YDP,#NC$;NS 1@!!EYVU%YVU$QERT+KB,%EQEYVU%YVU%YVU\F@0PCBE]YVU%YVU%YVU%YVU%YVU%YVU%YVP@@@@@@@@@@@@@@@@@@
@@ -757,8 +757,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaExceptionBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaExceptionBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
D!!HRD!!HC@@DRD!!HRD!!HRD!!HRD!!HR@0@AD!!HRD!!HRD!!HRD!!HRD L@@QHRA $IA!!HRD!!HRD!!HC@@DRD $EAP$RD!!HRD!!HR@0@AD!!HIAPTID!!HRD!!HRD L@@QHR
B ,KB!!HRD!!HR@0HB@@HRD PD@ RD!!HRD LA@@HRD!!HLDQDLD!!HRD!!HRD!!HRD!!HRA0<OA1HRD!!HRD!!HRD!!HRD!!HNC!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HR
D!!HRD!!HRA $IA!!HRD!!HRD!!HRD!!HRD $MA@$RD!!HRD!!HRD!!HRD!!HNCPPND!!HRD!!HRD!!HRD!!HRA 8NA!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD @@@@@@@@@@@@@@@@@@
@@ -782,8 +782,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaPrivateClassBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaPrivateClassBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
XVE!!XQHWHAX!!E1I!!XVE!!XVE!!XQ@VPD]GQ4@JDFE!!XVE!!XQ@$SE]UU%USRALPXVE!!XQHVR%E XFA XEAIB!!I!!XVDNPUI XEQNS6AMR4DXXVE!!CC%CXDQBP$IF
QTT?CFE!!XP(^K6@1GA,[GA<%JQU!!XVDLI"I L"\+J1$4F" QXVE!!FB(7N&@5K%)ZV%)ZV%)!!XRLSM#48XFAYWE1\WE1YXVE!!C1P,N30>V51^W%9\V6E!!XVDO
GR43L@HGA TFA0I!!XVE!!XQHMB0$CW54@@E<AXVE!!XVE!!XVE!!AE!!XVE!!XAFE!!XVE!!XVE!!XP HB@ HB@!!!!XVE!!XVE!!XVE!!XVE!!XVE!!XP@@@@@@@@@@@@@@@@@@
@@ -807,8 +807,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaPrivateEnumBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaPrivateEnumBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
QDQDQC\#F1PZH3]DQDQDQDQDQB0TI"@ HBXRKDQDQDQDQB0PJ#D1LSD1I 0,QDQDQC\TJR%BP$IBP#H D#]DQDP!!IBP$P$H6K2<''IBP%QDQDFQ0"H$IBKRH"
H"T FTQDQAHOCP5BP$IBP" SE!!EDQDPYEQTUP$H0NC JL3L5QDQDIQX\GDIBB30<OC0<OC1DQC\LG!!9BP$L<O#8>O#8;QDQDJ04XK"89OS9@PD@>OTQDQDP+
C!!4 BPHGA TFA0IDQDQDQC\_E3PCPS<@@DDAQDQDQDQDQDQDAC(:N#(:BDQDQDQDQDQDQ@ HB@ HB@!!DQDQDQDQDQDQDQDQDQDQDQ@@@@@@@@@@@@@@@@@@@
@@ -832,8 +832,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaPrivateInterfaceBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaPrivateInterfaceBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
TUEQTTPVCP,NE$QQTUEQTUEQTS<KD!!TUEQHKO5EQTUEQTS<3OQ-GQ4\[OSL?TUEQTRD,NQ1PTEAPB!!0;KBEQTUDVD3 8FEAPBS 8NAPYTUEQC4XLC@1PTDLL
CCT5C5EQTR<(J"\''TE@ I2\*IB9QTUDOKR,&I%APPT@^GQ5BTUEQFSH0LTUPTD)JR$)JR$)QTRH#M#)PTEAJSD1LSD1ITUEQF"TQOC0_R41NS$9LR5EQTUDZ
JS\PO HGA TFA0IQTUEQTTPWMA<CS44@@D<ATUEQTUEQTUEQAD!!HRD!!HBEEQTUEQTUEQTP HB@ HB@!!QTUEQTUEQTUEQTUEQTUEQTP@@@@@@@@@@@@@@@@@@
@@ -857,8 +857,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaProtectedClassBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaProtectedClassBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
X6M#X0(PE 8WD@)#X6M#X6M#X0\NM34=OS\@A6M#X6M#X0\\P$5KSD-IO ,GX6M#X0(NPD]"X&I"X$X?@@)#X6LEND!!"X$)DQVICPS QX6M#@2<:X#,9NS$<
LSD6@6M#X0@UIVH(D1HRD1 _I 5#X6LCGQ)"JQ8!!HP<(T%HHX6M#DR@-LFH+IA%"T$9NT&M#X1,KKCP.X&I"T5APTD=TX6M#A 0"L#L5VUUZV%)ZUUE#X6LF
EBL*I5!!_XVE!!XU=WX6M#X0(D@PHIW&A XFAVX6M#X6M#X6M#X6M\XFA]X6M#X6M#X6M#X6M#X5-[X6M#X6M#X6M#X6M#X6M#X6M#X0@@@@@@@@@@@@@@@@@@
@@ -882,8 +882,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaProtectedEnumBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaProtectedEnumBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
Q4]GQ4P-IQ4$KTQGQ4]GQ4]GQ3\]LB(*J#@\M4]GQ4]GQ3\ZMS4=OS4=LAX7Q4]GQ4P]L3MFQ$YFQ#8*GDQGQ4\+K"8.Q$YCN3,1K"8/Q4]GH2X,KDYFNB0,
KB<*H4]GQ10YE1]FQ$YFQ#H?PQ-GQ4\#G!!8^Q$X<MCPUA@QBQ4]GK1<&I$YFNRYCA@@@AD]GQ4PVJB!!FQ$YFAPHB@ DFQ4]GM!!\"N#)EB0\LC@0LA0MGQ4\6
FB\*E@(QD1LSD1DIQ4]GQ4P)HBE@DAHRD!!HHQ4]GQ4]GQ4]GQ4\ND!!HOQ4]GQ4]GQ4]GQ4]GQ04MQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ0@@@@@@@@@@@@@@@@@@
@@ -907,8 +907,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaProtectedInterfaceBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaProtectedInterfaceBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
U%YVU#4MA@HECS5VU%YVU%YVU# BBP0LC@$BNEYVU%YVU# -M1I@PD@RM248U%YVU!!0&L1QUUUUU@QP5I!!1VU%XMB#H2C5UU@CH2L ,PU%YVA#<C@0MUUS0C
@2</A%YVU"$"IBD!!UUTYHRDUD2!!VU%XFI2T HEUUN"@VQTT;U%YVDB0*J39UUQ(9QTEAQUYVU!!4^LCQUUUUUQ$MCP4IGU%YVDQ<HM#XWSD!!MST5MRDQVU%XQ
H3DGF4-RUEQTUEIJU%YVU#4NK"\XTUMST5MIU%YVU%YVU%YVU%YOT5MPU%YVU%YVU%YVU%YVU$9NU%YVU%YVU%YVU%YVU%YVU%YVU @@@@@@@@@@@@@@@@@@
@@ -932,8 +932,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaClassBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaClassBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
VU%YVU%YVU%YVU%YVU%YVU%YVU%YVU%YVU%YVU%YVU%YVU%YVU\OF@4YC5]YVU%YVU%YVP$MO4YFQ#<ABU%YVU%YVP$[R5YTUUQRQ0(IVU%YVU\MRUAXVE!!X
VD=H@U]YVU$GPEEXVEMMS%!!LR$@PVU%YASYBVDMAPTEEQDP>AU%YVPDVI5 (EALSEA\\H@1YVU$EGQ)XJQ8"H!!H.C"PEVU%YDBD3M5 /I!!=XOR4*@E%YVU\J
LC(4VE!!XMS02B%]YVU%YDP,#NC$;NS 1@!!EYVU%YVU$QERT+KB,%EQEYVU%YVU%YVU\F@0PCBE]YVU%YVU%YVU%YVU%YVU%YVU%YVP@@@@@@@@@@@@@@@@@@
@@ -959,8 +959,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaPublicEnumBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaPublicEnumBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
LC@0LB8ZD@ OF"80LC@0LC@0LBTHGQXVE!!4FIS@0LC@0LBTDH2,+J2,+GP@%LC@0LB8HHRD/K2</K20VA"80LC@WF1,[K2<-JR$_F1,\LC@0C!!DYFR</I!!$Y
FQ0VC#@0L@XC@PD/K2</K2@GB T0LC@NBP$IK2<*H"H[BP$NLC@0G@(QDR</I1DQDQDQG#@0LB8@D1L/K2</K20V@B80LC@0I@DMJB (JB ]A2P0LC@0LC@$
@!!HVEQXR@"P0LC@0LC@0LB8TB00KFB80LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0L@@@@@@@@@@@@@@@@@@@
@@ -984,8 +984,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaPublicInterfaceBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaPublicInterfaceBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
P4MCP38NAPLFC#9CP4MCP4MCP3,CB 4MCP(CN4MCP4MCP3,.N!!UAPTDUN"8;P4MCP1$%M!!YBP$IB@!!X8IQ%CP4LNB3T5DTIB@CT5MP0RP4MCA4@DA@QBP#4D
AC@0A4MCP2 H!!<_P$HWG1<"GB]CP4LGI"P^G$IBOA8_H"LGP4MCD"4*J3=BP!! ?J2,,EDMCP1([L3]BP$IB@S\2F1%CP4MCD14INS$9NS$1JQMCP4MCP4LS
HSPHB@ 4HQMCP4MCP4MCP38OK2X/DC9CP4MCP4MCP4MCP4MCP4MCP4MCP4MCP4MCP4MCP4MCP4MCP4MCP4MCP4MCP4MCP4MCP4MCP0@@@@@@@@@@@@@@@@@@
@@ -1009,8 +1009,8 @@
<resource: #image>
^Icon
- constantNamed:'GenericToolbarIconLibrary class javaRuntimeExceptionBrowserIcon'
- ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:'GenericToolbarIconLibrary class javaRuntimeExceptionBrowserIcon'
+ ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
D1LSD1LMB ,SD1LSD1LSD1LSD1LSCP(KD1LSD1LSD1LSD1LSD04JB1LSB@8NBALSD1LSD1LMB ,SD08OC08SD1LSD1LSCP(KD1LND!!DND1LSD1LSD04JB1LS
D@@@DALSD1LSCP0LB 0SD0DB@0DSD1LSD04KB 0SD1LGAPPGD1LSD1LSD1LSD1LSA 8NA!!LSD1LSD1LSD1LSD1LGA1LSD1LSD1LSD1LSD1LSD1LSD1LSD1LS
D1LSD1LSBP8NBQLSD1LSD1LSD1LSD08QDP8SD1LSD1LSD1LSD1LGDQDGD1LSD1LSD1LSD1LSB@\GBALSD1LSD1LSD1LSD1LSD1LSD0@@@@@@@@@@@@@@@@@@
@@ -1033,7 +1033,7 @@
! !
!Integer class methodsFor:'autoboxing support'!
-javaBox: anObject
+javaBox: anObject
| wrapper |
wrapper := (JavaVM classForName: 'java.lang.Integer') new.
@@ -1067,7 +1067,7 @@
! !
!LargeInteger class methodsFor:'autoboxing support'!
-javaBox: anObject
+javaBox: anObject
| wrapper |
wrapper := (JavaVM classForName: 'java.lang.Long') new.
@@ -1141,7 +1141,7 @@
! !
!ShortFloat class methodsFor:'autoboxing support'!
-javaBox: anObject
+javaBox: anObject
| wrapper |
wrapper := (JavaVM classForName: 'java.lang.Float') new.
@@ -1299,7 +1299,7 @@
javaComponentClass
- ^Short
+ ^JavaShort
"Created: / 20-12-2010 / 22:13:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
--- a/src/libInit.cc Fri Nov 25 16:28:39 2011 +0000
+++ b/src/libInit.cc Sat Nov 26 08:22:25 2011 +0000
@@ -59,7 +59,6 @@
_JavaNode_Init(pass,__pRT__,snd);
_JavaObject_Init(pass,__pRT__,snd);
_JavaObjectDictionary_Init(pass,__pRT__,snd);
-_JavaPackage_Init(pass,__pRT__,snd);
_JavaParseResult_Init(pass,__pRT__,snd);
_JavaPopUpView_Init(pass,__pRT__,snd);
_JavaProcess_Init(pass,__pRT__,snd);
@@ -116,6 +115,8 @@
_JavaMethodDeclaratorNode_Init(pass,__pRT__,snd);
_JavaMethodDescriptor_Init(pass,__pRT__,snd);
_JavaMethodNode_Init(pass,__pRT__,snd);
+_JavaMethodWrapperCompiler_Init(pass,__pRT__,snd);
+_JavaPackage_Init(pass,__pRT__,snd);
_JavaParser_Init(pass,__pRT__,snd);
_JavaSelectorParser_Init(pass,__pRT__,snd);
_JavaStringBox_Init(pass,__pRT__,snd);
--- a/src/libjava.rc Fri Nov 25 16:28:39 2011 +0000
+++ b/src/libjava.rc Sat Nov 26 08:22:25 2011 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libjava.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,1502,1502
+ FILEVERSION 6,2,1509,1509
PRODUCTVERSION 6,2,1,1
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.2.1502.1502\0"
+ VALUE "FileVersion", "6.2.1509.1509\0"
VALUE "InternalName", "stx:libjava\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\b SWING Research Group, Czech Technical University In Prague\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.1.1\0"
- VALUE "ProductDate", "Fri, 25 Nov 2011 08:04:50 GMT\0"
+ VALUE "ProductDate", "Sat, 26 Nov 2011 08:22:29 GMT\0"
END
END
--- a/src/stx_libjava.st Fri Nov 25 16:28:39 2011 +0000
+++ b/src/stx_libjava.st Sat Nov 26 08:22:25 2011 +0000
@@ -588,7 +588,7 @@
"Return a SVN revision number of myself.
This number is updated after a commit"
- ^ "$SVN-Revision:"'1508M'"$"
+ ^ "$SVN-Revision:"'1510M'"$"
! !
!stx_libjava class methodsFor:'file generation'!