Author: scabanovich Date: 2011-07-26 18:56:28 -0400 (Tue, 26 Jul 2011) New Revision: 33220 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ElCoreMessages.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java Log: JBIDE-9087 https://issues.jboss.org/browse/JBIDE-9087 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ElCoreMessages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ElCoreMessages.java 2011-07-26 22:51:32 UTC (rev 33219) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ElCoreMessages.java 2011-07-26 22:56:28 UTC (rev 33220) @@ -32,7 +32,8 @@ public static String RENAME_MESSAGE_PROPERTY_PROCESSOR_TITLE; public static String RENAME_EL_VARIABLE_PROCESSOR_CAN_NOT_FIND_EL_VARIABLE; public static String RENAME_MESSAGE_PROPERTY_PROCESSOR_CAN_NOT_FIND_MESSAGE_PROPERTY; - + + public static String Open; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, ElCoreMessages.class); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties 2011-07-26 22:51:32 UTC (rev 33219) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties 2011-07-26 22:56:28 UTC (rev 33220) @@ -26,3 +26,4 @@ RENAME_EL_VARIABLE_PROCESSOR_CAN_NOT_FIND_EL_VARIABLE=Can not find EL Variable: ''{0}''. RENAME_MESSAGE_PROPERTY_PROCESSOR_CAN_NOT_FIND_MESSAGE_PROPERTY=Can not find message: ''{0}''. +Open=Open ''{0}'' Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2011-07-26 22:51:32 UTC (rev 33219) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2011-07-26 22:56:28 UTC (rev 33220) @@ -10,18 +10,23 @@ ******************************************************************************/ package org.jboss.tools.common.el.core.resolver; +import java.text.MessageFormat; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.PartInitException; import org.jboss.tools.common.CommonPlugin; import org.jboss.tools.common.el.core.ELCorePlugin; +import org.jboss.tools.common.el.core.ElCoreMessages; import org.jboss.tools.common.el.core.parser.LexicalToken; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo; @@ -180,7 +185,23 @@ @Override public String getLabel() { - return getJavaElement().getElementName(); + IJavaElement javaElement = getJavaElement(); + String name = ""; //$NON-NLS-1$ + IType type = null; + if(javaElement instanceof IType){ + name = javaElement.getElementName(); + type = (IType)javaElement; + + }else if(javaElement instanceof IMethod){ + type = ((IMethod) javaElement).getDeclaringType(); + name = type.getElementName()+"."+javaElement.getElementName()+"()"; //$NON-NLS-1$ //$NON-NLS-2$ + }else if(javaElement instanceof IField){ + type = ((IField) javaElement).getDeclaringType(); + name = type.getElementName()+"."+javaElement.getElementName(); //$NON-NLS-1$ + } + if(type != null) + name += " - "+type.getPackageFragment().getElementName(); //$NON-NLS-1$ + return MessageFormat.format(ElCoreMessages.Open, name); } @Override