- AbstractFileBrowser: added support for ant, hammer as build icon
- NweSystemBrowser - added option to show/hide synthetic methods
--- a/AbstractFileBrowser.st Fri Apr 13 14:15:47 2012 +0100
+++ b/AbstractFileBrowser.st Fri Apr 13 19:16:04 2012 +0100
@@ -3720,6 +3720,12 @@
]
!
+makeCommandHolder
+ ^ self aspectFor:#makeCommandHolder ifAbsent:[ nil asValue ].
+
+ "Created: / 13-04-2012 / 17:01:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
notify:aString
"aString is shown in the lower pane"
@@ -4378,14 +4384,35 @@
can := false.
dir := self currentDirectory.
dir notNil ifTrue:[
+ "/ Check for make
can := (dir asFilename construct:'Makefile') exists.
OperatingSystem isMSWINDOWSlike ifTrue:[
can ifFalse:[
can := (self currentDirectory asFilename construct:'nt.mak') exists.
]
].
+ can ifTrue:[
+ self makeCommandHolder value: 'make'.
+ self canMake value: true.
+ ^ self
+ ].
+
+ "/Check for Apache ant
+ (OperatingSystem canExecuteCommand: 'ant') ifTrue:[
+ can := (dir asFilename construct:'build.xml') exists.
+ can ifTrue:[
+ self makeCommandHolder value: 'ant'.
+ self canMake value: true.
+ ^ self
+ ].
+ ].
+
+ "/Add more here...
+
].
self canMake value:can.
+
+ "Modified: / 13-04-2012 / 17:05:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
updateListAfterDelete:colOfFiles
@@ -6289,17 +6316,31 @@
doMake
|dir cmd|
- cmd := 'make'.
- dir := self theSingleSelectedDirectoryOrNil.
-
- OperatingSystem isMSWINDOWSlike ifTrue:[
- dir notNil ifTrue:[
- (dir construct:'bmake.bat') exists ifTrue:[
- cmd := 'bmake.bat'.
+ cmd := self makeCommandHolder value.
+
+ "Make"
+ cmd = 'make' ifTrue:[
+ dir := self theSingleSelectedDirectoryOrNil.
+ OperatingSystem isMSWINDOWSlike ifTrue:[
+ dir notNil ifTrue:[
+ (dir construct:'bmake.bat') exists ifTrue:[
+ cmd := 'bmake.bat'.
+ ]
]
- ]
- ].
- self executeCommand:cmd.
+ ].
+ self executeCommand:cmd.
+ ^self.
+ ].
+
+ "Apache ant"
+ cmd = 'ant' ifTrue:[
+ self executeCommand:cmd.
+ ^self.
+ ].
+
+ "Add more here..."
+
+ "Modified (comment): / 13-04-2012 / 17:07:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doOpenCBrowser
@@ -9153,7 +9194,7 @@
!AbstractFileBrowser class methodsFor:'documentation'!
version
- ^ '$Id: AbstractFileBrowser.st 7964 2012-04-03 17:37:50Z vranyj1 $'
+ ^ '$Id: AbstractFileBrowser.st 7979 2012-04-13 18:16:04Z vranyj1 $'
!
version_CVS
@@ -9161,5 +9202,5 @@
!
version_SVN
- ^ '$Id: AbstractFileBrowser.st 7964 2012-04-03 17:37:50Z vranyj1 $'
+ ^ '$Id: AbstractFileBrowser.st 7979 2012-04-13 18:16:04Z vranyj1 $'
! !
--- a/FileBrowserV3.st Fri Apr 13 14:15:47 2012 +0100
+++ b/FileBrowserV3.st Fri Apr 13 19:16:04 2012 +0100
@@ -51,12 +51,30 @@
^ super helpSpec addPairsFrom:#(
+#copyFile
+''
+
+#cutFile
+''
+
+#deleteFile
+''
+
#editFile
''
+#fileGotoBookmark
+''
+
+#fileHistory
+''
+
#fileIn
''
+#pasteFile
+''
+
)
! !
@@ -539,11 +557,21 @@
labelImage: (ResourceRetriever ToolbarIconLibrary stxHomeIcon)
)
(MenuItem
+ activeHelpKey: fileGotoBookmark
+ label: 'Bookmarks'
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ submenuChannel: gotoBookmarksMenu
+ labelImage: (ResourceRetriever ToolbarIconLibrary directoryBookmarksIcon)
+ )
+ (MenuItem
activeHelpKey: fileHistory
enabled: enableFileHistory
label: 'File History'
translateLabel: true
isButton: true
+ isVisible: false
submenuChannel: menuFileHistory
labelImage: (ResourceRetriever ToolbarIconLibrary historyIcon)
)
@@ -562,6 +590,50 @@
label: '-'
)
(MenuItem
+ activeHelpKey: cutFile
+ enabled: hasSelection
+ label: 'Cut'
+ itemValue: cutFiles
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary cutFileIcon)
+ )
+ (MenuItem
+ activeHelpKey: copyFile
+ enabled: hasSelection
+ label: 'Copy'
+ itemValue: copyFiles
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary copyFileIcon)
+ )
+ (MenuItem
+ activeHelpKey: pasteFile
+ enabled: canPaste
+ label: 'Paste'
+ itemValue: pasteFiles
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary pasteFileIcon)
+ )
+ (MenuItem
+ activeHelpKey: deleteFile
+ enabled: hasSelection
+ label: 'Delete'
+ itemValue: deleteFiles
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary deleteFileIcon)
+ )
+ (MenuItem
+ label: '-'
+ isVisible: false
+ )
+ (MenuItem
activeHelpKey: editFile
label: 'Edit File'
itemValue: doShowFileContents
@@ -580,14 +652,6 @@
labelImage: (ResourceRetriever ToolbarIconLibrary fileInIcon)
)
(MenuItem
- activeHelpKey: fileIn
- label: 'File In'
- itemValue: fileFileIn
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever ToolbarIconLibrary fileInIcon)
- )
- (MenuItem
activeHelpKey: openChangeBrowser
enabled: hasFileSelection
label: 'Changes Browser'
@@ -615,7 +679,7 @@
itemValue: doMake
translateLabel: true
isButton: true
- labelImage: (ResourceRetriever ToolbarIconLibrary makeIcon)
+ labelImage: (ResourceRetriever ToolbarIconLibrary make24x24Icon3)
)
(MenuItem
activeHelpKey: viewDetails
@@ -712,6 +776,30 @@
!FileBrowserV3 methodsFor:'change & update'!
+update:something with:aParameter from:changedObject
+ "Invoked when an object that I depend upon sends a change notification."
+
+ changedObject == fileEntryFieldHolder ifTrue:[
+ self updateBookmark.
+ ].
+
+ super update:something with:aParameter from:changedObject
+
+ "Modified: / 13-04-2012 / 12:36:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+updateBookmark
+
+ | file bookmark |
+ file := fileEntryFieldHolder value.
+ file notEmptyOrNil ifFalse:[
+ bookmark := Bookmark forFile: file.
+ ].
+ self bookmarkHolder value: bookmark.
+
+ "Created: / 13-04-2012 / 12:37:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
updateToolVisibility
|builder toolBar bookmarkBar infoBar filenameEntryField vPanel topOffset bottomOffset
toolBarVisible bookmarkBarVisible filenameEntryFieldVisible infoBarVisible d|
@@ -763,5 +851,5 @@
!FileBrowserV3 class methodsFor:'documentation'!
version_SVN
- ^ '$Id: FileBrowserV3.st 7969 2012-04-04 16:35:25Z vranyj1 $'
+ ^ '$Id: FileBrowserV3.st 7979 2012-04-13 18:16:04Z vranyj1 $'
! !
--- a/Make.proto Fri Apr 13 14:15:47 2012 +0100
+++ b/Make.proto Fri Apr 13 19:16:04 2012 +0100
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-04-11 17:13:16.362.
+# automagically generated from the projectDefinition: stx_libtool.
#
# 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/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(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) $(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)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)
--- a/Make.spec Fri Apr 13 14:15:47 2012 +0100
+++ b/Make.spec Fri Apr 13 19:16:04 2012 +0100
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-04-11 17:13:15.290.
+# automagically generated from the projectDefinition: stx_libtool.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/Tools__MethodList.st Fri Apr 13 14:15:47 2012 +0100
+++ b/Tools__MethodList.st Fri Apr 13 19:16:04 2012 +0100
@@ -13,14 +13,14 @@
"{ NameSpace: Tools }"
-Tools::BrowserList subclass:#MethodList
+BrowserList subclass:#MethodList
instanceVariableNames:'classes selectedMethodNameIndices methodList lastSelectedMethods
browserNameList variableFilter filterClassVars updateProcess
lastShowClass lastShowCategory lastShowClassFirst
showMethodInheritance lastMethodClass lastMethodClassesSubclasses
classAndSelectorsRedefinedBySubclassesOfClass showClass
showMethodComplexity showMethodTypeIcon
- showImageResourceMethodsImages'
+ showImageResourceMethodsImages showSyntheticMethods'
classVariableNames:'ShowComplexityValue'
poolDictionaries:''
category:'Interface-Browsers-New'
@@ -176,8 +176,10 @@
#sortBy
#updateTrigger
#variableFilter
+ #showSyntheticMethods
).
+ "Modified: / 13-04-2012 / 16:11:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MethodList methodsFor:'aspects'!
@@ -315,6 +317,28 @@
].
!
+showSyntheticMethods
+ showSyntheticMethods isNil ifTrue:[
+ showSyntheticMethods := false asValue.
+ showSyntheticMethods addDependent:self
+ ].
+ ^ showSyntheticMethods
+
+ "Created: / 13-04-2012 / 16:03:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+showSyntheticMethods:aValueHolder
+ showSyntheticMethods notNil ifTrue:[
+ showSyntheticMethods removeDependent:self
+ ].
+ showSyntheticMethods := aValueHolder.
+ showSyntheticMethods notNil ifTrue:[
+ showSyntheticMethods addDependent:self
+ ].
+
+ "Created: / 13-04-2012 / 16:03:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
variableFilter
variableFilter isNil ifTrue:[
variableFilter := nil asValue.
@@ -603,7 +627,8 @@
(changedObject == variableFilter
or:[changedObject == filterClassVars
or:[changedObject == showMethodInheritance
- or:[changedObject == showMethodComplexity]]]) ifTrue:[
+ or:[changedObject == showMethodComplexity
+ or:[changedObject == showSyntheticMethods]]]]) ifTrue:[
self invalidateList.
^ self
].
@@ -675,7 +700,7 @@
"Created: / 05-02-2000 / 13:42:14 / cg"
"Modified: / 20-07-2011 / 18:56:23 / cg"
- "Modified: / 22-07-2011 / 18:12:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 13-04-2012 / 16:04:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
selectedMethodsChanged
@@ -936,7 +961,7 @@
generator do:[:cls :cat :sel :mthd |
mthd == aMethod ifTrue:[
- mthd isSynthetic ifFalse:[
+ (mthd isSynthetic not or:[self showSyntheticMethods value]) ifTrue:[
sel notNil ifTrue:[
(packageFilter value isNil
or:[ packageFilter value includes:mthd package ]) ifTrue:[
@@ -950,6 +975,7 @@
^ false
"Created: / 17-08-2011 / 15:03:34 / cg"
+ "Modified: / 13-04-2012 / 17:57:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
listOfMethodNames
@@ -995,7 +1021,9 @@
"/ JV: Filter method through package filter
"/ but not, if it is an extension method and we are showing extensions
(mthd notNil
- and:[ mthd isSynthetic not
+ and:[ (mthd isSynthetic not or:[
+ self showSyntheticMethods value
+ ])
and:[ sel notNil ]]
) ifTrue:[
(packageFilterValue isNil
@@ -1209,9 +1237,9 @@
^ newNameList.
"Created: / 05-02-2000 / 22:43:40 / cg"
- "Modified: / 20-07-2010 / 11:21:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 24-08-2010 / 20:34:09 / Jan Vrany <enter your email here>"
"Modified: / 07-09-2011 / 09:33:30 / cg"
+ "Modified: / 13-04-2012 / 17:55:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
makeDependent
@@ -1689,6 +1717,11 @@
redefIcon := self redefinedOrInheritedIconFor:aMethod.
].
+ "JV@2012-04-13: Show all synthetic methods in gray"
+ aMethod isSynthetic ifTrue:[
+ s := s colorizeAllWith: Color gray.
+ ].
+
(icn notNil or:[redefIcon notNil]) ifTrue:[
"/eXept version
"/l := LabelAndIcon icon:redefIcon string:s.
@@ -1704,8 +1737,8 @@
"Created: / 22-10-1996 / 19:51:00 / cg"
"Modified: / 15-08-2009 / 13:13:32 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 17-11-2011 / 20:51:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 07-03-2012 / 19:06:09 / cg"
+ "Modified: / 13-04-2012 / 18:17:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MethodList methodsFor:'private-watching'!
@@ -1755,7 +1788,7 @@
!MethodList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.62 2012/03/07 18:06:39 cg Exp $'
+ ^ '$Id: Tools__MethodList.st 7979 2012-04-13 18:16:04Z vranyj1 $'
!
version_CVS
@@ -1763,5 +1796,5 @@
!
version_SVN
- ^ '$Id: Tools__MethodList.st 7978 2012-04-13 13:15:47Z vranyj1 $'
+ ^ '$Id: Tools__MethodList.st 7979 2012-04-13 18:16:04Z vranyj1 $'
! !
--- a/Tools__NavigatorCanvas.st Fri Apr 13 14:15:47 2012 +0100
+++ b/Tools__NavigatorCanvas.st Fri Apr 13 19:16:04 2012 +0100
@@ -148,6 +148,11 @@
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #methodVisibilityHolder
#aspect: #methodVisibilityHolder
@@ -222,6 +227,7 @@
)
"Modified: / 20-07-2011 / 14:19:31 / cg"
+ "Modified: / 13-04-2012 / 16:14:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
categoryAndSingleClassOnlySpec
@@ -334,6 +340,11 @@
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #methodVisibilityHolder
#aspect: #methodVisibilityHolder
@@ -404,6 +415,7 @@
)
"Modified: / 20-07-2011 / 14:19:38 / cg"
+ "Modified: / 13-04-2012 / 16:14:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
fullBrowserSpec
@@ -723,6 +735,10 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
#(#SubChannelInfoSpec
#subAspect: #showCoverageInformation
#aspect: #showCoverageInformation
@@ -751,6 +767,7 @@
"Created: / 11-03-2010 / 08:41:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 20-07-2011 / 14:20:41 / cg"
+ "Modified: / 13-04-2012 / 16:17:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
fullBrowserSpecWithEmbeddedTestRunner
@@ -1310,6 +1327,11 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -1345,6 +1367,7 @@
)
"Modified: / 04-07-2011 / 18:35:49 / cg"
+ "Modified: / 13-04-2012 / 16:17:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
multipleClassBrowserSpec
@@ -1642,6 +1665,11 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -1665,6 +1693,7 @@
)
"Modified: / 04-07-2011 / 18:36:29 / cg"
+ "Modified: / 13-04-2012 / 16:16:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
multipleClassDiffBrowserSpec
@@ -2119,6 +2148,11 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -2142,6 +2176,7 @@
)
"Modified: / 04-07-2011 / 18:36:44 / cg"
+ "Modified: / 13-04-2012 / 16:16:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
multipleFullProtocolBrowserSpec
@@ -2629,6 +2664,11 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -2652,6 +2692,7 @@
)
"Modified: / 04-07-2011 / 18:36:54 / cg"
+ "Modified: / 13-04-2012 / 16:16:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
multipleNameSpaceFullBrowserSpec
@@ -3063,6 +3104,11 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -3096,6 +3142,7 @@
)
"Modified: / 04-07-2011 / 18:37:01 / cg"
+ "Modified: / 13-04-2012 / 16:16:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
multipleProjectBrowserSpec
@@ -3432,6 +3479,11 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -3455,6 +3507,7 @@
)
"Modified: / 04-07-2011 / 18:37:12 / cg"
+ "Modified: / 13-04-2012 / 16:16:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
multipleProjectFullBrowserSpec
@@ -3875,6 +3928,10 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -3898,6 +3955,7 @@
)
"Modified: / 04-07-2011 / 18:37:24 / cg"
+ "Modified (format): / 13-04-2012 / 16:16:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
multipleProtocolBrowserSpec
@@ -4631,6 +4689,11 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -4663,6 +4726,7 @@
)
"Modified: / 04-07-2011 / 18:37:34 / cg"
+ "Modified: / 13-04-2012 / 16:15:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
singleClassBrowserSpec
@@ -4927,6 +4991,11 @@
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #packageFilter
#aspect: #packageFilter
@@ -4955,6 +5024,7 @@
)
"Modified: / 04-07-2011 / 18:37:41 / cg"
+ "Modified: / 13-04-2012 / 16:15:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
singleFullProtocolBrowserSpec
@@ -5411,6 +5481,11 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -5444,6 +5519,7 @@
)
"Modified: / 04-07-2011 / 18:37:52 / cg"
+ "Modified: / 13-04-2012 / 16:15:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
singleNameSpaceFullBrowserSpec
@@ -5843,6 +5919,11 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -5876,6 +5957,7 @@
)
"Modified: / 04-07-2011 / 18:37:57 / cg"
+ "Modified: / 13-04-2012 / 16:15:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
singleProjectBrowserSpec
@@ -6198,6 +6280,11 @@
#subAspect: #showMethodComplexity
#aspect: #showMethodComplexity
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
#(#SubChannelInfoSpec
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
@@ -6231,6 +6318,7 @@
)
"Modified: / 04-07-2011 / 18:38:02 / cg"
+ "Modified: / 13-04-2012 / 16:15:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
singleProjectFullBrowserSpec
@@ -6634,6 +6722,12 @@
#subAspect: #showMethodTypeIcon
#aspect: #showMethodTypeIcon
)
+ #(SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
+
#(#SubChannelInfoSpec
#subAspect: #packageFilter
#aspect: #packageFilter
@@ -6663,6 +6757,7 @@
)
"Modified: / 04-07-2011 / 18:38:13 / cg"
+ "Modified: / 13-04-2012 / 16:15:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
singleProtocolBrowserSpec
@@ -6838,5 +6933,5 @@
!
version_SVN
- ^ '$Id: Tools__NavigatorCanvas.st 7978 2012-04-13 13:15:47Z vranyj1 $'
+ ^ '$Id: Tools__NavigatorCanvas.st 7979 2012-04-13 18:16:04Z vranyj1 $'
! !
--- a/Tools__NewSystemBrowser.st Fri Apr 13 14:15:47 2012 +0100
+++ b/Tools__NewSystemBrowser.st Fri Apr 13 19:16:04 2012 +0100
@@ -43,7 +43,7 @@
LastImportedPackage LastLintRules NewNavigationHistory
DefaultSortByNameAndInheritance LastLiteralReplacementType
LastLiteralReplacementNewName LastLiteralReplacementOldLiteral
- LastNewProjectType'
+ LastNewProjectType DefaultShowSyntheticMethods'
poolDictionaries:''
category:'Interface-Browsers-New'
!
@@ -3327,7 +3327,12 @@
subAspect: showMethodTypeIcon
aspect: showMethodTypeIcon
)
-
+ (SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
+
+
(SubChannelInfoSpec
subAspect: filterClassVars
aspect: filterClassVars
@@ -3348,6 +3353,7 @@
)
"Modified: / 17-08-2011 / 13:57:39 / cg"
+ "Modified: / 13-04-2012 / 16:13:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
protocolAndMethodListSpec_JustMethodList
@@ -3436,6 +3442,10 @@
subAspect: showMethodComplexity
aspect: showMethodComplexity
)
+ (SubChannelInfoSpec
+ subAspect: showSyntheticMethods
+ aspect: showSyntheticMethods
+ )
(SubChannelInfoSpec
subAspect: showMethodTypeIcon
aspect: showMethodTypeIcon
@@ -3456,6 +3466,7 @@
)
"Modified: / 17-08-2011 / 13:57:59 / cg"
+ "Modified (format): / 13-04-2012 / 18:00:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
searchSpec
@@ -12245,6 +12256,7 @@
"Do not manually edit this!! If it is corrupted,
the MenuEditor may not be able to read the specification."
+
"
MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#viewMenuCommonSlice
(Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser viewMenuCommonSlice)) startUp
@@ -12419,6 +12431,15 @@
label: '-'
)
(MenuItem
+ label: 'Show Synthetic Methods'
+ translateLabel: true
+ hideMenuOnActivated: false
+ indication: showSyntheticMethods
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
label: 'Show Method Inheritance Indicator'
translateLabel: true
hideMenuOnActivated: false
@@ -16085,6 +16106,7 @@
"Modified: / 29-09-2006 / 16:11:08 / cg"
! !
+
!NewSystemBrowser class methodsFor:'menu specs-popup'!
categoryPopUpMenu
@@ -17865,6 +17887,7 @@
"Created: / 24.2.2000 / 23:28:06 / cg"
! !
+
!NewSystemBrowser methodsFor:'aspects-organization'!
categoryMenuVisible
@@ -18698,6 +18721,21 @@
^ holder
!
+showSyntheticMethods
+ |holder|
+
+ (holder := builder bindingAt:#showSyntheticMethods) isNil ifTrue:[
+ holder := (DefaultShowSyntheticMethods ? false) asValue.
+ builder aspectAt:#showSyntheticMethods put: holder.
+ holder onChangeEvaluate:[
+ DefaultShowSyntheticMethods := holder value
+ ].
+ ].
+ ^ holder
+
+ "Created: / 13-04-2012 / 16:07:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
showUnloadedClasses
|holder|
@@ -18805,8 +18843,6 @@
^ self hasClassAndVariableSelectedHolder
!
-
-
canGenerateMultiSetterMethodHolder
^ self hasSingleLoadedClassSelectedAndMultipleVariablesSelectedHolder
!
@@ -21324,6 +21360,7 @@
^ UserPreferences current useSearchBarInBrowser or:[self codeView searchBarActionBlock notNil]
! !
+
!NewSystemBrowser methodsFor:'change & update'!
categorySelectionChanged
@@ -35333,6 +35370,7 @@
"Modified: / 28-02-2012 / 16:27:44 / cg"
! !
+
!NewSystemBrowser methodsFor:'menu actions-namespace'!
nameSpaceMenuCheckOut
@@ -44000,6 +44038,7 @@
"Modified: / 28-02-2012 / 16:48:38 / cg"
! !
+
!NewSystemBrowser methodsFor:'menu actions-variables'!
browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
@@ -48596,10 +48635,10 @@
to scrool to it..."
"hmm...hmm...how implement it in a better, more generic way?"
doUpdateCode := true.
- mthd isJavaMethod ifTrue:[
+ (mthd isJavaMethod and:[mthd isSynthetic not]) ifTrue:[
prevMthd := navigationState lastMethodShownInCodeView.
(prevMthd notNil and:[prevMthd isJavaMethod]) ifTrue:[
- doUpdateCode := mthd javaClass ~~ prevMthd javaClass
+ doUpdateCode := prevMthd isSynthetic or:[mthd javaClass ~~ prevMthd javaClass]
].
].
doUpdateCode ifTrue:[
@@ -48641,7 +48680,7 @@
"Created: / 01-03-2000 / 11:38:57 / cg"
"Modified: / 21-08-2011 / 08:54:33 / cg"
- "Modified: / 17-03-2012 / 16:15:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 13-04-2012 / 18:21:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
showNothing
@@ -51107,6 +51146,7 @@
^ navigationState projectListApplication
! !
+
!NewSystemBrowser methodsFor:'private-history'!
lastSearchPatterns
@@ -56532,7 +56572,7 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1738 2012/04/06 14:00:08 stefan Exp $'
+ ^ '$Id: Tools__NewSystemBrowser.st 7979 2012-04-13 18:16:04Z vranyj1 $'
!
version_CVS
@@ -56540,7 +56580,7 @@
!
version_SVN
- ^ '$Id: Tools__NewSystemBrowser.st 7978 2012-04-13 13:15:47Z vranyj1 $'
+ ^ '$Id: Tools__NewSystemBrowser.st 7979 2012-04-13 18:16:04Z vranyj1 $'
! !
NewSystemBrowser initialize!
--- a/bc.mak Fri Apr 13 14:15:47 2012 +0100
+++ b/bc.mak Fri Apr 13 19:16:04 2012 +0100
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-04-11 17:13:16.938.
+# automagically generated from the projectDefinition: stx_libtool.
#
# 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\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(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) $(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)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)
--- a/libtool.rc Fri Apr 13 14:15:47 2012 +0100
+++ b/libtool.rc Fri Apr 13 19:16:04 2012 +0100
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libtool.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,7964,7964
+ FILEVERSION 6,2,7976,7976
PRODUCTVERSION 6,2,1,1
#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.7964.7964\0"
+ VALUE "FileVersion", "6.2.7976.7976\0"
VALUE "InternalName", "stx:libtool\0"
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, 11 Apr 2012 16:13:30 GMT\0"
+ VALUE "ProductDate", "Fri, 13 Apr 2012 18:14:47 GMT\0"
END
END