Author: scabanovich Date: 2011-02-04 08:32:58 -0500 (Fri, 04 Feb 2011) New Revision: 29001 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java Log: JBIDE-8328 https://issues.jboss.org/browse/JBIDE-8328 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 2011-02-04 11:42:06 UTC (rev 29000) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 2011-02-04 13:32:58 UTC (rev 29001) @@ -17,6 +17,9 @@ import java.util.ListIterator; import org.eclipse.core.resources.IProject; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.search.IJavaSearchConstants; import org.eclipse.jface.fieldassist.ContentProposalAdapter; import org.eclipse.jface.fieldassist.IContentProposal; @@ -32,7 +35,9 @@ import org.jboss.tools.common.model.ui.attribute.IAttributeContentProposalProvider; import org.jboss.tools.common.model.ui.attribute.IValueFilter; import org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkCueLabelProvider; +import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.ModelFeatureFactory; +import org.jboss.tools.common.util.EclipseJavaUtil; public class JavaClassContentAssistProvider implements IAttributeContentProposalProvider { @@ -227,12 +232,39 @@ proposals = (IContentProposal[]) list.toArray(new IContentProposal[list.size()]); // Sort the proposals alphabetically Arrays.sort(proposals, fComparator); + + restoreDefaultPackage(proposals); + } else { proposals = new IContentProposal[0]; } return proposals; } + private void restoreDefaultPackage(IContentProposal[] proposals) { + for (int i = 0; i < proposals.length; i++) { + IContentProposal p = proposals[i]; + String content = p.getContent(); + if(content == null || content.indexOf('.') >= 0) continue; + String label = p.getLabel(); + if(label != null && label.indexOf("- null") >= 0 && p instanceof TypeContentProposal) { + String qn = "java.lang." + content; + IJavaProject jp = EclipseResourceUtil.getJavaProject(fProject); + IType t = null; + try { + t = EclipseJavaUtil.findType(jp, qn); + } catch (JavaModelException e) { + e.printStackTrace(); + } + int k = label.indexOf("- null"); + String pack = t != null ? "java.lang" : "(default)"; + label = label.substring(0, k + 2) + pack; + TypeContentProposal p1 = new TypeContentProposal(label, content, p.getDescription(), ((TypeContentProposal)p).getImage()); + proposals[i] = p1; + } + } + } + /** * @param currentContent * @return