#REFACTORING by cg
class: Tools::NewSystemBrowser
comment/format in:
#classOfSelectedMethodOrSelectedClass
#codeAspect
#codeAspect:
changed:
#hasInstanceVariableSelectedInCodeView
#hasLocalVariableSelectedInCodeView
#hasMultipleTemporaryVariablesSelectedInCodeView
#hasTemporaryVariableSelectedInCodeView
#selectedClassVariableInCodeViewOrNil
#selectedInstanceVariableInCodeViewOrNil
#withCurrentClassDo:
--- a/Tools__NewSystemBrowser.st Sat Nov 25 13:07:53 2017 +0100
+++ b/Tools__NewSystemBrowser.st Sat Nov 25 13:08:09 2017 +0100
@@ -19096,17 +19096,23 @@
!
codeAspect
- "the current buffers codeAspect; a symbol such as #method, #classDefinition, #comment etc."
+ "the current buffer's codeAspect;
+ a symbol describing what is shown, such as #method, #classDefinition, #comment etc."
^ self navigationState codeAspect
- "Created: / 11.2.2000 / 13:07:07 / cg"
+ "Created: / 11-02-2000 / 13:07:07 / cg"
+ "Modified (comment): / 25-11-2017 / 12:29:28 / cg"
!
codeAspect:newAspect
+ "the current buffer's codeAspect;
+ a symbol describing what is shown, such as #method, #classDefinition, #comment etc."
+
^ self navigationState codeAspect:newAspect
- "Created: / 11.2.2000 / 13:07:19 / cg"
+ "Created: / 11-02-2000 / 13:07:19 / cg"
+ "Modified (comment): / 25-11-2017 / 12:28:35 / cg"
!
codeHolder
@@ -21252,12 +21258,14 @@
(mthd := self theSingleSelectedMethod) notNil ifTrue:[
mclass := mthd mclass.
] ifFalse:[
-"/ self codeAspect value ~= #classDefinition ifTrue:[
+"/ self codeAspect ~= #classDefinition ifTrue:[
"/ ^ nil
"/ ].
mclass := self theSingleSelectedClass.
].
^ mclass
+
+ "Modified (format): / 25-11-2017 / 12:29:56 / cg"
!
classWizardVisibleHolder
@@ -22282,7 +22290,7 @@
mclass := mthd mclass.
].
mclass isNil ifTrue:[
- self codeAspect value ~= SyntaxHighlighter codeAspectClassDefinition ifTrue:[
+ self codeAspect ~= SyntaxHighlighter codeAspectClassDefinition ifTrue:[
^ false
].
mclass := self theSingleSelectedClass.
@@ -22297,7 +22305,7 @@
"/ ].
"/ ^ true
- "Modified: / 27-07-2012 / 22:25:25 / cg"
+ "Modified: / 25-11-2017 / 12:30:03 / cg"
!
hasInstanceVariableSelectedInCodeViewHolder
@@ -22384,7 +22392,7 @@
hasLocalVariableSelectedInCodeView
|"node" selectionInCode|
- self codeAspect value == SyntaxHighlighter codeAspectMethod ifFalse:[^ false].
+ self codeAspect == SyntaxHighlighter codeAspectMethod ifFalse:[^ false].
selectionInCode := self codeView selection.
selectionInCode size == 0 ifTrue:[ ^ false ].
@@ -22397,7 +22405,7 @@
"/ ].
^ true
- "Modified: / 27-07-2012 / 22:18:31 / cg"
+ "Modified: / 25-11-2017 / 12:30:09 / cg"
!
hasLocalVariableSelectedInCodeViewHolder
@@ -22644,12 +22652,12 @@
!
hasMultipleTemporaryVariablesSelectedInCodeView
- self codeAspect value ~~ SyntaxHighlighter codeAspectMethod ifTrue:[^ false].
+ self codeAspect ~~ SyntaxHighlighter codeAspectMethod ifTrue:[^ false].
(self hasMultipleWordsSelectedInCodeView) ifFalse:[^ false].
^ true
- "Modified: / 27-07-2012 / 22:18:29 / cg"
+ "Modified: / 25-11-2017 / 12:30:14 / cg"
!
hasMultipleTemporaryVariablesSelectedInCodeViewHolder
@@ -23665,7 +23673,7 @@
hasTemporaryVariableSelectedInCodeView
"/ |node|
- self codeAspect value ~~ SyntaxHighlighter codeAspectMethod ifTrue:[ ^ false].
+ self codeAspect ~~ SyntaxHighlighter codeAspectMethod ifTrue:[ ^ false].
(self hasSingleWordSelectedInCodeView) ifFalse:[ ^ false].
"/ the following is too slow
@@ -23675,7 +23683,7 @@
"/ ].
^ true
- "Modified: / 27-07-2012 / 22:18:26 / cg"
+ "Modified: / 25-11-2017 / 12:30:18 / cg"
!
hasTemporaryVariableSelectedInCodeViewHolder
@@ -39974,14 +39982,14 @@
(mthd := self theSingleSelectedMethod) notNil ifTrue:[
cls := mthd mclass.
] ifFalse:[
- self codeAspect value ~= SyntaxHighlighter codeAspectClassDefinition ifTrue:[
+ self codeAspect ~= SyntaxHighlighter codeAspectClassDefinition ifTrue:[
^ self warn:'Select either a single class or a single method.'
].
cls := self theSingleSelectedClass.
].
aOneArgBlock value:cls.
- "Modified: / 27-07-2012 / 22:27:10 / cg"
+ "Modified: / 25-11-2017 / 12:30:37 / cg"
!
withCurrentMethodsClassAndSelectorDo:aTwoArgBlock
@@ -58469,7 +58477,7 @@
(mthd := self theSingleSelectedMethod) notNil ifTrue:[
cls := mthd mclass.
] ifFalse:[
- self codeAspect value ~= SyntaxHighlighter codeAspectClassDefinition ifTrue:[
+ self codeAspect ~= SyntaxHighlighter codeAspectClassDefinition ifTrue:[
^ nil
].
cls := self theSingleSelectedClass.
@@ -58486,7 +58494,7 @@
].
^ node name.
- "Modified: / 27-07-2012 / 22:26:00 / cg"
+ "Modified: / 25-11-2017 / 12:30:28 / cg"
!
selectedClassesDo:aBlock
@@ -58655,7 +58663,7 @@
(mthd := self theSingleSelectedMethod) notNil ifTrue:[
cls := mthd mclass.
] ifFalse:[
- self codeAspect value ~= SyntaxHighlighter codeAspectClassDefinition ifTrue:[
+ self codeAspect ~= SyntaxHighlighter codeAspectClassDefinition ifTrue:[
^ nil
].
cls := self theSingleSelectedClass.
@@ -58676,7 +58684,7 @@
].
^ node name.
- "Modified: / 27-07-2012 / 22:26:04 / cg"
+ "Modified: / 25-11-2017 / 12:30:32 / cg"
!
selectedLocalMethodClasses