Merge pull request #59 from riseclipse/58-elements-from-other-namespa…

…ces-cause-a-bad-inclusion-hierarchy 58 elements from other namespaces cause a bad inclusion hierarchy
riseclipse · Sep 11, 2024 · 789d17a · 789d17a
2 parents 029147d + 9694a10
commit 789d17a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit;singleton:=true
 Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit
-Bundle-Version: 1.2.12
+Bundle-Version: 1.2.13.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin$Implementation
 Bundle-Localization: plugin

diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities
-Bundle-Version: 1.2.12
+Bundle-Version: 1.2.13.qualifier
 Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.emf.ecore,

diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl;singleton:=true
 Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl
-Bundle-Version: 1.2.12
+Bundle-Version: 1.2.13.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17

diff --git a/...e.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SCLXMLHandler.java b/...e.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SCLXMLHandler.java
@@ -132,6 +132,11 @@ else if( inPrivate ) {
             }
             return;
         }
+        if( ! SclPackage.eNS_URI.equals( uri )) {
+            // any content is ignored (see getFeature() below) so do not call standard endElement
+            // because no object has been put on the stack
+            return;
+        }
         super.endElement( uri, localName, name );
     }