Added JavaUnresolvedCompilationError. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 18 Apr 2013 23:32:13 +0200
branchdevelopment
changeset 2526 ef415ed11871
parent 2525 9e83c7ee780e
child 2527 c380a7c258fb
Added JavaUnresolvedCompilationError. This one is raised whenever Java code reaches unresolved code / code with errors. This is dove by translating exception thrown by ECJ-synthetized error code into smalltalk exception. This has two advantages: 1) allow for easier handling of this un user code 2) it is not handled by thread error handler so when raised, it does not cause silen thread death.
JavaClassRegistry.st
JavaUnresolvedCompilationError.st
JavaVM.st
Make.proto
Make.spec
abbrev.stc
bc.mak
bmake.bat
lccmake.bat
libInit.cc
libjava.rc
mingwmake.bat
stx_libjava.st
vcmake.bat
--- a/JavaClassRegistry.st	Thu Apr 18 23:25:04 2013 +0200
+++ b/JavaClassRegistry.st	Thu Apr 18 23:32:13 2013 +0200
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaClassRegistry class methodsFor:'instance creation'!
 
 for: aJavaVM
@@ -70,7 +69,6 @@
     "Modified (format): / 30-10-2011 / 12:07:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry methodsFor:'accessing'!
 
 classForName: className loader: classLoader ifAbsent: aBlock 
@@ -194,7 +192,6 @@
     "Created: / 16-08-2012 / 17:32:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry methodsFor:'class loading'!
 
 loadFile: aFilename 
@@ -244,7 +241,6 @@
     "Modified: / 30-10-2011 / 12:24:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry methodsFor:'enumerating'!
 
 classesDo: aBlock
@@ -258,7 +254,6 @@
     "Created: / 23-10-2011 / 20:13:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry methodsFor:'helpers'!
 
 addClassLoader: aJavaClassLoader
@@ -270,7 +265,6 @@
     ^loaders at: classLoader ifAbsent: [nil].
 ! !
 
-
 !JavaClassRegistry methodsFor:'initialization'!
 
 flush
@@ -302,7 +296,6 @@
     "Modified (format): / 07-02-2013 / 17:36:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry methodsFor:'registering'!
 
 registerClass: newClass
@@ -356,7 +349,7 @@
 
     | nameComponents accessor ns |
 
-
+    javaclass isSynthetic ifTrue:[ ^ self ].
     nameComponents := javaclass name asCollectionOfSubstringsSeparatedBy:$/.
     nameComponents size > 1 ifTrue:[
         javaclass setCategory:((nameComponents asStringWith:$/ from:1 to:(nameComponents size - 1))
@@ -403,6 +396,7 @@
     ].
 
     "Created: / 04-04-2012 / 10:01:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 18-04-2013 / 22:51:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 registerClasses: classes
@@ -430,8 +424,8 @@
 
     | nameComponents ns |
 
+    javaclass isSynthetic ifTrue:[ ^ self ].
     ns := JAVA.
-
     nameComponents size > 1 ifTrue:[
         | s |
 
@@ -458,6 +452,7 @@
     ].
 
     "Created: / 04-04-2012 / 10:01:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-04-2013 / 22:52:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 unregisterClassLoader: aJavaClassLoader 
@@ -472,7 +467,6 @@
     "Created: / 02-01-2013 / 17:01:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry class methodsFor:'documentation'!
 
 version_CVS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/JavaUnresolvedCompilationError.st	Thu Apr 18 23:32:13 2013 +0200
@@ -0,0 +1,79 @@
+"
+ COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+                            SWING Research Group, Czech Technical University in Prague
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+
+ [1] Code written at SWING Research Group contains a signature
+     of one of the above copright owners. For exact set of such code,
+     see the differences between this version and version stx:libjava
+     as of 1.9.2010
+"
+"{ Package: 'stx:libjava' }"
+
+Error subclass:#JavaUnresolvedCompilationError
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Languages-Java-Support'
+!
+
+!JavaUnresolvedCompilationError class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+                            SWING Research Group, Czech Technical University in Prague
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+
+ [1] Code written at SWING Research Group contains a signature
+     of one of the above copright owners. For exact set of such code,
+     see the differences between this version and version stx:libjava
+     as of 1.9.2010
+
+"
+!
+
+documentation
+"
+    Raised when execution reaches code which contains conpilation error
+    (such as unresolved class/method, uncompatible parmeters, etc).
+
+    [author:]
+        Jan Vrany <jan.vrany@fit.cvut.cz>
+
+    [instance variables:]
+
+    [class variables:]
+
+    [see also:]
+
+"
+! !
+
+!JavaUnresolvedCompilationError class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
--- a/JavaVM.st	Thu Apr 18 23:25:04 2013 +0200
+++ b/JavaVM.st	Thu Apr 18 23:32:13 2013 +0200
@@ -4855,6 +4855,8 @@
 
     <resource: #skipInDebuggersWalkBack>
 
+    | message |
+
     aJavaException isNil ifTrue:[
         self halt:'cannot happen'
     ].
@@ -4869,11 +4871,24 @@
         aJavaException pass.
         self halt:'Should never be reached'.
     ].
