Author: scabanovich Date: 2010-05-13 08:53:58 -0400 (Thu, 13 May 2010) New Revision: 22057 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java Log: https://jira.jboss.org/jira/browse/JBIDE-6258 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2010-05-13 12:35:56 UTC (rev 22056) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2010-05-13 12:53:58 UTC (rev 22057) @@ -54,10 +54,12 @@ String start = content.substring(sr.getOffset(), nr.getOffset()); int off = -1; int off0 = -1; + int bc = 0; for (int i = start.length() - 1; i >= 0; i--) { char ch = start.charAt(i); + if(ch == '>') bc++; else if(ch == '<') bc--; if(Character.isWhitespace(ch)) { - if(off >= 0) break; + if(off >= 0 && bc <= 0) break; } else if(Character.isJavaIdentifierPart(ch) || ch == '.' || ch == '$' || ch == '<' || ch == '>') { off = i; if(off0 < 0) off0 = i + 1; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-13 12:35:56 UTC (rev 22056) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-13 12:53:58 UTC (rev 22057) @@ -78,7 +78,10 @@ int start = paramStart + 1; for (int i = 0; i < params.length; i++) { - if(params[i].indexOf('@') < 0) continue; //do not need parameters without annotation + if(params[i].indexOf('@') < 0) { + start += params[i].length() + 1; + continue; //do not need parameters without annotation + } ParameterDefinition pd = new ParameterDefinition();