From a17d6a67720ac6a5f783f58798e4c1715565af03 Mon Sep 17 00:00:00 2001 From: Philippe Marschall Date: Wed, 10 Jul 2024 14:46:44 +0200 Subject: [PATCH] Fix browser on Pharo 13 --- .../instance/packages.st | 13 ++++++++----- .../instance/parentOfClass..st | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/packages.st b/repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/packages.st index cce7c8a92..1e117f201 100644 --- a/repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/packages.st +++ b/repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/packages.st @@ -1,7 +1,10 @@ private packages - | rPackage | - rPackage := Smalltalk at: #RPackage. - ^ ((rPackage respondsTo: #packageOrganizer) - ifTrue: [ rPackage packageOrganizer ] - ifFalse: [ rPackage organizer ]) packages \ No newline at end of file + ^ (Smalltalk hasClassNamed: #RPackage) + ifTrue: [ + | rPackage | + rPackage := Smalltalk at: #RPackage. + ((rPackage respondsTo: #packageOrganizer) + ifTrue: [ rPackage packageOrganizer ] + ifFalse: [ rPackage organizer ]) packages ] + ifFalse: [ PackageOrganizer default packages ] \ No newline at end of file diff --git a/repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/parentOfClass..st b/repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/parentOfClass..st index 0383cc799..12d7345a8 100644 --- a/repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/parentOfClass..st +++ b/repository/Seaside-Pharo-Development.package/WARPackageBasedBrowser.class/instance/parentOfClass..st @@ -7,7 +7,9 @@ parentOfClass: aClass | package tag | package := aClass package. - tag := package classTagForClass: aClass. + tag := (package respondsTo: #classTagForClass:) + ifTrue: [ package perform: #classTagForClass: with: aClass ] + ifFalse: [ package perform: #tagOf: with: aClass ]. ^ (((tag name = package name) and: [ package classTags size <= 1 ]) or: [ tag isNil ]) ifTrue: [ package ]