Index: topia/src/java/org/codelutin/topia/persistence/TopiaCollectionQueryHelper.java
diff -u topia/src/java/org/codelutin/topia/persistence/TopiaCollectionQueryHelper.java:1.2 topia/src/java/org/codelutin/topia/persistence/TopiaCollectionQueryHelper.java:1.3
--- topia/src/java/org/codelutin/topia/persistence/TopiaCollectionQueryHelper.java:1.2	Wed Jun 15 16:52:29 2005
+++ topia/src/java/org/codelutin/topia/persistence/TopiaCollectionQueryHelper.java	Fri Jun 17 14:15:06 2005
@@ -24,7 +24,7 @@
 * Created: 13 juin 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.2 $
+* @version $Revision: 1.3 $
 */
 
 
@@ -32,9 +32,14 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 
 import org.codelutin.queryparser.Constraint;
@@ -52,15 +57,23 @@
 import bsh.EvalError;
 import bsh.Interpreter;
 
-
+/**
+ * Cette classe permet d'effectuer des requêtes de type Query sur une
+ * Collection d'objet par introspection.
+ * Cependant, pour que cela fonctionne, les attributs sur lesquels portent les
+ * requêtes doivent etre associés à une méthode get<Attribute>. Si ce n'est pas
+ * le cas, l'objet sera considéré comme non conforme à la requête et ne sera
+ * donc pas retourné.
+ */
 public class TopiaCollectionQueryHelper extends QueryHelper {
 
     /** to use log facility, just put in your code: log.info("..."); */
-    static private Logger log = Logger.getLogger("org.codelutin.topia.TopiaCollectionQueryHelper");
+    static private Logger log = 
+        Logger.getLogger("org.codelutin.topia.TopiaCollectionQueryHelper");
     
     protected TopiaCollectionQueryBuilder queryBuilder;
     protected Collection datas;
-    protected Interpreter interpreter;
+    protected Interpreter inter;
     
     public TopiaCollectionQueryHelper(Collection datas) {
         this.datas = datas;
@@ -71,7 +84,8 @@
         queryBuilder = null;
         HashMap fields = getQuery().getSelect().getFields();
         if(fields.size() != 1)
-            throw new IllegalArgumentException("Select statement must have one field only. "+fields);
+            throw new IllegalArgumentException("Select statement must " +
+            		"have one field only. "+fields);
     }
 
     /* (non-Javadoc)
@@ -79,57 +93,102 @@
      */
     public Collection execute() throws QueryHelperException {
         //System.out.println("Query : " + query);
+        if (getQuery() == null)
+            throw new QueryHelperException("Please use setQuery(...) " +
+            		"before execute()");
+
         if (queryBuilder == null) { //Préparation de la requete pour BSH
             queryBuilder = new TopiaCollectionQueryBuilder();
             getQuery().visit(queryBuilder);
-            //System.out.println(queryBuilder.getClassName());
-            //System.out.println(queryBuilder.getFrom());
-            //System.out.println(queryBuilder.getFilter());
-            interpreter = new Interpreter();
+            inter = new Interpreter();
             try {
                 for(int i=0; i<args.size(); i++){
-                    interpreter.set("$" + (i+1), args.get(i));
+                    inter.set("$" + (i+1), args.get(i));
                 }
             } catch (EvalError e) {
                 e.printStackTrace();
             }
-            generateMethodsForBSH(interpreter);
+            generateMethodsForBSH(inter);
         }
-        
 
-        Collection result = new ArrayList();
+        List result = new ArrayList();
         for (Iterator it = datas.iterator(); it.hasNext(); ) {
             Object o = it.next();
-            if (evalTrue(o, queryBuilder.getFilter(), interpreter))
+            if (evalTrue(o, queryBuilder.getFilter(), inter))
                 result.add(o);
         }
         
-        //TODO Arno : Tri des résultats - orderBy
-        
-        //TODO Arno : renvoi uniquement des fieldPath
+        if (queryBuilder.getFieldName() != null) { 
+            List resultAccordingToFieldPath = new ArrayList();
+            for (Iterator it = result.iterator(); it.hasNext(); ) {
+	            Object o = eval(it.next(), queryBuilder.getFieldName(), inter);
+	            if (o != null)
+	                resultAccordingToFieldPath.add(o);
+	        }
+	        result = resultAccordingToFieldPath;
+        }
+
+        Collections.sort(result, new TopiaCollectionQueryComparator(
+                queryBuilder.getOrderBy(), inter));
 
         return result;
     }
 
+    /**
+     * Génère pour l'interprêteur spécifié différentes méthode utiles
+     */
     private void generateMethodsForBSH(Interpreter interpreter) {
         try {
             interpreter.eval("toObject(boolean value) {new Boolean(value);}");
-            interpreter.eval("toObject(char value) {new String(\"\" + value);}");
+            interpreter.eval("toObject(char value) {new String(\"\"+value);}");
             //Tout nombre est converti en Double
             interpreter.eval("toObject(double value) {new Double(value);}");
             interpreter.eval("toObject(Object o) {o;}");
-            interpreter.eval("equals(o1, o2) {if ((toObject(o1) instanceof Number) && (toObject(o2) instanceof Number)) return (toObject(o1).doubleValue() == toObject(o2).doubleValue()); else return toObject(o1).equals(toObject(o2));}");
+            interpreter.eval("equals(o1, o2) {" +
+                "if ((toObject(o1) instanceof Number)" +
+                " && (toObject(o2) instanceof Number)) " +
+                    "return (toObject(o1).doubleValue()" +
+                    " == toObject(o2).doubleValue()); " +
+                "else " +
+                    "return toObject(o1).equals(toObject(o2));" +
+            "}");
+            interpreter.eval("compare(o1, o2) {" +
+                "if ((toObject(o1) instanceof Number)" +
+                " && (toObject(o2) instanceof Number)) " +
+                    "return Double.compare(toObject(o1).doubleValue()," +
+                    " toObject(o2).doubleValue()); " +
+                "else " +
+                    "return toObject(o1).compareTo(toObject(o2));" +
+            "}");
         } catch (EvalError e) {
             e.printStackTrace();
         }
     }
     
-    protected boolean evalTrue(Object o, String filter, Interpreter interpreter) {
+    /**
+     * Applique un filtre sur l'objet spécifié et le renvoie s'il correspond  
+     */
+    private Object eval(Object object, String field, Interpreter inter) {
+        if (field == null)
+            return object;
+        try {
+            inter.set("target", object);
+            return inter.eval("target." + field); 
+        } catch (EvalError error) {
+            log.info("Error, invalid BSH request : " + error.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * Evalue le filtre spécifié et renvoie si l'objet correspond (true/false) 
+     */
+    protected boolean evalTrue(Object o, String filter, Interpreter inter) {
         //System.out.println("------ Filter : " + filter);
         Boolean result = new Boolean(false);
         try {
-            interpreter.set("target", o);
-            result = (Boolean)interpreter.eval(filter);
+            inter.set("target", o);
+            result = (Boolean)inter.eval(filter);
         } catch (EvalError e) {
             log.info("Error, invalid BSH request : " + e.getMessage());
             return false;
@@ -139,7 +198,46 @@
     
     
     
-    
+    public class TopiaCollectionQueryComparator implements Comparator {
+
+        Map orderBy;
+        Interpreter inter;
+        
+        public TopiaCollectionQueryComparator(Map orderMap, Interpreter inter) {
+            if (!(orderMap instanceof LinkedHashMap))
+                log.info("Warning ! Given Map is not a LinkedHashMap : order" +
+                    " will not be guaranteed");
+            this.orderBy = orderMap;
+            this.inter = inter;
+        }
+        
+        /* (non-Javadoc)
+         * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+         */
+        public int compare(Object arg0, Object arg1) {
+            Iterator it = orderBy.keySet().iterator();
+            int compareValue = 0;
+            while (compareValue == 0 && it.hasNext()) {
+                String field = (String)it.next();
+                boolean asc = (Boolean.TRUE.equals(orderBy.get(field)));
+                String request = "compare(" +
+                "target0." + field + ", target1." + field + ")";
+                try {
+                    inter.set("target0", arg0);
+                    inter.set("target1", arg1);
+                    Integer i = (Integer)inter.eval(request);
+                    compareValue = i.intValue();
+                } catch (EvalError e) {
+                    log.info("Error, invalid BSH request : " + e.getMessage());
+                    compareValue = 0;
+                }
+                if (!asc)
+                    compareValue = -compareValue;
+            }
+            return compareValue;
+        }
+        
+    }
     
     public class TopiaCollectionQueryBuilder extends DefaultQueryVisitorUnsupportedOperation {
         
@@ -158,10 +256,16 @@
         public String getFrom() {
             return from;
         }
+        public Map getOrderBy() {
+            return orderBy;
+        }
+
         protected String className;
         protected String fieldName;
         protected String from;
         protected String filter = "";
+        //LinkedHashMap instead of Map to keep order between fields
+        protected Map orderBy = new LinkedHashMap();
 
         protected Collection argCollection = new LinkedList();
 
@@ -170,7 +274,6 @@
         protected Query query;
         
         public void visitFrom(From from) {
-            //Nothing more than visitFromSource
         }
 
         public void visitFromSource(From from, String field, String alias) {
@@ -179,11 +282,14 @@
         
         
         public void visitOrderBy(OrderBy orderBy) {
-            // TODO Arno : Auto-generated method stub
         }
         public void visitOrderByField(OrderBy orderBy, FieldPath field,
                 boolean asc) {
-            // TODO Arno : Auto-generated method stub
+            String adaptedField = field.getField();
+            int pos = query.getFrom().startsWithSourceOrAlias(adaptedField);
+            if (pos != -1)
+                adaptedField = adaptedField.substring(pos + 1);
+            this.orderBy.put(adaptedField, Boolean.valueOf(asc));
         }
         
         
@@ -193,7 +299,6 @@
         
         
         public void visitSelect(Select select) {
-            //Rien de plus que visitSelectField
         }
         public void visitSelectAvg(Select select) {
             // TODO Arno : Auto-generated method stub
@@ -210,14 +315,12 @@
         public void visitSelectField(Select select, FieldPath field,
                 String alias) {
             className = field.getField();
-            
-            /*int pos = query.getFrom().startsWithSourceOrAlias(className);
+            int pos = query.getFrom().startsWithSourceOrAlias(className);
             if(pos != -1 && pos != className.length()){
                 fieldName = className.substring(pos+1);
                 className = className.substring(0, pos);
             }
             className = query.getFrom().getSource(className);
-            */
         }
         public void visitSelectLimit(Select select, int first, int last) {
             // TODO Arno : Auto-generated method stub