clone models before writing them to file to fix problem with regenerated uids

tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/DNIAPParser.java

@@ -58,7 +58,7 @@ public class DNIAPParser {
 				.put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
 		resourceSet.getPackageRegistry().put(DNIAPPackage.eNS_URI, DNIAPPackage.eINSTANCE);
 		Resource resource = resourceSet.createResource(URI.createFileURI(file.getAbsolutePath()));
-		resource.getContents().add(adaptationPoints);
+		resource.getContents().add(DNIAPUtil.cloneModel(adaptationPoints));
 		resource.save(Collections.EMPTY_MAP);
 	}
 

tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/DNIParser.java

@@ -17,7 +17,7 @@ import tools.descartes.dni.dnimm3.NetworkInfrastructure;
 import tools.descartes.dni.dnimm3.impl.NetworkInfrastructureImpl;
 
 public class DNIParser {
-	
+
 	private DNIParser() {
 	}
 
@@ -58,7 +58,7 @@ public class DNIParser {
 				.put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
 		resourceSet.getPackageRegistry().put(DNIPackage.eNS_URI, DNIPackage.eINSTANCE);
 		Resource resource = resourceSet.createResource(URI.createFileURI(file.getAbsolutePath()));
-		resource.getContents().add(networkInfrastructure);
+		resource.getContents().add(DNIUtil.cloneModel(networkInfrastructure));
 		resource.save(Collections.EMPTY_MAP);
 	}