#REFACTORING by cg
authorClaus Gittinger <cg@exept.de>
Wed, 13 Jun 2018 11:17:39 +0200
changeset 18205 527c961bdc68
parent 18204 3a97b366d5b3
child 18206 3a033f68599c
#REFACTORING by cg class: DebugView comment/format in: #openOn: changed: #helpTextFor: #initializeAbortButtonIn: #initializeGotoApplicationActionMethodButtonIn: #initializeGotoDialogOpenerButtonIn: #initializeNextButtonIn: #initializeSendButtonIn: #initializeStepButtonIn: #initializeStepInButtonIn:
DebugView.st
--- a/DebugView.st	Wed Jun 13 11:16:10 2018 +0200
+++ b/DebugView.st	Wed Jun 13 11:17:39 2018 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -2774,6 +2776,7 @@
     monitorToggle label:(resources string:'Monitor').
     monitorToggle pressAction:[self autoUpdateOn].
     monitorToggle releaseAction:[self autoUpdateOff].
+    monitorToggle helpKey:#HELP_MONITOR.
 
     "can only look into process - context chain is not active"
     canContinue := true.
@@ -2819,8 +2822,9 @@
     ].
     self open
 
-    "Modified: 20.3.1997 / 16:53:56 / cg"
-    "Modified: 17.4.1997 / 13:01:57 / stefan"
+    "Modified: / 20-03-1997 / 16:53:56 / cg"
+    "Modified: / 17-04-1997 / 13:01:57 / stefan"
+    "Modified: / 13-06-2018 / 11:12:09 / Claus Gittinger"
 !
 
 selectContextWithIndex:index
@@ -2883,16 +2887,19 @@
         ^ nil
     ].
 
-   aComponent == abortButton ifTrue:[
-        "/ s := 'Abort (unwind to eventLoop)'
-        s := 'HELP_ABORT'
-    ].
+"/    aComponent == abortButton ifTrue:[
+"/        "/ s := 'Abort (unwind to eventLoop)'
+"/        s := 'HELP_ABORT'
+"/    ].
     aComponent == terminateButton ifTrue:[
-        "/ s := 'HELP_TERMINATE'
         Processor activeProcess isGUIProcess ifTrue:[
-            s := 'Terminate the process.\Attention: closes view and shuts down application.'
+            s := 'HELP_TERMINATE_GUI'
         ] ifFalse:[
-            s := 'Terminate the process.\Attention: do not kill a system thread'
+            Processor activeProcess isSystemProcess ifTrue:[
+                s := 'HELP_TERMINATE_SYSTEMPROCESS'
+            ] ifFalse:[
+                s := 'HELP_TERMINATE'
+            ]
         ]
     ].
     aComponent == continueButton ifTrue:[
@@ -2904,33 +2911,33 @@
             s := 'HELP_CONTINUE'
         ]
     ].
