--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/AbstractJavaTestCase.st Thu May 12 14:28:39 2011 +0000
@@ -0,0 +1,65 @@
+"{ Package: 'stx:libjava' }"
+
+TestCase subclass:#AbstractJavaTestCase
+ instanceVariableNames:'exceptionThrowerBackup'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'Languages-Java-Tests-RuntimeConstantPool'
+!
+
+
+!AbstractJavaTestCase class methodsFor:'resources'!
+
+resources
+ ^ Array with: JavaInitializedResource with: JavaTestsResource.
+
+ "Created: / 26-04-2011 / 13:03:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+! !
+
+!AbstractJavaTestCase methodsFor:'helpers'!
+
+disableMockedExceptionThrowing
+ JavaResolver uniqueInstance exceptionThrower: exceptionThrowerBackup.
+
+ "Created: / 13-04-2011 / 14:11:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+!
+
+enableMockedExceptionThrowing
+ exceptionThrowerBackup := JavaResolver uniqueInstance exceptionThrower.
+ JavaResolver uniqueInstance exceptionThrower: JavaExceptionThrowerMock new.
+
+ "Created: / 13-04-2011 / 14:11:01 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+!
+
+getClassRefFor: classString
+^ JavaClassRef2 in: (JavaConstantPool with: classString)
+ withNameAt: 1.
+
+ "Created: / 10-05-2011 / 15:03:38 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+!
+
+getCrateClassReadStream
+ ^ ((Filename named: UserPreferences current javaTestsDirectory)
+ / 'libjava' / 'bin'
+ / 'stx' / 'libjava'
+ / 'tests' / 'mocks'
+ / 'Crate.class') readStream.
+
+ "Created: / 10-05-2011 / 12:13:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 12-05-2011 / 16:26:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+!
+
+getName: name descriptor: type
+ ^ JavaNameAndType2
+ in: (JavaConstantPool with: name with: type)
+ withNameAt: 1
+ andDescriptorAt: 2.
+
+ "Created: / 10-05-2011 / 16:01:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+! !
+
+!AbstractJavaTestCase class methodsFor:'documentation'!
+
+version_SVN
+ ^ '$Id$'
+! !
--- a/src/JavaClassReader2Tests.st Tue May 10 22:04:56 2011 +0000
+++ b/src/JavaClassReader2Tests.st Thu May 12 14:28:39 2011 +0000
@@ -1,6 +1,6 @@
"{ Package: 'stx:libjava' }"
-TestCase subclass:#JavaClassReader2Tests
+AbstractJavaTestCase subclass:#JavaClassReader2Tests
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
@@ -8,38 +8,6 @@
!
-!JavaClassReader2Tests class methodsFor:'resources'!
-
-resources
- ^ Array with: JavaInitializedResource with: JavaTestsResource.
-
- "Created: / 26-04-2011 / 13:03:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-! !
-
-!JavaClassReader2Tests methodsFor:'helpers'!
-
-getClassRefFor: classString
-^ JavaClassRef2 in: (JavaConstantPool with: classString)
- withNameAt: 1.
-
- "Created: / 10-05-2011 / 15:03:38 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-getCrateClassReadStream
-^ (( Smalltalk packageDirectoryForPackageId: 'stx:libjava') / 'java' / 'libjava-tests' / 'bin' / 'stx' / 'libjava' / 'tests' / 'mocks' / 'Crate.class' ) readStream.
-
- "Created: / 10-05-2011 / 12:13:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-getName: name descriptor: type
- ^ JavaNameAndType2
- in: (JavaConstantPool with: name with: type)
- withNameAt: 1
- andDescriptorAt: 2.
-
- "Created: / 10-05-2011 / 16:01:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-! !
-
!JavaClassReader2Tests methodsFor:'infrastructure'!
setUp
--- a/src/JavaClassRefTests.st Tue May 10 22:04:56 2011 +0000
+++ b/src/JavaClassRefTests.st Thu May 12 14:28:39 2011 +0000
@@ -1,6 +1,6 @@
"{ Package: 'stx:libjava' }"
-JavaRuntimeConstantPoolTests subclass:#JavaClassRefTests
+AbstractJavaTestCase subclass:#JavaClassRefTests
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
@@ -206,4 +206,3 @@
version_SVN
^ '$Id$'
! !
-
--- a/src/JavaFieldRefTests.st Tue May 10 22:04:56 2011 +0000
+++ b/src/JavaFieldRefTests.st Thu May 12 14:28:39 2011 +0000
@@ -1,6 +1,6 @@
"{ Package: 'stx:libjava' }"
-JavaRuntimeConstantPoolTests subclass:#JavaFieldRefTests
+AbstractJavaTestCase subclass:#JavaFieldRefTests
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
@@ -444,4 +444,3 @@
version_SVN
^ '$Id$'
! !
-
--- a/src/JavaInterfaceMethodRefTests.st Tue May 10 22:04:56 2011 +0000
+++ b/src/JavaInterfaceMethodRefTests.st Thu May 12 14:28:39 2011 +0000
@@ -1,6 +1,6 @@
"{ Package: 'stx:libjava' }"
-JavaRuntimeConstantPoolTests subclass:#JavaInterfaceMethodRefTests
+AbstractJavaTestCase subclass:#JavaInterfaceMethodRefTests
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
@@ -346,4 +346,3 @@
version_SVN
^ '$Id$'
! !
-
--- a/src/JavaMethodRefTests.st Tue May 10 22:04:56 2011 +0000
+++ b/src/JavaMethodRefTests.st Thu May 12 14:28:39 2011 +0000
@@ -1,6 +1,6 @@
"{ Package: 'stx:libjava' }"
-JavaRuntimeConstantPoolTests subclass:#JavaMethodRefTests
+AbstractJavaTestCase subclass:#JavaMethodRefTests
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
@@ -428,4 +428,3 @@
version_SVN
^ '$Id$'
! !
-
--- a/src/JavaRefTests.st Tue May 10 22:04:56 2011 +0000
+++ b/src/JavaRefTests.st Thu May 12 14:28:39 2011 +0000
@@ -1,6 +1,6 @@
"{ Package: 'stx:libjava' }"
-JavaRuntimeConstantPoolTests subclass:#JavaRefTests
+AbstractJavaTestCase subclass:#JavaRefTests
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
--- a/src/JavaResolver.st Tue May 10 22:04:56 2011 +0000
+++ b/src/JavaResolver.st Thu May 12 14:28:39 2011 +0000
@@ -82,7 +82,7 @@
ifFalse: [ self throwIllegalAccessError ].
"Created: / 11-04-2011 / 19:07:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 26-04-2011 / 13:14:08 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 12-05-2011 / 16:27:09 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaResolver methodsFor:'class resolving helpers'!
@@ -120,9 +120,10 @@
!
loadUnresolvedClass: aJavaClassRef
- ^ JavaClassReader loadClassLazy: aJavaClassRef javaClassName.
+ ^ JavaClassReader loadClass: aJavaClassRef javaClassName.
"Created: / 11-04-2011 / 19:27:10 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 12-05-2011 / 16:17:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
loadUnresolvedClass: aJavaClassRef withJavaClassLoader: classLoader
--- a/src/JavaRuntimeConstantPoolTests.st Tue May 10 22:04:56 2011 +0000
+++ b/src/JavaRuntimeConstantPoolTests.st Thu May 12 14:28:39 2011 +0000
@@ -1,28 +1,13 @@
"{ Package: 'stx:libjava' }"
-JavaClassReader2Tests subclass:#JavaRuntimeConstantPoolTests
- instanceVariableNames:'exceptionThrowerBackup'
+AbstractJavaTestCase subclass:#JavaRuntimeConstantPoolTests
+ instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
category:'Languages-Java-Tests-RuntimeConstantPool'
!
-!JavaRuntimeConstantPoolTests methodsFor:'helpers'!
-
-disableMockedExceptionThrowing
- JavaResolver uniqueInstance exceptionThrower: exceptionThrowerBackup.
-
- "Created: / 13-04-2011 / 14:11:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-enableMockedExceptionThrowing
- exceptionThrowerBackup := JavaResolver uniqueInstance exceptionThrower.
- JavaResolver uniqueInstance exceptionThrower: JavaExceptionThrowerMock new.
-
- "Created: / 13-04-2011 / 14:11:01 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-! !
-
!JavaRuntimeConstantPoolTests methodsFor:'infrastructure'!
setUp
@@ -134,4 +119,3 @@
version_SVN
^ '$Id$'
! !
-
--- a/src/Make.proto Tue May 10 22:04:56 2011 +0000
+++ b/src/Make.proto Thu May 12 14:28:39 2011 +0000
@@ -97,10 +97,9 @@
cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../goodies/xml/stx && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../goodies/xml/stx && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/../squeak/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -230,8 +229,7 @@
$(OUTDIR)JavaNativeMethod.$(O) JavaNativeMethod.$(H): JavaNativeMethod.st $(INCLUDE_TOP)/stx/libjava/JavaMethodWithHandler.$(H) $(INCLUDE_TOP)/stx/libjava/JavaMethodWithException.$(H) $(INCLUDE_TOP)/stx/libjava/JavaMethod.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaUnresolvedInterfaceMethodrefConstant.$(O) JavaUnresolvedInterfaceMethodrefConstant.$(H): JavaUnresolvedInterfaceMethodrefConstant.st $(INCLUDE_TOP)/stx/libjava/JavaUnresolvedMethodrefConstant.$(H) $(INCLUDE_TOP)/stx/libjava/JavaUnresolvedRefConstant.$(H) $(INCLUDE_TOP)/stx/libjava/JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaInterfaceMethodRef2.$(O) JavaInterfaceMethodRef2.$(H): JavaInterfaceMethodRef2.st $(INCLUDE_TOP)/stx/libjava/JavaMethodRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaClassContentRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaConstantPoolContent.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic2/BooleanArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/BitArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/DoubleArray.$(H) $(INCLUDE_TOP)/stx/libbasic/FloatArray.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/ZipArchive.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Float.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic2/IntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/UnboxedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic/LargeInteger.$(H) $(INCLUDE_TOP)/stx/libbasic2/LongIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ShortFloat.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic2/WordArray.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic2/BooleanArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/BitArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/DoubleArray.$(H) $(INCLUDE_TOP)/stx/libbasic/FloatArray.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic2/ZipArchive.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Float.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic2/IntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/UnboxedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic/LargeInteger.$(H) $(INCLUDE_TOP)/stx/libbasic2/LongIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ShortFloat.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic2/WordArray.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
-
--- a/src/Make.spec Tue May 10 22:04:56 2011 +0000
+++ b/src/Make.spec Thu May 12 14:28:39 2011 +0000
@@ -277,4 +277,3 @@
-
--- a/src/abbrev.stc Tue May 10 22:04:56 2011 +0000
+++ b/src/abbrev.stc Thu May 12 14:28:39 2011 +0000
@@ -1,3 +1,4 @@
+AbstractJavaTestCase AbstractJavaTestCase stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
Byte Byte stx:libjava 'Magnitude-Numbers' 0
JUnitTestCaseProxy JUnitTestCaseProxy stx:libjava 'Languages-Java-JUnit' 5
Java Java stx:libjava 'Languages-Java-Support' 0
@@ -13,11 +14,9 @@
JavaByteCodeProcessor JavaByteCodeProcessor stx:libjava 'Languages-Java-Bytecode' 0
JavaByteCodeProcessorTests JavaByteCodeProcessorTests stx:libjava 'Languages-Java-Tests' 4
JavaClassReader JavaClassReader stx:libjava 'Languages-Java-Support' 0
-JavaClassReader2Tests JavaClassReader2Tests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaClassReaderTests JavaClassReaderTests stx:libjava 'Languages-Java-Tests' 4
JavaConstantPool JavaConstantPool stx:libjava 'Languages-Java-Reader-Support' 0
JavaConstantPoolContent JavaConstantPoolContent stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaConstantPoolsTests JavaConstantPoolsTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaContext JavaContext stx:libjava 'Languages-Java-Support' 0
JavaDecompiler JavaDecompiler stx:libjava 'Languages-Java-Support-Decompiling' 0
JavaDescriptor JavaDescriptor stx:libjava 'Languages-Java-Support' 0
@@ -28,6 +27,8 @@
JavaJUnitTests JavaJUnitTests stx:libjava 'Languages-Java-Tests' 4
JavaJavadocNode JavaJavadocNode stx:libjava 'Languages-Java-AST' 0
JavaLanguage JavaLanguage stx:libjava 'Languages-Java-Support' 1
+JavaLibraries JavaLibraries stx:libjava 'Languages-Java-Support' 0
+JavaLibrariesResource JavaLibrariesResource stx:libjava 'Languages-Java-Tests' 1
JavaLocalVariableTable JavaLocalVariableTable stx:libjava 'Languages-Java-Support' 0
JavaLocalVariableTableEntry JavaLocalVariableTableEntry stx:libjava 'Languages-Java-Support' 0
JavaLookup JavaLookup stx:libjava 'Languages-Java-Lookup' 0
@@ -47,13 +48,12 @@
JavaRef JavaRef stx:libjava 'Languages-Java-Reader-Support' 0
JavaRelease JavaRelease stx:libjava 'Languages-Java-Support' 0
JavaResolver JavaResolver stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaResolverTests JavaResolverTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaSlotIndexCache JavaSlotIndexCache stx:libjava 'Languages-Java-Support' 0
JavaSourceCodeCache JavaSourceCodeCache stx:libjava 'Languages-Java-Support' 1
JavaSourceFileWriter JavaSourceFileWriter stx:libjava 'Languages-Java-Support' 0
JavaStartup JavaStartup stx:libjava 'Languages-Java-Support' 1
-JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 3
JavaTestsLoader JavaTestsLoader stx:libjava 'Languages-Java-Tests' 0
+JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
JavaTopView JavaTopView stx:libjava 'Languages-Java-Views-Support' 2
JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 4
JavaUnresolvedConstant JavaUnresolvedConstant stx:libjava 'Languages-Java-Reader-Support' 0
@@ -64,7 +64,7 @@
Short Short stx:libjava 'Magnitude-Numbers' 0
SmalltalkAppletContext SmalltalkAppletContext stx:libjava 'Languages-Java-Views-Support' 0
SmalltalkAppletStub SmalltalkAppletStub stx:libjava 'Languages-Java-Views-Support' 0
-TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-JUnit' 5
+TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-JUnit' 0
stx_libjava stx_libjava stx:libjava '* Projects & Packages *' 4
JavaAnnotationArrayValue JavaAnnotationArrayValue stx:libjava 'Languages-Java-Reader-Support' 0
JavaAnnotationClassValue JavaAnnotationClassValue stx:libjava 'Languages-Java-Reader-Support' 0
@@ -77,23 +77,29 @@
JavaClass JavaClass stx:libjava 'Languages-Java-Classes' 0
JavaClassAnnotationContainer JavaClassAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
JavaClassReader2 JavaClassReader2 stx:libjava 'Languages-Java-Support' 0
+JavaClassReader2Tests JavaClassReader2Tests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaClassRef JavaClassRef stx:libjava 'Languages-Java-Reader-Support' 0
+JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaEmbeddedFrameView JavaEmbeddedFrameView stx:libjava 'Languages-Java-Views-Support' 2
JavaField JavaField stx:libjava 'Languages-Java-Reader-Support' 0
JavaFieldAnnotationContainer JavaFieldAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
JavaFieldDescriptor JavaFieldDescriptor stx:libjava 'Languages-Java-Support' 0
+JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaFieldref JavaFieldref stx:libjava 'Languages-Java-Reader-Support' 0
JavaFormalParameterNode JavaFormalParameterNode stx:libjava 'Languages-Java-AST' 0
+JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaMethodAnnotationContainer JavaMethodAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
JavaMethodDeclarationNode JavaMethodDeclarationNode stx:libjava 'Languages-Java-AST' 0
JavaMethodDeclaratorNode JavaMethodDeclaratorNode stx:libjava 'Languages-Java-AST' 0
JavaMethodDescriptor JavaMethodDescriptor stx:libjava 'Languages-Java-Support' 0
JavaMethodNode JavaMethodNode stx:libjava 'Languages-Java-AST' 0
+JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaMethodWithException JavaMethodWithException stx:libjava 'Languages-Java-Classes' 0
JavaMethodref JavaMethodref stx:libjava 'Languages-Java-Reader-Support' 0
JavaNameAndType2 JavaNameAndType2 stx:libjava 'Languages-Java-Reader-Support-new' 0
JavaParser JavaParser stx:libjava 'Languages-Java-Parser' 0
JavaRef2 JavaRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
+JavaRefTests JavaRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaTypeNode JavaTypeNode stx:libjava 'Languages-Java-AST' 0
JavaUnhandledExceptionError JavaUnhandledExceptionError stx:libjava 'Languages-Java-Support' 1
@@ -111,18 +117,13 @@
JavaClassOrInterfaceTypeNode JavaClassOrInterfaceTypeNode stx:libjava 'Languages-Java-AST' 0
JavaClassPointerRef JavaClassPointerRef stx:libjava 'Languages-Java-Reader-Support' 0
JavaClassRef2 JavaClassRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaDoubleTypeNode JavaDoubleTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaFloatTypeNode JavaFloatTypeNode stx:libjava 'Languages-Java-AST' 0
JavaIntTypeNode JavaIntTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaInterfaceMethodref JavaInterfaceMethodref stx:libjava 'Languages-Java-Reader-Support' 0
JavaLongTypeNode JavaLongTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaMethodWithHandler JavaMethodWithHandler stx:libjava 'Languages-Java-Classes' 0
JavaRefMock JavaRefMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaRefTests JavaRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
JavaUnresolvedFieldrefConstant JavaUnresolvedFieldrefConstant stx:libjava 'Languages-Java-Reader-Support' 0
JavaUnresolvedMethodrefConstant JavaUnresolvedMethodrefConstant stx:libjava 'Languages-Java-Reader-Support' 0
JavaVoidTypeNode JavaVoidTypeNode stx:libjava 'Languages-Java-AST' 0
@@ -132,4 +133,3 @@
JavaNativeMethod JavaNativeMethod stx:libjava 'Languages-Java-Classes' 0
JavaUnresolvedInterfaceMethodrefConstant JavaUnresolvedInterfaceMethodrefConstant stx:libjava 'Languages-Java-Reader-Support' 0
JavaInterfaceMethodRef2 JavaInterfaceMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-
--- a/src/bc.mak Tue May 10 22:04:56 2011 +0000
+++ b/src/bc.mak Thu May 12 14:28:39 2011 +0000
@@ -52,10 +52,9 @@
pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\goodies\xml\vw & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\goodies\xml\stx & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\goodies\xml\stx & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -177,7 +176,6 @@
$(OUTDIR)JavaNativeMethod.$(O) JavaNativeMethod.$(H): JavaNativeMethod.st $(INCLUDE_TOP)\stx\libjava\JavaMethodWithHandler.$(H) $(INCLUDE_TOP)\stx\libjava\JavaMethodWithException.$(H) $(INCLUDE_TOP)\stx\libjava\JavaMethod.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaUnresolvedInterfaceMethodrefConstant.$(O) JavaUnresolvedInterfaceMethodrefConstant.$(H): JavaUnresolvedInterfaceMethodrefConstant.st $(INCLUDE_TOP)\stx\libjava\JavaUnresolvedMethodrefConstant.$(H) $(INCLUDE_TOP)\stx\libjava\JavaUnresolvedRefConstant.$(H) $(INCLUDE_TOP)\stx\libjava\JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaInterfaceMethodRef2.$(O) JavaInterfaceMethodRef2.$(H): JavaInterfaceMethodRef2.st $(INCLUDE_TOP)\stx\libjava\JavaMethodRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaClassContentRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaConstantPoolContent.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic2\BooleanArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\BitArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\DoubleArray.$(H) $(INCLUDE_TOP)\stx\libbasic\FloatArray.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\ZipArchive.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Float.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic2\IntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\UnboxedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\LargeInteger.$(H) $(INCLUDE_TOP)\stx\libbasic2\LongIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ShortFloat.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic2\WordArray.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic2\BooleanArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\BitArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\DoubleArray.$(H) $(INCLUDE_TOP)\stx\libbasic\FloatArray.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic2\ZipArchive.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Float.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic2\IntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\UnboxedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\LargeInteger.$(H) $(INCLUDE_TOP)\stx\libbasic2\LongIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ShortFloat.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic2\WordArray.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
-
--- a/src/builder/package.deps.rake Tue May 10 22:04:56 2011 +0000
+++ b/src/builder/package.deps.rake Thu May 12 14:28:39 2011 +0000
@@ -40,9 +40,6 @@
task "stx:libhtml" => "stx:libview"
task "stx:libhtml" => "stx:libbasic"
-task "stx:goodies/xml/stx" => "stx:goodies/xml/vw"
-task "stx:goodies/xml/stx" => "stx:libbasic2"
-task "stx:goodies/xml/stx" => "stx:libbasic"
task "stx:libtool" => "stx:libwidg2"
task "stx:libtool" => "stx:libbasic3"
@@ -72,10 +69,6 @@
task "stx:libbasic3" => "stx:libbasic2"
task "stx:libbasic3" => "stx:libbasic"
-task "stx:goodies/xml/vw" => "stx:libbasic2"
-task "stx:goodies/xml/vw" => "stx:libbasic3"
-task "stx:goodies/xml/vw" => "stx:libbasic"
-
task "stx:libui" => "stx:libview2"
task "stx:libui" => "stx:libview"
task "stx:libui" => "stx:libbasic"
--- a/src/libInit.cc Tue May 10 22:04:56 2011 +0000
+++ b/src/libInit.cc Thu May 12 14:28:39 2011 +0000
@@ -140,4 +140,3 @@
_stx_137libjava_extensions_Init(pass,__pRT__,snd);
__END_PACKAGE__();
}
-
--- a/src/libjava.rc Tue May 10 22:04:56 2011 +0000
+++ b/src/libjava.rc Thu May 12 14:28:39 2011 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libjava.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,1,1111,1111
+ FILEVERSION 6,1,0,1
PRODUCTVERSION 6,1,2,1
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -18,12 +18,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.1.1111.1111\0"
+ VALUE "FileVersion", "6.1.0.1\0"
VALUE "InternalName", "stx:libjava\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2010\nCopyright eXept Software AG 1998-2010\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.1.2.1\0"
- VALUE "ProductDate", "Tue, 10 May 2011 15:20:20 GMT\0"
+ VALUE "ProductDate", "Thu, 12 May 2011 14:29:10 GMT\0"
END
END
@@ -33,4 +33,3 @@
VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
END
END
-
--- a/src/stx_libjava.st Tue May 10 22:04:56 2011 +0000
+++ b/src/stx_libjava.st Thu May 12 14:28:39 2011 +0000
@@ -84,7 +84,7 @@
^ #(
#'squeak:petitparser' "PPParser - superclass of JavaParser::BlockParser "
- #'stx:goodies/sunit' "TestAsserter - superclass of JUnitTestCaseProxy "
+ #'stx:goodies/sunit' "TestCase - superclass of JavaClassRefTests "
#'stx:libbasic' "Object - superclass of JavaUnresolvedFieldrefConstant "
#'stx:libbasic2' "ZipArchive - referenced by Java class>>classSource:package:in: "
#'stx:libbasic3' "MessageTracer - referenced by JavaMethod>>setBreakPoint "
@@ -108,6 +108,7 @@
^ #(
"<className> or (<className> attributes...) in load order"
+ (AbstractJavaTestCase autoload)
Byte
(JUnitTestCaseProxy autoload)
Java
@@ -123,11 +124,9 @@
JavaByteCodeProcessor
(JavaByteCodeProcessorTests autoload)
JavaClassReader
- (JavaClassReader2Tests autoload)
(JavaClassReaderTests autoload)
JavaConstantPool
JavaConstantPoolContent
- (JavaConstantPoolsTests autoload)
JavaContext
JavaDecompiler
JavaDescriptor
@@ -159,7 +158,6 @@
JavaRef
JavaRelease
JavaResolver
- (JavaResolverTests autoload)
JavaSlotIndexCache
JavaSourceCodeCache
JavaSourceFileWriter
@@ -189,23 +187,29 @@
JavaClass
JavaClassAnnotationContainer
JavaClassReader2
+ (JavaClassReader2Tests autoload)
JavaClassRef
+ (JavaClassRefTests autoload)
JavaEmbeddedFrameView
JavaField
JavaFieldAnnotationContainer
JavaFieldDescriptor
+ (JavaFieldRefTests autoload)
JavaFieldref
JavaFormalParameterNode
+ (JavaInterfaceMethodRefTests autoload)
JavaMethodAnnotationContainer
JavaMethodDeclarationNode
JavaMethodDeclaratorNode
JavaMethodDescriptor
JavaMethodNode
+ (JavaMethodRefTests autoload)
JavaMethodWithException
JavaMethodref
JavaNameAndType2
JavaParser
JavaRef2
+ (JavaRefTests autoload)
(JavaRuntimeConstantPoolTests autoload)
JavaTypeNode
JavaUnhandledExceptionError
@@ -223,18 +227,13 @@
JavaClassOrInterfaceTypeNode
JavaClassPointerRef
JavaClassRef2
- (JavaClassRefTests autoload)
JavaDoubleTypeNode
- (JavaFieldRefTests autoload)
JavaFloatTypeNode
JavaIntTypeNode
- (JavaInterfaceMethodRefTests autoload)
JavaInterfaceMethodref
JavaLongTypeNode
- (JavaMethodRefTests autoload)
JavaMethodWithHandler
(JavaRefMock autoload)
- (JavaRefTests autoload)
JavaUnresolvedFieldrefConstant
JavaUnresolvedMethodrefConstant
JavaVoidTypeNode