summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhcao2006-03-15 19:01:26 (EST)
committerhcao2006-03-15 19:01:26 (EST)
commitfa1d3a1f1d892d5fbdb2a4d1ea913fc6865f255c (patch)
tree91be43e8fdf43445a10ffe10db72790226908ea7
parentab80b4621b8afa409eb3909be72a7252f062adb5 (diff)
downloadorg.eclipse.datatools.sqltools-fa1d3a1f1d892d5fbdb2a4d1ea913fc6865f255c.zip
org.eclipse.datatools.sqltools-fa1d3a1f1d892d5fbdb2a4d1ea913fc6865f255c.tar.gz
org.eclipse.datatools.sqltools-fa1d3a1f1d892d5fbdb2a4d1ea913fc6865f255c.tar.bz2
Fix 131616
-rw-r--r--plugins/org.eclipse.datatools.sqltools.plan/plugin.properties2
-rw-r--r--plugins/org.eclipse.datatools.sqltools.plan/plugin.xml5
-rw-r--r--plugins/org.eclipse.datatools.sqltools.result/plugin.properties6
-rw-r--r--plugins/org.eclipse.datatools.sqltools.result/plugin.xml9
-rw-r--r--plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.properties2
-rw-r--r--plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileCreationWizard.java5
-rw-r--r--plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileWizardPage.java2
7 files changed, 15 insertions, 16 deletions
diff --git a/plugins/org.eclipse.datatools.sqltools.plan/plugin.properties b/plugins/org.eclipse.datatools.sqltools.plan/plugin.properties
index 7676a20..4f4e031 100644
--- a/plugins/org.eclipse.datatools.sqltools.plan/plugin.properties
+++ b/plugins/org.eclipse.datatools.sqltools.plan/plugin.properties
@@ -1,3 +1,3 @@
PlanView.name=Execution Plan
-PlanView.preferencePage.title=Execution Plan Options
+PlanView.preferencePage.title=Execution Plan View Options
DataTools.name=Data Tools \ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.plan/plugin.xml b/plugins/org.eclipse.datatools.sqltools.plan/plugin.xml
index 3a98ddb..936a19c 100644
--- a/plugins/org.eclipse.datatools.sqltools.plan/plugin.xml
+++ b/plugins/org.eclipse.datatools.sqltools.plan/plugin.xml
@@ -10,9 +10,6 @@
icon="icons/sqlplan.gif"
id="org.eclipse.datatools.sqltools.plan.planView"
name="%PlanView.name"/>
- <category
- id="org.eclipse.datatools"
- name="%DataTools.name"/>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
@@ -20,7 +17,7 @@
class="org.eclipse.datatools.sqltools.plan.internal.preference.ExecutionPlanPage"
id="org.eclipse.datatools.sqltools.plan.executionPlanPage"
name="%PlanView.preferencePage.title"
- category="org.eclipse.datatools.connectivity.internal.ui.preferences.DataToolsMainPage"/>
+ category="org.eclipse.datatools.connectivity.sqm.core.internal.ui.preferences.data"/>
</extension>
<extension
point="org.eclipse.core.runtime.preferences">
diff --git a/plugins/org.eclipse.datatools.sqltools.result/plugin.properties b/plugins/org.eclipse.datatools.sqltools.result/plugin.properties
index e538cef..0eabc8f 100644
--- a/plugins/org.eclipse.datatools.sqltools.result/plugin.properties
+++ b/plugins/org.eclipse.datatools.sqltools.result/plugin.properties
@@ -1,8 +1,8 @@
SQLResultsView.name=SQL Results
SQLResultsView.full.name=SQL Results View
-SQLResultsView.display.options=SQL Results View Display Options
-SQLResultsView.export.options=SQL Results View Export Format
-SQLResultsView.history.page=Result History Options
+SQLResultsView.display.options=SQL Results View Options
+SQLResultsView.export.options=Export Format Options
+SQLResultsView.history.page=History Options
RemoveResultAction.command.name=Remove Result
RemoveAllResultAction.command.name=Remove All Visible Results
TerminateInstanceAction.command.name=Terminate Result
diff --git a/plugins/org.eclipse.datatools.sqltools.result/plugin.xml b/plugins/org.eclipse.datatools.sqltools.result/plugin.xml
index 3ea0e12..c376c33 100644
--- a/plugins/org.eclipse.datatools.sqltools.result/plugin.xml
+++ b/plugins/org.eclipse.datatools.sqltools.result/plugin.xml
@@ -10,9 +10,6 @@
icon="icons/sqlresult.gif"
id="org.eclipse.datatools.sqltools.result.resultView"
name="%SQLResultsView.name"/>
- <category
- id="org.eclipse.datatools"
- name="%DataTools.name"/>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
@@ -20,17 +17,17 @@
class="org.eclipse.datatools.sqltools.result.internal.preference.SQLResultsViewPage"
id="org.eclipse.datatools.sqltools.result.displayOption"
name="%SQLResultsView.display.options"
- category="org.eclipse.datatools.connectivity.internal.ui.preferences.DataToolsMainPage"/>
+ category="org.eclipse.datatools.connectivity.sqm.core.internal.ui.preferences.data"/>
<page
class="org.eclipse.datatools.sqltools.result.internal.preference.ExportFormatPreferencePage"
id="org.eclipse.datatools.sqltools.result.exportFormat"
name="%SQLResultsView.export.options"
- category="org.eclipse.datatools.connectivity.internal.ui.preferences.DataToolsMainPage"/>
+ category="org.eclipse.datatools.sqltools.result.displayOption"/>
<page
class="org.eclipse.datatools.sqltools.result.internal.preference.ResultHistoryPage"
id="org.eclipse.datatools.sqltools.result.resultHistory"
name="%SQLResultsView.history.page"
- category="org.eclipse.datatools.connectivity.internal.ui.preferences.DataToolsMainPage"/>
+ category="org.eclipse.datatools.sqltools.result.displayOption"/>
</extension>
<extension
point="org.eclipse.ui.commands">
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.properties b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.properties
index e13fb27..2790dc1 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.properties
+++ b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.properties
@@ -12,7 +12,7 @@ ExceptionDialog.seeErrorLogMessage = See error log for more details.
SQLScrapbookPlugin.internal_error = Internal error
# ------- NewSQLScrapbookFileWizardPage-------
-NewWizardCategoryName=Data
+NewWizardCategoryName=SQL Development
NewSQLScrapbookPage.label=SQL Scrapbook Page
NewSQLScrapbookPage.description=Create a SQL Scrapbook page
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileCreationWizard.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileCreationWizard.java
index 6dbf557..c399c1b 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileCreationWizard.java
+++ b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileCreationWizard.java
@@ -12,6 +12,7 @@ package org.eclipse.datatools.sqltools.internal.sqlscrapbook.wizards;
import org.eclipse.datatools.sqltools.editor.core.connection.ISQLEditorConnectionInfo;
import org.eclipse.datatools.sqltools.internal.sqlscrapbook.SqlscrapbookPlugin;
+import org.eclipse.datatools.sqltools.sqleditor.SQLEditorConnectionInfo;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.Wizard;
@@ -52,6 +53,10 @@ public class NewSQLScrapbookFileCreationWizard extends Wizard implements
* @see Wizard#performFinish
*/
public boolean performFinish() {
+ if (connectionInfo == null)
+ {
+ connectionInfo = SQLEditorConnectionInfo.DEFAULT_SQLEDITOR_CONNECTION_INFO;
+ }
return fPage.finish(connectionInfo); // tau 04.07.04
}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileWizardPage.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileWizardPage.java
index c35d0e4..04f38d3 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileWizardPage.java
+++ b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileWizardPage.java
@@ -34,7 +34,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
*/
public class NewSQLScrapbookFileWizardPage extends WizardNewFileCreationPage {
- private static final String fgDefaultExtension= ".sqlpage"; //$NON-NLS-1$
+ private static final String fgDefaultExtension= ".sql"; //$NON-NLS-1$
public NewSQLScrapbookFileWizardPage(IStructuredSelection selection) {
super("createScrapBookPage", selection); //$NON-NLS-1$