Author: scabanovich Date: 2010-12-28 11:10:41 -0500 (Tue, 28 Dec 2010) New Revision: 27765 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java Log: JBIDE-8011 https://issues.jboss.org/browse/JBIDE-8011 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2010-12-28 16:06:41 UTC (rev 27764) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2010-12-28 16:10:41 UTC (rev 27765) @@ -36,6 +36,7 @@ import org.jboss.tools.common.el.core.ELCorePlugin; import org.jboss.tools.common.el.core.ca.preferences.ELContentAssistPreferences; import org.jboss.tools.common.model.util.EclipseJavaUtil; +import org.jboss.tools.common.util.BeanUtil; /** * This class helps to collect information of java elements used in Seam EL. @@ -585,15 +586,11 @@ } public boolean isGetter() { - if (null == getType()) { - return false; - } - - return (((getName().startsWith("get") && !getName().equals("get")) || getName().startsWith("is")) && getNumberOfParameters() == 0); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + return getType() != null && BeanUtil.isGetter(getName(), getNumberOfParameters()); } public boolean isSetter() { - return ((getName().startsWith("set") && !getName().equals("set")) && getNumberOfParameters() == 1); //$NON-NLS-1$ //$NON-NLS-2$ + return BeanUtil.isSetter(getName(), getNumberOfParameters()); } public List<String> getAsPresentedStrings() { @@ -1200,16 +1197,8 @@ MethodInfo m = (MethodInfo)info; if (m.isGetter() || m.isSetter()) { - StringBuffer name = new StringBuffer(m.getName()); - if(m.getName().startsWith("i")) { //$NON-NLS-1$ - name.delete(0, 2); - } else { - name.delete(0, 3); - } - if(name.length()<2 || Character.isLowerCase(name.charAt(1))) { - name.setCharAt(0, Character.toLowerCase(name.charAt(0))); - } - String propertyName = name.toString(); + String propertyName = BeanUtil.getPropertyName(m.getName()); + if(propertyName == null) continue; MemberPresentation pr = new MemberPresentation(propertyName, propertyName, m); if(!properties.contains(pr)) { properties.add(pr);