diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimResourceImpl.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17Resource.java
similarity index 56%
rename from fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimResourceImpl.java
rename to fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17Resource.java
index c9b8e5f3009a6b75730fe2c1a3421fa8cf361bce..fc436fd68fc27b7571c4bd186cd3f94fc5199b45 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimResourceImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17Resource.java
@@ -20,39 +20,28 @@ import org.eclipse.emf.ecore.xmi.XMLHelper;
import org.eclipse.emf.ecore.xmi.XMLLoad;
import org.eclipse.emf.ecore.xmi.XMLSave;
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see fr.centralesupelec.edf.riseclipse.cim.cim17.iec61970cim17v16.cim.util.CimResourceFactoryImpl
- * @generated
- */
-public abstract class CimResourceImpl extends fr.centralesupelec.edf.riseclipse.cim.util.cimxml.CimResourceImpl {
-
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param uri the URI of the new resource.
- * @generated NOT
- */
- public CimResourceImpl( URI uri ) {
+import fr.centralesupelec.edf.riseclipse.cim.util.cimxml.AbstractCimResource;
+
+
+public abstract class AbstractCim17Resource extends AbstractCimResource {
+
+ public AbstractCim17Resource( URI uri ) {
super( uri );
}
@Override
protected XMLLoad createXMLLoad() {
- return new CimXMLLoadImpl( createXMLHelper() );
+ return new Cim17XmlLoad( createXMLHelper() );
}
@Override
protected XMLSave createXMLSave() {
- return new CimXMLSaveImpl( createXMLHelper() );
+ return new Cim17XmlSave( createXMLHelper() );
}
@Override
protected XMLHelper createXMLHelper() {
- return new CimXMLHelperImpl( this );
+ return new Cim17XmlHelper( this );
}
-} // CimResourceImpl
+}
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17ResourceFactory.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17ResourceFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..06a79385c975367b1b27e7f9acaa115bd24503b3
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17ResourceFactory.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2016 CentraleSupélec & EDF.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This file is part of the RiseClipse tool
+ *
+ * Contributors:
+ * Computer Science Department, CentraleSupélec : initial implementation
+ * Contacts:
+ * Dominique.Marcadet@centralesupelec.fr
+ *
+ */
+package fr.centralesupelec.edf.riseclipse.cim.cim17.util;
+
+import fr.centralesupelec.edf.riseclipse.cim.cim17.util.Cim17ResourceHandler;
+import fr.centralesupelec.edf.riseclipse.cim.util.cimxml.AbstractCimResourceFactory;
+
+public abstract class AbstractCim17ResourceFactory extends AbstractCimResourceFactory {
+
+ @Override
+ protected Cim17ResourceHandler createCimResourceHandler() {
+ return new Cim17ResourceHandler();
+ }
+
+}
+
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17ResourceSet.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17ResourceSet.java
new file mode 100644
index 0000000000000000000000000000000000000000..cd135107194b60807eb7ccdccacb07da721a80e5
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17ResourceSet.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2019 CentraleSupélec & EDF.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This file is part of the RiseClipse tool
+ *
+ * Contributors:
+ * Computer Science Department, CentraleSupélec
+ * EDF R&D
+ * Contacts:
+ * dominique.marcadet@centralesupelec.fr
+ * aurelie.dehouck-neveu@edf.fr
+ * Web site:
+ * http://wdi.supelec.fr/software/RiseClipse/
+ *
+ */
+package fr.centralesupelec.edf.riseclipse.cim.cim17.util;
+
+import fr.centralesupelec.edf.riseclipse.cim.util.cimxml.AbstractCimResourceSet;
+
+public abstract class AbstractCim17ResourceSet extends AbstractCimResourceSet {
+
+ public AbstractCim17ResourceSet( boolean strictContent ) {
+ super( strictContent );
+ }
+}
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17ResourceSetFactory.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17ResourceSetFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..e69d2319be8c7b5c0de0c014be043a192f4b81ad
--- /dev/null
+++ b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/AbstractCim17ResourceSetFactory.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2019 CentraleSupélec & EDF.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This file is part of the RiseClipse tool
+ *
+ * Contributors:
+ * Computer Science Department, CentraleSupélec
+ * EDF R&D
+ * Contacts:
+ * dominique.marcadet@centralesupelec.fr
+ * aurelie.dehouck-neveu@edf.fr
+ * Web site:
+ * http://wdi.supelec.fr/software/RiseClipse/
+ *
+ */
+package fr.centralesupelec.edf.riseclipse.cim.cim17.util;
+
+import fr.centralesupelec.edf.riseclipse.cim.util.cimxml.AbstractCimResourceSetFactory;
+
+public abstract class AbstractCim17ResourceSetFactory extends AbstractCimResourceSetFactory {
+
+ public AbstractCim17ResourceSetFactory() {
+ super();
+ }
+}
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimConstants.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17Constants.java
similarity index 87%
rename from fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimConstants.java
rename to fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17Constants.java
index 69b3a5817c86e09f9574e52aeb91b285f8808f6d..39ff34b8698a807b9aa3141c8b4d5a4f2931b630 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimConstants.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17Constants.java
@@ -15,8 +15,9 @@
*/
package fr.centralesupelec.edf.riseclipse.cim.cim17.util;
+import fr.centralesupelec.edf.riseclipse.cim.util.cimxml.AbstractCimConstants;
-public class CimConstants extends fr.centralesupelec.edf.riseclipse.cim.util.cimxml.CimConstants {
+public class Cim17Constants extends AbstractCimConstants {
// CimPackage is specific to each concrete Cim17 metamodel, so we cannot get it here,
// but we prefer to have a generic Cim17 package
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimResourceHandler.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17ResourceHandler.java
similarity index 78%
rename from fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimResourceHandler.java
rename to fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17ResourceHandler.java
index f9a35184212cbc571d9466217913ab27ad94092b..832848d286c87535d659ee84764622964c001557 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimResourceHandler.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17ResourceHandler.java
@@ -20,13 +20,15 @@ import java.util.Map;
import org.eclipse.emf.ecore.xmi.XMLResource;
-public class CimResourceHandler extends fr.centralesupelec.edf.riseclipse.cim.util.cimxml.CimResourceHandler {
+import fr.centralesupelec.edf.riseclipse.cim.util.cimxml.AbstractCimResourceHandler;
+
+public class Cim17ResourceHandler extends AbstractCimResourceHandler {
static final String xmlDeclaration = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\n";
@Override
public void preSave( XMLResource resource, OutputStream outputStream, Map< ?, ? > options ) {
- super.preSave( resource, outputStream, options, CimConstants.cimURISharp );
+ super.preSave( resource, outputStream, options, Cim17Constants.cimURISharp );
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLHandler.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlHandler.java
similarity index 76%
rename from fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLHandler.java
rename to fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlHandler.java
index acf5b23f6c2f150ffb653fc91c3d76faf4614433..6d6dd3d56c95d4340d56619e96a2f2865760f3bf 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLHandler.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlHandler.java
@@ -22,23 +22,25 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.xmi.XMLHelper;
import org.eclipse.emf.ecore.xmi.XMLResource;
-public class CimXMLHandler extends fr.centralesupelec.edf.riseclipse.cim.util.cimxml.CimXMLHandler {
+import fr.centralesupelec.edf.riseclipse.cim.util.cimxml.AbstractCimXmlHandler;
- public CimXMLHandler( XMLResource xmiResource, XMLHelper helper, Map< ?, ? > options ) {
- super( CimConstants.cimURI, xmiResource, helper, options );
+public class Cim17XmlHandler extends AbstractCimXmlHandler {
+
+ public Cim17XmlHandler( XMLResource xmiResource, XMLHelper helper, Map< ?, ? > options ) {
+ super( Cim17Constants.cimURI, xmiResource, helper, options );
}
// This method needs the specific URI
@Override
protected boolean setEnumValue( EObject object, EStructuralFeature feature, String resource ) {
- if( resource.startsWith( CimConstants.cimURISharp ) ) {
+ if( resource.startsWith( Cim17Constants.cimURISharp ) ) {
int enumNameLength = feature.getEType().getName().length();
// do not call fr.centralesupelec.riseclipse.cim.util.cimxml.CimXMLHandler.setFeatureValue to avoid infinite recursion
// call instead org.eclipse.emf.ecore.xmi.impl.SAXXMLHandler.setFeatureValue
// We use the fact that SAXXMLHandler.setFeatureValue( EObject, EStructuralFeature, Object ) call
// SAXXMLHandler.setFeatureValue( EObject, EStructuralFeature, Object, -1 )
super.setFeatureValue( object, feature,
- resource.substring( CimConstants.cimURISharp.length() + enumNameLength + 1 ), -1 );
+ resource.substring( Cim17Constants.cimURISharp.length() + enumNameLength + 1 ), -1 );
return true;
}
return false;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLHelperImpl.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlHelper.java
similarity index 67%
rename from fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLHelperImpl.java
rename to fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlHelper.java
index 2d1b7fb87d48bf249aab15d671e3f2fbc1cef573..89ccce132c8dd25587f58b1a64cc704bb4f1b436 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLHelperImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlHelper.java
@@ -14,17 +14,18 @@
*/
package fr.centralesupelec.edf.riseclipse.cim.cim17.util;
+import fr.centralesupelec.edf.riseclipse.cim.util.cimxml.AbstractCimXmlHelper;
-public class CimXMLHelperImpl extends fr.centralesupelec.edf.riseclipse.cim.util.cimxml.CimXMLHelperImpl {
+public class Cim17XmlHelper extends AbstractCimXmlHelper {
- public CimXMLHelperImpl( CimResourceImpl cimResourceImpl ) {
- super( cimResourceImpl );
+ public Cim17XmlHelper( AbstractCim17Resource abstractCim17Resource ) {
+ super( abstractCim17Resource );
}
@Override
public String getURI( String prefix ) {
String uri = super.getURI( prefix );
- if( CimConstants.cimURISharp.equals( uri )) return CimConstants.cimURI;
+ if( Cim17Constants.cimURISharp.equals( uri )) return Cim17Constants.cimURI;
return uri;
}
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLLoadImpl.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlLoad.java
similarity index 76%
rename from fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLLoadImpl.java
rename to fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlLoad.java
index e9fb6fbcafd98a355036f8c98e4cd8e5bd47c186..5823a473e92382af6e7aef60557d9b1b13bf9a83 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLLoadImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlLoad.java
@@ -18,15 +18,17 @@ package fr.centralesupelec.edf.riseclipse.cim.cim17.util;
import org.eclipse.emf.ecore.xmi.XMLHelper;
import org.xml.sax.helpers.DefaultHandler;
-public class CimXMLLoadImpl extends fr.centralesupelec.edf.riseclipse.cim.util.cimxml.CimXMLLoadImpl {
+import fr.centralesupelec.edf.riseclipse.cim.util.cimxml.AbstractCimXmlLoad;
- public CimXMLLoadImpl( XMLHelper helper ) {
+public class Cim17XmlLoad extends AbstractCimXmlLoad {
+
+ public Cim17XmlLoad( XMLHelper helper ) {
super( helper );
}
@Override
protected DefaultHandler makeDefaultHandler() {
- return new CimXMLHandler( resource, helper, options );
+ return new Cim17XmlHandler( resource, helper, options );
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLSaveImpl.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlSave.java
similarity index 54%
rename from fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLSaveImpl.java
rename to fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlSave.java
index a8faff8acee30c6da659022bba8f9e50b7c1caee..c2f90f2b82ad7a32069807a01d627d7a3fd61b75 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimXMLSaveImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/Cim17XmlSave.java
@@ -19,18 +19,20 @@ import java.util.Map;
import org.eclipse.emf.ecore.xmi.XMLHelper;
-public class CimXMLSaveImpl extends fr.centralesupelec.edf.riseclipse.cim.util.cimxml.CimXMLSaveImpl {
+import fr.centralesupelec.edf.riseclipse.cim.util.cimxml.AbstractCimXmlSave;
+
+public class Cim17XmlSave extends AbstractCimXmlSave {
- public CimXMLSaveImpl( XMLHelper helper ) {
- super( CimConstants.cimURISharp, helper );
+ public Cim17XmlSave( XMLHelper helper ) {
+ super( Cim17Constants.cimURISharp, helper );
}
- public CimXMLSaveImpl( Map< ?, ? > options, XMLHelper helper, String encoding ) {
- super( CimConstants.cimURISharp, options, helper, encoding );
+ public Cim17XmlSave( Map< ?, ? > options, XMLHelper helper, String encoding ) {
+ super( Cim17Constants.cimURISharp, options, helper, encoding );
}
- public CimXMLSaveImpl( Map< ?, ? > options, XMLHelper helper, String encoding, String xmlVersion ) {
- super( CimConstants.cimURISharp, options, helper, encoding, xmlVersion );
+ public Cim17XmlSave( Map< ?, ? > options, XMLHelper helper, String encoding, String xmlVersion ) {
+ super( Cim17Constants.cimURISharp, options, helper, encoding, xmlVersion );
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimResourceFactoryImpl.java b/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimResourceFactoryImpl.java
deleted file mode 100644
index a7e644ae4d46d32de3a6115e8f3cb85520301cd5..0000000000000000000000000000000000000000
--- a/fr.centralesupelec.edf.riseclipse.cim.cim17.util/src/fr/centralesupelec/edf/riseclipse/cim/cim17/util/CimResourceFactoryImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) 2016 CentraleSupélec & EDF.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * This file is part of the RiseClipse tool
- *
- * Contributors:
- * Computer Science Department, CentraleSupélec : initial implementation
- * Contacts:
- * Dominique.Marcadet@centralesupelec.fr
- *
- */
-package fr.centralesupelec.edf.riseclipse.cim.cim17.util;
-
-import fr.centralesupelec.edf.riseclipse.cim.cim17.util.CimResourceHandler;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see fr.centralesupelec.edf.riseclipse.cim.cim17.iec61970cim17v16.cim.util.CimResourceImpl
- * @generated NOT
- */
-public abstract class CimResourceFactoryImpl extends fr.centralesupelec.edf.riseclipse.cim.util.cimxml.CimResourceFactoryImpl {
-
- @Override
- protected CimResourceHandler createCimResourceHandler() {
- return new CimResourceHandler();
- }
-
-} //CimResourceFactoryImpl