-    aComponent == stepButton ifTrue:[
-        "/ s := 'Step to next send in selected context (don''t enter into called methods)'
-        s := 'HELP_STEP'
-    ].
-    aComponent == stepInButton ifTrue:[
-        "/ s := 'Step into next send in selected context (enter into called methods)'
-        s := 'HELP_STEPIN'
-    ].
-    aComponent == nextButton ifTrue:[
-        "/ s := 'Step to next line in selected context (don''t enter into called methods)'
-        s := 'HELP_NEXT'
-    ].
-    aComponent == nextOverButton ifTrue:[
-        "/ s := 'Step over to cursor-line'
-        s := 'HELP_NEXTOVER'
-    ].
-    aComponent == nextOutButton ifTrue:[
-        "/ s := 'Step out to caller'
-        s := 'HELP_NEXTOUT'
-    ].
-    aComponent == stepButton ifTrue:[
-        s := 'HELP_STEP'
-    ].
-    aComponent == sendButton ifTrue:[
-        "/ s := 'Send next message (enter into called methods)'
-        s := 'HELP_SEND'
-    ].
+"/    aComponent == stepButton ifTrue:[
+"/        "/ s := 'Step to next send in selected context (don''t enter into called methods)'
+"/        s := 'HELP_STEP'
+"/    ].
+"/    aComponent == stepInButton ifTrue:[
+"/        "/ s := 'Step into next send in selected context (enter into called methods)'
+"/        s := 'HELP_STEPIN'
+"/    ].
+"/    aComponent == nextButton ifTrue:[
+"/        "/ s := 'Step to next line in selected context (don''t enter into called methods)'
+"/        s := 'HELP_NEXT'
+"/    ].
+"/    aComponent == nextOverButton ifTrue:[
+"/        "/ s := 'Step over to cursor-line'
+"/        s := 'HELP_NEXTOVER'
+"/    ].
+"/    aComponent == nextOutButton ifTrue:[
+"/        "/ s := 'Step out to caller'
+"/        s := 'HELP_NEXTOUT'
+"/    ].
+"/    aComponent == stepButton ifTrue:[
+"/        s := 'HELP_STEP'
+"/    ].
+"/    aComponent == sendButton ifTrue:[
+"/        "/ s := 'Send next message (enter into called methods)'
+"/        s := 'HELP_SEND'
+"/    ].
     aComponent == returnButton ifTrue:[
         returnButton enabled ifTrue:[
             "/ s := 'Return from the selected method'
@@ -2958,26 +2965,26 @@
             s := 'HELP_RESEND_DISABLED'
         ].
     ].
-    aComponent == contextView ifTrue:[
-        s := 'HELP_WALKBACK'
-    ].
-    aComponent == codeView ifTrue:[
-        s := 'HELP_CODEVIEW'
-    ].
-    aComponent == monitorToggle ifTrue:[
-        "/ s := 'Toggle monitoring'
-        s := 'HELP_MONITOR'
-    ].
+"/    aComponent == contextView ifTrue:[
+"/        s := 'HELP_WALKBACK'
+"/    ].
+"/    aComponent == codeView ifTrue:[
+"/        s := 'HELP_CODEVIEW'
+"/    ].
+"/    aComponent == monitorToggle ifTrue:[
+"/        "/ s := 'Toggle monitoring'
+"/        s := 'HELP_MONITOR'
+"/    ].
     aComponent == updateButton ifTrue:[
         "/ s := 'Update'
         s := 'HELP_UPDATE'
     ].
-    aComponent == gotoDialogOpenerButton ifTrue:[
-        s := 'HELP_GOTO_DIALOG_OPENER'
-    ].
-    aComponent == gotoApplicationActionMethodButton ifTrue:[
-        s := 'HELP_GOTO_APPLICATION_ACTION'
-    ].
+"/    aComponent == gotoDialogOpenerButton ifTrue:[
+"/        s := 'HELP_GOTO_DIALOG_OPENER'
+"/    ].
+"/    aComponent == gotoApplicationActionMethodButton ifTrue:[
+"/        s := 'HELP_GOTO_APPLICATION_ACTION'
+"/    ].
 "/    aComponent == stopButton ifTrue:[
 "/        s := 'HELP_STOP'
 "/    ].
@@ -2994,13 +3001,15 @@
 "/        s := 'HELP_CON_INSP'
 "/    ].
 
+    s := s ? (aComponent helpKey).
     s notNil ifTrue:[
         ^ resources stringWithCRs:s
     ].
     ^ nil
 
-    "Modified: 29.8.1995 / 23:38:54 / claus"
-    "Modified: 4.3.1997 / 01:54:03 / cg"
+    "Modified: / 29-08-1995 / 23:38:54 / claus"
+    "Modified: / 04-03-1997 / 01:54:03 / cg"
+    "Modified: / 13-06-2018 / 11:14:49 / Claus Gittinger"
 !
 
 helpTextFor:aComponent at:aPointOrNil
@@ -3283,10 +3292,10 @@
                 ]
                 in:bpanel.
 
-    abortButton name:'abortButton'.
-
-    "Created: / 17.11.2001 / 20:56:47 / cg"
-    "Modified: / 17.11.2001 / 20:57:17 / cg"
+    abortButton name:'abortButton'; helpKey:#HELP_ABORT.
+
+    "Created: / 17-11-2001 / 20:56:47 / cg"
+    "Modified: / 13-06-2018 / 09:30:04 / Claus Gittinger"
 !
 
 initializeButtons1In:bpanel
