--- a/Java.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/Java.st	Fri Feb 22 16:06:12 2013 +0000
@@ -59,7 +59,6 @@
 "
 ! !
 
-
 !Java class methodsFor:'accessing'!
 
 classForName: aString
@@ -187,7 +186,6 @@
     "Created: / 9.1.1999 / 14:49:35 / cg"
 ! !
 
-
 !Java class methodsFor:'change & update'!
 
 update: what with: param from: sender
@@ -199,7 +197,6 @@
     "Created: / 14-12-2010 / 21:00:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !Java class methodsFor:'class initialization'!
 
 boot
@@ -492,7 +489,6 @@
     "Modified: / 17-11-2011 / 21:31:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !Java class methodsFor:'debugging'!
 
 dontHaltOnKnownBugs
@@ -549,7 +545,6 @@
     "Created: / 09-10-2011 / 17:29:05 / m"
 ! !
 
-
 !Java class methodsFor:'enumerating'!
 
 allClasses
@@ -567,7 +562,6 @@
     "Modified: / 23-10-2011 / 20:14:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !Java class methodsFor:'object conversions'!
 
 as_Boolean:aBoolean
@@ -727,6 +721,12 @@
     "Modified: / 25.9.1999 / 22:22:21 / cg"
 ! !
 
+!Java class methodsFor:'others'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
 
 !Java class methodsFor:'paths-accessing'!
 
@@ -851,7 +851,6 @@
     "Modified: / 16-01-2013 / 12:45:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !Java class methodsFor:'paths-adding & removing'!
 
 addToClassPath:pathOrCollection
@@ -941,7 +940,6 @@
     "Created: 2.8.1997 / 14:13:01 / cg"
 ! !
 
-
 !Java class methodsFor:'paths-utils'!
 
 addToClassPathInRuntime: aPath
@@ -1042,7 +1040,6 @@
 
 ! !
 
-
 !Java class methodsFor:'queries'!
 
 smalltalkClassFor:typeRef
@@ -1067,7 +1064,6 @@
     "Modified: 7.4.1997 / 13:13:24 / cg"
 ! !
 
-
 !Java class methodsFor:'registering java classes'!
 
 at: aJavaName
@@ -1251,7 +1247,6 @@
     "Modified: 12.8.1997 / 03:04:44 / cg"
 ! !
 
-
 !Java class methodsFor:'source management'!
 
 classSource:filename package:package in:dirOrZipFile
@@ -1431,7 +1426,6 @@
     "Modified: / 16-01-2013 / 12:46:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !Java class methodsFor:'starting apps'!
 
 javaProcessForMainOf:aJavaClass
@@ -1504,7 +1498,6 @@
     "Modified: / 24.12.1999 / 01:50:21 / cg"
 ! !
 
-
 !Java class methodsFor:'threads'!
 
 addThread: jThread for: stProcess
@@ -1597,7 +1590,6 @@
     "Created: / 09-12-2011 / 12:49:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !Java class methodsFor:'documentation'!
 
 version
@@ -1608,11 +1600,6 @@
     ^ '$Header: /cvs/stx/stx/libjava/Java.st,v 1.138 2013-02-18 23:44:48 cg Exp $'
 !
 
-version_HG
-
-    ^ '§Changeset: <not expanded> §'
-!
-
 version_SVN
     ^ '§Id§'
 

--- a/JavaAntProjectResource.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/JavaAntProjectResource.st	Fri Feb 22 16:06:12 2013 +0000
@@ -30,7 +30,11 @@
 JavaAntProjectResource class instanceVariableNames:'built'
 
 "
- No other class instance variables are inherited by this class.
+ The following class instance variables are inherited by this class:
+
+	TestResource - current
+	TestAsserter - 
+	Object - 
 "
 !
 
@@ -60,7 +64,6 @@
 "
 ! !
 
-
 !JavaAntProjectResource class methodsFor:'accessing'!
 
 antBuildDotXml
@@ -94,7 +97,6 @@
     "Created: / 02-09-2011 / 09:27:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaAntProjectResource class methodsFor:'accessing - ant project'!
 
 antProjectDir
@@ -103,7 +105,6 @@
     ^ self subclassResponsibility
 ! !
 
-
 !JavaAntProjectResource class methodsFor:'running'!
 
 build
@@ -155,7 +156,6 @@
     "Modified (comment): / 02-09-2011 / 09:32:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaAntProjectResource methodsFor:'running'!
 
 setUp
@@ -171,7 +171,6 @@
     "Modified: / 13-09-2012 / 20:34:19 / m"
 ! !
 
