--- a/JavaLanguage.st	Thu Apr 11 15:00:07 2013 +0200
+++ b/JavaLanguage.st	Fri Apr 12 20:56:56 2013 +0200
@@ -112,6 +112,15 @@
     "Created: / 17-03-2011 / 14:08:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+metaClass
+    "will be used for new classes (in the class wizard);
+     a fallback here"
+
+    ^ JavaMetaclass
+
+    "Created: / 12-04-2013 / 20:21:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 parserClass
     "Answer a class suitable for parsing a source code in 'my' language"
 

--- a/JavaMetaclass.st	Thu Apr 11 15:00:07 2013 +0200
+++ b/JavaMetaclass.st	Fri Apr 12 20:56:56 2013 +0200
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaMetaclass class methodsFor:'accessing - template'!
 
 classTemplateFor:aSuperClass in:categoryString asNamespace:asNameSpace private:isPrivate
@@ -62,7 +61,6 @@
     "Created: / 04-04-2012 / 02:07:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMetaclass methodsFor:'compiler interface'!
 
 programmingLanguage
@@ -76,15 +74,12 @@
 !
 
 realSubclassDefinerClass
-    "/For now: "
-    ^self error:'No JavaCompliler yet'.
-    "/Will be soon
-    "/^JavaCompiler
+    ^JavaCompiler
 
     "Created: / 04-04-2012 / 10:16:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 12-04-2013 / 20:22:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMetaclass methodsFor:'fileOut'!
 
 fileOutMethod:aMethod on:aStream
@@ -131,7 +126,6 @@
     "Modified: / 07-11-2012 / 23:43:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMetaclass methodsFor:'queries'!
 
 supportsMethodCategories
@@ -140,7 +134,6 @@
     "Created: / 04-07-2012 / 19:54:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMetaclass class methodsFor:'documentation'!
 
 version_CVS

--- a/Make.proto	Thu Apr 11 15:00:07 2013 +0200
+++ b/Make.proto	Fri Apr 12 20:56:56 2013 +0200
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS= tools experiments
+SUBDIRS= experiments tools
 
 
 # subdirectories where Makefiles are to be made:
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg2
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg2
 
 
 # if you need any additional defines for embedded C code,
@@ -262,7 +262,6 @@
 $(OUTDIR)JavaInvalidRefError.$(O) JavaInvalidRefError.$(H): JavaInvalidRefError.st $(INCLUDE_TOP)/stx/libjava/JavaError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethod.$(O) JavaMethod.$(H): JavaMethod.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodAnnotationContainer.$(O) JavaMethodAnnotationContainer.$(H): JavaMethodAnnotationContainer.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationContainer.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaMethodDeclarationNode.$(O) JavaMethodDeclarationNode.$(H): JavaMethodDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)/stx/libjava/JavaDescriptor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaNativeMethodImpl_OpenJDK6.$(O) JavaNativeMethodImpl_OpenJDK6.$(H): JavaNativeMethodImpl_OpenJDK6.st $(INCLUDE_TOP)/stx/libjava/JavaVMData.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)

--- a/Make.spec	Thu Apr 11 15:00:07 2013 +0200
+++ b/Make.spec	Fri Apr 12 20:56:56 2013 +0200
@@ -94,8 +94,7 @@
 	JavaPopUpView \
 	JavaProcess \
 	JavaRef2 \
-	JavaVMData \
-        JavaRelease \
+	JavaRelease \
 	JavaResolver \
 	JavaShort \
 	JavaSlotIndexCache \
@@ -106,6 +105,7 @@
 	JavaTopView \
 	JavaUnresolvedConstant \
 	JavaUtilities \
+	JavaVMData \
 	JavaView \
 	JavaZipSupport \
 	PPJavaNode \
@@ -222,7 +222,6 @@
     $(OUTDIR_SLASH)JavaPopUpView.$(O) \
     $(OUTDIR_SLASH)JavaProcess.$(O) \
     $(OUTDIR_SLASH)JavaRef2.$(O) \
-    $(OUTDIR_SLASH)JavaVMData.$(O) \
     $(OUTDIR_SLASH)JavaRelease.$(O) \
     $(OUTDIR_SLASH)JavaResolver.$(O) \
     $(OUTDIR_SLASH)JavaShort.$(O) \
