--- a/JavaVM.st	Fri Feb 15 18:49:09 2013 +0000
+++ b/JavaVM.st	Fri Feb 15 18:59:16 2013 +0000
@@ -2543,33 +2543,33 @@
                     self booted ifFalse: [
                         "class loaders allowed after vm boot, until then, only primordial"
                         class := self usePrimordialCLToLoadClassNamed: className.
-                        self assert: (class notNil)
-                            description: 'Couldnt load class ' , className , ' while booting Java VM'.
+                        self assert:(class notNil)
+    message:'Couldnt load class ' , className , ' while booting Java VM'.
                         class.
                     ] ifTrue: [
-                        self assert: (self booted)
-                            description: 'Java VM is not booted and we are not using primordial class loader to load: '
-                                    , className.
+                        self assert:(self booted)
+    message:'Java VM is not booted and we are not using primordial class loader to load: ' 
+            , className.
                         (Java release bootClassPathIncludesClassNamed: className) ifTrue: [
                             "we will use primordial class loader for classes in rt.jar etc"
                             class := self usePrimordialCLToLoadClassNamed: className.
-                            self assert: (class notNil)
-                                description: 'Class ' , className
-                                        , ' is supposed to be in boot classpath, but we couldnt load it'.
+                            self assert:(class notNil)
+    message:'Class ' , className 
+            , ' is supposed to be in boot classpath, but we couldnt load it'.
                             class.
                         ] ifFalse: [
                             (Java release extDirsIncludesClassNamed: className) ifTrue: [
                                 class := self useExtCLToLoadClassNamed: className.
-                                self assert: (class notNil)
-                                    description: 'Class ' , className
-                                            , ' is supposed to be in java.ext,dirs, but we couldnt load it'.
+                                self assert:(class notNil)
+    message:'Class ' , className 
+            , ' is supposed to be in java.ext,dirs, but we couldnt load it'.
                                 class.
                             ] ifFalse: [
                                 "at this point, nil classLoader means use system class loader,
                                  in other words, at this point, we shouldnt use primordial cl at all"
                                 classLoader isNil ifTrue: [
-                                    self assert: (self systemClassLoader notNil)
-                                        description: 'We needed system class loader, but its not loaded yet'.
+                                    self assert:(self systemClassLoader notNil)
+    message:'We needed system class loader, but its not loaded yet'.
                                     classLoaderEnsured := self systemClassLoader
                                 ] ifFalse: [ classLoaderEnsured := classLoader ].
                                 class := self useUserDefinedCL: classLoaderEnsured
@@ -2701,14 +2701,14 @@
 useExtCLToLoadClassNamed: className
     | ecl  class |
     ecl := self extClassLoader.
-    self assert: (ecl notNil)
-        description: 'we want to use ExtClassLoader, but its not loaded yet'.
+    self assert:(ecl notNil)
+    message:'we want to use ExtClassLoader, but its not loaded yet'.
     class := ecl
                 perform: #'loadClassInternal(Ljava/lang/String;)Ljava/lang/Class;'
                 with: (Java as_String: (className asDottedJavaClassName)).
-    self assert: (class notNil)
-        description: 'we tried to load class ' , className
-                , ' using ExtClassLoader and we failed:)'.
+    self assert:(class notNil)
+    message:'we tried to load class ' , className 
+            , ' using ExtClassLoader and we failed:)'.
                 class := JavaVM classForJavaClassObject: class.
                 class classLoader: ecl.
     ^ class.
@@ -3132,7 +3132,7 @@
      - If S is a class representing the array type SC[], that is, an array of com-
      ponents of type SC , then:
     "
-    self assert: s isJavaArrayClass description: 'S should be array type'.
+    self assert:s isJavaArrayClass message:'S should be array type'.
     sc := s javaComponentClass.
      "
      - If T is a class type, then T must be Object.

--- a/Make.proto	Fri Feb 15 18:49:09 2013 +0000
+++ b/Make.proto	Fri Feb 15 18:59:16 2013 +0000
@@ -213,7 +213,6 @@
 $(OUTDIR)JavaSocket.$(O) JavaSocket.$(H): JavaSocket.st $(INCLUDE_TOP)/stx/libbasic2/Socket.$(H) $(INCLUDE_TOP)/stx/libbasic/NonPositionableExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaSourceCodeCache.$(O) JavaSourceCodeCache.$(H): JavaSourceCodeCache.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaSourceFileWriter.$(O) JavaSourceFileWriter.$(H): JavaSourceFileWriter.st $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaStartup.$(O) JavaStartup.$(H): JavaStartup.st $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTestsLoader.$(O) JavaTestsLoader.$(H): JavaTestsLoader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTopView.$(O) JavaTopView.$(H): JavaTopView.st $(INCLUDE_TOP)/stx/libview/StandardSystemView.$(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)JavaUnresolvedConstant.$(O) JavaUnresolvedConstant.$(H): JavaUnresolvedConstant.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)

--- a/abbrev.stc	Fri Feb 15 18:49:09 2013 +0000
+++ b/abbrev.stc	Fri Feb 15 18:59:16 2013 +0000
@@ -64,7 +64,6 @@
 JavaSocket JavaSocket 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

--- a/bc.mak	Fri Feb 15 18:49:09 2013 +0000
+++ b/bc.mak	Fri Feb 15 18:59:16 2013 +0000
@@ -147,7 +147,6 @@
 $(OUTDIR)JavaSocket.$(O) JavaSocket.$(H): JavaSocket.st $(INCLUDE_TOP)\stx\libbasic2\Socket.$(H) $(INCLUDE_TOP)\stx\libbasic\NonPositionableExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaSourceCodeCache.$(O) JavaSourceCodeCache.$(H): JavaSourceCodeCache.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaSourceFileWriter.$(O) JavaSourceFileWriter.$(H): JavaSourceFileWriter.st $(INCLUDE_TOP)\stx\libbasic\AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaStartup.$(O) JavaStartup.$(H): JavaStartup.st $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTestsLoader.$(O) JavaTestsLoader.$(H): JavaTestsLoader.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTopView.$(O) JavaTopView.$(H): JavaTopView.st $(INCLUDE_TOP)\stx\libview\StandardSystemView.$(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)JavaUnresolvedConstant.$(O) JavaUnresolvedConstant.$(H): JavaUnresolvedConstant.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)

--- a/libjava.rc	Fri Feb 15 18:49:09 2013 +0000
+++ b/libjava.rc	Fri Feb 15 18:59:16 2013 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,564,564
+  FILEVERSION     6,2,32767,32767
   PRODUCTVERSION  6,2,3,0
 #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.564.564\0"
+      VALUE "FileVersion", "6.2.32767.32767\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.0\0"
-      VALUE "ProductDate", "Thu, 14 Feb 2013 16:11:53 GMT\0"
+      VALUE "ProductDate", "Fri, 15 Feb 2013 18:58:03 GMT\0"
     END
 
   END

--- a/stx_libjava.st	Fri Feb 15 18:49:09 2013 +0000
+++ b/stx_libjava.st	Fri Feb 15 18:59:16 2013 +0000
@@ -332,7 +332,6 @@
         JavaSocket
         JavaSourceCodeCache
         JavaSourceFileWriter
-        JavaStartup
         (JavaTestCaseProxy autoload)
         JavaTestsLoader
         (JavaTestsResource autoload)
@@ -422,6 +421,8 @@
         #'JavaNativeMethodImpl_OpenJDK7'
         #'JavaNativeMethodImpl_SunJDK7'
     )
+
+    "Modified: / 15-02-2013 / 18:54:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 extensionMethodNames