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 =================================================================== --- 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 @@ protected static final String ATTR_INLINE = "inline"; - protected static final String ATTR_IDS = "id"; + protected static final String ATTR_IDS = "ids"; protected static final String BACKREFS = "backrefs"; @@ -406,7 +406,7 @@ protected static final String NAME = "name"; - protected static final String NAMES = "name"; + protected static final String NAMES = "names"; protected static final String NUM = "num"; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-05-18 13:35:06 UTC (rev 583) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-05-18 13: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; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.Reader; +import java.io.StringWriter; import java.net.URL; +import java.util.Locale; import junit.framework.Assert; import org.junit.Test; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; /** * JRSTReaderTest. @@ -72,7 +77,7 @@ Reader in = new InputStreamReader(url.openStream()); JRSTReader jrst = new JRSTReader(); Document doc = jrst.read(in); - String xmlexpected = "<topic class=\"contents\" id=\"table des matières\" name=\"table des matières\">" + + String xmlexpected = "<topic class=\"contents\" ids=\"table des matières\" names=\"table des matières\">" + "<title>Table des matières</title>" + "</topic>" + "<paragraph>Texte</paragraph>" + @@ -131,4 +136,5 @@ Assert.assertEquals(xmlexpected, actualXml); } + }