hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:5c129972b1fd
+:5568874ba4cf
 		LastBaseVersionTag DefaultShowPseudoProtocols
 		DefaultShowMultitabMode LastRenamedOld LastRenamedNew
 		LastImportedPackage LastLintRules NewNavigationHistory
 		DefaultSortByNameAndInheritance LastLiteralReplacementType
 		LastLiteralReplacementNewName LastLiteralReplacementOldLiteral
-		LastNewProjectType'
+		LastNewProjectType DefaultShowSyntheticMethods'
 	poolDictionaries:''
 	category:'Interface-Browsers-New'
 !
 Object subclass:#ClassCompletionEntry
 )
 (SubChannelInfoSpec
 subAspect: showMethodTypeIcon
 aspect: showMethodTypeIcon
 )
+(SubChannelInfoSpec
+subAspect: showSyntheticMethods
+aspect: showSyntheticMethods
+)
 (SubChannelInfoSpec
 subAspect: filterClassVars
 aspect: filterClassVars
 )
 )
 )
 )
 "Modified: / 17-08-2011 / 13:57:39 / cg"
+"Modified: / 13-04-2012 / 16:13:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 protocolAndMethodListSpec_JustMethodList
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 (SubChannelInfoSpec
 subAspect: showMethodComplexity
 aspect: showMethodComplexity
 )
+(SubChannelInfoSpec
+subAspect: showSyntheticMethods
+aspect: showSyntheticMethods
+)
 (SubChannelInfoSpec
 subAspect: showMethodTypeIcon
 aspect: showMethodTypeIcon
 )
 )
 )
 "Modified: / 17-08-2011 / 13:57:59 / cg"
+"Modified (format): / 13-04-2012 / 18:00:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 searchSpec
 ^self searchSpec_live
 by the MenuEditor of ST/X."
 "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
 "
 label: 'Do not Show Inherited Methods'
 translateLabel: true
 hideMenuOnActivated: false
 choice: methodVisibilityHolder
 choiceValue: class
+)
+(MenuItem
+label: '-'
+)
+(MenuItem
+label: 'Show Synthetic Methods'
+translateLabel: true
+hideMenuOnActivated: false
+indication: showSyntheticMethods
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 )
 "Modified: / 29-09-2006 / 16:11:08 / cg"
 ! !
 !NewSystemBrowser class methodsFor:'menu specs-popup'!
 categoryPopUpMenu
 "return the popUpMenu for the class-category-list view"
 ^ self navigationState variableFilter
 "Created: / 24.2.2000 / 23:28:06 / cg"
 ! !
 !NewSystemBrowser methodsFor:'aspects-organization'!
 categoryMenuVisible
 |holder|
 ].
 ].
 ^ 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|
 (holder := builder bindingAt:#showUnloadedClasses) isNil ifTrue:[
 holder := BlockValue forLogicalNot:(self hideUnloadedClasses).
 !
 canGenerateAccessMethodsHolder
 ^ self hasClassAndVariableSelectedHolder
 !
 canGenerateMultiSetterMethodHolder
 ^ self hasSingleLoadedClassSelectedAndMultipleVariablesSelectedHolder
 !
 useSearchBarInBrowser
 ^ UserPreferences current useSearchBarInBrowser or:[self codeView searchBarActionBlock notNil]
 ! !
 !NewSystemBrowser methodsFor:'change & update'!
 categorySelectionChanged
 "category selection changed by user interaction"
 ^ brwsr
 "Modified: / 28-02-2012 / 16:27:44 / cg"
 ! !
 !NewSystemBrowser methodsFor:'menu actions-namespace'!
 nameSpaceMenuCheckOut
 "check-out all classes in the selected nameSpace from the source repository.
 Individually ask for class revisions.
 open
 "Modified: / 25-06-2010 / 10:08:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 28-02-2012 / 16:48:38 / cg"
 ! !
 !NewSystemBrowser methodsFor:'menu actions-variables'!
 browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
 "show an enterbox for instVar/classVar to search for.
 there is no need to set codeview's content if previous method
 belonged to the same class. Code is already shown, we need only
 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:[
 doSyntaxColoring ifTrue:[
 "/ immediate coloring, if code is not too large;
 self normalLabel.
 self updatePackageInfoForMethod:mthd.
 "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
 self setAcceptActionForNothing.
 self showCode:nil.
 !
 projectListApp
 ^ navigationState projectListApplication
 ! !
 !NewSystemBrowser methodsFor:'private-history'!
 lastSearchPatterns
 ^ self class lastSearchPatterns
 ! !
 !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
 ^ '�Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1738 2012/04/06 14:00:08 stefan Exp �'
 !
 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!

branch	jv
changeset 12230	5568874ba4cf
parent 12229	5c129972b1fd
child 12236	8ec3d6230b65