-
 !JavaAntProjectResource methodsFor:'testing'!
 
 isAvailable
@@ -182,7 +181,6 @@
     "Created: / 18-07-2011 / 15:07:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaAntProjectResource class methodsFor:'documentation'!
 
 version_CVS

--- a/JavaByteCodeProcessorTests.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/JavaByteCodeProcessorTests.st	Fri Feb 22 16:06:12 2013 +0000
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaByteCodeProcessorTests class methodsFor:'testing'!
 
 isAbstract
@@ -63,7 +62,6 @@
     "Created: / 08-08-2011 / 17:36:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaByteCodeProcessorTests methodsFor:'tests-helpers'!
 
 invoke: methodName class: aClass args: args 
@@ -113,7 +111,6 @@
     "Modified: / 07-04-2011 / 23:15:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaByteCodeProcessorTests class methodsFor:'documentation'!
 
 version_CVS

--- a/JavaClassPathBundle.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/JavaClassPathBundle.st	Fri Feb 22 16:06:12 2013 +0000
@@ -87,7 +87,6 @@
 "
 ! !
 
-
 !JavaClassPathBundle methodsFor:'accessing'!
 
 environment
@@ -131,7 +130,6 @@
     "Created: / 25-01-2013 / 22:24:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassPathBundle methodsFor:'adding & removing'!
 
 add: libraryOrBundle
@@ -148,7 +146,6 @@
     "Created: / 15-01-2013 / 17:31:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassPathBundle methodsFor:'generating'!
 
 classPathOn:aStream
@@ -173,7 +170,6 @@
     "Modified: / 23-01-2013 / 14:42:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassPathBundle methodsFor:'initialization'!
 
 initialize
@@ -192,7 +188,6 @@
     "Modified: / 16-01-2013 / 13:29:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassPathBundle::EnvironmentBundle class methodsFor:'documentation'!
 
 documentation
@@ -212,7 +207,6 @@
 "
 ! !
 
-
 !JavaClassPathBundle::EnvironmentBundle methodsFor:'adding & removing'!
 
 add: libraryOrBundle
@@ -229,7 +223,6 @@
     "Created: / 15-01-2013 / 17:31:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassPathBundle::PackagesBundle class methodsFor:'documentation'!
 
 documentation
@@ -249,7 +242,6 @@
 "
 ! !
 
-
 !JavaClassPathBundle::PackagesBundle methodsFor:'accessing'!
 
 libraries
@@ -263,7 +255,6 @@
     "Created: / 15-01-2013 / 17:34:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassPathBundle::PackagesBundle methodsFor:'adding & removing'!
 
 add: libraryOrBundle
@@ -280,7 +271,6 @@
     "Created: / 15-01-2013 / 17:31:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassPathBundle class methodsFor:'documentation'!
 
 version_CVS

--- a/JavaCodeBundle.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/JavaCodeBundle.st	Fri Feb 22 16:06:12 2013 +0000
@@ -69,7 +69,6 @@
 "
 ! !
 
-
 !JavaCodeBundle class methodsFor:'instance creation'!
 
 new
@@ -132,7 +131,6 @@
     "Created: / 15-01-2013 / 17:05:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeBundle methodsFor:'accessing'!
 
 / name
@@ -147,24 +145,26 @@
     "Modified: / 15-01-2013 / 17:32:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeBundle methodsFor:'adding & removing'!
 
 add: libraryOrBundle
 
-    libraries add: libraryOrBundle
+    libraries add: libraryOrBundle.
+    self changed: #libraries.
 
     "Created: / 12-01-2013 / 16:08:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-02-2013 / 15:18:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 remove: libraryOrBundle
 
-    libraries remove: libraryOrBundle
+    libraries remove: libraryOrBundle.
+    self changed: #libraries.
 
     "Created: / 12-01-2013 / 16:08:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-02-2013 / 15:38:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeBundle methodsFor:'generating'!
 
 classPathOn:aStream
@@ -184,7 +184,6 @@
     "Modified: / 15-01-2013 / 17:32:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeBundle methodsFor:'initialization'!
 
 initialize
@@ -198,7 +197,6 @@
     "Modified: / 12-01-2013 / 16:07:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeBundle methodsFor:'testing'!
 
 isBundle
@@ -207,7 +205,6 @@
     "Created: / 25-01-2013 / 21:44:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeBundle class methodsFor:'documentation'!
 
 version_CVS

--- a/JavaCodeLibrary.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/JavaCodeLibrary.st	Fri Feb 22 16:06:12 2013 +0000
@@ -70,7 +70,6 @@
 "
 ! !
 
-
 !JavaCodeLibrary methodsFor:'accessing'!
 
 classes
