Author: tfischer
Date: Sat May 12 13:43:57 2012
New Revision: 1337540
URL: http://svn.apache.org/viewvc?rev=1337540&view=rev
Log:
- fix raw types compiler warnings
- remove unnecessary casts
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java?rev=1337540&r1=1337539&r2=1337540&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
Sat May 12 13:43:57 2012
@@ -54,7 +54,7 @@ public final class MapHelper
*/
public static TableMap getTableMap(
Object possibleColumn,
- CriteriaInterface criteria,
+ CriteriaInterface<?> criteria,
TableMap defaultTableMap)
{
if (!(possibleColumn instanceof Column))
@@ -67,7 +67,7 @@ public final class MapHelper
if (tableName == null)
{
// try asColumns
- Column asColumn = (Column) criteria.getAsColumns().get(
+ Column asColumn = criteria.getAsColumns().get(
column.getSqlExpression());
if (asColumn != null)
{
@@ -114,12 +114,12 @@ public final class MapHelper
*/
public static ColumnMap getColumnMap(
Column column,
- CriteriaInterface criteria)
+ CriteriaInterface<?> criteria)
{
String tableName = column.getTableName();
{
// try asColumns
- Column asColumn = (Column) criteria.getAsColumns().get(
+ Column asColumn = criteria.getAsColumns().get(
column.getSqlExpression());
if (asColumn != null)
{
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java?rev=1337540&r1=1337539&r2=1337540&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java
Sat May 12 13:43:57 2012
@@ -61,7 +61,7 @@ public final class JoinBuilder
*/
public static void processJoins(
final Database database,
- final CriteriaInterface criteria,
+ final CriteriaInterface<?> criteria,
final Query query)
throws TorqueException
{
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java?rev=1337540&r1=1337539&r2=1337540&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
Sat May 12 13:43:57 2012
@@ -230,7 +230,7 @@ public final class SqlBuilder
* @throws TorqueException if the as columns can not be processed.
*/
private static void processAsColumns(
- final CriteriaInterface criteria,
+ final CriteriaInterface<?> criteria,
final Query query,
final Database database)
throws TorqueException
@@ -262,7 +262,7 @@ public final class SqlBuilder
* not null.
*/
private static void processModifiers(
- final CriteriaInterface criteria,
+ final CriteriaInterface<?> criteria,
final Query query)
{
UniqueList<String> selectModifiers = query.getSelectModifiers();
@@ -520,7 +520,7 @@ public final class SqlBuilder
private static void processOrderBy(
final DB db,
final Database database,
- final CriteriaInterface crit,
+ final CriteriaInterface<?> crit,
final Query query)
throws TorqueException
{
@@ -659,7 +659,7 @@ public final class SqlBuilder
* @throws TorqueException if the Database adapter cannot be obtained
*/
private static void processLimits(
- final CriteriaInterface crit,
+ final CriteriaInterface<?> crit,
final Query query)
throws TorqueException
{
@@ -712,7 +712,7 @@ public final class SqlBuilder
static PreparedStatementPart getExpressionForFromClause(
final Column column,
final Database database,
- final CriteriaInterface criteria)
+ final CriteriaInterface<?> criteria)
throws TorqueException
{
Column resolvedColumn
@@ -1019,7 +1019,7 @@ public final class SqlBuilder
static void addTableToFromClause(
final Object possibleColumn,
final Database database,
- final CriteriaInterface criteria,
+ final CriteriaInterface<?> criteria,
Query query)
throws TorqueException
{
@@ -1073,7 +1073,7 @@ public final class SqlBuilder
*/
static boolean isIgnoreCase(
Criterion criterion,
- CriteriaInterface criteria,
+ CriteriaInterface<?> criteria,
Database database)
throws TorqueException
{
@@ -1107,7 +1107,7 @@ public final class SqlBuilder
*/
private static boolean ignoreCaseApplicable(
Object value,
- CriteriaInterface criteria,
+ CriteriaInterface<?> criteria,
Database database)
throws TorqueException
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
