Skip to content

Commit dbd50ae

Browse files
jeciscjecisc
authored
Merge pull request #729 from moosetechnology/rename-importers
Rename Moose-GenericImporter
2 parents d03795d + 4b27b13 commit dbd50ae

10 files changed

+68
-143
lines changed

‎src/BaselineOfFamix/BaselineOfFamix.class.st

+61-136
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ BaselineOfFamix >> groups: spec [
100100
with: #( 'Famix-PharoSmalltalk-Generator'
101101
'EntitiesSmalltalk' );
102102
group: 'Importers'
103-
with: #( 'Moose-GenericImporter' 'Moose-SmalltalkImporter' );
103+
with: #( 'Moose-Importers' 'Moose-SmalltalkImporter' );
104104
group: 'TestModels'
105105
with: #( 'Famix-Test1-Entities' 'Famix-Test2-Entities'
106106
'Famix-Test3-Entities' 'Famix-Test4-Entities' 'Famix-Test7-Entities' );
@@ -119,7 +119,7 @@ BaselineOfFamix >> groups: spec [
119119
'Famix-TestComposedMetamodel-Entities'
120120
'Famix-TestComposedMetamodel' 'Famix-TestComposedComposedMetamodel-Entities'
121121
'Famix-TestComposed3Metamodel-Entities'
122-
'Moose-GenericImporters-Tests' )
122+
'Moose-Importers-Tests' )
123123
]
124124

