Skip to content

Commit

Permalink
Clean packages usage
Browse files Browse the repository at this point in the history
- Remove dead #classCategory (we do not want categories anymore!)
- Replace references to RPackageOrganizer for PackageOrganizer
- Remove usage of RPackageSet. Monticello does not use the cache anymore! So we can remove everything about it (especially since RPackageSet will be deprecated)
  • Loading branch information
jecisc committed Nov 16, 2023
1 parent 622e4bb commit cbdf20d
Show file tree
Hide file tree
Showing 295 changed files with 3,185 additions and 2,752 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/preLoading.st
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#( 'BaselineOfLibGit' 'BaselineOfIceberg' ) do: [ :each |
(RPackageOrganizer default packageNamed: each ifAbsent: [ nil ])
(PackageOrganizer default packageNamed: each ifAbsent: [ nil ])
ifNotNil: [ :aPackage | aPackage removeFromSystem ] ]
4 changes: 2 additions & 2 deletions Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInI
self repository commitWithMessage: message.

self repository unload.
self deny: (RPackageOrganizer default includesPackageNamed: self packageName1).
self deny: (PackageOrganizer default includesPackageNamed: self packageName1).

self repository head checkoutAllPackages.
self assertClassExists: #IceGeneratedClassForTesting.
Expand Down Expand Up @@ -458,7 +458,7 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCommitInstallsCodeInImage [
self repository commitWithMessage: message.

self repository unload.
self deny: (RPackageOrganizer default includesPackageNamed: self packageName1).
self deny: (PackageOrganizer default includesPackageNamed: self packageName1).

self repository branch commit checkoutAllPackages.
self assertClassExists: #IceGeneratedClassForTesting.
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/Clipboard.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #Clipboard }
Extension { #name : 'Clipboard' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
Clipboard class >> clipboardText: aText informing: aString [
UIManager inform: aString.
^ self clipboardText: aText
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/CmCommandGroup.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #CmCommandGroup }
Extension { #name : 'CmCommandGroup' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
CmCommandGroup >> commandOrGroupNamed: aString ifFound: aBlock [

^ entries
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/CmCommandGroupDecorator.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #CmCommandGroupDecorator }
Extension { #name : 'CmCommandGroupDecorator' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
CmCommandGroupDecorator >> commandOrGroupNamed: aString ifFound: aBlock [

^ self decoratedGroup commandOrGroupNamed: aString ifFound: aBlock
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #CmUICommandDisplayStrategy }
Extension { #name : 'CmUICommandDisplayStrategy' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
CmUICommandDisplayStrategy >> ifVisible: aCmSpecCommand do: aBlock [

self subclassResponsibility
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #CmUIDisableWhenCantBeRun }
Extension { #name : 'CmUIDisableWhenCantBeRun' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
CmUIDisableWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [
"Always visible"

Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #CmUIHideWhenCantBeRun }
Extension { #name : 'CmUIHideWhenCantBeRun' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
CmUIHideWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [
"Visible if #canBeExecuted"

Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/FTBasicItem.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #FTBasicItem }
Extension { #name : 'FTBasicItem' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
FTBasicItem >> toggle [
self isExpanded
ifTrue: [ self collapseAndRefresh ]
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/FTRootItem.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #FTRootItem }
Extension { #name : 'FTRootItem' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
FTRootItem >> isRoot [
^ true
]
6 changes: 3 additions & 3 deletions Iceberg-TipUI/FTTableMorph.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #FTTableMorph }
Extension { #name : 'FTTableMorph' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
FTTableMorph >> selectFirstVisibleRow [
^ self
selectIndex:
Expand All @@ -9,7 +9,7 @@ FTTableMorph >> selectFirstVisibleRow [
ifEmpty: [ 0 ])
]

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
FTTableMorph >> useFunction: aFilterFunctionClass do: aBlock [
function := aFilterFunctionClass table: self.
aBlock cull: function cull: self
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/FTTreeItem.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #FTTreeItem }
Extension { #name : 'FTTreeItem' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
FTTreeItem >> isRoot [
^ false
]
6 changes: 3 additions & 3 deletions Iceberg-TipUI/IceAbstractCredentials.extension.st
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Extension { #name : #IceAbstractCredentials }
Extension { #name : 'IceAbstractCredentials' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceAbstractCredentials >> askForModelClass [
^ self subclassResponsibility
]

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceAbstractCredentials >> editModelClass [
^ self subclassResponsibility
]
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceAddition.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #IceAddition }
Extension { #name : 'IceAddition' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceAddition >> icon [

^ self iconNamed: #changeAdd
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceCheckoutAllPackages.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #IceCheckoutAllPackages }
Extension { #name : 'IceCheckoutAllPackages' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceCheckoutAllPackages class >> description [
^ 'Checkout ALL packages in the repository'
]
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #IceCheckoutAlreadyLoadedPackages }
Extension { #name : 'IceCheckoutAlreadyLoadedPackages' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceCheckoutAlreadyLoadedPackages class >> description [
^ 'Checkout packages ALREADY LOADED in the image'
]
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #IceCheckoutDoNotLoadPackages }
Extension { #name : 'IceCheckoutDoNotLoadPackages' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceCheckoutDoNotLoadPackages class >> description [
^ 'DO NOT CHECKOUT any packages, I will load them manually (for experts only)'
]
6 changes: 3 additions & 3 deletions Iceberg-TipUI/IceCheckoutStrategy.extension.st
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Extension { #name : #IceCheckoutStrategy }
Extension { #name : 'IceCheckoutStrategy' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceCheckoutStrategy >> description [

^ self class description
]

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceCheckoutStrategy class >> description [
^ self subclassResponsibility
]
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceClassDefinition.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #IceClassDefinition }
Extension { #name : 'IceClassDefinition' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceClassDefinition >> icon [
^ self iconNamed: #class
]
6 changes: 3 additions & 3 deletions Iceberg-TipUI/IceConflictingOperation.extension.st
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Extension { #name : #IceConflictingOperation }
Extension { #name : 'IceConflictingOperation' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceConflictingOperation >> operationIcon [
^ self iconNamed: #changeUpdate
]

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceConflictingOperation >> preferredColor [

^ self isResolved
Expand Down
10 changes: 6 additions & 4 deletions Iceberg-TipUI/IceCreateBranchCommand.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ I'm a command to create a new branch from a commit.
this is usefull in the case of commiting changes in unsync repositories (so you open a branch and you commit there)
"
Class {
#name : #IceCreateBranchCommand,
#superclass : #IceRepositoryCommand,
#category : #'Iceberg-TipUI-Commands'
#name : 'IceCreateBranchCommand',
#superclass : 'IceRepositoryCommand',
#category : 'Iceberg-TipUI-Commands',
#package : 'Iceberg-TipUI',
#tag : 'Commands'
}

{ #category : #execute }
{ #category : 'execute' }
IceCreateBranchCommand >> execute [
| selection |

Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceDefinition.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #IceDefinition }
Extension { #name : 'IceDefinition' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceDefinition >> icon [

self subclassResponsibility
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceDirectoryDefinition.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #IceDirectoryDefinition }
Extension { #name : 'IceDirectoryDefinition' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceDirectoryDefinition >> icon [
^ self iconNamed: #emptyPackage
]
6 changes: 3 additions & 3 deletions Iceberg-TipUI/IceErrorVisitor.extension.st
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Extension { #name : #IceErrorVisitor }
Extension { #name : 'IceErrorVisitor' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceErrorVisitor >> visitExperimentalFeature: aWarning [

"By default experimental features are just accepted when we are not in an interactive mode".
aWarning resume
]

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceErrorVisitor >> visitNoCommitMessage: aWarning [
self visitGenericError: aWarning
]
10 changes: 6 additions & 4 deletions Iceberg-TipUI/IceExperimentalFeature.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ Everytime an user tries to use an experimental feature, maybe the UI want to sho
This is useful to guarantee the correct keeping of the changes.
"
Class {
#name : #IceExperimentalFeature,
#superclass : #IceWarning,
#category : #'Iceberg-TipUI-Exceptions'
#name : 'IceExperimentalFeature',
#superclass : 'IceWarning',
#category : 'Iceberg-TipUI-Exceptions',
#package : 'Iceberg-TipUI',
#tag : 'Exceptions'
}

{ #category : #visiting }
{ #category : 'visiting' }
IceExperimentalFeature >> acceptError: aVisitor [

aVisitor visitExperimentalFeature: self
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceExtensionDefinition.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #IceExtensionDefinition }
Extension { #name : 'IceExtensionDefinition' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceExtensionDefinition >> icon [
^ self iconNamed: #group
]
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceFileDefinition.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #IceFileDefinition }
Extension { #name : 'IceFileDefinition' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceFileDefinition >> icon [
^ self iconNamed: #book
]
6 changes: 3 additions & 3 deletions Iceberg-TipUI/IceFileSystemDefinition.extension.st
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Extension { #name : #IceFileSystemDefinition }
Extension { #name : 'IceFileSystemDefinition' }

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceFileSystemDefinition >> canBeBrowsed [

"It can always be browsed through the libgit file system"
^ true
]

{ #category : #'*Iceberg-TipUI' }
{ #category : '*Iceberg-TipUI' }
IceFileSystemDefinition >> canBrowseReferences [

"We do not track file references..."
Expand Down
Loading

0 comments on commit cbdf20d

Please sign in to comment.