Attachment 110775 Details for Bug 182480 – Proposal patch

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

[patch] Proposal patch

patch182480.txt (text/plain), 2.14 KB, created by Masashi Sato

on 2008-08-25 02:50:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Masashi Sato

Created: 2008-08-25 02:50:39 EDT

Size: 2.14 KB

patch

obsolete

>Index: src-emfModelSynch/org/eclipse/wst/xml/core/internal/emf2xml/EMF2DOMSSEAdapter.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.core/src-emfModelSynch/org/eclipse/wst/xml/core/internal/emf2xml/EMF2DOMSSEAdapter.java,v
>retrieving revision 1.10
>diff -u -r1.10 EMF2DOMSSEAdapter.java
>--- src-emfModelSynch/org/eclipse/wst/xml/core/internal/emf2xml/EMF2DOMSSEAdapter.java	9 Aug 2008 19:17:15 -0000	1.10
>+++ src-emfModelSynch/org/eclipse/wst/xml/core/internal/emf2xml/EMF2DOMSSEAdapter.java	25 Aug 2008 06:47:13 -0000
>@@ -178,12 +178,37 @@
> 			return;
> 		String domPath = map.getDOMPath();
> 
>-		if ((!map.isManagedByParent() && !map.isDOMTextValue()) || (map.isManagedByParent() && domPath.length() != 0) && node.getNodeName().equals(domPath)) {
>+//		if ((!map.isManagedByParent() && !map.isDOMTextValue()) || (map.isManagedByParent() && domPath.length() != 0) && node.getNodeName().equals(domPath)) {
>+		if ((hasChildTag(map) && !map.isDOMTextValue()) || (map.isManagedByParent() && domPath.length() != 0) && node.getNodeName().equals(domPath)) {
> 			Text newWS = node.getOwnerDocument().createTextNode(getNewlineString(node) + indentString); //$NON-NLS-1$
> 			DOMUtilities.insertBeforeNode(node, newWS, null);
> 		}
> 	}
> 
>+	private static boolean hasChildTag(Translator map) {
>+		String name = map.getClass().getName();
>+		if (name.endsWith("GenericTranslator") || name.endsWith("WebTypeTranslator")) {
>+			
>+			Translator[] children = map.getChildren(null, -1);
>+			if (children != null) {
>+				for(int index = 0;index < children.length;index++) {
>+					String[] names = children[index].getDOMNames();
>+					for(int nameIndex = 0;nameIndex < names.length;nameIndex++) {
>+						if (names[nameIndex].equals("id") == false && names[nameIndex].equals("xml:lang") == false && names[nameIndex].equals("$TEXT_ATTRIBUTE_VALUE") == false) {
>+							return true;
>+						}
>+					}
>+					
>+				}
>+			}
>+		
>+			return false;
>+		}
>+		else {
>+			return !map.isManagedByParent();
>+		}
>+	}
>+	
> 	/**
> 	 * Indent before the start tag of the <node>passed in.
> 	 */

Actions: View | Diff

Attachments on bug 182480: 110775