--- a/DebugView.st Fri Aug 12 06:45:15 2016 +0200
+++ b/DebugView.st Tue Aug 16 06:52:08 2016 +0200
@@ -1528,7 +1528,7 @@
"return an interesting context to be shown in an error notifier.
We move up the calling chain, skipping intermediate Signal
and Exception contexts, to present the context in which the error
- actually occured.
+ actually occurred.
Just for your convenience :-)"
|someContexts con idx|
@@ -1538,9 +1538,9 @@
con := aContext.
idx := 1.
[(idx <= someContexts size) and:[con notNil]] whileTrue:[
- someContexts at:idx put:con.
- con := con sender.
- idx := idx + 1.
+ someContexts at:idx put:con.
+ con := con sender.
+ idx := idx + 1.
].
"/ search...
idx := self interestingContextIndexIn:someContexts.
@@ -1553,7 +1553,7 @@
"return an interesting context's index, or nil.
This is the context initially shown (selected) in the walkback.
We move up the calling chain, skipping all intermediate Signal
- and Exception contexts, to present the context in which the error actually occured.
+ and Exception contexts, to present the context in which the error actually occurred.
Just for your (my) convenience :-)"
|con found offset sel prev rcvr nMax idx methodHome method|
@@ -2533,7 +2533,7 @@
|selection con1 con2 h|
initialSelectionOrNil notNil ifTrue:[
- ^ initialSelectionOrNil
+ ^ initialSelectionOrNil
].
"
@@ -2542,7 +2542,7 @@
- if we came here by a step (i.e. bigStep), its the top context
(for ifs and whiles) or the sender (for regular sends).
- otherwise, we came here by some signal raise, and we are interested
- in the context where the raise actually occured.
+ in the context where the raise actually occurred.
"
con1 := (contextArray at:1 ifAbsent:nil).
con2 := (contextArray at:2 ifAbsent:nil).
@@ -2550,55 +2550,55 @@
"/ came here via a step?
exitAction == #step ifTrue:[
- selection := 1.
- steppedContext notNil ifTrue:[
-
- "
- if we came here by a big-step, show the method where we are
- "
- con1 == steppedContext ifTrue:[
- selection := 1
- ] ifFalse:[
- con2 == steppedContext ifTrue:[
- selection := 2
- ]
- ].
- "
- for bigStep, we could also be in a block below the actual method ...
- "
- ((h := con1 home) notNil
- and:[h == steppedContext]) ifTrue:[
- selection := 1
- ] ifFalse:[
- (con2 notNil
- and:[(h := con2 home) notNil
- and:[h == steppedContext]]) ifTrue:[
- selection := 2
- ]
- ].
- h := nil.
- ]
+ selection := 1.
+ steppedContext notNil ifTrue:[
+
+ "
+ if we came here by a big-step, show the method where we are
+ "
+ con1 == steppedContext ifTrue:[
+ selection := 1
+ ] ifFalse:[
+ con2 == steppedContext ifTrue:[
+ selection := 2
+ ]
+ ].
+ "
+ for bigStep, we could also be in a block below the actual method ...
+ "
+ ((h := con1 home) notNil
+ and:[h == steppedContext]) ifTrue:[
+ selection := 1
+ ] ifFalse:[
+ (con2 notNil
+ and:[(h := con2 home) notNil
+ and:[h == steppedContext]]) ifTrue:[
+ selection := 2
+ ]
+ ].
+ h := nil.
+ ]
] ifFalse:[
- steppedContext isNil ifTrue:[
- "
- preselect a more interesting context, (where halt/raise was ...)
- "
- "/ selection := self class interestingContextIndexFrom:aContext.
- selection := self class interestingContextIndexIn:contextArray.
+ steppedContext isNil ifTrue:[
+ "
+ preselect a more interesting context, (where halt/raise was ...)
+ "
+ "/ selection := self class interestingContextIndexFrom:aContext.
+ selection := self class interestingContextIndexIn:contextArray.
"/ Transcript show:'x '; showCR:selection.
- selection := selection min:(contextArray size).
- ] ifFalse:[
- "
- if we came here by a big-step, show the method where we are
- "
- con1 == steppedContext ifTrue:[
- selection := 1
- ] ifFalse:[
- con2 == steppedContext ifTrue:[
- selection := 2.
- ]
- ]
- ]
+ selection := selection min:(contextArray size).
+ ] ifFalse:[
+ "
+ if we came here by a big-step, show the method where we are
+ "
+ con1 == steppedContext ifTrue:[
+ selection := 1
+ ] ifFalse:[
+ con2 == steppedContext ifTrue:[
+ selection := 2.
+ ]
+ ]
+ ]
].
^ selection
@@ -9245,7 +9245,7 @@
errMsg := '** sorry; cannot show code of all optimized blocks (yet) **'.
] ifFalse:[
errMsg := '** no method - no source **'.
- canDefine := false. "/ true.
+ canDefine := true.
]
].
errMsg notNil ifTrue:[
--- a/FileDialog.st Fri Aug 12 06:45:15 2016 +0200
+++ b/FileDialog.st Tue Aug 16 06:52:08 2016 +0200
@@ -796,7 +796,7 @@
label: 'FileDialog'
name: 'FileDialog'
min: (Point 10 10)
- bounds: (Rectangle 0 0 400 400)
+ bounds: (Rectangle 0 0 460 482)
menu: mainMenu
performer: treeBrowser
)
@@ -805,7 +805,7 @@
collection: (
(VerticalPanelViewSpec
name: 'FilePanel'
- layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
+ layout: (LayoutFrame 0 0 0 0 0 1 -40 1)
horizontalLayout: fit
verticalLayout: bottomFit
horizontalSpace: 0
@@ -882,11 +882,11 @@
)
)
- handles: (Any 0.29729729729729998 1.0)
+ handles: (Any 0.29999999999999999 1.0)
)
(SubCanvasSpec
name: 'DirectoryTreeBrowser'
- layout: (LayoutFrame 0 0.0 70 0 0 1.0 -30 1)
+ layout: (LayoutFrame 0 0.0 70 0 0 1.0 -34 1)
tabable: true
hasHorizontalScrollBar: false
hasVerticalScrollBar: false
@@ -915,14 +915,14 @@
(LabelSpec
label: 'Filename:'
name: 'FilenameLabel'
- layout: (LayoutFrame 3 0 -25 1 90 0 -1 1)
+ layout: (LayoutFrame 3 0 -28 1 110 0 -1 1)
translateLabel: true
labelChannel: filenameLabelHolder
adjust: left
)
(FilenameInputFieldSpec
name: 'FilenameEntryField'
- layout: (LayoutFrame 90 0 -25 1 -2 1 -1 1)
+ layout: (LayoutFrame 110 0 -28 1 -2 1 -1 1)
tabable: true
model: filenameHolder
immediateAccept: false
@@ -933,7 +933,7 @@
)
)
- extent: (Point 400 370)
+ extent: (Point 460 442)
)
)
@@ -942,7 +942,7 @@
)
(HorizontalPanelViewSpec
name: 'ButtonPanel'
- layout: (LayoutFrame 0 0.0 -30 1 0 1 0 1)
+ layout: (LayoutFrame 0 0.0 -34 1 -16 1 0 1)
visibilityChannel: buttonPanelVisibleHolder
horizontalLayout: fitSpace
verticalLayout: center
@@ -959,7 +959,7 @@
labelChannel: cancelLabelHolder
tabable: true
model: doCancel
- extent: (Point 129 20)
+ extent: (Point 142 32)
usePreferredHeight: true
)
(ActionButtonSpec
@@ -970,7 +970,7 @@
labelChannel: appendLabelHolder
tabable: true
model: appendPressed
- extent: (Point 129 20)
+ extent: (Point 143 32)
usePreferredHeight: true
)
(ActionButtonSpec
@@ -982,7 +982,7 @@
model: okPressed
enableChannel: okLabelEnabled
isDefault: true
- extent: (Point 130 20)
+ extent: (Point 143 32)
usePreferredHeight: true
)
)