From 5456caece200cbdc6b1fa5aab8eb42db21b525e5 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <cpm@ocmland.org>
Date: Tue, 23 Feb 2010 17:41:58 +0100
Subject: [PATCH] Remove include functionality by <object appliction/xid way.

---
 build/classes/fr/devinsy/xid/Presenter.class | Bin 20267 -> 18687 bytes
 src/fr/devinsy/xid/Presenter.java            | 288 +++++--------------
 2 files changed, 78 insertions(+), 210 deletions(-)

diff --git a/build/classes/fr/devinsy/xid/Presenter.class b/build/classes/fr/devinsy/xid/Presenter.class
index caeba96b94a9658fb93d3890f73b05cc123c1dac..11a8694b17edff21f49e6bcd112cae5e88044c6d 100644
GIT binary patch
delta 7110
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

delta 8774
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
X7n;WdPwuBZ^4Js)($a4wWQ+b^=h4Qv

diff --git a/src/fr/devinsy/xid/Presenter.java b/src/fr/devinsy/xid/Presenter.java
index 6f8b5c6..6d2d1d3 100644
--- a/src/fr/devinsy/xid/Presenter.java
+++ b/src/fr/devinsy/xid/Presenter.java
@@ -301,121 +301,6 @@ public class Presenter
 	}
 
 
