diff --git a/build/classes/xid/Presenter.class b/build/classes/xid/Presenter.class index e0e6d6f..77f9c06 100644 Binary files a/build/classes/xid/Presenter.class and b/build/classes/xid/Presenter.class differ diff --git a/build_test/classes/xid/test/Test.class b/build_test/classes/xid/test/Test.class index 5a5533d..f4e1f03 100644 Binary files a/build_test/classes/xid/test/Test.class and b/build_test/classes/xid/test/Test.class differ diff --git a/dist/test.jar b/dist/test.jar index cdf3f1a..ef44092 100644 Binary files a/dist/test.jar and b/dist/test.jar differ diff --git a/dist/xid.jar b/dist/xid.jar index d121051..e264bab 100644 Binary files a/dist/xid.jar and b/dist/xid.jar differ diff --git a/src/xid/Presenter.java b/src/xid/Presenter.java index bacbf79..f08d1f7 100644 --- a/src/xid/Presenter.java +++ b/src/xid/Presenter.java @@ -321,7 +321,6 @@ public class Presenter } } - System.out.println ("childIndex=" + childIndex); if (child == null) { tagsData = null; @@ -331,9 +330,7 @@ public class Presenter // Searching for the ID value of the child. String childId; - System.out.println ("child" + child); NamedNodeMap attrsChild = child.getAttributes (); - System.out.println ("attrsChild=" + attrsChild); if (attrsChild == null) { @@ -385,16 +382,13 @@ public class Presenter } else { - System.out.println ("TagsDataByIndex detected."); switch (tagsData.getIterationStrategy ()) { case ONLY_FIRST_ROW: - System.out.println ("ONLY FIRST ROW"); result.append (process (child, datas, webappPath, prefix, errorOutput)); break; case ONLY_ROWS_WITH_ID: - System.out.println ("ONLY ROWS WITH ID"); for (int i = 0; i < childrenCount; i++) { NamedNodeMap attrs2 = children.item (i).getAttributes (); @@ -801,13 +795,12 @@ public class Presenter NamedNodeMap attrs = node.getAttributes (); Node idAttr = attrs.getNamedItem ("id"); - System.out.println ("process=" + node); if (idAttr != null) { result.append (Presenter.processElementWithId (node, attrs, idAttr, datas, webappPath, prefix, errorOutput)); } else - {System.out.println ("basically"); + { result.append (Presenter.processElementBasically (node, datas, webappPath, prefix, errorOutput)); } diff --git a/test/xid/test/Test.java b/test/xid/test/Test.java index ee83ebc..4ee5a0c 100644 --- a/test/xid/test/Test.java +++ b/test/xid/test/Test.java @@ -182,7 +182,8 @@ class Test errorMessage = new StringBuffer (); - html = Presenter.doXid ("\n \n
noidun nomun prenom
", datas, "", errorMessage); + htmlSource = "\n \n
noidun nomun prenom
"; + html = Presenter.doXid (htmlSource, datas, "", errorMessage); System.out.println ("----------------------------"); System.out.println ("datas = new TagsData ();"); @@ -194,11 +195,7 @@ class Test System.out.println ("datas.setContent (\"identity\", 2, \"prenom\", \"Christophe\");"); System.out.println ("+"); - System.out.println (""); - System.out.println (" "); - System.out.println (" "); - System.out.println (" "); - System.out.println ("
un nomun prenom
un nomun prenom
un nomun prenom
"); + System.out.println (htmlSource); System.out.println ("=>"); System.out.println (html);