From 062b838a82ec128b0d789d24a784fcd3aa9a2505 Mon Sep 17 00:00:00 2001 From: administrateur Date: Thu, 8 Feb 2007 03:29:52 +0100 Subject: [PATCH] IterationStrategy become a IdData attribute (before was IdsDataByIndex), the idea is to set it in than in . --- build.xml | 1 + build.xml~ | 128 ------------- build/classes/xid/Attributes.class | Bin 1370 -> 0 bytes build/classes/xid/ParserErrorHandler.class | Bin 2593 -> 0 bytes build/classes/xid/Presenter.class | Bin 22345 -> 0 bytes build/classes/xid/TagData.class | Bin 418 -> 0 bytes build/classes/xid/TagsData.class | Bin 1305 -> 0 bytes demo/Demo.java | 79 ++++---- src/xid/Data.java | 6 +- src/xid/IdData.java | 29 +++ src/xid/IdsDataByIndex.java | 28 --- src/xid/Presenter.java | 212 ++++++++++----------- 12 files changed, 175 insertions(+), 308 deletions(-) delete mode 100644 build.xml~ delete mode 100644 build/classes/xid/Attributes.class delete mode 100644 build/classes/xid/ParserErrorHandler.class delete mode 100644 build/classes/xid/Presenter.class delete mode 100644 build/classes/xid/TagData.class delete mode 100644 build/classes/xid/TagsData.class diff --git a/build.xml b/build.xml index f4113c9..e49d162 100644 --- a/build.xml +++ b/build.xml @@ -146,6 +146,7 @@ + diff --git a/build.xml~ b/build.xml~ deleted file mode 100644 index 4c8c533..0000000 --- a/build.xml~ +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/classes/xid/Attributes.class b/build/classes/xid/Attributes.class deleted file mode 100644 index a2cf8f1a1adab8c3c34639f6d6a4fad89631b232..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1370 zcmaKrTTc^F5Xb+gcb1g`<>m#%3#Hux#i9r)AraINE&71L=-X+#DNELEvlpUoehohX zuliCFO^nZeDC5lTx>;IcnoQ4`Gv_z|nc4IE&-b4I9$;I6ihFGCD;UKRn_?Er3exNz zMJbCiZ!|WQELO5u70B!umf`LSBunLEfz*DttqbHEhNZvqJ~Vavjcl6anQU}h(ma;7 z!TZpea!(9LV7&3sXjh-Ou5C0uS9j_Hh0>sp>57bE1XM?NqdNl2rN*f|lT}k%o$3*x ztWJH{!<4iso4U!8hAzsh43ld@mJK=SC-c9+kZnZ`AAN zsorwqg9$zH)`c#C(N@=TrC~WQ^-luRSAfdzDGd!q;L<$)2h9YN6HFP^si{S3YLS{+q~;dp!zz2Ej@8VCYV!X?9G)XB z4p+X?Sulkl=N{#JN_n19&kv|u4L_$wvzZ{yf?qAsqU>{FcJ6p^n!s(Jxk#S@v+w=| DUxFO( diff --git a/build/classes/xid/ParserErrorHandler.class b/build/classes/xid/ParserErrorHandler.class deleted file mode 100644 index 02074b49351ccf04dc02bb56b2ddb22ba6eadf1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2593 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 diff --git a/build/classes/xid/TagData.class b/build/classes/xid/TagData.class deleted file mode 100644 index fdbd824cb79df13cbbad095538fa87a67fde15cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmZXQK}*9x5QX2QX`*dvwYC+#sh3*8ARa5dD1s2YwDi7hLR^Un#8is^%2UCEKfoU) zzD;uwy}X&(ee=!ietmy@0=UFM12#HF_FZ&c^j!1>&b3Z;F&5MYXET9)lZBC>9q2TA zSU%6Ae5&RNPdY)iP{~Z?+SJvdT|DX+K`U74(4VUKRuyU_=naA=^{V_trLjLLa-GJb z5?(~B!l3@$3L2AanJ=O{ZH9Rj>%tg4IB<=$1kGQA*kh{u&`cF{OQ_ELNyHr!{bu&W zF=~9Upw2I_7>S~8vASXu#`f1v`kD`1zMfT4~A=2H1Hb*^%r^2@p7pyvAJ-IY#7SP*eb zTH*?h{nea$!wUrBmrCrq6YN*~!14KWd4R@MHa(zK?9>>6Dho)`JPX)Wp%HM*oqr-4 zOda)9!SMv5=gMnn6IHe9_@zE}`?%7m6`ccDI~wm8wx-9Hh$A7n$qj+w&`xcR#3r^R zZemR0HXcYk#3Kva5;K^Rn8y@H=yzXWv_E|Q>5$GE+=swY|7@=dXHGHTB6^;ODZ;A_ z!nX&&uc8MMjP;jxR!;Nd?4xT3FHSPmz6iY>FHb`E-^*Z*S6K3r15uCy37#X2Hu)Ah zo4$bf!jA|>dD?t~UnZ{e0ZUsTByoe0&`$Ey1a)Ezz8BN0O+sxz-~mH#9+hi(P7ElbZ8?SGF%JACTcC ORS*A5d4U~8aPJSTUh{(h diff --git a/demo/Demo.java b/demo/Demo.java index f18e85e..48539c3 100644 --- a/demo/Demo.java +++ b/demo/Demo.java @@ -125,29 +125,29 @@ class Demo // Populate attributes of Test 03. System.out.println ("----------------------------"); datas = new Data (); - datas.setContent ("identity", 0, "nom", "Jemba"); - datas.setContent ("identity", 0, "prenom", "Epo"); - datas.setContent ("identity", 1, "nom", "Momon"); - datas.setContent ("identity", 1, "prenom", "Christian"); - datas.setContent ("identity", 2, "nom", "Tronche"); - datas.setContent ("identity", 2, "prenom", "Christophe"); + datas.setContent ("identity", 0, "last_name", "Jemba"); + datas.setContent ("identity", 0, "first_name", "Epo"); + datas.setContent ("identity", 1, "last_name", "Momon"); + datas.setContent ("identity", 1, "first_name", "Christian"); + datas.setContent ("identity", 2, "last_name", "Tronche"); + datas.setContent ("identity", 2, "first_name", "Christophe"); errorMessage = new StringBuffer (); StringBuffer source = new StringBuffer (); source.append ("
\n"); - source.append (" \n"); + source.append (" \n"); source.append ("
noidun nomun prenom
noidJeanReve
"); htmlSource = source.toString (); html = Presenter.doXid (htmlSource, datas, errorMessage); 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\");"); - System.out.println ("datas.setContent (\"identity\", 1, \"prenom\", \"Christian\");"); - System.out.println ("datas.setContent (\"identity\", 2, \"nom\", \"Tronche\");"); - System.out.println ("datas.setContent (\"identity\", 2, \"prenom\", \"Christophe\");"); + System.out.println ("datas.setContent (\"identity\", 0, \"last_name\", \"Jemba\");"); + System.out.println ("datas.setContent (\"identity\", 0, \"first_name\", \"Epo\");"); + System.out.println ("datas.setContent (\"identity\", 1, \"last_name\", \"Momon\");"); + System.out.println ("datas.setContent (\"identity\", 1, \"first_name\", \"Christian\");"); + System.out.println ("datas.setContent (\"identity\", 2, \"last_name\", \"Tronche\");"); + System.out.println ("datas.setContent (\"identity\", 2, \"first_name\", \"Christophe\");"); System.out.println ("+"); System.out.println (htmlSource); @@ -158,13 +158,12 @@ class Demo // Populate attributes of Test 03. System.out.println ("----------------------------"); datas = new Data (); - datas.setContent ("identity", 0, "nom", "Jemba"); - datas.setContent ("identity", 0, "prenom", "Epo"); - datas.setContent ("identity", 1, "nom", "Momon"); - datas.setContent ("identity", 1, "prenom", "Christian"); - datas.setContent ("identity", 2, "nom", "Tronche"); - datas.setContent ("identity", 2, "prenom", "Christophe"); - datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW); + datas.setContent ("identity", 0, "last_name", "Jemba"); + datas.setContent ("identity", 0, "first_name", "Epo"); + datas.setContent ("identity", 1, "last_name", "Momon"); + datas.setContent ("identity", 1, "first_name", "Christian"); + datas.setContent ("identity", 2, "last_name", "Tronche"); + datas.setContent ("identity", 2, "first_name", "Christophe"); //datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID); //datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID); //datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS); @@ -172,42 +171,52 @@ class Demo errorMessage = new StringBuffer (); source = new StringBuffer (); - source.append ("\n"); - source.append (" \n"); - source.append (" \n"); - source.append (" \n"); - source.append ("
noidun nomun prenom
noidun nomun prenom
noidun nomun prenom
"); + source.append ("\n"); + source.append (" \n"); + source.append (" \n"); + source.append (" \n"); + source.append (" \n"); + source.append ("
noidFirst NameLast Name
noidJeanReve
noida first namea last name
noida first name morea last name more
\n"); htmlSource = source.toString (); 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\");"); - System.out.println ("datas.setContent (\"identity\", 1, \"prenom\", \"Christian\");"); - System.out.println ("datas.setContent (\"identity\", 2, \"nom\", \"Tronche\");"); - System.out.println ("datas.setContent (\"identity\", 2, \"prenom\", \"Christophe\");"); + System.out.println ("datas.setContent (\"identity\", 0, \"first_name\", \"Epo\");"); + System.out.println ("datas.setContent (\"identity\", 0, \"last_name\", \"Jemba\");"); + System.out.println ("datas.setContent (\"identity\", 1, \"first_name\", \"Christian\");"); + System.out.println ("datas.setContent (\"identity\", 1, \"last_name\", \"Momon\");"); + System.out.println ("datas.setContent (\"identity\", 2, \"first_name\", \"Christophe\");"); + System.out.println ("datas.setContent (\"identity\", 2, \"last_name\", \"Tronche\");"); System.out.println ("+"); System.out.println (htmlSource); System.out.println ("=>"); - datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW); + datas.setIterationStrategy ("identities", IdData.IterationStrategy.ONLY_FIRST_ROW); System.out.println ("ONLY_FIRST_ROW:"); html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println (html); - datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID); + System.out.println (""); + datas.setIterationStrategy ("identities", IdData.IterationStrategy.ONLY_FIRST_TWO_ROWS); + System.out.println ("ONLY_FIRST_TWO_ROWS:"); + html = Presenter.doXid (htmlSource, datas, errorMessage); + System.out.println (html); + + System.out.println (""); + datas.setIterationStrategy ("identities", IdData.IterationStrategy.ONLY_ROWS_WITH_ID); System.out.println ("ONLY_ROWS_WITH_ID:"); html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println (html); - datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID); + System.out.println (""); + datas.setIterationStrategy ("identities", IdData.IterationStrategy.ONLY_ROWS_WITHOUT_ID); System.out.println ("ONLY_ROWS_WITHOUT_ID:"); html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println (html); - datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS); + System.out.println (""); + datas.setIterationStrategy ("identities", IdData.IterationStrategy.ALL_ROWS); System.out.println ("ALL_ROWS:"); html = Presenter.doXid (htmlSource, datas, errorMessage); System.out.println (html); diff --git a/src/xid/Data.java b/src/xid/Data.java index 991953b..a67a58a 100644 --- a/src/xid/Data.java +++ b/src/xid/Data.java @@ -147,11 +147,11 @@ public class Data /** * */ - public void setIterationStrategy (String id, IdsDataByIndex.IterationStrategy strategy) + public void setIterationStrategy (String id, IdData.IterationStrategy strategy) { - IdsDataByIndex tags = (IdsDataByIndex) this.idsDataById.getId (id); + IdData tag = (IdData) this.getIdData (id); - tags.setIterationStrategy (strategy); + tag.setIterationStrategy (strategy); } diff --git a/src/xid/IdData.java b/src/xid/IdData.java index c217244..a350dbd 100644 --- a/src/xid/IdData.java +++ b/src/xid/IdData.java @@ -17,6 +17,11 @@ import java.io.*; */ public class IdData implements Serializable, IdDataCore { + public enum IterationStrategy {ONLY_FIRST_ROW, ONLY_FIRST_TWO_ROWS, ONLY_ROWS_WITH_ID, ONLY_ROWS_WITHOUT_ID, ALL_ROWS} + + protected IterationStrategy iterationStrategy; + + public enum MODE {REPLACE, APPEND, IGNORE}; protected Attributes attributes; @@ -33,6 +38,7 @@ public class IdData implements Serializable, IdDataCore this.excludeSection = false; this.displayMode = MODE.REPLACE; this.content = ""; + this.iterationStrategy = IterationStrategy.ALL_ROWS; } @@ -45,6 +51,7 @@ public class IdData implements Serializable, IdDataCore this.excludeSection = false; this.displayMode = MODE.REPLACE; this.content = text; + this.iterationStrategy = IterationStrategy.ALL_ROWS; } @@ -135,5 +142,27 @@ public class IdData implements Serializable, IdDataCore { return excludeSection; } + + /** + * + */ + public void setIterationStrategy (IterationStrategy strategy) + { + this.iterationStrategy = strategy; + } + + + /** + * + */ + public IterationStrategy getIterationStrategy () + { + IterationStrategy result; + + result = this.iterationStrategy; + + // + return (result); + } } diff --git a/src/xid/IdsDataByIndex.java b/src/xid/IdsDataByIndex.java index 6f70081..5466783 100644 --- a/src/xid/IdsDataByIndex.java +++ b/src/xid/IdsDataByIndex.java @@ -8,39 +8,11 @@ import java.io.*; */ public class IdsDataByIndex extends Vector implements IdDataCore { - public enum IterationStrategy {ONLY_FIRST_ROW, ONLY_ROWS_WITH_ID, ONLY_ROWS_WITHOUT_ID, ALL_ROWS} - - protected IterationStrategy iterationStrategy; - /** * */ public IdsDataByIndex () { super (); - this.iterationStrategy = IterationStrategy.ONLY_FIRST_ROW; - } - - - /** - * - */ - public void setIterationStrategy (IterationStrategy strategy) - { - this.iterationStrategy = strategy; - } - - - /** - * - */ - public IterationStrategy getIterationStrategy () - { - IterationStrategy result; - - result = this.iterationStrategy; - - // - return (result); } } diff --git a/src/xid/Presenter.java b/src/xid/Presenter.java index edbb1e8..d07c965 100644 --- a/src/xid/Presenter.java +++ b/src/xid/Presenter.java @@ -381,148 +381,132 @@ public class Presenter StringBuffer result; result = new StringBuffer (); - NodeList children = node.getChildNodes(); - int childrenCount = children.getLength (); - - if ((children == null) || (childrenCount == 0)) + // Get the iteration strategy. + IdData.IterationStrategy strategy; + + NamedNodeMap attributes = node.getAttributes (); + if (attributes == null) { - result.append (" "); + strategy = IdData.IterationStrategy.ALL_ROWS; } else { - // - // Is there a IdsDataByIndex associated with the first ELEMENT_NODE child? - // - IdsDataByIndex idsData; + Node id = attributes.getNamedItem ("id"); - // Find the first ELEMENT_NODE child. - int childIndex = 0; - Node child = null; - boolean ended = false; - while (!ended) + if (id == null) { - if (childIndex >= childrenCount) - { - ended = true; - child = null; - } - else if (children.item (childIndex).getNodeType () == Node.ELEMENT_NODE) - { - ended = true; - child = children.item (childIndex); - } - else - { - childIndex += 1; - } - } - - if (child == null) - { - idsData = null; + strategy = IdData.IterationStrategy.ALL_ROWS; } else { - // Searching for the ID value of the child. - String childId; - - NamedNodeMap attrsChild = child.getAttributes (); - - if (attrsChild == null) + IdDataCore dataCore = datas.getId (id.getNodeValue ()); + if (dataCore == null) { - childId = null; + strategy = IdData.IterationStrategy.ALL_ROWS; + } + else if (dataCore instanceof IdData) + { + IdData data = (IdData) dataCore; + strategy = data.getIterationStrategy (); } else { - Node idAttrChild; - idAttrChild = attrsChild.getNamedItem ("id"); - - if (idAttrChild == null) - { - childId = null; - } - else - { - childId = idAttrChild.getNodeValue (); - } - } - - - // Searching for the datas associated to the childId. - if (childId == null) - { - idsData = null; - } - else - { - // Check if the data is a IdsDataByIndex. - if (datas.getId (childId) instanceof IdsDataByIndex) - { - idsData = (IdsDataByIndex) datas.getId (childId); - } - else - { - idsData = null; - } + strategy = IdData.IterationStrategy.ALL_ROWS; } } + } + + // Iterate. + NodeList children = node.getChildNodes(); + int childrenCount = children.getLength (); + + switch (strategy) + { + case ONLY_FIRST_ROW: + int lineCounter = 0; + for (int childIndex = 0; childIndex < childrenCount; childIndex++) + { + if (children.item (childIndex).getNodeType () == Node.ELEMENT_NODE) + { + lineCounter += 1; + if (lineCounter == 1) + { + result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput)); + } + } + else + { + result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput)); + } + } + break; - // So, is there? - if (idsData == null) + case ONLY_FIRST_TWO_ROWS: + lineCounter = 0; + for (int childIndex = 0; childIndex < childrenCount; childIndex++) { - for (int i = 0; i < childrenCount; i++) + if (children.item (childIndex).getNodeType () == Node.ELEMENT_NODE) { - result.append (process (children.item(i), datas, tagsData, webappPath, suffix, errorOutput)); + lineCounter += 1; + + if ((lineCounter == 1) || (lineCounter == 2)) + { + result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput)); + } + } + else + { + result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput)); } } - else + break; + + case ONLY_ROWS_WITH_ID: + for (int childIndex = 0; childIndex < childrenCount; childIndex++) { - switch (idsData.getIterationStrategy ()) + if (children.item (childIndex).getNodeType () == Node.ELEMENT_NODE) { - case ONLY_FIRST_ROW: - for (int i = 0; i <= childIndex; i++) - { - result.append (process (children.item (i), datas, tagsData, webappPath, suffix, errorOutput)); - } - break; + NamedNodeMap attrs2 = children.item (childIndex).getAttributes (); - case ONLY_ROWS_WITH_ID: - for (int i = 0; i < childrenCount; i++) + if ((attrs2 != null) && + (attrs2.getNamedItem ("id") != null)) { - NamedNodeMap attrs2 = children.item (i).getAttributes (); - - if ((attrs2 != null) && - (attrs2.getNamedItem ("id") != null)) - { - result.append (process (children.item(i), datas, tagsData, webappPath, suffix, errorOutput)); - } + result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput)); } - break; - - case ONLY_ROWS_WITHOUT_ID: - for (int i = 0; i < childrenCount; i++) - { - // Process row? - boolean processRow; - - NamedNodeMap attrs2 = children.item (i).getAttributes (); - if ((attrs2 == null) || - (attrs2.getNamedItem ("id") == null)) - { - result.append (process (children.item(i), datas, tagsData, webappPath, suffix, errorOutput)); - } - } - break; - - case ALL_ROWS: - for (int i = 0; i < childrenCount; i++) - { - result.append (process (children.item(i), datas, tagsData, webappPath, suffix, errorOutput)); - } - break; + } + else + { + result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput)); } } + break; + + case ONLY_ROWS_WITHOUT_ID: + for (int childIndex = 0; childIndex < childrenCount; childIndex++) + { + if (children.item (childIndex).getNodeType () == Node.ELEMENT_NODE) + { + NamedNodeMap attrs2 = children.item (childIndex).getAttributes (); + if ((attrs2 == null) || + (attrs2.getNamedItem ("id") == null)) + { + result.append (process (children.item(childIndex), datas, tagsData, webappPath, suffix, errorOutput)); + } + } + else + { + result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput)); + } + } + break; + + case ALL_ROWS: + for (int childIndex = 0; childIndex < childrenCount; childIndex++) + { + result.append (process (children.item(childIndex), datas, tagsData, webappPath, suffix, errorOutput)); + } + break; } //