You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2011/03/03 23:20:57 UTC
svn commit: r1076840 -
/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java
Author: mrisaliti
Date: Thu Mar 3 22:20:56 2011
New Revision: 1076840
URL: http://svn.apache.org/viewvc?rev=1076840&view=rev
Log:
Remove some warning/unused variable in EntityPlanner (OFBIZ-4102)
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java?rev=1076840&r1=1076839&r2=1076840&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java Thu Mar 3 22:20:56 2011
@@ -136,7 +136,6 @@ public class EntityPlanner extends Plann
}
private static void addFieldDef(DynamicViewEntity dve, List<String> groupBy, String alias, ConstantValue value) {
- ComplexAliasMember complexMember;
if (value instanceof FieldValue) {
addFieldDef(dve, groupBy, alias, (FieldValue) value, null);
return;
@@ -176,8 +175,8 @@ public class EntityPlanner extends Plann
Value f1 = it.next(), f2 = it.next();
if (f1 instanceof FieldValue) {
FieldValue fv = (FieldValue) f1;
- if (f2 instanceof NumberValue) {
- return new ComplexAliasField(fv.getTableName(), fv.getFieldName(), ((NumberValue) f2).getNumber().toString(), name);
+ if (f2 instanceof NumberValue<?>) {
+ return new ComplexAliasField(fv.getTableName(), fv.getFieldName(), ((NumberValue<?>) f2).getNumber().toString(), name);
} else if (f2 instanceof StringValue) {
return new ComplexAliasField(fv.getTableName(), fv.getFieldName(), "'" + ((StringValue) f2).getString() + "'", name);
}
@@ -189,8 +188,8 @@ public class EntityPlanner extends Plann
Value f1 = it.next(), f2 = it.next();
if (f1 instanceof FieldValue) {
FieldValue fv = (FieldValue) f1;
- if (f2 instanceof NumberValue) {
- return new ComplexAliasField(fv.getTableName(), fv.getFieldName(), ((NumberValue) f2).getNumber().toString(), null);
+ if (f2 instanceof NumberValue<?>) {
+ return new ComplexAliasField(fv.getTableName(), fv.getFieldName(), ((NumberValue<?>) f2).getNumber().toString(), null);
} else if (f2 instanceof StringValue) {
return new ComplexAliasField(fv.getTableName(), fv.getFieldName(), "'" + ((StringValue) f2).getString() + "'", null);
}