Fixes in syntax highlighting and support for accepting code in the debugger. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 09 Aug 2013 01:22:51 +0100
branchdevelopment
changeset 2648 f871848ecfa8
parent 2647 8feaf04a003d
child 2649 b299761c9bbb
Fixes in syntax highlighting and support for accepting code in the debugger.
JavaClass.st
JavaLanguage.st
Make.proto
abbrev.stc
bmake.bat
experiments/JavaCompiler.st
experiments/abbrev.stc
experiments/experiments.rc
lccmake.bat
libjava.rc
mingwmake.bat
stx_libjava.st
tools/JavaCompilerProblemService.st
tools/JavaSyntaxHighlighter.st
tools/Make.proto
tools/bc.mak
tools/tools.rc
vcmake.bat
--- a/JavaClass.st	Thu Aug 08 10:41:42 2013 +0100
+++ b/JavaClass.st	Fri Aug 09 01:22:51 2013 +0100
@@ -1120,6 +1120,11 @@
     "Created: / 18-03-2012 / 14:19:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+handlerForSignal:exceptionHandler context:theContext originator:originator
+    ^nil
+
+!
+
 handles: anObject
 
     Transcript showCR:'>>>> JavaClass>>handles: ' , anObject printString.
@@ -1129,11 +1134,6 @@
     "Created: / 18-03-2012 / 14:19:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-handlerForSignal:exceptionHandler context:theContext originator:originator
-    ^nil
-
-!
-
 isControlInterrupt
     ^false
 
@@ -1437,8 +1437,8 @@
         method notNil ifTrue:[
             method isStatic ifTrue:[
                 ^ method
-                    valueWithReceiver:self
-                    arguments:args
+                    valueWithReceiver:self arguments:args selector:selector search:self class 
+
             ].
         ].
     ].
@@ -1470,7 +1470,7 @@
 
     "Created: / 19-09-2011 / 23:33:06 / Jan Kurs <kursjan@fit.cvut.cz>"
     "Modified: / 10-04-2012 / 16:47:31 / kursjan"
-    "Modified: / 17-04-2013 / 21:41:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-08-2013 / 00:48:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaClass methodsFor:'java initialization'!
--- a/JavaLanguage.st	Thu Aug 08 10:41:42 2013 +0100
+++ b/JavaLanguage.st	Fri Aug 09 01:22:51 2013 +0100
@@ -209,8 +209,10 @@
         sclass := superClass.
     ].
 
-    ^'//import stx.libjava.annotations.Category;
-//@Category("%(CATEGORY)")
+    ^'//package ...;
+
+//import java.util.*;
+
 %(ACCESS) class %(NAME) extends %(SNAME) {
     /* fields and methods here... */
 }
@@ -223,7 +225,7 @@
             yourself)
 
     "Created: / 18-02-2012 / 18:27:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 07-05-2013 / 11:19:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-08-2013 / 00:36:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaLanguage class methodsFor:'documentation'!
--- a/Make.proto	Thu Aug 08 10:41:42 2013 +0100
+++ b/Make.proto	Fri Aug 09 01:22:51 2013 +0100
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS= experiments tools
+SUBDIRS=
 
 
 # subdirectories where Makefiles are to be made:
