ST6RI-682 Using Platform URI in Eclipse IDE

Author: TheKorpos

org.omg.sysml.xtext.ui/src/org/omg/sysml/xtext/ui/handlers/PullRepositoryProject.java

@@ -142,7 +142,7 @@ private void tryPullRemoteFor(IProject project, IProgressMonitor monitor) {
 				RepositoryProject repositoryProject = new RepositoryProject(repositoryUrl, projectName);
 				RepositoryContentFetcher repositoryFetcher = new RepositoryContentFetcher(repositoryProject, uuidToElementMap);
 				ProjectDelta delta = repositoryFetcher.fetch();
-				delta.save(resourceSet, targetPath);
+				delta.save(resourceSet, URI.createPlatformResourceURI(targetPath, false));
 			}
 		} catch (IOException | CoreException e) {
 			e.printStackTrace();

org.omg.sysml.xtext/src/org/omg/sysml/xtext/util/SysMLRepositoryLoadUtil.java

@@ -32,6 +32,7 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.omg.kerml.xtext.KerMLStandaloneSetup;
@@ -128,7 +129,7 @@ public void load() {
 		ResourceSet resourceSet = getResourceSet();
 
 		try {
-			delta.save(resourceSet, targetLocation);
+			delta.save(resourceSet, URI.createFileURI(projectName));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

org.omg.sysml/src/org/omg/sysml/util/repository/ProjectDelta.java

@@ -33,7 +33,7 @@
 import org.omg.sysml.util.ElementUtil;
 
 public class ProjectDelta {
-	private static final Object EXTENSION = "sysmlx";
+	private static final String EXTENSION = "sysmlx";
 
 	private final RepositoryProject remoteProject;
 	private final Map<EObject, Element> projectRoots;
@@ -47,11 +47,13 @@ public Map<EObject, Element> getProjectRoots() {
 		return projectRoots;
 	}
 
-	public void save(ResourceSet resourceSet, String targetLocation) throws IOException {
+	public void save(ResourceSet resourceSet, URI baseUri) throws IOException {
+		
+		
 		for (var root : projectRoots.keySet()) {
 			var dto = projectRoots.get(root);
 			Object object = dto.get("@id");
-			URI fileURI = URI.createFileURI(String.format("%s/%s.%s", targetLocation, object.toString(), EXTENSION));
+			URI fileURI = baseUri.appendFragment(object.toString()).appendFileExtension(EXTENSION);
 			Resource resource = resourceSet.createResource(fileURI);
 			resource.getContents().add(root);
 			ElementUtil.transformAll(resource, false);