Author: akazakov Date: 2008-02-18 13:38:55 -0500 (Mon, 18 Feb 2008) New Revision: 6414 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java Log: JBIDE-999 Ignore collections with no parameters. Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-02-18 18:16:20 UTC (rev 6413) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-02-18 18:38:55 UTC (rev 6414) @@ -441,7 +441,7 @@ for (TypeInfoCollector.MemberInfo mbr : members) { if (mbr.getMemberType() == null) continue; TypeInfoCollector infos = SeamExpressionResolver.collectTypeInfo(mbr); - if (TypeInfoCollector.isNotParameterizedCollection(mbr.getMemberType()) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { + if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { status.setMapOrCollectionOrBundleAmoungTheTokens(); } List<TypeInfoCollector.MemberInfo> properties = infos.getProperties(); @@ -470,7 +470,7 @@ for (TypeInfoCollector.MemberInfo mbr : members) { if (mbr.getMemberType() == null) continue; TypeInfoCollector infos = SeamExpressionResolver.collectTypeInfo(mbr); - if (TypeInfoCollector.isNotParameterizedCollection(mbr.getMemberType()) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { + if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { status.setMapOrCollectionOrBundleAmoungTheTokens(); } List<TypeInfoCollector.MemberInfo> methods = infos.getMethods(); @@ -491,7 +491,7 @@ for (TypeInfoCollector.MemberInfo mbr : members) { if (mbr.getMemberType() == null) continue; TypeInfoCollector infos = SeamExpressionResolver.collectTypeInfo(mbr); - if (TypeInfoCollector.isNotParameterizedCollection(mbr.getMemberType()) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { + if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { status.setMapOrCollectionOrBundleAmoungTheTokens(); } proposals.addAll(infos.getMethodPresentations()); @@ -505,7 +505,7 @@ for (TypeInfoCollector.MemberInfo mbr : members) { if (mbr.getMemberType() == null) continue; TypeInfoCollector infos = SeamExpressionResolver.collectTypeInfo(mbr); - if (TypeInfoCollector.isNotParameterizedCollection(mbr.getMemberType()) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { + if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCollector.isResourceBundle(mbr.getMemberType())) { status.setMapOrCollectionOrBundleAmoungTheTokens(); } proposalsToFilter.addAll(infos.getMethodPresentations()); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java 2008-02-18 18:16:20 UTC (rev 6413) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java 2008-02-18 18:38:55 UTC (rev 6414) @@ -586,10 +586,16 @@ } } - public static boolean isNotParameterizedCollection(IType type) { + public static boolean isNotParameterizedCollection(TypeInfoCollector.MemberInfo mbr) { try { - String name = type.getFullyQualifiedParameterizedName(); - return (name.indexOf('<')==-1) && (isInstanceofType(type, "java.util.Map") || (isInstanceofType(type, "java.util.Collection"))); + if(mbr.getParametersOfType()!=null && mbr.getParametersOfType().length>0) { + return false; + } + IType type = mbr.getMemberType(); + if(type!=null) { + return isInstanceofType(type, "java.util.Map") || isInstanceofType(type, "java.util.Collection"); + } + return false; } catch (JavaModelException e) { return false; }