@@ -97,7 +96,6 @@
     sources := something.
 ! !
 
-
 !JavaCodeLibrary methodsFor:'generating'!
 
 classPathOn:aStream
@@ -121,7 +119,6 @@
     "Modified: / 16-01-2013 / 13:12:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeLibrary methodsFor:'testing'!
 
 isLibrary
@@ -130,7 +127,6 @@
     "Created: / 25-01-2013 / 21:44:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeLibrary class methodsFor:'documentation'!
 
 version_CVS

--- a/JavaCodeLibraryOrBundle.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/JavaCodeLibraryOrBundle.st	Fri Feb 22 16:06:12 2013 +0000
@@ -69,7 +69,6 @@
 "
 ! !
 
-
 !JavaCodeLibraryOrBundle methodsFor:'accessing'!
 
 name
@@ -82,7 +81,6 @@
     name := something.
 ! !
 
-
 !JavaCodeLibraryOrBundle methodsFor:'generating'!
 
 classPath
@@ -109,7 +107,6 @@
     "Created: / 12-01-2013 / 16:24:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeLibraryOrBundle methodsFor:'printing & storing'!
 
 printOn:aStream
@@ -123,7 +120,6 @@
     "Modified: / 15-01-2013 / 17:20:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeLibraryOrBundle methodsFor:'testing'!
 
 isBundle
@@ -138,7 +134,6 @@
     "Created: / 25-01-2013 / 21:44:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaCodeLibraryOrBundle class methodsFor:'documentation'!
 
 version_CVS

--- a/JavaRefsAndConstantPoolTestCase.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/JavaRefsAndConstantPoolTestCase.st	Fri Feb 22 16:06:12 2013 +0000
@@ -60,7 +60,6 @@
 "
 ! !
 
-
 !JavaRefsAndConstantPoolTestCase class methodsFor:'resources'!
 
 resources
@@ -69,7 +68,6 @@
     "Created: / 26-04-2011 / 13:03:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRefsAndConstantPoolTestCase class methodsFor:'testing'!
 
 isAbstract
@@ -78,7 +76,6 @@
     "Created: / 06-07-2012 / 21:53:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaRefsAndConstantPoolTestCase methodsFor:'cp creation helpers'!
 
 getClassRefNamed: name 
@@ -162,7 +159,6 @@
     "Created: / 23-05-2011 / 16:00:01 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRefsAndConstantPoolTestCase methodsFor:'helpers'!
 
 disableMockedExceptionThrowing
@@ -243,7 +239,6 @@
     "Created: / 12-05-2011 / 19:09:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRefsAndConstantPoolTestCase methodsFor:'refs creation'!
 
 getClassRefIn: aJavaConstantPool withNameAt: nameCPIndex 
@@ -309,7 +304,6 @@
     "Created: / 23-05-2011 / 16:00:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRefsAndConstantPoolTestCase methodsFor:'running'!
 
 setUp
@@ -327,7 +321,6 @@
     "Modified: / 08-08-2011 / 17:24:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaRefsAndConstantPoolTestCase::JavaExceptionThrowerMock class methodsFor:'documentation'!
 
 copyright
@@ -358,7 +351,6 @@
     ^ '§Id§'
 ! !
 
-
 !JavaRefsAndConstantPoolTestCase::JavaExceptionThrowerMock methodsFor:'exceptions'!
 
 throwAbstractMethodError
@@ -402,7 +394,6 @@
     "Modified: / 13-04-2011 / 14:10:10 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRefsAndConstantPoolTestCase class methodsFor:'documentation'!
 
 version_CVS

--- a/JavaTestCaseProxy.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/JavaTestCaseProxy.st	Fri Feb 22 16:06:12 2013 +0000
@@ -30,7 +30,11 @@
 JavaTestCaseProxy class instanceVariableNames:'javaClassName shouldFork'
 
 "
- No other class instance variables are inherited by this class.
+ The following class instance variables are inherited by this class:
+
+	TestCase - lastOutcomes
+	TestAsserter - 
+	Object - 
 "
 !
 
@@ -60,7 +64,6 @@
 "
 ! !
 
-
 !JavaTestCaseProxy class methodsFor:'initialization'!
 
 initialize
@@ -79,7 +82,6 @@
     "Created: / 01-03-2011 / 10:43:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaTestCaseProxy class methodsFor:'accessing'!
 
 javaClass
@@ -114,7 +116,6 @@
     "Created: / 10-08-2011 / 21:21:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaTestCaseProxy class methodsFor:'private'!
 
 testSelectors
