From aca6a35ebbddb50e3c972682257e147a4e4bffb5 Mon Sep 17 00:00:00 2001
From: Richard Lincoln <r.w.lincoln@gmail.com>
Date: Thu, 25 Aug 2011 14:07:14 +0100
Subject: [PATCH] Fixing space in "Cuts and Jumpers" package name, as reported
 by Stefan in Issue #6.

---
 CIM15/IEC61970/{Cuts and jumpers => CutsJumpers}/Clamp.py    | 0
 CIM15/IEC61970/{Cuts and jumpers => CutsJumpers}/Cut.py      | 0
 CIM15/IEC61970/{Cuts and jumpers => CutsJumpers}/__init__.py | 8 ++++----
 CIM15/__init__.py                                            | 4 ++--
 Model/CIM15/CIM15.ecore                                      | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename CIM15/IEC61970/{Cuts and jumpers => CutsJumpers}/Clamp.py (100%)
 rename CIM15/IEC61970/{Cuts and jumpers => CutsJumpers}/Cut.py (100%)
 rename CIM15/IEC61970/{Cuts and jumpers => CutsJumpers}/__init__.py (84%)

diff --git a/CIM15/IEC61970/Cuts and jumpers/Clamp.py b/CIM15/IEC61970/CutsJumpers/Clamp.py
similarity index 100%
rename from CIM15/IEC61970/Cuts and jumpers/Clamp.py
rename to CIM15/IEC61970/CutsJumpers/Clamp.py
diff --git a/CIM15/IEC61970/Cuts and jumpers/Cut.py b/CIM15/IEC61970/CutsJumpers/Cut.py
similarity index 100%
rename from CIM15/IEC61970/Cuts and jumpers/Cut.py
rename to CIM15/IEC61970/CutsJumpers/Cut.py
diff --git a/CIM15/IEC61970/Cuts and jumpers/__init__.py b/CIM15/IEC61970/CutsJumpers/__init__.py
similarity index 84%
rename from CIM15/IEC61970/Cuts and jumpers/__init__.py
rename to CIM15/IEC61970/CutsJumpers/__init__.py
index 43f148f..7286be8 100644
--- a/CIM15/IEC61970/Cuts and jumpers/__init__.py	
+++ b/CIM15/IEC61970/CutsJumpers/__init__.py
@@ -19,9 +19,9 @@
 # IN THE SOFTWARE.
 
 
-from CIM15.IEC61970.Cuts and jumpers.Cut import Cut
-from CIM15.IEC61970.Cuts and jumpers.Clamp import Clamp
+from CIM15.IEC61970.CutsJumpers.Cut import Cut
+from CIM15.IEC61970.CutsJumpers.Clamp import Clamp
 
-nsURI = "http://iec.ch/TC57/2010/CIM-schema-cim15#Cuts and jumpers"
-nsPrefix = "cimCuts and jumpers"
+nsURI = "http://iec.ch/TC57/2010/CIM-schema-cim15#CutsJumpers"
+nsPrefix = "cimCutsJumpers"
 
diff --git a/CIM15/__init__.py b/CIM15/__init__.py
index 4a1a12c..6ef80a0 100644
--- a/CIM15/__init__.py
+++ b/CIM15/__init__.py
@@ -508,8 +508,8 @@ packageMap = {
     "OutageSchedule": "CIM15.IEC61970.Outage",
     "ClearanceTagType": "CIM15.IEC61970.Outage",
     "ClearanceTag": "CIM15.IEC61970.Outage",
-    "Cut": "CIM15.IEC61970.Cuts and jumpers",
-    "Clamp": "CIM15.IEC61970.Cuts and jumpers",
+    "Cut": "CIM15.IEC61970.CutsJumpers",
+    "Clamp": "CIM15.IEC61970.CutsJumpers",
     "RecloseSequence": "CIM15.IEC61970.Protection",
     "SynchrocheckRelay": "CIM15.IEC61970.Protection",
     "CurrentRelay": "CIM15.IEC61970.Protection",
diff --git a/Model/CIM15/CIM15.ecore b/Model/CIM15/CIM15.ecore
index 2d49253..0aa328c 100644
--- a/Model/CIM15/CIM15.ecore
+++ b/Model/CIM15/CIM15.ecore
@@ -15030,7 +15030,7 @@
           </eAnnotations>
         </eStructuralFeatures>
         <eStructuralFeatures xsi:type="ecore:EReference" name="Cut" upperBound="-1"
-            eType="#//IEC61970/Cuts%20and%20jumpers/Cut" eOpposite="#//IEC61970/Cuts%20and%20jumpers/Cut/ACLineSegment"/>
+            eType="#//IEC61970/CutsJumpers/Cut" eOpposite="#//IEC61970/CutsJumpers/Cut/ACLineSegment"/>
         <eStructuralFeatures xsi:type="ecore:EReference" name="PhaseImpedance" eType="#//IEC61970/Wires/PerLengthPhaseImpedance"
             eOpposite="#//IEC61970/Wires/PerLengthPhaseImpedance/LineSegments">
           <eAnnotations source="http://iec.ch/TC57/2010/CIM-schema-cim15">
@@ -15041,7 +15041,7 @@
           </eAnnotations>
         </eStructuralFeatures>
         <eStructuralFeatures xsi:type="ecore:EReference" name="Clamp" upperBound="-1"
-            eType="#//IEC61970/Cuts%20and%20jumpers/Clamp" eOpposite="#//IEC61970/Cuts%20and%20jumpers/Clamp/ACLineSegment"/>
+            eType="#//IEC61970/CutsJumpers/Clamp" eOpposite="#//IEC61970/CutsJumpers/Clamp/ACLineSegment"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="x0" eType="#//IEC61970/Domain/Reactance"
             unsettable="true">
           <eAnnotations source="http://iec.ch/TC57/2010/CIM-schema-cim15">
@@ -22924,8 +22924,8 @@
         </eStructuralFeatures>
       </eClassifiers>
     </eSubpackages>
-    <eSubpackages name="Cuts and jumpers" nsURI="http://iec.ch/TC57/2010/CIM-schema-cim15#Cuts and jumpers"
-        nsPrefix="cimCuts and jumpers">
+    <eSubpackages name="CutsJumpers" nsURI="http://iec.ch/TC57/2010/CIM-schema-cim15#CutsJumpers"
+        nsPrefix="cimCutsJumpers">
       <eClassifiers xsi:type="ecore:EClass" name="Cut" eSuperTypes="#//IEC61970/Wires/Switch">
         <eAnnotations source="http://iec.ch/TC57/2010/CIM-schema-cim15">
           <details key="Documentation" value="A Cut separates a line segment into two parts. The Cut appears as a Switch inserted between these two parts and connects them together. As the Cut is normally &amp;ldquo;open&amp;rdquo; there is no galvanic connection between the two line segment parts. But it is possible to &quot;close&quot; the Cut to get galvanic connection.&#xA;The Cut Terminals are oriented towards the line segment Terminals with the same sequenceNumber. Hence the Cut Terminal with sequenceNumber=1 is oriented to the line segment with Terminal.sequenceNumber=1.&#xA;The Cut Terminals also act as connection points for jumpers and other equipment, e.g. a mobile generator. To enable this ConnectivityNoces are placed at the Cut Terminals. Once the ConnectivityNodes are in place any ConductingEquipment can be connected at them."/>
-- 
2.11.4.GIT