Fix #34 and 35#.

occiware · Jul 26, 2018 · 6669fc9 · 6669fc9
1 parent 941b9a8
commit 6669fc9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/...mf.ui/src/org/eclipse/cmf/occi/core/gen/emf/ui/popup/actions/OCCI2EMFGeneratorAction.java b/...mf.ui/src/org/eclipse/cmf/occi/core/gen/emf/ui/popup/actions/OCCI2EMFGeneratorAction.java
@@ -207,9 +207,12 @@ private void generateEMFModels(Extension ext, IFile occieFile, String basePackag
 		importsAnnotation.setSource("http://www.eclipse.org/OCL/Import");
 		for(Extension importedExt : ext.getImport())
 			if(importedExt.getScheme().equals("http://schemas.ogf.org/occi/core#"))
-				importsAnnotation.getDetails().put("occi", Occi2Ecore.convertOcciScheme2EcoreNamespace(importedExt.getScheme()));
+				importsAnnotation.getDetails().put("occi", "platform:/plugin/org.eclipse.cmf.occi.core/model/OCCI.ecore#/");
 			else
-				importsAnnotation.getDetails().put(importedExt.getName(), Occi2Ecore.convertOcciScheme2EcoreNamespace(importedExt.getScheme()));
+				{
+					//System.out.println("imported extension file uri " + OcciRegistry.getInstance().getFileURI(importedExt.getScheme()).replace(".occie", ".ecore#/"));
+					importsAnnotation.getDetails().put(importedExt.getName(), OcciRegistry.getInstance().getFileURI(importedExt.getScheme()).replace(".occie", ".ecore#/"));
+				}
 		ePackage.getEAnnotations().add(importsAnnotation);
 
 		resourceSet.getPackageRegistry().put(ePackage.getNsURI(), ePackage);

diff --git a/...emf.ui/src/org/eclipse/cmf/occi/core/gen/emf/ui/popup/actions/OCCI2EMFGeneratorUtils.java b/...emf.ui/src/org/eclipse/cmf/occi/core/gen/emf/ui/popup/actions/OCCI2EMFGeneratorUtils.java
@@ -60,10 +60,10 @@ public static GenPackage createGenModel(final EPackage rootPackage, final String
 				"- Faiez Zalila <faiez.zalila@inria.fr>"
 		);
 		// Added to generate java code corresponding to OCL constraints defined in the OCCI extension
-//		GenAnnotation genannotation = GenModelFactory.eINSTANCE.createGenAnnotation();
-//		genannotation.setSource("http://www.eclipse.org/OCL/GenModel");
-//		genannotation.getDetails().put("Use Delegates", "false");
-//		genModel.getGenAnnotations().add(genannotation);
+		GenAnnotation genannotation = GenModelFactory.eINSTANCE.createGenAnnotation();
+		genannotation.setSource("http://www.eclipse.org/OCL/GenModel");
+		genannotation.getDetails().put("Use Delegates", "false");
+		genModel.getGenAnnotations().add(genannotation);
 
 		String modelPluginId = new Path(ecoreLocation).removeLastSegments(2).lastSegment().toString();
 		String editPluginId = modelPluginId + ".edit";
@@ -87,7 +87,7 @@ public static GenPackage createGenModel(final EPackage rootPackage, final String
 		GenPackage genPackage = genModel.getGenPackages().get(0);
 		genPackage.setPrefix(ConverterUtils.toU1Case(rootPackage.getNsPrefix()));
 		genPackage.setBasePackage(basePackage);
-		genPackage.setLoadInitialization(false);
+		//genPackage.setLoadInitialization(false);
 		URI genModelURI = URI
 				.createFileURI(new Path(ecoreLocation).removeFileExtension().addFileExtension("genmodel").toString());
 		final XMIResourceImpl genModelResource = new XMIResourceImpl(genModelURI);

diff --git a/...ipse.cmf.occi.core.gen.emf/src/org/eclipse/cmf/occi/core/gen/emf/OCCIExtension2Ecore.java b/...ipse.cmf.occi.core.gen.emf/src/org/eclipse/cmf/occi/core/gen/emf/OCCIExtension2Ecore.java
@@ -453,13 +453,13 @@ private EDataType createNumericType(NumericType type) {
 			if (type.isSetTotalDigits())
 				eannotation.getDetails().put("totalDigits", Integer.toString(type.getTotalDigits()));
 			if (type.isSetMinInclusive())
-				eannotation.getDetails().put("MinInclusive", type.getMinInclusive());
+				eannotation.getDetails().put("minInclusive", type.getMinInclusive());
 			if (type.isSetMinExclusive())
-				eannotation.getDetails().put("MinExclusive", type.getMinExclusive());
+				eannotation.getDetails().put("minExclusive", type.getMinExclusive());
 			if (type.isSetMaxInclusive())
-				eannotation.getDetails().put("MaxInclusive", type.getMaxInclusive());
+				eannotation.getDetails().put("maxInclusive", type.getMaxInclusive());
 			if (type.isSetMaxExclusive())
-				eannotation.getDetails().put("MaxExclusive", type.getMaxExclusive());
+				eannotation.getDetails().put("maxExclusive", type.getMaxExclusive());
 		}
 		if (type.getDocumentation() != null) {
 			attachInfo(edatatype, type.getDocumentation());

diff --git a/plugins/org.eclipse.cmf.occi.core/src/org/eclipse/cmf/occi/core/util/OcciHelper.java b/plugins/org.eclipse.cmf.occi.core/src/org/eclipse/cmf/occi/core/util/OcciHelper.java
@@ -735,8 +735,8 @@ public static EObject getRootElement(ResourceSet resourceSet, String path) {
 
 	public static EObject getRootElement(ResourceSet resourceSet, IFile file) {
 		URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);
-		System.out.println("file " + file.getFullPath().toString());
-		System.out.println("uri " + uri);
+		//System.out.println("file " + file.getFullPath().toString());
+		//System.out.println("uri " + uri);
 		org.eclipse.emf.ecore.resource.Resource resource = resourceSet.getResource(uri, true);
 		EcoreUtil.resolveAll(resource);
 		return resource.getContents().get(0);