BZ 220685: Deliver SQB changes to switch ResultsView checking off and on when the dialog runs.
diff --git a/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/META-INF/MANIFEST.MF
index 3647faf..d9da7f4 100644
--- a/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SQL Query Builder Examples Plug-in
Bundle-SymbolicName: org.eclipse.datatools.sqltools.sqlbuilder.examples;singleton:=true
-Bundle-Version: 1.0.0.200802291
+Bundle-Version: 1.0.0.200803111
Bundle-Activator: org.eclipse.datatools.sqltools.sqlbuilder.examples.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
diff --git a/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/src/org/eclipse/datatools/sqltools/sqlbuilder/examples/dialogs/SQLBuilderDialog.java b/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/src/org/eclipse/datatools/sqltools/sqlbuilder/examples/dialogs/SQLBuilderDialog.java
index be01fa8..7701a8b 100644
--- a/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/src/org/eclipse/datatools/sqltools/sqlbuilder/examples/dialogs/SQLBuilderDialog.java
+++ b/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/src/org/eclipse/datatools/sqltools/sqlbuilder/examples/dialogs/SQLBuilderDialog.java
@@ -14,6 +14,7 @@
import java.io.StringWriter;
import org.eclipse.datatools.connectivity.IConnectionProfile;
+import org.eclipse.datatools.sqltools.result.ResultsViewAPI;
import org.eclipse.datatools.sqltools.result.ui.view.ResultsViewControl;
import org.eclipse.datatools.sqltools.sqlbuilder.IContentChangeListener;
import org.eclipse.datatools.sqltools.sqlbuilder.IExecuteSQLListener;
@@ -183,6 +184,8 @@
filterResultsView(_editorInput.getConnectionInfo().getConnectionProfile());
+ ResultsViewAPI.getInstance().setCheckSRV(false);
+
return topComposite;
}
@@ -392,6 +395,8 @@
* @see org.eclipse.jface.window.Window#close()
*/
public boolean close() {
+ ResultsViewAPI.getInstance().setCheckSRV(true);
+
_sqlBuilder.removeExecuteSQLListener(this);
_resultsViewControl.dispose();
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/sqlbuilderdialog/SQLBuilderDialog.java b/plugins/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/sqlbuilderdialog/SQLBuilderDialog.java
index 41aa96a..16b9820 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/sqlbuilderdialog/SQLBuilderDialog.java
+++ b/plugins/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/sqlbuilderdialog/SQLBuilderDialog.java
@@ -20,6 +20,7 @@
import org.eclipse.datatools.sqltools.core.profile.ProfileUtil;
import org.eclipse.datatools.sqltools.core.services.UIComponentService;
import org.eclipse.datatools.sqltools.editor.core.connection.ISQLEditorConnectionInfo;
+import org.eclipse.datatools.sqltools.result.ResultsViewAPI;
import org.eclipse.datatools.sqltools.result.ui.view.ResultsViewControl;
import org.eclipse.datatools.sqltools.sqlbuilder.IExecuteSQLListener;
import org.eclipse.datatools.sqltools.sqlbuilder.Messages;
@@ -208,7 +209,7 @@
filterResultsView(_connectionInfo.getConnectionProfile());
-
+ ResultsViewAPI.getInstance().setCheckSRV(false);
return topComposite;
}
@@ -313,6 +314,8 @@
* @see org.eclipse.jface.window.Window#close()
*/
public boolean close() {
+ ResultsViewAPI.getInstance().setCheckSRV(true);
+
_sqlBuilder.removeExecuteSQLListener(this);
_resultsViewControl.dispose();
return super.close();