From d0606fe62e463002924322c156c344a259cebf72 Mon Sep 17 00:00:00 2001 From: administrateur Date: Wed, 24 Jan 2007 03:01:46 +0100 Subject: [PATCH] Presenter manage TagsData. --- build/classes/xid/Presenter.class | Bin 16481 -> 16877 bytes build_test/classes/xid/test/Test.class | Bin 5604 -> 6330 bytes dist/test.jar | Bin 29164 -> 29472 bytes dist/xid.jar | Bin 39575 -> 39786 bytes src/xid/Presenter.java | 42 ++++++++++++++++++++++++- src/xid/TagsDataById.java | 8 ++--- test/xid/test/Test.java | 31 +++++++++++++++++- 7 files changed, 75 insertions(+), 6 deletions(-) diff --git a/build/classes/xid/Presenter.class b/build/classes/xid/Presenter.class index 29d02fabfd15d739c580debe473a78b133ddeca7..60cd68380c4e7bf4179e51a58650565977a8f06c 100644 GIT binary patch delta 7360 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 Xf@z*~Fjdk-dHO_Tk6c(Mc#{7QpQ$x- delta 6903 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 diff --git a/build_test/classes/xid/test/Test.class b/build_test/classes/xid/test/Test.class index b3acf4a660f65e44c76b6deb3881c38c1992fc4e..0a7ab995de28b19bcaec742aebcffc4e155e94f1 100644 GIT binary patch delta 1813 zcmZ`(c~q2D6#v~fGkllNkHkT6A$7zI1Z%)06>v$VGPE)&D>EBqfT2+oacdiGv8*iZ z%gn6I(n>Q;$562>S}bj~vNFr8+;HFbrTc~<&*_~0c=vbj{oQ-teed1#wq;ahh1Q?1 zS_2@92Aa4R^I|a{Z!q38@fH>sSZKn9c?RA#VPGC(QLNxQjK$i&gz+w8sexrC>T5R4 zSZ?4w6A9X?G_b-%l2%u0T%|>o7OQpk`}Obv)`aTeLwuw~wSkYd{}ThBnn=-UpE1@l zKG)V4jCG9lj4us*#rT@>jc)N<#&-rbn8?&!es7|k&ig^*kBp7lFJ1n`_}RoS*u?mi zv6=B3<9Egu#vdWZRvq;x<1fbFI&m9gJ7b55o!G^wVeDq?(bitZKE{5=0mebbA;w|G z5ynwn;FuQ287CMg8K)Sh8D|)0wfh|7JmUfrn21R+IhdSGE~b7lOa>D(#WI;p^_VP^ z;^-2S>Qj6yH6XXv5||olOk_%8YQ)r7TTKjVYEm*?s*Pp_H4o3A&MM^rJZMl0i#*hl zU=@}HMihH|o(liy3WHKCYDJgX2OQa#w8mtDBT$%S(dCqCcXEzSO`|pzrBS*?8PwLI zE9gptycT6rmOPT1F8=Q%bPSn}1ab`HusEggmRqSX*+4dw?S4WPNuXbg` z1k0faqW+30Z*W?YiguWYB!%pE4kiaKq#*S5K`@GPG}V2Q`&km+j>$Wo29hL`7f6xTx9PE z*GA_xsmp68T(qBynGNgM_QFPb6i)6SDXEU=AcSr@lG9pO4AoH`g_46r7^gl9q3Qph zMlK<89)qs6=sNxMeJr}3@(t>1Q9ruDq8sTZ3CbH$;V-wSKV?g~0sab4MTy@NEGzaD z1%iH0QCYdYJ2u&Kv!>(52MWD-N7^o=O? z4yY)X3CrnYw~R{)uaC>4+s4UH0uW5xhx_1Mm-Q&`Xs?Q&8PZ`zvcn=w!=soi-_mkCj>lxN{3{_$!4r}g zPnmcUPf2WJO2bq6zGEuBt97|&sbd_>P7pDeefn8X6SZrc$w8Wnzcwf}N@-cBy>Sr~>R(gRxH)VZR!MgK7c} zsYy7jrr?O0j-zT8j;Xmgt`^{gT8fiu6;7#YoL1{_Ms2`ZwF&3cR-9M6a3S)79U_-h zgBLMdE6_S Sx*1dQIoFOT;WddN!*Gos4? delta 1215 zcmX|AX>e0j6#mY8$-5`7m$tMvMxiBbg_cxJQ<%|l?C6a4SDkSfnb8^7Xxf^#q}Yav z3r0jmQ53xhg8PCCq6ooItKx#7)_q@a193qScN9hN+*JMX&UU|Z?sva;?{H#!Q*LD6 z@CE=0n(8AB6T)KL#8~2EDQ;F+<|7EBu-u1&VcZfDe=FlQTfd!g2jfnKyL^<{)w>z@ zDBSC#(q=0Z?(-40;r-S>V9kTpthC(^m0%Sf&XwR1thVM+g*CRmRw3`B&bF;%JjN*4 zY&~O$@i=2x;R(i*jHfKc4UDH1p7GIaSw8Ed#r8dC{YJ*~wk|9;F*f^n0WUIMVvI0e zX1v09mGN4R@w!F5!FZGLmTi2S@ebo%AMfFP#s`cK86Vkf3*%$PCyY-SpD{jXY-Ma? zd|?M{x8_U6SB$S2-!OJCzV-1PcKY}pyF&N@KicRg#?RLO!uXZ(TZFOOroSuv;bRZ} zw8>uzd-Ef7q%*M>GZg;T*oXZDo$5ijJYjCZMjX32(ZJ`i4igw{TA?_khdvLu(0Xfd1|D~HN7%SZr zY9GRBLpZ%Xwiag;aAvIHtOAm;inELMoT5z?&{2u9&H}oIaBlm*N}HLH__+TxcI0)9 N{vyH+GS|V4{{YrJ|JeWl diff --git a/dist/test.jar b/dist/test.jar index 1c37008a77232d1076b5484e3770cdcd60031bc3..8e52c5910d3654978e20ddf29c51abd0849dfbbf 100644 GIT binary patch delta 3179 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 R0Tf9K5qa3005!J1keBg delta 2885 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 diff --git a/dist/xid.jar b/dist/xid.jar index b50ff0373df96204e362dd42ffa9dc0976f39c29..7a84700a9ed885e5211273e0f8c181225b451ee6 100644 GIT binary patch delta 10283 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 delta 10054 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 diff --git a/src/xid/Presenter.java b/src/xid/Presenter.java index f4bfb9e..dbd55d8 100644 --- a/src/xid/Presenter.java +++ b/src/xid/Presenter.java @@ -483,7 +483,47 @@ public class Presenter } else if (dataCore instanceof TagsData) { - TagsData data = (TagsData) dataCore; + TagsData tags = (TagsData) dataCore; + + int nbLines = tags.size (); + for (int nLine = 0; nLine < nbLines; nLine++) + { + TagData data = (TagData) tags.elementAt (nLine); + + // Open the tag. + result.append ("<"); + result.append (node.getNodeName()); + + // Build attributes. + result.append (processAttributes (attrs, data)); + + 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, webappPath, errorOutput)); + } + else + { + result.append (data.display ()); + } + + // Close the tag. + result.append ("\n"); + } + } } else if (dataCore instanceof TagsDataById) { diff --git a/src/xid/TagsDataById.java b/src/xid/TagsDataById.java index 3db8ff7..a763259 100644 --- a/src/xid/TagsDataById.java +++ b/src/xid/TagsDataById.java @@ -79,9 +79,9 @@ public class TagsDataById extends HashMap implements TagDat // Be sure that lines are existing. int nbLines = tags.size (); - for (int nLine = nbLines; nLine < line; nLine++) + for (int nLine = nbLines; nLine < line + 1; nLine++) { - tags.set (nLine, new TagData ()); + tags.add (nLine, new TagData ()); } // Get item. @@ -110,9 +110,9 @@ public class TagsDataById extends HashMap implements TagDat // Be sure that lines are existing. int nbLines = tags.size (); - for (int nLine = nbLines; nLine < line; nLine++) + for (int nLine = nbLines; nLine < line + 1; nLine++) { - tags.set (nLine, new TagsDataById ()); + tags.add (nLine, new TagsDataById ()); } // Get item. diff --git a/test/xid/test/Test.java b/test/xid/test/Test.java index 63108f6..f1fd338 100644 --- a/test/xid/test/Test.java +++ b/test/xid/test/Test.java @@ -210,7 +210,7 @@ class Test errorMessage = new StringBuffer (); - html = Presenter.doXid ("
a last name
", datas, "", errorMessage); + html = Presenter.doXid ("
a last name
", datas, "", errorMessage); System.out.println ("----------------------------"); System.out.println ("datas = new TagsDataId ();"); @@ -222,6 +222,35 @@ class Test System.out.println ("
a last name
"); System.out.println ("=>"); System.out.println (html); + + + // Populate attributes of Test 03. + datas = new TagsDataById (); + datas.setContent ("words", 0, "alpha"); + datas.setContent ("words", 1, "bravo"); + datas.setContent ("words", 2, "charlie"); + datas.setContent ("words", 3, "delta"); + datas.setContent ("words", 4, "echo"); + datas.setContent ("words", 5, "fox"); + + + errorMessage = new StringBuffer (); + html = Presenter.doXid ("
    \n
  • a word
  • \n
", datas, "", errorMessage); + + System.out.println ("----------------------------"); + System.out.println ("datas = new TagsDataId ();"); + System.out.println ("datas.setContent (\"words\", 0, \"alpha\");"); + System.out.println ("datas.setContent (\"words\", 1, \"bravo\");"); + System.out.println ("datas.setContent (\"words\", 2, \"charlie\");"); + System.out.println ("datas.setContent (\"words\", 3, \"delta\");"); + System.out.println ("datas.setContent (\"words\", 4, \"echo\");"); + System.out.println ("datas.setContent (\"words\", 5, \"fox\");"); + System.out.println ("+"); + System.out.println ("
    "); + System.out.println ("
  • a word
  • "); + System.out.println ("
"); + System.out.println ("=>"); + System.out.println (html); System.out.println ("----------------------------"); } }