Merge 6a08ef1

Author: Johan Brichau

Diff for: 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
+	^ (Smalltalk hasClassNamed: #RPackage)
+		ifTrue: [ 
+			| rPackage |
+			rPackage := Smalltalk at: #RPackage.
+			((rPackage respondsTo: #packageOrganizer)
+				ifTrue: [ rPackage packageOrganizer ]
+				ifFalse: [ rPackage organizer ]) packages  ]
+		ifFalse: [ PackageOrganizer default packages ]

Diff for: 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 ]