125125
{ #category : #dependencies }
@@ -150,148 +150,73 @@ BaselineOfFamix >> packageRepositoryURL [
150150
BaselineOfFamix >> packages: spec [
151151

152152
spec
153-
package: 'Moose-Query'
154-
with: [
155-
spec requires: #( 'Fame' 'DeepTraverser' 'CollectionExtensions' ) ];
156-
package: 'Moose-Core'
157-
with: [ spec requires: #( 'Fame' 'Moose-Query' ) ];
158-
package: 'Moose-Core-Generator'
159-
with: [ spec requires: #( 'Famix-MetamodelBuilder-Core' ) ];
160-
package: 'Moose-Query-Extensions'
161-
with: [ spec requires: #( 'Moose-Query' 'BasicTraits' ) ];
153+
package: 'Moose-Query' with: [ spec requires: #( 'Fame' 'DeepTraverser' 'CollectionExtensions' ) ];
154+
package: 'Moose-Core' with: [ spec requires: #( 'Fame' 'Moose-Query' ) ];
155+
package: 'Moose-Core-Generator' with: [ spec requires: #( 'Famix-MetamodelBuilder-Core' ) ];
156+
package: 'Moose-Query-Extensions' with: [ spec requires: #( 'Moose-Query' 'BasicTraits' ) ];
162157
package: 'Famix-Traits' with: [ spec requires: #( 'Moose-Core' ) ];
163-
package: 'Famix-MetamodelBuilder-Core'
164-
with: [ spec requires: #( 'Moose-Core' 'SingularizePluralize' ) ];
165-
package: 'Famix-MetamodelGeneration'
166-
with: [ spec requires: #( 'Famix-MetamodelBuilder-Core' ) ];
167-
package: 'Famix-Visualizations'
168-
with: [ spec requires: #( 'Famix-Traits' 'Fame' 'Moose-Core' ) ];
169-
package: 'Famix-BasicInfrastructure'
170-
with: [ spec requires: #( 'Famix-MetamodelGeneration' ) ];
171-
package: 'Famix-Smalltalk-Utils'
172-
with: [ spec requires: #( 'Moose-Core' ) ];
173-
package: 'Moose-GenericImporter'
174-
with: [ spec requires: #( 'BasicTraits' ) ];
175-
package: 'Moose-SmalltalkImporter' with: [
176-
spec requires:
177-
#( 'Moose-GenericImporter' 'RoelTyper' 'Famix-PharoSmalltalk-Entities' ) ];
178-
package: 'Famix-VerveineJ-Tests'
179-
with: [
180-
spec requires: #( 'Moose-Core-Tests' 'Famix-Java-Entities' ) ];
181-
package: 'Famix-PharoSmalltalk-Generator'
182-
with: [ spec requires: #( 'Basic' ) ];
183-
package: 'Famix-PharoSmalltalk-Entities'
184-
with: [ spec requires: #( 'Famix-Smalltalk-Utils'
185-
'BasicTraits' ) ];
158+
package: 'Famix-MetamodelBuilder-Core' with: [ spec requires: #( 'Moose-Core' 'SingularizePluralize' ) ];
159+
package: 'Famix-MetamodelGeneration' with: [ spec requires: #( 'Famix-MetamodelBuilder-Core' ) ];
160+
package: 'Famix-Visualizations' with: [ spec requires: #( 'Famix-Traits' 'Fame' 'Moose-Core' ) ];
161+
package: 'Famix-BasicInfrastructure' with: [ spec requires: #( 'Famix-MetamodelGeneration' ) ];
162+
package: 'Famix-Smalltalk-Utils' with: [ spec requires: #( 'Moose-Core' ) ];
163+
package: 'Moose-Importers' with: [ spec requires: #( 'BasicTraits' ) ];
164+
package: 'Moose-SmalltalkImporter' with: [ spec requires: #( 'Moose-Importers' 'RoelTyper' 'Famix-PharoSmalltalk-Entities' ) ];
165+
package: 'Famix-VerveineJ-Tests' with: [ spec requires: #( 'Moose-Core-Tests' 'Famix-Java-Entities' ) ];
166+
package: 'Famix-PharoSmalltalk-Generator' with: [ spec requires: #( 'Basic' ) ];
167+
package: 'Famix-PharoSmalltalk-Entities' with: [ spec requires: #( 'Famix-Smalltalk-Utils' 'BasicTraits' ) ];
186168
package: 'Famix-PharoSmalltalk-Tests' with: [
187169
spec requires:
188-
#( 'Famix-PharoSmalltalk-Entities'
189-
'Moose-SmalltalkImporter-Core-Tests'
190-
'PackageBlueprintTestResources'
191-
'Moose-TestResources-LCOM' 'KGBTestResources' ) ];
192-
package: 'Famix-Java-Generator'
193-
with: [ spec requires: #( 'Basic' ) ];
194-
package: 'Famix-Java-Entities'
195-
with: [ spec requires: #( 'BasicTraits' ) ];
196-
package: 'Famix-Java-Visitor'
197-
with: [ spec requires: #( 'Famix-Java-Entities' ) ];
198-
package: 'Famix-Java-Tests'
199-
with: [
200-
spec requires: #( 'Famix-Java-Entities' 'Famix-Java-Generator' ) ];
170+
#( 'Famix-PharoSmalltalk-Entities' 'Moose-SmalltalkImporter-Core-Tests' 'PackageBlueprintTestResources' 'Moose-TestResources-LCOM'
171+
'KGBTestResources' ) ];
172+
package: 'Famix-Java-Generator' with: [ spec requires: #( 'Basic' ) ];
173+
package: 'Famix-Java-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
174+
package: 'Famix-Java-Visitor' with: [ spec requires: #( 'Famix-Java-Entities' ) ];
175+
package: 'Famix-Java-Tests' with: [ spec requires: #( 'Famix-Java-Entities' 'Famix-Java-Generator' ) ];
201176
package: 'Moose-TestResources-LAN';
202177
package: 'Moose-TestResources-LCOM';
203-
package: 'Moose-Query-Test'
204-
with: [ spec requires: #( 'Moose-Query' 'Famix-Java-Entities' ) ];
205-
package: 'FamixTestGenerator'
206-
with: [ spec requires: #( 'Famix-Tests' 'Fame' ) ];
207-
package: 'Famix-Tests'
208-
with: [ spec requires: #( 'BasicTraits' 'Talents' ) ];
209-
package: 'Moose-Core-Tests'
210-
with: [
211-
spec requires: #( 'TestModels' 'Moose-Core-Tests-Entities' ) ];
212-
package: 'Moose-Core-Tests-Entities'
213-
with: [ spec requires: #( 'Moose-Core' 'BasicTraits' ) ];
214-
package: 'Moose-GenericImporters-Tests'
215-
with: [
216-
spec requires: #( 'Moose-GenericImporter' 'Famix-Test1-Entities' ) ];
217-
package: 'Famix-Smalltalk-Utils-Tests' with: [
218-
spec requires:
219-
#( 'Famix-Smalltalk-Utils' 'ReferenceTestResources' ) ];
220-
package: 'Moose-SmalltalkImporter-Core-Tests' with: [
221-
spec requires: #( 'Moose-Core-Tests' 'Moose-SmalltalkImporter'
222-
'ReferenceTestResources' ) ];
223-
package: 'Moose-SmalltalkImporter-LAN-Tests' with: [
224-
spec requires: #( 'Moose-SmalltalkImporter-Core-Tests'
225-
'Moose-TestResources-LAN' ) ];
226-
package: 'Moose-SmalltalkImporter-KGB-Tests' with: [
227-
spec requires:
228-
#( 'KGBTestResources' 'Moose-SmalltalkImporter-Core-Tests' ) ];
229-
package: 'Famix-TestGenerators'
230-
with: [ spec requires: #( 'Basic' ) ];
178+
package: 'Moose-Query-Test' with: [ spec requires: #( 'Moose-Query' 'Famix-Java-Entities' ) ];
179+
package: 'FamixTestGenerator' with: [ spec requires: #( 'Famix-Tests' 'Fame' ) ];
180+
package: 'Famix-Tests' with: [ spec requires: #( 'BasicTraits' 'Talents' ) ];
181+
package: 'Moose-Core-Tests' with: [ spec requires: #( 'TestModels' 'Moose-Core-Tests-Entities' ) ];
182+
package: 'Moose-Core-Tests-Entities' with: [ spec requires: #( 'Moose-Core' 'BasicTraits' ) ];
183+
package: 'Moose-Importers-Tests' with: [ spec requires: #( 'Moose-Importers' 'Famix-Test1-Entities' ) ];
184+
package: 'Famix-Smalltalk-Utils-Tests' with: [ spec requires: #( 'Famix-Smalltalk-Utils' 'ReferenceTestResources' ) ];
185+
package: 'Moose-SmalltalkImporter-Core-Tests' with: [ spec requires: #( 'Moose-Core-Tests' 'Moose-SmalltalkImporter' 'ReferenceTestResources' ) ];
186+
package: 'Moose-SmalltalkImporter-LAN-Tests' with: [ spec requires: #( 'Moose-SmalltalkImporter-Core-Tests' 'Moose-TestResources-LAN' ) ];
187+
package: 'Moose-SmalltalkImporter-KGB-Tests' with: [ spec requires: #( 'KGBTestResources' 'Moose-SmalltalkImporter-Core-Tests' ) ];
188+
package: 'Famix-TestGenerators' with: [ spec requires: #( 'Basic' ) ];
231189
package: 'Famix-MetamodelBuilder-Tests' with: [
232-
spec requires:
233-
#( 'Famix-TestGenerators' 'Famix-MetamodelBuilder-TestsTraitsResources-A'
234-
'Famix-MetamodelBuilder-TestsTraitsResources-B'
190+
spec requires: #( 'Famix-TestGenerators' 'Famix-MetamodelBuilder-TestsTraitsResources-A' 'Famix-MetamodelBuilder-TestsTraitsResources-B'
235191
'Famix-Test1-Entities' ) ];
236-
package: 'Famix-MetamodelBuilder-TestsTraitsResources-A'
237-
with: [ spec requires: #( 'Basic' ) ];
238-
package: 'Famix-MetamodelBuilder-TestsTraitsResources-B' with: [
239-
spec requires:
240-
#( 'Basic' 'Famix-MetamodelBuilder-TestsTraitsResources-A' ) ];
241-
package: 'Famix-Test1-Entities'
242-
with: [ spec requires: #( 'BasicTraits' ) ];
243-
package: 'Famix-Test1-Tests'
244-
with: [ spec requires: #( 'Famix-Test1-Entities' ) ];
245-
package: 'Famix-Test2-Entities'
246-
with: [ spec requires: #( 'BasicTraits' ) ];
247-
package: 'Famix-Test2-Tests'
248-
with: [ spec requires: #( 'Famix-Test2-Entities' ) ];
249-
package: 'Famix-Test3-Entities'
250-
with: [ spec requires: #( 'BasicTraits' ) ];
251-
package: 'Famix-Test3-Tests'
252-
with: [ spec requires: #( 'Famix-Test3-Entities' ) ];
253-
package: 'Famix-Test4-Entities'
254-
with: [ spec requires: #( 'BasicTraits' ) ];
255-
package: 'Famix-Test4-Tests'
256-
with: [ spec requires: #( 'Famix-Test4-Entities' ) ];
257-
package: 'Famix-Test5-Entities'
258-
with: [ spec requires: #( 'BasicTraits' ) ];
259-
package: 'Famix-Test5-Tests'
260-
with: [ spec requires: #( 'Famix-Test5-Entities' ) ];
261-
package: 'Famix-Test6-Entities'
262-
with: [ spec requires: #( 'BasicTraits' ) ];
263-
package: 'Famix-Test6-Tests'
264-
with: [ spec requires: #( 'Famix-Test6-Entities' ) ];
265-
package: 'Famix-Test7-Entities'
266-
with: [ spec requires: #( 'BasicTraits' ) ];
267-
package: 'Famix-Test7-Tests'
268-
with: [ spec requires: #( 'Famix-Test7-Entities' ) ];
269-
package: 'Famix-Test8-Entities'
270-
with: [ spec requires: #( 'BasicTraits' ) ];
271-
package: 'Famix-Test8-Tests'
272-
with: [ spec requires: #( 'Famix-Test8-Entities' ) ];
273-
package: 'Famix-TestComposedSubmetamodel1-Entities'
274-
with: [ spec requires: #( 'BasicTraits' ) ];
275-
package: 'Famix-TestComposedSubmetamodel2-Entities'
276-
with: [ spec requires: #( 'BasicTraits' ) ];
277-
package: 'Famix-TestComposedMetamodel-Entities' with: [
278-
spec requires:
279-
#( 'Famix-Test2-Entities' 'Famix-TestComposedSubmetamodel1-Entities'
280-
'Famix-TestComposedSubmetamodel2-Entities' ) ];
281-
package: 'Famix-TestComposedComposedMetamodel-Entities'
282-
with: [ spec requires: #( 'Famix-TestComposedMetamodel-Entities' ) ];
283-
package: 'Famix-TestComposed3Metamodel-Entities'
284-
with: [ spec requires: #( 'Famix-TestComposedMetamodel-Entities' ) ];
285-
package: 'Famix-TestComposedMetamodel'
286-
with: [ spec requires: #( 'Famix-TestComposedMetamodel-Entities' ) ];
287-
package: 'Famix-Deprecated'
288-
with: [
289-
spec requires: #( 'Core' 'ModelJava' 'ModelSmalltalk'
290-
'Tests' ) ];
192+
package: 'Famix-MetamodelBuilder-TestsTraitsResources-A' with: [ spec requires: #( 'Basic' ) ];
193+
package: 'Famix-MetamodelBuilder-TestsTraitsResources-B' with: [ spec requires: #( 'Basic' 'Famix-MetamodelBuilder-TestsTraitsResources-A' ) ];
194+
package: 'Famix-Test1-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
195+
package: 'Famix-Test1-Tests' with: [ spec requires: #( 'Famix-Test1-Entities' ) ];
196+
package: 'Famix-Test2-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
197+
package: 'Famix-Test2-Tests' with: [ spec requires: #( 'Famix-Test2-Entities' ) ];
198+
package: 'Famix-Test3-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
199+
package: 'Famix-Test3-Tests' with: [ spec requires: #( 'Famix-Test3-Entities' ) ];
200+
package: 'Famix-Test4-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
201+
package: 'Famix-Test4-Tests' with: [ spec requires: #( 'Famix-Test4-Entities' ) ];
202+
package: 'Famix-Test5-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
203+
package: 'Famix-Test5-Tests' with: [ spec requires: #( 'Famix-Test5-Entities' ) ];
204+
package: 'Famix-Test6-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
205+
package: 'Famix-Test6-Tests' with: [ spec requires: #( 'Famix-Test6-Entities' ) ];
206+
package: 'Famix-Test7-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
207+
package: 'Famix-Test7-Tests' with: [ spec requires: #( 'Famix-Test7-Entities' ) ];
208+
package: 'Famix-Test8-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
209+
package: 'Famix-Test8-Tests' with: [ spec requires: #( 'Famix-Test8-Entities' ) ];
210+
package: 'Famix-TestComposedSubmetamodel1-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
211+
package: 'Famix-TestComposedSubmetamodel2-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
212+
package: 'Famix-TestComposedMetamodel-Entities'
213+
with: [ spec requires: #( 'Famix-Test2-Entities' 'Famix-TestComposedSubmetamodel1-Entities' 'Famix-TestComposedSubmetamodel2-Entities' ) ];
214+
package: 'Famix-TestComposedComposedMetamodel-Entities' with: [ spec requires: #( 'Famix-TestComposedMetamodel-Entities' ) ];
215+
package: 'Famix-TestComposed3Metamodel-Entities' with: [ spec requires: #( 'Famix-TestComposedMetamodel-Entities' ) ];
216+
package: 'Famix-TestComposedMetamodel' with: [ spec requires: #( 'Famix-TestComposedMetamodel-Entities' ) ];
217+
package: 'Famix-Deprecated' with: [ spec requires: #( 'Core' 'ModelJava' 'ModelSmalltalk' 'Tests' ) ];
291218
package: 'Famix-UMLDocumentor' with: [ spec requires: #( 'Core' ) ];
292-
package: 'Famix-UMLDocumentor-Tests' with: [
293-
spec requires:
294-
#( 'Famix-UMLDocumentor' 'FamixDocumentor-TestMetaModel' ) ];
219+
package: 'Famix-UMLDocumentor-Tests' with: [ spec requires: #( 'Famix-UMLDocumentor' 'FamixDocumentor-TestMetaModel' ) ];
295220
package: 'FamixDocumentor-TestMetaModel'
296221
]
297222

‎src/Moose-GenericImporter/package.st

-1
This file was deleted.

‎src/Moose-GenericImporters-Tests/package.st

-1
This file was deleted.

‎src/Moose-GenericImporters-Tests/MooseFileStructureImporterTest.class.st ‎src/Moose-Importers-Tests/MooseFileStructureImporterTest.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Class {
55
'model',
66
'toDelete'
77
],
8-
#category : #'Moose-GenericImporters-Tests'
8+
#category : #'Moose-Importers-Tests'
99
}
1010

1111
{ #category : #setup }

‎src/Moose-Importers-Tests/package.st

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Package { #name : #'Moose-Importers-Tests' }

‎src/Moose-GenericImporter/FamixBasicInfrastructureMetamodelFactory.class.st ‎src/Moose-Importers/FamixBasicInfrastructureMetamodelFactory.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Class {
22
#name : #FamixBasicInfrastructureMetamodelFactory,
33
#superclass : #FMMetamodelFactory,
4-
#category : #'Moose-GenericImporter-Factories'
4+
#category : #'Moose-Importers-Factories'
55
}
66

77
{ #category : #testing }

‎src/Moose-GenericImporter/MooseAbstractImporter.class.st ‎src/Moose-Importers/MooseAbstractImporter.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Class {
1010
'loggingStream',
1111
'targetModel'
1212
],
13-
#category : #'Moose-GenericImporter-Importers'
13+
#category : #'Moose-Importers-Importers'
1414
}
1515

1616
{ #category : #public }

‎src/Moose-GenericImporter/MooseFileStructureImporter.class.st ‎src/Moose-Importers/MooseFileStructureImporter.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Class {
55
'mooseModel',
66
'factory'
77
],
8-
#category : #'Moose-GenericImporter-Importers'
8+
#category : #'Moose-Importers-Importers'
99
}
1010

1111
{ #category : #accessing }

‎src/Moose-GenericImporter/MooseImportingContext.class.st ‎src/Moose-Importers/MooseImportingContext.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Class {
3333
#classInstVars : [
3434
'entityDependencies'
3535
],
36-
#category : #'Moose-GenericImporter-Contexts'
36+
#category : #'Moose-Importers-Contexts'
3737
}
3838

3939
{ #category : #'importing-filters' }

‎src/Moose-Importers/package.st

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Package { #name : #'Moose-Importers' }

0 commit comments

Comments
 (0)