From 901fb7f84134218f0d78a295dcd8ec7f25ee1176 Mon Sep 17 00:00:00 2001 From: Cyril Ferlicot Date: Mon, 24 Jul 2017 18:40:50 +0200 Subject: [PATCH 1/5] Guess the subdirectory while importing a local repository. See: https://github.com/pharo-vcs/iceberg/issues/421 Taking into account Esteban's comments --- .../instance/guessSubDirectory.st | 10 ++++++++++ .../instance/initializeWidgets.st | 1 + .../IceLocationModel.class/instance/choose.st | 3 ++- .../IceLocationModel.class/instance/onChoose..st | 5 +++++ .../IceLocationModel.class/instance/onChoose.st | 3 +++ .../IceLocationModel.class/properties.json | 3 ++- 6 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 Iceberg-UI.package/IceCreateRepositoryModel.class/instance/guessSubDirectory.st create mode 100644 Iceberg-UI.package/IceLocationModel.class/instance/onChoose..st create mode 100644 Iceberg-UI.package/IceLocationModel.class/instance/onChoose.st diff --git a/Iceberg-UI.package/IceCreateRepositoryModel.class/instance/guessSubDirectory.st b/Iceberg-UI.package/IceCreateRepositoryModel.class/instance/guessSubDirectory.st new file mode 100644 index 0000000000..00e59f76fb --- /dev/null +++ b/Iceberg-UI.package/IceCreateRepositoryModel.class/instance/guessSubDirectory.st @@ -0,0 +1,10 @@ +actions +guessSubDirectory + "If a '.filetree' file, there is a high chance that this is a smalltalk code directory. In that case, the directory containing it is probably the subdirectory of the repository." + + | location | + location := localDirectoryLocation location. + location files + detect: [ :file | file basename = '.filetree' ] + ifFound: [ :dir | subdirectory text: '' ] + ifNone: [ location directories do: [ :directory | directory files detect: [ :file | file basename = '.filetree' ] ifFound: [ :file | subdirectory text: directory basename ] ] ] \ No newline at end of file diff --git a/Iceberg-UI.package/IceCreateRepositoryModel.class/instance/initializeWidgets.st b/Iceberg-UI.package/IceCreateRepositoryModel.class/instance/initializeWidgets.st index 6e75e70bd2..39b3ea51f5 100644 --- a/Iceberg-UI.package/IceCreateRepositoryModel.class/instance/initializeWidgets.st +++ b/Iceberg-UI.package/IceCreateRepositoryModel.class/instance/initializeWidgets.st @@ -2,6 +2,7 @@ initialization initializeWidgets localDirectoryLocation := self instantiate: IceDirectoryModel. localDirectoryLocation + onChoose: [ self guessSubDirectory ]; label: 'Local directory'; chooseTitle: 'Choose local repository'; location: self defaultLocation. diff --git a/Iceberg-UI.package/IceLocationModel.class/instance/choose.st b/Iceberg-UI.package/IceLocationModel.class/instance/choose.st index ac3da89298..1ab857f20e 100644 --- a/Iceberg-UI.package/IceLocationModel.class/instance/choose.st +++ b/Iceberg-UI.package/IceLocationModel.class/instance/choose.st @@ -2,4 +2,5 @@ actions choose self chooseReference ifNotNil: [ :reference | self location: reference. - self locationInput text: reference pathString ] \ No newline at end of file + self locationInput text: reference pathString. + self onChoose ifNotNil: #value ] \ No newline at end of file diff --git a/Iceberg-UI.package/IceLocationModel.class/instance/onChoose..st b/Iceberg-UI.package/IceLocationModel.class/instance/onChoose..st new file mode 100644 index 0000000000..899ba6c029 --- /dev/null +++ b/Iceberg-UI.package/IceLocationModel.class/instance/onChoose..st @@ -0,0 +1,5 @@ +hook +onChoose: aBlockClosure + "I allow to set a hook to execute when the user select a location." + + chooseBlock := aBlockClosure \ No newline at end of file diff --git a/Iceberg-UI.package/IceLocationModel.class/instance/onChoose.st b/Iceberg-UI.package/IceLocationModel.class/instance/onChoose.st new file mode 100644 index 0000000000..42e6642d68 --- /dev/null +++ b/Iceberg-UI.package/IceLocationModel.class/instance/onChoose.st @@ -0,0 +1,3 @@ +hook +onChoose + ^ chooseBlock \ No newline at end of file diff --git a/Iceberg-UI.package/IceLocationModel.class/properties.json b/Iceberg-UI.package/IceLocationModel.class/properties.json index 3393a7ed5a..959509d5bb 100644 --- a/Iceberg-UI.package/IceLocationModel.class/properties.json +++ b/Iceberg-UI.package/IceLocationModel.class/properties.json @@ -10,7 +10,8 @@ "locationInput", "chooseButton", "label", - "chooseTitle" + "chooseTitle", + "chooseBlock" ], "name" : "IceLocationModel", "type" : "normal" From 7be67c026f27dc3b37ac8e6ab967956831da5428 Mon Sep 17 00:00:00 2001 From: Cyril Ferlicot Date: Mon, 21 Aug 2017 18:36:42 +0200 Subject: [PATCH 2/5] Change senders of #subscribe:send:to: to use #when:send:to: --- .../IceCachedValue.class/instance/invalidateOn.from..st | 2 +- .../IceDiffChangeTreeBuilder.class/instance/buildOn..st | 2 +- .../instance/buildOn..st | 2 +- .../instance/composeRepositories.in..st | 2 +- .../instance/composeRepositoriesIn..st | 2 +- Iceberg.package/IceDiff.class/instance/repository..st | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Iceberg-UI.package/IceCachedValue.class/instance/invalidateOn.from..st b/Iceberg-UI.package/IceCachedValue.class/instance/invalidateOn.from..st index 58592717c7..ffed264ff0 100644 --- a/Iceberg-UI.package/IceCachedValue.class/instance/invalidateOn.from..st +++ b/Iceberg-UI.package/IceCachedValue.class/instance/invalidateOn.from..st @@ -1,3 +1,3 @@ initialization invalidateOn: announcementType from: announcer - announcer subscribe: announcementType send: #reset to: self \ No newline at end of file + announcer when: announcementType send: #reset to: self \ No newline at end of file diff --git a/Iceberg-UI.package/IceDiffChangeTreeBuilder.class/instance/buildOn..st b/Iceberg-UI.package/IceDiffChangeTreeBuilder.class/instance/buildOn..st index a20f07a5fe..35aa788a01 100644 --- a/Iceberg-UI.package/IceDiffChangeTreeBuilder.class/instance/buildOn..st +++ b/Iceberg-UI.package/IceDiffChangeTreeBuilder.class/instance/buildOn..st @@ -14,7 +14,7 @@ buildOn: aPresenter onChangeOfPort: #entity act: [ :presentation | self diff ifNotNil: [ self diff announcer - subscribe: IceChangeSetChanged + when: IceChangeSetChanged send: #execute: to: (IceChangesTreeResetSelectionHelper for: presentation) ] ]; yourself \ No newline at end of file diff --git a/Iceberg-UI.package/IceDiffCherryPickChangeTreeBuilder.class/instance/buildOn..st b/Iceberg-UI.package/IceDiffCherryPickChangeTreeBuilder.class/instance/buildOn..st index 3b315f926b..41da3ece01 100644 --- a/Iceberg-UI.package/IceDiffCherryPickChangeTreeBuilder.class/instance/buildOn..st +++ b/Iceberg-UI.package/IceDiffCherryPickChangeTreeBuilder.class/instance/buildOn..st @@ -16,7 +16,7 @@ buildOn: aPresenter onChangeOfPort: #entity act: [ :presentation | self diff ifNotNil: [ self diff announcer - subscribe: IceChangeSetChanged + when: IceChangeSetChanged send: #execute: to: (IceChangesTreeResetSelectionHelper for: presentation) ] ]; yourself \ No newline at end of file diff --git a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composeRepositories.in..st b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composeRepositories.in..st index dda14cdb85..4c8358edd0 100644 --- a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composeRepositories.in..st +++ b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composeRepositories.in..st @@ -17,7 +17,7 @@ composeRepositories: repositories in: composite table updateOn: MCPackageModified from: MCPackageManager announcer. Iceberg announcer weak - subscribe: IceRepositoryCreated + when: IceRepositoryCreated send: #execute: to: (IceRepositoryUpdateHelper for: table). diff --git a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composeRepositoriesIn..st b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composeRepositoriesIn..st index d8c19b11e6..b15aaac39d 100644 --- a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composeRepositoriesIn..st +++ b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composeRepositoriesIn..st @@ -17,7 +17,7 @@ composeRepositoriesIn: composite table updateOn: MCPackageModified from: MCPackageManager announcer. Iceberg announcer weak - subscribe: IceRepositoryCreated + when: IceRepositoryCreated send: #execute: to: (IceRepositoryUpdateHelper for: table). diff --git a/Iceberg.package/IceDiff.class/instance/repository..st b/Iceberg.package/IceDiff.class/instance/repository..st index 207142e4d9..131eb379eb 100644 --- a/Iceberg.package/IceDiff.class/instance/repository..st +++ b/Iceberg.package/IceDiff.class/instance/repository..st @@ -2,4 +2,4 @@ accessing repository: anObject repository := anObject. repository announcer weak - subscribe: IceCommited send: #refresh to: self \ No newline at end of file + when: IceCommited send: #refresh to: self \ No newline at end of file From e57942bf26799849075cef7e0a2ad93163317a6a Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Wed, 23 Aug 2017 14:44:33 +0100 Subject: [PATCH 3/5] add restore repository dialog --- .../class/compactIfNeeded.st | 6 ++++-- .../IceAbstractModel.class/class/modelFor..st | 21 +++++++++++-------- .../IceAbstractModel.class/class/models.st | 2 +- .../instance/configureRepository..st | 3 +++ .../instance/createRepository.st | 2 +- .../instance/restore.st | 3 +-- .../IceRestoreRepositoryModel.class/README.md | 0 .../class/new.st | 3 +++ .../class/repository..st | 5 +++++ .../instance/configureRepository..st | 6 ++++++ .../instance/initializeRepository..st | 8 +++++++ .../properties.json | 13 ++++++++++++ 12 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 Iceberg-UI.package/IceCloneRepositoryModel.class/instance/configureRepository..st create mode 100644 Iceberg-UI.package/IceRestoreRepositoryModel.class/README.md create mode 100644 Iceberg-UI.package/IceRestoreRepositoryModel.class/class/new.st create mode 100644 Iceberg-UI.package/IceRestoreRepositoryModel.class/class/repository..st create mode 100644 Iceberg-UI.package/IceRestoreRepositoryModel.class/instance/configureRepository..st create mode 100644 Iceberg-UI.package/IceRestoreRepositoryModel.class/instance/initializeRepository..st create mode 100644 Iceberg-UI.package/IceRestoreRepositoryModel.class/properties.json diff --git a/Iceberg-UI.package/IceAbstractModel.class/class/compactIfNeeded.st b/Iceberg-UI.package/IceAbstractModel.class/class/compactIfNeeded.st index f3c3d07320..fff375ea5d 100644 --- a/Iceberg-UI.package/IceAbstractModel.class/class/compactIfNeeded.st +++ b/Iceberg-UI.package/IceAbstractModel.class/class/compactIfNeeded.st @@ -1,5 +1,7 @@ private compactIfNeeded + | newModelCache | self models size > 250 ifFalse: [ ^ self ]. - "it looks like rehash will do what I need :)" - modelCache rehash \ No newline at end of file + newModelCache := self models select: [ :each | each notNil ]. + modelCache := newModelCache + \ No newline at end of file diff --git a/Iceberg-UI.package/IceAbstractModel.class/class/modelFor..st b/Iceberg-UI.package/IceAbstractModel.class/class/modelFor..st index 56a20149ef..51f4da379e 100644 --- a/Iceberg-UI.package/IceAbstractModel.class/class/modelFor..st +++ b/Iceberg-UI.package/IceAbstractModel.class/class/modelFor..st @@ -1,14 +1,17 @@ instance creation modelFor: entity | model | - "We are using a WeakSet for keeping models because using a dictionary (sorted by - name) has problems when cleaning. This should be efficient enough, but we'll see." - model := self models - detect: [ :each | each entity name = entity name ] - ifNone: [ nil ]. + "We are using WeakValueDictionary to keep this sinchronized (in case you have more than + one window open, you want always same model). Now, it has to be cleaned when windows are + no longer around, but associations will be nil... so we cannot use a simple ifAbsentPut:. + Yep, ugly... but effective." + + model := self models at: entity name ifAbsent: [ nil ]. ^ model ifNil: [ self compactIfNeeded. - self models add: (self basicNew - entity: entity; - initialize; - yourself) ] \ No newline at end of file + self models + at: entity name + put: (self basicNew + entity: entity; + initialize; + yourself) ] \ No newline at end of file diff --git a/Iceberg-UI.package/IceAbstractModel.class/class/models.st b/Iceberg-UI.package/IceAbstractModel.class/class/models.st index 6cb4b43220..f5d668375f 100644 --- a/Iceberg-UI.package/IceAbstractModel.class/class/models.st +++ b/Iceberg-UI.package/IceAbstractModel.class/class/models.st @@ -3,4 +3,4 @@ models "since a repository can have same name as a package (and we keep models by name), I need to keep this as an instance of class and not a variable (who would be shared by all hierarchy and because of that prone to errors)" - ^ modelCache ifNil: [ modelCache := WeakSet new ] \ No newline at end of file + ^ modelCache ifNil: [ modelCache := WeakValueDictionary new ] \ No newline at end of file diff --git a/Iceberg-UI.package/IceCloneRepositoryModel.class/instance/configureRepository..st b/Iceberg-UI.package/IceCloneRepositoryModel.class/instance/configureRepository..st new file mode 100644 index 0000000000..f091fe9f39 --- /dev/null +++ b/Iceberg-UI.package/IceCloneRepositoryModel.class/instance/configureRepository..st @@ -0,0 +1,3 @@ +private +configureRepository: aRepository + aRepository register \ No newline at end of file diff --git a/Iceberg-UI.package/IceCloneRepositoryModel.class/instance/createRepository.st b/Iceberg-UI.package/IceCloneRepositoryModel.class/instance/createRepository.st index 7c7bc081bc..1d8028f314 100644 --- a/Iceberg-UI.package/IceCloneRepositoryModel.class/instance/createRepository.st +++ b/Iceberg-UI.package/IceCloneRepositoryModel.class/instance/createRepository.st @@ -8,7 +8,7 @@ createRepository location: self location; subdirectory: subdirectory text; createRepository. - repository register. + self configureRepository: repository. self window delete. ] diff --git a/Iceberg-UI.package/IceRepositoryModel.class/instance/restore.st b/Iceberg-UI.package/IceRepositoryModel.class/instance/restore.st index 201a255e50..da5f15f28b 100644 --- a/Iceberg-UI.package/IceRepositoryModel.class/instance/restore.st +++ b/Iceberg-UI.package/IceRepositoryModel.class/instance/restore.st @@ -1,4 +1,3 @@ actions restore - self repository backend cloneRepository. - self repository refresh. + (IceRestoreRepositoryModel repository: self repository) openWithSpec \ No newline at end of file diff --git a/Iceberg-UI.package/IceRestoreRepositoryModel.class/README.md b/Iceberg-UI.package/IceRestoreRepositoryModel.class/README.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Iceberg-UI.package/IceRestoreRepositoryModel.class/class/new.st b/Iceberg-UI.package/IceRestoreRepositoryModel.class/class/new.st new file mode 100644 index 0000000000..fff5b20bea --- /dev/null +++ b/Iceberg-UI.package/IceRestoreRepositoryModel.class/class/new.st @@ -0,0 +1,3 @@ +instance creation +new + self error: 'Use #repository:' \ No newline at end of file diff --git a/Iceberg-UI.package/IceRestoreRepositoryModel.class/class/repository..st b/Iceberg-UI.package/IceRestoreRepositoryModel.class/class/repository..st new file mode 100644 index 0000000000..de3faa4f40 --- /dev/null +++ b/Iceberg-UI.package/IceRestoreRepositoryModel.class/class/repository..st @@ -0,0 +1,5 @@ +instance creation +repository: aRepository + ^ self basicNew + initializeRepository: aRepository; + yourself \ No newline at end of file diff --git a/Iceberg-UI.package/IceRestoreRepositoryModel.class/instance/configureRepository..st b/Iceberg-UI.package/IceRestoreRepositoryModel.class/instance/configureRepository..st new file mode 100644 index 0000000000..1f17ee850a --- /dev/null +++ b/Iceberg-UI.package/IceRestoreRepositoryModel.class/instance/configureRepository..st @@ -0,0 +1,6 @@ +private +configureRepository: aRepository + repository location = aRepository location + ifFalse: [ repository location: aRepository location ]. + repository subdirectory = aRepository subdirectory + ifFalse: [ repository subdirectory: aRepository subdirectory ] diff --git a/Iceberg-UI.package/IceRestoreRepositoryModel.class/instance/initializeRepository..st b/Iceberg-UI.package/IceRestoreRepositoryModel.class/instance/initializeRepository..st new file mode 100644 index 0000000000..d7245e5f1d --- /dev/null +++ b/Iceberg-UI.package/IceRestoreRepositoryModel.class/instance/initializeRepository..st @@ -0,0 +1,8 @@ +initialization +initializeRepository: aRepository + repository := aRepository. + self initialize. + repository location ifNotNil: [ + remoteUrl text: repository origin url. + localDirectoryLocation location: repository location ]. + subdirectory text: repository subdirectory diff --git a/Iceberg-UI.package/IceRestoreRepositoryModel.class/properties.json b/Iceberg-UI.package/IceRestoreRepositoryModel.class/properties.json new file mode 100644 index 0000000000..b51d3cbcc1 --- /dev/null +++ b/Iceberg-UI.package/IceRestoreRepositoryModel.class/properties.json @@ -0,0 +1,13 @@ +{ + "commentStamp" : "", + "super" : "IceCloneRepositoryModel", + "category" : "Iceberg-UI-View", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ + "repository" + ], + "name" : "IceRestoreRepositoryModel", + "type" : "normal" +} \ No newline at end of file From d7068d0e9750eb7031d0af8b961440acc0ec3553 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Wed, 23 Aug 2017 15:30:13 +0100 Subject: [PATCH 4/5] split clone from checkout (so I do it just once when a branch is explicit) --- .../instance/changedFilesBetween.and..st | 8 +++++--- .../instance/cloneRepositoryFrom.branch..st | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/changedFilesBetween.and..st b/Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/changedFilesBetween.and..st index 5c8fa2be21..54536dced0 100644 --- a/Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/changedFilesBetween.and..st +++ b/Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/changedFilesBetween.and..st @@ -4,7 +4,9 @@ changedFilesBetween: aCommitish and: otherCommitish | fromTree toTree | self withRepoDo: [ :repo | | diff | - fromTree := (LGitCommit of: repo fromHexString: aCommitish id) tree. - toTree := (LGitCommit of: repo fromHexString: otherCommitish id) tree. - diff := fromTree diffTo: toTree. + fromTree := (LGitCommit of: repo fromId: (LGitId fromHexString: aCommitish id)) tree. + toTree := (LGitCommit of: repo fromId: (LGitId fromHexString: otherCommitish id)) tree. + + diff := LGitDiff of: repo. + diff diffTree: fromTree toTree: toTree. ^ diff files ] \ No newline at end of file diff --git a/Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/cloneRepositoryFrom.branch..st b/Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/cloneRepositoryFrom.branch..st index fa91eacec7..c5d1f514a6 100644 --- a/Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/cloneRepositoryFrom.branch..st +++ b/Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/cloneRepositoryFrom.branch..st @@ -7,10 +7,12 @@ cloneRepositoryFrom: aRemote branch: aBranchName | repo cloneOptions | repo := LGitRepository on: self location. cloneOptions := LGitCloneOptions withCredentialsProvider: IceCredentialsProvider default. - + cloneOptions checkoutOptions checkoutStrategy: LGitCheckoutStrategyEnum git_checkout_none. repo clone: url options: cloneOptions. - aBranchName ifNotNil: [ - repo checkout: aBranchName ]. + repo checkout: (aBranchName ifNil: [ + self branch + ifNotNil: [ :b | b name ] + ifNil: [ 'master' ] ]). (LGitRemote of: repo named: 'origin') lookup; From 18dfa9cad5f61139f830e79206ba7e230ebc7636 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Thu, 24 Aug 2017 12:28:34 +0100 Subject: [PATCH 5/5] do not cache the plugin manager (it does not worths, and can cause problems) --- .../IcePluginManager.class/class/managerFor..st | 4 +--- .../IcePluginManager.class/class/managers.st | 3 --- .../IcePluginManager.class/instance/availablePluginsFor..st | 2 +- .../IcePluginManager.class/instance/configurePluginsFor..st | 3 +++ .../instance/initializeRepository..st | 2 +- .../IcePluginManager.class/properties.json | 4 +--- Iceberg-Plugin.package/monticello.meta/categories.st | 6 +++--- 7 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 Iceberg-Plugin.package/IcePluginManager.class/class/managers.st create mode 100644 Iceberg-Plugin.package/IcePluginManager.class/instance/configurePluginsFor..st diff --git a/Iceberg-Plugin.package/IcePluginManager.class/class/managerFor..st b/Iceberg-Plugin.package/IcePluginManager.class/class/managerFor..st index f9e0990743..6613be6e73 100644 --- a/Iceberg-Plugin.package/IcePluginManager.class/class/managerFor..st +++ b/Iceberg-Plugin.package/IcePluginManager.class/class/managerFor..st @@ -1,5 +1,3 @@ instance creation managerFor: aRepository - ^ self managers - at: aRepository - ifAbsentPut: [ self basicNew initializeRepository: aRepository ]. + ^ self basicNew initializeRepository: aRepository diff --git a/Iceberg-Plugin.package/IcePluginManager.class/class/managers.st b/Iceberg-Plugin.package/IcePluginManager.class/class/managers.st deleted file mode 100644 index d7125367ce..0000000000 --- a/Iceberg-Plugin.package/IcePluginManager.class/class/managers.st +++ /dev/null @@ -1,3 +0,0 @@ -private -managers - ^ Managers ifNil: [ Managers := WeakKeyDictionary new ] \ No newline at end of file diff --git a/Iceberg-Plugin.package/IcePluginManager.class/instance/availablePluginsFor..st b/Iceberg-Plugin.package/IcePluginManager.class/instance/availablePluginsFor..st index 631fc5880c..6375df1ebd 100644 --- a/Iceberg-Plugin.package/IcePluginManager.class/instance/availablePluginsFor..st +++ b/Iceberg-Plugin.package/IcePluginManager.class/instance/availablePluginsFor..st @@ -1,4 +1,4 @@ -initialization +private availablePluginsFor: aRepository ^ (IcePlugin allAvailableFor: aRepository) collect: #new diff --git a/Iceberg-Plugin.package/IcePluginManager.class/instance/configurePluginsFor..st b/Iceberg-Plugin.package/IcePluginManager.class/instance/configurePluginsFor..st new file mode 100644 index 0000000000..d95f01914d --- /dev/null +++ b/Iceberg-Plugin.package/IcePluginManager.class/instance/configurePluginsFor..st @@ -0,0 +1,3 @@ +accessing +configurePluginsFor: aRepository + plugins := self availablePluginsFor: aRepository \ No newline at end of file diff --git a/Iceberg-Plugin.package/IcePluginManager.class/instance/initializeRepository..st b/Iceberg-Plugin.package/IcePluginManager.class/instance/initializeRepository..st index 79c8cdd6db..a859d99094 100644 --- a/Iceberg-Plugin.package/IcePluginManager.class/instance/initializeRepository..st +++ b/Iceberg-Plugin.package/IcePluginManager.class/instance/initializeRepository..st @@ -1,4 +1,4 @@ initialization initializeRepository: aRepository. self initialize. - plugins := self availablePluginsFor: aRepository \ No newline at end of file + self configurePluginsFor: aRepository \ No newline at end of file diff --git a/Iceberg-Plugin.package/IcePluginManager.class/properties.json b/Iceberg-Plugin.package/IcePluginManager.class/properties.json index 833a111ca1..8efecdb4dc 100644 --- a/Iceberg-Plugin.package/IcePluginManager.class/properties.json +++ b/Iceberg-Plugin.package/IcePluginManager.class/properties.json @@ -4,9 +4,7 @@ "category" : "Iceberg-Plugin-Base", "classinstvars" : [ ], "pools" : [ ], - "classvars" : [ - "Managers" - ], + "classvars" : [ ], "instvars" : [ "plugins" ], diff --git a/Iceberg-Plugin.package/monticello.meta/categories.st b/Iceberg-Plugin.package/monticello.meta/categories.st index b2da7723bd..682c0e81d8 100644 --- a/Iceberg-Plugin.package/monticello.meta/categories.st +++ b/Iceberg-Plugin.package/monticello.meta/categories.st @@ -1,4 +1,4 @@ SystemOrganization addCategory: #'Iceberg-Plugin'! -SystemOrganization addCategory: 'Iceberg-Plugin-Base'! -SystemOrganization addCategory: 'Iceberg-Plugin-General'! -SystemOrganization addCategory: 'Iceberg-Plugin-Pharo-FogBugz'! +SystemOrganization addCategory: #'Iceberg-Plugin-Base'! +SystemOrganization addCategory: #'Iceberg-Plugin-General'! +SystemOrganization addCategory: #'Iceberg-Plugin-Pharo-FogBugz'!