+    "Another kludge: ECJ compiler throws java.lang.Error in case
+     there's an unresolved compilation problem. We want to open debugger
+     in this case tp be more Smalltalk-like - so translate such exception
+     to JavaUnresolvedCompilationError"
+    aJavaException class name == #'java/lang/Error' ifTrue:[
+        message := aJavaException getMessage.
+        (message startsWith: 'Unresolved compilation problem:') ifTrue:[
+            JavaUnresolvedCompilationError newException
+                messageText: (message copyFrom: 'Unresolved compilation problem:' size + 1) trimSeparators;
+                raiseSignal
+        ]
+    ].
+
     self throwException:aJavaException
 
     "Created: / 08-01-1999 / 14:15:36 / cg"
     "Modified: / 08-11-2011 / 16:32:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 09-04-2012 / 21:00:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-04-2013 / 23:08:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 _CHECKCAST2: object _: classRef
--- a/Make.proto	Thu Apr 18 23:25:04 2013 +0200
+++ b/Make.proto	Thu Apr 18 23:32:13 2013 +0200
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS= tools experiments
+SUBDIRS= tools experiments examples
 
 
 # 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/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/libbasic2 -I$(INCLUDE_TOP)/stx/libview
 
 
 # if you need any additional defines for embedded C code,
@@ -142,17 +142,8 @@
 prereq:
 	cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
@@ -225,6 +216,7 @@
 $(OUTDIR)JavaSourceFileWriter.$(O) JavaSourceFileWriter.$(H): JavaSourceFileWriter.st $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(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)JavaUnresolvedCompilationError.$(O) JavaUnresolvedCompilationError.$(H): JavaUnresolvedCompilationError.st $(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)JavaUnresolvedConstant.$(O) JavaUnresolvedConstant.$(H): JavaUnresolvedConstant.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUtilities.$(O) JavaUtilities.$(H): JavaUtilities.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaVMData.$(O) JavaVMData.$(H): JavaVMData.st $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec	Thu Apr 18 23:25:04 2013 +0200
+++ b/Make.spec	Thu Apr 18 23:32:13 2013 +0200
@@ -94,6 +94,7 @@
 	JavaPopUpView \
 	JavaProcess \
 	JavaRef2 \
+	JavaVMData \
 	JavaResolver \
 	JavaShort \
 	JavaSlotIndexCache \
@@ -102,9 +103,9 @@
 	JavaSourceFileWriter \
 	JavaTestsLoader \
 	JavaTopView \
+	JavaUnresolvedCompilationError \
 	JavaUnresolvedConstant \
 	JavaUtilities \
-	JavaVMData \
 	JavaRelease \
 	JavaView \
 	JavaZipSupport \
@@ -220,6 +221,7 @@
     $(OUTDIR_SLASH)JavaPopUpView.$(O) \
     $(OUTDIR_SLASH)JavaProcess.$(O) \
     $(OUTDIR_SLASH)JavaRef2.$(O) \
+    $(OUTDIR_SLASH)JavaVMData.$(O) \
     $(OUTDIR_SLASH)JavaResolver.$(O) \
     $(OUTDIR_SLASH)JavaShort.$(O) \
     $(OUTDIR_SLASH)JavaSlotIndexCache.$(O) \
@@ -228,9 +230,9 @@
     $(OUTDIR_SLASH)JavaSourceFileWriter.$(O) \
     $(OUTDIR_SLASH)JavaTestsLoader.$(O) \
     $(OUTDIR_SLASH)JavaTopView.$(O) \
+    $(OUTDIR_SLASH)JavaUnresolvedCompilationError.$(O) \
     $(OUTDIR_SLASH)JavaUnresolvedConstant.$(O) \
     $(OUTDIR_SLASH)JavaUtilities.$(O) \
