Author: vrubezhny Date: 2007-11-16 09:59:24 -0500 (Fri, 16 Nov 2007) New Revision: 4947 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: http://jira.jboss.com/jira/browse/JBIDE-1308 Disable "unresolved EL" for GA ? Validation bug in methods filtering is fixed 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 2007-11-16 13:42:30 UTC (rev 4946) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2007-11-16 14:59:24 UTC (rev 4947) @@ -531,6 +531,9 @@ for (String proposal : proposalsToFilter) { // We do expect nothing but name for method tokens (No round brackets) String filter = token.getText(); + if (filter.indexOf('(') != -1) { + filter = filter.substring(0, filter.indexOf('(')); + } if(returnEqualedVariablesOnly) { // This is used for validation. if (proposal.equals(filter)) { 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 2007-11-16 13:42:30 UTC (rev 4946) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java 2007-11-16 14:59:24 UTC (rev 4947) @@ -579,14 +579,13 @@ String[] parameterTypes = method.getParameterTypeQualifiedNames(); boolean equal = true; - for (int i = 0; parameterTypes != null && i < parameterTypes.length; i++) { + for (int i = 0; equal && parameterTypes != null && i < parameterTypes.length; i++) { // simple types must be equal, but complex types may not if (!parameterTypes[i].equals(methodParameterTypes[i])) { // sure - it's Complex Type - if (! (parameterTypes[i].indexOf('.') != -1) + if ((parameterTypes[i].indexOf('.') != -1) && (methodParameterTypes[i].indexOf('.') == -1)) { equal = false; - break; } } }