@@ -234,6 +233,7 @@
     $(OUTDIR_SLASH)JavaTopView.$(O) \
     $(OUTDIR_SLASH)JavaUnresolvedConstant.$(O) \
     $(OUTDIR_SLASH)JavaUtilities.$(O) \
+    $(OUTDIR_SLASH)JavaVMData.$(O) \
     $(OUTDIR_SLASH)JavaView.$(O) \
     $(OUTDIR_SLASH)JavaZipSupport.$(O) \
     $(OUTDIR_SLASH)PPJavaNode.$(O) \

--- a/abbrev.stc	Thu Apr 11 15:00:07 2013 +0200
+++ b/abbrev.stc	Fri Apr 12 20:56:56 2013 +0200
@@ -37,6 +37,7 @@
 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
@@ -114,11 +115,9 @@
 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
-JavaMethodDeclarationNode JavaMethodDeclarationNode stx:libjava 'Languages-Java-AST' 0
 JavaMethodDescriptor JavaMethodDescriptor stx:libjava 'Languages-Java-Support' 0
 JavaNativeMethodImpl_OpenJDK6 JavaNativeMethodImpl_OpenJDK6 stx:libjava 'Languages-Java-Support-OpenJDK6' 0
 JavaStringRef2 JavaStringRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0

--- a/bc.mak	Thu Apr 11 15:00:07 2013 +0200
+++ b/bc.mak	Fri Apr 12 20:56:56 2013 +0200
@@ -34,7 +34,7 @@
 
 
 
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg2
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg2
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -194,7 +194,6 @@
 $(OUTDIR)JavaInvalidRefError.$(O) JavaInvalidRefError.$(H): JavaInvalidRefError.st $(INCLUDE_TOP)\stx\libjava\JavaError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethod.$(O) JavaMethod.$(H): JavaMethod.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodAnnotationContainer.$(O) JavaMethodAnnotationContainer.$(H): JavaMethodAnnotationContainer.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationContainer.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaMethodDeclarationNode.$(O) JavaMethodDeclarationNode.$(H): JavaMethodDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)\stx\libjava\JavaDescriptor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaNativeMethodImpl_OpenJDK6.$(O) JavaNativeMethodImpl_OpenJDK6.$(H): JavaNativeMethodImpl_OpenJDK6.st $(INCLUDE_TOP)\stx\libjava\JavaVMData.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)

--- a/bmake.bat	Thu Apr 11 15:00:07 2013 +0200
+++ b/bmake.bat	Fri Apr 12 20:56:56 2013 +0200
@@ -10,17 +10,17 @@
 make.exe -N -f bc.mak  %DEFINES% %*
 
 @echo "***********************************"
+@echo "Buildung stx/libjava/experiments
+@echo "***********************************"
+@cd experiments
+@call bmake %1 %2
+@cd ..
+
+@echo "***********************************"
 @echo "Buildung stx/libjava/tools
 @echo "***********************************"
 @cd tools
 @call bmake %1 %2
 @cd ..
 
-@echo "***********************************"
-@echo "Buildung stx/libjava/experiments
-@echo "***********************************"
-@cd experiments
-@call bmake %1 %2
-@cd ..
 
-

--- a/lccmake.bat	Thu Apr 11 15:00:07 2013 +0200
+++ b/lccmake.bat	Fri Apr 12 20:56:56 2013 +0200
@@ -6,17 +6,17 @@
 make.exe -N -f bc.mak -DUSELCC=1 %*
 
 @echo "***********************************"
+@echo "Buildung stx/libjava/experiments
+@echo "***********************************"
+@cd experiments
+@call lccmake %1 %2
+@cd ..
+
+@echo "***********************************"
 @echo "Buildung stx/libjava/tools
 @echo "***********************************"
 @cd tools
 @call lccmake %1 %2
 @cd ..
 
-@echo "***********************************"
-@echo "Buildung stx/libjava/experiments
-@echo "***********************************"
-@cd experiments
-@call lccmake %1 %2
-@cd ..
 
-

