diff --git a/src/GToolkit-GemStone-Pharo/GtGemStoneAsyncEvaluationElement.class.st b/src/GToolkit-GemStone-Pharo/GtGemStoneAsyncEvaluationElement.class.st index 17615a1e..4802984c 100644 --- a/src/GToolkit-GemStone-Pharo/GtGemStoneAsyncEvaluationElement.class.st +++ b/src/GToolkit-GemStone-Pharo/GtGemStoneAsyncEvaluationElement.class.st @@ -123,14 +123,6 @@ GtGemStoneAsyncEvaluationElement >> buildStartTimeRow [ yourself) ] -{ #category : #'building widgets' } -GtGemStoneAsyncEvaluationElement >> buildToolbar [ - ^ BrToolbar new - aptitude: BrGlamorousToolbarAptitude new; - alignCenterLeft; - fitContent. -] - { #category : #'building widgets' } GtGemStoneAsyncEvaluationElement >> buildToolLabel [ ^(BrLabel new) @@ -154,6 +146,14 @@ GtGemStoneAsyncEvaluationElement >> buildToolLabel [ background: Color white ] +{ #category : #'building widgets' } +GtGemStoneAsyncEvaluationElement >> buildToolbar [ + ^ BrToolbar new + aptitude: BrGlamorousToolbarAptitude new; + alignCenterLeft; + fitContent. +] + { #category : #'building widgets' } GtGemStoneAsyncEvaluationElement >> buildUnknownValueLabel [ ^ (BrLabel new) @@ -187,7 +187,7 @@ GtGemStoneAsyncEvaluationElement >> createTitleNotifier [ GtGemStoneAsyncEvaluationElement >> gtActionCancelExecutionFor: anAction [ - promiseResolution canStopExecution ifFalse: [ ^ anAction empty ]. + promiseResolution isResolvingRunning ifFalse: [ ^ anAction empty ]. ^ anAction button label: 'Cancel'; @@ -202,7 +202,7 @@ GtGemStoneAsyncEvaluationElement >> gtActionCancelExecutionFor: anAction [ GtGemStoneAsyncEvaluationElement >> gtActionDebugExecutionFor: anAction [ - promiseResolution canStopExecution ifFalse: [ ^ anAction empty ]. + promiseResolution isResolvingRunning ifFalse: [ ^ anAction empty ]. ^ anAction button label: 'Debug'; diff --git a/src/GToolkit-GemStone-Pharo/GtGemStoneAsyncPromiseResolution.class.st b/src/GToolkit-GemStone-Pharo/GtGemStoneAsyncPromiseResolution.class.st index 7d61ed01..018416c2 100644 --- a/src/GToolkit-GemStone-Pharo/GtGemStoneAsyncPromiseResolution.class.st +++ b/src/GToolkit-GemStone-Pharo/GtGemStoneAsyncPromiseResolution.class.st @@ -20,8 +20,8 @@ GtGemStoneAsyncPromiseResolution >> announcer [ { #category : #testing } GtGemStoneAsyncPromiseResolution >> canStopExecution [ "For now allow the execution to be stopped even if we do not have an evaluation context" - ^ self isResolvingRunning "and: [ - snippetPromise canStopExecution ]" + ^ self isResolvingRunning and: [ + snippetPromise canStopExecution ] ] { #category : #accessing } diff --git a/src/GToolkit-GemStone-Pharo/GtGemStoneDebugger.class.st b/src/GToolkit-GemStone-Pharo/GtGemStoneDebugger.class.st index 6a861f97..6f31b06c 100644 --- a/src/GToolkit-GemStone-Pharo/GtGemStoneDebugger.class.st +++ b/src/GToolkit-GemStone-Pharo/GtGemStoneDebugger.class.st @@ -10,12 +10,6 @@ Class { #category : #'GToolkit-GemStone-Pharo-Debugger' } -{ #category : #announcer } -GtGemStoneDebugger >> announcer [ - - ^ announcer -] - { #category : #private } GtGemStoneDebugger >> announceStateChange [ "Announce that the receiver's state has changed" @@ -23,6 +17,12 @@ GtGemStoneDebugger >> announceStateChange [ self announcer announce: (GtGemStoneDebuggerStateChanged new debugger: self) ] +{ #category : #announcer } +GtGemStoneDebugger >> announcer [ + + ^ announcer +] + { #category : #accessing } GtGemStoneDebugger >> debuggerProxy [ diff --git a/src/GToolkit-GemStone-Pharo/GtGemStoneExpandableDebuggerElement.class.st b/src/GToolkit-GemStone-Pharo/GtGemStoneExpandableDebuggerElement.class.st index a127a00c..0d7194e0 100644 --- a/src/GToolkit-GemStone-Pharo/GtGemStoneExpandableDebuggerElement.class.st +++ b/src/GToolkit-GemStone-Pharo/GtGemStoneExpandableDebuggerElement.class.st @@ -55,14 +55,6 @@ GtGemStoneExpandableDebuggerElement class >> sessionClass [ ^ GtGemStoneDebuggerSession ] -{ #category : #callbacks } -GtGemStoneExpandableDebuggerElement >> actOnDebuggerStateChanged [ - - self debugSession synchronizeCallStack. - self currentCallFrame resetState. - self scheduleUpdateUI. -] - { #category : #callbacks } GtGemStoneExpandableDebuggerElement >> actOnDebugSessionChanged [ @@ -75,6 +67,14 @@ GtGemStoneExpandableDebuggerElement >> actOnDebugSessionChanged [ self scheduleUpdateUI. ] +{ #category : #callbacks } +GtGemStoneExpandableDebuggerElement >> actOnDebuggerStateChanged [ + + self debugSession synchronizeCallStack. + self currentCallFrame resetState. + self scheduleUpdateUI. +] + { #category : #callbacks } GtGemStoneExpandableDebuggerElement >> actOnSelectedContextChangedFor: aContext [ self updateVariables. diff --git a/src/GToolkit-GemStone-Pharo/GtGemStoneKeepAliveNotificationElement.class.st b/src/GToolkit-GemStone-Pharo/GtGemStoneKeepAliveNotificationElement.class.st index 5922e458..cf935a4a 100644 --- a/src/GToolkit-GemStone-Pharo/GtGemStoneKeepAliveNotificationElement.class.st +++ b/src/GToolkit-GemStone-Pharo/GtGemStoneKeepAliveNotificationElement.class.st @@ -11,6 +11,12 @@ Class { #category : #'GToolkit-GemStone-Pharo-Notifications' } +{ #category : #accessing } +GtGemStoneKeepAliveNotificationElement >> actOnElementDetached [ + self clearNotification. + self clearContent. +] + { #category : #'private - accessing' } GtGemStoneKeepAliveNotificationElement >> activeMark [ @@ -22,12 +28,6 @@ GtGemStoneKeepAliveNotificationElement >> activeMark [ addChild: (BrGlamorousVectorIcons accept asElement) ] -{ #category : #accessing } -GtGemStoneKeepAliveNotificationElement >> actOnElementDetached [ - self clearNotification. - self clearContent. -] - { #category : #'private - accessing' } GtGemStoneKeepAliveNotificationElement >> borderElement [ diff --git a/src/GToolkit-GemStone-Pharo/GtGemStoneSessionRegistry.class.st b/src/GToolkit-GemStone-Pharo/GtGemStoneSessionRegistry.class.st index 59f01885..a0ccc430 100644 --- a/src/GToolkit-GemStone-Pharo/GtGemStoneSessionRegistry.class.st +++ b/src/GToolkit-GemStone-Pharo/GtGemStoneSessionRegistry.class.st @@ -726,12 +726,6 @@ GtGemStoneSessionRegistry >> sessionNamed: aString ifAbsent: absentBlock [ ^ sessions at: aString ifAbsent: absentBlock ] -{ #category : #private } -GtGemStoneSessionRegistry >> sessions [ - - ^ sessions -] - { #category : #accessing } GtGemStoneSessionRegistry >> sessionWithConnection: aRsrConnection [ @@ -771,6 +765,12 @@ GtGemStoneSessionRegistry >> sessionWithConnectorNamed: aString ifAbsent: absent (sessionCollection sorted: #sessionId ascending) first ]. ] +{ #category : #private } +GtGemStoneSessionRegistry >> sessions [ + + ^ sessions +] + { #category : #initialization } GtGemStoneSessionRegistry >> shutdown [ diff --git a/src/GToolkit-GemStone-Pharo/GtRsrEvaluationException.class.st b/src/GToolkit-GemStone-Pharo/GtRsrEvaluationException.class.st index c4bb7fa0..c1ee33a0 100644 --- a/src/GToolkit-GemStone-Pharo/GtRsrEvaluationException.class.st +++ b/src/GToolkit-GemStone-Pharo/GtRsrEvaluationException.class.st @@ -18,6 +18,16 @@ GtRsrEvaluationException >> currentDebuggerState [ ^ debuggerState ] +{ #category : #accessing } +GtRsrEvaluationException >> debugResult [ + ^ debugResult +] + +{ #category : #accessing } +GtRsrEvaluationException >> debugResult: anObject [ + debugResult := anObject +] + { #category : #accessing } GtRsrEvaluationException >> debuggerClient [ @@ -43,16 +53,6 @@ GtRsrEvaluationException >> debuggerState [ debuggerState := self getDebuggerState ] ] -{ #category : #accessing } -GtRsrEvaluationException >> debugResult [ - ^ debugResult -] - -{ #category : #accessing } -GtRsrEvaluationException >> debugResult: anObject [ - debugResult := anObject -] - { #category : #accessing } GtRsrEvaluationException >> evaluator [ diff --git a/src/GToolkit-GemStone-Pharo/GtRsrEvaluatorAsyncPromise.class.st b/src/GToolkit-GemStone-Pharo/GtRsrEvaluatorAsyncPromise.class.st index 42e1d48f..a67b8223 100644 --- a/src/GToolkit-GemStone-Pharo/GtRsrEvaluatorAsyncPromise.class.st +++ b/src/GToolkit-GemStone-Pharo/GtRsrEvaluatorAsyncPromise.class.st @@ -142,13 +142,6 @@ GtRsrEvaluatorAsyncPromise >> isResolved [ ^self isFulfilled or: [self isBroken] ] -{ #category : #accessing } -GtRsrEvaluatorAsyncPromise >> resolvedValue [ - self assert: [ value ~~ self ]. - - ^ value -] - { #category : #resolving } GtRsrEvaluatorAsyncPromise >> resolveWithEvaluationResult: evaluationResult [ evaluationResult isEvaluationCancelledResult @@ -156,6 +149,13 @@ GtRsrEvaluatorAsyncPromise >> resolveWithEvaluationResult: evaluationResult [ ifFalse: [ self fulfillWithEvaluationResult: evaluationResult ] ] +{ #category : #accessing } +GtRsrEvaluatorAsyncPromise >> resolvedValue [ + self assert: [ value ~~ self ]. + + ^ value +] + { #category : #actions } GtRsrEvaluatorAsyncPromise >> resumeEvaluation [ | resumedEvaluationResultData | diff --git a/src/GToolkit-GemStone-Pharo/GtRsrProxyServiceClient.class.st b/src/GToolkit-GemStone-Pharo/GtRsrProxyServiceClient.class.st index 2f1acfc8..51a77fe9 100644 --- a/src/GToolkit-GemStone-Pharo/GtRsrProxyServiceClient.class.st +++ b/src/GToolkit-GemStone-Pharo/GtRsrProxyServiceClient.class.st @@ -68,6 +68,15 @@ GtRsrProxyServiceClient class >> subclassForRemoteClass: aSymbol [ ] +{ #category : #private } +GtRsrProxyServiceClient >> _id: id connection: connection remoteSelf: anObject remoteClass: aString [ + + _id := id. + _connection := connection. + remoteSelf := anObject. + remoteClass := aString. +] + { #category : #converting } GtRsrProxyServiceClient >> asGtpoLocalObject [ "Answer a local copy of the receiver" @@ -689,12 +698,3 @@ GtRsrProxyServiceClient >> scriptEvaluation [ receiver: self; gtSession: self gtSession ] - -{ #category : #private } -GtRsrProxyServiceClient >> _id: id connection: connection remoteSelf: anObject remoteClass: aString [ - - _id := id. - _connection := connection. - remoteSelf := anObject. - remoteClass := aString. -] diff --git a/src/GToolkit-GemStone-Pharo/GtpoMetaclass3.class.st b/src/GToolkit-GemStone-Pharo/GtpoMetaclass3.class.st index 116a4c0d..0c54fed9 100644 --- a/src/GToolkit-GemStone-Pharo/GtpoMetaclass3.class.st +++ b/src/GToolkit-GemStone-Pharo/GtpoMetaclass3.class.st @@ -38,13 +38,6 @@ GtpoMetaclass3 class >> remoteClassName [ ^ #Metaclass3 ] -{ #category : #accessing } -GtpoMetaclass3 >> compiledMethodAt: selector [ - - ^ self proxyPerform: #compiledMethodAt: - withArguments: { selector }. -] - { #category : #private } GtpoMetaclass3 >> compileFromTab: aTab [ "Update the receiver's definition based on the current editor contents" @@ -67,6 +60,13 @@ GtpoMetaclass3 >> compileFromTab: aTab [ GtpoMetaclass3 >> compileMethod: source category: categoryName [ ] +{ #category : #accessing } +GtpoMetaclass3 >> compiledMethodAt: selector [ + + ^ self proxyPerform: #compiledMethodAt: + withArguments: { selector }. +] + { #category : #accessing } GtpoMetaclass3 >> definitionString [ ^ definitionString ifNil: [ definitionString := self proxyPerform: #definition ] diff --git a/src/GToolkit-GemStone-Pharo/TGtWithActivatedSessionViewModel.trait.st b/src/GToolkit-GemStone-Pharo/TGtWithActivatedSessionViewModel.trait.st index 692c71d5..ccda628f 100644 --- a/src/GToolkit-GemStone-Pharo/TGtWithActivatedSessionViewModel.trait.st +++ b/src/GToolkit-GemStone-Pharo/TGtWithActivatedSessionViewModel.trait.st @@ -6,15 +6,6 @@ Trait { #category : 'GToolkit-GemStone-Pharo-Support' } -{ #category : #'api - activated session view model' } -TGtWithActivatedSessionViewModel >> activatedSessionViewModel [ - - - >#propertyGetterTemplate'> - - ^ activatedSessionViewModel -] - { #category : #'api - activated session view model' } TGtWithActivatedSessionViewModel >> activateSessionViewModel: aNewActivatedSessionViewModel [ @@ -35,6 +26,15 @@ TGtWithActivatedSessionViewModel >> activateSessionViewModel: aNewActivatedSessi self notifyActivatedSessionViewModelChanged ] +{ #category : #'api - activated session view model' } +TGtWithActivatedSessionViewModel >> activatedSessionViewModel [ + + + >#propertyGetterTemplate'> + + ^ activatedSessionViewModel +] + { #category : #'api - activated session view model' } TGtWithActivatedSessionViewModel >> deactivateSessionViewModel [ diff --git a/src/GToolkit-GemStone-Pharo/TGtWithSelectedSessionViewModel.trait.st b/src/GToolkit-GemStone-Pharo/TGtWithSelectedSessionViewModel.trait.st index 218ca328..42a76cc6 100644 --- a/src/GToolkit-GemStone-Pharo/TGtWithSelectedSessionViewModel.trait.st +++ b/src/GToolkit-GemStone-Pharo/TGtWithSelectedSessionViewModel.trait.st @@ -51,15 +51,6 @@ TGtWithSelectedSessionViewModel >> onPreviousSelectedSessionViewModelUnset: aPre >#onPreviousPropertyUnsetHookTemplate'> ] -{ #category : #'api - selected session view model' } -TGtWithSelectedSessionViewModel >> selectedSessionViewModel [ - - - >#propertyGetterTemplate'> - - ^ selectedSessionViewModel -] - { #category : #'api - selected session view model' } TGtWithSelectedSessionViewModel >> selectSessionViewModel: aNewSelectedSessionViewModel [ @@ -79,3 +70,12 @@ TGtWithSelectedSessionViewModel >> selectSessionViewModel: aNewSelectedSessionVi self onNewSelectedSessionViewModelSet: aNewSelectedSessionViewModel. self notifySelectedSessionViewModelChanged ] + +{ #category : #'api - selected session view model' } +TGtWithSelectedSessionViewModel >> selectedSessionViewModel [ + + + >#propertyGetterTemplate'> + + ^ selectedSessionViewModel +]