1 files changed, 16 insertions, 16 deletions
diff --git a/src/com/iciql/QueryJoin.java b/src/com/iciql/QueryJoin.java
index dbb3d15..652d937 100644
--- a/src/com/iciql/QueryJoin.java
+++ b/src/com/iciql/QueryJoin.java
@@ -21,54 +21,54 @@ package com.iciql;
  * This class represents a query with a join.
  */
 
-public class QueryJoin {
+public class QueryJoin<T> {
 
-	private Query<?> query;
-	private SelectTable<?> join;
+	private Query<T> query;
+	private SelectTable<T> join;
 
-	QueryJoin(Query<?> query, SelectTable<?> join) {
+	QueryJoin(Query<T> query, SelectTable<T> join) {
 		this.query = query;
 		this.join = join;
 	}
 
-	public QueryJoinCondition<Boolean> on(boolean x) {
+	public QueryJoinCondition<T, Boolean> on(boolean x) {
 		return addPrimitive(x);
 	}
 
-	public QueryJoinCondition<Byte> on(byte x) {
+	public QueryJoinCondition<T, Byte> on(byte x) {
 		return addPrimitive(x);
 	}
 
-	public QueryJoinCondition<Short> on(short x) {
+	public QueryJoinCondition<T, Short> on(short x) {
 		return addPrimitive(x);
 	}
 
-	public QueryJoinCondition<Integer> on(int x) {
+	public QueryJoinCondition<T, Integer> on(int x) {
 		return addPrimitive(x);
 	}
 
-	public QueryJoinCondition<Long> on(long x) {
+	public QueryJoinCondition<T, Long> on(long x) {
 		return addPrimitive(x);
 	}
 
-	public QueryJoinCondition<Float> on(float x) {
+	public QueryJoinCondition<T, Float> on(float x) {
 		return addPrimitive(x);
 	}
 
-	public QueryJoinCondition<Double> on(double x) {
+	public QueryJoinCondition<T, Double> on(double x) {
 		return addPrimitive(x);
 	}
 
-	private <A> QueryJoinCondition<A> addPrimitive(A x) {		
+	private <A> QueryJoinCondition<T, A> addPrimitive(A x) {		
 		A alias = query.getPrimitiveAliasByValue(x);
 		if (alias == null) {
 			// this will result in an unmapped field exception
-			return new QueryJoinCondition<A>(query, join, x);
+			return new QueryJoinCondition<T, A>(query, join, x);
 		}
-		return new QueryJoinCondition<A>(query, join, alias);
+		return new QueryJoinCondition<T, A>(query, join, alias);
 	}
 
-	public <A> QueryJoinCondition<A> on(A x) {
-		return new QueryJoinCondition<A>(query, join, x);
+	public <A> QueryJoinCondition<T, A> on(A x) {
+		return new QueryJoinCondition<T, A>(query, join, x);
 	}
 }