Index: jrst2/src/test/org/codelutin/jrst/Compare.java
diff -u jrst2/src/test/org/codelutin/jrst/Compare.java:1.6 jrst2/src/test/org/codelutin/jrst/Compare.java:1.7
--- jrst2/src/test/org/codelutin/jrst/Compare.java:1.6	Thu May 31 18:46:25 2007
+++ jrst2/src/test/org/codelutin/jrst/Compare.java	Wed Jun 20 13:59:18 2007
@@ -1,10 +1,14 @@
+/**
+ * Class de test pour comparer le XML de DocUtils avec celui du JRST
+ * 
+ */
 package org.codelutin.jrst;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.URL;
 import java.util.LinkedList;
@@ -25,144 +29,143 @@
 import sdoc.*;
 
 public class Compare {
-    static boolean[] bColorRst ;
-    static boolean[] bColorPython; 
-	private static final String PATH="/home/letellier/PROJET/jrst2/"; // a
-                                                                        // redefinir
-                                                                        // manuelement
-	static public void main(String [] args) throws Exception {
-		File source = null;
-		if (args.length>0){
-			source = new File(args[0]);
-			if (source != null)
-				parser(source);
-		}
-		else
-			System.err.println("Argument source manquant");
-	}
-	private static void parser(File source) throws Exception {
-		URL url = source.toURL();
-        Reader in = new InputStreamReader(url.openStream());       
+    static boolean[] bColorRst;
+
+    static boolean[] bColorPython;
+
+    private static final String PATH = "/home/letellier/PROJET/jrst2/"; // a
+
+    // redefinir
+    // manuelement
+    static public void main(String[] args) throws Exception {
+        File source = null;
+        if (args.length > 0) {
+            source = new File(args[0]);
+            if (source != null)
+                parser(source);
+        } else
+            System.err.println("Argument source manquant");
+    }
+
+    @SuppressWarnings("deprecation")
+    private static void parser(File source) throws Exception {
+        URL url = source.toURL();
+        Reader in = new InputStreamReader(url.openStream());
         JRSTReader jrst = new JRSTReader();
         Document docRst = jrst.read(in); // JRST
-        String cmd = "rst2xml "+PATH+source.getPath()+" "+PATH+"src/test/org/codelutin/jrst/comparePython.xml";
-        Runtime.getRuntime().exec("rm "+PATH+"src/test/org/codelutin/jrst/comparePython.xml");
-        final Process p =Runtime.getRuntime().exec(cmd); // Python
-        Thread t = new Thread() {
-        	public void run() {
-        		try {
-        			BufferedReader reader = new BufferedReader(new InputStreamReader(p.getErrorStream()));
-        			String line = "";
-        			try {
-        				while((line = reader.readLine()) != null) {
-        					System.err.println(line); // Pour rediriger la
-                                                        // sortie des érreurs
-        				}
-        			} finally {
-        				reader.close();
-        			}
-        		} catch(IOException ioe) {
-        			ioe.printStackTrace();
-        		}
-        	}
-        };
+        String cmd = "rst2xml " + source.getPath();
+        Process p = Runtime.getRuntime().exec(cmd); // Python
+        ThreadRedirection t = new ThreadRedirection(p);
         t.start();
-        while(t.isAlive()); // On attend que le processus ce termine
+        p.waitFor(); // On attend que le processus ce termine
+        String strPython=t.getSortit().replaceAll("null","");
         t.stop();
         p.destroy();
-        File xml = new File("src/test/org/codelutin/jrst/comparePython.xml");
-        SAXReader sr= new SAXReader();
-        Document docPython =  sr.read(xml);
+        SAXReader sr = new SAXReader();
+        Document docPython = sr.read(new StringReader(t.getSortit()));
         String diff = test(docRst, docPython);
-        String sDocRst = indent(docRst);   // On indente
+        String sDocRst = indent(docRst); // On indente
         String sDocPython = indent(docPython);
         compare(sDocRst, sDocPython, diff);
-	}
-	private static String test(Document docRst, Document docPython) throws Exception {
-        String[] sDocRst = indent(docRst).split("\n"); 
+    }
+
+    private static String test(Document docRst, Document docPython)
+            throws Exception {
+        String[] sDocRst = indent(docRst).split("\n");
         bColorRst = new boolean[sDocRst.length];
-        for (int i=0;i<bColorRst.length;i++)
-            bColorRst[i]=false;
+        for (int i = 0; i < bColorRst.length; i++)
+            bColorRst[i] = false;
         String[] sDocPython = indent(docPython).split("\n");
         bColorPython = new boolean[sDocPython.length];
-        for (int i=0;i<bColorPython.length;i++)
-            bColorPython[i]=false;
+        for (int i = 0; i < bColorPython.length; i++)
+            bColorPython[i] = false;
         XMLUnit.setIgnoreComments(true);
         XMLUnit.setIgnoreAttributeOrder(true);
         XMLUnit.setNormalizeWhitespace(true);
-	    XMLCaseTest test = new XMLCaseTest("test");
-        DetailedDiff myDiff = test.testAllDifferences(docPython.asXML(),docRst.asXML());
+        XMLCaseTest test = new XMLCaseTest("test");
+        DetailedDiff myDiff = test.testAllDifferences(docPython.asXML(), docRst.asXML());
         List allDifferences = myDiff.getAllDifferences();
-        String text="";
+        String text = "";
         Pattern pattern = Pattern.compile("at\\s(\\/\\w+\\[\\d+])+");
-        for (int i=0;i<allDifferences.size();i++){
+        for (int i = 0; i < allDifferences.size(); i++) {
             String diff = allDifferences.get(i).toString();
-            int nbLineRst=0;
-            int nbLinePython=0;
+            int nbLineRst = 0;
+            int nbLinePython = 0;
             Matcher matcher = pattern.matcher(diff);
-            if (matcher.find()){
-                nbLineRst = findLine(matcher.group(),sDocRst);
-                bColorRst[nbLineRst]=true;
+            if (matcher.find()) {
+                nbLineRst = findLine(matcher.group(), sDocRst);
+                bColorRst[nbLineRst] = true;
             }
-            if (matcher.find()){
-                nbLinePython = findLine(matcher.group(),sDocPython);
-                bColorPython[nbLinePython]=true;
+            if (matcher.find()) {
+                nbLinePython = findLine(matcher.group(), sDocPython);
+                bColorPython[nbLinePython] = true;
             }
-            text+="L python : "+(nbLinePython+1)+" L rst : "+(nbLineRst+1)+" "+diff+"\n\n";
+            text += "L python : " + (nbLinePython + 1) + " L rst : "
+                    + (nbLineRst + 1) + " " + diff + "\n\n";
         }
         return text;
     }
-    
-    private static int findLine (String match, String[] doc){
+
+    private static int findLine(String match, String[] doc) {
         Pattern pattern2 = Pattern.compile("\\/\\w+\\[\\d+]");
         Matcher matcher2 = pattern2.matcher(match);
         LinkedList<String> names = new LinkedList<String>();
         LinkedList<Integer> rgs = new LinkedList<Integer>();
-        while (matcher2.find()){
-            names.add(matcher2.group().substring(1,matcher2.group().indexOf("[")));
-            rgs.add(Integer.valueOf(matcher2.group().substring(matcher2.group().indexOf("[")+1,matcher2.group().indexOf("]"))));
+        while (matcher2.find()) {
+            names.add(matcher2.group().substring(1,
+                    matcher2.group().indexOf("[")));
+            rgs.add(Integer.valueOf(matcher2.group().substring(
+                    matcher2.group().indexOf("[") + 1,
+                    matcher2.group().indexOf("]"))));
         }
-        int cntName=0;
-        int nbLine=0;
-        for (String name : names){
-            int trouve=0;
-            for (int i=nbLine;i<doc.length;i++){
+        int cntName = 0;
+        int nbLine = 0;
+        for (String name : names) {
+            int trouve = 0;
+            for (int i = nbLine; i < doc.length; i++) {
                 String line = doc[i];
-                if (line.matches(".*\\<"+name+".*")){
+                if (line.matches(".*\\<" + name + ".*")) {
                     trouve++;
-                    if (trouve==rgs.get(cntName)){
+                    if (trouve == rgs.get(cntName)) {
                         nbLine = i;
                     }
                 }
             }
-            cntName++;    
+            cntName++;
         }
         return nbLine;
     }
-    private static void compare(String docRst, String docPython, String diff) throws IOException {
+
+    private static void compare(String docRst, String docPython, String diff)
+            throws IOException {
         JTextArea jrst = new JTextArea();
         JTextArea python = new JTextArea();
         jrst.setEditable(false);
         python.setEditable(false);
-		SyntaxSupport support = SyntaxSupport.getInstance(); 
-		support.addSupport(SyntaxSupport.XML_LEXER, jrst); // Coloration
-		support.addSupport(SyntaxSupport.XML_LEXER, python);
-        
-		jrst.getDocument().putProperty(SyntaxDocument.tabSizeAttribute, new Integer(2));
-		python.getDocument().putProperty(SyntaxDocument.tabSizeAttribute,new Integer(2));
-		
+        SyntaxSupport support = SyntaxSupport.getInstance();
+        support.addSupport(SyntaxSupport.XML_LEXER, jrst); // Coloration
+        support.addSupport(SyntaxSupport.XML_LEXER, python);
+
+        jrst.getDocument().putProperty(SyntaxDocument.tabSizeAttribute,
+                new Integer(2));
+        python.getDocument().putProperty(SyntaxDocument.tabSizeAttribute,
+                new Integer(2));
+
         JScrollPane spJrst = new JScrollPane(jrst);
-		JScrollPane spPython = new JScrollPane(python);
-        
-		// Ajout de gutterColor : la numerotation des lignes et coloration des érreurs
-		spJrst.setRowHeaderView(new GutterColor(jrst , spJrst, bColorRst));
-		spPython.setRowHeaderView(new GutterColor(python , spPython, bColorPython));
+        JScrollPane spPython = new JScrollPane(python);
+
+        // Ajout de gutterColor : la numerotation des lignes et coloration des
+        // erreurs
+        spJrst.setRowHeaderView(new GutterColor(jrst, spJrst, bColorRst));
+        spPython.setRowHeaderView(new GutterColor(python, spPython,
+                bColorPython));
         jrst.setText(docRst);
         python.setText(docPython);
-		JScrollPane droit = new JScrollPane(spJrst);
-		JScrollPane gauche = new JScrollPane(spPython);
-		JFrame comparateur = new JFrame();
-		JSplitPane separateurVert = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,true, gauche,droit);
+        JScrollPane droit = new JScrollPane(spJrst);
+        JScrollPane gauche = new JScrollPane(spPython);
+        JFrame comparateur = new JFrame();
+        JSplitPane separateurVert = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
+                true, gauche, droit);
         separateurVert.setResizeWeight(0.5);
         separateurVert.setOneTouchExpandable(true);
         separateurVert.setContinuousLayout(true);
@@ -170,22 +173,23 @@
         differences.setRows(10);
         differences.setEditable(false);
         JScrollPane scrollDiff = new JScrollPane(differences);
-        JSplitPane separateurHoriz = new JSplitPane(JSplitPane.VERTICAL_SPLIT,true,separateurVert,scrollDiff);
+        JSplitPane separateurHoriz = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
+                true, separateurVert, scrollDiff);
         separateurHoriz.setResizeWeight(0.7);
         comparateur.add(separateurHoriz);
-		comparateur.setSize(1280, 900);
-		comparateur.setVisible(true);
-		comparateur.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		comparateur.setTitle("Comparateur");
-	}
-	private static String indent(Document xml) throws IOException {
-		// Indentation du document
-		OutputFormat of = new OutputFormat("  ",true);
-		StringWriter out = new StringWriter();
-		XMLWriter writer = new XMLWriter(out, of);
-		writer.write(xml);
-		writer.close();
-		return out.toString();
-	}
-}
+        comparateur.setSize(1280, 900);
+        comparateur.setVisible(true);
+        comparateur.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        comparateur.setTitle("Comparateur");
+    }
 
+    private static String indent(Document xml) throws IOException {
+        // Indentation du document
+        OutputFormat of = new OutputFormat("  ", true);
+        StringWriter out = new StringWriter();
+        XMLWriter writer = new XMLWriter(out, of);
+        writer.write(xml);
+        writer.close();
+        return out.toString();
+    }
+}

Index: jrst2/src/test/org/codelutin/jrst/GutterColor.java
diff -u jrst2/src/test/org/codelutin/jrst/GutterColor.java:1.2 jrst2/src/test/org/codelutin/jrst/GutterColor.java:1.3
--- jrst2/src/test/org/codelutin/jrst/GutterColor.java:1.2	Wed May 23 17:16:20 2007
+++ jrst2/src/test/org/codelutin/jrst/GutterColor.java	Wed Jun 20 13:59:18 2007
@@ -1,3 +1,7 @@
+/**
+ * numerotation des lignes
+ * 
+ */
 package org.codelutin.jrst;
 /*
 *