--- a/JavaFieldRefTests.st Sat Nov 17 20:41:00 2012 +0000
+++ b/JavaFieldRefTests.st Sat Nov 17 20:43:46 2012 +0000
@@ -371,11 +371,11 @@
classForName: 'stx.libjava.tests.mocks.PublicClass') fields
at: 3.
self assertTrue: (result = expectedResult).
- self assertTrue: (javaFieldRef offset = 3).
+ self assertTrue: (javaFieldRef offset = 4).
self assertTrue: (javaFieldRef type = 'java.lang.String').
"Created: / 08-04-2011 / 14:07:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 23-05-2011 / 16:29:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 17-11-2012 / 21:44:49 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
testInvalidation
--- a/JavaResolver.st Sat Nov 17 20:41:00 2012 +0000
+++ b/JavaResolver.st Sat Nov 17 20:43:46 2012 +0000
@@ -180,7 +180,7 @@
!
checkPermissionsFrom: refOwner to: resolvedClass
- OperatingSystem getLoginName = 'mfoo' ifFalse: [ ^ true ].
+ OperatingSystem getLoginName = 'm' ifFalse: [ ^ true ].
(JavaDescriptor isJavaPrimitiveArrayName: resolvedClass javaName) ifTrue: [
^ true
].
@@ -194,8 +194,8 @@
"Created: / 11-04-2011 / 19:35:21 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
"Modified (comment): / 09-10-2011 / 23:11:54 / Marcel Hlopko <hlopik@gmail.com>"
- "Modified (format): / 12-04-2012 / 10:12:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
"Modified: / 23-08-2012 / 20:21:40 / m"
+ "Modified: / 17-11-2012 / 21:33:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
loadUnresolvedClass: aJavaClassRef
--- a/JavaRuntimeConstantPoolTests.st Sat Nov 17 20:41:00 2012 +0000
+++ b/JavaRuntimeConstantPoolTests.st Sat Nov 17 20:43:46 2012 +0000
@@ -91,6 +91,17 @@
"Created: / 12-04-2012 / 10:16:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
+_testInvalidateAll
+ | cp |
+ cp := self getPrettyBigConstantPool.
+ cp do: [:each | each isJavaRef ifTrue: [ each resolve ] ].
+ cp do: [:each | each isJavaRef ifTrue: [ self assertTrue: (each isResolved) ] ].
+ cp invalidateAll.
+ cp do: [:each | each isJavaRef ifTrue: [ self assertTrue: (each isResolved not) ] ].
+
+ "Created: / 17-11-2012 / 21:44:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+!
+
_testInvalidateForClass
"will be enabled when caching and invalidation is implemented"
| cp |
--- a/Make.proto Sat Nov 17 20:41:00 2012 +0000
+++ b/Make.proto Sat Nov 17 20:43:46 2012 +0000
@@ -63,7 +63,7 @@
all:: preMake classLibRule postMake
-pre_objs:: zlib support/fdlibm/libfdm.a ant
+pre_objs:: zlib support/fdlibm/libfdm.a ant
ant:
--- a/libjava.rc Sat Nov 17 20:41:00 2012 +0000
+++ b/libjava.rc Sat Nov 17 20:43:46 2012 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libjava.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,2201,2201
+ FILEVERSION 6,2,2202,2202
PRODUCTVERSION 6,2,3,1
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG & SWING Research Group\0"
VALUE "FileDescription", "Java support for Smalltalk/X (LIB)\0"
- VALUE "FileVersion", "6.2.2201.2201\0"
+ VALUE "FileVersion", "6.2.2202.2202\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\n SWING Research Group, Czech Technical University In Prague\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.3.1\0"
- VALUE "ProductDate", "Fri, 16 Nov 2012 00:22:39 GMT\0"
+ VALUE "ProductDate", "Sat, 17 Nov 2012 20:45:42 GMT\0"
END
END
--- a/stx_libjava.st Sat Nov 17 20:41:00 2012 +0000
+++ b/stx_libjava.st Sat Nov 17 20:43:46 2012 +0000
@@ -155,17 +155,17 @@
exclude individual packages in the #excludedFromPrerequisites method."
^ #(
- #'stx:goodies/sunit' "TestSuite - referenced by stx_libjava class>>testSuite "
- #'stx:libbasic' "LibraryDefinition - superclass of stx_libjava "
- #'stx:libbasic2' "BitArray - superclass of extended BooleanArray "
+ #'stx:goodies/sunit' "TestCase - superclass of JUnitTestCaseProxy "
+ #'stx:libbasic' "AbstractSourceFileWriter - superclass of JavaSourceFileWriter "
+ #'stx:libbasic2' "Socket - superclass of JavaSocket "
#'stx:libbasic3' "WrappedMethod - extended "
- #'stx:libcomp' "SourceFileLoader - referenced by GroovyCompiler class>>compile:forClass:inCategory:notifying:install:skipIfSame:silent: "
+ #'stx:libcomp' "MethodNode - referenced by ProxyMethodCompiler>>generate "
#'stx:libhtml' "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
- #'stx:libtool' "WorkspaceApplication - referenced by GroovyEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
- #'stx:libview' "GraphicsContext - superclass of JavaTopView "
+ #'stx:libtool' "DebugView - referenced by Java class>>flushClasses "
+ #'stx:libview' "StandardSystemView - superclass of JavaTopView "
#'stx:libview2' "GIFReader - referenced by JavaVM class>>_GifImageDecoder_parseImage: "
#'stx:libwidg' "HVScrollableView - referenced by JavaVM class>>_WTextAreaPeer_create: "
- #'stx:libwidg2' "ComboBoxView - referenced by JavaVM class>>processEvent: "
+ #'stx:libwidg2' "MenuPanel - referenced by JavaVM class>>processEvent: "
)
! !
@@ -576,6 +576,20 @@
Object getJavaLockWord
Object getJavaMonitor
Object javaWrapRequired
+ 'java/lang/Byte class' javaWrap:
+ 'java/lang/Byte class' javaWrapRequired
+ 'java/lang/Double class' javaWrap:
+ 'java/lang/Double class' javaWrapRequired
+ 'java/lang/Float class' javaWrap:
+ 'java/lang/Float class' javaWrapRequired
+ 'java/lang/Integer class' javaWrap:
+ 'java/lang/Integer class' javaWrapRequired
+ 'java/lang/Long class' javaWrap:
+ 'java/lang/Long class' javaWrapRequired
+ 'java/lang/Short class' javaWrap:
+ 'java/lang/Short class' javaWrapRequired
+ 'java/lang/String class' javaWrap:
+ 'java/lang/String class' javaWrapRequired
)
! !
@@ -659,7 +673,7 @@
"Return a SVN revision number of myself.
This number is updated after a commit"
- ^ "$SVN-Revision:"'2197 '"$"
+ ^ "$SVN-Revision:"'2206 '"$"
! !
!stx_libjava class methodsFor:'file generation'!