commit | 3a67d71ca01b851651ccfb56206d7c840da731f8 | [log] [tgz] |
---|---|---|
author | Ed Willink <ed@willink.me.uk> | Tue Mar 11 12:25:52 2014 +0000 |
committer | Ed Willink <ed@willink.me.uk> | Tue Mar 11 12:29:11 2014 +0000 |
tree | 108c3cb0684c95141601bf467d61096411ac4d74 | |
parent | 379a416949a8a319022e7141970054b19d194b17 [diff] |
[omg] Generate into more useful folder structure
diff --git a/plugins/org.eclipse.qvt/model/ecore/EMOF.uml b/plugins/org.eclipse.qvt/model/uml/EMOF.uml similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/EMOF.uml rename to plugins/org.eclipse.qvt/model/uml/EMOF.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/EssentialOCL.uml b/plugins/org.eclipse.qvt/model/uml/EssentialOCL.uml similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/EssentialOCL.uml rename to plugins/org.eclipse.qvt/model/uml/EssentialOCL.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/ImperativeOCL.uml b/plugins/org.eclipse.qvt/model/uml/ImperativeOCL.uml similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/ImperativeOCL.uml rename to plugins/org.eclipse.qvt/model/uml/ImperativeOCL.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/PrimitiveTypes.uml b/plugins/org.eclipse.qvt/model/uml/PrimitiveTypes.uml similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/PrimitiveTypes.uml rename to plugins/org.eclipse.qvt/model/uml/PrimitiveTypes.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTBase.uml b/plugins/org.eclipse.qvt/model/uml/QVTBase.uml similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/QVTBase.uml rename to plugins/org.eclipse.qvt/model/uml/QVTBase.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTCore.uml b/plugins/org.eclipse.qvt/model/uml/QVTCore.uml similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/QVTCore.uml rename to plugins/org.eclipse.qvt/model/uml/QVTCore.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTOperational.uml b/plugins/org.eclipse.qvt/model/uml/QVTOperational.uml similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/QVTOperational.uml rename to plugins/org.eclipse.qvt/model/uml/QVTOperational.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTRelation.uml b/plugins/org.eclipse.qvt/model/uml/QVTRelation.uml similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/QVTRelation.uml rename to plugins/org.eclipse.qvt/model/uml/QVTRelation.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTTemplate.uml b/plugins/org.eclipse.qvt/model/uml/QVTTemplate.uml similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/QVTTemplate.uml rename to plugins/org.eclipse.qvt/model/uml/QVTTemplate.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/EMOF.xmi b/plugins/org.eclipse.qvt/model/xmi/EMOF.xmi similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/EMOF.xmi rename to plugins/org.eclipse.qvt/model/xmi/EMOF.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/EssentialOCL.xmi b/plugins/org.eclipse.qvt/model/xmi/EssentialOCL.xmi similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/EssentialOCL.xmi rename to plugins/org.eclipse.qvt/model/xmi/EssentialOCL.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/ImperativeOCL.xmi b/plugins/org.eclipse.qvt/model/xmi/ImperativeOCL.xmi similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/ImperativeOCL.xmi rename to plugins/org.eclipse.qvt/model/xmi/ImperativeOCL.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/PrimitiveTypes.xmi b/plugins/org.eclipse.qvt/model/xmi/PrimitiveTypes.xmi similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/PrimitiveTypes.xmi rename to plugins/org.eclipse.qvt/model/xmi/PrimitiveTypes.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTBase.xmi b/plugins/org.eclipse.qvt/model/xmi/QVTBase.xmi similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/QVTBase.xmi rename to plugins/org.eclipse.qvt/model/xmi/QVTBase.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTCore.xmi b/plugins/org.eclipse.qvt/model/xmi/QVTCore.xmi similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/QVTCore.xmi rename to plugins/org.eclipse.qvt/model/xmi/QVTCore.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTOperational.xmi b/plugins/org.eclipse.qvt/model/xmi/QVTOperational.xmi similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/QVTOperational.xmi rename to plugins/org.eclipse.qvt/model/xmi/QVTOperational.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTRelation.xmi b/plugins/org.eclipse.qvt/model/xmi/QVTRelation.xmi similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/QVTRelation.xmi rename to plugins/org.eclipse.qvt/model/xmi/QVTRelation.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTTemplate.xmi b/plugins/org.eclipse.qvt/model/xmi/QVTTemplate.xmi similarity index 100% rename from plugins/org.eclipse.qvt/model/ecore/QVTTemplate.xmi rename to plugins/org.eclipse.qvt/model/xmi/QVTTemplate.xmi
diff --git a/plugins/org.eclipse.qvt/src/org/eclipse/qvt/tools/Ecore2UML.java b/plugins/org.eclipse.qvt/src/org/eclipse/qvt/tools/Ecore2UML.java index 20086ce..9e7b7f9 100644 --- a/plugins/org.eclipse.qvt/src/org/eclipse/qvt/tools/Ecore2UML.java +++ b/plugins/org.eclipse.qvt/src/org/eclipse/qvt/tools/Ecore2UML.java
@@ -105,7 +105,7 @@ UMLResourcesUtil.init(umlResourceSet); for (Resource ecoreResource : new ArrayList<Resource>(ecoreResourceSet.getResources())) { // Ignore any profiles that aappear URI ecoreURI = ecoreResource.getURI(); - URI umlURI = ecoreURI.trimFileExtension().appendFileExtension("uml"); + URI umlURI = URI.createPlatformResourceURI("/org.eclipse.qvt/model/uml/" + ecoreURI.trimFileExtension().lastSegment() + ".uml", true); Resource umlResource = umlResourceSet.createResource(umlURI); for (EObject eObject : ecoreResource.getContents()) { Element umlElement = ecore2umlConverter.get(eObject); @@ -135,7 +135,7 @@ ResourceSet xmiResourceSet = new ResourceSetImpl(); xmiResourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl()); for (Resource umlResource : umlResourceSet.getResources()) { - URI xmiURI = umlResource.getURI().trimFileExtension().appendFileExtension("xmi"); + URI xmiURI = URI.createPlatformResourceURI("/org.eclipse.qvt/model/xmi/" + umlResource.getURI().trimFileExtension().lastSegment() + ".xmi", true); XMIResource xmiResource = (XMIResource) xmiResourceSet.createResource(xmiURI); xmiResource.setXMIVersion("20110701"); xmiResource.getContents().addAll(umlResource.getContents());