--- a/libjava.rc	Thu Apr 11 15:00:07 2013 +0200
+++ b/libjava.rc	Fri Apr 12 20:56:56 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", "Sun, 31 Mar 2013 18:18:37 GMT\0"
+      VALUE "ProductDate", "Fri, 12 Apr 2013 18:55:53 GMT\0"
     END
 
   END

--- a/mingwmake.bat	Thu Apr 11 15:00:07 2013 +0200
+++ b/mingwmake.bat	Fri Apr 12 20:56:56 2013 +0200
@@ -14,17 +14,17 @@
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 @echo "***********************************"
+@echo "Buildung stx/libjava/experiments
+@echo "***********************************"
+@cd experiments
+@call mingwmake %1 %2
+@cd ..
+
+@echo "***********************************"
 @echo "Buildung stx/libjava/tools
 @echo "***********************************"
 @cd tools
 @call mingwmake %1 %2
 @cd ..
 
-@echo "***********************************"
-@echo "Buildung stx/libjava/experiments
-@echo "***********************************"
-@cd experiments
-@call mingwmake %1 %2
-@cd ..
 
-

--- a/stx_libjava.st	Thu Apr 11 15:00:07 2013 +0200
+++ b/stx_libjava.st	Fri Apr 12 20:56:56 2013 +0200
@@ -162,15 +162,14 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
-        #'stx:goodies/petitparser'    "PPDelegateParser - superclass of JavaParserII "
-        #'stx:goodies/sunit'    "TestResource - superclass of JavaAntProjectResource "
-        #'stx:libbasic'    "Class - superclass of JavaClass "
-        #'stx:libbasic2'    "BitArray - extended "
+        #'stx:goodies/petitparser'    "PPCompositeParser - superclass of JavaParserII "
+        #'stx:libbasic'    "Notification - superclass of JavaClassQuery "
+        #'stx:libbasic2'    "Socket - superclass of JavaSocket "
         #'stx:libbasic3'    "WrappedMethod - extended "
-        #'stx:libcomp'    "ParseNode - superclass of JavaTypeNode "
-        #'stx:libtool'    "InspectorView - superclass of JavaMapInspectorView "
-        #'stx:libview'    "PopUpView - superclass of JavaPopUpView "
-        #'stx:libview2'    "Model - superclass of JavaCodeBundleEditor "
+        #'stx:libcomp'    "ParseNode - superclass of JavaTypeDeclarationNode "
+        #'stx:libtool'    "DictionaryInspectorView - superclass of JavaMapInspectorView "
+        #'stx:libview'    "DeviceGraphicsContext - superclass of JavaTopView "
+        #'stx:libview2'    "Model - superclass of JavaSettingsApplication "
         #'stx:libwidg2'    "HierarchicalItem - superclass of JavaCodeBundleEditor::Item "
     )
 !
@@ -208,10 +207,11 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
+        #'stx:goodies/sunit'    "TestSuite - referenced by JavaTestsLoader class>>buildSuiteFrom: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
-        #'stx:libjava/experiments'    "NoReflectionObject - referenced by JavaObjectDictionary>>reflectionOf: "
-        #'stx:libjava/tools'    "JavaSyntaxHighlighter::Scanner - referenced by JavaSyntaxHighlighter>>format:kind:in: "
-        #'stx:libwidg'    "ScrollableView - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_MComponentPeer_pSetForeground: "
+        #'stx:libjava/experiments'    "JavaCompiler::ClassSourceAnalyzer - referenced by JavaCompiler class>>newAnalyzer "
+        #'stx:libjava/tools'    "JavaParserI::TokenParser - referenced by JavaSyntaxHighlighter::Parser>>identifier "
+        #'stx:libwidg'    "EditField - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WTextFieldPeer_create: "
     )
 !
 
@@ -222,8 +222,8 @@
      for those, redefine requiredPrerequisites"
 
     ^ #(
+        #'stx:libjava/experiments'
         #'stx:libjava/tools'
-        #'stx:libjava/experiments'
     )
 ! !
 
@@ -372,6 +372,7 @@
         (JavaFieldRefTests autoload)
         JavaFinalizationRegistry
         (JavaFreshlyInitializedResource autoload)
