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/04 23:26:05 UTC
svn commit: r1078181 -
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
Author: mrisaliti
Date: Fri Mar 4 22:26:04 2011
New Revision: 1078181
URL: http://svn.apache.org/viewvc?rev=1078181&view=rev
Log:
Remove some warning in ModelTreeAction (OFBIZ-4102)
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java?rev=1078181&r1=1078180&r2=1078181&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java Fri Mar 4 22:26:04 2011
@@ -193,11 +193,11 @@ public abstract class ModelTreeAction {
BshUtil.runBshAtLocation(location, context);
Object obj = context.get("_LIST_ITERATOR_");
if (this.modelSubNode != null) {
- if (obj != null && (obj instanceof EntityListIterator || obj instanceof ListIterator)) {
+ if (obj != null && (obj instanceof EntityListIterator || obj instanceof ListIterator<?>)) {
ListIterator<? extends Map<String, ? extends Object>> listIt = UtilGenerics.cast(obj);
this.modelSubNode.setListIterator(listIt);
} else {
- if (obj instanceof List) {
+ if (obj instanceof List<?>) {
List<? extends Map<String, ? extends Object>> list = UtilGenerics.checkList(obj);
this.modelSubNode.setListIterator(list.listIterator());
}
@@ -299,7 +299,7 @@ public abstract class ModelTreeAction {
if (UtilValidate.isNotEmpty(resultMapListName)) {
List<? extends Map<String, ? extends Object>> lst = UtilGenerics.checkList(result.get(resultMapListName));
if (lst != null) {
- if (lst instanceof ListIterator) {
+ if (lst instanceof ListIterator<?>) {
ListIterator<? extends Map<String, ? extends Object>> listIt = UtilGenerics.cast(lst);
this.modelSubNode.setListIterator(listIt);
} else {
@@ -374,11 +374,11 @@ public abstract class ModelTreeAction {
context.put(this.listName, null);
finder.runFind(context, this.modelTree.getDelegator());
Object obj = context.get(this.listName);
- if (obj != null && (obj instanceof EntityListIterator || obj instanceof ListIterator)) {
+ if (obj != null && (obj instanceof EntityListIterator || obj instanceof ListIterator<?>)) {
ListIterator<? extends Map<String, ? extends Object>> listIt = UtilGenerics.cast(obj);
this.modelSubNode.setListIterator(listIt);
} else {
- if (obj instanceof List) {
+ if (obj instanceof List<?>) {
List<? extends Map<String, ? extends Object>> list = UtilGenerics.checkList(obj);
this.modelSubNode.setListIterator(list.listIterator());
}
@@ -414,11 +414,11 @@ public abstract class ModelTreeAction {
context.put(this.listName, null);
finder.runFind(context, this.modelTree.getDelegator());
Object obj = context.get(this.listName);
- if (obj != null && (obj instanceof EntityListIterator || obj instanceof ListIterator)) {
+ if (obj != null && (obj instanceof EntityListIterator || obj instanceof ListIterator<?>)) {
ListIterator<? extends Map<String, ? extends Object>> listIt = UtilGenerics.cast(obj);
this.modelSubNode.setListIterator(listIt);
} else {
- if (obj instanceof List) {
+ if (obj instanceof List<?>) {
List<? extends Map<String, ? extends Object>> list = UtilGenerics.cast(obj);
this.modelSubNode.setListIterator(list.listIterator());
}