Created a separated 'externaltools' plugin

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / php / PHPCompletionProcessor.java

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 54fe5a6..0ccf4c7 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
@@ -78,7 +78,7 @@ import org.eclipse.swt.graphics.Point;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
 
-import com.quantum.ExternalInterface;
+//import com.quantum.ExternalInterface;
 // import com.quantum.util.connection.NotConnectedException;
 
 /**
@@ -650,23 +650,25 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
           builtinResults = builtinEngine.getResults();
         }
       }
-      ICompletionProposal[] sqlResults = new ICompletionProposal[0];
-      if (project != null) {
-        sqlResults = getSQLProposals(viewer, project, context, prefix, sqlTable);
-      }
+//      ICompletionProposal[] sqlResults = new ICompletionProposal[0];
+//      if (project != null) {
+//        sqlResults = getSQLProposals(viewer, project, context, prefix, sqlTable);
+//      }
       // concatenate the result arrays
       IPHPCompletionProposal[] total;
       total = new IPHPCompletionProposal[localVariableResults.length + templateResults.length + identifierResults.length
-          + builtinResults.length + declarationResults.length + sqlResults.length];
+          + builtinResults.length + declarationResults.length];// + sqlResults.length];
       System.arraycopy(templateResults, 0, total, 0, templateResults.length);
       System.arraycopy(identifierResults, 0, total, templateResults.length, identifierResults.length);
       System.arraycopy(builtinResults, 0, total, templateResults.length + identifierResults.length, builtinResults.length);
       System.arraycopy(declarationResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length,
           declarationResults.length);
-      System.arraycopy(sqlResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
-          + declarationResults.length, sqlResults.length);
+//      System.arraycopy(sqlResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
+//          + declarationResults.length, sqlResults.length);
+//      System.arraycopy(localVariableResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
+//          + declarationResults.length + sqlResults.length, localVariableResults.length);
       System.arraycopy(localVariableResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
-          + declarationResults.length + sqlResults.length, localVariableResults.length);
+          + declarationResults.length, localVariableResults.length);
       results = total;
       fNumberOfComputedResults = (results == null ? 0 : results.length);
       /*
@@ -814,71 +816,71 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
    * @param sqlResults
    * @return
    */
-  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 = ProjectPrefUtil.getMiscProjectsPreferenceValue(project, IPreferenceConstants.PHP_BOOKMARK_DEFAULT);
-    if (bookmarkString != null && !bookmarkString.equals("")) {
-      String[] bookmarks = ExternalInterface.getBookmarkNames();
-      boolean foundBookmark = false;
-      for (int i = 0; i < bookmarks.length; i++) {
-        if (bookmarks[i].equals(bookmarkString)) {
-          foundBookmark = true;
-        }
-      }
-      if (!foundBookmark) {
-        return sqlResults;
-      }
-      //        Bookmark bookmark = sqlBookMarks.find(bookmarkString);
-      ArrayList sqlList = new ArrayList();
-      if (!ExternalInterface.isBookmarkConnected(bookmarkString)) {
-        ExternalInterface.connectBookmark(bookmarkString, null);
-        if (!ExternalInterface.isBookmarkConnected(bookmarkString)) {
-          return sqlResults;
-        }
-      }
-      //      if (ExternalInterface.isBookmarkConnected(bookmarkString)) {
-      try {
-         int start = context.getStart();
-        int end = context.getEnd();
-        String foundSQLTableName = sqlTable.getTableName();
-        String tableName;
-        String columnName;
-        String prefixWithoutDollar = prefix;
-        boolean isDollarPrefix = false;
-        if (prefix.length() > 0 && prefix.charAt(0) == '$') {
-          prefixWithoutDollar = prefix.substring(1);
-          isDollarPrefix = true;
-        }
-        IRegion region = new Region(start, end - start);
-        ResultSet set;
-        if (!isDollarPrefix) {
-          String[] tableNames = ExternalInterface.getMatchingTableNames(null, bookmarkString, prefixWithoutDollar, null, false);
-          for (int i = 0; i < tableNames.length; i++) {
-            sqlList.add(new SQLProposal(tableNames[i], context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
-          }
-        }
-
-        String[] columnNames = ExternalInterface.getMatchingColumnNames(null, bookmarkString, prefixWithoutDollar, null, false);
-        for (int i = 0; i < columnNames.length; i++) {
-          sqlList.add(new SQLProposal(columnNames[i], context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
-        }
-        
-        sqlResults = new IPHPCompletionProposal[sqlList.size()];
-        for (int i = 0; i < sqlList.size(); i++) {
-          sqlResults[i] = (SQLProposal) sqlList.get(i);
-        }
-      } catch (Exception /* NotConnectedException */ e) {
-        
-      }
-      //      }
-    }
-    //    }
-    return 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 = ProjectPrefUtil.getMiscProjectsPreferenceValue(project, IPreferenceConstants.PHP_BOOKMARK_DEFAULT);
+//    if (bookmarkString != null && !bookmarkString.equals("")) {
+//      String[] bookmarks = ExternalInterface.getBookmarkNames();
+//      boolean foundBookmark = false;
+//      for (int i = 0; i < bookmarks.length; i++) {
+//        if (bookmarks[i].equals(bookmarkString)) {
+//          foundBookmark = true;
+//        }
+//      }
+//      if (!foundBookmark) {
+//        return sqlResults;
+//      }
+//      //        Bookmark bookmark = sqlBookMarks.find(bookmarkString);
+//      ArrayList sqlList = new ArrayList();
+//      if (!ExternalInterface.isBookmarkConnected(bookmarkString)) {
+//        ExternalInterface.connectBookmark(bookmarkString, null);
+//        if (!ExternalInterface.isBookmarkConnected(bookmarkString)) {
+//          return sqlResults;
+//        }
+//      }
+//      //      if (ExternalInterface.isBookmarkConnected(bookmarkString)) {
+//      try {
+//         int start = context.getStart();
+//        int end = context.getEnd();
+//        String foundSQLTableName = sqlTable.getTableName();
+//        String tableName;
+//        String columnName;
+//        String prefixWithoutDollar = prefix;
+//        boolean isDollarPrefix = false;
+//        if (prefix.length() > 0 && prefix.charAt(0) == '$') {
+//          prefixWithoutDollar = prefix.substring(1);
+//          isDollarPrefix = true;
+//        }
+//        IRegion region = new Region(start, end - start);
+//        ResultSet set;
+//        if (!isDollarPrefix) {
+//          String[] tableNames = ExternalInterface.getMatchingTableNames(null, bookmarkString, prefixWithoutDollar, null, false);
+//          for (int i = 0; i < tableNames.length; i++) {
+//            sqlList.add(new SQLProposal(tableNames[i], context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
+//          }
+//        }
+//
+//        String[] columnNames = ExternalInterface.getMatchingColumnNames(null, bookmarkString, prefixWithoutDollar, null, false);
+//        for (int i = 0; i < columnNames.length; i++) {
+//          sqlList.add(new SQLProposal(columnNames[i], context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
+//        }
+//        
+//        sqlResults = new IPHPCompletionProposal[sqlList.size()];
+//        for (int i = 0; i < sqlList.size(); i++) {
+//          sqlResults[i] = (SQLProposal) sqlList.get(i);
+//        }
+//      } catch (Exception /* NotConnectedException */ e) {
+//        
+//      }
+//      //      }
+//    }
+//    //    }
+//    return sqlResults;
+//  }
 
   private boolean looksLikeMethod(PHPCodeReader reader) throws IOException {
     int curr = reader.read();