# HG changeset patch # User Jan Vrany # Date 1333557325 -3600 # Node ID 413e98858ddc102132ccf7898bee37e899cbecd4 # Parent d134bb6d552587bbfffc591286a7276c3d92a79d - EditFieldWithCompletion changed: #showOptionsWindow - Tools::NewSystemBrowser added: #searchCompletionEntryForClass: changed: #searchCompletionNew: category of: - Tools::CodeView2 changed: #buttonPress:x:y:in: #keyPress:x:y:in: - FileBrowserV3 added: #hideBookmarkBar changed: #bookmarkListHolder - stx_libtool changed: #classNamesAndAttributes #extensionMethodNames #preRequisites - BookmarkList class definition added: #forFileBrowser #forFiles #initializeFileBookmarks - CodeGeneratorTool changed: #executeCollectedChangesNamed: - extensions added: #confirmRefactorings / #confirmRefactorings: diff -r d134bb6d5525 -r 413e98858ddc AbstractSettingsApplication.st --- a/AbstractSettingsApplication.st Wed Apr 04 12:12:00 2012 +0100 +++ b/AbstractSettingsApplication.st Wed Apr 04 17:35:25 2012 +0100 @@ -324,7 +324,7 @@ showEmbeddedTestRunnerInBrowser showBookmarkBar webBrowserLikeLayout sortAndIndentClassesByInheritance showLocalHistory showGlobalHistory useInPlaceSearchInBrowserLists - sourceCodeManagementMenuLayout' + sourceCodeManagementMenuLayout confirmRefactorings' classVariableNames:'' poolDictionaries:'' privateIn:AbstractSettingsApplication @@ -15672,7 +15672,7 @@ label: 'Tool Settings' name: 'Tool Settings' min: (Point 10 10) - bounds: (Rectangle 0 0 613 436) + bounds: (Rectangle 0 0 742 705) ) component: (SpecCollection @@ -15710,49 +15710,49 @@ name: 'ShowAcceptCancelBarInBrowser' model: showAcceptCancelBarInBrowser translateLabel: true - extent: (Point 579 25) + extent: (Point 712 25) ) (CheckBoxSpec label: 'Use the new CodeView2 (experimental)' name: 'UserCodeView2' model: useCodeView2InTools translateLabel: true - extent: (Point 579 25) + extent: (Point 712 25) ) (CheckBoxSpec label: 'Show Search Bar in Browser' name: 'ShowSearchBarInBrowser' model: useSearchBarInBrowser translateLabel: true - extent: (Point 579 25) + extent: (Point 712 25) ) (CheckBoxSpec label: 'Show Method Template' name: 'MethodTemplate' model: showMethodTemplate translateLabel: true - extent: (Point 579 25) + extent: (Point 712 25) ) (CheckBoxSpec label: 'Use the Embedded Test Runner' name: 'UseEmbeddedTestRunner' model: showEmbeddedTestRunnerInBrowser translateLabel: true - extent: (Point 579 25) + extent: (Point 712 25) ) (CheckBoxSpec label: 'Show Bookmarks Bar' name: 'ShowBookmarksBar' model: showBookmarkBar translateLabel: true - extent: (Point 579 25) + extent: (Point 712 25) ) (CheckBoxSpec label: 'Sort and Indent Classes by Inheritance' name: 'SortAndIndentClassesByInheritance' model: sortAndIndentClassesByInheritance translateLabel: true - extent: (Point 579 25) + extent: (Point 712 25) ) (CheckBoxSpec label: 'Web Browser Like Layout (Toolbars are Part of the Tab - EXPERIMENTAL)' @@ -15767,21 +15767,28 @@ name: 'CheckBox2' model: showLocalHistory translateLabel: true - extent: (Point 579 25) + extent: (Point 712 25) ) (CheckBoxSpec label: 'Show Global Navigation History (Global History for all Browser Windows)' name: 'CheckBox3' model: showGlobalHistory translateLabel: true - extent: (Point 579 25) + extent: (Point 712 25) ) (CheckBoxSpec label: 'Use In-place Search In Browser Lists (experimental)' name: 'CheckBox4' model: useInPlaceSearchInBrowserLists translateLabel: true - extent: (Point 579 22) + extent: (Point 712 22) + ) + (CheckBoxSpec + label: 'Confirm Refactorings (experimental)' + name: 'CheckBox5' + model: confirmRefactorings + translateLabel: true + extent: (Point 712 22) ) ) @@ -15790,7 +15797,7 @@ ) ) - extent: (Point 607 321) + extent: (Point 607 340) useDynamicPreferredHeight: true ) (FramedBoxSpec @@ -15818,7 +15825,7 @@ model: sourceCodeManagementMenuLayout isTriggerOnDown: true select: 'old' - extent: (Point 579 22) + extent: (Point 712 22) ) (RadioButtonSpec label: 'Inline (experimental)' @@ -15827,7 +15834,7 @@ model: sourceCodeManagementMenuLayout isTriggerOnDown: true select: 'inline' - extent: (Point 579 22) + extent: (Point 712 22) ) (RadioButtonSpec label: 'Compact (experimental)' @@ -15836,7 +15843,7 @@ model: sourceCodeManagementMenuLayout isTriggerOnDown: true select: 'compact' - extent: (Point 579 22) + extent: (Point 712 22) ) ) @@ -15845,7 +15852,7 @@ ) ) - extent: (Point 613 108) + extent: (Point 742 108) ) ) @@ -15873,9 +15880,11 @@ showLocalHistory useInPlaceSearchInBrowserLists sourceCodeManagementMenuLayout + confirmRefactorings ) "Created: / 25-11-2011 / 15:09:28 / cg" + "Modified: / 04-04-2012 / 14:03:43 / Jan Vrany " ! basicReadSettings @@ -15898,6 +15907,17 @@ !AbstractSettingsApplication::SystemBrowserSettingsAppl methodsFor:'aspects'! +confirmRefactorings + + confirmRefactorings isNil ifTrue:[ + confirmRefactorings := false asValue. + confirmRefactorings onChangeSend:#updateModifiedChannel to:self + ]. + ^ confirmRefactorings. + + "Created: / 07-06-2011 / 14:34:25 / Jan Vrany " +! + showAcceptCancelBarInBrowser showAcceptCancelBarInBrowser isNil ifTrue:[ showAcceptCancelBarInBrowser := false asValue. @@ -17714,7 +17734,7 @@ !AbstractSettingsApplication class methodsFor:'documentation'! version - ^ '$Id: AbstractSettingsApplication.st 7963 2012-04-03 12:32:03Z vranyj1 $' + ^ '$Id: AbstractSettingsApplication.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! version_CVS @@ -17722,5 +17742,5 @@ ! version_SVN - ^ '$Id: AbstractSettingsApplication.st 7963 2012-04-03 12:32:03Z vranyj1 $' -! ! + ^ '$Id: AbstractSettingsApplication.st 7969 2012-04-04 16:35:25Z vranyj1 $' +! ! diff -r d134bb6d5525 -r 413e98858ddc BookmarkList.st --- a/BookmarkList.st Wed Apr 04 12:12:00 2012 +0100 +++ b/BookmarkList.st Wed Apr 04 17:35:25 2012 +0100 @@ -27,7 +27,7 @@ HierarchicalList subclass:#BookmarkList instanceVariableNames:'fileName' - classVariableNames:'BrowserBookmarks WorkspaceBookmarks WebBookmarks' + classVariableNames:'BrowserBookmarks WorkspaceBookmarks WebBookmarks FileBookmarks' poolDictionaries:'' category:'Interface-Bookmarks' ! @@ -127,6 +127,15 @@ !BookmarkList class methodsFor:'accessing'! +forFileBrowser + FileBookmarks isNil ifTrue:[ + self initializeFileBookmarks + ]. + ^ FileBookmarks + + "Created: / 04-04-2012 / 12:04:31 / Jan Vrany " +! + forSystemBrowser BrowserBookmarks isNil ifTrue: @@ -190,6 +199,22 @@ "Modified: / 29-11-2011 / 11:21:06 / cg" ! +initializeFileBookmarks + + | file | + file := Filename defaultDirectory / 'file-bookmarks.rc'. + FileBookmarks := self readFromFile: file onError:[nil]. + FileBookmarks notNil ifTrue:[^self]. + + file := Filename homeDirectory / '.smalltalk' / 'file-bookmarks.rc'. + FileBookmarks := self readFromFile: file onError:[nil]. + FileBookmarks notNil ifTrue:[^self]. + + FileBookmarks := self new fileName: file pathName. + + "Created: / 04-04-2012 / 12:05:18 / Jan Vrany " +! + initializeWebBookmarks | file | @@ -385,5 +410,5 @@ ! version_SVN - ^ '$Id: BookmarkList.st 7854 2012-01-30 17:49:41Z vranyj1 $' + ^ '$Id: BookmarkList.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! ! diff -r d134bb6d5525 -r 413e98858ddc CodeGeneratorTool.st --- a/CodeGeneratorTool.st Wed Apr 04 12:12:00 2012 +0100 +++ b/CodeGeneratorTool.st Wed Apr 04 17:35:25 2012 +0100 @@ -852,8 +852,6 @@ it might be better to let the generator decide (for example, if it does high-impact changes, as opposed to simple ones)" - | changes | - compositeChangeCollector notNil ifTrue:[ compositeChangeNesting := compositeChangeNesting - 1. compositeChangeNesting == 0 ifTrue:[ @@ -861,20 +859,17 @@ compositeChangeCollector changesSize == 0 ifTrue:[ self information:'Nothing generated.'. ] ifFalse:[ - (compositeChangeCollector shouldBeConfimed and:[self confirmChanges]) - ifFalse: [ - RefactoryChangeManager instance performChange: compositeChangeCollector - ] ifTrue: [ - changes := Tools::ChangeSetBrowser2 confirmChanges:(ChangeSet with:compositeChangeCollector). - changes do:[:chg | RefactoryChangeManager instance performChange: chg]. - ]. + "JV@2012-04-04: Here used to be a code for confirming changes. + The has moved to RefactoryChangeManager so all refactorings + are also subject to confirmation (is enabled in UserPreferences)" + RefactoryChangeManager instance performChange: compositeChangeCollector ]. compositeChangeCollector := nil. ] ] - "Modified: / 08-07-2011 / 11:03:25 / Jan Vrany " "Modified (comment): / 04-08-2011 / 17:30:27 / cg" + "Modified (format): / 04-04-2012 / 16:35:37 / Jan Vrany " ! startCollectChanges @@ -1685,7 +1680,7 @@ !CodeGeneratorTool class methodsFor:'documentation'! version - ^ '$Id: CodeGeneratorTool.st 7854 2012-01-30 17:49:41Z vranyj1 $' + ^ '$Id: CodeGeneratorTool.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! version_CVS @@ -1693,5 +1688,5 @@ ! version_SVN - ^ '$Id: CodeGeneratorTool.st 7854 2012-01-30 17:49:41Z vranyj1 $' + ^ '$Id: CodeGeneratorTool.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! ! diff -r d134bb6d5525 -r 413e98858ddc EditFieldWithCompletion.st --- a/EditFieldWithCompletion.st Wed Apr 04 12:12:00 2012 +0100 +++ b/EditFieldWithCompletion.st Wed Apr 04 17:35:25 2012 +0100 @@ -343,6 +343,8 @@ showOptionsWindow + | x y w | + showOptions ifFalse:[^ self]. optionsWindow notNil ifTrue:[ ^ self ]. @@ -360,14 +362,19 @@ highlightMode: #line; font:self font; backgroundColor:self backgroundColor; - delegate: self. + delegate: self; + yourself. + + x := self absoluteLeft + 5" - optionsView textStartLeft". + y := self absoluteTop + self height + 1 + 5. + w := (width * 2) + 0"((optionsView textStartLeft) * 2)". optionsWindow := StandardSystemView new bePopUpView; beSlave; - origin:(self absoluteLeft + 5" - optionsView textStartLeft") - @ (self absoluteTop + self height + 1 + 5) - extent:(width + 0"((optionsView textStartLeft) * 2)") @ (fontHeight * 10). + origin:x @ y + extent:(w min: (Screen current width - x)) @ (fontHeight * 10); + yourself. ScrollableView forView:optionsView @@ -384,8 +391,8 @@ "Created: / 09-08-2009 / 08:12:21 / Jan Vrany " "Modified: / 09-08-2009 / 09:28:47 / Jan Vrany " - "Modified: / 09-12-2010 / 22:05:46 / Jan Vrany " "Modified: / 29-11-2011 / 11:27:13 / cg" + "Modified: / 04-04-2012 / 13:08:45 / Jan Vrany " ! startCompletion @@ -403,5 +410,5 @@ ! version_SVN - ^ '$Id: EditFieldWithCompletion.st 7961 2012-03-31 00:16:30Z vranyj1 $' + ^ '$Id: EditFieldWithCompletion.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! ! diff -r d134bb6d5525 -r 413e98858ddc FileBrowserV3.st --- a/FileBrowserV3.st Wed Apr 04 12:12:00 2012 +0100 +++ b/FileBrowserV3.st Wed Apr 04 17:35:25 2012 +0100 @@ -652,6 +652,15 @@ ) ! ! +!FileBrowserV3 methodsFor:'actions'! + +hideBookmarkBar + + self bookmarkBarVisibleHolder value + + "Created: / 04-04-2012 / 12:08:18 / Jan Vrany " +! ! + !FileBrowserV3 methodsFor:'aspects'! bookmarkBarVisibleHolder @@ -696,7 +705,7 @@ bookmarkListHolder - ^BookmarkList forWebBrowser + ^BookmarkList forFileBrowser "Created: / 08-06-2011 / 12:16:38 / Jan Vrany " ! ! @@ -754,5 +763,5 @@ !FileBrowserV3 class methodsFor:'documentation'! version_SVN - ^ '$Id: FileBrowserV3.st 7965 2012-04-04 00:09:32Z vranyj1 $' + ^ '$Id: FileBrowserV3.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! ! diff -r d134bb6d5525 -r 413e98858ddc Make.proto --- a/Make.proto Wed Apr 04 12:12:00 2012 +0100 +++ b/Make.proto Wed Apr 04 17:35:25 2012 +0100 @@ -1,7 +1,7 @@ # $Header$ # # DO NOT EDIT -# automagically generated from the projectDefinition: stx_libtool at 2012-04-04 01:09:23.804. +# automagically generated from the projectDefinition: stx_libtool at 2012-04-04 17:26:20.750. # # 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/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)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)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/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__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__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) diff -r d134bb6d5525 -r 413e98858ddc Make.spec --- a/Make.spec Wed Apr 04 12:12:00 2012 +0100 +++ b/Make.spec Wed Apr 04 17:35:25 2012 +0100 @@ -1,7 +1,7 @@ # $Header$ # # DO NOT EDIT -# automagically generated from the projectDefinition: stx_libtool at 2012-04-04 01:09:22.570. +# automagically generated from the projectDefinition: stx_libtool at 2012-04-04 17:26:18.438. # # Warning: once you modify this file, do not rerun # stmkmp or projectDefinition-build again - otherwise, your changes are lost. diff -r d134bb6d5525 -r 413e98858ddc Tools__CodeView2.st --- a/Tools__CodeView2.st Wed Apr 04 12:12:00 2012 +0100 +++ b/Tools__CodeView2.st Wed Apr 04 17:35:25 2012 +0100 @@ -1216,18 +1216,19 @@ buttonPress: button x:x y:y in: view "Delegates events to services. Answers true iff at least one service handler method returns true. In that case, - the event is is NOT processes by the view." - - ^ services - inject: false - into:[:processed :service| - service isEnabled - ifFalse: [processed] - ifTrue: [processed | ((service buttonPress: button x:x y:y in: view) == true)]]. - - "Modified: / 07-03-2010 / 13:53:47 / Jan Vrany " + the event is is NOT passed to the rest of services AND it is NOT + processes by the view." + + services do:[:service| + (service isEnabled and:[(service buttonPress: button x:x y:y in: view) == true]) ifTrue:[ + ^true + ] + ]. + ^false + "Modified: / 06-10-2011 / 14:14:00 / cg" "Modified (format): / 05-03-2012 / 08:56:02 / cg" + "Modified: / 04-04-2012 / 12:42:46 / Jan Vrany " ! keyPress: key x:x y:y in: view @@ -1355,11 +1356,7 @@ "Created: / 06-07-2011 / 17:12:58 / jv" "Modified: / 06-10-2011 / 14:13:44 / cg" -! - - - - ! +! ! !CodeView2 methodsFor:'diff mode'! @@ -2741,8 +2738,6 @@ "Modified: / 17-03-2012 / 10:04:49 / Jan Vrany " ! - - redrawLines |i pom| @@ -3333,8 +3328,6 @@ !CodeView2::TextView methodsFor:'scrolling'! - - basicScrollTo:anOrigin redraw:doRedraw super scrollTo:anOrigin redraw:doRedraw @@ -3343,8 +3336,6 @@ "Created: / 19-03-2012 / 17:01:36 / Jan Vrany " ! - - originChanged:delta super originChanged:delta. @@ -3354,8 +3345,6 @@ "Created: / 07-12-2009 / 21:50:49 / Jindra " ! - - scrollTo:anOrigin redraw:doRedraw codeView scrollTo:anOrigin redraw:doRedraw in: self. @@ -3364,9 +3353,7 @@ "Modified: / 06-04-2010 / 14:04:28 / Jakub " "Modified: / 17-03-2012 / 10:06:10 / Jan Vrany " "Created: / 19-03-2012 / 17:05:22 / Jan Vrany " -! - - ! +! ! !CodeView2::TextView methodsFor:'undo & again'! @@ -3389,7 +3376,7 @@ !CodeView2 class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.57 2012/03/16 13:36:10 stefan Exp $' + ^ '$Id: Tools__CodeView2.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! version_CVS @@ -3397,7 +3384,7 @@ ! version_SVN - ^ '$Id: Tools__CodeView2.st 7952 2012-03-21 17:50:14Z vranyj1 $' + ^ '$Id: Tools__CodeView2.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! ! CodeView2 initialize! diff -r d134bb6d5525 -r 413e98858ddc Tools__NewSystemBrowser.st --- a/Tools__NewSystemBrowser.st Wed Apr 04 12:12:00 2012 +0100 +++ b/Tools__NewSystemBrowser.st Wed Apr 04 17:35:25 2012 +0100 @@ -48,6 +48,13 @@ category:'Interface-Browsers-New' ! +Object subclass:#ClassCompletionEntry + instanceVariableNames:'klass' + classVariableNames:'' + poolDictionaries:'' + privateIn:NewSystemBrowser +! + !NewSystemBrowser class methodsFor:'documentation'! aboutThisApplicationText @@ -27653,41 +27660,6 @@ self codeAspect:#newError. ! -classMenuNewGroovyClass - - | currentClass superClass code category | - JavaVM booted ifFalse:[JavaVM boot]. - - currentClass := self theSingleSelectedClass. - currentClass notNil ifTrue:[ - superClass := currentClass theNonMetaclass superclass. - superClass notNil ifTrue:[ - superClass isJavaClass ifFalse:[ - superClass := Java classForName:'java.lang.Object'. - ] - ] - ] ifFalse:[ - superClass := Java classForName:'java.lang.Object'. - ]. - - category := self hasCategorySelected - ifTrue:[self selectedCategoriesValue first] - ifFalse:[Compiler defaultMethodCategory]. "/ '* As yet uncategorized *' - - - code := GroovyLanguage instance - classTemplateFor: superClass - in: category - asNamespace: false - private: false. - - self showCode: code. - self setAcceptAction: [:theCode | self doAcceptGroovyClassDefinition: theCode asString ]. - self codeAspect:#newClassDefinition. - - "Created: / 18-02-2012 / 17:16:57 / Jan Vrany " -! - classMenuNewHaskellModule self classMenuNewClass:HaskellModule ! @@ -51899,6 +51871,13 @@ "Created: / 04-12-2011 / 22:11:28 / Jan Vrany " ! +searchCompletionEntryForClass: aClass + + ^ClassCompletionEntry new klass: aClass + + "Created: / 04-04-2012 / 12:58:56 / Jan Vrany " +! + searchCompletionNew: patternString | env pattern matches | @@ -51918,7 +51897,7 @@ cls := env at: nm. (cls notNil and:[cls isBehavior]) ifTrue:[ (pattern match: (nmWihoutPrefix := cls nameWithoutPrefix)) ifTrue:[ - matches add: nmWihoutPrefix + matches add: (self searchCompletionEntryForClass: cls) ]. ]. ]. @@ -56396,10 +56375,56 @@ "Modified (format): / 29-11-2011 / 14:49:08 / cg" ! ! +!NewSystemBrowser::ClassCompletionEntry methodsFor:'accessing'! + +klass + ^ klass +! + +klass:something + klass := something. +! ! + +!NewSystemBrowser::ClassCompletionEntry methodsFor:'converting'! + +asString + + ^klass name + + "Created: / 04-04-2012 / 13:00:58 / Jan Vrany " +! ! + +!NewSystemBrowser::ClassCompletionEntry methodsFor:'displaying'! + +displayOn:aGC x:x y:y opaque:opaque + + | name namespace lw cnw fg | + + name := klass nameWithoutPrefix. + namespace := klass nameSpace name. + + name displayOn:aGC x:x y:y opaque:opaque. + + namespace ~~ #Smalltalk ifTrue:[ + namespace := 'in ', namespace. + lw := x + 16 + (name widthOn: aGC). + cnw := aGC widthOfString: namespace. + + (aGC width > (lw + cnw + 5)) ifTrue:[ + fg := aGC paint. + aGC paint: (Color gray: 40). + namespace displayOn:aGC x: aGC width - cnw - 5 y:y opaque:opaque. + aGC paint: fg. + ] + ] + + "Created: / 04-04-2012 / 13:03:22 / Jan Vrany " +! ! + !NewSystemBrowser class methodsFor:'documentation'! version - ^ '$Id: Tools__NewSystemBrowser.st 7966 2012-04-04 09:30:46Z vranyj1 $' + ^ '$Id: Tools__NewSystemBrowser.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! version_CVS @@ -56407,7 +56432,7 @@ ! version_SVN - ^ '$Id: Tools__NewSystemBrowser.st 7966 2012-04-04 09:30:46Z vranyj1 $' + ^ '$Id: Tools__NewSystemBrowser.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! ! NewSystemBrowser initialize! diff -r d134bb6d5525 -r 413e98858ddc bc.mak --- a/bc.mak Wed Apr 04 12:12:00 2012 +0100 +++ b/bc.mak Wed Apr 04 17:35:25 2012 +0100 @@ -1,7 +1,7 @@ # $Header$ # # DO NOT EDIT -# automagically generated from the projectDefinition: stx_libtool at 2012-04-04 01:09:24.569. +# automagically generated from the projectDefinition: stx_libtool at 2012-04-04 17:26:22.060. # # 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\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)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)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\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__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__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) diff -r d134bb6d5525 -r 413e98858ddc extensions.st --- a/extensions.st Wed Apr 04 12:12:00 2012 +0100 +++ b/extensions.st Wed Apr 04 17:35:25 2012 +0100 @@ -1542,6 +1542,48 @@ "Created: / 10-10-2011 / 16:40:51 / Jan Vrany " ! ! +!UserPreferences methodsFor:'accessing-prefs-browser'! + +confirmRefactorings + "If set, each refactoring must be confirmed before accepted. + A programmer may select which changes to apply and which not + and/or alter the change. + + See RefactoryChange>>shouldBeConfirmed + " + + ^ self at:#confirmRefactorings ifAbsent:[false]. + + " + UserPreferences current confirmRefactorings + UserPreferences current confirmRefactorings:true + UserPreferences current confirmRefactorings:false + " + + "Created: / 04-04-2012 / 14:02:17 / Jan Vrany " +! ! + +!UserPreferences methodsFor:'accessing-prefs-browser'! + +confirmRefactorings:aBoolean + "If set, each refactoring must be confirmed before accepted. + A programmer may select which changes to apply and which not + and/or alter the change. + + See RefactoryChange>>shouldBeConfirmed + " + + ^ self at:#confirmRefactorings put:aBoolean + + " + UserPreferences current confirmRefactorings + UserPreferences current confirmRefactorings:true + UserPreferences current confirmRefactorings:false + " + + "Created: / 04-04-2012 / 14:02:01 / Jan Vrany " +! ! + !UserPreferences methodsFor:'accessing-pref''d tools'! fileBrowserClass @@ -2027,5 +2069,5 @@ !stx_libtool class methodsFor:'documentation'! extensionsVersion_SVN - ^ '$Id:: extensions.st 7964 2012-04-03 17:37:50Z vranyj1 $' + ^ '$Id:: extensions.st 7969 2012-04-04 16:35:25Z vranyj1 $' ! ! \ No newline at end of file diff -r d134bb6d5525 -r 413e98858ddc libtool.rc --- a/libtool.rc Wed Apr 04 12:12:00 2012 +0100 +++ b/libtool.rc Wed Apr 04 17:35:25 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 00:09:46 GMT\0" + VALUE "ProductDate", "Wed, 04 Apr 2012 16:27:07 GMT\0" END END