misc

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / actions / PHPOpenSQLTableEditorAction.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenSQLTableEditorAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenSQLTableEditorAction.java
index 99fbfc5..011993c 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenSQLTableEditorAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenSQLTableEditorAction.java
@@ -4,7 +4,7 @@
  * the Common Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/cpl-v10.html
  * 
- * Contributors: Klaus Hartlage - www.eclipseproject.de
+ * Contributors: www.phpeclipse.de
  ******************************************************************************/
 package net.sourceforge.phpeclipse.actions;
 
@@ -14,15 +14,14 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 
-import net.sourceforge.phpeclipse.IPreferenceConstants;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.overlaypages.Util;
 import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
+import net.sourceforge.phpeclipse.ui.WebUI;
+import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.text.BadLocationException;
@@ -210,8 +209,8 @@ public class PHPOpenSQLTableEditorAction extends ActionDelegate implements
     // 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,
+          WebUI.PHP_BOOKMARK_DEFAULT);
       if (bookmarkString != null && !bookmarkString.equals("")) {
         Bookmark bookmark = sqlBookMarks.find(bookmarkString);
         ArrayList sqlList = new ArrayList();
@@ -247,7 +246,7 @@ public class PHPOpenSQLTableEditorAction extends ActionDelegate implements
               if (sqlList.size() == 1) {
                 adapter = bookmark.getAdapter();
                 entity = entityFactory.create(bookmark, null, (String) sqlList
-                    .get(0), Entity.TABLE_TYPE);
+                    .get(0), Entity.TABLE_TYPE, false);
                 String query = adapter.getTableQuery(entity.getQualifiedName());
 
                 try {
@@ -279,7 +278,7 @@ public class PHPOpenSQLTableEditorAction extends ActionDelegate implements
                     for (int i = 0; i < locations.length; i++) {
                       adapter = bookmark.getAdapter();
                       entity = entityFactory.create(bookmark, null,
-                          (String) locations[i], Entity.TABLE_TYPE);
+                          (String) locations[i], Entity.TABLE_TYPE, false);
                       String query = adapter.getTableQuery(entity
                           .getQualifiedName());