-    $(OUTDIR_SLASH)JavaVMData.$(O) \
     $(OUTDIR_SLASH)JavaRelease.$(O) \
     $(OUTDIR_SLASH)JavaView.$(O) \
     $(OUTDIR_SLASH)JavaZipSupport.$(O) \
--- a/abbrev.stc	Thu Apr 18 23:25:04 2013 +0200
+++ b/abbrev.stc	Thu Apr 18 23:32:13 2013 +0200
@@ -80,6 +80,7 @@
 JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
 JavaTopView JavaTopView stx:libjava 'Languages-Java-Views-Support' 2
 JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 1
+JavaUnresolvedCompilationError JavaUnresolvedCompilationError stx:libjava 'Languages-Java-Support' 1
 JavaUnresolvedConstant JavaUnresolvedConstant stx:libjava 'Languages-Java-Reader-Support' 0
 JavaUtilities JavaUtilities stx:libjava 'Languages-Java-Utilities' 0
 JavaVMData JavaVMData stx:libjava 'Languages-Java-Support' 0
--- a/bc.mak	Thu Apr 18 23:25:04 2013 +0200
+++ b/bc.mak	Thu Apr 18 23:32:13 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\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\libbasic2 -I$(INCLUDE_TOP)\stx\libview
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -52,16 +52,8 @@
 prereq:
 	pushd ..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
@@ -157,6 +149,7 @@
 $(OUTDIR)JavaSourceFileWriter.$(O) JavaSourceFileWriter.$(H): JavaSourceFileWriter.st $(INCLUDE_TOP)\stx\libbasic\AbstractSourceFileWriter.$(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)JavaUnresolvedCompilationError.$(O) JavaUnresolvedCompilationError.$(H): JavaUnresolvedCompilationError.st $(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)JavaUnresolvedConstant.$(O) JavaUnresolvedConstant.$(H): JavaUnresolvedConstant.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUtilities.$(O) JavaUtilities.$(H): JavaUtilities.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaVMData.$(O) JavaVMData.$(H): JavaVMData.st $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/bmake.bat	Thu Apr 18 23:25:04 2013 +0200
+++ b/bmake.bat	Thu Apr 18 23:32:13 2013 +0200
@@ -23,4 +23,11 @@
 @call bmake %1 %2
 @cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples
+@echo "***********************************"
+@cd examples
+@call bmake %1 %2
+@cd ..
 
+
--- a/lccmake.bat	Thu Apr 18 23:25:04 2013 +0200
+++ b/lccmake.bat	Thu Apr 18 23:32:13 2013 +0200
@@ -19,4 +19,11 @@
 @call lccmake %1 %2
 @cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples
+@echo "***********************************"
+@cd examples
+@call lccmake %1 %2
+@cd ..
 
+
--- a/libInit.cc	Thu Apr 18 23:25:04 2013 +0200
+++ b/libInit.cc	Thu Apr 18 23:32:13 2013 +0200
@@ -80,6 +80,7 @@
 _JavaSourceFileWriter_Init(pass,__pRT__,snd);
 _JavaTestsLoader_Init(pass,__pRT__,snd);
 _JavaTopView_Init(pass,__pRT__,snd);
+_JavaUnresolvedCompilationError_Init(pass,__pRT__,snd);
 _JavaUnresolvedConstant_Init(pass,__pRT__,snd);
 _JavaUtilities_Init(pass,__pRT__,snd);
 _JavaVMData_Init(pass,__pRT__,snd);
--- a/libjava.rc	Thu Apr 18 23:25:04 2013 +0200
+++ b/libjava.rc	Thu Apr 18 23:32:13 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", "Thu, 18 Apr 2013 15:55:15 GMT\0"
+      VALUE "ProductDate", "Thu, 18 Apr 2013 21:27:57 GMT\0"
     END
 
   END
--- a/mingwmake.bat	Thu Apr 18 23:25:04 2013 +0200
+++ b/mingwmake.bat	Thu Apr 18 23:32:13 2013 +0200
@@ -27,4 +27,11 @@
 @call mingwmake %1 %2
 @cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples
+@echo "***********************************"
+@cd examples
+@call mingwmake %1 %2
+@cd ..
 