--- a/abbrev.stc	Thu Aug 08 10:41:42 2013 +0100
+++ b/abbrev.stc	Fri Aug 09 01:22:51 2013 +0100
@@ -1,152 +0,0 @@
-# automagically generated by the project definition
-# this file is needed for stc to be able to compile modules independently.
-# it provides information about a classes filename, category and especially namespace.
-GroovyCompiler GroovyCompiler stx:libjava 'Languages-Groovy-Compiler' 0
-GroovyEvaluator GroovyEvaluator stx:libjava 'Languages-Groovy-Compiler' 0
-GroovyLanguage GroovyLanguage stx:libjava 'Languages-Groovy-Support' 1
-GroovySourceFileWriter GroovySourceFileWriter stx:libjava 'Languages-Groovy-Support' 0
-JUnitTestCaseProxy JUnitTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
-JavaAnnotation JavaAnnotation stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAnnotationContainer JavaAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
-JavaAnnotationDefault JavaAnnotationDefault stx:libjava 'Languages-Java-Annotations' 1
-JavaAnnotationDictionary JavaAnnotationDictionary stx:libjava 'Languages-Java-Annotations' 1
-JavaAnnotationValue JavaAnnotationValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAntProjectResource JavaAntProjectResource stx:libjava 'Languages-Java-Tests' 2
-JavaArray JavaArray stx:libjava 'Languages-Java-Classes' 1
-JavaByte JavaByte stx:libjava 'Languages-Java-Support' 0
-JavaByteCodeDisassemblerTests JavaByteCodeDisassemblerTests stx:libjava 'Languages-Java-Tests' 1
-JavaByteCodeProcessor JavaByteCodeProcessor stx:libjava 'Languages-Java-Bytecode' 0
-JavaByteCodeProcessorTests JavaByteCodeProcessorTests stx:libjava 'Languages-Java-Tests' 1
-JavaClassAccessor JavaClassAccessor stx:libjava 'Languages-Java-Classes' 0
-JavaClassLoadingTests JavaClassLoadingTests stx:libjava 'Languages-Java-Tests-ClassLoading' 1
-JavaClassQuery JavaClassQuery stx:libjava 'Languages-Java-Classes' 1
-JavaClassReaderTests JavaClassReaderTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaClassReloader JavaClassReloader stx:libjava 'Languages-Java-Support' 0
-JavaCodeLibraryOrBundle JavaCodeLibraryOrBundle stx:libjava 'Languages-Java-Support-Libraries' 0
-JavaCompiler_Eclipse JavaCompiler_Eclipse stx:libjava 'Languages-Java-Tools-Eclipse' 0
-JavaConstantPool JavaConstantPool stx:libjava 'Languages-Java-Reader-Support' 0
-JavaConstants JavaConstants stx:libjava 'Languages-Java-Support' 0
-JavaContext JavaContext stx:libjava 'Languages-Java-Support' 0
-JavaDecompiler JavaDecompiler stx:libjava 'Languages-Java-Support-Decompiling' 0
-JavaDescriptor JavaDescriptor stx:libjava 'Languages-Java-Support' 0
-JavaError JavaError stx:libjava 'Languages-Java-Support' 1
-JavaExceptionTable JavaExceptionTable stx:libjava 'Languages-Java-Support' 0
-JavaExceptionTests JavaExceptionTests stx:libjava 'Languages-Java-Tests' 1
-JavaField JavaField stx:libjava 'Languages-Java-Reader-Support' 0
-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
-JavaLibraries JavaLibraries stx:libjava 'Languages-Java-Support' 0
-JavaLibrariesResource JavaLibrariesResource stx:libjava 'Languages-Java-Tests' 1
-JavaLocalVariableTable JavaLocalVariableTable stx:libjava 'Languages-Java-Support' 0
-JavaLocalVariableTableEntry JavaLocalVariableTableEntry stx:libjava 'Languages-Java-Support' 0
-JavaLookup JavaLookup stx:libjava 'Languages-Java-Interop' 0
-JavaLookupResolutionAlgorithmTests JavaLookupResolutionAlgorithmTests stx:libjava 'Languages-Java-Tests-Interop' 1
-JavaLookupTests JavaLookupTests stx:libjava 'Languages-Java-Tests-Interop' 1
-JavaLookupTestsResource JavaLookupTestsResource stx:libjava 'Languages-Java-Tests-Interop' 3
-JavaMathSupport JavaMathSupport stx:libjava 'Languages-Java-Support-Native' 0
-JavaMetaclass JavaMetaclass stx:libjava 'Languages-Java-Classes' 0
-JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaMirror JavaMirror stx:libjava 'Languages-Java-Classes' 0
-JavaMonitor JavaMonitor stx:libjava 'Languages-Java-Support' 0
-JavaMonitorsTests JavaMonitorsTests stx:libjava 'Languages-Java-Tests' 1
-JavaNameAndType2 JavaNameAndType2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaNativeMemory JavaNativeMemory stx:libjava 'Languages-Java-Support' 0
-JavaNativeMemoryTests JavaNativeMemoryTests stx:libjava 'Languages-Java-Tests' 1
-JavaNioSupport JavaNioSupport stx:libjava 'Languages-Java-Support-Native' 0
-JavaObject JavaObject stx:libjava 'Languages-Java-Classes' 0
-JavaObjectDictionary JavaObjectDictionary stx:libjava 'Languages-Java-Support' 0
-JavaPackage JavaPackage stx:libjava 'Languages-Java-Support' 0
-JavaPopUpView JavaPopUpView stx:libjava 'Languages-Java-Views-Support' 2
-JavaProcess JavaProcess stx:libjava 'Languages-Java-Classes' 0
-JavaRef2 JavaRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaRefMock JavaRefMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaRefsAndConstantPoolTestCase JavaRefsAndConstantPoolTestCase stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaResolver JavaResolver stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaShort JavaShort stx:libjava 'Languages-Java-Support' 0
-JavaSlotIndexCache JavaSlotIndexCache stx:libjava 'Languages-Java-Support' 0
-JavaSocket JavaSocket stx:libjava 'Languages-Java-Support' 0
-JavaSourceCodeCache JavaSourceCodeCache stx:libjava 'Languages-Java-Support' 1
-JavaSourceFileWriter JavaSourceFileWriter stx:libjava 'Languages-Java-Support' 0
-JavaTestCaseProxy JavaTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
-JavaTestsLoader JavaTestsLoader stx:libjava 'Languages-Java-Tests' 0
-JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
-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
-JavaView JavaView stx:libjava 'Languages-Java-Views-Support' 2
-JavaZipSupport JavaZipSupport stx:libjava 'Languages-Java-Support-Native' 0
-ProxyMethod ProxyMethod stx:libjava 'System-Compiler-Interop' 0
-ProxyMethodCompiler ProxyMethodCompiler stx:libjava 'System-Compiler-Interop' 0
-ProxyMethodNode ProxyMethodNode stx:libjava 'System-Compiler-Interop' 0
-SmalltalkAppletContext SmalltalkAppletContext stx:libjava 'Languages-Java-Views-Support' 0
-SmalltalkAppletStub SmalltalkAppletStub stx:libjava 'Languages-Java-Views-Support' 0
-TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
-stx_libjava stx_libjava stx:libjava '* Projects & Packages *' 3
-GroovyMetaclass GroovyMetaclass stx:libjava 'Languages-Groovy-Classes' 0
-Java Java stx:libjava 'Languages-Java-Support' 0
-JavaAnnotationArrayValue JavaAnnotationArrayValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAnnotationClassValue JavaAnnotationClassValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAnnotationEnumValue JavaAnnotationEnumValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAnnotationNestedAnnotationValue JavaAnnotationNestedAnnotationValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAnnotationPrimitiveValue JavaAnnotationPrimitiveValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaBehavior JavaBehavior stx:libjava 'Languages-Java-Classes' 0
-JavaByteCodeDisassembler JavaByteCodeDisassembler stx:libjava 'Languages-Java-Bytecode' 0
-JavaByteCodeEnumerator JavaByteCodeEnumerator stx:libjava 'Languages-Java-Support-Decompiling' 0
-JavaByteCodeProcessorAdapter JavaByteCodeProcessorAdapter stx:libjava 'Languages-Java-Bytecode' 0
-JavaClassAnnotationContainer JavaClassAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
-JavaClassContentRef2 JavaClassContentRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaClassReader JavaClassReader stx:libjava 'Languages-Java-Support' 0
-JavaClassRef2 JavaClassRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaClassRegistry JavaClassRegistry stx:libjava 'Languages-Java-Support' 0
-JavaCodeBundle JavaCodeBundle stx:libjava 'Languages-Java-Support-Libraries' 0
-JavaCodeLibrary JavaCodeLibrary stx:libjava 'Languages-Java-Support-Libraries' 0
-JavaEmbeddedFrameView JavaEmbeddedFrameView stx:libjava 'Languages-Java-Views-Support' 2
-JavaFieldAnnotationContainer JavaFieldAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
-JavaFieldDescriptor JavaFieldDescriptor stx:libjava 'Languages-Java-Support' 0
-JavaFieldDescriptorWithUnionType JavaFieldDescriptorWithUnionType stx:libjava 'Languages-Java-Support' 0
-JavaInvalidRefError JavaInvalidRefError stx:libjava 'Languages-Java-Support' 1
-JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes' 0
-JavaMethodAnnotationContainer JavaMethodAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
-JavaMethodDescriptor JavaMethodDescriptor stx:libjava 'Languages-Java-Support' 0
-JavaNativeMethodImpl_OpenJDK6 JavaNativeMethodImpl_OpenJDK6 stx:libjava 'Languages-Java-Support-OpenJDK6' 0
-JavaRelease JavaRelease stx:libjava 'Languages-Java-Support' 1
-JavaStringRef2 JavaStringRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaUnhandledExceptionError JavaUnhandledExceptionError stx:libjava 'Languages-Java-Support' 1
-JavaUnresolvedClassConstant JavaUnresolvedClassConstant stx:libjava 'Languages-Java-Reader-Support' 0
-JavaUnresolvedStringConstant JavaUnresolvedStringConstant stx:libjava 'Languages-Java-Reader-Support' 0
-JavaVM JavaVM stx:libjava 'Languages-Java-Support' 0
-ProxyMethodConditionNode ProxyMethodConditionNode stx:libjava 'System-Compiler-Interop' 0
-ProxyMethodGuardNode ProxyMethodGuardNode stx:libjava 'System-Compiler-Interop' 0
-ProxyMethodInvocationNode ProxyMethodInvocationNode stx:libjava 'System-Compiler-Interop' 0
-ProxyMethodJavaFieldAccessor ProxyMethodJavaFieldAccessor stx:libjava 'Languages-Java-Interop' 0
-JavaByteCodePreresolver JavaByteCodePreresolver stx:libjava 'Languages-Java-Bytecode' 0
-JavaClass JavaClass stx:libjava 'Languages-Java-Classes' 0
-JavaClassPathBundle JavaClassPathBundle stx:libjava 'Languages-Java-Support-Libraries' 0
-JavaFieldRef2 JavaFieldRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaMethodRef2 JavaMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaMethodWithException JavaMethodWithException stx:libjava 'Languages-Java-Classes' 0
-JavaNativeMethodImpl_OpenJDK7 JavaNativeMethodImpl_OpenJDK7 stx:libjava 'Languages-Java-Support-OpenJDK7' 0
-JavaNativeMethodImpl_SunJDK6 JavaNativeMethodImpl_SunJDK6 stx:libjava 'Languages-Java-Support-OpenJDK6' 0
-ProxyMethodAndNode ProxyMethodAndNode stx:libjava 'System-Compiler-Interop' 0
-ProxyMethodBlockInvocationNode ProxyMethodBlockInvocationNode stx:libjava 'System-Compiler-Interop' 0
-ProxyMethodJavaFieldGetter ProxyMethodJavaFieldGetter stx:libjava 'Languages-Java-Interop' 0
-ProxyMethodJavaFieldSetter ProxyMethodJavaFieldSetter stx:libjava 'Languages-Java-Interop' 0
-ProxyMethodMethodInvocationNode ProxyMethodMethodInvocationNode stx:libjava 'System-Compiler-Interop' 0
-ProxyMethodTypeCheckNode ProxyMethodTypeCheckNode stx:libjava 'System-Compiler-Interop' 0
-GroovyClass GroovyClass stx:libjava 'Languages-Groovy-Classes' 0
-JavaInterfaceMethodRef2 JavaInterfaceMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaMethodWithHandler JavaMethodWithHandler stx:libjava 'Languages-Java-Classes' 0
-JavaNativeMethodImpl_SunJDK7 JavaNativeMethodImpl_SunJDK7 stx:libjava 'Languages-Java-Support-OpenJDK7' 0
-ProxyMethodJavaMethodInvocationNode ProxyMethodJavaMethodInvocationNode stx:libjava 'Languages-Java-Interop' 0
-ProxyMethodJavaTypeCheckNode ProxyMethodJavaTypeCheckNode stx:libjava 'Languages-Java-Interop' 0
-JavaNativeMethod JavaNativeMethod stx:libjava 'Languages-Java-Classes' 0
--- a/bmake.bat	Thu Aug 08 10:41:42 2013 +0100
+++ b/bmake.bat	Fri Aug 09 01:22:51 2013 +0100
@@ -9,18 +9,4 @@
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 make.exe -N -f bc.mak  %DEFINES% %*
 
