import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
import net.sourceforge.phpeclipse.ui.IPreferenceConstants;
-import net.sourceforge.phpeclipse.ui.overlaypages.Util;
+import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
builtinResults = builtinEngine.getResults();
}
}
- IPHPCompletionProposal[] sqlResults = new IPHPCompletionProposal[0];
+ ICompletionProposal[] sqlResults = new ICompletionProposal[0];
if (project != null) {
- sqlResults = getSQLProposals(viewer, project, context, prefix, sqlTable, sqlResults);
+ sqlResults = getSQLProposals(viewer, project, context, prefix, sqlTable);
}
// concatenate the result arrays
IPHPCompletionProposal[] total;
* @param sqlResults
* @return
*/
- private IPHPCompletionProposal[] getSQLProposals(ITextViewer viewer, IProject project, DocumentTemplateContext context,
- String prefix, TableName sqlTable, IPHPCompletionProposal[] sqlResults) {
+ private ICompletionProposal[] getSQLProposals(ITextViewer viewer, IProject project, DocumentTemplateContext context,
+ String prefix, TableName sqlTable) {
+ ICompletionProposal[] sqlResults = new ICompletionProposal[0];
// Get The Database bookmark from the Quantum SQL plugin:
BookmarkCollection sqlBookMarks = BookmarkCollection.getInstance();
if (sqlBookMarks != null) {
- String bookmarkString = Util.getMiscProjectsPreferenceValue(project, IPreferenceConstants.PHP_BOOKMARK_DEFAULT);
+ String bookmarkString = ProjectPrefUtil.getMiscProjectsPreferenceValue(project, IPreferenceConstants.PHP_BOOKMARK_DEFAULT);
if (bookmarkString != null && !bookmarkString.equals("")) {
Bookmark bookmark = sqlBookMarks.find(bookmarkString);
ArrayList sqlList = new ArrayList();