fedor 01/05/09 01:57:33
Modified: proposals/fedor/nqm And.java Comparison.java
ComplexCondition.java Condition.java Equal.java
Less.java More.java NotEqual.java Or.java
Query.java Statement.java
Log:
now the proposal compiles
Revision Changes Path
1.2 +2 -1 jakarta-turbine/proposals/fedor/nqm/And.java
Index: And.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/And.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- And.java 2001/05/09 02:54:49 1.1
+++ And.java 2001/05/09 08:57:18 1.2
@@ -55,6 +55,7 @@
*/
// Java Core Classes
+import java.util.Collection;
// Turbine Classes
import org.apache.turbine.util.db.adapter.DB;
@@ -63,7 +64,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: And.java,v 1.1 2001/05/09 02:54:49 fedor Exp $
+ * @version $Id: And.java,v 1.2 2001/05/09 08:57:18 fedor Exp $
*/
public class And extends ComplexCondition
{
1.2 +7 -3 jakarta-turbine/proposals/fedor/nqm/Comparison.java
Index: Comparison.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/Comparison.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Comparison.java 2001/05/09 02:54:49 1.1
+++ Comparison.java 2001/05/09 08:57:19 1.2
@@ -65,7 +65,7 @@
/**
* A simple column condition such as "column=3" "column >=5" "column LIKE
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: Comparison.java,v 1.1 2001/05/09 02:54:49 fedor Exp $
+ * @version $Id: Comparison.java,v 1.2 2001/05/09 08:57:19 fedor Exp $
*/
public abstract class Comparison implements Condition
{
@@ -123,18 +123,22 @@
.add(value.toString())
.add(QUOTE);
}
+ return ssb;
}
public Set getTables()
{
+ HashSet tables;
int dot = column.indexOf(DOT);
if (dot<0)
{
- return null;
+ tables = new HashSet(0);
}
else
{
- return new HashSet(1).add(column.substring(0,dot).toUpperCase());
+ tables = new HashSet(1);
+ tables.add(column.substring(0,dot).toUpperCase());
}
+ return tables;
}
}
1.2 +12 -12 jakarta-turbine/proposals/fedor/nqm/ComplexCondition.java
Index: ComplexCondition.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/ComplexCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComplexCondition.java 2001/05/09 02:54:49 1.1
+++ ComplexCondition.java 2001/05/09 08:57:20 1.2
@@ -57,6 +57,8 @@
// Java Core Classes
import java.util.Set;
import java.util.HashSet;
+import java.util.Vector;
+import java.util.Collection;
// Turbine Classes
import org.apache.turbine.util.db.adapter.DB;
@@ -65,28 +67,27 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: ComplexCondition.java,v 1.1 2001/05/09 02:54:49 fedor Exp $
+ * @version $Id: ComplexCondition.java,v 1.2 2001/05/09 08:57:20 fedor Exp $
*/
public abstract class ComplexCondition implements Condition
{
public static final String OPEN_PARENS = "(";
public static final String CLOSE_PARENS = ")";
- private Vector conditions;
+ private Vector conditions = new Vector();
public ComplexCondition()
{
- this.conditions = new Vector();
}
public ComplexCondition(Condition condition)
{
- this.conditions = new Vector().add(condition);
+ this.conditions.add(condition);
}
public ComplexCondition(Collection conditions)
{
- this.conditions = new Vector(conditions);
+ this.conditions.addAll(conditions);
}
public abstract String getOperator(DB db);
@@ -112,19 +113,18 @@
{
return null;
}
- StringStackBuffer ssb = new StringStackBuffer()
- .add(this.conditions.get(0).toSQL(db));
+ StringStackBuffer ssb =((Condition)this.conditions.get(0)).toSQL(db);
for (int i=1; i<this.conditions.size(); i++)
{
- ssb.add(getOperator());
- Condition cond = this.conditions.get(i);
+ ssb.add(getOperator(db));
+ Condition cond = (Condition)this.conditions.get(i);
if (cond instanceof ComplexCondition)
{
ssb.add(OPEN_PARENS)
- .addAll(this.conditions.get(i).toSQL(db))
+ .addAll(((Condition)this.conditions.get(i)).toSQL(db))
.add(CLOSE_PARENS);
}
- ssb.addAll(this.conditions.get(i).toSQL(db));
+ ssb.addAll(((Condition)this.conditions.get(i)).toSQL(db));
}
return ssb;
}
@@ -134,7 +134,7 @@
HashSet tables = new HashSet(this.conditions.size());
for (int i=0; i<this.conditions.size(); i++)
{
- tables.addAll(this.conditions.get(i).getTables());
+ tables.addAll(((Condition)this.conditions.get(i)).getTables());
}
return tables;
}
1.2 +2 -2 jakarta-turbine/proposals/fedor/nqm/Condition.java
Index: Condition.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/Condition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Condition.java 2001/05/09 02:54:50 1.1
+++ Condition.java 2001/05/09 08:57:20 1.2
@@ -55,8 +55,8 @@
*/
// Java Core Classes
+import java.util.Set;
-
// Turbine Classes
import org.apache.turbine.util.db.adapter.DB;
import org.apache.turbine.util.StringStackBuffer;
@@ -65,7 +65,7 @@
* This interface represents a condition in where clause
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: Condition.java,v 1.1 2001/05/09 02:54:50 fedor Exp $
+ * @version $Id: Condition.java,v 1.2 2001/05/09 08:57:20 fedor Exp $
*/
public interface Condition extends SQLCode
{
1.2 +2 -2 jakarta-turbine/proposals/fedor/nqm/Equal.java
Index: Equal.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/Equal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Equal.java 2001/05/09 02:54:50 1.1
+++ Equal.java 2001/05/09 08:57:21 1.2
@@ -63,7 +63,7 @@
/**
* A simple column condition such as "column=3" "column >=5" "column LIKE
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: Equal.java,v 1.1 2001/05/09 02:54:50 fedor Exp $
+ * @version $Id: Equal.java,v 1.2 2001/05/09 08:57:21 fedor Exp $
*/
public class Equal extends Comparison
{
@@ -83,7 +83,7 @@
*/
public Equal(String column, Object value, boolean quoteValue)
{
- super(column, value, quoteValue)
+ super(column, value, quoteValue);
}
/**
1.2 +2 -2 jakarta-turbine/proposals/fedor/nqm/Less.java
Index: Less.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/Less.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Less.java 2001/05/09 02:54:50 1.1
+++ Less.java 2001/05/09 08:57:22 1.2
@@ -63,7 +63,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: Less.java,v 1.1 2001/05/09 02:54:50 fedor Exp $
+ * @version $Id: Less.java,v 1.2 2001/05/09 08:57:22 fedor Exp $
*/
public class Less extends Comparison
{
@@ -83,7 +83,7 @@
*/
public Less(String column, Object value, boolean quoteValue)
{
- super(column, value, quoteValue)
+ super(column, value, quoteValue);
}
/**
1.2 +2 -2 jakarta-turbine/proposals/fedor/nqm/More.java
Index: More.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/More.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- More.java 2001/05/09 02:54:50 1.1
+++ More.java 2001/05/09 08:57:22 1.2
@@ -63,7 +63,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: More.java,v 1.1 2001/05/09 02:54:50 fedor Exp $
+ * @version $Id: More.java,v 1.2 2001/05/09 08:57:22 fedor Exp $
*/
public class More extends Comparison
{
@@ -83,7 +83,7 @@
*/
public More(String column, Object value, boolean quoteValue)
{
- super(column, value, quoteValue)
+ super(column, value, quoteValue);
}
/**
1.2 +2 -2 jakarta-turbine/proposals/fedor/nqm/NotEqual.java
Index: NotEqual.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/NotEqual.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NotEqual.java 2001/05/09 02:54:50 1.1
+++ NotEqual.java 2001/05/09 08:57:23 1.2
@@ -63,7 +63,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: NotEqual.java,v 1.1 2001/05/09 02:54:50 fedor Exp $
+ * @version $Id: NotEqual.java,v 1.2 2001/05/09 08:57:23 fedor Exp $
*/
public class NotEqual extends Comparison
{
@@ -83,7 +83,7 @@
*/
public NotEqual(String column, Object value, boolean quoteValue)
{
- super(column, value, quoteValue)
+ super(column, value, quoteValue);
}
/**
1.2 +2 -1 jakarta-turbine/proposals/fedor/nqm/Or.java
Index: Or.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/Or.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Or.java 2001/05/09 02:54:50 1.1
+++ Or.java 2001/05/09 08:57:24 1.2
@@ -55,6 +55,7 @@
*/
// Java Core Classes
+import java.util.Collection;
// Turbine Classes
import org.apache.turbine.util.db.adapter.DB;
@@ -63,7 +64,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: Or.java,v 1.1 2001/05/09 02:54:50 fedor Exp $
+ * @version $Id: Or.java,v 1.2 2001/05/09 08:57:24 fedor Exp $
*/
public class Or extends ComplexCondition
{
1.2 +5 -1 jakarta-turbine/proposals/fedor/nqm/Query.java
Index: Query.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/Query.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Query.java 2001/05/09 02:54:50 1.1
+++ Query.java 2001/05/09 08:57:25 1.2
@@ -55,6 +55,9 @@
*/
// Java Core Classes
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Vector;
// Turbine Classes
import org.apache.turbine.util.db.adapter.DB;
@@ -63,7 +66,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: Query.java,v 1.1 2001/05/09 02:54:50 fedor Exp $
+ * @version $Id: Query.java,v 1.2 2001/05/09 08:57:25 fedor Exp $
*/
public class Query extends Statement
{
@@ -148,6 +151,7 @@
query.add(COMMA).addAll(((OrderBy)orderBys.get(i)).toSQL(db));
}
}
+ return query;
}
public class OrderBy implements SQLCode
1.2 +8 -4 jakarta-turbine/proposals/fedor/nqm/Statement.java
Index: Statement.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/proposals/fedor/nqm/Statement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Statement.java 2001/05/09 02:54:50 1.1
+++ Statement.java 2001/05/09 08:57:26 1.2
@@ -55,6 +55,9 @@
*/
// Java Core Classes
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Iterator;
// Turbine Classes
import org.apache.turbine.util.db.adapter.DB;
@@ -63,7 +66,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
- * @version $Id: Statement.java,v 1.1 2001/05/09 02:54:50 fedor Exp $
+ * @version $Id: Statement.java,v 1.2 2001/05/09 08:57:26 fedor Exp $
*/
public abstract class Statement implements SQLCode
{
@@ -89,7 +92,7 @@
StringStackBuffer clause = new StringStackBuffer();
if (condition!=null)
{
- clause.add(WHERE).addAll(condition.toSQL(db))
+ clause.add(WHERE).addAll(condition.toSQL(db));
}
return clause;
}
@@ -97,9 +100,9 @@
protected StringStackBuffer fromClause(DB db)
{
StringStackBuffer clause = new StringStackBuffer();
- if (!tables.empty())
+ if (!tables.isEmpty())
{
- Iterator i=tables.iterator;
+ Iterator i=tables.iterator();
clause.add(FROM).add((String)i.next());
while(i.hasNext())
{
@@ -113,6 +116,7 @@
{
this.condition = condition;
this.tables.addAll(condition.getTables());
+ return this;
}
public Condition getCondition()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
