Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix browser deprecations in Pharo 11 #1421

Merged
merged 1 commit into from
Jul 6, 2024
Merged

Fix browser deprecations in Pharo 11 #1421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...itory/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/contents.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
selectedMessageCategory isNil
ifTrue: [
"class definition"
self selectedClass definition ]
(self selectedClass respondsTo: #definitionString)
ifTrue: [ self selectedClass definitionString ]
ifFalse: [ self selectedClass definition ] ]

Check warning on line 21 in repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/contents.st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/contents.st#L19-L21 

Added lines #L19 - L21 were not covered by tests
ifFalse: [
"method template"
self selectedClass sourceCodeTemplate ] ] ]
Expand Down
4 changes: 3 additions & 1 deletion ...de-Pharo-Development.package/WARPackageBasedBrowser.class/instance/messageCategoryList.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ messageCategoryList
| all categories unclassified |
all := #'-- all --'. "AllProtocol defaultName is fucked in Pharo 2.0"
self selectedClass ifNil: [ ^ Array with: all ].
categories := self selectedClass organization categories.
categories := (self selectedClass respondsTo: #protocolNames)
ifTrue: [ self selectedClass protocolNames ]
ifFalse: [ self selectedClass organization categories ].
(categories notEmpty and: [ categories first = all ]) ifFalse: [ "all is only in 3.0+"
categories := (Array with: all) , categories ].
unclassified := Protocol unclassified. "#unclassified only in 3.0+"
Expand Down
21 changes: 12 additions & 9 deletions ...ry/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/messageList.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
ifTrue: [ #() ]
ifFalse: [ self selectedClass selectors ] ]
ifFalse: [
| organization organizer |
organization := self selectedClass organization.
organizer := (organization respondsTo: #protocolOrganizer) "Only in Pharo 3.0+"
ifTrue: [ organization protocolOrganizer ]
ifFalse: [
| classOrganization |
classOrganization := Smalltalk globals class name hasClassNamed: 'ClassOrganization'.
(classOrganization importFrom: self selectedClass organization) protocolOrganizer ].
organizer methodsInProtocolNamed: selectedMessageCategory ]) sorted
(self selectedClass respondsTo: #selectorsInProtocol:)
ifTrue: [ self selectedClass selectorsInProtocol: selectedMessageCategory ]
ifFalse: [
| organization organizer |
organization := self selectedClass organization.
organizer := (organization respondsTo: #protocolOrganizer) "Only in Pharo 3.0+"
ifTrue: [ organization protocolOrganizer ]
ifFalse: [
| classOrganization |
classOrganization := Smalltalk globals class name classNamed: 'ClassOrganization'.
(classOrganization importFrom: self selectedClass organization) protocolOrganizer ].
organizer methodsInProtocolNamed: selectedMessageCategory ] ]) sorted

Check warning on line 20 in repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/messageList.st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/messageList.st#L9-L20 

Added lines #L9 - L20 were not covered by tests
5 changes: 5 additions & 0 deletions ...Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/packageNameOf..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
private
packageNameOf: aPackage
^ (aPackage respondsTo: #name)
ifTrue: [ aPackage name ]
ifFalse: [ aPackage packageName ]
6 changes: 5 additions & 1 deletion ...itory/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/packages.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
private
packages
^ (Smalltalk at: #RPackage) organizer packages
| rPackage |
rPackage := Smalltalk at: #RPackage.
^ ((rPackage respondsTo: #packageOrganizer)
ifTrue: [ rPackage packageOrganizer ]
ifFalse: [ rPackage organizer ]) packages
4 changes: 3 additions & 1 deletion .../Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/selectedClass.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ selectedClass
| class |
class := selectedClass.
(class notNil and: [ showInstance not ]) ifTrue: [
class := class theMetaClass ].
class := (class respondsTo: #classSide)
ifTrue: [ class classSide ]
ifFalse: [ class theMetaClass ] ].
^ class
5 changes: 2 additions & 3 deletions ...ide-Pharo-Development.package/WARPackageBasedBrowser.class/instance/systemCategoryList.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
accessing
systemCategoryList
^ (self packages
collect: [ :each | each packageName ])
sorted

^ (self packages collect: [ :each | (self packageNameOf: each) ]) sorted
2 changes: 1 addition & 1 deletion ...aro-Development.package/WARPackageBasedBrowser.class/instance/systemCategoryListIndex..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
accessing
systemCategoryListIndex: anInteger
selectedPackage := ((self packages
sorted: [ :a :b | a packageName <= b packageName ]) at: anInteger).
sorted: [ :a :b | (self packageNameOf: a) <= (self packageNameOf: b) ]) at: anInteger).
selectedClass := nil.
self clearMessageAndProtoclSelection.
self changed: #systemCategoryListIndex
2 changes: 1 addition & 1 deletion ...haro-Development.package/WARPackageBasedBrowser.class/instance/systemCategoryListIndex.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
accessing
systemCategoryListIndex
^ (self packages
sorted: [ :a :b | a packageName <= b packageName ])
sorted: [ :a :b | (self packageNameOf: a) <= (self packageNameOf: b) ])

Check warning on line 4 in repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/systemCategoryListIndex.st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/systemCategoryListIndex.st#L4 

Added line #L4 was not covered by tests
indexOf: selectedPackage
5 changes: 1 addition & 4 deletions repository/Seaside-Pharo-Development.package/monticello.meta/categories.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
SystemOrganization addCategory: #'Seaside-Pharo-Development'!
SystemOrganization addCategory: #'Seaside-Pharo-Development-Core'!
SystemOrganization addCategory: #'Seaside-Pharo-Development-Core-Plugins'!
SystemOrganization addCategory: #'Seaside-Pharo-Development-Core-Profiler'!
self packageOrganizer ensurePackage: #'Seaside-Pharo-Development' withTags: #(#Core #'Core-Plugins' #'Core-Profiler')!
Loading