-@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/experiments/JavaCompiler.st	Thu Aug 08 10:41:42 2013 +0100
+++ b/experiments/JavaCompiler.st	Fri Aug 09 01:22:51 2013 +0100
@@ -149,6 +149,12 @@
     "Created: / 27-02-2012 / 23:27:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+compile:source forClass: class inCategory:cat notifying: requestor
+    ^ self compile:source forClass: class inCategory:cat notifying: requestor install: true.
+
+    "Created: / 08-08-2013 / 23:48:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 compile: source forClass: class inCategory: category notifying: requestor install: doInstall
     "We allways compile whole class"
     ^self compile: source register: true notifying: requestor
--- a/experiments/abbrev.stc	Thu Aug 08 10:41:42 2013 +0100
+++ b/experiments/abbrev.stc	Fri Aug 09 01:22:51 2013 +0100
@@ -1,18 +0,0 @@
-# automagically generated by the project definition
-# this file is needed for stc to be able to compile modules independently.
-# it provides information about a classes filename, category and especially namespace.
-Benchmarks::JavaLookup Benchmarks__JavaLookup stx:libjava/experiments 'benchmarks-Misc' 0
-JavaByteCodeInterpreter JavaByteCodeInterpreter stx:libjava/experiments 'Languages-Java-Bytecode' 0
-JavaByteCodeInterpreterTests JavaByteCodeInterpreterTests stx:libjava/experiments 'Languages-Java-Tests' 1
-JavaClassReloadingTests JavaClassReloadingTests stx:libjava/experiments 'Languages-Java-Tests-ClassReloading' 1
-JavaCompiler JavaCompiler stx:libjava/experiments 'Languages-Java-Support-Compiling' 0
-JavaCompilerProblemRegistry JavaCompilerProblemRegistry stx:libjava/experiments 'Languages-Java-Support-Compiling' 1
-JavaCompilerTests JavaCompilerTests stx:libjava/experiments 'Languages-Java-Tests-Compiling' 1
-JavaMethodWrapperCompiler JavaMethodWrapperCompiler stx:libjava/experiments 'Languages-Java-Experiments-Lookup' 0
-JavaSingleClassReloadingTests JavaSingleClassReloadingTests stx:libjava/experiments 'Languages-Java-Tests-ClassReloading' 1
-NoReflectionObject NoReflectionObject stx:libjava/experiments 'Languages-Java-Experiments-Lookup' 0
-PersonSample PersonSample stx:libjava/experiments 'Languages-Java-Experiments-Tests' 0
-SampleHandler SampleHandler stx:libjava/experiments 'Languages-Java-Experiments-Tests' 0
-SetSample SetSample stx:libjava/experiments 'Languages-Java-Experiments-Tests' 0
-stx_libjava_experiments stx_libjava_experiments stx:libjava/experiments '* Projects & Packages *' 3
-JavaByteCodeSteppableInterpreter JavaByteCodeSteppableInterpreter stx:libjava/experiments 'Languages-Java-Bytecode' 0
--- a/experiments/experiments.rc	Thu Aug 08 10:41:42 2013 +0100
+++ b/experiments/experiments.rc	Fri Aug 09 01:22:51 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2013\nCopyright eXept Software AG 1998-2013\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Tue, 06 Aug 2013 10:05:34 GMT\0"
+      VALUE "ProductDate", "Fri, 09 Aug 2013 00:20:44 GMT\0"
     END
 
   END
