From kcardineaud@users.nuiton.org Wed May 18 15:55:12 2011
From: kcardineaud@users.nuiton.org
To: jrst-commits@list.nuiton.org
Subject: [Jrst-commits] r584 - in trunk/jrst/src: main/java/org/nuiton/jrst
	test/java/org/nuiton/jrst
Date: Wed, 18 May 2011 15:55:12 +0200
Message-ID: <20110518135512.8429E16EC9@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5103006704797061629=="

--===============5103006704797061629==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: kcardineaud
Date: 2011-05-18 15:55:12 +0200 (Wed, 18 May 2011)
New Revision: 584

Url: http://nuiton.org/repositories/revision/jrst/584

Log:
#1537 Remplacer les attributs id et name par ids et names dans le XML


Modified:
   trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java
   trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java

Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java	2011-05-18 13:35=
:06 UTC (rev 583)
+++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java	2011-05-18 13:55=
:12 UTC (rev 584)
@@ -380,7 +380,7 @@
    =20
     protected static final String ATTR_INLINE =3D "inline";
    =20
-    protected static final String ATTR_IDS =3D "id";
+    protected static final String ATTR_IDS =3D "ids";
    =20
     protected static final String BACKREFS =3D "backrefs";
    =20
@@ -406,7 +406,7 @@
    =20
     protected static final String NAME =3D "name";
    =20
-    protected static final String NAMES =3D "name";
+    protected static final String NAMES =3D "names";
    =20
     protected static final String NUM =3D "num";
    =20

Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java	2011-05-18 1=
3:35:06 UTC (rev 583)
+++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java	2011-05-18 1=
3:55:12 UTC (rev 584)
@@ -28,15 +28,20 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.dom4j.Document;
+import org.dom4j.io.XMLWriter;
=20
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.io.StringWriter;
 import java.net.URL;
+import java.util.Locale;
=20
 import junit.framework.Assert;
=20
 import org.junit.Test;
+import org.nuiton.i18n.I18n;
+import org.nuiton.i18n.init.ClassPathI18nInitializer;
=20
 /**
  * JRSTReaderTest.
@@ -72,7 +77,7 @@
         Reader in =3D new InputStreamReader(url.openStream());
         JRSTReader jrst =3D new JRSTReader();
         Document doc =3D jrst.read(in);
-        String xmlexpected =3D "<topic class=3D\"contents\" id=3D\"table des=
 mati=C3=A8res\" name=3D\"table des mati=C3=A8res\">" +
+        String xmlexpected =3D "<topic class=3D\"contents\" ids=3D\"table de=
s mati=C3=A8res\" names=3D\"table des mati=C3=A8res\">" +
                              "<title>Table des mati=C3=A8res</title>" +
                              "</topic>" +
                              "<paragraph>Texte</paragraph>" +
@@ -131,4 +136,5 @@
=20
         Assert.assertEquals(xmlexpected, actualXml);
     }
+
 }


--===============5103006704797061629==--