+
--- a/stx_libjava.st	Thu Apr 18 23:25:04 2013 +0200
+++ b/stx_libjava.st	Thu Apr 18 23:32:13 2013 +0200
@@ -162,39 +162,10 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
-        #'stx:goodies/petitparser'    "PPParser - superclass of JavaParser "
-        #'stx:libbasic'    "ArithmeticValue - superclass of JavaByte "
-        #'stx:libbasic2'    "BooleanArray - extended "
+        #'stx:libbasic'    "Unicode16String - extended "
+        #'stx:libbasic2'    "BitArray - extended "
         #'stx:libbasic3'    "WrappedMethod - extended "
-        #'stx:libcomp'    "ParseNode - superclass of JavaImportDeclarationNode "
-        #'stx:libtool'    "AbstractSettingsApplication - superclass of JavaSettingsApplication "
-        #'stx:libview'    "GraphicsContext - superclass of JavaTopView "
-        #'stx:libview2'    "Model - superclass of JavaCodeLibraryEditor "
-        #'stx:libwidg2'    "HierarchicalItem - superclass of JavaCodeBundleEditor::Item "
-    )
-!
-
-preRequisites
-    "list all required packages.
-     This list can be maintained manually or (better) generated and
-     updated by scanning the superclass hierarchies and looking for
-     global variable accesses. (the browser has a menu function for that)
-     However, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPreRequisites method.
-     If you have explicit preqrequisites, define them in the #includedInPreRequisites method."
-
-    ^ #(
-        #'stx:goodies/sunit'    "TestCase - superclass of JUnitTestCaseProxy "
-        #'stx:libbasic'    "ArrayedCollection - superclass of JavaConstantPool "
-        #'stx:libbasic2'    "BitArray - superclass of extended BooleanArray "
-        #'stx:libbasic3'    "WrappedMethod - extended "
-        #'stx:libcomp'    "StatementNode - referenced by ProxyMethodGuardNode>>generate: "
-        #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
-        #'stx:libtool'    "WorkspaceApplication - referenced by GroovyEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
-        #'stx:libview'    "StandardSystemView - superclass of JavaTopView "
-        #'stx:libview2'    "GIFReader - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_GifImageDecoder_parseImage: "
-        #'stx:libwidg'    "Label - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WLabelPeer_create: "
-        #'stx:libwidg2'    "MenuPanel - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WMenuPeer_createMenu: "
+        #'stx:libview'    "PopUpView - superclass of JavaPopUpView "
     )
 !
 
@@ -208,10 +179,14 @@
 
     ^ #(
         #'stx:goodies/sunit'    "TestSuite - referenced by JavaTestsLoader class>>buildSuiteFrom: "
+        #'stx:libcomp'    "ReturnNode - referenced by JavaNativeMethod>>numberOfArgs: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
-        #'stx:libjava/experiments'    "JavaCompiler - referenced by JavaLanguage>>compilerClass "
-        #'stx:libjava/tools'    "JavaCodeLibraryEditor - referenced by JavaCodeBundleEditor>>doBrowseFiles "
-        #'stx:libwidg'    "Label - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WLabelPeer_create: "
+        #'stx:libjava/experiments'    "JavaByteCodeInterpreter - referenced by JavaMethod>>interpretWithReceiver:arguments: "
+        #'stx:libjava/tools'    "JavaSyntaxHighlighter - referenced by GroovyLanguage>>syntaxHighlighterClass "
+        #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
+        #'stx:libview2'    "Plug - referenced by JavaSourceCodeCache>>findMethodLine:inMethods: "
+        #'stx:libwidg'    "EditTextView - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WTextAreaPeer_create: "
+        #'stx:libwidg2'    "MenuPanel - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WMenuPeer_createMenu: "
     )
 !
 
@@ -224,6 +199,7 @@
     ^ #(
         #'stx:libjava/tools'
         #'stx:libjava/experiments'
+        #'stx:libjava/examples'
     )
 ! !
 
@@ -415,6 +391,7 @@
         (JavaTestsResource autoload)
         JavaTopView
         (JavaUTF8Tests autoload)
+        JavaUnresolvedCompilationError
         JavaUnresolvedConstant
         JavaUtilities
         JavaVMData
--- a/vcmake.bat	Thu Apr 18 23:25:04 2013 +0200
+++ b/vcmake.bat	Thu Apr 18 23:32:13 2013 +0200
@@ -31,4 +31,11 @@
 @call vcmake %1 %2
 @cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples
+@echo "***********************************"
+@cd examples
+@call vcmake %1 %2
+@cd ..
 
+