Support for senders/implementors for Java. Fix for accepting Java classes. jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 02 Sep 2013 09:55:31 +0100
branchjv
changeset 13471 3ee11c3d0306
parent 13470 b79cb1799851
child 13472 81d796e3295c
Support for senders/implementors for Java. Fix for accepting Java classes.
ApplicationBuilder.st
BrowserView.st
Make.proto
Make.spec
SyntaxElementVariable.st
SystemBrowser.st
Tools__NavigationState.st
Tools__NewSystemBrowser.st
Tools__Toolbox.st
abbrev.stc
bc.mak
bmake.bat
extensions.st
lccmake.bat
libInit.cc
libtool.rc
mingwmake.bat
stx_libtool.st
vcmake.bat
--- a/ApplicationBuilder.st	Fri Aug 30 17:29:48 2013 +0100
+++ b/ApplicationBuilder.st	Mon Sep 02 09:55:31 2013 +0100
@@ -21,7 +21,12 @@
 ApplicationBuilder class instanceVariableNames:'aspects'
 
 "
- No other class instance variables are inherited by this class.
+ The following class instance variables are inherited by this class:
+
+	ToolApplicationModel - history fileHistory clipboard settings showingHelp instances
+	ApplicationModel - ClassResources
+	Model - 
+	Object - 
 "
 !
 
--- a/BrowserView.st	Fri Aug 30 17:29:48 2013 +0100
+++ b/BrowserView.st	Mon Sep 02 09:55:31 2013 +0100
@@ -12794,7 +12794,7 @@
         self clearAcceptAction.
         ^ self
     ].
-    currentClass isJavaClass ifTrue:[
+    currentClass theNonMetaclass isJavaClass ifTrue:[
         ^ self setAcceptActionForJavaClass.
     ].
 
@@ -12864,6 +12864,7 @@
     ].
 
     "Modified: / 10-11-2006 / 17:10:04 / cg"
+    "Modified: / 02-09-2013 / 09:41:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 setAcceptActionForClassInstVars
--- a/Make.proto	Fri Aug 30 17:29:48 2013 +0100
+++ b/Make.proto	Mon Sep 02 09:55:31 2013 +0100
@@ -63,7 +63,7 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs::
+pre_objs::  
 
 
 
@@ -124,16 +124,14 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libui && $(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)"
 
 
@@ -168,6 +166,7 @@
 $(OUTDIR)BookmarksEditDialog.$(O) BookmarksEditDialog.$(H): BookmarksEditDialog.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)BrowserView.$(O) BrowserView.$(H): BrowserView.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)ChangesBrowser.$(O) ChangesBrowser.$(H): ChangesBrowser.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)CodeCompletionHelpView.$(O) CodeCompletionHelpView.$(H): CodeCompletionHelpView.st $(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)CodeGenerator.$(O) CodeGenerator.$(H): CodeGenerator.st $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser/RBProgramNodeVisitor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CodeGeneratorTool.$(O) CodeGeneratorTool.$(H): CodeGeneratorTool.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)DebugView.$(O) DebugView.$(H): DebugView.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)
@@ -245,6 +244,7 @@
 $(OUTDIR)Tools__TagsBrowser.$(O) Tools__TagsBrowser.$(H): Tools__TagsBrowser.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/SelectionInListModelView.$(H) $(INCLUDE_TOP)/stx/libwidg2/ListModelView.$(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) $(STCHDR)
 $(OUTDIR)Tools__TextDiffTool.$(O) Tools__TextDiffTool.$(H): Tools__TextDiffTool.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__TextMergeInfo.$(O) Tools__TextMergeInfo.$(H): Tools__TextMergeInfo.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Tools__Toolbox.$(O) Tools__Toolbox.$(H): Tools__Toolbox.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__WebBrowserPage.$(O) Tools__WebBrowserPage.$(H): Tools__WebBrowserPage.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)VersionDiffBrowser.$(O) VersionDiffBrowser.$(H): VersionDiffBrowser.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)ViewWithAcceptAndCancelBar.$(O) ViewWithAcceptAndCancelBar.$(H): ViewWithAcceptAndCancelBar.st $(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) $(INCLUDE_TOP)/stx/libwidg/Button.$(H) $(INCLUDE_TOP)/stx/libwidg/Label.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