+        (JavaInitializedResource autoload)
         (JavaInterfaceMethodRefTests autoload)
         (JavaJUnitTests autoload)
         JavaLanguage
@@ -401,7 +402,6 @@
         JavaRef2
         (JavaRefMock autoload)
         (JavaRefsAndConstantPoolTestCase autoload)
-        JavaVMData
         JavaRelease
         JavaResolver
         (JavaRuntimeConstantPoolTests autoload)
@@ -417,6 +417,7 @@
         (JavaUTF8Tests autoload)
         JavaUnresolvedConstant
         JavaUtilities
+        JavaVMData
         JavaView
         JavaZipSupport
         PPJavaNode
@@ -449,7 +450,6 @@
         JavaFieldAnnotationContainer
         JavaFieldDescriptor
         JavaFieldDescriptorWithUnionType
-        (JavaInitializedResource autoload)
         JavaInvalidRefError
         JavaMethod
         JavaMethodAnnotationContainer

--- a/tools/JavaParser.st	Thu Apr 11 15:00:07 2013 +0200
+++ b/tools/JavaParser.st	Fri Apr 12 20:56:56 2013 +0200
@@ -61,10 +61,14 @@
         "
 
         ^super compilationUnit ==> [:nodes |
-            builder newSourceFile_package: (nodes at:1) second imports: (nodes at:2) types: (nodes at:3)            
+            | pkg |
+
+            pkg := (nodes at:1) notNil ifTrue:[(nodes at:1) second] ifFalse:[nil].
+            builder newSourceFile_package: pkg imports: (nodes at:2) types: (nodes at:3)            
         ]
 
     "Created: / 03-04-2013 / 23:18:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 12-04-2013 / 20:24:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 packageDeclaration 

