diff --git a/BaselineOfJadeiteForPharo/BaselineOfJadeiteForPharo.class.st b/BaselineOfJadeiteForPharo/BaselineOfJadeiteForPharo.class.st index e3485c7..6678900 100644 --- a/BaselineOfJadeiteForPharo/BaselineOfJadeiteForPharo.class.st +++ b/BaselineOfJadeiteForPharo/BaselineOfJadeiteForPharo.class.st @@ -50,6 +50,8 @@ BaselineOfJadeiteForPharo >> baseline: spec [ with: [ spec requires: 'Jadeite-Changes' ]; package: 'Jadeite-Connection' with: [ spec requires: 'Jadeite-Debugger' ]; + package: 'Jadeite-Help' + with: [ spec requires: 'Jadeite-Connection' ]; package: 'Jadeite-Tests' with: [ spec requires: 'Jadeite-Connection' ]. spec diff --git a/Jadeite-RowanClientServicesClient/RowanProcessServiceClient.class.st b/Jadeite-RowanClientServicesClient/RowanProcessServiceClient.class.st index d776e76..3df7976 100644 --- a/Jadeite-RowanClientServicesClient/RowanProcessServiceClient.class.st +++ b/Jadeite-RowanClientServicesClient/RowanProcessServiceClient.class.st @@ -40,20 +40,24 @@ RowanProcessServiceClient >> debugger [ { #category : 'debugger' } RowanProcessServiceClient >> openDebugger [ - | activeProcess | + | activeProcess debuggerApplication | activeProcess := Processor activeProcess. - debugger := JadeiteDebuggerApplication showOnSession: - GciSession current library. + debuggerApplication := JadeiteDebuggerApplication new gciSession: + GciSession current. + debuggerApplication gciSession library: GciSession current library. + debugger := debuggerApplication new: JadeiteDebuggerPresenter. debugger suspendedProcess: activeProcess; gsProcess: self. + debugger + addStyle: 'jadeiteTextBackgroundColor'; + gciSession: GciSession current. debugger errorMessagePresenter text: errorMessage. - 1 to: frames size do: [ :index | - (frames at: index) index: index - ]. + 1 to: frames size do: [ :index | (frames at: index) index: index ]. debugger frameListPresenter items: frames. debugger selectInitialFrame. self class debuggedProcessServices add: self. + UIManager default defer: [ debugger open ]. activeProcess suspend. ^ debugger answer ] diff --git a/Jadeite-SupportClasses/ListModel.class.st b/Jadeite-SupportClasses/ListModel.class.st index 880c07e..f996157 100644 --- a/Jadeite-SupportClasses/ListModel.class.st +++ b/Jadeite-SupportClasses/ListModel.class.st @@ -116,13 +116,7 @@ ListModel >> reject: aBlock [ { #category : 'removing' } ListModel >> remove: anObject [ - (collection isKindOf: Array) ifTrue: [self halt. - Transcript - cr; - show: 'ListModel list is an Array again. :('; - tab; - print: collection; - flush. + collection isArray ifTrue: [ collection := collection asOrderedCollection ]. "yuck - still can't find the source of these Arrays" collection remove: anObject. self announcer announce: (ValueChanged newValue: self) @@ -136,7 +130,7 @@ ListModel >> remove: anObject ifAbsent: absentBlock [ { #category : 'removing' } ListModel >> removeAll [ - (collection isKindOf: Array) ifTrue: [self halt. + collection isArray ifTrue: [ collection := collection asOrderedCollection "yuck - still can't find the source of these Arrays" ]. collection removeAll. self refreshList.