removing lineseperator() code that causes inconsitent lineendings.

eclipse · Feb 9, 2024 · 4ec40ca · 4ec40ca
1 parent e1c57dd
commit 4ec40ca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/...degenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl b/...degenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl
@@ -78,10 +78,14 @@ import [javaClassFullNameForService(aServiceProvider)/];
 [/for]
 import [javaClassFullNameForResourceShapeService(anAdaptorInterface) /];
 
-[for (aResource: Resource | relevantResources(anAdaptorInterface)->sortedBy(name)) separator(lineSeparator())]import [javaClassFullName(aResource, anAdaptorInterface, null) /];[/for]
-[for (aDomainSpecification: DomainSpecification | relevantDomainSpecifications(anAdaptorInterface)->sortedBy(name)) separator(lineSeparator())]import [javaInterfaceFullNameForConstants(aDomainSpecification, anAdaptorInterface, null) /];[/for]
-[for (aService: Service | anAdaptorInterface.serviceProviders().services) separator(lineSeparator())]import [javaClassFullName(aService) /];[/for]
-[for (aWebService: WebService | anAdaptorInterface.webServices) separator(lineSeparator())]import [javaClassFullName(aWebService) /];[/for]
+[for (aResource: Resource | relevantResources(anAdaptorInterface)->sortedBy(name))]import [javaClassFullName(aResource, anAdaptorInterface, null) /];
+[/for]
+[for (aDomainSpecification: DomainSpecification | relevantDomainSpecifications(anAdaptorInterface)->sortedBy(name))]import [javaInterfaceFullNameForConstants(aDomainSpecification, anAdaptorInterface, null) /];
+[/for]
+[for (aService: Service | anAdaptorInterface.serviceProviders().services)]import [javaClassFullName(aService) /];
+[/for]
+[for (aWebService: WebService | anAdaptorInterface.webServices)]import [javaClassFullName(aWebService) /];
+[/for]
 [if (anAdaptorInterface.trsServiceEnabled())]
 import org.eclipse.lyo.oslc4j.trs.server.service.TrackedResourceSetService;
 [/if]

diff --git a/.../src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl b/.../src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl
@@ -63,8 +63,10 @@ import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 
 import [javaClassFullName(aServiceProvider) /];
 
-[for (aDomainSpecification: DomainSpecification | relevantDomainSpecifications(anAdaptorInterface)->sortedBy(name)) separator(lineSeparator())]import [javaInterfaceFullNameForConstants(aDomainSpecification, anAdaptorInterface, null) /];[/for]
-[for (aService: Service | aServiceProvider.services) separator(lineSeparator())]import [javaClassFullName(aService) /];[/for]
+[for (aDomainSpecification: DomainSpecification | relevantDomainSpecifications(anAdaptorInterface)->sortedBy(name))]import [javaInterfaceFullNameForConstants(aDomainSpecification, anAdaptorInterface, null) /];
+[/for]
+[for (aService: Service | aServiceProvider.services)]import [javaClassFullName(aService) /];
+[/for]
 
 // [protected ('imports')]
 // [/protected]