--- a/NewSystemBrowser.st Mon Sep 14 20:15:56 2009 +0200
+++ b/NewSystemBrowser.st Mon Sep 14 20:16:10 2009 +0200
@@ -39,7 +39,7 @@
DefaultShowSpecialResourceEditors SharedMethodCategoryCache
LastMethodProcessingBlockString PreviousBuildDirectory
LastLoadedPackage DefaultShortAllClassesInNameSpaceOrganisation
- LastTag'
+ LastTag DefaultShowPseudoProtocols'
poolDictionaries:''
category:'Interface-Browsers-New'
!
@@ -9898,8 +9898,8 @@
)
(MenuItem
label: 'Project Diagram'
+ translateLabel: true
isVisible: packageDiagramMenuItemVisible
- translateLabel: true
hideMenuOnActivated: false
choice: organizerModeForMenu
choiceValue: packageDiagram
@@ -9929,51 +9929,27 @@
label: '-'
)
(MenuItem
- label: 'Hide Unloaded Classes'
- translateLabel: true
- hideMenuOnActivated: false
- indication: hideUnloadedClasses
- )
- (MenuItem
- label: 'Show All Classes in NameSpace View'
- translateLabel: true
- hideMenuOnActivated: false
- indication: showAllClassesInNameSpaceOrganisation
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Show Inherited Methods'
- translateLabel: true
- hideMenuOnActivated: false
- choice: methodVisibilityHolder
- choiceValue: all
- )
- (MenuItem
- label: 'Show Inherited Methods except Object''s'
- translateLabel: true
- hideMenuOnActivated: false
- choice: methodVisibilityHolder
- choiceValue: allButObject
- )
- (MenuItem
- label: 'Do not Show Inherited Methods'
- translateLabel: true
- hideMenuOnActivated: false
- choice: methodVisibilityHolder
- choiceValue: class
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Indicators'
+ label: 'Class'
translateLabel: true
submenu:
(Menu
(
(MenuItem
+ label: 'Hide Unloaded Classes'
+ translateLabel: true
+ hideMenuOnActivated: false
+ indication: hideUnloadedClasses
+ )
+ (MenuItem
+ label: 'Show All Classes in NameSpace View'
+ translateLabel: true
+ hideMenuOnActivated: false
+ indication: showAllClassesInNameSpaceOrganisation
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
enabled: showUnloadedClasses
label: 'Emphasize Unloaded Classes'
translateLabel: true
@@ -9998,6 +9974,58 @@
hideMenuOnActivated: false
indication: showClassPackages
)
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: 'Protocol'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Show Pseudo Protocols'
+ translateLabel: true
+ hideMenuOnActivated: false
+ indication: showPseudoProtocols
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: 'Selector'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Show Inherited Methods'
+ translateLabel: true
+ hideMenuOnActivated: false
+ choice: methodVisibilityHolder
+ choiceValue: all
+ )
+ (MenuItem
+ label: 'Show Inherited Methods except Object''s'
+ translateLabel: true
+ hideMenuOnActivated: false
+ choice: methodVisibilityHolder
+ choiceValue: allButObject
+ )
+ (MenuItem
+ label: 'Do not Show Inherited Methods'
+ translateLabel: true
+ hideMenuOnActivated: false
+ choice: methodVisibilityHolder
+ choiceValue: class
+ )
+ (MenuItem
+ label: '-'
+ )
(MenuItem
label: 'Show Method Inheritance Indicator'
translateLabel: true
@@ -12241,6 +12269,17 @@
^ holder
!
+showPseudoProtocols
+ |holder|
+
+ (holder := builder bindingAt:#showPseudoProtocols) isNil ifTrue:[
+ holder := (DefaultShowPseudoProtocols ? true) asValue.
+ builder aspectAt:#showPseudoProtocols put: holder.
+ holder onChangeEvaluate:[ DefaultShowPseudoProtocols := holder value ].
+ ].
+ ^ holder
+!
+
showSpecialResourceEditors
|holder|
@@ -30200,7 +30239,17 @@
dialog accepted ifFalse: [^ self].
+ newArgs := dialog arguments asOrderedCollection.
+ map := Array new: args size.
+ 1 to: args size do: [:i | map at: i put: (newArgs indexOf: (args at: i))].
+
newSelector := dialog methodName.
+ newSelector = oldSelector ifTrue:[
+ newArgs = args ifTrue:[
+self halt.
+ ].
+ ].
+
renameSelectedMethodsOnly := dialog isRenameSelectedMethodsOnly.
renameOnly := dialog isRenameOnly.
rewriteLocalSendersOnly := dialog isRewritingLocalSendersOnly.
@@ -30212,10 +30261,6 @@
(self findSendersOf:oldSelector in:affectedClasses andConfirmRefactoring:refactoring) ifFalse:[ ^ self ].
].
- newArgs := dialog arguments asOrderedCollection.
- map := Array new: args size.
- 1 to: args size do: [:i | map at: i put: (newArgs indexOf: (args at: i))].
-
self withWaitCursorDo:[
|classesOfSelectedMethods affectedImplementors|
@@ -42444,7 +42489,7 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.1288 2009-09-08 15:57:12 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.1289 2009-09-14 18:16:10 cg Exp $'
! !
NewSystemBrowser initialize!
--- a/Tools__NewSystemBrowser.st Mon Sep 14 20:15:56 2009 +0200
+++ b/Tools__NewSystemBrowser.st Mon Sep 14 20:16:10 2009 +0200
@@ -39,7 +39,7 @@
DefaultShowSpecialResourceEditors SharedMethodCategoryCache
LastMethodProcessingBlockString PreviousBuildDirectory
LastLoadedPackage DefaultShortAllClassesInNameSpaceOrganisation
- LastTag'
+ LastTag DefaultShowPseudoProtocols'
poolDictionaries:''
category:'Interface-Browsers-New'
!
@@ -9898,8 +9898,8 @@
)
(MenuItem
label: 'Project Diagram'
+ translateLabel: true
isVisible: packageDiagramMenuItemVisible
- translateLabel: true
hideMenuOnActivated: false
choice: organizerModeForMenu
choiceValue: packageDiagram
@@ -9929,51 +9929,27 @@
label: '-'
)
(MenuItem
- label: 'Hide Unloaded Classes'
- translateLabel: true
- hideMenuOnActivated: false
- indication: hideUnloadedClasses
- )
- (MenuItem
- label: 'Show All Classes in NameSpace View'
- translateLabel: true
- hideMenuOnActivated: false
- indication: showAllClassesInNameSpaceOrganisation
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Show Inherited Methods'
- translateLabel: true
- hideMenuOnActivated: false
- choice: methodVisibilityHolder
- choiceValue: all
- )
- (MenuItem
- label: 'Show Inherited Methods except Object''s'
- translateLabel: true
- hideMenuOnActivated: false
- choice: methodVisibilityHolder
- choiceValue: allButObject
- )
- (MenuItem
- label: 'Do not Show Inherited Methods'
- translateLabel: true
- hideMenuOnActivated: false
- choice: methodVisibilityHolder
- choiceValue: class
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Indicators'
+ label: 'Class'
translateLabel: true
submenu:
(Menu
(
(MenuItem
+ label: 'Hide Unloaded Classes'
+ translateLabel: true
+ hideMenuOnActivated: false
+ indication: hideUnloadedClasses
+ )
+ (MenuItem
+ label: 'Show All Classes in NameSpace View'
+ translateLabel: true
+ hideMenuOnActivated: false
+ indication: showAllClassesInNameSpaceOrganisation
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
enabled: showUnloadedClasses
label: 'Emphasize Unloaded Classes'
translateLabel: true
@@ -9998,6 +9974,58 @@
hideMenuOnActivated: false
indication: showClassPackages
)
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: 'Protocol'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Show Pseudo Protocols'
+ translateLabel: true
+ hideMenuOnActivated: false
+ indication: showPseudoProtocols
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: 'Selector'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Show Inherited Methods'
+ translateLabel: true
+ hideMenuOnActivated: false
+ choice: methodVisibilityHolder
+ choiceValue: all
+ )
+ (MenuItem
+ label: 'Show Inherited Methods except Object''s'
+ translateLabel: true
+ hideMenuOnActivated: false
+ choice: methodVisibilityHolder
+ choiceValue: allButObject
+ )
+ (MenuItem
+ label: 'Do not Show Inherited Methods'
+ translateLabel: true
+ hideMenuOnActivated: false
+ choice: methodVisibilityHolder
+ choiceValue: class
+ )
+ (MenuItem
+ label: '-'
+ )
(MenuItem
label: 'Show Method Inheritance Indicator'
translateLabel: true
@@ -12241,6 +12269,17 @@
^ holder
!
+showPseudoProtocols
+ |holder|
+
+ (holder := builder bindingAt:#showPseudoProtocols) isNil ifTrue:[
+ holder := (DefaultShowPseudoProtocols ? true) asValue.
+ builder aspectAt:#showPseudoProtocols put: holder.
+ holder onChangeEvaluate:[ DefaultShowPseudoProtocols := holder value ].
+ ].
+ ^ holder
+!
+
showSpecialResourceEditors
|holder|
@@ -30200,7 +30239,17 @@
dialog accepted ifFalse: [^ self].
+ newArgs := dialog arguments asOrderedCollection.
+ map := Array new: args size.
+ 1 to: args size do: [:i | map at: i put: (newArgs indexOf: (args at: i))].
+
newSelector := dialog methodName.
+ newSelector = oldSelector ifTrue:[
+ newArgs = args ifTrue:[
+self halt.
+ ].
+ ].
+
renameSelectedMethodsOnly := dialog isRenameSelectedMethodsOnly.
renameOnly := dialog isRenameOnly.
rewriteLocalSendersOnly := dialog isRewritingLocalSendersOnly.
@@ -30212,10 +30261,6 @@
(self findSendersOf:oldSelector in:affectedClasses andConfirmRefactoring:refactoring) ifFalse:[ ^ self ].
].
- newArgs := dialog arguments asOrderedCollection.
- map := Array new: args size.
- 1 to: args size do: [:i | map at: i put: (newArgs indexOf: (args at: i))].
-
self withWaitCursorDo:[
|classesOfSelectedMethods affectedImplementors|
@@ -42444,7 +42489,7 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1288 2009-09-08 15:57:12 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1289 2009-09-14 18:16:10 cg Exp $'
! !
NewSystemBrowser initialize!