bug 1469012, exception in CompletionProposal

[phpeclipse.git] / archive / net.sourceforge.phpeclipse.quantum.sql / src / com / quantum / view / SchemaSelectionControl.java

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SchemaSelectionControl.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SchemaSelectionControl.java
index f18c3b9..c6e21cf 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SchemaSelectionControl.java
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/SchemaSelectionControl.java
@@ -12,13 +12,14 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import com.quantum.ImageStore;
 import com.quantum.Messages;
-import com.quantum.QuantumPlugin;
 import com.quantum.model.Bookmark;
 import com.quantum.model.ConnectionException;
 import com.quantum.model.NotConnectedException;
 import com.quantum.model.Schema;
 import com.quantum.ui.dialog.ExceptionDisplayDialog;
+import com.quantum.ui.dialog.SQLExceptionDialog;
 import com.quantum.ui.dialog.SimpleSelectionDialog;
 import com.quantum.util.connection.ConnectionUtil;
 
@@ -65,7 +66,7 @@ public class SchemaSelectionControl extends Composite {
 
         public Image getColumnImage(Object element, int columnIndex) {
             if (columnIndex == 0) {
-                return QuantumPlugin.getImage("schema.gif");
+                return ImageStore.getImage(ImageStore.SCHEMA);
             } else {
                 return null;
             }
@@ -254,7 +255,7 @@ public class SchemaSelectionControl extends Composite {
                 SimpleSelectionDialog dialog = new SimpleSelectionDialog(
                                getShell(), Messages.getString(getClass(), "addSchemaDialog"), 
                                                schemaList.toArray(), 
-                                               QuantumPlugin.getImage("schema.gif"), true);
+                                               ImageStore.getImage(ImageStore.SCHEMA), true);
                 int result = dialog.open();
                 if (result == SimpleSelectionDialog.OK 
                                && !dialog.getSelection().isEmpty()) {
@@ -273,7 +274,7 @@ public class SchemaSelectionControl extends Composite {
         } catch (ConnectionException e) {
             ExceptionDisplayDialog.openError(getShell(), null, null, e);
         } catch (SQLException e) {
-            ExceptionDisplayDialog.openError(getShell(), null, null, e);
+            SQLExceptionDialog.openException(getShell(), bookmark, e);
                }
     }