@@ -123,7 +124,6 @@
     ^ self subclassResponsibility
 ! !
 
-
 !JavaTestCaseProxy class methodsFor:'queries'!
 
 isAbstract
@@ -140,7 +140,6 @@
     "Created: / 21-06-2011 / 16:57:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaTestCaseProxy class methodsFor:'subclass creation'!
 
 for: javaClass 
@@ -176,7 +175,6 @@
     "Created: / 21-06-2011 / 17:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaTestCaseProxy methodsFor:'accessing'!
 
 javaClass
@@ -192,7 +190,6 @@
 
 ! !
 
-
 !JavaTestCaseProxy methodsFor:'queries'!
 
 shouldSkip
@@ -201,7 +198,6 @@
     "Created: / 29-11-2012 / 12:03:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaTestCaseProxy class methodsFor:'documentation'!
 
 version_CVS

--- a/JavaVM.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/JavaVM.st	Fri Feb 22 16:06:12 2013 +0000
@@ -1247,7 +1247,6 @@
 
 ! !
 
-
 !JavaVM class methodsFor:'initialization'!
 
 boot
@@ -2281,7 +2280,6 @@
     "Modified: / 17-08-2012 / 15:35:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'Signal constants'!
 
 badMessageSignal
@@ -2352,7 +2350,6 @@
     "Modified: / 15-01-2013 / 22:30:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'accessing'!
 
 addClass:aJavaClass definedBy:aJavaClassLoader
@@ -2487,7 +2484,6 @@
     "Created: / 23-02-2011 / 12:59:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'cache management'!
 
 flushCachesFor: aClass
@@ -2507,7 +2503,6 @@
     "Created: / 17-10-2012 / 20:22:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'class access'!
 
 arrayClassFor: javaClass ifAbsentPut: block
@@ -2711,7 +2706,6 @@
     "Modified: / 30-10-2011 / 14:02:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'class loading'!
 
 useExtCLToLoadClassNamed: className
@@ -2756,7 +2750,6 @@
     "Modified: / 22-08-2012 / 12:57:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'debugging support'!
 
 disableMonitorTrace
@@ -2817,7 +2810,6 @@
     "Created: / 25-02-2011 / 08:08:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'debugging-dumping'!
 
 dumpOpenExternalStream: stream on: output
@@ -2876,7 +2868,6 @@
     "Created: / 23-07-2012 / 16:34:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'defaults'!
 
 audioEnabled
@@ -3088,7 +3079,6 @@
     "Created: / 19.10.1998 / 16:02:06 / cg"
 ! !
 
-
 !JavaVM class methodsFor:'eager resolving'!
 
 disableEagerResolving
@@ -3109,7 +3099,6 @@
     "Created: / 08-12-2011 / 21:06:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'helpers'!
 
 canCast: s to: t
@@ -3307,7 +3296,6 @@
     "Modified: / 25-04-2011 / 20:27:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'helpers - exceptions'!
 
 throwAbstractMethodError
@@ -3827,7 +3815,6 @@
     "Created: / 20-07-2012 / 19:15:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'helpers - io'!
 
 commonOpenStreamUsing: aBlock
@@ -3865,7 +3852,6 @@
     "Modified: / 16-01-2013 / 20:56:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'helpers - reflection'!
 
 classForJavaClassObject:aJavaClassObject
@@ -3972,7 +3958,6 @@
     "Modified: / 28-02-2011 / 16:58:05 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaVM class methodsFor:'monitors'!
 
 getJavaMonitorFor:someObject
@@ -4208,7 +4193,6 @@
     "Modified: / 26-08-2012 / 18:40:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'monitors-internal'!
 
 acquireMonitor: obj ofProcess: aProcess
@@ -4622,7 +4606,6 @@
     "Modified: / 10-04-2012 / 11:08:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'monitors-obsolete'!
 
 waitFor: sema state: pState timeOut: tmo
@@ -4672,7 +4655,6 @@
     "Modified: / 20-11-2011 / 12:36:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'native - java.lang'!
 
 _java_lang_System_arraycopy: nativeContext
@@ -4683,6 +4665,12 @@
     "Modified: / 21-01-2013 / 09:18:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!JavaVM class methodsFor:'others'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
 
 !JavaVM class methodsFor:'queries'!
 
@@ -4707,7 +4695,6 @@
     "Modified: / 04-12-2011 / 10:32:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'threads'!
 
 clearInterrupted: process
@@ -4828,7 +4815,6 @@
     "Created: / 16-08-2012 / 21:52:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'vm support'!
 
 _ANEWARRAY:cls _:size
