Attachment 83388 Details for Bug 207806 – Patch for the problem

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

[patch] Patch for the problem

207806.txt (text/plain), 6.09 KB, created by Rohit Shetty

on 2007-11-20 22:55:45 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Rohit Shetty

Created: 2007-11-20 22:55:45 EST

Size: 6.09 KB

patch

obsolete

>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	21 Nov 2007 03:53:57 -0000
>@@ -597,7 +597,7 @@
>                         //Do not persist white space (e.g. formatting characters)
>                         // between elements:
>                         if (anyElementCharacters.trim().length() > 0) {
>-                            ((CommonBaseEvent) (object)).addAny(XmlUtility.normalize(anyElementCharacters));
>+                            ((CommonBaseEvent) (object)).addAny(anyElementCharacters.trim());
>                         }
>                         
>                         if(eventListener != null){
>@@ -619,10 +619,10 @@
>                             String currentAnyElement = otherSituation.getAny();
> 
>                             if ((currentAnyElement != null) && (currentAnyElement.trim().length() > 0)) {
>-                                otherSituation.setAny(currentAnyElement.concat(XmlUtility.normalize(anyElementCharacters)));
>+                                otherSituation.setAny(currentAnyElement.concat(anyElementCharacters));
>                             } 
>                             else {
>-                                otherSituation.setAny(XmlUtility.normalize(anyElementCharacters));
>+                                otherSituation.setAny(anyElementCharacters.trim());
>                             }
> 				        }					
> 					}
>Index: src.events/org/eclipse/tptp/logging/events/cbe/util/EventFormatter.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.logging.events/src.events/org/eclipse/tptp/logging/events/cbe/util/EventFormatter.java,v
>retrieving revision 1.2
>diff -u -r1.2 EventFormatter.java
>--- src.events/org/eclipse/tptp/logging/events/cbe/util/EventFormatter.java	5 Oct 2006 21:07:44 -0000	1.2
>+++ src.events/org/eclipse/tptp/logging/events/cbe/util/EventFormatter.java	21 Nov 2007 03:54:10 -0000
>@@ -2089,9 +2089,9 @@
> 							buffer.append("\t\t\t");
> 						}
> 
>-						// Do NOT normalize since this string is assumed to be a
>-						// valid XML fragment:
>-						buffer.append(anyData);
>+			              // Normalizing since this string might not always be
>+		                // a valid XML fragment: Bugzilla 207806
>+		                buffer.append(XmlUtility.normalize(anyData));
> 					}
> 
> 					if (format) {
>@@ -2127,9 +2127,9 @@
> 					buffer.append("\t");
> 				}
> 
>-				// Do NOT normalize since this string is assumed to be a
>-				// valid XML fragment:
>-				buffer.append(anyElement);
>+                // Normalizing since this string might not always be
>+                // a valid XML fragment: Bugzilla 207806
>+                buffer.append(XmlUtility.normalize(anyElement));
> 			}
> 		}
> 
>Index: src.cbe101/org/eclipse/hyades/logging/events/cbe/util/EventFormatter.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.logging.events/src.cbe101/org/eclipse/hyades/logging/events/cbe/util/EventFormatter.java,v
>retrieving revision 1.2
>diff -u -r1.2 EventFormatter.java
>--- src.cbe101/org/eclipse/hyades/logging/events/cbe/util/EventFormatter.java	5 Oct 2006 21:07:44 -0000	1.2
>+++ src.cbe101/org/eclipse/hyades/logging/events/cbe/util/EventFormatter.java	21 Nov 2007 03:54:03 -0000
>@@ -2091,9 +2091,9 @@
> 							buffer.append("\t\t\t");
> 						}
> 
>-						// Do NOT normalize since this string is assumed to be a
>-						// valid XML fragment:
>-						buffer.append(anyData);
>+						// Normalizing since this string might not always be
>+		                // a valid XML fragment: Bugzilla 207806
>+		                buffer.append(XmlUtility.normalize(anyData));
> 					}
> 
> 					if (format) {
>@@ -2129,9 +2129,9 @@
> 					buffer.append("\t");
> 				}
> 
>-				// Do NOT normalize since this string is assumed to be a
>-				// valid XML fragment:
>-				buffer.append(anyElement);
>+				// Normalizing since this string might not always be
>+				// a valid XML fragment: Bugzilla 207806
>+				buffer.append(XmlUtility.normalize(anyElement));
> 			}
> 		}
> 
>Index: src.events/org/eclipse/tptp/logging/events/cbe/internal/util/EventHandler.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.logging.events/src.events/org/eclipse/tptp/logging/events/cbe/internal/util/EventHandler.java,v
>retrieving revision 1.1
>diff -u -r1.1 EventHandler.java
>--- src.events/org/eclipse/tptp/logging/events/cbe/internal/util/EventHandler.java	6 Sep 2006 17:54:23 -0000	1.1
>+++ src.events/org/eclipse/tptp/logging/events/cbe/internal/util/EventHandler.java	21 Nov 2007 03:54:05 -0000
>@@ -1080,7 +1080,7 @@
> 
>                 //Do not persist white space (e.g. formatting characters) between elements:
>                 if (charactersBuffer.toString().trim().length() > 0) {
>-                    commonBaseEvent.addAny(XmlUtility.normalize(charactersBuffer.toString()));
>+                    commonBaseEvent.addAny(charactersBuffer.toString().trim());
>                 }
> 
>                 if(eventListener != null){
>@@ -1247,7 +1247,7 @@
>     
>                 //Do not persist white space (e.g. formatting characters) between elements:
>                 if (charactersBuffer.toString().trim().length() > 0) {
>-                    otherSituation.setAny(XmlUtility.normalize(charactersBuffer.toString()));
>+                    otherSituation.setAny(charactersBuffer.toString().trim());
>                 }                    
> 
>                 ((Situation)(parsedElements.get(parsedElements.size() - 1))).setSituationType(otherSituation);

Actions: View | Diff

Attachments on bug 207806: 83388 | 83389 | 83693 | 83694 | 89501