Some Galileo inspired raw type elimination.
This commit is contained in:
@@ -144,7 +144,8 @@ public abstract class KeySet<T extends PersistentRecord> extends WhereClause
|
|||||||
if (this == obj) {
|
if (this == obj) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return (obj instanceof EmptyKeySet) && _pClass.equals(((EmptyKeySet<?>)obj)._pClass);
|
return (obj instanceof EmptyKeySet<?>) &&
|
||||||
|
_pClass.equals(((EmptyKeySet<?>)obj)._pClass);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override public int hashCode () {
|
@Override public int hashCode () {
|
||||||
@@ -191,7 +192,7 @@ public abstract class KeySet<T extends PersistentRecord> extends WhereClause
|
|||||||
if (this == obj) {
|
if (this == obj) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!(obj instanceof SingleKeySet)) {
|
if (!(obj instanceof SingleKeySet<?>)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
SingleKeySet<?> oset = (SingleKeySet<?>)obj;
|
SingleKeySet<?> oset = (SingleKeySet<?>)obj;
|
||||||
@@ -245,7 +246,7 @@ public abstract class KeySet<T extends PersistentRecord> extends WhereClause
|
|||||||
if (this == obj) {
|
if (this == obj) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!(obj instanceof MultiKeySet)) {
|
if (!(obj instanceof MultiKeySet<?>)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
MultiKeySet<?> oset = (MultiKeySet<?>)obj;
|
MultiKeySet<?> oset = (MultiKeySet<?>)obj;
|
||||||
|
|||||||
@@ -918,11 +918,11 @@ public class DepotMarshaller<T extends PersistentRecord>
|
|||||||
}
|
}
|
||||||
} else if (config instanceof SQLExpression) {
|
} else if (config instanceof SQLExpression) {
|
||||||
definition.add(new Tuple<SQLExpression, Order>((SQLExpression)config, Order.ASC));
|
definition.add(new Tuple<SQLExpression, Order>((SQLExpression)config, Order.ASC));
|
||||||
} else if (config instanceof Tuple) {
|
} else if (config instanceof Tuple<?,?>) {
|
||||||
@SuppressWarnings("unchecked") Tuple<SQLExpression, Order> tuple =
|
@SuppressWarnings("unchecked") Tuple<SQLExpression, Order> tuple =
|
||||||
(Tuple<SQLExpression, Order>)config;
|
(Tuple<SQLExpression, Order>)config;
|
||||||
definition.add(tuple);
|
definition.add(tuple);
|
||||||
} else if (config instanceof List) {
|
} else if (config instanceof List<?>) {
|
||||||
@SuppressWarnings("unchecked") List<Tuple<SQLExpression, Order>> defs =
|
@SuppressWarnings("unchecked") List<Tuple<SQLExpression, Order>> defs =
|
||||||
(List<Tuple<SQLExpression, Order>>)config;
|
(List<Tuple<SQLExpression, Order>>)config;
|
||||||
definition.addAll(defs);
|
definition.addAll(defs);
|
||||||
|
|||||||
@@ -291,7 +291,7 @@ public class HSQLBuilder
|
|||||||
return "VARBINARY";
|
return "VARBINARY";
|
||||||
} else if (fm instanceof FieldMarshaller.IntArrayMarshaller) {
|
} else if (fm instanceof FieldMarshaller.IntArrayMarshaller) {
|
||||||
return "VARBINARY";
|
return "VARBINARY";
|
||||||
} else if (fm instanceof FieldMarshaller.ByteEnumMarshaller) {
|
} else if (fm instanceof FieldMarshaller.ByteEnumMarshaller<?>) {
|
||||||
return "TINYINT";
|
return "TINYINT";
|
||||||
} else if (fm instanceof FieldMarshaller.BooleanMarshaller) {
|
} else if (fm instanceof FieldMarshaller.BooleanMarshaller) {
|
||||||
return "BOOLEAN";
|
return "BOOLEAN";
|
||||||
|
|||||||
@@ -330,7 +330,7 @@ public class MySQLBuilder
|
|||||||
return "MEDIUMBLOB";
|
return "MEDIUMBLOB";
|
||||||
}
|
}
|
||||||
return "LONGBLOB";
|
return "LONGBLOB";
|
||||||
} else if (fm instanceof ByteEnumMarshaller) {
|
} else if (fm instanceof ByteEnumMarshaller<?>) {
|
||||||
return "TINYINT";
|
return "TINYINT";
|
||||||
} else if (fm instanceof BooleanMarshaller) {
|
} else if (fm instanceof BooleanMarshaller) {
|
||||||
return "TINYINT";
|
return "TINYINT";
|
||||||
|
|||||||
@@ -294,7 +294,7 @@ public class PostgreSQLBuilder
|
|||||||
return "BYTEA";
|
return "BYTEA";
|
||||||
} else if (fm instanceof FieldMarshaller.IntArrayMarshaller) {
|
} else if (fm instanceof FieldMarshaller.IntArrayMarshaller) {
|
||||||
return "BYTEA";
|
return "BYTEA";
|
||||||
} else if (fm instanceof FieldMarshaller.ByteEnumMarshaller) {
|
} else if (fm instanceof FieldMarshaller.ByteEnumMarshaller<?>) {
|
||||||
return "SMALLINT";
|
return "SMALLINT";
|
||||||
} else if (fm instanceof FieldMarshaller.BooleanMarshaller) {
|
} else if (fm instanceof FieldMarshaller.BooleanMarshaller) {
|
||||||
return "BOOLEAN";
|
return "BOOLEAN";
|
||||||
|
|||||||
Reference in New Issue
Block a user