-
-	/**
-	 * Includes another file into the current page.
-	 * 
-	 * @param node
-	 * @param attrMap
-	 * @param idAttr
-	 */
-	static protected StringBuffer processObjectTag (Node node,
-			NamedNodeMap attrMap,
-			Node idAttr,
-			IdsDataById datas,
-			String webappPath,
-			StringBuffer errorOutput)
-	{
-		StringBuffer result;
-
-		result = new StringBuffer ();
-
-		// Find codetype.
-		String codetype;
-		if (attrMap == null)
-		{
-			codetype = null;
-		}
-		else if (attrMap.getNamedItem ("codetype") == null)
-		{
-			codetype = null;
-		}
-		else
-		{
-			codetype = attrMap.getNamedItem ("codetype").getNodeValue ();
-		}
-
-		// Check tag requirements.
-		if ((attrMap == null) ||
-				(codetype == null) ||
-				(!codetype.equals ("application/xid")) ||
-				(attrMap.getNamedItem ("data") == null))
-		{
-			// STU: do default action.
-			Presenter.processElementBasically (node, datas, webappPath, errorOutput);
-		}
-		else
-		{
-			logger.debug ("object action");
-			result.append ("<!-- STARTING INCLUDE XID FILE " + attrMap.getNamedItem ("data") + " -->");
-
-			// Build the file name.
-			String htmlFileName = webappPath + attrMap.getNamedItem ("data").getNodeValue ();
-
-
-			// Load file in tree.
-			Document childDoc = null;
-			try
-			{
-				childDoc = fileToTree (htmlFileName, errorOutput);
-			}
-			catch (Exception ex)
-			{
-				errorOutput.append ("unable to build the file tree");
-				logger.debug ("unable to build the file tree");
-			}
-
-			// Extract the 'body' section.
-			Node body = null;
-			try
-			{
-				NodeList nodes = childDoc.getElementsByTagName ("body");
-
-				if (nodes.getLength () == 0)
-				{
-					errorOutput.append ("no body tag in include html");
-					logger.debug ("no body tag in include html");
-				}
-				else
-				{		
-					body = nodes.item(0);
-				}
-			}
-			catch (Exception e)
-			{
-				errorOutput.append ("error getting child");
-				logger.debug ("error getting child");
-			}
-
-			// Process the body child as part of the primary tree.
-			if (body == null)
-			{
-				errorOutput.append ("xid object body empty.");
-			}
-			else
-			{
-				NodeList bodyChildren = body.getChildNodes ();
-
-				if (bodyChildren != null)
-				{
-					int childCount = bodyChildren.getLength ();
-					for (int childCounter = 0; childCounter < childCount; childCounter++)
-					{
-						result.append (process (bodyChildren.item (childCounter), datas, webappPath, errorOutput));
-					}
-				}
-			}
-
-			//
-			result.append ("<!-- ENDING INCLUDE XID FILE " + attrMap.getNamedItem ("data") + " -->");
-		}
-		logger.debug ("end of object action");
-		//
-		return (result);
-	}
-
-
-
 	/**
 	 * Processes a node that has dynamic content. Calls the appropriate code
 	 * generator method, depending on the tag.
@@ -468,62 +353,103 @@ public class Presenter
 
 		String tag = node.getNodeName();
 
-		if (tag.equals ("object"))
+		String idValue = idAttr.getNodeValue();
+
+		logger.debug ("tag=" + tag);
+
+		// Get data of this id.
+		IdDataCore dataCore = datas.get (idAttr.getNodeValue ());
+
+		if (dataCore == null)
 		{
-			result.append (processObjectTag (node, attrs, idAttr, datas, webappPath, errorOutput));
+			result.append (Presenter.processElementBasically (node, datas, webappPath, suffix, errorOutput));
 		}
-		else
+		else if (dataCore instanceof IdData)
 		{
-			String idValue = idAttr.getNodeValue();
+			IdData data = (IdData) dataCore;
 
-			logger.debug ("tag=" + tag);
-
-			// Get data of this id.
-			IdDataCore dataCore = datas.get (idAttr.getNodeValue ());
-
-			if (dataCore == null)
+			String theClass;
+			if (data == null)
 			{
-				result.append (Presenter.processElementBasically (node, datas, webappPath, suffix, errorOutput));
+				theClass = null;
 			}
-			else if (dataCore instanceof IdData)
+			else
 			{
-				IdData data = (IdData) dataCore;
+				theClass = data.getAttributes ().getAttribute ("class");
+			}
 
-				String theClass;
-				if (data == null)
+			if ((theClass == null) ||
+					(!theClass.equals ("xid:nodisplay")))
+			{
+				// Open the tag.
+				result.append ("<");
+				result.append (node.getNodeName());
+
+				// Build attributes.
+				result.append (processAttributes (attrs, data.getAttributes (), suffix));
+
+				if ((node.getChildNodes () == null) &&
+						((data == null) || (data.display () == null)))
 				{
-					theClass = null;
+					// Close the tag.
+					result.append (" />");
 				}
 				else
 				{
-					theClass = data.getAttributes ().getAttribute ("class");
-				}
+					result.append ('>');
 
-				if ((theClass == null) ||
-						(!theClass.equals ("xid:nodisplay")))
+					// CHANGED, cpm:
+
+					// Insert data.
+					if ((data == null) ||
+							(data.display () == null))
+					{
+						result.append (processChildren (node, datas, webappPath, suffix, errorOutput));
+					}
+					else
+					{
+						result.append (data.display ());
+					}
+
+					// Close the tag.
+					result.append ("</");
+					result.append (node.getNodeName());
+					result.append ('>');
+				}
+			}
+		}
+		else if (dataCore instanceof IdsDataByIndex)
+		{
+			IdsDataByIndex tags = (IdsDataByIndex) dataCore;
+
+			int nbLines = tags.size ();
+			for (int nLine = 0; nLine < nbLines; nLine++)
+			{
+				if (tags.elementAt (nLine) instanceof IdData)
 				{
+					IdData data = (IdData) tags.elementAt (nLine);
+
 					// Open the tag.
 					result.append ("<");
 					result.append (node.getNodeName());
 
-					// Build attributes.
-					result.append (processAttributes (attrs, data.getAttributes (), suffix));
+					result.append (processAttributes (attrs, data.getAttributes (), Integer.toString (nLine)));
 
 					if ((node.getChildNodes () == null) &&
 							((data == null) || (data.display () == null)))
 					{
 						// Close the tag.
-						result.append (" />");
+						result.append (" />\n");
 					}
 					else
 					{
 						result.append ('>');
 
-						// CHANGED, cpm:
+
+						// CHANGED, cpm
 
 						// Insert data.
-						if ((data == null) ||
-								(data.display () == null))
+						if ((data == null) || (data.display () == null))
 						{
 							result.append (processChildren (node, datas, webappPath, suffix, errorOutput));
 						}
@@ -535,70 +461,22 @@ public class Presenter
 						// Close the tag.
 						result.append ("</");
 						result.append (node.getNodeName());
-						result.append ('>');
+						result.append (">\n");
 					}
 				}
-			}
-			else if (dataCore instanceof IdsDataByIndex)
-			{
-				IdsDataByIndex tags = (IdsDataByIndex) dataCore;
-
-				int nbLines = tags.size ();
-				for (int nLine = 0; nLine < nbLines; nLine++)
+				else
 				{
-					if (tags.elementAt (nLine) instanceof IdData)
-					{
-						IdData data = (IdData) tags.elementAt (nLine);
+					// Manage a Hashmap.
+					IdsDataById data = (IdsDataById) tags.elementAt (nLine);
 
-						// Open the tag.
-						result.append ("<");
-						result.append (node.getNodeName());
-
-						result.append (processAttributes (attrs, data.getAttributes (), Integer.toString (nLine)));
-
-						if ((node.getChildNodes () == null) &&
-								((data == null) || (data.display () == null)))
-						{
-							// Close the tag.
-							result.append (" />\n");
-						}
-						else
-						{
-							result.append ('>');
-
-
-							// CHANGED, cpm
-
-							// Insert data.
-							if ((data == null) || (data.display () == null))
-							{
-								result.append (processChildren (node, datas, webappPath, suffix, errorOutput));
-							}
-							else
-							{
-								result.append (data.display ());
-							}
-
-							// Close the tag.
-							result.append ("</");
-							result.append (node.getNodeName());
-							result.append (">\n");
-						}
-					}
-					else
-					{
-						// Manage a Hashmap.
-						IdsDataById data = (IdsDataById) tags.elementAt (nLine);
-
-						result.append (Presenter.processElementWithId (node, attrs, idAttr, data, webappPath, Integer.toString (nLine), errorOutput));
-						result.append ('\n');
-					}
+					result.append (Presenter.processElementWithId (node, attrs, idAttr, data, webappPath, Integer.toString (nLine), errorOutput));
+					result.append ('\n');
 				}
 			}
-			else
-			{
-				logger.warn ("Unknow type of IdDataId");
-			}
+		}
+		else
+		{
+			logger.warn ("Unknow type of IdDataId");
 		}
 
 		//
@@ -694,17 +572,7 @@ public class Presenter
 					}
 					else
 					{
-
-						String tag = node.getNodeName();
-
-						if (tag.equals ("object"))
-						{
-							result.append (processObjectTag (node, attrs, idAttr, datas, webappPath, errorOutput));
-						}
-						else
-						{
-							result.append (Presenter.processElementBasically (node, datas, webappPath, suffix, errorOutput));
-						}
+						result.append (Presenter.processElementBasically (node, datas, webappPath, suffix, errorOutput));
 					}
 
 					break;