From 76b3863699b32d41d26dba230aced03cde2bf8ad Mon Sep 17 00:00:00 2001 From: axelcl Date: Sun, 5 Dec 2004 13:15:08 +0000 Subject: [PATCH 1/1] misc --- .../phpeditor/php/PHPCompletionProcessor.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) 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 b4efebc..a4a2def 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 @@ -592,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; @@ -680,8 +680,9 @@ public class PHPCompletionProcessor implements IContentAssistProcessor { * @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) { -- 1.7.1