Author: vyemialyanchyk Date: 2008-01-24 08:18:07 -0500 (Thu, 24 Jan 2008) New Revision: 5931 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java Log: http://jira.jboss.com/jira/browse/JBIDE-1624 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java 2008-01-24 13:14:47 UTC (rev 5930) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java 2008-01-24 13:18:07 UTC (rev 5931) @@ -49,6 +49,7 @@ } HibernateResultCollector rc = new HibernateResultCollector(javaProject); + rc.setFilterPackage(packageName); rc.acceptContext(new CompletionContext()); //rc.reset(offset, javaProject, null); rc.setAccepts(settings); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java 2008-01-24 13:14:47 UTC (rev 5930) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java 2008-01-24 13:18:07 UTC (rev 5931) @@ -24,6 +24,7 @@ import org.eclipse.jdt.core.CompletionProposal; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.compiler.CharOperation; import org.eclipse.jdt.ui.text.java.CompletionProposalCollector; /** @@ -215,4 +216,25 @@ public void accept(CompletionProposal proposal) { super.accept(proposal); } + + protected String filterPackage = null; + + public void setFilterPackage(String filterPackage) { + this.filterPackage = filterPackage; + } + + protected char[] getProposalPackage(CompletionProposal proposal) { + //return proposal.getPackageName(); + return proposal.getDeclarationSignature(); + } + + protected boolean isFiltered(CompletionProposal proposal) { + boolean res = super.isFiltered(proposal); + if (!res && null != filterPackage) { + if (!CharOperation.equals(getProposalPackage(proposal), filterPackage.toCharArray())) { + res = true; + } + } + return res; + } }