Merge pull request pharo-vcs#1759 from pharo-vcs/clean-packages-usage

Clean packages usage

Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st

@@ -428,8 +428,8 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInI
 	self repository commitWithMessage: message.
 
 	self repository unload.
-	self deny: (RPackageOrganizer default hasPackage: self packageName1).
-
+	self deny: (PackageOrganizer default includesPackageNamed: self packageName1).
+	
 	self repository head checkoutAllPackages.
 	self assertClassExists: #IceGeneratedClassForTesting.
 	self assertPackageExists: self packageName1
@@ -454,8 +454,8 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCommitInstallsCodeInImage [
 	self repository commitWithMessage: message.
 
 	self repository unload.
-	self deny: (RPackageOrganizer default hasPackage: self packageName1).
-
+	self deny: (PackageOrganizer default includesPackageNamed: self packageName1).
+	
 	self repository branch commit checkoutAllPackages.
 	self assertClassExists: #IceGeneratedClassForTesting.
 	self assertPackageExists: self packageName1

Iceberg-TipUI/IcePackage.extension.st

@@ -3,5 +3,5 @@ Extension { #name : 'IcePackage' }
 { #category : '*Iceberg-TipUI' }
 IcePackage >> browse [
 
-	(RPackageOrganizer default packageNamed: self name) browse
+	(PackageOrganizer default packageNamed: self name) browse
 ]

Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st

@@ -30,9 +30,7 @@ IceTipAddPackagesDialogPresenter >> accept [
 { #category : 'accessing' }
 IceTipAddPackagesDialogPresenter >> allPackages [
 
-	^ RPackageOrganizer default packages
-		asOrderedCollection 
-		sort: [ :a :b | a name < b name ]
+	^ self packageOrganizer packages asOrderedCollection sort: [ :a :b | a name < b name ]
 ]
 
 { #category : 'accessing' }

Iceberg/IceSystemEventListener.class.st

@@ -48,26 +48,25 @@ IceSystemEventListener class >> handleVersionLoaded: ann [
 
 	| package |
 	"this is ugly, but since I do not have a package I need to look for it"
-	package := RPackageOrganizer default packageMatchingExtensionName: ann label.
-
-	"The package can be nil".
-	package ifNil: [ ^self ].
-
-	"now we can verify its status"
-	RPackageSet withoutCacheDo: [
-		IceRepository registry
-			do: [ :repository | 
-				(repository includesPackageNamed: package name)
-					ifTrue: [ | icePackage isDirty |
-						icePackage := repository packageNamed: package name.
-						self flag: #pharoTodo. "Ugly hack. Should enhance for next version"
-						isDirty := repository workingCopy referenceCommit isUnknownCommit
-							ifTrue: [ true ]
-							ifFalse: [ | diff |
-								diff := repository workingCopy referenceCommit diffToWorkingCopyForPackage: icePackage.
-								diff includesPackageNamed: package name ].
-						icePackage beDirty: isDirty.
-						Iceberg announcer announce: (IceRepositoryModified for: repository) ] ]]
+	package := self packageOrganizer packageMatchingExtensionName: ann label.
+
+	"The package can be nil"
+	package ifNil: [ ^ self ].
+
+
+	IceRepository registry do: [ :repository |
+		(repository includesPackageNamed: package name) ifTrue: [
+			| icePackage isDirty |
+			icePackage := repository packageNamed: package name.
+			self flag: #pharoTodo. "Ugly hack. Should enhance for next version"
+			isDirty := repository workingCopy referenceCommit isUnknownCommit
+				           ifTrue: [ true ]
+				           ifFalse: [
+					           | diff |
+					           diff := repository workingCopy referenceCommit diffToWorkingCopyForPackage: icePackage.
+					           diff includesPackageNamed: package name ].
+			icePackage beDirty: isDirty.
+			Iceberg announcer announce: (IceRepositoryModified for: repository) ] ]
 ]
 
 { #category : 'class initialization' }

Iceberg/Iceberg.class.st

@@ -171,18 +171,18 @@ Iceberg class >> remoteTypeSelector: anObject [
 ]
 
 { #category : 'accessing' }
-Iceberg class >> repositoryForPackage: anRPackage [
+Iceberg class >> repositoryForPackage: aPackage [
 
 	| existingRepositories possibleRepositoryTypes |
-	existingRepositories := anRPackage mcWorkingCopy repositoryGroup repositories.
+	existingRepositories := aPackage mcWorkingCopy repositoryGroup repositories.
 	possibleRepositoryTypes := IceRepository allSubclasses , { IceMetacelloRepositoryAdapter . MCGitHubRepository }.
 
 	possibleRepositoryTypes do: [ :class |
 		existingRepositories
 			detect: [ :repo | repo isKindOf: class ]
 			ifFound: [ :repo | ^ repo getOrCreateIcebergRepository ] ].
 
-	self error: ('Could not find a git repository for {1}' format: { anRPackage name })
+	self error: ('Could not find a git repository for {1}' format: { aPackage name })
 ]
 
 { #category : 'settings' }

Iceberg/MCClassDefinition.extension.st

@@ -1,12 +1,5 @@
 Extension { #name : 'MCClassDefinition' }
 
-{ #category : '*Iceberg-Adapters' }
-MCClassDefinition >> classCategory [
-	"Avoid direct use of #category, because MCClassDefinitions and 
-	MCMethodDefinition use the same message for different things. "
-	^ self category
-]
-
 { #category : '*Iceberg' }
 MCClassDefinition >> fullDefinitionString [
 	^ String streamContents: [:stream | 

Iceberg/MCClassTraitDefinition.extension.st

@@ -1,10 +1,5 @@
 Extension { #name : 'MCClassTraitDefinition' }
 
-{ #category : '*Iceberg-Adapters' }
-MCClassTraitDefinition >> classCategory [
-	^ self category
-]
-
 { #category : '*Iceberg-Core' }
 MCClassTraitDefinition >> traitComposition [
 	^ self classTraitComposition 

Iceberg/MCMethodDefinition.extension.st

@@ -5,12 +5,6 @@ MCMethodDefinition >> buildOn: anIcePackageDiff [
 	self shouldBeImplemented.
 ]
 
-{ #category : '*Iceberg-Adapters' }
-MCMethodDefinition >> classCategory [
-	^ self actualClass ifNotNil: #category ifNil: [ RPackage defaultPackageName ]
-
-]
-
 { #category : '*Iceberg-Changes' }
 MCMethodDefinition >> method [
 	^ self actualClass >> self selector