@@ -5446,7 +5432,6 @@
     "Modified: / 02-11-2012 / 21:10:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM class methodsFor:'windows - events'!
 
 awtEventsForEvent: anEvent javaWindow: jWin
@@ -5947,7 +5932,6 @@
     "Modified: / 10.12.1998 / 19:36:59 / cg"
 ! !
 
-
 !JavaVM::Performance class methodsFor:'documentation'!
 
 documentation
@@ -5966,7 +5950,6 @@
 "
 ! !
 
-
 !JavaVM::Performance class methodsFor:'instance creation'!
 
 for: aJavaVM
@@ -6038,7 +6021,6 @@
     "Modified (format): / 20-02-2013 / 00:06:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM::Performance methodsFor:'initialization'!
 
 setVM: aJavaVM
@@ -6053,7 +6035,6 @@
     "Modified: / 20-02-2013 / 00:07:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM::Performance methodsFor:'orinting-streams'!
 
 printOpenExternalStream: stream number: index on: output
@@ -6171,7 +6152,6 @@
     "Modified: / 11-02-2013 / 12:43:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM::Performance methodsFor:'printing-counters'!
 
 printCounters
@@ -6265,7 +6245,6 @@
     "Created: / 27-10-2012 / 18:12:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM::Performance methodsFor:'printing-counters-private'!
 
 printCounter: name on: stream
@@ -6294,7 +6273,6 @@
     "Created: / 15-10-2012 / 15:29:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM::ReflectionRegistry class methodsFor:'documentation'!
 
 documentation
@@ -6313,7 +6291,6 @@
 "
 ! !
 
-
 !JavaVM::ReflectionRegistry class methodsFor:'instance creation'!
 
 for: aJavaVM
@@ -6329,7 +6306,6 @@
     ^ self basicNew initialize.
 ! !
 
-
 !JavaVM::ReflectionRegistry methodsFor:'debugging'!
 
 returnNilIfMissing
@@ -6344,7 +6320,6 @@
     "Created: / 28-01-2011 / 15:25:35 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaVM::ReflectionRegistry methodsFor:'initialization'!
 
 flush
@@ -6375,7 +6350,6 @@
     "Created: / 21-12-2010 / 19:44:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM::ReflectionRegistry methodsFor:'reflection - classes'!
 
 arrayClassFor: javaClass ifAbsentPut: block
@@ -6489,7 +6463,6 @@
     "Created: / 05-12-2011 / 09:57:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM::ReflectionRegistry methodsFor:'reflection - constant pool'!
 
 constantPoolFor:javaConstantPoolObject
@@ -6512,7 +6485,6 @@
     "Created: / 21-12-2010 / 19:54:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM::ReflectionRegistry methodsFor:'reflection - methods & ctors'!
 
 classForJavaConstructorObject:constructor
@@ -6658,7 +6630,6 @@
     "Created: / 05-12-2011 / 10:00:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaVM::ReflectionRegistry methodsFor:'reflection - other'!
 
 javaStringObjectForString:string
@@ -6676,7 +6647,6 @@
     "Created: / 09-02-2011 / 10:34:29 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaVM class methodsFor:'documentation'!
 
 version
@@ -6687,11 +6657,6 @@
     ^ '$Header: /cvs/stx/stx/libjava/JavaVM.st,v 1.188 2013-02-18 17:04:46 vrany Exp $'
 !
 
-version_HG
-
-    ^ 'Changeset: <not expanded> '
-!
-
 version_SVN
     ^ 'Id'
 ! !

--- a/Make.proto	Fri Feb 22 00:34:22 2013 +0000
+++ b/Make.proto	Fri Feb 22 16:06:12 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/Make.proto,v 1.17 2013-02-18 11:39:01 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava.

--- a/Make.spec	Fri Feb 22 00:34:22 2013 +0000
+++ b/Make.spec	Fri Feb 22 16:06:12 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/Make.spec,v 1.10 2013-02-18 11:38:46 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava.

--- a/bc.mak	Fri Feb 22 00:34:22 2013 +0000
+++ b/bc.mak	Fri Feb 22 16:06:12 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/bc.mak,v 1.22 2013-02-18 15:11:31 cg Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava.

--- a/libInit.cc	Fri Feb 22 00:34:22 2013 +0000
+++ b/libInit.cc	Fri Feb 22 16:06:12 2013 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvs/stx/stx/libjava/libInit.cc,v 1.11 2013-02-18 11:41:00 vrany Exp $
+ * $Header$
  *
  * DO NOT EDIT
  * automagically generated from the projectDefinition: stx_libjava.