@@ -266,8 +266,9 @@
 $(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)/stx/libtool/AbstractLauncherApplication.$(H) $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(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)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(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)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(STCHDR)
 $(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)/stx/libtool/CodeGeneratorTool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SyntaxElementVariable.$(O) SyntaxElementVariable.$(H): SyntaxElementVariable.st $(INCLUDE_TOP)/stx/libtool/SyntaxElement.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__BackgroundSourceProcessingService.$(O) Tools__BackgroundSourceProcessingService.$(H): Tools__BackgroundSourceProcessingService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__BreakpointService.$(O) Tools__BreakpointService.$(H): Tools__BreakpointService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__BrowserList.$(O) Tools__BrowserList.$(H): Tools__BrowserList.st $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -279,7 +280,7 @@
 $(OUTDIR)Tools__LintRuleSettingsApplication.$(O) Tools__LintRuleSettingsApplication.$(H): Tools__LintRuleSettingsApplication.st $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__LintService.$(O) Tools__LintService.$(H): Tools__LintService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__NavigatorCanvas.$(O) Tools__NavigatorCanvas.$(H): Tools__NavigatorCanvas.st $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Tools__NewSystemBrowser.$(O) Tools__NewSystemBrowser.$(H): Tools__NewSystemBrowser.st $(INCLUDE_TOP)/stx/libtool/SystemBrowser.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Tools__NewSystemBrowser.$(O) Tools__NewSystemBrowser.$(H): Tools__NewSystemBrowser.st $(INCLUDE_TOP)/stx/libtool/SystemBrowser.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/ListEntry.$(H) $(STCHDR)
 $(OUTDIR)Tools__OrganizerCanvas.$(O) Tools__OrganizerCanvas.$(H): Tools__OrganizerCanvas.st $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__SendersBrowslet.$(O) Tools__SendersBrowslet.$(H): Tools__SendersBrowslet.st $(INCLUDE_TOP)/stx/libtool/Tools__Browslet.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__StringSearchToolForTextView.$(O) Tools__StringSearchToolForTextView.$(H): Tools__StringSearchToolForTextView.st $(INCLUDE_TOP)/stx/libtool/Tools__StringSearchTool.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -328,6 +329,7 @@
 $(OUTDIR)Tools__HierarchicalPackageFilterList.$(O) Tools__HierarchicalPackageFilterList.$(H): Tools__HierarchicalPackageFilterList.st $(INCLUDE_TOP)/stx/libtool/Tools__HierarchicalProjectList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__ProjectList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
 $(OUTDIR)Tools__InheritanceClassList.$(O) Tools__InheritanceClassList.$(H): Tools__InheritanceClassList.st $(INCLUDE_TOP)/stx/libtool/Tools__HierarchicalClassList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__ClassList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)XTermView.$(O) XTermView.$(H): XTermView.st $(INCLUDE_TOP)/stx/libview/XEmbedContainerView.$(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)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libcomp/Breakpoint.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libcomp/BreakpointDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic3/ChangeSet.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libview/Color.$(H) $(INCLUDE_TOP)/stx/libbasic3/CompositeChange.$(H) $(INCLUDE_TOP)/stx/libbasic/Date.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libwidg/EditTextView.$(H) $(INCLUDE_TOP)/stx/libwidg/TextView.$(H) $(INCLUDE_TOP)/stx/libwidg/ListView.$(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/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libview/Form.$(H) $(INCLUDE_TOP)/stx/libview/Image.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libwidg/MenuView.$(H) $(INCLUDE_TOP)/stx/libwidg/SelectionInListView.$(H) $(INCLUDE_TOP)/stx/libbasic/Method.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/MethodDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/KeyedCollection.$(H) $(INCLUDE_TOP)/stx/libwidg/PopUpMenu.$(H) $(INCLUDE_TOP)/stx/libview/PopUpView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libbasic3/ProfileTree.$(H) $(INCLUDE_TOP)/stx/libbasic2/RunArray.$(H) $(INCLUDE_TOP)/stx/libwidg2/SelectionInListModelView.$(H) $(INCLUDE_TOP)/stx/libwidg2/ListModelView.$(H) $(INCLUDE_TOP)/stx/libbasic/StringCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Symbol.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic2/Text.$(H) $(INCLUDE_TOP)/stx/libbasic/Timestamp.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractTime.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libcomp/AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(INCLUDE_TOP)/stx/libbasic/Block.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic2/Iterator.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libcomp/Breakpoint.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libcomp/BreakpointDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic3/ChangeSet.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libview/Color.$(H) $(INCLUDE_TOP)/stx/libbasic3/CompositeChange.$(H) $(INCLUDE_TOP)/stx/libbasic/Date.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libwidg/EditTextView.$(H) $(INCLUDE_TOP)/stx/libwidg/TextView.$(H) $(INCLUDE_TOP)/stx/libwidg/ListView.$(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/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libview/Form.$(H) $(INCLUDE_TOP)/stx/libview/Image.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libwidg/MenuView.$(H) $(INCLUDE_TOP)/stx/libwidg/SelectionInListView.$(H) $(INCLUDE_TOP)/stx/libbasic/Method.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/MethodDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/KeyedCollection.$(H) $(INCLUDE_TOP)/stx/libwidg/PopUpMenu.$(H) $(INCLUDE_TOP)/stx/libview/PopUpView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libbasic3/ProfileTree.$(H) $(INCLUDE_TOP)/stx/libbasic2/RunArray.$(H) $(INCLUDE_TOP)/stx/libwidg2/SelectionInListModelView.$(H) $(INCLUDE_TOP)/stx/libwidg2/ListModelView.$(H) $(INCLUDE_TOP)/stx/libbasic/StringCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Symbol.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic2/Text.$(H) $(INCLUDE_TOP)/stx/libbasic/Timestamp.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractTime.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libcomp/AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(INCLUDE_TOP)/stx/libbasic/Block.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic2/Iterator.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Smalltalk.$(H) $(INCLUDE_TOP)/stx/libbasic/ProgrammingLanguage.$(H) $(INCLUDE_TOP)/stx/libbasic2/UUID.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
+
--- a/Make.spec	Fri Aug 30 17:29:48 2013 +0100
+++ b/Make.spec	Mon Sep 02 09:55:31 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libtool/Make.spec,v 1.85 2013-06-14 14:36:45 cg Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libtool.
@@ -142,6 +142,7 @@
 	Tools::TagsBrowser \
 	Tools::TextDiffTool \
 	Tools::TextMergeInfo \
+	Tools::Toolbox \
 	Tools::WebBrowserPage \
 	VersionDiffBrowser \
 	ViewWithAcceptAndCancelBar \
@@ -325,6 +326,7 @@
     $(OUTDIR_SLASH)Tools__TagsBrowser.$(O) \
     $(OUTDIR_SLASH)Tools__TextDiffTool.$(O) \
     $(OUTDIR_SLASH)Tools__TextMergeInfo.$(O) \
+    $(OUTDIR_SLASH)Tools__Toolbox.$(O) \
     $(OUTDIR_SLASH)Tools__WebBrowserPage.$(O) \
     $(OUTDIR_SLASH)VersionDiffBrowser.$(O) \
     $(OUTDIR_SLASH)ViewWithAcceptAndCancelBar.$(O) \
--- a/SyntaxElementVariable.st	Fri Aug 30 17:29:48 2013 +0100
+++ b/SyntaxElementVariable.st	Mon Sep 02 09:55:31 2013 +0100
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+	      All Rights Reserved
+
+ 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.
+"
 "{ Package: 'stx:libtool' }"
 
 SyntaxElement subclass:#SyntaxElementVariable
@@ -9,6 +20,20 @@
 
 !SyntaxElementVariable class methodsFor:'documentation'!
 
+copyright
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+	      All Rights Reserved
+
+ 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.
+"
+!
+
 documentation
 "
  Replace 'SyntaxElement', 'NewClass1' and
--- a/SystemBrowser.st	Fri Aug 30 17:29:48 2013 +0100
+++ b/SystemBrowser.st	Mon Sep 02 09:55:31 2013 +0100
@@ -1758,8 +1758,6 @@
     ^ ToolbarIconLibrary testCasePassedIcon
 !
 
-
-
 testCaseUnknownResultIcon
     <resource: #programImage>
 
--- a/Tools__NavigationState.st	Fri Aug 30 17:29:48 2013 +0100
+++ b/Tools__NavigationState.st	Mon Sep 02 09:55:31 2013 +0100
@@ -1202,6 +1202,7 @@
     "Created: / 24.2.2000 / 23:45:28 / cg"
 ! !
 
+
 !NavigationState methodsFor:'aspects-kludges'!
 
 metaToggle
--- a/Tools__NewSystemBrowser.st	Fri Aug 30 17:29:48 2013 +0100
+++ b/Tools__NewSystemBrowser.st	Mon Sep 02 09:55:31 2013 +0100
@@ -19015,6 +19015,8 @@
     "Created: / 24.2.2000 / 23:28:06 / cg"
 ! !
 
+
+
 !NewSystemBrowser methodsFor:'aspects-organization'!
 
 categoryMenuVisible
@@ -22718,6 +22720,7 @@
     ^ UserPreferences current useSearchBarInBrowser or:[self codeView searchBarActionBlock notNil]
 ! !
 
+
 !NewSystemBrowser methodsFor:'change & update'!
 
 categorySelectionChanged
@@ -38117,6 +38120,7 @@
     HTMLDocumentView openFullOnDocumentationFile:'TOP.html'
 ! !
 
+
 !NewSystemBrowser methodsFor:'menu actions-inheritance'!
 
 inheritanceMenuNavigateToClass
@@ -47552,6 +47556,7 @@
     "Modified: / 28-02-2012 / 16:48:38 / cg"
 ! !
 
+
 !NewSystemBrowser methodsFor:'menu actions-variables'!
 
 browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
@@ -49786,17 +49791,38 @@
     m := Menu new.
 
     mthd := self theSingleSelectedMethod.
+
     (mthd notNil and:[ (mSel := mthd selector) notNil]) ifTrue:[
-	needSep := false.
-
-	contractedSelector := mSel contractTo:80.
-
-	withCurrentSelector ifTrue:[
-	    item := MenuItem label:(' ' , contractedSelector , ' ').   "/ ' ' is a kludge - to allow '-' selector
-	    item itemValue:actionSelector argument:mSel.
-	    m addItem:item.
-	    needSep := true.
-	].
+
+        "/ JV: Following code should be language-specific. For Smalltalk, use the old code.
+        "/ For the rest, delegate to the language's toolbox (if any)
+        mthd programmingLanguage isSmalltalk ifFalse:[
+            | toolbox |
+
+            toolbox := mthd programmingLanguage toolbox.
+            toolbox isNil ifTrue:[
+                m addItem:((MenuItem label: (resources string: 'Not supported for %1 (no toolbox)'with: mthd programmingLanguage name))
+                            enabled: false).
+                ^ m.
+            ].
+            toolbox browser: self.
+            ^ toolbox messagesMenuFor:actionSelector
+                        withMethods: (Array with: mthd)
+                        withMethodSelectors:withCurrentSelector
+                        withSentSelectors: true
+                        withSelfSelectorsOnly: selfSendsOnly
+        ].   
+
+        needSep := false.
+
+        contractedSelector := mSel contractTo:80.
+
+        withCurrentSelector ifTrue:[
+            item := MenuItem label:(' ' , contractedSelector , ' ').   "/ ' ' is a kludge - to allow '-' selector
+            item itemValue:actionSelector argument:mSel.
+            m addItem:item.
+            needSep := true.
+        ].
 "/            true "withInstanceProtocolOnly" ifTrue:[
 "/                item := MenuItem label:(resources string:' %1 - Instance Protocol Only' with:contractedSelector).
 "/                item value:actionSelector.
@@ -49810,63 +49836,63 @@
 "/                m addItem:item.
 "/            ].
 
-	(withLocalSenders or:[ withSenderChain or:[ withLocalImplementors or:[ withImplementorChain]]]) ifTrue:[
-	    needSep ifTrue:[ m addSeparator ].
-	    needSep := false.
-	].
-
-	withLocalSenders ifTrue:[
-	    "/ item := MenuItem label:(resources string:' %1 - Local Senders' with:contractedSelector).
-	    item := MenuItem label:(resources string:'Local Senders of %1' with:contractedSelector).
-	    item itemValue:#spawnLocalSendersBuffer.
-	    m addItem:item. needSep := true
-	].
-	withSenderChain ifTrue:[
-	    "/ item := MenuItem label:(resources string:' %1 - Sender Chain' with:contractedSelector).
-	    item := MenuItem label:(resources string:'Sender Chain of %1' with:contractedSelector).
-	    item itemValue:#spawnSenderChainBuffer.
-	    m addItem:item. needSep := true
-	].
-	(withCallersOfThisMethod and:[mthd isInstrumented]) ifTrue:[
-	    item := MenuItem label:(resources string:'Callers of this %1' with:contractedSelector).
-	    item itemValue:#spawnCallersBuffer.
-	    m addItem:item. needSep := true
-	].
-
-	withLocalImplementors ifTrue:[
-	    item := MenuItem label:(resources string:'Local Implementors of %1' with:contractedSelector).
-	    item itemValue:#spawnLocalImplementorsBuffer.
-	    m addItem:item. needSep := true
-	].
-	withImplementorChain ifTrue:[
-	    item := MenuItem label:(resources string:'Implementor Chain of %1' with:contractedSelector).
-	    item itemValue:#spawnImplementorChainBuffer.
-	    m addItem:item. needSep := true
-	].
-	withMethodsCalledByThisMethod ifTrue:[
-	    item := MenuItem label:(resources string:'Methods Called by %1' with:contractedSelector).
-	    item itemValue:#spawnMethodsCalledByBuffer.
-	    m addItem:item. needSep := true
-	].
-
-	selfSendsOnly ifTrue:[
-	    l := mthd messagesSentToSelf.
-	    l := l , (mthd messagesSentToSuper asArray collect:[:each | { each . mthd mclass superclass }]).
-	    l := l , ((mthd messagesPossiblySent
-			  select:[:sel | mthd mclass canUnderstand:sel])
-			    asArray collect:[:each | each colorizeAllWith:Color darkGrey]).
-	] ifFalse:[
-	    l := mthd messagesSent asArray.
-	    l := l , (mthd messagesPossiblySent asArray collect:[:each | each colorizeAllWith:Color darkGrey]).
-	].
-	l size > 0 ifTrue:[
-	    l := l asOrderedCollection sort:[:a :b |
-						|sA sB|
-						sA := a isArray ifTrue:[a first] ifFalse:[a string].
-						sB := b isArray ifTrue:[b first] ifFalse:[b string].
-						sA < sB].
-
-	    needSep ifTrue:[ m addSeparator ].
+        (withLocalSenders or:[ withSenderChain or:[ withLocalImplementors or:[ withImplementorChain]]]) ifTrue:[
+            needSep ifTrue:[ m addSeparator ].
+            needSep := false.
+        ].
+
+        withLocalSenders ifTrue:[
+            "/ item := MenuItem label:(resources string:' %1 - Local Senders' with:contractedSelector).
+            item := MenuItem label:(resources string:'Local Senders of %1' with:contractedSelector).
+            item itemValue:#spawnLocalSendersBuffer.
+            m addItem:item. needSep := true
+        ].
+        withSenderChain ifTrue:[
+            "/ item := MenuItem label:(resources string:' %1 - Sender Chain' with:contractedSelector).
+            item := MenuItem label:(resources string:'Sender Chain of %1' with:contractedSelector).
+            item itemValue:#spawnSenderChainBuffer.
+            m addItem:item. needSep := true
+        ].
+        (withCallersOfThisMethod and:[mthd isInstrumented]) ifTrue:[
+            item := MenuItem label:(resources string:'Callers of this %1' with:contractedSelector).
+            item itemValue:#spawnCallersBuffer.
+            m addItem:item. needSep := true
+        ].
+
+        withLocalImplementors ifTrue:[
+            item := MenuItem label:(resources string:'Local Implementors of %1' with:contractedSelector).
+            item itemValue:#spawnLocalImplementorsBuffer.
+            m addItem:item. needSep := true
+        ].
+        withImplementorChain ifTrue:[
+            item := MenuItem label:(resources string:'Implementor Chain of %1' with:contractedSelector).
+            item itemValue:#spawnImplementorChainBuffer.
+            m addItem:item. needSep := true
+        ].
+        withMethodsCalledByThisMethod ifTrue:[
+            item := MenuItem label:(resources string:'Methods Called by %1' with:contractedSelector).
+            item itemValue:#spawnMethodsCalledByBuffer.
+            m addItem:item. needSep := true
+        ].
+
+        selfSendsOnly ifTrue:[
+            l := mthd messagesSentToSelf.
+            l := l , (mthd messagesSentToSuper asArray collect:[:each | { each . mthd mclass superclass }]).
+            l := l , ((mthd messagesPossiblySent
+                          select:[:sel | mthd mclass canUnderstand:sel])
+                            asArray collect:[:each | each colorizeAllWith:Color darkGrey]).
+        ] ifFalse:[
+            l := mthd messagesSent asArray.
+            l := l , (mthd messagesPossiblySent asArray collect:[:each | each colorizeAllWith:Color darkGrey]).
+        ].
+        l size > 0 ifTrue:[
+            l := l asOrderedCollection sort:[:a :b |
+                                                |sA sB|
+                                                sA := a isArray ifTrue:[a first] ifFalse:[a string].
+                                                sB := b isArray ifTrue:[b first] ifFalse:[b string].
+                                                sA < sB].
+
+            needSep ifTrue:[ m addSeparator ].
 
 "/            (l size > 30) ifTrue:[
 "/                l removeAllFoundIn:#(ifTrue: ifFalse: ifTrue:ifFalse: ifFalse:ifTrue:
@@ -49883,72 +49909,125 @@
 "/                l := l copyTo:30
 "/            ].
 
-	    l do:[:eachMessageOrPair |
-		|selector class label arg|
-
-		eachMessageOrPair isArray ifTrue:[
-		    selector := eachMessageOrPair first.
-		    class := eachMessageOrPair second.
-		    arg := eachMessageOrPair.
-		] ifFalse:[
-		    selector := eachMessageOrPair.
-		    arg := eachMessageOrPair string asSymbol.
-		].
-		label := (selector contractTo:100).
-		class notNil ifTrue:[
-		    label := label , ' (super)'.
-		].
-		item := MenuItem label:(' ' , label, ' ').  "/ ' ' is a kludge - to allow '-' selector (i.e. not confuse with separator)
-		item itemValue:actionSelector argument:arg.
-		m addItem:item.
-	    ].
+            l do:[:eachMessageOrPair |
+                |selector class label arg|
+
+                eachMessageOrPair isArray ifTrue:[
+                    selector := eachMessageOrPair first.
+                    class := eachMessageOrPair second.
+                    arg := eachMessageOrPair.
+                ] ifFalse:[
+                    selector := eachMessageOrPair.
+                    arg := eachMessageOrPair string asSymbol.
+                ].
+                label := (selector contractTo:100).
+                class notNil ifTrue:[
+                    label := label , ' (super)'.
+                ].
+                item := MenuItem label:(' ' , label, ' ').  "/ ' ' is a kludge - to allow '-' selector (i.e. not confuse with separator)
+                item itemValue:actionSelector argument:arg.
+                m addItem:item.
+            ].
 
 "/            cut ifTrue:[
 "/                m addItem:(MenuItem label:'-').
 "/                m addItem:(MenuItem label:'<< more items ignored >>').
 "/            ]
-	]
-    ] ifFalse:[
-	allMessagesSent := Set new.
-
-	"/ not exactly one method selected;
-	"/ generate a menu for all selected method's implementors and sent messages.
-	methods := self selectedMethodsValue.
-	methods isEmptyOrNil ifTrue:[
-	    methods := OrderedCollection new.
-	    self selectedClassesDo:[:cls |
-		cls methodsDo:[:eachMethod | methods add:eachMethod].
-	    ].
-	].
-	methods do:[:eachMethod |
-	    mSel := eachMethod selector ? '?'.
-	    contractedSelector := mSel contractTo:80.
-
-	    item := MenuItem label:(' ' , contractedSelector , ' ').   "/ ' ' is a kludge - to allow '-' selector
-	    item itemValue:actionSelector argument:mSel.
-	    m addItem:item.
-
-	    selfSendsOnly ifTrue:[
-		allMessagesSent addAll:(eachMethod messagesSentToSelf).
-	    ] ifFalse:[
-		allMessagesSent addAll:(eachMethod messagesSent).
-	    ].
-	].
-
-	allMessagesSent := allMessagesSent asSortedCollection.
-	allMessagesSent size > 0 ifTrue:[
-	    m addSeparator.
-	    allMessagesSent do:[:eachMessage |
-		item := MenuItem label:(' ' , (eachMessage contractTo:100), ' ').  "/ ' ' is a kludge - to allow '-' selector
-		item itemValue:actionSelector argument:eachMessage asSymbol.
-		m addItem:item.
-	    ].
-	].
+        ]
+    ] ifFalse:[
+        | methodsPerLanguage |
+
+        allMessagesSent := Set new.
+
+        "/ not exactly one method selected;
+        "/ generate a menu for all selected method's implementors and sent messages.
+        methods := self selectedMethodsValue.
+        methods isEmptyOrNil ifTrue:[
+            methods := OrderedCollection new.
+            self selectedClassesDo:[:cls |
+                cls methodsDo:[:eachMethod | methods add:eachMethod].
+            ].
+        ].
+        methodsPerLanguage := Dictionary new.
+        methods do:[:each |
+            (methodsPerLanguage at: each programmingLanguage ifAbsentPut:[Set new]) add: each.
+        ].
+        methodsPerLanguage keysAndValuesDo:[:language :methods |
+            language isSmalltalk ifTrue:[
+                "/ Do it as before...
+                methods do:[:eachMethod |
+                    mSel := eachMethod selector ? '?'.
+                    contractedSelector := mSel contractTo:80.
+
+                    item := MenuItem label:(' ' , contractedSelector , ' ').   "/ ' ' is a kludge - to allow '-' selector
+                    item itemValue:actionSelector argument:mSel.
+                    m addItem:item.
+
+                    selfSendsOnly ifTrue:[
+                        allMessagesSent addAll:(eachMethod messagesSentToSelf).
+                    ] ifFalse:[
+                        allMessagesSent addAll:(eachMethod messagesSent).
+                    ].
+                ].
+            ] ifFalse:[
+                "/ Not a Smalltalk, must ask toolbox
+                | toolbox |
+
+                toolbox := language toolbox.
+                toolbox notNil ifTrue:[
+                    m addItemsFrom:
+                        (toolbox messagesMenuFor:actionSelector
+                                    withMethods: methods
+                                    withMethodSelectors:true
+                                    withSentSelectors: false
+                                    withSelfSelectorsOnly: selfSendsOnly)
+                ].
+            ].
+        ].
+
+        needSep := true.    
+        methodsPerLanguage keysAndValuesDo:[:language :methods |
+            language isSmalltalk ifTrue:[
+                "/ Do it as before...                
+                allMessagesSent := allMessagesSent asSortedCollection.
+                allMessagesSent size > 0 ifTrue:[
+                    needSep ifTrue:[
+                        m addSeparator.
+                        needSep := false.
+                    ].
+                    allMessagesSent do:[:eachMessage |
+                        item := MenuItem label:(' ' , (eachMessage contractTo:100), ' ').  "/ ' ' is a kludge - to allow '-' selector
+                        item itemValue:actionSelector argument:eachMessage asSymbol.
+                        m addItem:item.
+                    ].
+                ].
+            ] ifFalse:[
+                "/ Not a Smalltalk, must ask toolbox
+                | toolbox |
+
+                toolbox := language toolbox.
+                toolbox notNil ifTrue:[
+                    | lm |
+
+                    lm := toolbox messagesMenuFor:actionSelector
+                                withMethods: methods
+                                withMethodSelectors:false
+                                withSentSelectors: true
+                                withSelfSelectorsOnly: selfSendsOnly.
+                    (lm items notEmptyOrNil and:[needSep]) ifTrue:[
+                        m addSeparator.
+                        needSep := false.
+                    ].
+                    m addItemsFrom: lm.
+                ].
+            ].
+        ].
     ].
     ^ m
 
     "Created: / 27-04-2010 / 15:05:52 / cg"
     "Modified: / 30-07-2013 / 15:53:58 / cg"
+    "Modified: / 01-09-2013 / 18:25:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 messagesMenuFor:actionSelector withSenderChain:withSenderChain withImplementorChain:withImplementorChain
@@ -50699,6 +50778,7 @@
     "Modified: / 19-10-2011 / 16:48:31 / cg"
 ! !
 
+
 !NewSystemBrowser methodsFor:'menus-dynamic-popup'!
 
 categoryPopUpMenu
@@ -55195,6 +55275,7 @@
     ^ navigationState projectListApplication
 ! !
 
+
 !NewSystemBrowser methodsFor:'private-history'!
 
 lastSearchPatterns
@@ -59195,36 +59276,37 @@
     currentClass := self theSingleSelectedClass.
 
     metaClassUsedOrNil isNil ifTrue:[
-	currentClass isJavaClass ifTrue:[
-	    ^ self setAcceptActionForJavaClass.
-	].
+        (currentClass notNil and:[currentClass theNonMetaclass isJavaClass]) ifTrue:[
+            ^ self setAcceptActionForJavaClass.
+        ].
     ].
 
     (currentClass isRealNameSpace) ifTrue:[
-	self setAcceptActionForNothing.
-	^ self
+        self setAcceptActionForNothing.
+        ^ self
     ].
 
     metaClassUsedOrNil notNil ifTrue:[
-	compiler := metaClassUsedOrNil basicNew realSubclassDefinerClass
-    ] ifFalse:[
-	compiler := currentClass
-			ifNil:[Compiler]
-			ifNotNil:[ (currentClass subclassDefinerClass ? Compiler) ].
+        compiler := metaClassUsedOrNil basicNew realSubclassDefinerClass
+    ] ifFalse:[
+        compiler := currentClass
+                        ifNil:[Compiler]
+                        ifNotNil:[ (currentClass subclassDefinerClass ? Compiler) ].
     ].
 
     navigationState isFullClassSourceBrowser ifTrue:[
-	action := [:theCode | self doAcceptFullClassDefinition:theCode
-				   usingCompiler:compiler
-		  ].
-    ] ifFalse:[
-	action := [:theCode | self doAcceptClassDefinition:theCode
-				   usingCompiler:compiler
-		  ].
+        action := [:theCode | self doAcceptFullClassDefinition:theCode
+                                   usingCompiler:compiler
+                  ].
+    ] ifFalse:[
+        action := [:theCode | self doAcceptClassDefinition:theCode
+                                   usingCompiler:compiler
+                  ].
     ].
     self setAcceptAction:action.
 
     "Modified: / 10-11-2006 / 17:14:34 / cg"
+    "Modified: / 02-09-2013 / 09:41:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 setAcceptActionForMethod
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Tools__Toolbox.st	Mon Sep 02 09:55:31 2013 +0100
@@ -0,0 +1,72 @@
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+	      All Rights Reserved
+
+ 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.
+"
+"{ Package: 'stx:libtool' }"
+
+"{ NameSpace: Tools }"
+
+Object subclass:#Toolbox
+	instanceVariableNames:'browser'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Interface-Tools'
+!
+
+!Toolbox class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+	      All Rights Reserved
+
+ 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.
+"
+! !
+
+!Toolbox methodsFor:'accessing'!
+
+browser
+    ^ browser
+!
+
+browser:aNewSystemBrowser
+    browser := aNewSystemBrowser.
+! !
+
+!Toolbox methodsFor:'menus'!
+
+messagesMenuFor:arg1 withMethods:arg2 withMethodSelectors:arg3 withSentSelectors:arg4 withSelfSelectorsOnly:arg5
+    "raise an error: must be redefined in concrete subclass(es)"
+
+    ^ Menu new
+            addItem: ((MenuItem label: 'Not supporte') enabled: false);
+            yourself.
+
+    "Modified: / 02-09-2013 / 09:40:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!Toolbox methodsFor:'private'!
+
+ensureBrowser
+    browser isNil ifTrue:[
+        browser := NewSystemBrowser new.
+        browser open.
+    ].
+    ^ browser
+
+    "Created: / 31-08-2013 / 22:46:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
--- a/abbrev.stc	Fri Aug 30 17:29:48 2013 +0100
+++ b/abbrev.stc	Mon Sep 02 09:55:31 2013 +0100
@@ -4,8 +4,7 @@
 AboutBox AboutBox stx:libtool 'Views-DialogBoxes' 2
 AbstractFileApplicationNoteBookComponent AbstractFileApplicationNoteBookComponent stx:libtool 'Interface-Tools-File' 1
 AbstractFileBrowser AbstractFileBrowser stx:libtool 'Interface-Tools-File' 3
-AbstractLauncherApplication AbstractLauncherApplication stx:libtool 'Interface-Smalltalk' 7
-AbstractRevisionItem AbstractRevisionItem stx:libtool 'Interface-Browsers-Support' 0
+AbstractLauncherApplication AbstractLauncherApplication stx:libtool 'Interface-Smalltalk' 9
 AbstractSettingsApplication AbstractSettingsApplication stx:libtool 'Interface-Smalltalk' 1
 AbstractVersionDiffBrowserItem AbstractVersionDiffBrowserItem stx:libtool 'Interface-Browsers-Support' 0
 ApplicationBuilder ApplicationBuilder stx:libtool 'Interface-Tools' 8
@@ -20,11 +19,11 @@
 ChangeSetBrowser ChangeSetBrowser stx:libtool 'Interface-Browsers' 2
 ChangesBrowser ChangesBrowser stx:libtool 'Interface-Browsers' 2
 ClassItem ClassItem stx:libtool 'Interface-Browsers-Support' 0
-ClassItemRoot ClassItemRoot stx:libtool 'Interface-Browsers-Support' 0
 ClassItemRootForRevision ClassItemRootForRevision stx:libtool 'Interface-Browsers-Support' 0
 ClassNameItem ClassNameItem stx:libtool 'Interface-Browsers-Support' 0
 ClassRevisionTree ClassRevisionTree stx:libtool 'Interface-Browsers-Support' 1
 ClassVariablesInspectorView ClassVariablesInspectorView stx:libtool 'Interface-Inspector' 2
+CodeCompletionHelpView CodeCompletionHelpView stx:libtool 'Interface-Help' 2
 CodeGenerator CodeGenerator stx:libtool 'Interface-Browsers' 0
 CodeGeneratorTests CodeGeneratorTests stx:libtool 'Interface-Browsers' 1
 CodeGeneratorTool CodeGeneratorTool stx:libtool 'Interface-Browsers' 0
@@ -55,7 +54,7 @@
 HierarchicalClassRevisionList HierarchicalClassRevisionList stx:libtool 'Interface-Browsers-Support' 0
 HierarchicalVersionDiffBrowser HierarchicalVersionDiffBrowser stx:libtool 'Interface-Browsers' 1
 InspectorView InspectorView stx:libtool 'Interface-Inspector' 2
-Launcher Launcher stx:libtool 'Interface-Smalltalk' 7
+Launcher Launcher stx:libtool 'Interface-Smalltalk' 9
 LibraryBuilder LibraryBuilder stx:libtool 'Interface-Tools' 8
 MemoryMonitor MemoryMonitor stx:libtool 'Monitors-ST/X' 1
 MemoryMonitorView MemoryMonitorView stx:libtool 'Monitors-ST/X' 2
@@ -70,7 +69,6 @@
 ProjectView ProjectView stx:libtool 'Interface-Tools' 2
 RCSConflictEditTextView RCSConflictEditTextView stx:libtool 'Views-Text' 2
 SemaphoreMonitor SemaphoreMonitor stx:libtool 'Monitors-ST/X' 2
-SmalltalkInspectorView SmalltalkInspectorView stx:libtool 'Interface-Inspector' 2
 SourceRevisionItem SourceRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 SyntaxElement SyntaxElement stx:libtool 'Interface-CodeView-Syntax' 0
 SyntaxHighlighter2 SyntaxHighlighter2 stx:libtool 'Interface-CodeView-Syntax' 3
@@ -136,17 +134,20 @@
 Tools::ToDoListBrowser Tools__ToDoListBrowser stx:libtool 'Interface-Smalltalk-ToDo' 1
 Tools::ToDoListEntry Tools__ToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
 Tools::ToDoNotification Tools__ToDoNotification stx:libtool 'Interface-Smalltalk-ToDo' 1
+Tools::Toolbox Tools__Toolbox stx:libtool 'Interface-Tools' 0
 Tools::WebBrowserPage Tools__WebBrowserPage stx:libtool 'Interface-Browsers-Web' 1
 VersionDiffBrowser VersionDiffBrowser stx:libtool 'Interface-Browsers' 1
 VersionRevisionItem VersionRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 ViewWithAcceptAndCancelBar ViewWithAcceptAndCancelBar stx:libtool 'Views-Basic' 2
 Win32FileDialog Win32FileDialog stx:libtool 'Interface-Tools-File' 0
-XTermView XTermView stx:libtool  'unknownCategory'  0
+XTermView XTermView stx:libtool 'Interface-Tools-Terminal' 2
 stx_libtool stx_libtool stx:libtool '* Projects & Packages *' 3
 AbstractDirectoryBrowser AbstractDirectoryBrowser stx:libtool 'Interface-Tools-File' 3
 AbstractFileFinderApplicationComponent AbstractFileFinderApplicationComponent stx:libtool 'Interface-Tools-File' 1
+AbstractRevisionItem AbstractRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 AbstractSourceCodeManagementSettingsAppl AbstractSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 BookmarkMenuBuilder BookmarkMenuBuilder stx:libtool 'Interface-Bookmarks' 0
+ClassItemRoot ClassItemRoot stx:libtool 'Interface-Browsers-Support' 0
 ContextInspectorView ContextInspectorView stx:libtool 'Interface-Inspector' 2
 DictionaryInspectorView DictionaryInspectorView stx:libtool 'Interface-Inspector' 2
 Diff3ExclusiveVisitor Diff3ExclusiveVisitor stx:libtool 'Collections-Sequenceable-Diff3' 0
@@ -156,11 +157,12 @@
 FileBrowserV2SettingsAppl FileBrowserV2SettingsAppl stx:libtool 'Interface-Tools-File' 1
 FileDialogWithPreview FileDialogWithPreview stx:libtool 'Interface-Tools-File' 1
 ImageInspectorView ImageInspectorView stx:libtool 'Interface-Inspector' 2
-NewLauncher NewLauncher stx:libtool 'Interface-Smalltalk' 7
+NewLauncher NewLauncher stx:libtool 'Interface-Smalltalk' 9
 OrderedCollectionInspectorView OrderedCollectionInspectorView stx:libtool 'Interface-Inspector' 2
 SetInspectorView SetInspectorView stx:libtool 'Interface-Inspector' 2
 SettingsDialog SettingsDialog stx:libtool 'Interface-Smalltalk' 1
 SmalltalkCodeGeneratorTool SmalltalkCodeGeneratorTool stx:libtool 'Interface-Browsers' 0
+SyntaxElementVariable SyntaxElementVariable stx:libtool 'Interface-CodeView-Syntax' 0
 Tools::BackgroundSourceProcessingService Tools__BackgroundSourceProcessingService stx:libtool 'Interface-CodeView' 0
 Tools::BreakpointService Tools__BreakpointService stx:libtool 'Interface-CodeView' 0
 Tools::BrowserList Tools__BrowserList stx:libtool 'Interface-Browsers-New' 1
@@ -194,6 +196,7 @@
 GitSourceCodeManagementSettingsAppl GitSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 MercurialSourceCodeManagementSettingsAppl MercurialSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 PerforceSourceCodeManagementSettingsAppl PerforceSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
+SmalltalkInspectorView SmalltalkInspectorView stx:libtool 'Interface-Inspector' 2
 StoreSourceCodeManagementSettingsAppl StoreSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 Tools::BrowserListWithFilter Tools__BrowserListWithFilter stx:libtool 'Interface-Browsers-New' 1
 Tools::ClassCategoryList Tools__ClassCategoryList stx:libtool 'Interface-Browsers-New' 1
@@ -220,5 +223,3 @@
 Tools::HierarchicalChangeList Tools__HierarchicalChangeList stx:libtool 'Interface-Browsers-ChangeSet' 1
 Tools::HierarchicalPackageFilterList Tools__HierarchicalPackageFilterList stx:libtool 'Interface-Browsers-New-Profiler' 1
 Tools::InheritanceClassList Tools__InheritanceClassList stx:libtool 'Interface-Browsers-New' 1
-CodeCompletionHelpView CodeCompletionHelpView stx:libtool 'Interface-Help' 2
-SyntaxElementVariable SyntaxElementVariable stx:libtool 'Interface-CodeView-Syntax' 0
--- a/bc.mak	Fri Aug 30 17:29:48 2013 +0100
+++ b/bc.mak	Mon Sep 02 09:55:31 2013 +0100
@@ -54,16 +54,14 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	pushd ..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libboss & $(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) "
 
 
@@ -95,6 +93,7 @@
 $(OUTDIR)BookmarksEditDialog.$(O) BookmarksEditDialog.$(H): BookmarksEditDialog.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)BrowserView.$(O) BrowserView.$(H): BrowserView.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)ChangesBrowser.$(O) ChangesBrowser.$(H): ChangesBrowser.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)CodeCompletionHelpView.$(O) CodeCompletionHelpView.$(H): CodeCompletionHelpView.st $(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)CodeGenerator.$(O) CodeGenerator.$(H): CodeGenerator.st $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser\RBProgramNodeVisitor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CodeGeneratorTool.$(O) CodeGeneratorTool.$(H): CodeGeneratorTool.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)DebugView.$(O) DebugView.$(H): DebugView.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)
