You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by br...@apache.org on 2004/05/22 13:28:48 UTC

cvs commit: db-ojb/src/java/org/apache/ojb/jdo QueryImpl.java ExtentImpl.java

brj         2004/05/22 04:28:47

  Modified:    src/java/org/apache/ojb/jdo QueryImpl.java ExtentImpl.java
  Log:
  removed unused imports
  
  Revision  Changes    Path
  1.9       +2 -5      db-ojb/src/java/org/apache/ojb/jdo/QueryImpl.java
  
  Index: QueryImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/jdo/QueryImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- QueryImpl.java	3 May 2004 00:12:02 -0000	1.8
  +++ QueryImpl.java	22 May 2004 11:28:47 -0000	1.9
  @@ -28,10 +28,6 @@
   import java.util.Map;
   
   /**
  -
  - */
  -
  -/**
    * Not Really Functional Yet:
    * <p>
    * Consider making this a front end for a State system where the
  @@ -45,6 +41,7 @@
    *
    * @author <a href="mailto:mattbaird@yahoo.com">Matthew Baird</a>
    * @author <a href="mailto:brianm@apache.org">Brian McCallister</a>
  + * @version $Id$
    */
   
   public class QueryImpl implements Query
  @@ -164,7 +161,7 @@
   	{
           if (!m_compiled) this.compile();
           QueryByCriteria query = QueryFactory.newQuery(m_searchClass, this.m_criteria);
  -		Collection results =  (Collection) m_conn.getCollectionByQuery(query);
  +		Collection results =  m_conn.getCollectionByQuery(query);
           if (m_candidates != null) return CollectionUtils.intersection(results, this.m_candidates);
           else return results;
   	}
  
  
  
  1.9       +9 -10     db-ojb/src/java/org/apache/ojb/jdo/ExtentImpl.java
  
  Index: ExtentImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/jdo/ExtentImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ExtentImpl.java	14 Apr 2004 13:12:04 -0000	1.8
  +++ ExtentImpl.java	22 May 2004 11:28:47 -0000	1.9
  @@ -15,27 +15,26 @@
    * limitations under the License.
    */
   
  +import java.util.HashSet;
  +import java.util.Iterator;
  +import java.util.NoSuchElementException;
  +
  +import javax.jdo.Extent;
  +import javax.jdo.PersistenceManager;
  +
   import org.apache.ojb.broker.accesslayer.OJBIterator;
   import org.apache.ojb.broker.accesslayer.RsIterator;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.broker.query.Criteria;
  -import org.apache.ojb.broker.query.Query;
  -import org.apache.ojb.broker.query.QueryFactory;
   import org.apache.ojb.broker.query.QueryByCriteria;
  +import org.apache.ojb.broker.query.QueryFactory;
   import org.apache.ojb.otm.OTMConnection;
   
  -import javax.jdo.Extent;
  -import javax.jdo.PersistenceManager;
  -import java.util.Iterator;
  -import java.util.Set;
  -import java.util.HashSet;
  -import java.util.NoSuchElementException;
  -
   /**
    * @author <a href="mailto:mattbaird@yahoo.com">Matthew Baird</a>
    * @author <a href="mailto:brianm@apache.org">Brian McCallister</a>
  + * @version $Id$
    */
  -
   public class ExtentImpl implements Extent
   {
   	private Class m_clazz;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Re: cvs commit: db-ojb/src/java/org/apache/ojb/jdo QueryImpl.java ExtentImpl.java

Posted by Thomas Dudziak <to...@first.gmd.de>.
Jakob,

could you stay clear of the jdo package and subpackeges for now as I'm
currently changing some of the stuff there, and your changes result in
merging failures.

Thanks,
Tom


---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org