Author: vyemialyanchyk
Date: 2009-05-27 11:01:16 -0400 (Wed, 27 May 2009)
New Revision: 15561
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4384 - enhance "Hibernate Criteria
Editor" context assist, when there is no project associated with a console
configuration
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java 2009-05-27
14:29:59 UTC (rev 15560)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java 2009-05-27
15:01:16 UTC (rev 15561)
@@ -92,26 +92,27 @@
return new ICompletionProposal[0];
}
String prefix = HibernateConsoleMessages.JavaCompletionProcessor_session_session; //
has to do this because of
https://bugs.eclipse.org/bugs/show_bug.cgi?id=141518
-
- try {
- IJavaProject javaProject = ProjectUtils.findJavaProject(
editor.getConsoleConfiguration() );
+
+ IJavaCompletionProposal[] results = new IJavaCompletionProposal[0];
+ IJavaProject[] projects =
ProjectUtils.findJavaProjects(editor.getConsoleConfiguration());
+ for (int i = 0; i < projects.length && results.length <= 0; i++) {
+ IJavaProject javaProject = projects[i];
collector = new CompletionProposalCollector( javaProject );
collector.acceptContext( new CompletionContext() );
-
- editor.codeComplete( prefix, collector, position, javaProject );
+ try {
+ editor.codeComplete( prefix, collector, position, javaProject );
+ }
+ catch (JavaModelException x) {
+ Shell shell = viewer.getTextWidget().getShell();
+ ErrorDialog
+ .openError(
+ shell,
+ HibernateConsoleMessages.JavaCompletionProcessor_error,
HibernateConsoleMessages.JavaCompletionProcessor_error_while_performing_code_completion,
x.getStatus() );
+ HibernateConsolePlugin.getDefault().log( x );
+ }
+ results = collector.getJavaCompletionProposals();
}
- catch (JavaModelException x) {
- Shell shell = viewer.getTextWidget().getShell();
- ErrorDialog
- .openError(
- shell,
- HibernateConsoleMessages.JavaCompletionProcessor_error,
HibernateConsoleMessages.JavaCompletionProcessor_error_while_performing_code_completion,
x.getStatus() );
- HibernateConsolePlugin.getDefault().log( x );
- }
-
- IJavaCompletionProposal[] results = collector
- .getJavaCompletionProposals();
-
+
Arrays.sort( results, comparator );
CompletionHelper.transpose( null, -prefix.length(), results );
return results;