--- a/tools/JavaParserI.st	Thu Apr 11 15:00:07 2013 +0200
+++ b/tools/JavaParserI.st	Fri Apr 12 20:56:56 2013 +0200
@@ -818,7 +818,7 @@
     ].
 
     peekC ~~ ${ ifTrue:[
-        ^ PPFailure message: ('unexpected char (got ', peekC, ' expecting { )') at: aStream position
+        ^ PPFailure message: ('unexpected char (got ', (peekC ? 'nil'), ' expecting { )') at: aStream position
     ].
     openCount := 1.
     aStream next.
@@ -872,7 +872,7 @@
 
     "
 
-    "Modified: / 04-04-2013 / 00:32:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 12-04-2013 / 20:31:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaParserI::TokenParser class methodsFor:'documentation'!

--- a/tools/Make.proto	Thu Apr 11 15:00:07 2013 +0200
+++ b/tools/Make.proto	Fri Apr 12 20:56:56 2013 +0200
@@ -162,6 +162,7 @@
 $(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)JavaMethodDeclarationNode.$(O) JavaMethodDeclarationNode.$(H): JavaMethodDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(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)
 $(OUTDIR)JavaParseNodeBuilder.$(O) JavaParseNodeBuilder.$(H): JavaParseNodeBuilder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaParserI.$(O) JavaParserI.$(H): JavaParserI.st $(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)
@@ -186,7 +187,7 @@
 $(OUTDIR)JavaConstructorDeclarationNode.$(O) JavaConstructorDeclarationNode.$(H): JavaConstructorDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaMethodLikeDeclarationNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaDeclarationWithJavadodNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaEnumDeclarationNode.$(O) JavaEnumDeclarationNode.$(H): JavaEnumDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaTypeDeclarationNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaDeclarationWithJavadodNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaInterfaceDeclarationNode.$(O) JavaInterfaceDeclarationNode.$(H): JavaInterfaceDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaTypeDeclarationNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaDeclarationWithJavadodNode.$(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/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) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libjava/JavaObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(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) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line

--- a/tools/abbrev.stc	Thu Apr 11 15:00:07 2013 +0200
+++ b/tools/abbrev.stc	Fri Apr 12 20:56:56 2013 +0200
@@ -27,6 +27,7 @@
 JavaScanner JavaScanner stx:libjava/tools 'Languages-Java-Parser' 3
 JavaSourceFile JavaSourceFile stx:libjava/tools 'Languages-Java-Parser-AST' 0
 JavaMethodLikeDeclarationNode JavaMethodLikeDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
+JavaMethodDeclarationNode JavaMethodDeclarationNode stx:libjava/tools 'Languages-Java-AST' 0
 JavaParser JavaParser stx:libjava/tools 'Languages-Java-Parser' 0
 JavaSourcePartitioner JavaSourcePartitioner stx:libjava/tools 'Languages-Java-Parser-Utils' 0
 JavaTypeDeclarationNode JavaTypeDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0

--- a/tools/bc.mak	Thu Apr 11 15:00:07 2013 +0200
+++ b/tools/bc.mak	Fri Apr 12 20:56:56 2013 +0200
@@ -86,6 +86,7 @@
 $(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)JavaMethodDeclarationNode.$(O) JavaMethodDeclarationNode.$(H): JavaMethodDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(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)
 $(OUTDIR)JavaParseNodeBuilder.$(O) JavaParseNodeBuilder.$(H): JavaParseNodeBuilder.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaParserI.$(O) JavaParserI.$(H): JavaParserI.st $(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)
@@ -110,7 +111,7 @@
 $(OUTDIR)JavaConstructorDeclarationNode.$(O) JavaConstructorDeclarationNode.$(H): JavaConstructorDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaMethodLikeDeclarationNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaDeclarationWithJavadodNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaEnumDeclarationNode.$(O) JavaEnumDeclarationNode.$(H): JavaEnumDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaTypeDeclarationNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaDeclarationWithJavadodNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaInterfaceDeclarationNode.$(O) JavaInterfaceDeclarationNode.$(H): JavaInterfaceDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaTypeDeclarationNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaDeclarationWithJavadodNode.$(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\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) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libjava\JavaObject.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(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) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line

--- a/tools/libInit.cc	Thu Apr 11 15:00:07 2013 +0200
+++ b/tools/libInit.cc	Fri Apr 12 20:56:56 2013 +0200
@@ -31,6 +31,7 @@
 _JavaCodeLibraryEditor_Init(pass,__pRT__,snd);
 _JavaListInspectorView_Init(pass,__pRT__,snd);
 _JavaMapInspectorView_Init(pass,__pRT__,snd);
+_JavaMethodDeclarationNode_Init(pass,__pRT__,snd);
 _JavaParseNode_Init(pass,__pRT__,snd);
 _JavaParseNodeBuilder_Init(pass,__pRT__,snd);
 _JavaParserI_Init(pass,__pRT__,snd);
@@ -48,7 +49,6 @@
 _JavaScanner_Init(pass,__pRT__,snd);
 _JavaSourceFile_Init(pass,__pRT__,snd);
 _JavaMethodLikeDeclarationNode_Init(pass,__pRT__,snd);
-_JavaMethodDeclarationNode_Init(pass,__pRT__,snd);
 _JavaParser_Init(pass,__pRT__,snd);
 _JavaTypeDeclarationNode_Init(pass,__pRT__,snd);
 _JavaAnnotationDeclarationNode_Init(pass,__pRT__,snd);

--- a/tools/tools.rc	Thu Apr 11 15:00:07 2013 +0200
+++ b/tools/tools.rc	Fri Apr 12 20:56:56 2013 +0200
@@ -25,7 +25,7 @@
       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", "Wed, 03 Apr 2013 23:51:48 GMT\0"
+      VALUE "ProductDate", "Fri, 12 Apr 2013 18:51:30 GMT\0"
     END
 
   END

--- a/vcmake.bat	Thu Apr 11 15:00:07 2013 +0200
+++ b/vcmake.bat	Fri Apr 12 20:56:56 2013 +0200
@@ -18,17 +18,17 @@
 
 
 @echo "***********************************"
+@echo "Buildung stx/libjava/experiments
+@echo "***********************************"
+@cd experiments
+@call vcmake %1 %2
+@cd ..
+
+@echo "***********************************"
 @echo "Buildung stx/libjava/tools
 @echo "***********************************"
 @cd tools
 @call vcmake %1 %2
 @cd ..
 
-@echo "***********************************"
-@echo "Buildung stx/libjava/experiments
-@echo "***********************************"
-@cd experiments
-@call vcmake %1 %2
-@cd ..
 
-