From 5bc5964bd6224a3a066fa5abd139c77d9df3b243 Mon Sep 17 00:00:00 2001 From: administrateur Date: Wed, 7 Feb 2007 07:30:24 +0100 Subject: [PATCH] small fix. --- build/classes/xid/Presenter.class | Bin 21985 -> 22345 bytes demo/Demo.java | 18 +-- demo/Demo.java~ | 84 ++-------- src/xid/Presenter.java | 249 +++++++++++++++++------------- test/xid/test/Test.java | 8 +- 5 files changed, 173 insertions(+), 186 deletions(-) diff --git a/build/classes/xid/Presenter.class b/build/classes/xid/Presenter.class index 04637d29fe4fd6c90a93528e4ee78a86b452f800..1ac5e3f3cc40af277a21167aed2881fd65277337 100644 GIT binary patch literal 22345 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 literal 21985 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 A)c^nh diff --git a/demo/Demo.java b/demo/Demo.java index de01306..4d43a2f 100644 --- a/demo/Demo.java +++ b/demo/Demo.java @@ -60,7 +60,7 @@ class Demo datas.setContent ("name", "Superman"); errorMessage = new StringBuffer (); - html = Presenter.doXid ("
a name
", datas, "", errorMessage); + html = Presenter.doXid ("
a name
", datas, errorMessage); System.out.println ("datas = new Data ();"); System.out.println ("datas.setContent (\"name\", \"Superman\");"); @@ -80,7 +80,7 @@ class Demo errorMessage = new StringBuffer (); - html = Presenter.doXid ("
a last name
", datas, "", errorMessage); + html = Presenter.doXid ("
a last name
", datas, errorMessage); System.out.println ("datas = new Data ();"); System.out.println ("datas.setContent (\"lastname\", \"Spiderman\");"); @@ -105,7 +105,7 @@ class Demo errorMessage = new StringBuffer (); - html = Presenter.doXid ("
    \n
  • a word
    • \n
", datas, "", errorMessage); + html = Presenter.doXid ("
    \n
  • a word
    • \n
", datas, errorMessage); System.out.println ("datas = new Data ();"); System.out.println ("datas.setContent (\"words\", 0, \"alpha\");"); @@ -139,7 +139,7 @@ class Demo source.append (" noidun nomun prenom\n"); source.append (""); htmlSource = source.toString (); - html = Presenter.doXid (htmlSource, datas, "", errorMessage); + html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println ("datas = new Data ();"); System.out.println ("datas.setContent (\"identity\", 0, \"nom\", \"Jemba\");"); @@ -194,22 +194,22 @@ class Demo datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW); System.out.println ("ONLY_FIRST_ROW:"); - html = Presenter.doXid (htmlSource, datas, "", errorMessage); + html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println (html); datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID); System.out.println ("ONLY_ROWS_WITH_ID:"); - html = Presenter.doXid (htmlSource, datas, "", errorMessage); + html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println (html); datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID); System.out.println ("ONLY_ROWS_WITHOUT_ID:"); - html = Presenter.doXid (htmlSource, datas, "", errorMessage); + html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println (html); datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS); System.out.println ("ALL_ROWS:"); - html = Presenter.doXid (htmlSource, datas, "", errorMessage); + html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println (html); @@ -230,7 +230,7 @@ class Demo source.append ("

three

\n"); source.append (""); htmlSource = source.toString (); - html = Presenter.doXid (htmlSource, datas, "", errorMessage); + html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println (htmlSource); System.out.println ("+"); diff --git a/demo/Demo.java~ b/demo/Demo.java~ index 4b6e3bc..de01306 100644 --- a/demo/Demo.java~ +++ b/demo/Demo.java~ @@ -1,5 +1,3 @@ -package xid.test; - import java.util.*; import java.io.*; import xid.*; @@ -7,7 +5,7 @@ import xid.*; /** * */ -class Test +class Demo { static private org.apache.log4j.Logger log; @@ -33,21 +31,21 @@ class Test log.info ("... done."); log.debug ("Exit"); - log = org.apache.log4j.Logger.getLogger (Test.class.getName ()); + log = org.apache.log4j.Logger.getLogger (Demo.class.getName ()); } /** * */ - public static void main(String[] args) + public static void main (String[] args) { System.out.println("Hello World!"); //test (); // - IdsData datas; + Data datas; IdData tag; @@ -58,33 +56,13 @@ class Test // Populate attributes of Test 03. System.out.println ("----------------------------"); - datas = new IdsData (); - tag = new IdData (); - tag.setContent ("Superman"); - datas.put ("name", tag); - - errorMessage = new StringBuffer (); - html = Presenter.doXid ("
a name
", datas, "", errorMessage); - - System.out.println ("datas = new IdsData ();"); - System.out.println ("tag = new IdData ();"); - System.out.println ("tag.setContent (\"Superman\");"); - System.out.println ("datas.put (\"name\", tag););"); - System.out.println ("+"); - System.out.println ("
a name
"); - System.out.println ("=>"); - System.out.println (html); - - - // Populate attributes of Test 03. - System.out.println ("----------------------------"); - datas = new IdsData (); + datas = new Data (); datas.setContent ("name", "Superman"); errorMessage = new StringBuffer (); html = Presenter.doXid ("
a name
", datas, "", errorMessage); - System.out.println ("datas = new IdsData ();"); + System.out.println ("datas = new Data ();"); System.out.println ("datas.setContent (\"name\", \"Superman\");"); System.out.println ("+"); System.out.println ("
a name
"); @@ -94,34 +72,7 @@ class Test // Populate attributes of Test 03. System.out.println ("----------------------------"); - datas = new IdsData (); - tag = new IdData (); - tag.setContent ("Spiderman"); - tag.getAttributes ().appendAttribute ("style", "background: blue;"); - tag.getAttributes ().appendAttribute ("style", "foreground: red;"); - tag.getAttributes ().setAttribute ("class", "nameClass"); - datas.put ("lastname", tag); - - - errorMessage = new StringBuffer (); - html = Presenter.doXid ("
a last name
", datas, "", errorMessage); - - System.out.println ("datas = new IdsData ();"); - System.out.println ("tag = new IdData ();"); - System.out.println ("tag.getAttributes ().setAttribute (\"class\", \"lastnameClass\");"); - System.out.println ("tag.getAttributes ().appendAttribute (\"style\", \"background: blue;\");"); - System.out.println ("tag.getAttributes ().appendAttribute (\"style\", \"foreground: red;\");"); - System.out.println ("tag.setContent (\"Spiderman\");"); - System.out.println ("datas.put (\"lastname\", tag););"); - System.out.println ("+"); - System.out.println ("
a last name
"); - System.out.println ("=>"); - System.out.println (html); - - - // Populate attributes of Test 03. - System.out.println ("----------------------------"); - datas = new IdsData (); + datas = new Data (); datas.setContent ("lastname", "Spiderman"); datas.appendAttribute ("lastname", "style", "background: blue;"); datas.appendAttribute ("lastname", "style", "foreground: red;"); @@ -131,7 +82,7 @@ class Test errorMessage = new StringBuffer (); html = Presenter.doXid ("
a last name
", datas, "", errorMessage); - System.out.println ("datas = new IdsData ();"); + System.out.println ("datas = new Data ();"); System.out.println ("datas.setContent (\"lastname\", \"Spiderman\");"); System.out.println ("datas.appendAttribute (\"lastname\", \"style\", \"background: blue;\");"); System.out.println ("datas.appendAttribute (\"lastname\", \"style\", \"foreground: red;\");"); @@ -144,7 +95,7 @@ class Test // Populate attributes of Test 03. System.out.println ("----------------------------"); - datas = new IdsData (); + datas = new Data (); datas.setContent ("words", 0, "alpha"); datas.setContent ("words", 1, "bravo"); datas.setContent ("words", 2, "charlie"); @@ -156,7 +107,7 @@ class Test errorMessage = new StringBuffer (); html = Presenter.doXid ("
    \n
  • a word
    • \n
", datas, "", errorMessage); - System.out.println ("datas = new IdsData ();"); + System.out.println ("datas = new Data ();"); System.out.println ("datas.setContent (\"words\", 0, \"alpha\");"); System.out.println ("datas.setContent (\"words\", 1, \"bravo\");"); System.out.println ("datas.setContent (\"words\", 2, \"charlie\");"); @@ -173,7 +124,7 @@ class Test // Populate attributes of Test 03. System.out.println ("----------------------------"); - datas = new IdsData (); + datas = new Data (); datas.setContent ("identity", 0, "nom", "Jemba"); datas.setContent ("identity", 0, "prenom", "Epo"); datas.setContent ("identity", 1, "nom", "Momon"); @@ -190,7 +141,7 @@ class Test htmlSource = source.toString (); html = Presenter.doXid (htmlSource, datas, "", errorMessage); - System.out.println ("datas = new IdsData ();"); + System.out.println ("datas = new Data ();"); System.out.println ("datas.setContent (\"identity\", 0, \"nom\", \"Jemba\");"); System.out.println ("datas.setContent (\"identity\", 0, \"prenom\", \"Epo\");"); System.out.println ("datas.setContent (\"identity\", 1, \"nom\", \"Momon\");"); @@ -206,7 +157,7 @@ class Test // Populate attributes of Test 03. System.out.println ("----------------------------"); - datas = new IdsData (); + datas = new Data (); datas.setContent ("identity", 0, "nom", "Jemba"); datas.setContent ("identity", 0, "prenom", "Epo"); datas.setContent ("identity", 1, "nom", "Momon"); @@ -228,7 +179,7 @@ class Test source.append (""); htmlSource = source.toString (); - System.out.println ("datas = new IdsData ();"); + System.out.println ("datas = new Data ();"); System.out.println ("datas.setContent (\"identity\", 0, \"nom\", \"Jemba\");"); System.out.println ("datas.setContent (\"identity\", 0, \"prenom\", \"Epo\");"); System.out.println ("datas.setContent (\"identity\", 1, \"nom\", \"Momon\");"); @@ -264,14 +215,12 @@ class Test // Populate attributes of Test 03. - /* System.out.println ("----------------------------"); - datas = new IdsData (); + datas = new Data (); datas.setAttribute ("
", "class", "aDivClass"); datas.setAttribute ("
", "style", "background-color: #000000;"); datas.setAttribute ("number", "style", "background-color: #0000FF;"); - errorMessage = new StringBuffer (); source = new StringBuffer (); source.append ("
\n"); @@ -285,13 +234,12 @@ class Test System.out.println (htmlSource); System.out.println ("+"); - System.out.println ("datas = new IdsData ();"); + System.out.println ("datas = new Data ();"); System.out.println ("datas.setAttribute (\"
\", \"class\", \"aDivClass\");"); System.out.println ("datas.setAttribute (\"
\", \"style\", \"background-color: #000000;\");"); System.out.println ("datas.setAttribute (\"number\", \"style\", \"background-color: #0000FF;\");"); System.out.println ("=>"); System.out.println (html); - */ } } diff --git a/src/xid/Presenter.java b/src/xid/Presenter.java index 941fcae..edbb1e8 100644 --- a/src/xid/Presenter.java +++ b/src/xid/Presenter.java @@ -91,9 +91,9 @@ public class Presenter /* * */ - public StringBuffer doXid (IdsDataById datas, StringBuffer errorOutput) + public StringBuffer doXid (Data datas, StringBuffer errorOutput) { - return (doXid (datas, null, errorOutput)); + return (doXid (datas.getIdsDataById (), datas.getTagsDataById (), errorOutput)); } /* @@ -168,6 +168,15 @@ public class Presenter + /* + * + */ + static public StringBuffer doXid (String html, Data datas, StringBuffer errorOutput) + { + return (doXid (html, datas.getIdsDataById (), datas.getTagsDataById (), "", errorOutput)); + } + + /* * */ @@ -529,7 +538,13 @@ public class Presenter * @param attrMap * @param idAttr */ - static protected StringBuffer processObjectTag (Node node, NamedNodeMap attrMap, Node idAttr, IdsDataById datas, TagsDataById tagsData, String webappPath, StringBuffer errorOutput) + static protected StringBuffer processObjectTag (Node node, + NamedNodeMap attrMap, + Node idAttr, + IdsDataById datas, + TagsDataById tagsData, + String webappPath, + StringBuffer errorOutput) { StringBuffer result; @@ -550,7 +565,6 @@ public class Presenter codetype = attrMap.getNamedItem ("codetype").getNodeValue (); } - // Check tag requirements. if ((attrMap == null) || (codetype == null) || @@ -577,7 +591,7 @@ public class Presenter } catch (Exception ex) { - result.append ("unable to build the file tree"); + errorOutput.append ("unable to build the file tree"); log.debug ("unable to build the file tree"); } @@ -589,7 +603,7 @@ public class Presenter if (nodes.getLength () == 0) { - result.append ("no body tag in include html"); + errorOutput.append ("no body tag in include html"); log.debug ("no body tag in include html"); } else @@ -599,19 +613,26 @@ public class Presenter } catch (Exception e) { - result.append ("error getting child"); + errorOutput.append ("error getting child"); log.debug ("error getting child"); } // Process the body child as part of the primary tree. - NodeList bodyChildren = body.getChildNodes (); - - if (bodyChildren != null) + if (body == null) { - int childCount = bodyChildren.getLength (); - for (int childCounter = 0; childCounter < childCount; childCounter++) + errorOutput.append ("xid object body empty."); + } + else + { + NodeList bodyChildren = body.getChildNodes (); + + if (bodyChildren != null) { - result.append (process (bodyChildren.item (childCounter), datas, tagsData, webappPath, errorOutput)); + int childCount = bodyChildren.getLength (); + for (int childCounter = 0; childCounter < childCount; childCounter++) + { + result.append (process (bodyChildren.item (childCounter), datas, tagsData, webappPath, errorOutput)); + } } } @@ -677,98 +698,41 @@ public class Presenter result = new StringBuffer (); String tag = node.getNodeName(); - String idValue = idAttr.getNodeValue(); - log.debug ("tag=" + tag); - - // Get data of this id. - IdDataCore dataCore = datas.get (idAttr.getNodeValue ()); - - if (dataCore == null) + if (tag.equals ("object")) { - result.append (Presenter.processElementBasically (node, datas, tagsData, webappPath, suffix, errorOutput)); + result.append (processObjectTag (node, attrs, idAttr, datas, tagsData, webappPath, errorOutput)); } - else if (dataCore instanceof IdData) + else { - IdData data = (IdData) dataCore; + String idValue = idAttr.getNodeValue(); - String theClass; - if (data == null) - { - theClass = null; - } - else - { - theClass = data.getAttributes ().getAttribute ("class"); - } + log.debug ("tag=" + tag); - if ((theClass == null) || - (!theClass.equals ("xid:nodisplay"))) + // Get data of this id. + IdDataCore dataCore = datas.get (idAttr.getNodeValue ()); + + if (dataCore == null) { - // Open the tag. - result.append ("<"); - result.append (node.getNodeName()); + result.append (Presenter.processElementBasically (node, datas, tagsData, webappPath, suffix, errorOutput)); + } + else if (dataCore instanceof IdData) + { + IdData data = (IdData) dataCore; - // Build attributes. - Attributes tagAttributes; - if (tagsData == null) + String theClass; + if (data == null) { - tagAttributes = null; + theClass = null; } else { - TagData tagData = tagsData.getId (node.getNodeName ()); - if (tagData == null) - { - tagAttributes = null; - } - else - { - tagAttributes = tagData.getAttributes (); - } + theClass = data.getAttributes ().getAttribute ("class"); } - - result.append (processAttributes (attrs, data.getAttributes (), tagAttributes, suffix)); - if ((node.getChildNodes () == null) && - ((data == null) || data.display ().equals (""))) + if ((theClass == null) || + (!theClass.equals ("xid:nodisplay"))) { - // Close the tag. - result.append (" />"); - } - else - { - result.append ('>'); - - // Insert data. - if ((data == null) || - (data.display ().equals (""))) - { - result.append (processChildren (node, datas, tagsData, webappPath, suffix, errorOutput)); - } - else - { - result.append (data.display ()); - } - - // Close the tag. - 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()); @@ -791,14 +755,14 @@ public class Presenter tagAttributes = tagData.getAttributes (); } } - - result.append (processAttributes (attrs, data.getAttributes (), tagAttributes, Integer.toString (nLine))); + + result.append (processAttributes (attrs, data.getAttributes (), tagAttributes, suffix)); if ((node.getChildNodes () == null) && ((data == null) || data.display ().equals (""))) { // Close the tag. - result.append (" />\n"); + result.append (" />"); } else { @@ -818,22 +782,87 @@ public class Presenter // Close the tag. result.append ("\n"); + result.append ('>'); } } - else + } + else if (dataCore instanceof IdsDataByIndex) + { + IdsDataByIndex tags = (IdsDataByIndex) dataCore; + + int nbLines = tags.size (); + for (int nLine = 0; nLine < nbLines; nLine++) { - // Manage a Hashmap. - IdsDataById data = (IdsDataById) tags.elementAt (nLine); - - result.append (Presenter.processElementWithId (node, attrs, idAttr, data, tagsData, webappPath, Integer.toString (nLine), errorOutput)); - result.append ('\n'); + if (tags.elementAt (nLine) instanceof IdData) + { + IdData data = (IdData) tags.elementAt (nLine); + + // Open the tag. + result.append ("<"); + result.append (node.getNodeName()); + + // Build attributes. + Attributes tagAttributes; + if (tagsData == null) + { + tagAttributes = null; + } + else + { + TagData tagData = tagsData.getId (node.getNodeName ()); + if (tagData == null) + { + tagAttributes = null; + } + else + { + tagAttributes = tagData.getAttributes (); + } + } + + result.append (processAttributes (attrs, data.getAttributes (), tagAttributes, Integer.toString (nLine))); + + if ((node.getChildNodes () == null) && + ((data == null) || data.display ().equals (""))) + { + // Close the tag. + result.append (" />\n"); + } + else + { + result.append ('>'); + + // Insert data. + if ((data == null) || + (data.display ().equals (""))) + { + result.append (processChildren (node, datas, tagsData, webappPath, suffix, errorOutput)); + } + else + { + result.append (data.display ()); + } + + // Close the tag. + result.append ("\n"); + } + } + else + { + // Manage a Hashmap. + IdsDataById data = (IdsDataById) tags.elementAt (nLine); + + result.append (Presenter.processElementWithId (node, attrs, idAttr, data, tagsData, webappPath, Integer.toString (nLine), errorOutput)); + result.append ('\n'); + } } } - } - else - { - log.warn ("Unknow type of IdDataId"); + else + { + log.warn ("Unknow type of IdDataId"); + } } // @@ -930,7 +959,17 @@ public class Presenter } else { - result.append (Presenter.processElementBasically (node, datas, tagsData, webappPath, suffix, errorOutput)); + + String tag = node.getNodeName(); + + if (tag.equals ("object")) + { + result.append (processObjectTag (node, attrs, idAttr, datas, tagsData, webappPath, errorOutput)); + } + else + { + result.append (Presenter.processElementBasically (node, datas, tagsData, webappPath, suffix, errorOutput)); + } } break; diff --git a/test/xid/test/Test.java b/test/xid/test/Test.java index 7184856..5ec5b99 100644 --- a/test/xid/test/Test.java +++ b/test/xid/test/Test.java @@ -83,7 +83,7 @@ class Test datas.setContent ("name", "Superman"); errorMessage = new StringBuffer (); - html = Presenter.doXid ("
a name
", datas, "", errorMessage); + html = Presenter.doXid ("
a name
", datas, errorMessage); System.out.println (check ("only content change", html, "
Superman
")); @@ -97,7 +97,7 @@ class Test datas.setAttribute ("lastname", "class", "nameClass"); errorMessage = new StringBuffer (); - html = Presenter.doXid ("
a last name
", datas, "", errorMessage); + html = Presenter.doXid ("
a last name
", datas, errorMessage); System.out.println (check ("content and attributes", html, "
Spiderman
")); // Populate attributes of Test 03. @@ -112,7 +112,7 @@ class Test errorMessage = new StringBuffer (); - html = Presenter.doXid ("
    \n
  • a word
    • \n
", datas, "", errorMessage); + html = Presenter.doXid ("
    \n
  • a word
    • \n
", datas, errorMessage); System.out.println (check ("list assertion 1", html, "
  • alpha
    • ")); System.out.println (check ("list assertion 2", html, "
  • bravo
    • ")); @@ -138,7 +138,7 @@ class Test source.append (" noidun nomun prenom\n"); source.append (""); htmlSource = source.toString (); - html = Presenter.doXid (htmlSource, datas, "", errorMessage); + html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println (check ("table 1 assertion 1", html, "noidJembaEpo")); System.out.println (check ("table 1 assertion 2", html, "noidMomonChristian"));