X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
index 40b6d78..c8755e0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
@@ -45,7 +45,7 @@ import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
 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;
@@ -61,6 +61,7 @@ import org.eclipse.jface.text.contentassist.IContextInformation;
 import org.eclipse.jface.text.contentassist.IContextInformationExtension;
 import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
 import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.jface.text.templates.DocumentTemplateContext;
 import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
@@ -469,7 +470,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
               if (ident.equals("select")) {
                 //                  System.out.println("select");
                 token = ITerminalSymbols.TokenNameSQLselect;
-                return token;  
+                return token;
               } else if (ident.equals("insert")) {
                 //                  System.out.println("insert");
                 token = ITerminalSymbols.TokenNameSQLinsert;
@@ -591,9 +592,9 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
           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;
@@ -679,12 +680,13 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
    * @param sqlResults
    * @return
    */
-  private IPHPCompletionProposal[] getSQLProposals(ITextViewer viewer, IProject project, JavaContext 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();