Author: max.andersen(a)jboss.com
Date: 2008-02-01 21:10:15 -0500 (Fri, 01 Feb 2008)
New Revision: 6096
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLSourceViewerConfiguration.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/LoadConsoleCFGCompletionProposal.java
Log:
Addtional fixes for JBIDE-1500.
+ show info why "Load console configuration" is relevant
+ don't just stop adding other usefull completions because configuration is not open
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java 2008-02-02
01:30:43 UTC (rev 6095)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java 2008-02-02
02:10:15 UTC (rev 6096)
@@ -110,15 +110,16 @@
}
Configuration configuration =
consoleConfiguration!=null?consoleConfiguration.getConfiguration():null;
- if(configuration == null && consoleConfiguration!=null) {
- errorMessage = "Configuration not opened";
- return new ICompletionProposal[]{ new
LoadConsoleCFGCompletionProposal(consoleConfiguration) };
- }
IHQLCodeAssist hqlEval = new HQLCodeAssist(configuration);
EclipseHQLCompletionRequestor eclipseHQLCompletionCollector = new
EclipseHQLCompletionRequestor();
hqlEval.codeComplete(doc.get(), currentOffset, eclipseHQLCompletionCollector);
proposalList.addAll(eclipseHQLCompletionCollector.getCompletionProposals());
errorMessage = eclipseHQLCompletionCollector.getLastErrorMessage();
+
+ if(configuration == null && consoleConfiguration!=null) {
+ proposalList.add(new LoadConsoleCFGCompletionProposal(consoleConfiguration));
+ }
+
//findMatchingWords( currentOffset, proposalList, startWord,
HQLCodeScanner.getHQLKeywords(), "keyword" );
//findMatchingWords( currentOffset, proposalList, startWord,
HQLCodeScanner.getHQLFunctionNames(), "function");
@@ -149,7 +150,7 @@
public char[] getCompletionProposalAutoActivationCharacters() { return
autoActivationChars; }
- public char[] getContextInformationAutoActivationCharacters() { return new char[0];
}
+ public char[] getContextInformationAutoActivationCharacters() { return null; }
public IContextInformationValidator getContextInformationValidator() { return
validator; }
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLSourceViewerConfiguration.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLSourceViewerConfiguration.java 2008-02-02
01:30:43 UTC (rev 6095)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLSourceViewerConfiguration.java 2008-02-02
02:10:15 UTC (rev 6096)
@@ -75,6 +75,8 @@
assistant.setAutoActivationDelay( 500 );
assistant.setProposalPopupOrientation( IContentAssistant.PROPOSAL_STACKED );
+
assistant.setInformationControlCreator(getInformationControlCreator(sourceViewer));
+
return assistant;
}
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 2008-02-02
01:30:43 UTC (rev 6095)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/LoadConsoleCFGCompletionProposal.java 2008-02-02
02:10:15 UTC (rev 6096)
@@ -15,8 +15,10 @@
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
+import org.hibernate.HibernateException;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.ImageConstants;
+import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.EclipseImages;
/**
@@ -37,7 +39,11 @@
public void apply(IDocument document) {
//load console configuration
if(consoleConfiguration.getConfiguration()==null) {
- consoleConfiguration.build();
+ try {
+ consoleConfiguration.build();
+ } catch (HibernateException he) {
+ HibernateConsolePlugin.getDefault().showError(HibernateConsolePlugin.getDefault().getShell(),
"Could not load configuration " + consoleConfiguration.getName(), he);
+ }
}
}
@@ -45,7 +51,7 @@
* @see
org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
*/
public String getAdditionalProposalInfo() {
- return "Additional Info";
+ return "No open console configuration found.\nThis will attempt to open the
console configuration\nto enable better code completion.";
}
/* (non-Javadoc)
Show replies by date