@@ -172,6 +171,7 @@
 $(OUTDIR)Tools__TagsBrowser.$(O) Tools__TagsBrowser.$(H): Tools__TagsBrowser.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ListModelView.$(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) $(STCHDR)
 $(OUTDIR)Tools__TextDiffTool.$(O) Tools__TextDiffTool.$(H): Tools__TextDiffTool.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__TextMergeInfo.$(O) Tools__TextMergeInfo.$(H): Tools__TextMergeInfo.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Tools__Toolbox.$(O) Tools__Toolbox.$(H): Tools__Toolbox.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__WebBrowserPage.$(O) Tools__WebBrowserPage.$(H): Tools__WebBrowserPage.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)VersionDiffBrowser.$(O) VersionDiffBrowser.$(H): VersionDiffBrowser.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)ViewWithAcceptAndCancelBar.$(O) ViewWithAcceptAndCancelBar.$(H): ViewWithAcceptAndCancelBar.st $(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) $(INCLUDE_TOP)\stx\libwidg\Button.$(H) $(INCLUDE_TOP)\stx\libwidg\Label.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
@@ -193,8 +193,9 @@
 $(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)\stx\libtool\AbstractLauncherApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ToolApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(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)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(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)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(STCHDR)
 $(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)\stx\libtool\CodeGeneratorTool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SyntaxElementVariable.$(O) SyntaxElementVariable.$(H): SyntaxElementVariable.st $(INCLUDE_TOP)\stx\libtool\SyntaxElement.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__BackgroundSourceProcessingService.$(O) Tools__BackgroundSourceProcessingService.$(H): Tools__BackgroundSourceProcessingService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__BreakpointService.$(O) Tools__BreakpointService.$(H): Tools__BreakpointService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__BrowserList.$(O) Tools__BrowserList.$(H): Tools__BrowserList.st $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -206,7 +207,7 @@
 $(OUTDIR)Tools__LintRuleSettingsApplication.$(O) Tools__LintRuleSettingsApplication.$(H): Tools__LintRuleSettingsApplication.st $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__LintService.$(O) Tools__LintService.$(H): Tools__LintService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__NavigatorCanvas.$(O) Tools__NavigatorCanvas.$(H): Tools__NavigatorCanvas.st $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Tools__NewSystemBrowser.$(O) Tools__NewSystemBrowser.$(H): Tools__NewSystemBrowser.st $(INCLUDE_TOP)\stx\libtool\SystemBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Tools__NewSystemBrowser.$(O) Tools__NewSystemBrowser.$(H): Tools__NewSystemBrowser.st $(INCLUDE_TOP)\stx\libtool\SystemBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\ListEntry.$(H) $(STCHDR)
 $(OUTDIR)Tools__OrganizerCanvas.$(O) Tools__OrganizerCanvas.$(H): Tools__OrganizerCanvas.st $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__SendersBrowslet.$(O) Tools__SendersBrowslet.$(H): Tools__SendersBrowslet.st $(INCLUDE_TOP)\stx\libtool\Tools__Browslet.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__StringSearchToolForTextView.$(O) Tools__StringSearchToolForTextView.$(H): Tools__StringSearchToolForTextView.st $(INCLUDE_TOP)\stx\libtool\Tools__StringSearchTool.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -254,7 +255,7 @@
 $(OUTDIR)Tools__HierarchicalChangeList.$(O) Tools__HierarchicalChangeList.$(H): Tools__HierarchicalChangeList.st $(INCLUDE_TOP)\stx\libtool\Tools__ChangeList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserListWithFilter.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__HierarchicalPackageFilterList.$(O) Tools__HierarchicalPackageFilterList.$(H): Tools__HierarchicalPackageFilterList.st $(INCLUDE_TOP)\stx\libtool\Tools__HierarchicalProjectList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__ProjectList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
 $(OUTDIR)Tools__InheritanceClassList.$(O) Tools__InheritanceClassList.$(H): Tools__InheritanceClassList.st $(INCLUDE_TOP)\stx\libtool\Tools__HierarchicalClassList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__ClassList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libcomp\Breakpoint.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libcomp\BreakpointDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic3\ChangeSet.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libview\Color.$(H) $(INCLUDE_TOP)\stx\libbasic3\CompositeChange.$(H) $(INCLUDE_TOP)\stx\libbasic\Date.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(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\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libview\Form.$(H) $(INCLUDE_TOP)\stx\libview\Image.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libwidg\MenuView.$(H) $(INCLUDE_TOP)\stx\libwidg\SelectionInListView.$(H) $(INCLUDE_TOP)\stx\libbasic\Method.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\MethodDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\KeyedCollection.$(H) $(INCLUDE_TOP)\stx\libwidg\PopUpMenu.$(H) $(INCLUDE_TOP)\stx\libview\PopUpView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libbasic3\ProfileTree.$(H) $(INCLUDE_TOP)\stx\libbasic2\RunArray.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ListModelView.$(H) $(INCLUDE_TOP)\stx\libbasic\StringCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Symbol.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic2\Text.$(H) $(INCLUDE_TOP)\stx\libbasic\Timestamp.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractTime.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libbasic\NameSpace.$(H) $(INCLUDE_TOP)\stx\libbasic\Block.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic2\Iterator.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libcomp\Breakpoint.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libcomp\BreakpointDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic3\ChangeSet.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libview\Color.$(H) $(INCLUDE_TOP)\stx\libbasic3\CompositeChange.$(H) $(INCLUDE_TOP)\stx\libbasic\Date.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(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\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libview\Form.$(H) $(INCLUDE_TOP)\stx\libview\Image.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libwidg\MenuView.$(H) $(INCLUDE_TOP)\stx\libwidg\SelectionInListView.$(H) $(INCLUDE_TOP)\stx\libbasic\Method.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\MethodDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\KeyedCollection.$(H) $(INCLUDE_TOP)\stx\libwidg\PopUpMenu.$(H) $(INCLUDE_TOP)\stx\libview\PopUpView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libbasic3\ProfileTree.$(H) $(INCLUDE_TOP)\stx\libbasic2\RunArray.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ListModelView.$(H) $(INCLUDE_TOP)\stx\libbasic\StringCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Symbol.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic2\Text.$(H) $(INCLUDE_TOP)\stx\libbasic\Timestamp.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractTime.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libbasic\NameSpace.$(H) $(INCLUDE_TOP)\stx\libbasic\Block.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic2\Iterator.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Smalltalk.$(H) $(INCLUDE_TOP)\stx\libbasic\ProgrammingLanguage.$(H) $(INCLUDE_TOP)\stx\libbasic2\UUID.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/bmake.bat	Fri Aug 30 17:29:48 2013 +0100
+++ b/bmake.bat	Mon Sep 02 09:55:31 2013 +0100
@@ -8,3 +8,5 @@
 @FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 make.exe -N -f bc.mak  %DEFINES% %*
+
+
--- a/extensions.st	Fri Aug 30 17:29:48 2013 +0100
+++ b/extensions.st	Mon Sep 02 09:55:31 2013 +0100
@@ -1440,6 +1440,36 @@
     "Modified: / 07-11-2008 / 08:40:35 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!ProgrammingLanguage methodsFor:'accessing'!
+
+toolbox
+    "Answer a toolbox for receiver. A toolbox is used by language-agnostic tools (such as
+     class browser) to perform language-specific tasks (search for implementors,
+     build implementor menu and so on. If nil is returned, no toolbox available"
+
+    | class |
+
+    class := self toolboxClass.   
+    ^ class notNil 
+        ifTrue:[ class new] 
+        ifFalse:[ nil ]
+
+    "Created: / 31-08-2013 / 10:15:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 31-08-2013 / 23:42:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!ProgrammingLanguage methodsFor:'accessing - classes'!
+
+toolboxClass
+    "Answer a 'toolbox class'. A toolbox is used by language-agnostic tools (such as
+     class browser) to perform language-specific tasks (search for implementors,
+     build implementor menu and so on. If nil is returned, no toolbox available"
+
+    ^ nil
+
+    "Created: / 31-08-2013 / 10:07:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !RunArray methodsFor:'user interface'!
 
 inspectorClass
--- a/lccmake.bat	Fri Aug 30 17:29:48 2013 +0100
+++ b/lccmake.bat	Mon Sep 02 09:55:31 2013 +0100
@@ -5,11 +5,4 @@
 @REM -------
 make.exe -N -f bc.mak -DUSELCC=1 %*
 
-@echo "***********************************"
-@echo "Buildung stx/libtool/smallsense
-@echo "***********************************"
-@cd smallsense
-@call lccmake %1 %2
-@cd ..
 
-
--- a/libInit.cc	Fri Aug 30 17:29:48 2013 +0100
+++ b/libInit.cc	Mon Sep 02 09:55:31 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvs/stx/stx/libtool/libInit.cc,v 1.106 2013-06-14 14:37:01 cg Exp $
+ * $Header$
  *
  * DO NOT EDIT
  * automagically generated from the projectDefinition: stx_libtool.
@@ -119,6 +119,7 @@
 _Tools__TagsBrowser_Init(pass,__pRT__,snd);
 _Tools__TextDiffTool_Init(pass,__pRT__,snd);
 _Tools__TextMergeInfo_Init(pass,__pRT__,snd);
+_Tools__Toolbox_Init(pass,__pRT__,snd);
 _Tools__WebBrowserPage_Init(pass,__pRT__,snd);
 _VersionDiffBrowser_Init(pass,__pRT__,snd);
 _ViewWithAcceptAndCancelBar_Init(pass,__pRT__,snd);
--- a/libtool.rc	Fri Aug 30 17:29:48 2013 +0100
+++ b/libtool.rc	Mon Sep 02 09:55:31 2013 +0100
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libtool.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1,94
+  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 Tools (LIB)\0"
-      VALUE "FileVersion", "6.2.1.94\0"
+      VALUE "FileVersion", "6.2.32767.32767\0"
       VALUE "InternalName", "stx:libtool\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Fri, 14 Jun 2013 14:36:42 GMT\0"
+      VALUE "ProductDate", "Mon, 02 Sep 2013 08:49:10 GMT\0"
     END
 
   END
--- a/mingwmake.bat	Fri Aug 30 17:29:48 2013 +0100
+++ b/mingwmake.bat	Mon Sep 02 09:55:31 2013 +0100
@@ -13,11 +13,4 @@
 @popd
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
-@echo "***********************************"
-@echo "Buildung stx/libtool/smallsense
-@echo "***********************************"
-@cd smallsense
-@call mingwmake %1 %2
-@cd ..
 
-
--- a/stx_libtool.st	Fri Aug 30 17:29:48 2013 +0100
+++ b/stx_libtool.st	Mon Sep 02 09:55:31 2013 +0100
@@ -11,7 +11,7 @@
 "
 "{ Package: 'stx:libtool' }"
 
-LibraryDefinition subclass:#'stx_libtool'
+LibraryDefinition subclass:#stx_libtool
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -39,14 +39,21 @@
     Build- and package information for creation of the st/x standard library: stx_libtool.
     This library contains developer tools.
 "
-!
+! !
+
+!stx_libtool class methodsFor:'accessing - hg'!
+
+hgRemoveContainesForDeletedClasses
+    "If true, then containers for removed classes are __AUTOMATICALLY__ removed from the
+     repositoru. If false, obsolete containes are kept.
 
-extensionsVersion_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/extensions.st,v 1.104 2013-04-02 20:28:09 cg Exp $'
-!
+     Default is true (remove obsolete containers) but if the repository is mirror of CVS and
+     you want to merge back to CVS at some point, you may want to return false to avoid deletions
+     of obsolete files. Usefull when branching off an old CVS repo with loads of mess."
 
-extensionsVersion_SVN
-    ^ '$Id:: extensions.st 8086 2013-01-15 12:03:21Z vranyj1                                                                        $'
+    ^false "default"
+
+    "Created: / 02-09-2013 / 09:47:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !stx_libtool class methodsFor:'description'!
@@ -102,21 +109,19 @@
      or classes which are extended by this package.
      This list can be maintained manually or (better) generated and
      updated by scanning the superclass hierarchies
-     (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."
+     (the browser has a menu function for that)"
 
     ^ #(
-	#'stx:goodies/refactoryBrowser/parser'    "RBProgramNodeVisitor - superclass of CodeGenerator "
-	#'stx:libbasic'    "LimitedPrecisionReal - extended "
-	#'stx:libbasic2'    "List - superclass of Tools::ToDoList "
-	#'stx:libbasic3'    "ProfileTree - extended "
-	#'stx:libcomp'    "Scanner - superclass of SyntaxHighlighter2 "
-	#'stx:libui'    "UISpecification - superclass of EditFieldWithCompletionSpec "
-	#'stx:libview'    "Form - extended "
-	#'stx:libview2'    "ApplicationModel - superclass of AbstractSettingsApplication::LanguageSettingsAppl "
-	#'stx:libwidg'    "GenericToolbarIconLibrary - superclass of EWorldIconLibrary "
-	#'stx:libwidg2'    "ComboView - superclass of FilenameEditFieldV2 "
+        #'stx:goodies/refactoryBrowser/parser'    "RBProgramNodeVisitor - superclass of CodeGenerator "
+        #'stx:libbasic'    "AbstractTime - extended "
+        #'stx:libbasic2'    "Iterator - extended "
+        #'stx:libbasic3'    "Change - extended "
+        #'stx:libcomp'    "AbstractSyntaxHighlighter - extended "
+        #'stx:libui'    "ComponentSpec - superclass of EditFieldWithCompletionSpec "
+        #'stx:libview'    "Color - extended "
+        #'stx:libview2'    "ApplicationModel - superclass of AbstractDirectoryBrowser "
+        #'stx:libwidg'    "Button - superclass of ViewWithAcceptAndCancelBar::AcceptAndCancelBar::ButtonWithHelpText "
+        #'stx:libwidg2'    "ComboBoxView - superclass of FilenameEditFieldV2 "
     )
 !
 
@@ -155,8 +160,8 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
-	#'exept:vncViewer'    "VNCConnectionFailure - referenced by FileApplicationNoteBook::XViewApplication>>vncConnect "
-	#'stx:libwidg3'    "ClockView - referenced by WorkspaceApplication>>addStopWatch "
+        #'exept:vncViewer'    "VNCAuthenticationFailure - referenced by FileApplicationNoteBook::XViewApplication>>startVNCserver "
+        #'stx:libwidg3'    "ClockView - referenced by WorkspaceApplication>>addStopWatch "
     )
 !
 
@@ -191,367 +196,376 @@
      Attributes are: #autoload or #<os> where os is one of win32, unix,..."
 
     ^ #(
-	"<className> or (<className> attributes...) in load order"
-	AboutBox
-	AbstractFileApplicationNoteBookComponent
-	AbstractFileBrowser
-	AbstractLauncherApplication
-	AbstractSettingsApplication
-	(AbstractVersionDiffBrowserItem autoload)
-	(ApplicationBuilder autoload)
-	Bookmark
-	BookmarkBar
-	BookmarkEditor
-	BookmarkList
-	BookmarkListEditor
-	BookmarkVisitor
-	BookmarksEditDialog
-	BrowserView
-	ChangesBrowser
-	(ClassNameItem autoload)
-	(ClassRevisionTree autoload)
-	CodeGenerator
-	(CodeGeneratorTests autoload)
-	CodeGeneratorTool
-	DebugView
-	Diff
-	Diff2
-	Diff3
-	Diff3Hunk
-	Diff3InclusiveVisitor
-	(Diff3TextView autoload)
-	DiffListUtility
-	DiffTextView
-	(EWorldIconLibrary autoload)
-	EditFieldWithCompletion
-	EditFieldWithCompletionSpec
-	(EventMonitor autoload)
-	FileBrowser
-	FileBrowserV2PanelView
-	(FileBrowserV2SettingsDialog autoload)
-	(FileBrowserV2Tests autoload)
-	FileBrowserV2UISpecifications
-	FileDialog
-	(FileDialogV2 autoload)
-	FileOperation
-	FilenameEditFieldV2
-	(HierarchicalClassRevisionList autoload)
-	(HierarchicalVersionDiffBrowser autoload)
-	InspectorView
-	MemoryMonitor
-	MemoryMonitorView
-	(MemoryUsageView autoload)
-	MultiViewToolApplication
-	(NewChangesBrowser autoload)
-	(OldLauncher autoload)
-	ParseTreeIndex
-	PerforceSourceCodeManagerUtilities
-	ProcessMonitorV2
-	(ProjectView autoload)
-	(RCSConflictEditTextView autoload)
-	SyntaxElement
-	SyntaxHighlighter2
-	SystemBrowser
-	(SystemStatusMonitor autoload)
-	(TextDiffTests autoload)
-	#'Tools::AbstractTestRunner'
-	#'Tools::BreakpointBrowser'
-	#'Tools::Browslet'
-	#'Tools::BrowsletCanvas'
-	#'Tools::CachedTags'
-	#'Tools::ChangeSetBrowser2'
-	#'Tools::ChangeSetDiffInfo'
-	#'Tools::ChangeSetDiffTool'
-	#'Tools::ChangeSetSelectionDialog'
-	#'Tools::ChangeSetSpec'
-	#'Tools::CheckinInfoDialog'
-	#'Tools::ClassChecker'
-	#'Tools::ClassSorter'
-	#'Tools::CodeCompletionMenu'
-	#'Tools::CodeCritics'
-	#'Tools::CodeView2'
-	(#'Tools::CodeView2DemoApp' autoload)
-	#'Tools::CodeViewService'
-	#'Tools::DiffCodeView2'
-	(#'Tools::DiffCodeView2DemoApp' autoload)
-	#'Tools::HierarchicalChangesetDialog'
-	#'Tools::InlineMessageDialog'
-	#'Tools::Inspector2'
-	#'Tools::Inspector2Tab'
-	#'Tools::LintAnnotation'
-	#'Tools::LintHighlighter'
-	#'Tools::LintRuleDetail'
-	#'Tools::LintRuleEditDialog'
-	#'Tools::LintRuleSelectionDialog'
-	#'Tools::MethodCategoryCache'
-	#'Tools::MethodRewriter'
-	#'Tools::NavigationHistory'
-	(#'Tools::NavigationHistoryTests' autoload)
-	#'Tools::NavigationState'
-	#'Tools::NavigatorModel'
-	#'Tools::NewClassWizardDialog'
-	#'Tools::NewSystemBrowserCodeView'
-	#'Tools::Profiler'
-	#'Tools::ProfilerInfoBuilder'
-	#'Tools::ProfilerInfoItem'
-	#'Tools::ProjectCheckerBrowser'
-	#'Tools::ProjectLoader'
-	#'Tools::SearchDialog'
-	#'Tools::SmalltalkDiffTool'
-	#'Tools::SourceCodeManagerConfigurationTestTool'
-	#'Tools::SpecialCodeView'
-	#'Tools::StringSearchTool'
-	#'Tools::Tag'
-	#'Tools::TagList'
-	#'Tools::TagsBrowser'
-	#'Tools::TextDiffTool'
-	#'Tools::TextMergeInfo'
-	(#'Tools::ToDoList' autoload)
-	(#'Tools::ToDoListBrowser' autoload)
-	(#'Tools::ToDoListEntry' autoload)
-	(#'Tools::ToDoNotification' autoload)
-	#'Tools::WebBrowserPage'
-	VersionDiffBrowser
-	ViewWithAcceptAndCancelBar
-	Win32FileDialog
-	(XTermView unix)
-	#'stx_libtool'
-	AbstractDirectoryBrowser
-	AbstractFileFinderApplicationComponent
-	(AbstractRevisionItem autoload)
-	AbstractSourceCodeManagementSettingsAppl
-	BookmarkMenuBuilder
-	(ChangeSetBrowser autoload)
-	(ClassItem autoload)
-	(ClassItemRoot autoload)
-	(ColorInspectorView autoload)
-	ContextInspectorView
-	DictionaryInspectorView
-	Diff3ExclusiveVisitor
-	DiffCodeView
-	FileApplicationNoteBook
-	FileBrowserV2
-	FileBrowserV2SettingsAppl
-	FileDialogWithPreview
-	ImageInspectorView
-	(Launcher autoload)
-	(LibraryBuilder autoload)
-	NewLauncher
-	OrderedCollectionInspectorView
-	(ProcessMonitor autoload)
-	(SemaphoreMonitor autoload)
-	SetInspectorView
-	SettingsDialog
-	SmalltalkCodeGeneratorTool
-	(TerminalApplication autoload)
-	#'Tools::BackgroundSourceProcessingService'
-	#'Tools::BreakpointService'
-	#'Tools::BrowserList'
-	#'Tools::CodeCompletionService'
-	#'Tools::CodeNavigationService'
-	#'Tools::CodeView2SettingsAppl'
-	(#'Tools::CompilerWarningToDoListEntry' autoload)
-	#'Tools::Diff2CodeView2'
-	#'Tools::Diff3CodeView2'
-	#'Tools::LintRuleSettingsApplication'
-	#'Tools::LintService'
-	#'Tools::NavigatorCanvas'
-	#'Tools::NewSystemBrowser'
-	#'Tools::OrganizerCanvas'
-	#'Tools::SendersBrowslet'
-	(#'Tools::SmalltalkMergeTool' autoload)
-	#'Tools::StringSearchToolForTextView'
-	#'Tools::TestRunnerEmbedded'
-	#'Tools::TextDiff2Tool'
-	#'Tools::TextDiff3Tool'
-	#'Tools::VisualProfilerCanvas'
-	WorkspaceApplication
-	BookmarkAddMenuBuilder
-	BookmarkToolbarMenuBuilder
-	CVSSourceCodeManagementSettingsAppl
-	(ClassItemRootForRevision autoload)
-	DataBaseSourceCodeManagementSettingsAppl
-	DirectoryContentsBrowser
-	DirectoryDifferenceViewApplication
-	DirectoryTreeBrowser
-	(ExpandableRevisionItem autoload)
-	FileBasedSourceCodeManagementSettingsAppl
-	FileBrowserV3
-	FindFileApplication
-	GitSourceCodeManagementSettingsAppl
-	MercurialSourceCodeManagementSettingsAppl
-	PerforceSourceCodeManagementSettingsAppl
-	(SmalltalkInspectorView autoload)
-	(SourceRevisionItem autoload)
-	StoreSourceCodeManagementSettingsAppl
-	#'Tools::BrowserListWithFilter'
-	#'Tools::ClassCategoryList'
-	#'Tools::ClassGeneratorList'
-	#'Tools::ClassList'
-	#'Tools::CodeHighlightingService'
-	#'Tools::LintRuleList'
-	#'Tools::MethodCategoryList'
-	#'Tools::MethodList'
-	#'Tools::NamespaceList'
-	#'Tools::ProjectList'
-	#'Tools::VariableList'
-	(VersionRevisionItem autoload)
-	(ClassVariablesInspectorView autoload)
-	#'Tools::ChangeList'
-	#'Tools::ChangeSetDiffList'
-	#'Tools::FullMethodCategoryList'
-	#'Tools::HierarchicalClassCategoryList'
-	#'Tools::HierarchicalClassList'
-	#'Tools::HierarchicalLintRuleList'
-	#'Tools::HierarchicalProjectList'
-	#'Tools::ImplementingClassList'
-	#'Tools::ImplementingMethodList'
-	#'Tools::NamespaceFilter'
-	#'Tools::TestRunner2'
-	#'Tools::HierarchicalChangeList'
-	#'Tools::HierarchicalPackageFilterList'
-	#'Tools::InheritanceClassList'
-	CodeCompletionHelpView
-	SyntaxElementVariable
+        "<className> or (<className> attributes...) in load order"
+        AboutBox
+        AbstractFileApplicationNoteBookComponent
+        AbstractFileBrowser
+        AbstractLauncherApplication
+        AbstractSettingsApplication
+        (AbstractVersionDiffBrowserItem autoload)
+        (ApplicationBuilder autoload)
+        Bookmark
+        BookmarkBar
+        BookmarkEditor
+        BookmarkList
+        BookmarkListEditor
+        BookmarkVisitor
+        BookmarksEditDialog
+        BrowserView
+        (ChangeSetBrowser autoload)
+        ChangesBrowser
+        (ClassItem autoload)
+        (ClassItemRootForRevision autoload)
+        (ClassNameItem autoload)
+        (ClassRevisionTree autoload)
+        (ClassVariablesInspectorView autoload)
+        CodeCompletionHelpView
+        CodeGenerator
+        (CodeGeneratorTests autoload)
+        CodeGeneratorTool
+        (ColorInspectorView autoload)
+        DebugView
+        Diff
+        Diff2
+        Diff3
+        Diff3Hunk
+        Diff3InclusiveVisitor
+        (Diff3TextView autoload)
+        DiffListUtility
+        DiffTextView
+        (EWorldIconLibrary autoload)
+        EditFieldWithCompletion
+        EditFieldWithCompletionSpec
+        (EventMonitor autoload)
+        (ExpandableRevisionItem autoload)
+        FileBrowser
+        FileBrowserV2PanelView
+        (FileBrowserV2SettingsDialog autoload)
+        (FileBrowserV2Tests autoload)
+        FileBrowserV2UISpecifications
+        FileDialog
+        (FileDialogV2 autoload)
+        FileOperation
+        FilenameEditFieldV2
+        (HierarchicalClassRevisionList autoload)
+        (HierarchicalVersionDiffBrowser autoload)
+        InspectorView
+        (Launcher autoload)
+        (LibraryBuilder autoload)
+        MemoryMonitor
+        MemoryMonitorView
+        (MemoryUsageView autoload)
+        MultiViewToolApplication
+        (NewChangesBrowser autoload)
+        (OldLauncher autoload)
+        ParseTreeIndex
+        PerforceSourceCodeManagerUtilities
+        (ProcessMonitor autoload)
+        ProcessMonitorV2
+        (ProjectView autoload)
+        (RCSConflictEditTextView autoload)
+        (SemaphoreMonitor autoload)
+        (SourceRevisionItem autoload)
+        SyntaxElement
+        SyntaxHighlighter2
+        SystemBrowser
+        (SystemStatusMonitor autoload)
+        (TerminalApplication autoload)
+        (TextDiffTests autoload)
+        #'Tools::AbstractTestRunner'
+        #'Tools::BreakpointBrowser'
+        #'Tools::Browslet'
+        #'Tools::BrowsletCanvas'
+        #'Tools::CachedTags'
+        #'Tools::ChangeSetBrowser2'
+        #'Tools::ChangeSetDiffInfo'
+        #'Tools::ChangeSetDiffTool'
+        #'Tools::ChangeSetSelectionDialog'
+        #'Tools::ChangeSetSpec'
+        #'Tools::CheckinInfoDialog'
+        #'Tools::ClassChecker'
+        #'Tools::ClassSorter'
+        #'Tools::CodeCompletionMenu'
+        #'Tools::CodeCritics'
+        #'Tools::CodeView2'
+        (#'Tools::CodeView2DemoApp' autoload)
+        #'Tools::CodeViewService'
+        (#'Tools::CompilerWarningToDoListEntry' autoload)
+        #'Tools::DiffCodeView2'
+        (#'Tools::DiffCodeView2DemoApp' autoload)
+        #'Tools::HierarchicalChangesetDialog'
+        #'Tools::InlineMessageDialog'
+        #'Tools::Inspector2'
+        #'Tools::Inspector2Tab'
+        #'Tools::LintAnnotation'
+        #'Tools::LintHighlighter'
+        #'Tools::LintRuleDetail'
+        #'Tools::LintRuleEditDialog'
+        #'Tools::LintRuleSelectionDialog'
+        #'Tools::MethodCategoryCache'
+        #'Tools::MethodRewriter'
+        #'Tools::NavigationHistory'
+        (#'Tools::NavigationHistoryTests' autoload)
+        #'Tools::NavigationState'
+        #'Tools::NavigatorModel'
+        #'Tools::NewClassWizardDialog'
+        #'Tools::NewSystemBrowserCodeView'
+        #'Tools::Profiler'
+        #'Tools::ProfilerInfoBuilder'
+        #'Tools::ProfilerInfoItem'
+        #'Tools::ProjectCheckerBrowser'
+        #'Tools::ProjectLoader'
+        #'Tools::SearchDialog'
+        #'Tools::SmalltalkDiffTool'
+        (#'Tools::SmalltalkMergeTool' autoload)
+        #'Tools::SourceCodeManagerConfigurationTestTool'
+        #'Tools::SpecialCodeView'
+        #'Tools::StringSearchTool'
+        #'Tools::Tag'
+        #'Tools::TagList'
+        #'Tools::TagsBrowser'
+        #'Tools::TextDiffTool'
+        #'Tools::TextMergeInfo'
+        (#'Tools::ToDoList' autoload)
+        (#'Tools::ToDoListBrowser' autoload)
+        (#'Tools::ToDoListEntry' autoload)
+        (#'Tools::ToDoNotification' autoload)
+        #'Tools::Toolbox'
+        #'Tools::WebBrowserPage'
+        VersionDiffBrowser
+        (VersionRevisionItem autoload)
+        ViewWithAcceptAndCancelBar
+        Win32FileDialog
+        (XTermView unix)
+        #'stx_libtool'
+        AbstractDirectoryBrowser
+        AbstractFileFinderApplicationComponent
+        (AbstractRevisionItem autoload)
+        AbstractSourceCodeManagementSettingsAppl
+        BookmarkMenuBuilder
+        (ClassItemRoot autoload)
+        ContextInspectorView
+        DictionaryInspectorView
+        Diff3ExclusiveVisitor
+        DiffCodeView
+        FileApplicationNoteBook
+        FileBrowserV2
+        FileBrowserV2SettingsAppl
+        FileDialogWithPreview
+        ImageInspectorView
+        NewLauncher
+        OrderedCollectionInspectorView
+        SetInspectorView
+        SettingsDialog
+        SmalltalkCodeGeneratorTool
+        SyntaxElementVariable
+        #'Tools::BackgroundSourceProcessingService'
+        #'Tools::BreakpointService'
+        #'Tools::BrowserList'
+        #'Tools::CodeCompletionService'
+        #'Tools::CodeNavigationService'
+        #'Tools::CodeView2SettingsAppl'
+        #'Tools::Diff2CodeView2'
+        #'Tools::Diff3CodeView2'
+        #'Tools::LintRuleSettingsApplication'
+        #'Tools::LintService'
+        #'Tools::NavigatorCanvas'
+        #'Tools::NewSystemBrowser'
+        #'Tools::OrganizerCanvas'
+        #'Tools::SendersBrowslet'
+        #'Tools::StringSearchToolForTextView'
+        #'Tools::TestRunnerEmbedded'
+        #'Tools::TextDiff2Tool'
+        #'Tools::TextDiff3Tool'
+        #'Tools::VisualProfilerCanvas'
+        WorkspaceApplication
+        BookmarkAddMenuBuilder
+        BookmarkToolbarMenuBuilder
+        CVSSourceCodeManagementSettingsAppl
+        DataBaseSourceCodeManagementSettingsAppl
+        DirectoryContentsBrowser
+        DirectoryDifferenceViewApplication
+        DirectoryTreeBrowser
+        FileBasedSourceCodeManagementSettingsAppl
+        FileBrowserV3
+        FindFileApplication
+        GitSourceCodeManagementSettingsAppl
+        MercurialSourceCodeManagementSettingsAppl
+        PerforceSourceCodeManagementSettingsAppl
+        (SmalltalkInspectorView autoload)
+        StoreSourceCodeManagementSettingsAppl
+        #'Tools::BrowserListWithFilter'
+        #'Tools::ClassCategoryList'
+        #'Tools::ClassGeneratorList'
+        #'Tools::ClassList'
+        #'Tools::CodeHighlightingService'
+        #'Tools::LintRuleList'
+        #'Tools::MethodCategoryList'
+        #'Tools::MethodList'
+        #'Tools::NamespaceList'
+        #'Tools::ProjectList'
+        #'Tools::VariableList'
+        #'Tools::ChangeList'
+        #'Tools::ChangeSetDiffList'
+        #'Tools::FullMethodCategoryList'
+        #'Tools::HierarchicalClassCategoryList'
+        #'Tools::HierarchicalClassList'
+        #'Tools::HierarchicalLintRuleList'
+        #'Tools::HierarchicalProjectList'
+        #'Tools::ImplementingClassList'
+        #'Tools::ImplementingMethodList'
+        #'Tools::NamespaceFilter'
+        #'Tools::TestRunner2'
+        #'Tools::HierarchicalChangeList'
+        #'Tools::HierarchicalPackageFilterList'
+        #'Tools::InheritanceClassList'
     )
 !
 
 extensionMethodNames
     "lists the extension methods which are to be included in the project.
-     Entries are pairwise elements, consisting of class-name and selector."
+     Entries are 2-element array literals, consisting of class-name and selector."
 
     ^ #(
-	Breakpoint icon
-	BreakpointDescription icon
-	ByteArray inspectorExtraAttributes
-	Change flattenOnto:
-	Change flattenedChanges
-	Change removed
-	Change removed:
-	ChangeSet condenseChangesForRemoved
-	Character inspectorExtraAttributes
-	CharacterArray inspector2TabBytes
-	CharacterArray inspector2TabText
-	CharacterArray inspector2Tabs
-	CharacterArray inspectorExtraAttributes
-	Color inspectorClass
-	Color inspectorExtraAttributes
-	CompositeChange condenseChangesForRemoved
-	CompositeChange flattenOnto:
-	CompositeChange removed
-	CompositeChange removed:
-	Date inspectorExtraAttributes
-	Dictionary inspector2TabLabel
-	Dictionary inspectorClass
-	EditTextView absoluteXOfPosition:
-	EditTextView absoluteYOfCursor
-	EditTextView xOfPosition:
-	EditTextView yOfCursor
-	EditTextView yOfPosition:
-	ExecutableFunction printStringForBrowserWithSelector:
-	Form inspectorClass
-	Image inspectorClass
-	Integer inspectorExtraAttributes
-	MenuView shortKeys
-	Method inspectorExtraAttributes
-	Method printStringForBrowserWithSelector:inClass:
-	Method selectorPrintStringInBrowserFor:
-	Method selectorPrintStringInBrowserFor:class:
-	MethodDictionary inspectorClass
-	Object inspect
-	Object inspector2TabCommon
-	Object inspector2TabForBasicInspect
-	Object inspector2TabForInspectorClass
-	Object inspector2TabLabel
-	Object inspector2Tabs
-	Object inspectorExtraAttributes
-	Object isTestCaseLike
-	Object newInspector2Tab
-	OrderedCollection inspectorClass
-	PopUpMenu asMenu
-	ProfileTree method
-	ProfileTree package
-	RunArray inspectorClass
-	SelectionInListModelView textStartLeft
-	SelectionInListModelView textStartLeft:
-	Set inspectorClass
-	SimpleView isCodeView2
-	StringCollection inspector2TabText
-	StringCollection inspector2Tabs
-	Symbol formattedCode
-	Text inspector2TabText
-	Text inspectorExtraAttributes
-	Timestamp inspectorExtraAttributes
-	UserPreferences alwaysOpenNewTabWhenCtrlClick
-	UserPreferences alwaysOpenNewTabWhenCtrlClick:
-	UserPreferences showBookmarkBar
-	UserPreferences showBookmarkBar:
-	UserPreferences showEmbeddedTestRunnerInBrowser
-	UserPreferences showEmbeddedTestRunnerInBrowser:
-	UserPreferences showGlobalHistory
-	UserPreferences showGlobalHistory:
-	UserPreferences showLocalHistory
-	UserPreferences showLocalHistory:
-	UserPreferences showMethodTemplate
-	UserPreferences showMethodTemplate:
-	UserPreferences sortAndIndentClassesByInheritance
-	UserPreferences sortAndIndentClassesByInheritance:
-	UserPreferences useCodeView2In:
-	UserPreferences useCodeView2InBrowser
-	UserPreferences useCodeView2InBrowser:
-	UserPreferences useCodeView2InDebugger
-	UserPreferences useCodeView2InDebugger:
-	UserPreferences useCodeView2InTools
-	UserPreferences useCodeView2InTools:
-	UserPreferences useCodeView2InWorkspace
-	UserPreferences useCodeView2InWorkspace:
-	UserPreferences webBrowserLikeLayout
-	UserPreferences webBrowserLikeLayout:
-	'AbstractSyntaxHighlighter class' formatExpression:in:elementsInto:
-	'AbstractSyntaxHighlighter class' formatMethod:in:using:elementsInto:
-	'GenericToolbarIconLibrary class' bookmarks22x22
-	'GenericToolbarIconLibrary class' bug16x16Icon
-	'GenericToolbarIconLibrary class' bug24x24Icon
-	'GenericToolbarIconLibrary class' bug32x32Icon
-	'GenericToolbarIconLibrary class' lint16x16Icon
-	'GenericToolbarIconLibrary class' lint24x24Icon
-	'GenericToolbarIconLibrary class' lint32x32Icon
-	'NameSpace class' inspectorClass
-	Block inspectorExtraAttributes
-	CharacterArray inspector2TabHTML
-	Image inspector2TabImage
-	Image inspector2Tabs
-	UserPreferences codeView2AutoIndent
-	UserPreferences codeView2AutoIndent:
-	UserPreferences codeView2ShowAcceptCancel
-	UserPreferences codeView2ShowAcceptCancel:
-	UserPreferences sourceCodeManagementMenuLayout
-	UserPreferences sourceCodeManagementMenuLayout:
-	UserPreferences useInPlaceSearchInBrowserLists
-	UserPreferences useInPlaceSearchInBrowserLists:
-	'GenericToolbarIconLibrary class' smalllintWarning16x16
-	'GenericToolbarIconLibrary class' versionMerged24x24
-	ArrayedCollection inspector2TabForHexDump
-	LimitedPrecisionReal inspectorExtraAttributes
-	UninterpretedBytes inspector2Tabs
-	UserPreferences changesBrowserClassName
-	UserPreferences fileBrowserClass
-	UserPreferences fileBrowserClass:
-	UserPreferences fileBrowserClassName
-	UserPreferences confirmRefactorings
-	UserPreferences confirmRefactorings:
-	Character inspectorValueStringInListFor:
-	CharacterArray inspectorValueStringInListFor:
-	Color inspectorValueStringInListFor:
-	Object inspectorValueStringInListFor:
-	Symbol inspectorValueStringInListFor:
-	UndefinedObject inspectorValueStringInListFor:
-	Behavior inspectorExtraAttributes
-	Behavior inspectorValueStringInListFor:
-	Collection inspectorValueStringInListFor:
-	Iterator inspectorValueStringInListFor:
-	Class inspectorClass
-	'Smalltalk class' inspectorClass
+        Breakpoint icon
+        BreakpointDescription icon
+        ByteArray inspectorExtraAttributes
+        Change flattenOnto:
+        Change flattenedChanges
+        Change removed
+        Change removed:
+        ChangeSet condenseChangesForRemoved
+        Character inspectorExtraAttributes
+        CharacterArray inspector2TabBytes
+        CharacterArray inspector2TabText
+        CharacterArray inspector2Tabs
+        CharacterArray inspectorExtraAttributes
+        Color inspectorClass
+        Color inspectorExtraAttributes
+        CompositeChange condenseChangesForRemoved
+        CompositeChange flattenOnto:
+        CompositeChange removed
+        CompositeChange removed:
+        Date inspectorExtraAttributes
+        Dictionary inspector2TabLabel
+        Dictionary inspectorClass
+        EditTextView absoluteXOfPosition:
+        EditTextView absoluteYOfCursor
+        EditTextView xOfPosition:
+        EditTextView yOfCursor
+        EditTextView yOfPosition:
+        ExecutableFunction printStringForBrowserWithSelector:
+        Form inspectorClass
+        Image inspectorClass
+        Integer inspectorExtraAttributes
+        MenuView shortKeys
+        Method inspectorExtraAttributes
+        Method printStringForBrowserWithSelector:inClass:
+        Method selectorPrintStringInBrowserFor:
+        Method selectorPrintStringInBrowserFor:class:
+        MethodDictionary inspectorClass
+        Object inspect
+        Object inspector2TabCommon
+        Object inspector2TabForBasicInspect
+        Object inspector2TabForInspectorClass
+        Object inspector2TabLabel
+        Object inspector2Tabs
+        Object inspectorExtraAttributes
+        Object isTestCaseLike
+        Object newInspector2Tab
+        OrderedCollection inspectorClass
+        PopUpMenu asMenu
+        ProfileTree method
+        ProfileTree package
+        RunArray inspectorClass
+        SelectionInListModelView textStartLeft
+        SelectionInListModelView textStartLeft:
+        Set inspectorClass
+        SimpleView isCodeView2
+        StringCollection inspector2TabText
+        StringCollection inspector2Tabs
+        Symbol formattedCode
+        Text inspector2TabText
+        Text inspectorExtraAttributes
+        Timestamp inspectorExtraAttributes
+        UserPreferences alwaysOpenNewTabWhenCtrlClick
+        UserPreferences alwaysOpenNewTabWhenCtrlClick:
+        UserPreferences showBookmarkBar
+        UserPreferences showBookmarkBar:
+        UserPreferences showEmbeddedTestRunnerInBrowser
+        UserPreferences showEmbeddedTestRunnerInBrowser:
+        UserPreferences showGlobalHistory
+        UserPreferences showGlobalHistory:
+        UserPreferences showLocalHistory
+        UserPreferences showLocalHistory:
+        UserPreferences showMethodTemplate
+        UserPreferences showMethodTemplate:
+        UserPreferences sortAndIndentClassesByInheritance
+        UserPreferences sortAndIndentClassesByInheritance:
+        UserPreferences useCodeView2In:
+        UserPreferences useCodeView2InBrowser
+        UserPreferences useCodeView2InBrowser:
+        UserPreferences useCodeView2InDebugger
+        UserPreferences useCodeView2InDebugger:
+        UserPreferences useCodeView2InTools
+        UserPreferences useCodeView2InTools:
+        UserPreferences useCodeView2InWorkspace
+        UserPreferences useCodeView2InWorkspace:
+        UserPreferences webBrowserLikeLayout
+        UserPreferences webBrowserLikeLayout:
+        'AbstractSyntaxHighlighter class' formatExpression:in:elementsInto:
+        'AbstractSyntaxHighlighter class' formatMethod:in:using:elementsInto:
+        'GenericToolbarIconLibrary class' bookmarks22x22
+        'GenericToolbarIconLibrary class' bug16x16Icon
+        'GenericToolbarIconLibrary class' bug24x24Icon
+        'GenericToolbarIconLibrary class' bug32x32Icon
+        'GenericToolbarIconLibrary class' lint16x16Icon
+        'GenericToolbarIconLibrary class' lint24x24Icon
+        'GenericToolbarIconLibrary class' lint32x32Icon
+        'NameSpace class' inspectorClass
+        Block inspectorExtraAttributes
+        CharacterArray inspector2TabHTML
+        Image inspector2TabImage
+        Image inspector2Tabs
+        UserPreferences codeView2AutoIndent
+        UserPreferences codeView2AutoIndent:
+        UserPreferences codeView2ShowAcceptCancel
+        UserPreferences codeView2ShowAcceptCancel:
+        UserPreferences sourceCodeManagementMenuLayout
+        UserPreferences sourceCodeManagementMenuLayout:
+        UserPreferences useInPlaceSearchInBrowserLists
+        UserPreferences useInPlaceSearchInBrowserLists:
+        'GenericToolbarIconLibrary class' smalllintWarning16x16
+        'GenericToolbarIconLibrary class' versionMerged24x24
+        ArrayedCollection inspector2TabForHexDump
+        LimitedPrecisionReal inspectorExtraAttributes
+        UninterpretedBytes inspector2Tabs
+        UserPreferences changesBrowserClassName
+        UserPreferences fileBrowserClass
+        UserPreferences fileBrowserClass:
+        UserPreferences fileBrowserClassName
+        UserPreferences confirmRefactorings
+        UserPreferences confirmRefactorings:
+        Character inspectorValueStringInListFor:
+        CharacterArray inspectorValueStringInListFor:
+        Color inspectorValueStringInListFor:
+        Object inspectorValueStringInListFor:
+        Symbol inspectorValueStringInListFor:
+        UndefinedObject inspectorValueStringInListFor:
+        Behavior inspectorExtraAttributes
+        Behavior inspectorValueStringInListFor:
+        Collection inspectorValueStringInListFor:
+        Iterator inspectorValueStringInListFor:
+        Class inspectorClass
+        'Smalltalk class' inspectorClass
+        ChangeSet flattenOnto:
+        ChangeSet flattenedChanges
+        ChangeSet inspector2TabBrowser
+        ChangeSet inspector2Tabs
+        ProgrammingLanguage toolbox
+        ProgrammingLanguage toolboxClass
+        Timestamp inspectorValueStringInListFor:
+        UUID inspectorValueStringInListFor:
     )
 ! !
 
@@ -625,3 +639,4 @@
 version_SVN
     ^ '$Id: stx_libtool.st 8090 2013-01-17 21:52:18Z vranyj1 $'
 ! !
+
--- a/vcmake.bat	Fri Aug 30 17:29:48 2013 +0100
+++ b/vcmake.bat	Mon Sep 02 09:55:31 2013 +0100
@@ -17,11 +17,4 @@
 
 
 
-@echo "***********************************"
-@echo "Buildung stx/libtool/smallsense
-@echo "***********************************"
-@cd smallsense
-@call vcmake %1 %2
-@cd ..
 
-