From cbfbfc71d562b8f05bf8d33b03f1c6e4ff57d49f Mon Sep 17 00:00:00 2001 From: administrateur Date: Wed, 24 Jan 2007 03:39:27 +0100 Subject: [PATCH] Manage a prefix for the TagsData processAttributes. --- build/classes/xid/Presenter.class | Bin 16877 -> 17291 bytes build_test/classes/xid/test/Test.class | Bin 6330 -> 6334 bytes dist/test.jar | Bin 29472 -> 29476 bytes dist/xid.jar | Bin 39786 -> 39945 bytes src/xid/Presenter.java | 26 +++++++++++++++++++++++-- test/xid/test/Test.java | 4 ++-- 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/build/classes/xid/Presenter.class b/build/classes/xid/Presenter.class index 60cd68380c4e7bf4179e51a58650565977a8f06c..473dcc85cae927d7a7fb2023a2ce115caf9e26e9 100644 GIT binary patch delta 6672 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 GC*^;x`MPlc delta 6340 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 diff --git a/build_test/classes/xid/test/Test.class b/build_test/classes/xid/test/Test.class index 0a7ab995de28b19bcaec742aebcffc4e155e94f1..17cec62d9e4b96dd4498f6670ccc0abbcf621a0d 100644 GIT binary patch delta 34 qcmdmGxX*CID^3n|o6;ORE(L|nA2?MQnPn6dCV$|R+N{sr%?kj{tO~6F delta 26 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 N@Ny~!LT>;7007nO0s8;| delta 3168 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 G0002L`T|`5 diff --git a/dist/xid.jar b/dist/xid.jar index 7a84700a9ed885e5211273e0f8c181225b451ee6..a30bc7978972eb37673b9e2e4b538db22a5d194f 100644 GIT binary patch delta 8919 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 delta 8767 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 diff --git a/src/xid/Presenter.java b/src/xid/Presenter.java index dbd55d8..0e8f29d 100644 --- a/src/xid/Presenter.java +++ b/src/xid/Presenter.java @@ -495,7 +495,7 @@ public class Presenter result.append (node.getNodeName()); // Build attributes. - result.append (processAttributes (attrs, data)); + result.append (processAttributes (attrs, data, Integer.toString (nLine))); if ((node.getChildNodes () == null) && ((data == null) || data.display ().equals (""))) @@ -1039,6 +1039,20 @@ public class Presenter { StringBuffer result; + result = processAttributes (attrs, model, ""); + + // + return (result); + } + + + /* + * + */ + static protected StringBuffer processAttributes (NamedNodeMap attrs, TagData model, String prefix) + { + StringBuffer result; + result = new StringBuffer (); // Build the original attributes list. @@ -1089,7 +1103,15 @@ public class Presenter while (iterator.hasNext ()) { Map.Entry attribute = (Map.Entry) iterator.next(); - result.append(" " + attribute.getKey () + "=\"" + attribute.getValue ()+ "\""); + + if (attribute.getKey ().equals ("id")) + { + result.append(" " + attribute.getKey () + "=\"" + attribute.getValue () + '_' + prefix + "\""); + } + else + { + result.append(" " + attribute.getKey () + "=\"" + attribute.getValue ()+ "\""); + } } // diff --git a/test/xid/test/Test.java b/test/xid/test/Test.java index f1fd338..2d03921 100644 --- a/test/xid/test/Test.java +++ b/test/xid/test/Test.java @@ -235,7 +235,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 ("----------------------------"); System.out.println ("datas = new TagsDataId ();"); @@ -247,7 +247,7 @@ class Test System.out.println ("datas.setContent (\"words\", 5, \"fox\");"); System.out.println ("+"); System.out.println ("
    "); - System.out.println ("
  • a word
  • "); + System.out.println ("
  • a word
  • "); System.out.println ("
"); System.out.println ("=>"); System.out.println (html);