Skip to content

Commit d6ea569

Browse files
committed
fix sent by Eliot
1 parent 6edf54c commit d6ea569

File tree

4 files changed

+26
-4
lines changed

4 files changed

+26
-4
lines changed
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
private
2-
createDefaultOrganizationFrom: aMCClassDefinition
3-
^ MCOrganizationDefinition categories: { aMCClassDefinition category }
2+
createDefaultOrganizationFrom: aCollection
3+
"answers a default organisation for the cases where there are none"
4+
5+
"simplest case, I answer the clas definition"
6+
snapshot definitions
7+
detect: #isClassDefinition
8+
ifFound: [ :each | ^ each category ].
9+
10+
^ self createDefaultOrganizationFromDefinition: (snapshot definitions
11+
detect: #isMethodDefinition
12+
ifNone: [ self error: 'cannot determine package name from empty snapshot' ])
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
private
2+
createDefaultOrganizationFromDefinition: aMethodDefinition
3+
4+
^ MCOrganizationDefinition categories: (self packageNameForMethodDefinition: aMethodDefinition)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
private
2+
packageNameForMethodDefinition: aMethodDefinition
3+
| category |
4+
5+
self assert: aMethodDefinition category first = $*.
6+
category := aMethodDefinition category allButFirst.
7+
^(MCWorkingCopy allManagers
8+
detect: ((category allSatisfy: #isLowercase)
9+
ifTrue: [[: wc| category beginsWith: wc packageName asLowercase]]
10+
ifFalse: [[: wc| category beginsWith: wc packageName]])) packageName

MonticelloTonel-Core.package/TonelWriter.class/instance/writeSnapshot..st

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ writeSnapshot: aSnapshot
66
It has to be just one but well..."
77
self writePackage: (snapshot definitions
88
detect: #isOrganizationDefinition
9-
ifFound: [ :each | each ]
10-
ifNone: [ self createDefaultOrganizationFrom: (snapshot definitions detect: #isClassDefinition) ]).
9+
ifNone: [ self createDefaultOrganizationFrom: snapshot definitions ]).
1110
"now export classes"
1211
(snapshot definitions
1312
select: #isClassDefinition)

0 commit comments

Comments
 (0)