avoid uncessary switching in the Packages class.

eclipse · Apr 28, 2022 · c7fe81d · c7fe81d
1 parent 14eca7b
commit c7fe81d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...o.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/config/generatePomXml.mtl b/...o.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/config/generatePomXml.mtl
@@ -273,7 +273,7 @@
             <groupId>org.eclipse.lyo.server</groupId>
             <artifactId>oslc-ui-model</artifactId>
             <version>${version.lyo}</version>
-        </dependency>        
+        </dependency>
         [/if]
         <!-- [protected ('dependencies_final')]
         -->

diff --git a/...degenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorPackageInfo.mtl b/...degenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorPackageInfo.mtl
@@ -56,7 +56,7 @@
 ]    @OslcNamespaceDefinition(prefix = [javaInterfaceNameForConstants(aDomainSpecification)/].[domainSpecificationImplicitVocabularyNamespacePrefixConstantName(aDomainSpecification) /], namespaceURI = [javaInterfaceNameForConstants(aDomainSpecification)/].[domainSpecificationImplicitVocabularyNamespaceConstantName(aDomainSpecification) /])[/for][if 
         (relevantVocabularies(anAdaptorInterface)->size() > 0)],
 [/if]
-[for (aVocabulary: Vocabulary | relevantVocabularies(anAdaptorInterface)->sortedBy(name)) separator(','.concat(lineSeparator()))
+[for (aVocabulary: Vocabulary | relevantVocabularies(anAdaptorInterface)->sortedBy(preferredNamespacePrefix)) separator(','.concat(lineSeparator()))
 ]    @OslcNamespaceDefinition(prefix = [javaInterfaceNameForConstants(aVocabulary)/].[vocabularyPreferredNamespacePrefixConstantName(aVocabulary) /], namespaceURI = [javaInterfaceNameForConstants(aVocabulary)/].[vocabularyNamespaceConstantName(aVocabulary) /])[/for]
 })
 package [javaClassPackageNameForAdaptorPackageInfo(anAdaptorInterface) /];
@@ -66,7 +66,7 @@ import org.eclipse.lyo.oslc4j.core.annotation.OslcSchema;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 
 [for (aDomainSpecification: DomainSpecification | relevantDomainSpecifications(anAdaptorInterface)->sortedBy(name)) separator(lineSeparator())]import [javaInterfaceFullNameForConstants(aDomainSpecification, anAdaptorInterface, null) /];[/for]
-[for (aVocabulary: Vocabulary | relevantVocabularies(anAdaptorInterface)->sortedBy(name)) separator(lineSeparator())]import [javaInterfaceFullNameForConstants(aVocabulary, anAdaptorInterface, null) /];[/for]
+[for (aVocabulary: Vocabulary | relevantVocabularies(anAdaptorInterface)->sortedBy(preferredNamespacePrefix)) separator(lineSeparator())]import [javaInterfaceFullNameForConstants(aVocabulary, anAdaptorInterface, null) /];[/for]
 
 [/file]
 [/template]