From 55411240d2dc2018f9c1f19ec0e33bd091635a14 Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Fri, 16 Feb 2018 17:00:32 +0100
Subject: [PATCH] Sharp character in URI removed, code adapted
---
.../plugin.xml | 2 +-
.../model/headerModel.ecore | 20 +++++++++----------
.../plugin.xml | 2 +-
.../headerModel/ModelDescription/Model.java | 18 ++++++++---------
.../ModelDescriptionPackage.java | 2 +-
.../impl/ModelDescriptionPackageImpl.java | 20 +++++++++----------
.../cim/util/cimxml/CimConstants.java | 12 +++++++----
.../cim/util/cimxml/CimResourceHandler.java | 2 +-
.../cim/util/cimxml/CimXMLHandler.java | 2 +-
.../cim/util/cimxml/CimXMLHelperImpl.java | 1 +
10 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml
index 39c8d28..0c539f4 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 0ee689e..f5f48f6 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 d93776e..c99c39e 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 7651dc8..6f0a6a0 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 90fc0f6..b9f35cb 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 d79f656..598512b 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 af50564..d979fb6 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 c35a0bb..f3bbe50 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 5683ff7..76ac970 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 1d7abcd..7d2994d 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;
}
--
GitLab