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/11/13 11:01:21 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/query CompositeSelectionCriterion.java IdentityCriterion.java
brj 2004/11/13 02:01:21
Modified: src/java/org/apache/ojb/broker/query IdentityCriterion.java
Added: src/java/org/apache/ojb/broker/query
CompositeSelectionCriterion.java
Log:
prepare for InCriteria to be built during preProcess
Revision Changes Path
1.5 +2 -20 db-ojb/src/java/org/apache/ojb/broker/query/IdentityCriterion.java
Index: IdentityCriterion.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/IdentityCriterion.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IdentityCriterion.java 25 Sep 2004 14:54:56 -0000 1.4
+++ IdentityCriterion.java 13 Nov 2004 10:01:21 -0000 1.5
@@ -32,7 +32,7 @@
* @author <a href="mailto:jbraeuchi@gmx.ch">Jakob Braeuchi</a>
* @version $Id$
*/
-public class IdentityCriterion extends SelectionCriteria
+public class IdentityCriterion extends CompositeSelectionCriterion
{
private static final long serialVersionUID = -2349356771591660674L;
@@ -46,8 +46,6 @@
return new IdentityCriterion(anAttribute, aValue, NOT_EQUAL);
}
- // the list of SelectionCriteria based on the identity
- private List m_criteriaList;
private String m_clause;
/**
@@ -79,22 +77,6 @@
m_clause = clause;
}
- /**
- * @return Returns the criteriaList.
- */
- public List getCriteriaList()
- {
- return m_criteriaList;
- }
-
- /**
- * @param criteriaList The criteriaList to set.
- */
- protected void setCriteriaList(List criteriaList)
- {
- m_criteriaList = criteriaList;
- }
-
/**
* Build SelectionCriteria based on Identity.
*
1.1 db-ojb/src/java/org/apache/ojb/broker/query/CompositeSelectionCriterion.java
Index: CompositeSelectionCriterion.java
===================================================================
package org.apache.ojb.broker.query;
/* Copyright 2002-2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import java.util.List;
/**
* A Criterion containing other SelectionCriteria.
* The real Criterion are built during preprocess.
*
* @author <a href="mailto:jbraeuchi@gmx.ch">Jakob Braeuchi</a>
* @version $Id: CompositeSelectionCriterion.java,v 1.1 2004/11/13 10:01:21 brj Exp $
*/
public abstract class CompositeSelectionCriterion extends SelectionCriteria
{
// the list of SelectionCriteria based on this Container
private List m_criteriaList;
/**
* @param anAttribute
* @param aValue
*/
CompositeSelectionCriterion(Object anAttribute, Object aValue)
{
super(anAttribute, aValue);
}
/**
* @return Returns the criteriaList.
*/
public List getCriteriaList()
{
return m_criteriaList;
}
/**
* @param criteriaList The criteriaList to set.
*/
protected void setCriteriaList(List criteriaList)
{
m_criteriaList = criteriaList;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org