temporarily add JavaConstantPool>>invalidateReferencesForClass
The method is an alias of invalidateForClass. Only one of
these will be used in the near future, but until then, alias
method is needed for Java reloading tests.
--- a/JavaConstantPool.st Sun Sep 22 21:12:02 2013 +0200
+++ b/JavaConstantPool.st Tue Oct 01 22:58:12 2013 +0200
@@ -76,11 +76,12 @@
!JavaConstantPool class methodsFor:'special'!
invalidateForClass: internalJavaClassName
- "Only alias, everybody calls invalidateForClass so why not me :)"
+ "Alias for invalidateReferencesToClass to keep object apis consistent"
^ self invalidateReferencesToClass: internalJavaClassName.
"Created: / 08-04-2011 / 16:52:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified (comment): / 01-10-2013 / 22:00:25 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
!
invalidateReferencesToClass: internalJavaClassName
@@ -152,6 +153,13 @@
"Created: / 13-05-2011 / 09:05:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
+!JavaConstantPool methodsFor:'invalidation'!
+
+invalidateReferencesToClass: binaryName
+ ^ self invalidateForClass: binaryName.
+
+ "Created: / 01-10-2013 / 22:33:07 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
+! !
!JavaConstantPool methodsFor:'printing & storing'!
--- a/Make.proto Sun Sep 22 21:12:02 2013 +0200
+++ b/Make.proto Tue Oct 01 22:58:12 2013 +0200
@@ -21,7 +21,7 @@
INCLUDE_TOP=$(TOP)/..
# subdirectories where targets are to be made:
-SUBDIRS= examples experiments tools examples/jabber
+SUBDIRS= tools experiments
# subdirectories where Makefiles are to be made:
--- a/abbrev.stc Sun Sep 22 21:12:02 2013 +0200
+++ b/abbrev.stc Tue Oct 01 22:58:12 2013 +0200
@@ -37,7 +37,6 @@
JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
JavaFinalizationRegistry JavaFinalizationRegistry stx:libjava 'Languages-Java-Support' 0
JavaFreshlyInitializedResource JavaFreshlyInitializedResource stx:libjava 'Languages-Java-Tests' 1
-JavaInitializedResource JavaInitializedResource stx:libjava 'Languages-Java-Tests' 2
JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
JavaJUnitTests JavaJUnitTests stx:libjava 'Languages-Java-Tests-Libraries' 1
JavaLanguage JavaLanguage stx:libjava 'Languages-Java-Support' 1
@@ -76,7 +75,7 @@
JavaSourceFileWriter JavaSourceFileWriter stx:libjava 'Languages-Java-Support' 0
JavaTestCaseProxy JavaTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
JavaTestsLoader JavaTestsLoader stx:libjava 'Languages-Java-Tests' 0
-JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
+JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 0
JavaTopView JavaTopView stx:libjava 'Languages-Java-Views-Support' 2
JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 1
JavaUnresolvedCompilationError JavaUnresolvedCompilationError stx:libjava 'Languages-Java-Support' 1
@@ -114,6 +113,7 @@
JavaFieldAnnotationContainer JavaFieldAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
JavaFieldDescriptor JavaFieldDescriptor stx:libjava 'Languages-Java-Support' 0
JavaFieldDescriptorWithUnionType JavaFieldDescriptorWithUnionType stx:libjava 'Languages-Java-Support' 0
+JavaInitializedResource JavaInitializedResource stx:libjava 'Languages-Java-Tests' 2
JavaInvalidRefError JavaInvalidRefError stx:libjava 'Languages-Java-Support' 1
JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes' 0
JavaMethodAnnotationContainer JavaMethodAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
--- a/bmake.bat Sun Sep 22 21:12:02 2013 +0200
+++ b/bmake.bat Tue Oct 01 22:58:12 2013 +0200
@@ -10,20 +10,6 @@
make.exe -N -f bc.mak %DEFINES% %*
@echo "***********************************"
-@echo "Buildung stx/libjava/examples/jabber
-@echo "***********************************"
-@cd examples\jabber
-@call bmake %1 %2
-@cd ..\..
-
-@echo "***********************************"
-@echo "Buildung stx/libjava/examples
-@echo "***********************************"
-@cd examples
-@call bmake %1 %2
-@cd ..
-
-@echo "***********************************"
@echo "Buildung stx/libjava/tools
@echo "***********************************"
@cd tools
--- a/lccmake.bat Sun Sep 22 21:12:02 2013 +0200
+++ b/lccmake.bat Tue Oct 01 22:58:12 2013 +0200
@@ -6,20 +6,6 @@
make.exe -N -f bc.mak -DUSELCC=1 %*
@echo "***********************************"
-@echo "Buildung stx/libjava/examples/jabber
-@echo "***********************************"
-@cd examples\jabber
-@call lccmake %1 %2
-@cd ..\..
-
-@echo "***********************************"
-@echo "Buildung stx/libjava/examples
-@echo "***********************************"
-@cd examples
-@call lccmake %1 %2
-@cd ..
-
-@echo "***********************************"
@echo "Buildung stx/libjava/tools
@echo "***********************************"
@cd tools
--- a/libjava.rc Sun Sep 22 21:12:02 2013 +0200
+++ b/libjava.rc Tue Oct 01 22:58:12 2013 +0200
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n SWING Research Group, Czech Technical University In Prague\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.3.0\0"
- VALUE "ProductDate", "Fri, 20 Sep 2013 01:02:02 GMT\0"
+ VALUE "ProductDate", "Tue, 01 Oct 2013 20:53:43 GMT\0"
END
END
--- a/mingwmake.bat Sun Sep 22 21:12:02 2013 +0200
+++ b/mingwmake.bat Tue Oct 01 22:58:12 2013 +0200
@@ -14,20 +14,6 @@
make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
@echo "***********************************"
-@echo "Buildung stx/libjava/examples/jabber
-@echo "***********************************"
-@cd examples\jabber
-@call mingwmake %1 %2
-@cd ..\..
-
-@echo "***********************************"
-@echo "Buildung stx/libjava/examples
-@echo "***********************************"
-@cd examples
-@call mingwmake %1 %2
-@cd ..
-
-@echo "***********************************"
@echo "Buildung stx/libjava/tools
@echo "***********************************"
@cd tools
--- a/stx_libjava.st Sun Sep 22 21:12:02 2013 +0200
+++ b/stx_libjava.st Tue Oct 01 22:58:12 2013 +0200
@@ -160,7 +160,7 @@
(the browser has a menu function for that)"
^ #(
- #'stx:goodies/sunit' "TestAsserter - superclass of JavaByteCodeProcessorTests "
+ #'stx:goodies/sunit' "TestAsserter - superclass of JavaAntProjectResource "
#'stx:libbasic' "AbstractNumberVector - extended "
#'stx:libbasic2' "BitArray - extended "
#'stx:libbasic3' "WrappedMethod - extended "
@@ -193,10 +193,8 @@
for those, redefine requiredPrerequisites"
^ #(
- #'stx:libjava/examples'
+ #'stx:libjava/tools'
#'stx:libjava/experiments'
- #'stx:libjava/tools'
- #'stx:libjava/examples/jabber'
)
! !
@@ -345,7 +343,6 @@
(JavaFieldRefTests autoload)
JavaFinalizationRegistry
(JavaFreshlyInitializedResource autoload)
- (JavaInitializedResource autoload)
(JavaInterfaceMethodRefTests autoload)
(JavaJUnitTests autoload)
JavaLanguage
@@ -422,6 +419,7 @@
JavaFieldAnnotationContainer
JavaFieldDescriptor
JavaFieldDescriptorWithUnionType
+ (JavaInitializedResource autoload)
JavaInvalidRefError
JavaMethod
JavaMethodAnnotationContainer
--- a/vcmake.bat Sun Sep 22 21:12:02 2013 +0200
+++ b/vcmake.bat Tue Oct 01 22:58:12 2013 +0200
@@ -18,20 +18,6 @@
@echo "***********************************"
-@echo "Buildung stx/libjava/examples/jabber
-@echo "***********************************"
-@cd examples\jabber
-@call vcmake %1 %2
-@cd ..\..
-
-@echo "***********************************"
-@echo "Buildung stx/libjava/examples
-@echo "***********************************"
-@cd examples
-@call vcmake %1 %2
-@cd ..
-
-@echo "***********************************"
@echo "Buildung stx/libjava/tools
@echo "***********************************"
@cd tools