--- a/lccmake.bat	Thu Aug 08 10:41:42 2013 +0100
+++ b/lccmake.bat	Fri Aug 09 01:22:51 2013 +0100
@@ -5,18 +5,4 @@
 @REM -------
 make.exe -N -f bc.mak -DUSELCC=1 %*
 
-@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 Aug 08 10:41:42 2013 +0100
+++ b/libjava.rc	Fri Aug 09 01:22:51 2013 +0100
@@ -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", "Tue, 06 Aug 2013 10:09:04 GMT\0"
+      VALUE "ProductDate", "Fri, 09 Aug 2013 00:22:05 GMT\0"
     END
 
   END
--- a/mingwmake.bat	Thu Aug 08 10:41:42 2013 +0100
+++ b/mingwmake.bat	Fri Aug 09 01:22:51 2013 +0100
@@ -13,18 +13,4 @@
 @popd
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
-@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 Aug 08 10:41:42 2013 +0100
+++ b/stx_libjava.st	Fri Aug 09 01:22:51 2013 +0100
@@ -191,8 +191,6 @@
      for those, redefine requiredPrerequisites"
 
     ^ #(
-        #'stx:libjava/experiments'
-        #'stx:libjava/tools'
     )
 ! !
 
--- a/tools/JavaCompilerProblemService.st	Thu Aug 08 10:41:42 2013 +0100
+++ b/tools/JavaCompilerProblemService.st	Fri Aug 09 01:22:51 2013 +0100
@@ -98,9 +98,25 @@
     "Get updated whenever something changes in the code view.
      Subclasses may override this"
 