--- a/libjava.rc	Fri Feb 22 00:34:22 2013 +0000
+++ b/libjava.rc	Fri Feb 22 16:06:12 2013 +0000
@@ -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", "Wed, 20 Feb 2013 00:17:54 GMT\0"
+      VALUE "ProductDate", "Fri, 22 Feb 2013 16:01:06 GMT\0"
     END
 
   END

--- a/stx_libjava.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/stx_libjava.st	Fri Feb 22 16:06:12 2013 +0000
@@ -20,7 +20,7 @@
 "
 "{ Package: 'stx:libjava' }"
 
-LibraryDefinition subclass:#'stx_libjava'
+LibraryDefinition subclass:#stx_libjava
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -53,16 +53,10 @@
 "
 !
 
-extensionsVersion_HG
-
-    ^ '$Changeset: <not expanded> $'
-!
-
 extensionsVersion_SVN
     ^ '$Id::                                                                                                                        $'
 ! !
 
-
 !stx_libjava class methodsFor:'accessing'!
 
 svnRepositoryUrl
@@ -82,7 +76,6 @@
     "Created: / 08-04-2011 / 16:57:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !stx_libjava class methodsFor:'accessing - tests'!
 
 excludedFromTestSuite  
@@ -148,7 +141,6 @@
     "Created: / 21-06-2011 / 17:33:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !stx_libjava class methodsFor:'description'!
 
 excludedFromPreRequisites
@@ -182,7 +174,6 @@
     )
 ! !
 
-
 !stx_libjava class methodsFor:'description - compilation'!
 
 additionalLinkLibraries_bc_dot_mak
@@ -268,7 +259,6 @@
     "Created: / 23-08-2006 / 11:06:17 / cg"
 ! !
 
-
 !stx_libjava class methodsFor:'description - contents'!
 
 classNamesAndAttributes
@@ -602,7 +592,6 @@
     "Modified: / 07-02-2013 / 16:31:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !stx_libjava class methodsFor:'description - java'!
 
 javaBundle
@@ -622,7 +611,6 @@
     "Created: / 15-01-2013 / 18:04:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !stx_libjava class methodsFor:'description - project information'!
 
 applicationIconFileName
@@ -662,7 +650,6 @@
     ^ 'Smalltalk/X'
 ! !
 
-
 !stx_libjava class methodsFor:'description - svn'!
 
 svnRepositoryUrlString
@@ -681,7 +668,6 @@
     ^ "$SVN-Revision:"'2242            '"$"
 ! !
 
-
 !stx_libjava class methodsFor:'file generation'!
 
 basicFileNamesToGenerat
@@ -700,6 +686,12 @@
     "Created: / 11-03-2011 / 09:32:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!stx_libjava class methodsFor:'others'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
 
 !stx_libjava class methodsFor:'documentation'!
 
@@ -707,11 +699,6 @@
     ^ '$Header: /cvs/stx/stx/libjava/stx_libjava.st,v 1.7 2013-02-18 11:41:09 vrany Exp $'
 !
 
-version_HG
-
-    ^ '§Changeset: <not expanded> §'
-!
-
 version_SVN
     ^ '§Id§'
 ! !

--- a/tools/JavaCodeBundleEditor.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/tools/JavaCodeBundleEditor.st	Fri Feb 22 16:06:12 2013 +0000
@@ -359,12 +359,14 @@
 !
 
 updateTree
-    self bundleTree root:
-        (Item libraryOrBundle: self bundleHolder value parent: nil).
+    self bundleTree root notNil ifTrue:[
+        self bundleTree removeAll; root: nil.
+    ].
+    self bundleTree root: (Item libraryOrBundle: self bundleHolder value parent: nil).
     self bundleTree root expand.
 
     "Created: / 25-01-2013 / 21:40:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 28-01-2013 / 20:35:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-02-2013 / 14:01:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaCodeBundleEditor methodsFor:'hooks'!
@@ -378,7 +380,7 @@
 !JavaCodeBundleEditor methodsFor:'menu actions'!
 
 doAdd: libraryOrBundle
