Author: dgeraskov Date: 2009-07-17 08:43:24 -0400 (Fri, 17 Jul 2009) New Revision: 16646 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java Log: https://jira.jboss.org/jira/browse/JBIDE-4613 Load console configuration completion proposal added. Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2009-07-17 12:42:06 UTC (rev 16645) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2009-07-17 12:43:24 UTC (rev 16646) @@ -58,7 +58,6 @@ import org.eclipse.ui.texteditor.TextOperationAction; import org.hibernate.cfg.Configuration; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.execution.ExecutionContext; import org.hibernate.eclipse.console.AbstractQueryEditor; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.HibernateConsolePlugin; @@ -153,19 +152,6 @@ final ConsoleConfiguration consoleConfiguration = getConsoleConfiguration(); - if(consoleConfiguration.getConfiguration()==null) { - consoleConfiguration.build(); - consoleConfiguration.execute( new ExecutionContext.Command() { - - public Object execute() { - if(consoleConfiguration.hasConfiguration()) { - consoleConfiguration.getConfiguration().buildMappings(); - } - return consoleConfiguration; - } - } ); - } - Set<String> imports = new HashSet<String>(); Configuration configuration = consoleConfiguration.getConfiguration(); if(configuration!=null) { 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-07-17 12:42:06 UTC (rev 16645) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java 2009-07-17 12:43:24 UTC (rev 16646) @@ -21,8 +21,6 @@ */ package org.hibernate.eclipse.criteriaeditor; -import java.util.Arrays; - import org.eclipse.jdt.core.CompletionContext; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaModelException; @@ -40,6 +38,7 @@ import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.console.utils.ProjectUtils; import org.hibernate.eclipse.hqleditor.CompletionHelper; +import org.hibernate.eclipse.hqleditor.LoadConsoleCFGCompletionProposal; import org.hibernate.util.StringHelper; public class JavaCompletionProcessor implements IContentAssistProcessor { @@ -113,8 +112,15 @@ results = collector.getJavaCompletionProposals(); } - Arrays.sort( results, comparator ); CompletionHelper.transpose( null, -prefix.length(), results ); + + if (editor.getConsoleConfiguration().getConfiguration() == null){ + ICompletionProposal[] results2 = new ICompletionProposal[results.length + 1]; + System.arraycopy(results, 0, results2, 1, results.length); + results2[0] = new LoadConsoleCFGCompletionProposal(editor.getConsoleConfiguration()); + return results2; + } + return results; } finally {