[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl CriteriaImpl.java,1.1,1.2 QueryImpl.java,1.9,1.10

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv31647/hibernate/impl

Modified Files:
	CriteriaImpl.java QueryImpl.java 
Log Message:
expanded Criteria API
allowed unmapped-class queries with new from syntax

Index: CriteriaImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/CriteriaImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CriteriaImpl.java	8 Mar 2003 06:39:21 -0000	1.1
--- CriteriaImpl.java	9 Mar 2003 04:04:08 -0000	1.2
***************
*** 9,16 ****
--- 9,18 ----
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.expression.Expression;
+ import net.sf.hibernate.expression.Order;
  
  public class CriteriaImpl implements Criteria {
  	
  	private List expressions = new ArrayList();
+ 	private List orderings = new ArrayList();
  	private Integer maxResults;
  	private Integer firstResult;
***************
*** 60,63 ****
--- 62,69 ----
  	}
  	
+ 	public Iterator iterateOrderings() {
+ 		return orderings.iterator();
+ 	}
+ 	
  	public Class getPersistentClass() {
  		return persistentClass;
***************
*** 66,69 ****
--- 72,80 ----
  	public String toString() {
  		return expressions.toString();
+ 	}
+ 
+ 	public Criteria addOrder(Order ordering) {
+ 		orderings.add(ordering);
+ 		return this;
  	}
  

Index: QueryImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/QueryImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** QueryImpl.java	4 Mar 2003 10:53:46 -0000	1.9
--- QueryImpl.java	9 Mar 2003 04:04:08 -0000	1.10
***************
*** 5,8 ****
--- 5,9 ----
  import java.math.BigDecimal;
  import java.util.ArrayList;
+ import java.util.Arrays;
  import java.util.Calendar;
  import java.util.Collection;
***************
*** 420,423 ****
--- 421,434 ----
  	}
  	
+ 	public Query setParameterList(String name, Object[] vals, Type type)
+ 		throws HibernateException {
+ 		return setParameterList(name, Arrays.asList(vals), type);
+ 	}
+ 
+ 	public Query setParameterList(String name, Object[] vals)
+ 		throws HibernateException {
+ 		return setParameterList( name, Arrays.asList(vals) );
+ 	}
+ 
  }