Author: dgeraskov Date: 2009-07-14 04:14:39 -0400 (Tue, 14 Jul 2009) New Revision: 16560 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/hqleditor/LoadConsoleCFGCompletionProposal.java Log: https://jira.jboss.org/jira/browse/JBIDE-4593 Call buildMapping() for configuration. 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-14 07:58:30 UTC (rev 16559) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2009-07-14 08:14:39 UTC (rev 16560) @@ -58,6 +58,7 @@ 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; @@ -150,10 +151,19 @@ @SuppressWarnings("unchecked") private String[] getImports() { - ConsoleConfiguration consoleConfiguration = getConsoleConfiguration(); + 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>(); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/LoadConsoleCFGCompletionProposal.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/LoadConsoleCFGCompletionProposal.java 2009-07-14 07:58:30 UTC (rev 16559) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/LoadConsoleCFGCompletionProposal.java 2009-07-14 08:14:39 UTC (rev 16560) @@ -18,6 +18,7 @@ import org.hibernate.HibernateException; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.ImageConstants; +import org.hibernate.console.execution.ExecutionContext; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.console.utils.EclipseImages; @@ -42,8 +43,17 @@ if(consoleConfiguration.getConfiguration()==null) { try { consoleConfiguration.build(); + consoleConfiguration.execute( new ExecutionContext.Command() { + + public Object execute() { + if(consoleConfiguration.hasConfiguration()) { + consoleConfiguration.getConfiguration().buildMappings(); + } + return consoleConfiguration; + } + } ); } catch (HibernateException he) { - HibernateConsolePlugin.getDefault().showError(HibernateConsolePlugin.getDefault().getShell(), HibernateConsoleMessages.LoadConsoleCFGCompletionProposal_could_not_load_configuration + ' ' + consoleConfiguration.getName(), he); + HibernateConsolePlugin.getDefault().showError(HibernateConsolePlugin.getShell(), HibernateConsoleMessages.LoadConsoleCFGCompletionProposal_could_not_load_configuration + ' ' + consoleConfiguration.getName(), he); } } }