diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml index 39c8d287b08530e58f26ce1ad09ba393d23f8890..0c539f4dfa868c91f5bcc1898be2f3db488b2cca 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml +++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml @@ -23,7 +23,7 @@ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories"> <!-- @generated headerModel --> <factory - uri="http://iec.ch/TC57/61970-552/ModelDescription/1#" + uri="http://iec.ch/TC57/61970-552/ModelDescription/1" class="fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider.ModelDescriptionItemProviderAdapterFactory" supportedTypes= "org.eclipse.emf.edit.provider.IEditingDomainItemProvider diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.ecore b/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.ecore index 0ee689e77405ac1a38ee93786cc9ee4267cde4ce..f5f48f6c92d05d8db5378699b488370c593c9615 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.ecore +++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.ecore @@ -1,41 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="ModelDescription" nsURI="http://iec.ch/TC57/61970-552/ModelDescription/1#" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="ModelDescription" nsURI="http://iec.ch/TC57/61970-552/ModelDescription/1" nsPrefix="md"> <eClassifiers xsi:type="ecore:EClass" name="Model"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="created" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Model.created"/> <details key="kind" value="element"/> - <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1#"/> + <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="scenarioTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Model.scenarioTime"/> <details key="kind" value="element"/> - <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1#"/> + <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Model.description"/> <details key="kind" value="element"/> - <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1#"/> + <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Model.version"/> <details key="kind" value="element"/> - <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1#"/> + <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelingAuthoritySet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Model.modelingAuthoritySet"/> <details key="kind" value="element"/> - <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1#"/> + <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="profile" upperBound="-1" @@ -43,7 +43,7 @@ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Model.profile"/> <details key="kind" value="element"/> - <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1#"/> + <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="dependentOnUrn" upperBound="-1" @@ -51,7 +51,7 @@ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Model.DependentOn"/> <details key="kind" value="element"/> - <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1#"/> + <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="supersedesUrn" upperBound="-1" @@ -59,7 +59,7 @@ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Model.Supersedes"/> <details key="kind" value="element"/> - <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1#"/> + <details key="namespace" value="http://iec.ch/TC57/61970-552/ModelDescription/1"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="DependentOn" upperBound="-1" @@ -73,7 +73,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="urn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="namespace" value="http://www.w3.org/1999/02/22-rdf-syntax-ns#"/> + <details key="namespace" value="http://www.w3.org/1999/02/22-rdf-syntax-ns"/> <details key="name" value="about"/> <details key="kind" value="attribute"/> </eAnnotations> diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml index d93776eb4c14e446169fc347d43f792a8045f635..c99c39ea67f5cac433262a5f1e2b210d40bf522a 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml +++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml @@ -22,7 +22,7 @@ <extension point="org.eclipse.emf.ecore.generated_package"> <!-- @generated headerModel --> <package - uri="http://iec.ch/TC57/61970-552/ModelDescription/1#" + uri="http://iec.ch/TC57/61970-552/ModelDescription/1" class="fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.ModelDescriptionPackage" genModel="model/headerModel.genmodel"/> </extension> diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java index 7651dc844152be291e24487f78e789441e42feae..6f0a6a075921d2a01c63e4d599b99a8eeaaac9a9 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java +++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java @@ -60,7 +60,7 @@ public interface Model extends EObject { * @return the value of the '<em>Created</em>' attribute. * @see #setCreated(Date) * @see fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.ModelDescriptionPackage#getModel_Created() - * @model extendedMetaData="name='Model.created' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1#'" + * @model extendedMetaData="name='Model.created' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1'" * @generated */ Date getCreated(); @@ -86,7 +86,7 @@ public interface Model extends EObject { * @return the value of the '<em>Scenario Time</em>' attribute. * @see #setScenarioTime(Date) * @see fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.ModelDescriptionPackage#getModel_ScenarioTime() - * @model extendedMetaData="name='Model.scenarioTime' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1#'" + * @model extendedMetaData="name='Model.scenarioTime' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1'" * @generated */ Date getScenarioTime(); @@ -112,7 +112,7 @@ public interface Model extends EObject { * @return the value of the '<em>Description</em>' attribute. * @see #setDescription(String) * @see fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.ModelDescriptionPackage#getModel_Description() - * @model extendedMetaData="name='Model.description' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1#'" + * @model extendedMetaData="name='Model.description' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1'" * @generated */ String getDescription(); @@ -138,7 +138,7 @@ public interface Model extends EObject { * @return the value of the '<em>Version</em>' attribute. * @see #setVersion(String) * @see fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.ModelDescriptionPackage#getModel_Version() - * @model extendedMetaData="name='Model.version' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1#'" + * @model extendedMetaData="name='Model.version' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1'" * @generated */ String getVersion(); @@ -164,7 +164,7 @@ public interface Model extends EObject { * @return the value of the '<em>Modeling Authority Set</em>' attribute. * @see #setModelingAuthoritySet(String) * @see fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.ModelDescriptionPackage#getModel_ModelingAuthoritySet() - * @model extendedMetaData="name='Model.modelingAuthoritySet' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1#'" + * @model extendedMetaData="name='Model.modelingAuthoritySet' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1'" * @generated */ String getModelingAuthoritySet(); @@ -190,7 +190,7 @@ public interface Model extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Profile</em>' attribute list. * @see fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.ModelDescriptionPackage#getModel_Profile() - * @model extendedMetaData="name='Model.profile' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1#'" + * @model extendedMetaData="name='Model.profile' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1'" * @generated */ EList< String > getProfile(); @@ -207,7 +207,7 @@ public interface Model extends EObject { * @return the value of the '<em>Dependent On Urn</em>' attribute list. * @see fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.ModelDescriptionPackage#getModel_DependentOnUrn() * @model transient="true" - * extendedMetaData="name='Model.DependentOn' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1#'" + * extendedMetaData="name='Model.DependentOn' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1'" * @generated */ EList< String > getDependentOnUrn(); @@ -224,7 +224,7 @@ public interface Model extends EObject { * @return the value of the '<em>Supersedes Urn</em>' attribute list. * @see fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.ModelDescriptionPackage#getModel_SupersedesUrn() * @model transient="true" - * extendedMetaData="name='Model.Supersedes' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1#'" + * extendedMetaData="name='Model.Supersedes' kind='element' namespace='http://iec.ch/TC57/61970-552/ModelDescription/1'" * @generated */ EList< String > getSupersedesUrn(); @@ -313,7 +313,7 @@ public interface Model extends EObject { * @see #setUrn(String) * @see fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.ModelDescriptionPackage#getModel_Urn() * @model id="true" - * extendedMetaData="namespace='http://www.w3.org/1999/02/22-rdf-syntax-ns#' name='about' kind='attribute'" + * extendedMetaData="namespace='http://www.w3.org/1999/02/22-rdf-syntax-ns' name='about' kind='attribute'" * @generated */ String getUrn(); diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java index 90fc0f69f79239d1e3e6956f453d3bf82a03aa35..b9f35cb40d566b8e34da139e4629934f21861eaf 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java +++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java @@ -50,7 +50,7 @@ public interface ModelDescriptionPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_URI = "http://iec.ch/TC57/61970-552/ModelDescription/1#"; + String eNS_URI = "http://iec.ch/TC57/61970-552/ModelDescription/1"; /** * The package namespace name. diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java index d79f65611a78fe7f1bd72f7fecab8ec118f7ab49..598512b6d27d336ff0ed5382966299ff7ac9c30b 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java +++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java @@ -420,23 +420,23 @@ public class ModelDescriptionPackageImpl extends EPackageImpl implements ModelDe protected void createExtendedMetaDataAnnotations() { String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation( getModel_Created(), source, new String[] { "name", "Model.created", "kind", "element", - "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1#" } ); + "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1" } ); addAnnotation( getModel_ScenarioTime(), source, new String[] { "name", "Model.scenarioTime", "kind", "element", - "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1#" } ); + "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1" } ); addAnnotation( getModel_Description(), source, new String[] { "name", "Model.description", "kind", "element", - "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1#" } ); + "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1" } ); addAnnotation( getModel_Version(), source, new String[] { "name", "Model.version", "kind", "element", - "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1#" } ); + "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1" } ); addAnnotation( getModel_ModelingAuthoritySet(), source, new String[] { "name", "Model.modelingAuthoritySet", - "kind", "element", "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1#" } ); + "kind", "element", "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1" } ); addAnnotation( getModel_Profile(), source, new String[] { "name", "Model.profile", "kind", "element", - "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1#" } ); + "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1" } ); addAnnotation( getModel_DependentOnUrn(), source, new String[] { "name", "Model.DependentOn", "kind", "element", - "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1#" } ); + "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1" } ); addAnnotation( getModel_SupersedesUrn(), source, new String[] { "name", "Model.Supersedes", "kind", "element", - "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1#" } ); - addAnnotation( getModel_Urn(), source, new String[] { "namespace", - "http://www.w3.org/1999/02/22-rdf-syntax-ns#", "name", "about", "kind", "attribute" } ); + "namespace", "http://iec.ch/TC57/61970-552/ModelDescription/1" } ); + addAnnotation( getModel_Urn(), source, new String[] { "namespace", "http://www.w3.org/1999/02/22-rdf-syntax-ns", + "name", "about", "kind", "attribute" } ); } } //ModelDescriptionPackageImpl diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimConstants.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimConstants.java index af50564d4442a1629be8f1c6ec86518c7100dc74..d979fb6642fed7366b8ecd8d298b30e5f8e37596 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimConstants.java +++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimConstants.java @@ -19,7 +19,8 @@ public abstract class CimConstants { public static final String xmlnsURI = "http://www.w3.org/2000/xmlns/"; //$NON-NLS-1$ public static final String xmlnsPrefix = "xmlns"; //$NON-NLS-1$ - public static final String rdfURI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; //$NON-NLS-1$ + public static final String rdfURI = "http://www.w3.org/1999/02/22-rdf-syntax-ns"; //$NON-NLS-1$ + public static final String rdfURISharp = rdfURI + "#"; //$NON-NLS-1$ public static final String rdfPrefix = "rdf"; //$NON-NLS-1$ public static final String nameRdfRDF = "RDF"; //$NON-NLS-1$ public static final String nameRdfID = "ID"; //$NON-NLS-1$ @@ -33,8 +34,10 @@ public abstract class CimConstants { public static final String qualifiedRdfAbout = rdfPrefix + ":" + nameRdfAbout; public static final String qualifiedRdfDescription = rdfPrefix + ":" + nameRdfDescription; - public static final String mdURIDes = "http://iec.ch/TC57/61970-552/ModelDescription/1#"; - public static final String mdURIDef = "http://iec.ch/TC57/61970-552/ModelDefinition/1#"; + public static final String mdURIDes = "http://iec.ch/TC57/61970-552/ModelDescription/1"; + public static final String mdURIDesSharp = mdURIDes + "#"; + public static final String mdURIDef = "http://iec.ch/TC57/61970-552/ModelDefinition/1"; + public static final String mdURIDefSharp = mdURIDef + "#"; // public static final String mdPrefix = "md"; // public static final String nameMdFullModel = "FullModel"; // public static final String nameMdModel = "Model"; @@ -60,7 +63,8 @@ public abstract class CimConstants { public static final String cimPrefix = "cim"; //$NON-NLS-1$ - public static final String dmURI = "http://iec.ch/2002/schema/CIM_difference_model#"; //$NON-NLS-1$ + public static final String dmURI = "http://iec.ch/2002/schema/CIM_difference_model"; //$NON-NLS-1$ + public static final String dmURISharp = dmURI + "#"; //$NON-NLS-1$ public static final String dmPrefix = "dm"; //$NON-NLS-1$ public static final String nameDmDifferenceModel = "DifferenceModel"; //$NON-NLS-1$ public static final String nameDmReverseDifferences = "reverseDifferences"; //$NON-NLS-1$ diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceHandler.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceHandler.java index c35a0bbd521e9f217ad063b9f9e5f1eebc07ebef..f3bbe505902dfe64f61082451120eb704dd44520 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceHandler.java +++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceHandler.java @@ -44,7 +44,7 @@ public abstract class CimResourceHandler extends BasicResourceHandler { buffer.append( CimConstants.rdfPrefix ); buffer.append( '=' ); buffer.append( '"' ); - buffer.append( CimConstants.rdfURI ); + buffer.append( CimConstants.rdfURISharp ); buffer.append( '"' ); buffer.append( '\n' ); diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHandler.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHandler.java index 5683ff71e75fee7afbbbd08afde0d434d40ac84c..76ac9704f5f8086c2a2354a19e543b6b16c813cd 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHandler.java +++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHandler.java @@ -184,7 +184,7 @@ public abstract class CimXMLHandler extends SAXXMLHandler { uri = helper.getURI( prefix ); } } - if( CimConstants.rdfURI.equals( uri ) ) return; + if( CimConstants.rdfURISharp.equals( uri ) ) return; super.endElement( uri, localName, name ); } diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHelperImpl.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHelperImpl.java index 1d7abcd374fbbe626218193cf83e197078e12848..7d2994deb707e42105641bfab5bde6b7f9ac66ba 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHelperImpl.java +++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHelperImpl.java @@ -33,6 +33,7 @@ public abstract class CimXMLHelperImpl extends XMLHelperImpl { public String getURI( String prefix ) { String uri = super.getURI( prefix ); if( CimConstants.mdURIDef.equals( uri )) return CimConstants.mdURIDes; + if(( uri != null ) && uri.endsWith( "#" )) return uri.substring( 0, uri.length() - 1 ); return uri; }