fixed flushAllJavaResources.. suprisingly easy :)) jk_new_structure
authorhlopkmar
Wed, 16 Nov 2011 08:45:40 +0000
branchjk_new_structure
changeset 1113 7ac31c29769f
parent 1112 bcacdf94b551
child 1114 e5c34f689010
fixed flushAllJavaResources.. suprisingly easy :))
src/Java.st
src/JavaVM.st
src/Make.proto
src/Make.spec
src/abbrev.stc
src/bc.mak
src/libjava.rc
--- a/src/Java.st	Tue Nov 15 00:11:34 2011 +0000
+++ b/src/Java.st	Wed Nov 16 08:45:40 2011 +0000
@@ -1000,6 +1000,7 @@
 
     "Modified: / 06-11-2001 / 09:47:49 / cg"
     "Modified: / 30-10-2011 / 16:09:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 16-11-2011 / 09:43:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 markAllClassesUninitialized
--- a/src/JavaVM.st	Tue Nov 15 00:11:34 2011 +0000
+++ b/src/JavaVM.st	Wed Nov 16 08:45:40 2011 +0000
@@ -1326,7 +1326,7 @@
 
 deinitialize
     StandardThreadGroup := nil.
-    self releaseAllMonitors.
+    
     KnownWindows notNil ifTrue: [
         KnownWindows do: [:v | v isTopView ifTrue: [ v destroy ] ]
     ].
@@ -1342,7 +1342,7 @@
     "Created: / 03-01-1998 / 21:28:14 / cg"
     "Modified: / 03-12-1998 / 20:33:21 / cg"
     "Modified: / 28-01-2011 / 14:11:35 / Marcel Hlopko <hlopik@gmail.com>"
-    "Modified: / 02-11-2011 / 22:07:37 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 16-11-2011 / 09:46:49 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 deinitializeAdditionalJavaProtocol
@@ -1968,7 +1968,7 @@
     self initializePrimitiveClasses.
 
     self terminateAllThreads.
-
+self releaseAllMonitors.
     self releaseAllWindows.
     self releaseAllStreams.
 
@@ -1979,6 +1979,7 @@
     "Created: / 07-01-1998 / 22:49:42 / cg"
     "Modified: / 24-12-1999 / 02:33:11 / cg"
     "Modified: / 17-12-2010 / 17:51:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 16-11-2011 / 09:46:55 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 releaseAllMonitors
@@ -16192,7 +16193,6 @@
 
 syncMonitorCache
     | mO  mC  mP  mon  wasBlocked  enteredMonitors |
