From 9ea83fdd1a140a8e7cb66d005243854892776780 Mon Sep 17 00:00:00 2001
From: Willem Cazander <w.cazander@gmail.com>
Date: Mon, 8 Apr 2013 22:31:11 +0200
Subject: [PATCH] Done swixml two sided binding handlers methods and small
 things in xml writer.

---
 .../java/org/x4o/xml/io/XMLConstants.java     |   1 -
 .../java/org/x4o/xml/io/sax/XMLWriter.java    | 411 +++++++++---------
 .../org/x4o/xml/lang/X4OLanguageProperty.java |   7 +-
 .../META-INF/swixml/swixml-lang-2.0.eld       |  10 +-
 .../META-INF/swixml/swixml-lang-3.0.eld       |  10 +-
 5 files changed, 217 insertions(+), 222 deletions(-)

diff --git a/x4o-core/src/main/java/org/x4o/xml/io/XMLConstants.java b/x4o-core/src/main/java/org/x4o/xml/io/XMLConstants.java
index d42c6ff..d831cad 100644
--- a/x4o-core/src/main/java/org/x4o/xml/io/XMLConstants.java
+++ b/x4o-core/src/main/java/org/x4o/xml/io/XMLConstants.java
@@ -123,7 +123,6 @@ public final class XMLConstants {
 	public static final String CHAR_NEWLINE = "\r\n";
 	
 	
-
 	
 	static public String getDocumentDeclaration(String encoding) {
 		return getDocumentDeclaration(encoding,null);
diff --git a/x4o-core/src/main/java/org/x4o/xml/io/sax/XMLWriter.java b/x4o-core/src/main/java/org/x4o/xml/io/sax/XMLWriter.java
index 9f1909a..fc34c88 100644
--- a/x4o-core/src/main/java/org/x4o/xml/io/sax/XMLWriter.java
+++ b/x4o-core/src/main/java/org/x4o/xml/io/sax/XMLWriter.java
@@ -48,11 +48,6 @@ import org.xml.sax.ext.DefaultHandler2;
  * @version 1.0 17/04/2005
  */
 public class XMLWriter extends DefaultHandler2 {
-
-	private final static String ENCODING = "http://writer.x4o.org/xml/properties/encoding";
-	private final static String CHAR_NEWLINE = "http://writer.x4o.org/xml/properties/char/newline";
-	private final static String CHAR_TAB = "http://writer.x4o.org/xml/properties/char/tab";
-	private final static String URI_PREFX = "http://writer.x4o.org/xml/properties/char/";
 	
 	private String encoding = null;
 	private String charNewline = null;
@@ -123,19 +118,13 @@ public class XMLWriter extends DefaultHandler2 {
 		this(new OutputStreamWriter(out, XMLConstants.XML_DEFAULT_ENCODING),XMLConstants.XML_DEFAULT_ENCODING);
 	}
 	
-
-	
 	/**
 	 * @see org.xml.sax.ContentHandler#startDocument()
 	 */
 	@Override
 	public void startDocument() throws SAXException {
 		indent = 0;
-		try {
-			out.write(XMLConstants.getDocumentDeclaration(encoding));
-		} catch (IOException e) {
-			throw new SAXException(e);
-		}
+		write(XMLConstants.getDocumentDeclaration(encoding));
 	}
 	
 	/**
@@ -143,11 +132,7 @@ public class XMLWriter extends DefaultHandler2 {
 	 */
 	@Override
 	public void endDocument() throws SAXException {
-		try {
-			out.flush();
-		} catch (IOException e) {
-			throw new SAXException(e);
-		}
+		writeFlush();
 	}
 
 	/**
@@ -159,112 +144,107 @@ public class XMLWriter extends DefaultHandler2 {
 	 */
 	@Override
 	public void startElement(String uri, String localName, String name,Attributes atts) throws SAXException {
-		try {
-			if (startElement!=null) {
-				out.write(startElement.toString());
-				startElement=null;
-			}
-			startElement = new StringBuffer(200);
-			
-			if (printedReturn==false) {
-				startElement.append(charNewline);
-			}
-			printedReturn=false;
-			
-			for (int i = 0; i < indent; i++) {
-				startElement.append(charTab);
-			}
-			startElement.append(XMLConstants.TAG_OPEN);
-			
-			if (localName==null) {
-				localName = "null";
-			}
-			
-			if (XMLConstants.NULL_NS_URI.equals(uri) | uri==null) {
-				startElement.append(localName);
-			} else {
-				String prefix = prefixMapping.get(uri);
-				if (prefix==null) {
-					throw new SAXException("preFixUri: "+uri+" is not started.");
-				}
-				if (XMLConstants.NULL_NS_URI.equals(prefix)==false) {
-					startElement.append(prefix);
-					startElement.append(XMLConstants.XMLNS_ASSIGN);
-				}
-				startElement.append(localName);
-			}
-			
-			if ((uri!=null & XMLConstants.NULL_NS_URI.equals(uri)==false) && printedMappings.contains(uri)==false) {
-				String prefix = prefixMapping.get(uri);
-				if (prefix==null) {
-					throw new SAXException("preFixUri: "+uri+" is not started.");
-				}
-				printedMappings.add(uri);
-				
-				startElement.append(' ');
-				startElement.append(XMLConstants.XMLNS_ATTRIBUTE);
-				if ("".equals(prefix)==false) {
-					startElement.append(':');
-					startElement.append(prefix);
-				}
-				startElement.append("=\"");
-				startElement.append(uri);
-				startElement.append('"');
-				
-				boolean first = true;
-				for (String uri2:prefixMapping.keySet()) {
-					if (printedMappings.contains(uri2)==false) {
-						prefix = prefixMapping.get(uri2);
-						if (prefix==null) {
-							throw new SAXException("preFixUri: "+uri+" is not started.");
-						}
-						printedMappings.add(uri2);
-						
-						if (first) {
-							startElement.append(charNewline);
-							first = false;
-						}
-						
-						startElement.append(' ');
-						startElement.append(XMLConstants.XMLNS_ATTRIBUTE);
-						if ("".equals(prefix)==false) {
-							startElement.append(XMLConstants.XMLNS_ASSIGN);
-							startElement.append(prefix);
-						}
-						startElement.append("=\"");
-						startElement.append(uri2);
-						startElement.append('"');
-						startElement.append(charNewline);
-					}
-				}
-			}
-			
-			for (int i=0;i<atts.getLength();i++) {
-				String attributeUri = atts.getURI(i);
-				String attributeName = atts.getLocalName(i);
-				String attributeValue = atts.getValue(i);
-				if (attributeValue==null) {
-					attributeValue = "null";
-				}
-				startElement.append(' ');
-				if (XMLConstants.NULL_NS_URI.equals(attributeUri) | attributeUri ==null) {
-					startElement.append(attributeName);
-				} else {
-					startElement.append(attributeUri);
-					startElement.append(XMLConstants.XMLNS_ASSIGN);
-					startElement.append(attributeName);
-				}
-				
-				startElement.append("=\"");
-				startElement.append(XMLConstants.escapeAttributeValue(attributeValue));
-				startElement.append('"');
-			}
-			startElement.append(XMLConstants.TAG_CLOSE);
-		} catch (IOException e) {
-			throw new SAXException(e);
-		} finally {
-			indent++;
+		if (startElement!=null) {
+			write(startElement.toString());
+			startElement=null;
 		}
+		startElement = new StringBuffer(200);
+		
+		if (printedReturn==false) {
+			startElement.append(charNewline);
+		}
+		printedReturn=false;
+		
+		for (int i = 0; i < indent; i++) {
+			startElement.append(charTab);
+		}
+		startElement.append(XMLConstants.TAG_OPEN);
+		
+		if (localName==null) {
+			localName = "null";
+		}
+		
+		if (XMLConstants.NULL_NS_URI.equals(uri) | uri==null) {
+			startElement.append(localName);
+		} else {
+			String prefix = prefixMapping.get(uri);
+			if (prefix==null) {
+				throw new SAXException("preFixUri: "+uri+" is not started.");
+			}
+			if (XMLConstants.NULL_NS_URI.equals(prefix)==false) {
+				startElement.append(prefix);
+				startElement.append(XMLConstants.XMLNS_ASSIGN);
+			}
+			startElement.append(localName);
+		}
+		
+		if ((uri!=null & XMLConstants.NULL_NS_URI.equals(uri)==false) && printedMappings.contains(uri)==false) {
+			String prefix = prefixMapping.get(uri);
+			if (prefix==null) {
+				throw new SAXException("preFixUri: "+uri+" is not started.");
+			}
+			printedMappings.add(uri);
+			
+			startElement.append(' ');
+			startElement.append(XMLConstants.XMLNS_ATTRIBUTE);
+			if ("".equals(prefix)==false) {
+				startElement.append(':');
+				startElement.append(prefix);
+			}
+			startElement.append("=\"");
+			startElement.append(uri);
+			startElement.append('"');
+			
+			boolean first = true;
+			for (String uri2:prefixMapping.keySet()) {
+				if (printedMappings.contains(uri2)==false) {
+					prefix = prefixMapping.get(uri2);
+					if (prefix==null) {
+						throw new SAXException("preFixUri: "+uri+" is not started.");
+					}
+					printedMappings.add(uri2);
+					
+					if (first) {
+						startElement.append(charNewline);
+						first = false;
+					}
+					
+					startElement.append(' ');
+					startElement.append(XMLConstants.XMLNS_ATTRIBUTE);
+					if ("".equals(prefix)==false) {
+						startElement.append(XMLConstants.XMLNS_ASSIGN);
+						startElement.append(prefix);
+					}
+					startElement.append("=\"");
+					startElement.append(uri2);
+					startElement.append('"');
+					startElement.append(charNewline);
+				}
+			}
+		}
+		
+		for (int i=0;i<atts.getLength();i++) {
+			String attributeUri = atts.getURI(i);
+			String attributeName = atts.getLocalName(i);
+			String attributeValue = atts.getValue(i);
+			if (attributeValue==null) {
+				attributeValue = "null";
+			}
+			startElement.append(' ');
+			if (XMLConstants.NULL_NS_URI.equals(attributeUri) | attributeUri ==null) {
+				startElement.append(attributeName);
+			} else {
+				startElement.append(attributeUri);
+				startElement.append(XMLConstants.XMLNS_ASSIGN);
+				startElement.append(attributeName);
+			}
+			
+			startElement.append("=\"");
+			startElement.append(XMLConstants.escapeAttributeValue(attributeValue));
+			startElement.append('"');
+		}
+		startElement.append(XMLConstants.TAG_CLOSE);
+		indent++;
 	}
 	
 	/**
@@ -275,45 +255,40 @@ public class XMLWriter extends DefaultHandler2 {
 	 */
 	@Override
 	public void endElement(String uri, String localName, String name) throws SAXException {
-		try {
-			if (startElement!=null) {
-				String ss = startElement.toString();
-				out.write(ss,0,ss.length()-1);
-				out.write(XMLConstants.TAG_CLOSE_EMPTY);
-				startElement=null;
-				indent--;
-				return;
-			}
-			
-			if (printedReturn==false) {
-				out.write(charNewline);
-			}
-			printedReturn=false;
+		if (startElement!=null) {
+			write(startElement.toString());
+			write(XMLConstants.TAG_CLOSE_EMPTY);
+			startElement=null;
 			indent--;
-			writeIndent();
-			
-			if (localName==null) {
-				localName = "null";
-			}
-			
-			out.write(XMLConstants.TAG_OPEN_END);
-			if (XMLConstants.NULL_NS_URI.equals(uri) | uri==null) {
-				out.write(localName);
-			} else {
-				String prefix = prefixMapping.get(uri);
-				if (prefix==null) {
-					throw new SAXException("preFixUri: "+uri+" is not started.");
-				}
-				if (XMLConstants.NULL_NS_URI.equals(prefix)==false) {
-					out.write(prefix);
-					out.write(XMLConstants.XMLNS_ASSIGN);
-				}
-				out.write(localName);
-			}
-			out.write(XMLConstants.TAG_CLOSE);
-		} catch (IOException e) {
-			throw new SAXException(e);
+			return;
 		}
+		
+		if (printedReturn==false) {
+			write(charNewline);
+		}
+		printedReturn=false;
+		indent--;
+		writeIndent();
+		
+		if (localName==null) {
+			localName = "null";
+		}
+		
+		write(XMLConstants.TAG_OPEN_END);
+		if (XMLConstants.NULL_NS_URI.equals(uri) | uri==null) {
+			write(localName);
+		} else {
+			String prefix = prefixMapping.get(uri);
+			if (prefix==null) {
+				throw new SAXException("preFixUri: "+uri+" is not started.");
+			}
+			if (XMLConstants.NULL_NS_URI.equals(prefix)==false) {
+				write(prefix);
+				write(XMLConstants.XMLNS_ASSIGN);
+			}
+			write(localName);
+		}
+		write(XMLConstants.TAG_CLOSE);
 	}
 		
 	/**
@@ -360,20 +335,16 @@ public class XMLWriter extends DefaultHandler2 {
 	 */
 	@Override
 	public void characters(char[] ch, int start, int length) throws SAXException {
-		try {
-			if (startElement!=null) {
-				out.write(startElement.toString());
-				startElement=null;
+		if (startElement!=null) {
+			write(startElement.toString());
+			startElement=null;
+		}
+		for (int i=start;i<(start+length);i++) {
+			char c = ch[i];
+			write(c);
+			if (c=='\n') {
+				printedReturn=true;
 			}
-			for (int i=start;i<(start+length);i++) {
-				char c = ch[i];
-				out.write(c);
-				if (c=='\n') {
-					printedReturn=true;
-				}
-			}
-		} catch (IOException e) {
-			throw new SAXException(e);
 		}
 	}
 	
@@ -388,15 +359,11 @@ public class XMLWriter extends DefaultHandler2 {
 	 */
 	@Override
 	public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
-		try {
-			if (startElement!=null) {
-				out.write(startElement.toString());
-				startElement=null;
-			}
-			out.write(ch, start, length); 
-		} catch (IOException e) {
-			throw new SAXException(e);
+		if (startElement!=null) {
+			write(startElement.toString());
+			startElement=null;
 		}
+		write(ch, start, length);
 	}
 
 	/**
@@ -408,18 +375,14 @@ public class XMLWriter extends DefaultHandler2 {
 	 */
 	@Override
 	public void processingInstruction(String target, String data) throws SAXException {
-		try {
-			writeIndent();
-			out.write(XMLConstants.PROCESS_START);
-			out.write(target);
-			out.write(' ');
-			out.write(data);
-			out.write(XMLConstants.PROCESS_END);
-			out.write(charNewline);
-			out.flush();
-		} catch (IOException e) {
-			throw new SAXException(e);
-		} 
+		writeIndent();
+		write(XMLConstants.PROCESS_START);
+		write(target);
+		write(' ');
+		write(data);
+		write(XMLConstants.PROCESS_END);
+		write(charNewline);
+		writeFlush();
 	}
 
 	/**
@@ -454,33 +417,61 @@ public class XMLWriter extends DefaultHandler2 {
 	 */
 	@Override
 	public void comment(char[] ch, int start, int length) throws SAXException {
-		try {
-			writeIndent();
-			out.write(XMLConstants.COMMENT_START);
-					
-			/// mmm todo improve a bit
-			for (int i=start;i<(start+length);i++) {
-				char c = ch[i];
-				if (c=='\n') {
-					out.write(c);
-					writeIndent();
-					continue;
-				}
-				out.write(c);
+		writeIndent();
+		write(XMLConstants.COMMENT_START);
+				
+		/// mmm todo improve a bit
+		for (int i=start;i<(start+length);i++) {
+			char c = ch[i];
+			if (c=='\n') {
+				write(c);
+				writeIndent();
+				continue;
 			}
-			out.write(XMLConstants.COMMENT_END);
-		} catch (IOException e) {
-			throw new SAXException(e);
+			write(c);
 		}
+		write(XMLConstants.COMMENT_END);
 	}
 
 	/**
 	 * Indent the output writer with tabs by indent count.
 	 * @throws IOException	When prints gives exception.
 	 */
-	private void writeIndent() throws IOException {
+	private void writeIndent() throws SAXException {
 		for (int i = 0; i < indent; i++) {
-			out.write(charTab);
+			write(charTab);
+		}
+	}
+	
+	private void writeFlush() throws SAXException {
+		try {
+			out.flush();
+		} catch (IOException e) {
+			throw new SAXException(e);
+		}
+	}
+	
+	private void write(String text) throws SAXException {
+		try {
+			out.write(text);
+		} catch (IOException e) {
+			throw new SAXException(e);
+		}
+	}
+	
+	private void write(char[] ch, int start, int length) throws SAXException {
+		try {
+			out.write(ch,start,length);
+		} catch (IOException e) {
+			throw new SAXException(e);
+		}
+	}
+	
+	private void write(char c) throws SAXException {
+		try {
+			out.write(c);
+		} catch (IOException e) {
+			throw new SAXException(e);
 		}
 	}
 }
diff --git a/x4o-core/src/main/java/org/x4o/xml/lang/X4OLanguageProperty.java b/x4o-core/src/main/java/org/x4o/xml/lang/X4OLanguageProperty.java
index 507f36e..2a932d5 100644
--- a/x4o-core/src/main/java/org/x4o/xml/lang/X4OLanguageProperty.java
+++ b/x4o-core/src/main/java/org/x4o/xml/lang/X4OLanguageProperty.java
@@ -46,7 +46,12 @@ import org.xml.sax.ext.DefaultHandler2;
  */
 public enum X4OLanguageProperty {
 	
-
+	/* TODO: refactor all keys ?
+	private final static String ENCODING = "http://writer.x4o.org/xml/properties/encoding";
+	private final static String CHAR_NEWLINE = "http://writer.x4o.org/xml/properties/char/newline";
+	private final static String CHAR_TAB = "http://writer.x4o.org/xml/properties/char/tab";
+	private final static String URI_PREFX = "http://writer.x4o.org/xml/properties/char/";
+	*/
 	
 	/** Read-Only property returning the language we are working with. */
 	LANGUAGE_NAME(IO.GLOBAL,"language/name"),
diff --git a/x4o-core/src/test/resources/META-INF/swixml/swixml-lang-2.0.eld b/x4o-core/src/test/resources/META-INF/swixml/swixml-lang-2.0.eld
index cdb84d7..501d178 100644
--- a/x4o-core/src/test/resources/META-INF/swixml/swixml-lang-2.0.eld
+++ b/x4o-core/src/test/resources/META-INF/swixml/swixml-lang-2.0.eld
@@ -38,11 +38,11 @@
 	<bindingHandler id="JInternalFrameBindingHandler" 	bean.class="org.x4o.xml.test.swixml.bind.JInternalFrameBindingHandler"/>
 	<bindingHandler id="JPanelBindingHandler"			bean.class="org.x4o.xml.test.swixml.bind.JPanelBindingHandler"/>
 	<bindingHandler id="JSplitPaneBindingHandler" 		bean.class="org.x4o.xml.test.swixml.bind.JSplitPaneBindingHandler"/>
-	<classBindingHandler id="JScrollPane-JComponent"		parentClass="javax.swing.JScrollPane"		childClass="javax.swing.JComponent"		addMethod="setViewportView"		getMethod="todo"/>
-	<classBindingHandler id="JDesktopPane-JInternalFrame"	parentClass="javax.swing.JDesktopPane"		childClass="javax.swing.JInternalFrame"	addMethod="add"		getMethod="todo"/>
-	<classBindingHandler id="JFrame-JDesktopPane"			parentClass="javax.swing.JFrame"			childClass="javax.swing.JDesktopPane"	addMethod="setContentPane"		getMethod="todo"/>
-	<classBindingHandler id="JMenuBar-JMenu"				parentClass="javax.swing.JMenuBar"			childClass="javax.swing.JMenu"			addMethod="add"		getMethod="todo"/>
-	<classBindingHandler id="JMenu-JMenuItem"				parentClass="javax.swing.JMenu"				childClass="javax.swing.JMenuItem"		addMethod="add"		getMethod="todo"/>
+	<classBindingHandler id="JScrollPane-JComponent"		parentClass="javax.swing.JScrollPane"		childClass="javax.swing.JComponent"		addMethod="setViewportView"		getMethod="getViewport"/>
+	<classBindingHandler id="JDesktopPane-JInternalFrame"	parentClass="javax.swing.JDesktopPane"		childClass="javax.swing.JInternalFrame"	addMethod="add"		getMethod="getComponents"/>
+	<classBindingHandler id="JFrame-JDesktopPane"			parentClass="javax.swing.JFrame"			childClass="javax.swing.JDesktopPane"	addMethod="setContentPane"		getMethod="getContentPane"/>
+	<classBindingHandler id="JMenuBar-JMenu"				parentClass="javax.swing.JMenuBar"			childClass="javax.swing.JMenu"			addMethod="add"		getMethod="getComponents"/>
+	<classBindingHandler id="JMenu-JMenuItem"				parentClass="javax.swing.JMenu"				childClass="javax.swing.JMenuItem"		addMethod="add"		getMethod="getComponents"/>
 	
 	<elementInterface id="Component" interfaceClass="java.awt.Component">
 		<attribute name="bounds">
diff --git a/x4o-core/src/test/resources/META-INF/swixml/swixml-lang-3.0.eld b/x4o-core/src/test/resources/META-INF/swixml/swixml-lang-3.0.eld
index 00f4d65..ab2cd2b 100644
--- a/x4o-core/src/test/resources/META-INF/swixml/swixml-lang-3.0.eld
+++ b/x4o-core/src/test/resources/META-INF/swixml/swixml-lang-3.0.eld
@@ -38,11 +38,11 @@
 	<bindingHandler id="JInternalFrameBindingHandler" 	bean.class="org.x4o.xml.test.swixml.bind.JInternalFrameBindingHandler"/>
 	<bindingHandler id="JPanelBindingHandler"			bean.class="org.x4o.xml.test.swixml.bind.JPanelBindingHandler"/>
 	<bindingHandler id="JSplitPaneBindingHandler" 		bean.class="org.x4o.xml.test.swixml.bind.JSplitPaneBindingHandler"/>
-	<classBindingHandler id="JScrollPane-JComponent"		parentClass="javax.swing.JScrollPane"		childClass="javax.swing.JComponent"		addMethod="setViewportView"		getMethod="todo"/>
-	<classBindingHandler id="JDesktopPane-JInternalFrame"	parentClass="javax.swing.JDesktopPane"		childClass="javax.swing.JInternalFrame"	addMethod="add"		getMethod="todo"/>
-	<classBindingHandler id="JFrame-JDesktopPane"			parentClass="javax.swing.JFrame"			childClass="javax.swing.JDesktopPane"	addMethod="setContentPane"		getMethod="todo"/>
-	<classBindingHandler id="JMenuBar-JMenu"				parentClass="javax.swing.JMenuBar"			childClass="javax.swing.JMenu"			addMethod="add"		getMethod="todo"/>
-	<classBindingHandler id="JMenu-JMenuItem"				parentClass="javax.swing.JMenu"				childClass="javax.swing.JMenuItem"		addMethod="add"		getMethod="todo"/>
+	<classBindingHandler id="JScrollPane-JComponent"		parentClass="javax.swing.JScrollPane"		childClass="javax.swing.JComponent"		addMethod="setViewportView"		getMethod="getViewport"/>
+	<classBindingHandler id="JDesktopPane-JInternalFrame"	parentClass="javax.swing.JDesktopPane"		childClass="javax.swing.JInternalFrame"	addMethod="add"		getMethod="getComponents"/>
+	<classBindingHandler id="JFrame-JDesktopPane"			parentClass="javax.swing.JFrame"			childClass="javax.swing.JDesktopPane"	addMethod="setContentPane"		getMethod="getContentPane"/>
+	<classBindingHandler id="JMenuBar-JMenu"				parentClass="javax.swing.JMenuBar"			childClass="javax.swing.JMenu"			addMethod="add"		getMethod="getComponents"/>
+	<classBindingHandler id="JMenu-JMenuItem"				parentClass="javax.swing.JMenu"				childClass="javax.swing.JMenuItem"		addMethod="add"		getMethod="getComponents"/>
 	
 	<elementInterface id="Component" interfaceClass="java.awt.Component">
 		<attribute name="bounds">