@@ -3626,8 +3635,10 @@
                 ]
                 in:bpanel.
 
-    gotoApplicationActionMethodButton name:'gotoAppMethodButton'.
+    gotoApplicationActionMethodButton name:'gotoAppMethodButton'; helpKey:#HELP_GOTO_APPLICATION_ACTION.
     gotoApplicationActionMethodButton beInvisible
+
+    "Modified: / 13-06-2018 / 11:14:32 / Claus Gittinger"
 !
 
 initializeGotoDialogOpenerButtonIn:bpanel
@@ -3639,8 +3650,10 @@
                 ]
                 in:bpanel.
 
-    gotoDialogOpenerButton name:'gotoDialogOpenerButton'.
+    gotoDialogOpenerButton name:'gotoDialogOpenerButton'; helpKey:#HELP_GOTO_DIALOG_OPENER.
     gotoDialogOpenerButton beInvisible
+
+    "Modified: / 13-06-2018 / 11:14:02 / Claus Gittinger"
 !
 
 initializeGotoRaisingMethodButtonIn:bpanel
@@ -3685,9 +3698,10 @@
                 ]
                 in:bpanel.
 
-    nextButton name:'nextButton'.
-    
-    "Created: / 17.11.2001 / 20:59:38 / cg" 
+    nextButton name:'nextButton'; helpKey:#HELP_NEXT.
+
+    "Created: / 17-11-2001 / 20:59:38 / cg"
+    "Modified: / 13-06-2018 / 09:31:25 / Claus Gittinger"
 !
 
 initializeReportButtonIn:bpanel
@@ -3756,9 +3770,10 @@
                 ]
                 in:bpanel.
 
-    sendButton name:'sendButton'.
-
-    "Created: / 17.11.2001 / 21:01:20 / cg"
+    sendButton name:'sendButton'; helpKey:#HELP_SEND.
+
+    "Created: / 17-11-2001 / 21:01:20 / cg"
+    "Modified: / 13-06-2018 / 11:10:28 / Claus Gittinger"
 !
 
 initializeStepButtonIn:bpanel
@@ -3770,9 +3785,10 @@
                 ]
                 in:bpanel.
 
-    stepButton name:'stepButton'.
-
-    "Created: / 17.11.2001 / 21:00:13 / cg"
+    stepButton name:'stepButton'; helpKey:#HELP_STEP.
+
+    "Created: / 17-11-2001 / 21:00:13 / cg"
+    "Modified: / 13-06-2018 / 09:30:57 / Claus Gittinger"
 !
 
 initializeStepInButtonIn:bpanel
@@ -3784,10 +3800,10 @@
                 ]
                 in:bpanel.
 
-    stepInButton name:'stepInButton'.
+    stepInButton name:'stepInButton'; helpKey:#HELP_STEPIN.
 
     "Created: / 17-11-2001 / 21:00:13 / cg"
-    "Modified: / 27-05-2018 / 11:40:18 / Claus Gittinger"
+    "Modified: / 13-06-2018 / 09:31:11 / Claus Gittinger"
 !
 
 initializeTerminateButtonIn:bpanel
@@ -7753,7 +7769,7 @@
                 ]
             ].
 
-            s := Text streamContents:[:s | aContext printWithSeparator:' » ' on:s ].
+            s := Text streamContents:[:s | aContext printWithSeparator:' » ' on:s ].
             RememberedCallChain notNil ifTrue:[
                 (RememberedCallChain includesIdentical:aContext) ifTrue:[
                     s := s withColor:#red.
@@ -9853,7 +9869,7 @@
 
 printConditionOn:aStream
     ignoredSendingClassAndSelectors notEmptyOrNil ifTrue:[
-        aStream nextPutAll:(' if called from %1 » %2'
+        aStream nextPutAll:(' if called from %1 » %2'
                                 bindWith:ignoredSendingClassAndSelectors first first
                                 with:ignoredSendingClassAndSelectors first second).
         ^ self.