-    self breakPoint:#mh.
     wasBlocked := OperatingSystem blockInterrupts.
     (mO := EnteredMonitorObject) notNil ifTrue: [
         mC := EnteredMonitorObjectCount.
@@ -16207,7 +16207,7 @@
 
     "Created: / 08-01-1999 / 13:59:17 / cg"
     "Modified: / 09-01-1999 / 00:39:55 / cg"
-    "Modified: / 09-11-2011 / 14:21:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 16-11-2011 / 09:37:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 unwindHandlerForJavaContext: aJavaContext 
--- a/src/Make.proto	Tue Nov 15 00:11:34 2011 +0000
+++ b/src/Make.proto	Wed Nov 16 08:45:40 2011 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-11-14 23:28:39.829.
+# automagically generated from the projectDefinition: stx_libjava at 2011-11-16 09:47:57.487.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/Make.spec	Tue Nov 15 00:11:34 2011 +0000
+++ b/src/Make.spec	Wed Nov 16 08:45:40 2011 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-11-14 23:28:37.911.
+# automagically generated from the projectDefinition: stx_libjava at 2011-11-16 09:47:57.061.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/abbrev.stc	Tue Nov 15 00:11:34 2011 +0000
+++ b/src/abbrev.stc	Wed Nov 16 08:45:40 2011 +0000
@@ -28,19 +28,19 @@
 JavaExceptionThrowerMock JavaExceptionThrowerMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
 JavaField JavaField stx:libjava 'Languages-Java-Reader-Support' 0
 JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 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' 1
+JavaInitializedResource JavaInitializedResource stx:libjava 'Languages-Java-Tests' 0
+JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
+JavaJUnitTests JavaJUnitTests stx:libjava 'Languages-Java-Tests' 0
 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
+JavaLibrariesResource JavaLibrariesResource stx:libjava 'Languages-Java-Tests' 0
 JavaLocalVariableTable JavaLocalVariableTable stx:libjava 'Languages-Java-Support' 0
 JavaLocalVariableTableEntry JavaLocalVariableTableEntry stx:libjava 'Languages-Java-Support' 0
 JavaLookup JavaLookup stx:libjava 'Languages-Java-Lookup' 0
 JavaMathSupport JavaMathSupport stx:libjava 'Languages-Java-Support-Native' 0
 JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes' 0
-JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
+JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
 JavaNameAndType2 JavaNameAndType2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaNativeMemory JavaNativeMemory stx:libjava 'Languages-Java-Support' 0
 JavaNode JavaNode stx:libjava 'Languages-Java-AST' 0
@@ -48,35 +48,35 @@
 JavaObjectDictionary JavaObjectDictionary stx:libjava 'Languages-Java-Support' 0
 JavaPackage JavaPackage stx:libjava 'Languages-Java-Classes' 0
 JavaParseResult JavaParseResult stx:libjava 'Languages-Java-Parser' 0
-JavaParserNavigationTests JavaParserNavigationTests stx:libjava 'Languages-Java-Tests' 1
-JavaParserTestCase JavaParserTestCase stx:libjava 'Languages-Java-Tests' 1
-JavaParserTests JavaParserTests stx:libjava 'Languages-Java-Tests' 1
+JavaParserNavigationTests JavaParserNavigationTests stx:libjava 'Languages-Java-Tests' 0
+JavaParserTestCase JavaParserTestCase stx:libjava 'Languages-Java-Tests' 0
+JavaParserTests JavaParserTests stx:libjava 'Languages-Java-Tests' 0
 JavaPopUpView JavaPopUpView stx:libjava 'Languages-Java-Views-Support' 2
 JavaProcess JavaProcess stx:libjava 'Languages-Java-Classes' 0
 JavaRef2 JavaRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaRefMock JavaRefMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaRefTests JavaRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
+JavaRefTests JavaRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
 JavaRelease JavaRelease stx:libjava 'Languages-Java-Support' 0
 JavaResolver JavaResolver stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaSelectorParserTests JavaSelectorParserTests stx:libjava 'Languages-Java-Lookup-Tests' 1
+JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
+JavaSelectorParserTests JavaSelectorParserTests stx:libjava 'Languages-Java-Lookup-Tests' 0
 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
 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
 JavaTypeBox JavaTypeBox stx:libjava 'Languages-Java-Types' 0
-JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 1
+JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 0
 JavaUnresolvedConstant JavaUnresolvedConstant stx:libjava 'Languages-Java-Reader-Support' 0
 JavaVM JavaVM stx:libjava 'Languages-Java-Support' 0
 JavaView JavaView stx:libjava 'Languages-Java-Views-Support' 2
 JavaZipSupport JavaZipSupport stx:libjava 'Languages-Java-Support' 0
-LookupIntegrationTests LookupIntegrationTests stx:libjava 'Languages-Java-Lookup-Tests' 1
-LookupIntegrationTestsResource LookupIntegrationTestsResource stx:libjava 'Languages-Java-Lookup-Tests' 3
-LookupTests LookupTests stx:libjava 'Languages-Java-Lookup-Tests' 1
+LookupIntegrationTests LookupIntegrationTests stx:libjava 'Languages-Java-Lookup-Tests' 0
+LookupIntegrationTestsResource LookupIntegrationTestsResource stx:libjava 'Languages-Java-Lookup-Tests' 0
+LookupTests LookupTests stx:libjava 'Languages-Java-Lookup-Tests' 0
 MessageDescription MessageDescription stx:libjava 'Languages-Java-Lookup' 0
 NoOpTypeBox NoOpTypeBox stx:libjava 'Languages-Java-Types' 0
 PPJavaNode PPJavaNode stx:libjava 'Languages-Java-AST' 0
@@ -88,8 +88,8 @@
 SmalltalkAppletContext SmalltalkAppletContext stx:libjava 'Languages-Java-Views-Support' 0
 SmalltalkAppletStub SmalltalkAppletStub stx:libjava 'Languages-Java-Views-Support' 0
 SmalltalkLookup SmalltalkLookup stx:libjava 'Languages-Java-Lookup' 0
-SmalltalkSelectorParserTests SmalltalkSelectorParserTests stx:libjava 'Languages-Java-Lookup-Tests' 1
-TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
+SmalltalkSelectorParserTests SmalltalkSelectorParserTests stx:libjava 'Languages-Java-Lookup-Tests' 0
+TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 0
 stx_libjava stx_libjava stx:libjava '* Projects & Packages *' 3
 JavaAnnotationArrayValue JavaAnnotationArrayValue stx:libjava 'Languages-Java-Reader-Support' 0
 JavaAnnotationClassValue JavaAnnotationClassValue stx:libjava 'Languages-Java-Reader-Support' 0
@@ -145,8 +145,8 @@
 JavaVoidTypeNode JavaVoidTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaInterfaceMethodRef2 JavaInterfaceMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaNativeMethod JavaNativeMethod stx:libjava 'Languages-Java-Classes' 0
-JavaClassLoadingTests JavaClassLoadingTests stx:libjava 'Languages-Java-Tests-ClassLoading' 1
-JavaFreshlyInitializedResource JavaFreshlyInitializedResource stx:libjava 'Languages-Java-Tests' 1
+JavaClassLoadingTests JavaClassLoadingTests stx:libjava 'Languages-Java-Tests-ClassLoading' 0
+JavaFreshlyInitializedResource JavaFreshlyInitializedResource stx:libjava 'Languages-Java-Tests' 0
 JavaClassRegistry JavaClassRegistry stx:libjava 'Languages-Java-Support' 0
 JavaConstants JavaConstants stx:libjava 'Languages-Java-Support' 0
 JavaSocket JavaSocket stx:libjava 'Languages-Java-Support' 0
--- a/src/bc.mak	Tue Nov 15 00:11:34 2011 +0000
+++ b/src/bc.mak	Wed Nov 16 08:45:40 2011 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-11-14 23:28:40.655.
+# automagically generated from the projectDefinition: stx_libjava at 2011-11-16 09:47:57.711.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/libjava.rc	Tue Nov 15 00:11:34 2011 +0000
+++ b/src/libjava.rc	Wed Nov 16 08:45:40 2011 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1453,1453
+  FILEVERSION     6,2,0,1
   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.1453.1453\0"
+      VALUE "FileVersion", "6.2.0.1\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", "Mon, 14 Nov 2011 22:29:09 GMT\0"
+      VALUE "ProductDate", "Wed, 16 Nov 2011 08:48:00 GMT\0"
     END
 
   END