-    | libraryOrBundleItem parent parentItem |
+    | parent parentItem |
 
     parentItem := self bundleTreeSelectionHolder value.
     parentItem isNil ifTrue:[
@@ -392,39 +394,38 @@
 
     parent add: libraryOrBundle.
 
-    libraryOrBundleItem := Item libraryOrBundle: libraryOrBundle parent: parentItem.
-    parentItem add: libraryOrBundleItem.
     parentItem expand.
 
-    self bundleTreeSelectionHolder value: libraryOrBundleItem.
+    self doSelect: libraryOrBundle.
     self updateModifiedChannel
 
     "Created: / 30-01-2013 / 17:20:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 21-02-2013 / 23:44:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-02-2013 / 15:36:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doAddBundle
     | name bundle |
 
     name := Dialog request: (resources string: 'Enter name of new bundle').
-    name isNil ifTrue:[^self].
+    name isEmptyOrNil ifTrue:[^self].
     bundle := JavaCodeBundle new.
     bundle name: name.
 
     self doAdd: bundle
 
-    "Modified: / 30-01-2013 / 17:20:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-02-2013 / 13:19:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doAddLibrary
     | dialog |
 
     dialog := JavaCodeLibraryEditor new.
-    dialog open ifTrue:[
+    dialog open.
+    dialog accepted ifTrue:[
         self doAdd: dialog acceptedValue.
     ]
 
-    "Modified: / 21-02-2013 / 23:30:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-02-2013 / 13:25:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doBrowseFiles
@@ -464,12 +465,25 @@
     parent := parentItem libraryOrBundle.
 
     parent remove: sel.
-    parentItem remove: selItem.
+    parent libraries size > 0 ifTrue:[
+        parentItem expand.
+    ].
 
-    self bundleTreeSelectionHolder value: parentItem.
+    self doSelect: parent.
     self updateModifiedChannel
 
-    "Modified: / 30-01-2013 / 17:22:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-02-2013 / 15:53:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+doSelect: libraryOrBundle
+    self bundleTree root recursiveDo:[:e|
+        e libraryOrBundle == libraryOrBundle ifTrue:[
+            self bundleTreeSelectionHolder value: e.
+            ^self
+        ]
+    ]
+
+    "Created: / 22-02-2013 / 15:36:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaCodeBundleEditor::Item class methodsFor:'instance creation'!
@@ -500,8 +514,55 @@
     ^ libraryOrBundle
 !
 
-libraryOrBundle:something
-    libraryOrBundle := something.
+libraryOrBundle:aJavaCodeLibraryOrBundle
+    libraryOrBundle notNil ifTrue:[
+        libraryOrBundle removeDependent: self
+    ].
+    libraryOrBundle := aJavaCodeLibraryOrBundle.
+    libraryOrBundle notNil ifTrue:[
+        libraryOrBundle addDependent: self
+    ].
+
+    "Modified: / 22-02-2013 / 15:19:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaCodeBundleEditor::Item methodsFor:'change & update'!
+
+update:aspect with: parameter from:changedObject
+    "Invoked when an object that I depend upon sends a change notification."
+
+    changedObject == libraryOrBundle ifTrue:[
+        self updateChildren.
+        ^ self.
+    ].
+    super update:aspect with:parameter from:changedObject
+
+    "Modified: / 22-02-2013 / 15:20:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+updateChildren
+    | oldChildren newChildren |
+
+    children isNil ifTrue:[
+        self children: self fetchChildren.
+        ^self.
+    ].
+    libraryOrBundle isLibrary ifTrue:[ ^ self ].
+
+
+    oldChildren := children copy.
+    newChildren := OrderedCollection new.
+    libraryOrBundle libraries do:[:e|
+        | item |
+
+        item := oldChildren 
+                detect:[:item|item libraryOrBundle == e] 
+                ifNone:[self class libraryOrBundle:e parent: self].
+        newChildren add: item.
+    ].
+    self children: newChildren
+
+    "Created: / 22-02-2013 / 15:20:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaCodeBundleEditor::Item methodsFor:'protocol-accessing'!

--- a/tools/JavaCodeLibraryEditor.st	Fri Feb 22 00:34:22 2013 +0000
+++ b/tools/JavaCodeLibraryEditor.st	Fri Feb 22 16:06:12 2013 +0000
@@ -396,13 +396,13 @@
         library name: self nameHolder value.
         library classes: self classesHolder value.
         library sources: self sourcesHolder value.
-        self acceptValue: library.
+        acceptedValue := library.
         ^self
     ].
 
     super update:something with:aParameter from:changedObject
 
-    "Modified: / 21-02-2013 / 19:59:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-02-2013 / 11:46:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaCodeLibraryEditor methodsFor:'hooks'!

--- a/tools/Make.proto	Fri Feb 22 00:34:22 2013 +0000
+++ b/tools/Make.proto	Fri Feb 22 16:06:12 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/tools/Make.proto,v 1.1 2013-02-16 18:08:44 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava_tools.
@@ -122,6 +122,7 @@
 postMake:: cleanjunk
 
 prereq: $(REQUIRED_SUPPORT_DIRS)
+	cd $(TOP)/../squeak/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -135,7 +136,6 @@
 	cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../goodies/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/../squeak/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -156,7 +156,7 @@
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)JavaCodeBundleEditor.$(O) JavaCodeBundleEditor.$(H): JavaCodeBundleEditor.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)JavaCodeLibraryEditor.$(O) JavaCodeLibraryEditor.$(H): JavaCodeLibraryEditor.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaCodeLibraryEditor.$(O) JavaCodeLibraryEditor.$(H): JavaCodeLibraryEditor.st $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaListInspectorView.$(O) JavaListInspectorView.$(H): JavaListInspectorView.st $(INCLUDE_TOP)/stx/libtool/OrderedCollectionInspectorView.$(H) $(INCLUDE_TOP)/stx/libtool/InspectorView.$(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)JavaMapInspectorView.$(O) JavaMapInspectorView.$(H): JavaMapInspectorView.st $(INCLUDE_TOP)/stx/libtool/DictionaryInspectorView.$(H) $(INCLUDE_TOP)/stx/libtool/InspectorView.$(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)JavaParseNode.$(O) JavaParseNode.$(H): JavaParseNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -186,7 +186,7 @@
 $(OUTDIR)JavaLongTypeNode.$(O) JavaLongTypeNode.$(H): JavaLongTypeNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaTypeNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaVoidTypeNode.$(O) JavaVoidTypeNode.$(H): JavaVoidTypeNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaTypeNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(H) $(STCHDR)