-    aspect == #problems ifTrue:[
-        | cls method |
+    | cls method |
+
+    sender == codeView ifTrue:[
+        (#(methodHolder classHolder languageHolder) includes: aspect) ifTrue:[
+            param key removeDependent: self.
+            param value addDependent: self.                         
+        ]
+    ].    
 
+    (sender == codeView languageHolder
+        or:[sender == codeView classHolder
+        or:[sender == codeView methodHolder]]) 
+        ifTrue:[
+        method := codeView method.
+        cls := method notNil ifTrue:[method mclass] ifFalse:[codeView classHolder value].
+        self updateProblems: cls
+    ].
+
+    (aspect == #problems) ifTrue:[
         method := codeView method.
         cls := method notNil ifTrue:[method mclass] ifFalse:[codeView classHolder value].
         cls == param ifTrue:[
@@ -109,7 +125,7 @@
     ].
 
     "Created: / 06-08-2013 / 10:37:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 06-08-2013 / 21:01:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-08-2013 / 00:51:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 updateProblems: class
@@ -214,8 +230,24 @@
 
     super registerIn: aCodeView.
     JavaCompilerProblemRegistry instance addDependent: self.
+    codeView languageHolder addDependent: self.
+    codeView classHolder addDependent: self.
+    codeView methodHolder addDependent: self.
 
     "Created: / 06-08-2013 / 10:33:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-08-2013 / 00:38:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+unregister
+
+    "Uninstall myself from my codeView"
+
+    JavaCompilerProblemRegistry instance addDependent: self.
+    codeView languageHolder removeDependent: self.
+    codeView classHolder removeDependent: self.
+    codeView methodHolder removeDependent: self.
+
+    "Created: / 09-08-2013 / 00:38:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaCompilerProblemService class methodsFor:'documentation'!
--- a/tools/JavaSyntaxHighlighter.st	Thu Aug 08 10:41:42 2013 +0100
+++ b/tools/JavaSyntaxHighlighter.st	Fri Aug 09 01:22:51 2013 +0100
@@ -296,7 +296,7 @@
     ^sourceText copy
 
     "Created: / 17-03-2012 / 14:02:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 08-08-2013 / 00:22:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 08-08-2013 / 23:29:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaSyntaxHighlighter methodsFor:'syntax detection'!
--- a/tools/Make.proto	Thu Aug 08 10:41:42 2013 +0100
+++ b/tools/Make.proto	Fri Aug 09 01:22:51 2013 +0100
@@ -199,7 +199,7 @@
 $(OUTDIR)JavaConstructorDeclarationNode.$(O) JavaConstructorDeclarationNode.$(H): JavaConstructorDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaMethodLikeDeclarationNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaDeclarationNode.$(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/JavaDeclarationNode.$(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/JavaDeclarationNode.$(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/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(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) $(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/bc.mak	Thu Aug 08 10:41:42 2013 +0100
+++ b/tools/bc.mak	Fri Aug 09 01:22:51 2013 +0100
@@ -123,7 +123,7 @@
 $(OUTDIR)JavaConstructorDeclarationNode.$(O) JavaConstructorDeclarationNode.$(H): JavaConstructorDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaMethodLikeDeclarationNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaDeclarationNode.$(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\JavaDeclarationNode.$(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\JavaDeclarationNode.$(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\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(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) $(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/tools.rc	Thu Aug 08 10:41:42 2013 +0100
+++ b/tools/tools.rc	Fri Aug 09 01:22:51 2013 +0100
@@ -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, 07 Aug 2013 01:05:07 GMT\0"
+      VALUE "ProductDate", "Fri, 09 Aug 2013 00:19:34 GMT\0"
     END
 
   END
--- a/vcmake.bat	Thu Aug 08 10:41:42 2013 +0100
+++ b/vcmake.bat	Fri Aug 09 01:22:51 2013 +0100
@@ -17,18 +17,4 @@
 
 
 
-@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 ..
-
-