Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- XTermView jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 05 Apr 2012 18:53:51 +0100
branchjv
changeset 12224 eabcf6fc3857
parent 12223 fa02fa14b321
child 12225 60dfd3fa018d
- XTermView changed: #clientUnplugged: - FileBrowserV2SettingsDialog added: #version_SVN - stx_libtool changed: #classNamesAndAttributes #extensionMethodNames #preRequisites - Tools::NewSystemBrowser changed: #searchCompletionNew: - extensions ...
FileApplicationNoteBook.st file | annotate | diff | comparison | revisions
FileBrowserV2SettingsDialog.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
Make.spec file | annotate | diff | comparison | revisions
Tools__BrowserList.st file | annotate | diff | comparison | revisions
Tools__CodeView2.st file | annotate | diff | comparison | revisions
Tools__NewSystemBrowser.st file | annotate | diff | comparison | revisions
XTermView.st file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
libtool.rc file | annotate | diff | comparison | revisions 
--- a/FileApplicationNoteBook.st	Thu Apr 05 13:51:06 2012 +0100
+++ b/FileApplicationNoteBook.st	Thu Apr 05 18:53:51 2012 +0100
@@ -4388,7 +4388,7 @@
 terminalView
 
     terminalView isNil ifTrue:[
-        (OperatingSystem isUNIXlike and:[XTermView notNil]) ifTrue:[
+        (OperatingSystem isUNIXlike and:[XTermView notNil and:[XTermView isAvailable]]) ifTrue:[
             terminalView := XTermView new.
         ] ifFalse:[
             VT100TerminalView isNil ifTrue:[
@@ -4397,11 +4397,12 @@
             ].
             terminalView := VT100TerminalView new.
         ].
+        terminalView workingDirectory: item fileName pathName.
         terminalView lineLimit:(self class defaultLineLimit).
     ].
     ^ terminalView.
 
-    "Modified: / 03-04-2012 / 10:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-04-2012 / 15:58:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !FileApplicationNoteBook::Terminal methodsFor:'actions'!
@@ -6714,7 +6715,7 @@
 !FileApplicationNoteBook class methodsFor:'documentation'!
 
 version
-    ^ '$Id: FileApplicationNoteBook.st 7963 2012-04-03 12:32:03Z vranyj1 $'
+    ^ '$Id: FileApplicationNoteBook.st 7972 2012-04-05 17:53:51Z vranyj1 $'
 !
 
 version_CVS
@@ -6722,5 +6723,5 @@
 !
 
 version_SVN
-    ^ '$Id: FileApplicationNoteBook.st 7963 2012-04-03 12:32:03Z vranyj1 $'
+    ^ '$Id: FileApplicationNoteBook.st 7972 2012-04-05 17:53:51Z vranyj1 $'
 ! !
--- a/FileBrowserV2SettingsDialog.st	Thu Apr 05 13:51:06 2012 +0100
+++ b/FileBrowserV2SettingsDialog.st	Thu Apr 05 18:53:51 2012 +0100
@@ -329,9 +329,13 @@
 !FileBrowserV2SettingsDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsDialog.st,v 1.11 2010/10/15 08:31:37 cg Exp $'
+    ^ '$Id: FileBrowserV2SettingsDialog.st 7972 2012-04-05 17:53:51Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsDialog.st,v 1.11 2010/10/15 08:31:37 cg Exp §'
+!
+
+version_SVN
+    ^ '$Id:: FileBrowserV2SettingsDialog.st 7972 2012-04-05 17:53:51Z vranyj1                                                       $'
 ! !
--- a/Make.proto	Thu Apr 05 13:51:06 2012 +0100
+++ b/Make.proto	Thu Apr 05 18:53:51 2012 +0100
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-04-04 17:26:20.750.
+# automagically generated from the projectDefinition: stx_libtool at 2012-04-05 18:54:39.209.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -243,7 +243,7 @@
 $(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/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) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(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/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/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
 $(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)/stx/libtool/CodeGeneratorTool.$(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)
@@ -299,7 +299,7 @@
 $(OUTDIR)Tools__ImplementingClassList.$(O) Tools__ImplementingClassList.$(H): Tools__ImplementingClassList.st $(INCLUDE_TOP)/stx/libtool/Tools__MethodList.$(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__ImplementingMethodList.$(O) Tools__ImplementingMethodList.$(H): Tools__ImplementingMethodList.st $(INCLUDE_TOP)/stx/libtool/Tools__MethodList.$(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__NamespaceFilter.$(O) Tools__NamespaceFilter.$(H): Tools__NamespaceFilter.st $(INCLUDE_TOP)/stx/libtool/Tools__NamespaceList.$(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__TestRunner2.$(O) Tools__TestRunner2.$(H): Tools__TestRunner2.st $(INCLUDE_TOP)/stx/libtool/Tools__AbstractTestRunner.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(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/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)Tools__TestRunner2.$(O) Tools__TestRunner2.$(H): Tools__TestRunner2.st $(INCLUDE_TOP)/stx/libtool/Tools__AbstractTestRunner.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__ClassList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(STCHDR)
 $(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)
--- a/Make.spec	Thu Apr 05 13:51:06 2012 +0100
+++ b/Make.spec	Thu Apr 05 18:53:51 2012 +0100
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-04-04 17:26:18.438.
+# automagically generated from the projectDefinition: stx_libtool at 2012-04-05 18:54:37.064.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/Tools__BrowserList.st	Thu Apr 05 13:51:06 2012 +0100
+++ b/Tools__BrowserList.st	Thu Apr 05 18:53:51 2012 +0100
@@ -1552,7 +1552,14 @@
     aView == searchField ifTrue:[
         key == #Escape ifTrue:[self stopSearch].
         key == #Accept ifTrue:[self stopSearch].
-        key == #Return ifTrue:[self stopSearch].
+        key == #Return ifTrue:[
+            self stopSearch.
+            "If list is in extended combo box (such as Namespace popup in NewSystemBrowser,
+             then also forward the keu to the list, so combobox will eventually close"
+            (listView topView class ==  ExtendedComboBox::MenuWrapper) ifTrue:[
+                listView keyPress:key x:x y:y.
+            ]
+        ].
         (key == #CursorUp or:[key == #CursorDown]) ifTrue:[
             listView sensor setCtrlDown: false.
             listView sensor setShiftDown: false.
@@ -1781,6 +1788,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__BrowserList.st 7952 2012-03-21 17:50:14Z vranyj1 $'
+    ^ '$Id: Tools__BrowserList.st 7972 2012-04-05 17:53:51Z vranyj1 $'
 ! !
-
--- a/Tools__CodeView2.st	Thu Apr 05 13:51:06 2012 +0100
+++ b/Tools__CodeView2.st	Thu Apr 05 18:53:51 2012 +0100
@@ -2144,6 +2144,12 @@
         self invalidate.
     ].
 
+    changedObject == codeView currentBlockNodeHolder ifTrue:[
+         self invalidate.
+         ^ self.
+    ].
+
+
     "/ changedObject == someOfMyValueHolders ifTrue:[
     "/     self doSomethingApropriate.
     "/     ^ self.
@@ -2151,7 +2157,7 @@
     super update:something with:aParameter from:changedObject
 
     "Modified (format): / 15-07-2011 / 20:14:04 / cg"
-    "Modified: / 07-10-2011 / 19:25:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-04-2012 / 17:47:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CodeView2::GutterView methodsFor:'event handling'!
@@ -2214,6 +2220,8 @@
     codeView := aCodeView2.
     codeView addDependent: self.
     codeView reallyModifiedChannel addDependent: self.
+    codeView currentBlockNodeHolder addDependent: self.
+
     textView := aCodeView2 textView.
     textView addDependent: self.
     self currentBlockNodeHolder: codeView currentBlockNodeHolder.
@@ -2223,7 +2231,7 @@
 
     "Created: / 14-02-2010 / 15:19:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 17-08-2011 / 15:15:55 / cg"
-    "Modified: / 16-02-2012 / 23:11:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-04-2012 / 17:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CodeView2::GutterView methodsFor:'queries'!
@@ -2332,7 +2340,7 @@
 redrawLine:line cleared: cleared
     "redraws specified line. Returns width of drawn object. Color of drawn objects should be taken from lineFont, lineColor"
     
-    |lineString y0 textW requiredW oldFont newFont oldColor newColor|
+    |lineString y0 yOfLine textW requiredW oldFont newFont oldColor newColor|
 
     lineString := self displayedString:line.
     textW := (lineString widthOn:self).
@@ -2344,7 +2352,7 @@
     newFont isNil ifTrue:[ 
         newFont := oldFont.
         newColor := self lineColor:line.
-        newColor ifNotNil:[ self paint:newColor ].
+        newColor notNil ifTrue:[ self paint:newColor ].
     ] ifFalse:[
         self font:newFont. 
     ].
@@ -2353,7 +2361,7 @@
         self font:newFont
     ].
 
-    y0 := (textView yOfLine:line) 
+    y0 := (yOfLine := textView yOfLine:line) 
           + (textView font ascentOn:device)
           - (newFont descentOn:device).
 
@@ -2366,22 +2374,25 @@
         drawLine:line in: self 
         atX: self paddingLeft + (widthAcceptCancel ? 0) y:y0 width: widthAnnotations height: font height
         from:nil to:nil with:self paint and: self backgroundColor.
-
     self 
         displayString:lineString
         x:(self width - textW - self paddingRight - widthDiffInfo)
         y:y0.
-    newFont 
-        ifNotNil:[
-            self font:oldFont.
-            self paint:oldColor
-        ]
-        ifNil:[ newColor ifNotNil:[ self paint:oldColor ]. ].
+    newFont notNil ifTrue:[
+        self font:oldFont.
+        self paint:oldColor
+    ] ifFalse:[ 
+        newColor notNil ifTrue:[ 
+            self paint:oldColor 
+        ]. 
+    ].
+
     ^ requiredW.
 
     "Modified: / 14-12-2009 / 15:30:44 / Jindra <a>"
     "Created: / 17-06-2011 / 14:11:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 16-03-2012 / 11:16:27 / cg"
+    "Modified: / 05-04-2012 / 17:58:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 redrawLinesFrom:start
@@ -3376,7 +3387,7 @@
 !CodeView2 class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__CodeView2.st 7969 2012-04-04 16:35:25Z vranyj1 $'
+    ^ '$Id: Tools__CodeView2.st 7972 2012-04-05 17:53:51Z vranyj1 $'
 !
 
 version_CVS
@@ -3384,7 +3395,7 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeView2.st 7969 2012-04-04 16:35:25Z vranyj1 $'
+    ^ '$Id: Tools__CodeView2.st 7972 2012-04-05 17:53:51Z vranyj1 $'
 ! !
 
 CodeView2 initialize!
--- a/Tools__NewSystemBrowser.st	Thu Apr 05 13:51:06 2012 +0100
+++ b/Tools__NewSystemBrowser.st	Thu Apr 05 18:53:51 2012 +0100
@@ -51880,7 +51880,7 @@
 
 searchCompletionNew: patternString
 
-    | env pattern matches |
+    | env pattern matches relax |
 
     patternString isEmptyOrNil ifTrue:[^#('' #())].
 
@@ -51889,17 +51889,23 @@
     env := Smalltalk at: env.
 
     pattern := StringPattern readFrom: patternString onError: [^#('' #())].
-    matches := OrderedCollection new.
-
-    env keysDo:[:nm|
-        | cls nmWihoutPrefix |
-
-        cls := env at: nm.
-        (cls notNil and:[cls isBehavior]) ifTrue:[
-            (pattern match: (nmWihoutPrefix := cls nameWithoutPrefix)) ifTrue:[
-                matches add: (self searchCompletionEntryForClass: cls)
-            ].
-        ].
+
+
+
+    relax := 1.
+    [ matches isEmptyOrNil and:[relax <= 3] ] whileTrue:[
+        matches := OrderedCollection new.
+        env keysDo:[:nm|
+            | cls nmWihoutPrefix |
+
+            cls := env at: nm.
+            (cls notNil and:[cls isBehavior]) ifTrue:[
+                (pattern match: (nmWihoutPrefix := cls nameWithoutPrefix)) ifTrue:[
+                    matches add: (self searchCompletionEntryForClass: cls)
+                ].
+            ].
+        ].
+        relax := relax + 1.
     ].
 
     matches isEmpty ifTrue:[
@@ -55256,11 +55262,20 @@
 !
 
 doAcceptJavaClassDefinition:theCode
-    "tell the codeView what to do on accept.
+    "Called upon accepting Java Class definition
      Return false, if NOT accepted (i.e. compilation canceled)"
 
+    "Hack for now - when a Java class is changed and accepted, it is recompiled
+     using GroovyCompiler (which effectively turn it into Groovy class)"
+
+    JavaLanguage instance compilerClass == GroovyCompiler ifTrue:[
+        ^self doAcceptGroovyClassDefinition:theCode
+    ].
+
     self warn:'Accept of Java classes is not yet implemented'.
     ^ false
+
+    "Modified: / 05-04-2012 / 11:26:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doAcceptMethod:theCode language: languageOrNil
@@ -56424,7 +56439,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__NewSystemBrowser.st 7969 2012-04-04 16:35:25Z vranyj1 $'
+    ^ '$Id: Tools__NewSystemBrowser.st 7972 2012-04-05 17:53:51Z vranyj1 $'
 !
 
 version_CVS
@@ -56432,7 +56447,7 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__NewSystemBrowser.st 7969 2012-04-04 16:35:25Z vranyj1 $'
+    ^ '$Id: Tools__NewSystemBrowser.st 7972 2012-04-05 17:53:51Z vranyj1 $'
 ! !
 
 NewSystemBrowser initialize!
--- a/XTermView.st	Thu Apr 05 13:51:06 2012 +0100
+++ b/XTermView.st	Thu Apr 05 18:53:51 2012 +0100
@@ -134,12 +134,18 @@
     "But hackish..."
     app := self application.
     app ifNil:[^self].
+    (app class == FileApplicationNoteBook::Terminal) ifTrue:[
+        app doClose.
+        ^self.
+    ].
     #(removeWorkspace "WorkspaceApplication"
-      doCloseApplication "FileBrowserNotebook"
       bufferMenuRemoveCurrentBuffer "NewSystemBrowser"
     ) do:[:closeSelector|
-        (app topApplication respondsTo: closeSelector) ifTrue:
-            [app topApplication perform: closeSelector]].
+        (app topApplication respondsTo: closeSelector) ifTrue: [
+            app topApplication perform: closeSelector.
+            ^self
+        ]
+    ].
 
     "Created: / 06-06-2011 / 10:04:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -350,7 +356,7 @@
 !
 
 version_SVN
-    ^ '$Id: XTermView.st 7963 2012-04-03 12:32:03Z vranyj1 $'
+    ^ '$Id: XTermView.st 7972 2012-04-05 17:53:51Z vranyj1 $'
 ! !
 
 XTermView initialize!
--- a/bc.mak	Thu Apr 05 13:51:06 2012 +0100
+++ b/bc.mak	Thu Apr 05 18:53:51 2012 +0100
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-04-04 17:26:22.060.
+# automagically generated from the projectDefinition: stx_libtool at 2012-04-05 18:54:40.427.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -185,7 +185,7 @@
 $(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\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) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(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\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\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
 $(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)\stx\libtool\CodeGeneratorTool.$(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)
@@ -241,7 +241,7 @@
 $(OUTDIR)Tools__ImplementingClassList.$(O) Tools__ImplementingClassList.$(H): Tools__ImplementingClassList.st $(INCLUDE_TOP)\stx\libtool\Tools__MethodList.$(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__ImplementingMethodList.$(O) Tools__ImplementingMethodList.$(H): Tools__ImplementingMethodList.st $(INCLUDE_TOP)\stx\libtool\Tools__MethodList.$(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__NamespaceFilter.$(O) Tools__NamespaceFilter.$(H): Tools__NamespaceFilter.st $(INCLUDE_TOP)\stx\libtool\Tools__NamespaceList.$(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__TestRunner2.$(O) Tools__TestRunner2.$(H): Tools__TestRunner2.st $(INCLUDE_TOP)\stx\libtool\Tools__AbstractTestRunner.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(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\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)Tools__TestRunner2.$(O) Tools__TestRunner2.$(H): Tools__TestRunner2.st $(INCLUDE_TOP)\stx\libtool\Tools__AbstractTestRunner.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__ClassList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(STCHDR)
 $(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)
--- a/libtool.rc	Thu Apr 05 13:51:06 2012 +0100
+++ b/libtool.rc	Thu Apr 05 18:53:51 2012 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Wed, 04 Apr 2012 16:27:07 GMT\0"
+      VALUE "ProductDate", "Thu, 05 Apr 2012 17:55:02 GMT\0"
     END
 
   END
hg/stx-libtool