+$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libjava/JavaClass.$(H) $(INCLUDE_TOP)/stx/libjava/JavaBehavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaObject.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)/stx/libtool/SystemBrowser.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line

--- a/tools/Make.spec	Fri Feb 22 00:34:22 2013 +0000
+++ b/tools/Make.spec	Fri Feb 22 16:06:12 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/tools/Make.spec,v 1.1 2013-02-16 18:08:44 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava_tools.

--- a/tools/bc.mak	Fri Feb 22 00:34:22 2013 +0000
+++ b/tools/bc.mak	Fri Feb 22 16:06:12 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/tools/bc.mak,v 1.1 2013-02-16 18:08:44 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava_tools.
@@ -50,6 +50,7 @@
 
 # build all prerequisite packages for this package
 prereq:
+	pushd ..\..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -63,7 +64,6 @@
 	pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\goodies\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -81,7 +81,7 @@
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)JavaCodeBundleEditor.$(O) JavaCodeBundleEditor.$(H): JavaCodeBundleEditor.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)JavaCodeLibraryEditor.$(O) JavaCodeLibraryEditor.$(H): JavaCodeLibraryEditor.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaCodeLibraryEditor.$(O) JavaCodeLibraryEditor.$(H): JavaCodeLibraryEditor.st $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaListInspectorView.$(O) JavaListInspectorView.$(H): JavaListInspectorView.st $(INCLUDE_TOP)\stx\libtool\OrderedCollectionInspectorView.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(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)JavaMapInspectorView.$(O) JavaMapInspectorView.$(H): JavaMapInspectorView.st $(INCLUDE_TOP)\stx\libtool\DictionaryInspectorView.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(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)JavaParseNode.$(O) JavaParseNode.$(H): JavaParseNode.st $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -111,7 +111,7 @@
 $(OUTDIR)JavaLongTypeNode.$(O) JavaLongTypeNode.$(H): JavaLongTypeNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaTypeNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaVoidTypeNode.$(O) JavaVoidTypeNode.$(H): JavaVoidTypeNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaTypeNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(H) $(STCHDR)
+$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libjava\JavaClass.$(H) $(INCLUDE_TOP)\stx\libjava\JavaBehavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaObject.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)\stx\libtool\SystemBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line

--- a/tools/libInit.cc	Fri Feb 22 00:34:22 2013 +0000
+++ b/tools/libInit.cc	Fri Feb 22 16:06:12 2013 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvs/stx/stx/libjava/tools/libInit.cc,v 1.1 2013-02-16 18:08:44 vrany Exp $
+ * $Header$
  *
  * DO NOT EDIT
  * automagically generated from the projectDefinition: stx_libjava_tools.

--- a/tools/tools.rc	Fri Feb 22 00:34:22 2013 +0000
+++ b/tools/tools.rc	Fri Feb 22 16:06:12 2013 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava_tools.
 //
 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\0"
       VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
-      VALUE "FileVersion", "6.2.564.564\0"
+      VALUE "FileVersion", "6.2.32767.32767\0"
       VALUE "InternalName", "stx:libjava/tools\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:15 GMT\0"
+      VALUE "ProductDate", "Fri, 22 Feb 2013 15:57:50 GMT\0"
     END
 
   END