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 2003/06/07 12:03:55 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/query SearchFilter.java
brj 2003/06/07 03:03:55
Modified: src/java/org/apache/ojb/broker/query SearchFilter.java
Log:
some style fixes
Revision Changes Path
1.5 +20 -20 db-ojb/src/java/org/apache/ojb/broker/query/SearchFilter.java
Index: SearchFilter.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/SearchFilter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SearchFilter.java 21 Aug 2002 14:01:17 -0000 1.4
+++ SearchFilter.java 7 Jun 2003 10:03:55 -0000 1.5
@@ -92,7 +92,7 @@
protected static final int BINARY_OPER_MASK = 0x100;
protected static final int LOGICAL_OPER_MASK = 0x200;
// Define the current search filter
- protected SearchBase filter = null;
+ protected SearchBase m_filter = null;
/**
* Create an empty search filter.
@@ -115,7 +115,7 @@
public void matchList(String ElementName, Vector values, int oper)
{
// Delete the old search filter
- filter = null;
+ m_filter = null;
// If not NOT_IN, assume IN
// (Since ints are passed by value, it is OK to change it)
if (oper != NOT_IN)
@@ -126,7 +126,7 @@
String[] value_string_array = new String[values.size()];
values.copyInto(value_string_array);
// Create a leaf node for this list and store it as the filter
- filter = new SearchBaseLeaf(ElementName, oper, value_string_array);
+ m_filter = new SearchBaseLeaf(ElementName, oper, value_string_array);
}
/**
@@ -141,7 +141,7 @@
public void matchList(String ElementName, String[] values, int oper)
{
// Delete the old search filter
- filter = null;
+ m_filter = null;
// If not NOT_IN, assume IN
// (Since ints are passed by value, it is OK to change it)
if (oper != NOT_IN)
@@ -149,7 +149,7 @@
oper = IN;
// Create a leaf node for this list and store it as the filter
}
- filter = new SearchBaseLeaf(ElementName, oper, values);
+ m_filter = new SearchBaseLeaf(ElementName, oper, values);
}
/**
@@ -164,7 +164,7 @@
public void matchList(String ElementName, int[] values, int oper)
{
// Delete the old search filter
- filter = null;
+ m_filter = null;
// If not NOT_IN, assume IN
// (Since ints are passed by value, it is OK to change it)
if (oper != NOT_IN)
@@ -172,7 +172,7 @@
oper = IN;
// Create a leaf node for this list and store it as the filter
}
- filter = new SearchBaseLeafInt(ElementName, oper, values);
+ m_filter = new SearchBaseLeafInt(ElementName, oper, values);
}
/**
@@ -187,7 +187,7 @@
public void matchValue(String ElementName, String value, int oper)
{
// Delete the old search filter
- filter = null;
+ m_filter = null;
// If not NOT_IN, assume IN
// (Since ints are passed by value, it is OK to change it)
if (oper != NOT_IN)
@@ -199,7 +199,7 @@
String[] ValueArray = new String[1];
ValueArray[0] = value;
// Create a leaf node for this list and store it as the filter
- filter = new SearchBaseLeaf(ElementName, oper, ValueArray);
+ m_filter = new SearchBaseLeaf(ElementName, oper, ValueArray);
}
/**
@@ -211,7 +211,7 @@
public void matchValue(String ElementName, int value, int oper)
{
// Delete the old search filter
- filter = null;
+ m_filter = null;
// If not NOT_IN, assume IN
// (Since ints are passed by value, it is OK to change it)
if (oper != NOT_IN)
@@ -219,7 +219,7 @@
oper = IN;
// Create a leaf node for this list and store it as the filter
}
- filter = new SearchBaseLeafInt(ElementName, oper, new int[]
+ m_filter = new SearchBaseLeafInt(ElementName, oper, new int[]
{
value
});
@@ -237,14 +237,14 @@
public void compareFilter(String ElementName, String value, int oper) throws DBException
{
// Delete the old search filter
- filter = null;
+ m_filter = null;
// If this is not a binary operator, throw an exception
if ((oper & BINARY_OPER_MASK) == 0)
{
throw new DBException();
// Create a SearchBaseLeafComparison node and store it as the filter
}
- filter = new SearchBaseLeafComparison(ElementName, oper, value);
+ m_filter = new SearchBaseLeafComparison(ElementName, oper, value);
}
/**
@@ -262,7 +262,7 @@
public void matchSet(Hashtable elements, int combine_op, int compare_op) throws DBException
{
// Delete the old search filter
- filter = null;
+ m_filter = null;
// If combine_op is not a logical operator, throw an exception
if ((combine_op & LOGICAL_OPER_MASK) == 0)
{
@@ -289,7 +289,7 @@
compareVector.addElement(comparenode);
}
// Now return a node that holds this set of leaf nodes
- filter = new SearchBaseNode(combine_op, compareVector);
+ m_filter = new SearchBaseNode(combine_op, compareVector);
}
/**
@@ -307,7 +307,7 @@
public void matchSet(String[] ElementNames, String[] ElementValues, int op) throws DBException
{
// Delete the old search filter
- filter = null;
+ m_filter = null;
// If this is not a logical operator, throw an exception
if ((op & LOGICAL_OPER_MASK) == 0)
{
@@ -325,7 +325,7 @@
leafVector.addElement(leafnode);
}
// Now return a node that holds this set of leaf nodes
- filter = new SearchBaseNode(op, leafVector);
+ m_filter = new SearchBaseNode(op, leafVector);
}
/**
@@ -353,7 +353,7 @@
filters.addElement(f.getFilter());
}
// Create a node for this list and return it
- filter = new SearchBaseNode(op, filter, filters);
+ m_filter = new SearchBaseNode(op, m_filter, filters);
}
/**
@@ -375,7 +375,7 @@
Vector filters = new Vector();
filters.addElement(new_filter.getFilter());
// Create a node for this list and return it
- filter = new SearchBaseNode(op, filter, filters);
+ m_filter = new SearchBaseNode(op, m_filter, filters);
}
/**
@@ -425,7 +425,7 @@
*/
protected SearchBase getFilter()
{
- return filter;
+ return m_filter;
}
/**