Attachment 83306 Details for Bug 207763 – Patch for bug 207763

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Patch for bug 207763

Bug207763.txt (text/plain), 2.73 KB, created by Alex Nan

on 2007-11-20 01:12:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Nan

Created: 2007-11-20 01:12:42 EST

Size: 2.73 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.logging.events
>Index: src.cbe101/org/eclipse/hyades/logging/events/cbe/internal/util/EventHandler.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.logging.events/src.cbe101/org/eclipse/hyades/logging/events/cbe/internal/util/EventHandler.java,v
>retrieving revision 1.1
>diff -u -r1.1 EventHandler.java
>--- src.cbe101/org/eclipse/hyades/logging/events/cbe/internal/util/EventHandler.java	6 Sep 2006 17:54:15 -0000	1.1
>+++ src.cbe101/org/eclipse/hyades/logging/events/cbe/internal/util/EventHandler.java	20 Nov 2007 06:11:00 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.hyades.logging.events.cbe.OtherSituation;
> import org.eclipse.hyades.logging.events.cbe.Situation;
> import org.eclipse.hyades.logging.events.cbe.util.EventListener;
>+import org.eclipse.osgi.baseadaptor.bundlefile.NestedDirBundleFile;
> import org.xml.sax.Attributes;
> import org.xml.sax.Locator;
> import org.xml.sax.SAXException;
>@@ -356,7 +357,7 @@
> 
>         String elementName = getLocalElementName(localName, qualifiedName);
> 
>-        if ((!elementName.equals("CommonBaseEvents")) && (!elementName.equals("TemplateEvent"))) {
>+        if ((!elementName.equals("CommonBaseEvents")) && (!elementName.equals("TemplateEvent")) || anyElementNestingDepth > 0) {
> 
>             //The EMF class and object for this XML element:
>             EObject emfObj = null;
>@@ -390,7 +391,7 @@
> 
>                 //This element is assumed to be an any element if no structural
>                 // feature was found:
>-                if (objStructuralFeature == null) {
>+                if (objStructuralFeature == null || anyElementNestingDepth > 0) {
> 
>                     if ((containerName.equals(COMMON_BASE_EVENT_CLASS)) || (containerName.equals(OTHER_SITUATION_CLASS))) {
> 
>@@ -473,7 +474,7 @@
>             }
> 
>             //Fill instance attributes:
>-            if (emfObj != null) {
>+            if (emfObj != null && emfObjClass != null) {
> 
>                 HashMap featureSubMap = (HashMap) FEATURE_MAP.get(emfObjClass.getName());
>                 EAttribute feature = null;
>@@ -542,7 +543,7 @@
> 
>         String elementName = getLocalElementName(localName, qualifiedName);
> 
>-        if ((!elementName.equals("CommonBaseEvents")) && (!elementName.equals("TemplateEvent"))) {
>+        if ((!elementName.equals("CommonBaseEvents")) && (!elementName.equals("TemplateEvent")) || anyElementNestingDepth > 0) {
> 
>             if (stack.isEmpty()) {
>                 throw new SAXException(LoggingCoreResourceBundle.getString("LOG_EVENT_SAX_PARSER_UNEXPECTED_XML_ELEMENT_EXC_", elementName, String.valueOf(line), String.valueOf(column)));

Actions: View

Attachments on bug 207763: 83228 | 83306 | 83712 | 83713 | 84055 | 84635 | 89498