Fix compile against Photon.
Photon removes WorkbenchHelp (deprecated since 2005) and it has to be
accessed through PlatformUI now.
Change-Id: I866344d701f5e0c47ca130e3ce5889ec5288f519
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/FileFormatWizardPage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/FileFormatWizardPage.java
index f5da33e..7de8ea2 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/FileFormatWizardPage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/FileFormatWizardPage.java
@@ -33,7 +33,7 @@
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class FileFormatWizardPage extends WizardPage
@@ -82,7 +82,7 @@
Composite c = new Composite(parent, SWT.NONE);
c.setLayout(new GridLayout(3, false));
if (getHelpID()!=null)
- WorkbenchHelp.setHelp(c, getHelpID());
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(c, getHelpID());
Label l = new Label(c, SWT.NONE);
if (extract)
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/NewSQLStatementDialog.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/NewSQLStatementDialog.java
index 5278d99..0c5cb31 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/NewSQLStatementDialog.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/NewSQLStatementDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -23,7 +23,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
@@ -89,7 +89,7 @@
// the state of the control.
fDialogArea.getStatementNameText().addModifyListener(this);
- WorkbenchHelp.setHelp(fDialogArea, SQLBuilderContextIds.SQLD_NEW_STMT_DIALOG);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(fDialogArea, SQLBuilderContextIds.SQLD_NEW_STMT_DIALOG);
return fDialogArea;
}
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/TableAliasAction.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/TableAliasAction.java
index e7e8039..8b000b4 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/TableAliasAction.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/TableAliasAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -12,22 +12,14 @@
import java.util.Iterator;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.datatools.modelbase.sql.tables.Table;
-
import org.eclipse.datatools.modelbase.sql.query.QueryDeleteStatement;
import org.eclipse.datatools.modelbase.sql.query.QuerySelectStatement;
import org.eclipse.datatools.modelbase.sql.query.QueryUpdateStatement;
import org.eclipse.datatools.modelbase.sql.query.SQLQueryObject;
import org.eclipse.datatools.modelbase.sql.query.TableExpression;
import org.eclipse.datatools.modelbase.sql.query.helper.TableHelper;
+import org.eclipse.datatools.modelbase.sql.schema.Database;
+import org.eclipse.datatools.modelbase.sql.tables.Table;
import org.eclipse.datatools.sqltools.sqlbuilder.Messages;
import org.eclipse.datatools.sqltools.sqlbuilder.SQLBuilderContextIds;
import org.eclipse.datatools.sqltools.sqlbuilder.model.DatabaseHelper;
@@ -35,6 +27,13 @@
import org.eclipse.datatools.sqltools.sqlbuilder.model.SQLDomainModel;
import org.eclipse.datatools.sqltools.sqlbuilder.model.SelectHelper;
import org.eclipse.datatools.sqltools.sqlbuilder.model.UpdateHelper;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
public class TableAliasAction extends Action {
@@ -65,7 +64,7 @@
AliasValidator aliasValidator = new AliasValidator(tableAliasName);
Shell aliasShell = Display.getCurrent().getActiveShell();
- WorkbenchHelp.setHelp(aliasShell, SQLBuilderContextIds.SQLG_UPDATE_ALIAS_TEXT);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(aliasShell, SQLBuilderContextIds.SQLG_UPDATE_ALIAS_TEXT);
UpdateTableAliasDialog updateAliasDialog = new UpdateTableAliasDialog(aliasShell, Messages._UI_DIALOG_CHANGE_ALIAS_TITLE,
Messages._UI_DIALOG_CHANGE_ALIAS_TEXT, tableAliasName, aliasValidator);
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/AddTableDialog.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/AddTableDialog.java
index dbc26a0..d845336 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/AddTableDialog.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/AddTableDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -54,7 +54,7 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
@@ -300,7 +300,7 @@
*/
public Control createDialogArea(Composite parent) {
Composite panel = ViewUtility.createComposite(parent, 1, true, true);
- WorkbenchHelp.setHelp(panel, SQLBuilderContextIds.SQLB_ADD_TABLE_DIALOG);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(panel, SQLBuilderContextIds.SQLB_ADD_TABLE_DIALOG);
createInputPanel(panel);
return panel;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/ChangeSetOperatorDialog.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/ChangeSetOperatorDialog.java
index bf30222..84b92bc 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/ChangeSetOperatorDialog.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/ChangeSetOperatorDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2009 Sybase, Inc. and others.
+ * Copyright � 2000, 2018 Sybase, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -25,7 +25,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
* Dialog that lets the user select a new SQL Set Operator.
@@ -104,7 +104,7 @@
GridData gd = null;
Composite composite = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(composite, SQLBuilderContextIds.SQLB_ADD_TABLE_DIALOG); // TODO
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, SQLBuilderContextIds.SQLB_ADD_TABLE_DIALOG); // TODO
GridLayout compositeLayout = new GridLayout(1, true);
composite.setLayout(compositeLayout);
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/ChangeStatementTypeDialog.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/ChangeStatementTypeDialog.java
index 837c9ed..88182af 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/ChangeStatementTypeDialog.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/ChangeStatementTypeDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 Sybase, Inc. and others.
+ * Copyright � 2000, 2018 Sybase, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -25,7 +25,7 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
* Dialog that lets the user select a new SQL statement type.
@@ -99,7 +99,7 @@
GridData gd = null;
Composite composite = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(composite, SQLBuilderContextIds.SQLB_ADD_TABLE_DIALOG); // TODO
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, SQLBuilderContextIds.SQLB_ADD_TABLE_DIALOG); // TODO
GridLayout compositeLayout = new GridLayout(1, true);
composite.setLayout(compositeLayout);
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/DefineTypeComposite.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/DefineTypeComposite.java
index 5162c2a..84a2da6 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/DefineTypeComposite.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/DefineTypeComposite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -25,7 +25,7 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class DefineTypeComposite {
@@ -39,7 +39,7 @@
public DefineTypeComposite(Composite parent, SQLDomainModel domainModel, int joinKind) {
typeControls = new Composite(parent, SWT.NULL);
- WorkbenchHelp.setHelp(typeControls, SQLBuilderContextIds.SQLG_DEFINE_JOINTYPE_DIALOG);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(typeControls, SQLBuilderContextIds.SQLG_DEFINE_JOINTYPE_DIALOG);
GridLayout layout = new GridLayout();
layout.numColumns = 1;
@@ -70,10 +70,10 @@
fullOuterJoinRadio = ViewUtility.createRadioButton(buttonGroup,
Messages._UI_RADIO_FULL_OUTER_JOIN);
- WorkbenchHelp.setHelp(innerJoinRadio, SQLBuilderContextIds.SQLG_DEFINE_JOINTYPE_DIALOG);
- WorkbenchHelp.setHelp(leftOuterJoinRadio, SQLBuilderContextIds.SQLG_DEFINE_JOINTYPE_DIALOG);
- WorkbenchHelp.setHelp(rightOuterJoinRadio, SQLBuilderContextIds.SQLG_DEFINE_JOINTYPE_DIALOG);
- WorkbenchHelp.setHelp(fullOuterJoinRadio, SQLBuilderContextIds.SQLG_DEFINE_JOINTYPE_DIALOG);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(innerJoinRadio, SQLBuilderContextIds.SQLG_DEFINE_JOINTYPE_DIALOG);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(leftOuterJoinRadio, SQLBuilderContextIds.SQLG_DEFINE_JOINTYPE_DIALOG);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(rightOuterJoinRadio, SQLBuilderContextIds.SQLG_DEFINE_JOINTYPE_DIALOG);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(fullOuterJoinRadio, SQLBuilderContextIds.SQLG_DEFINE_JOINTYPE_DIALOG);
if (domainModel.getVendor().isDB2() || domainModel.getVendor().isMSSQLServer() ||
domainModel.getVendor().isInstantDB()) {
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/OmitCurrentSchemaDialog.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/OmitCurrentSchemaDialog.java
index 9336ed4..00729fe 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/OmitCurrentSchemaDialog.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/OmitCurrentSchemaDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 Sybase, Inc. and others.
+ * Copyright � 2000, 2018 Sybase, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -28,7 +28,7 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
* Dialog that shows the settings for Omitting or Including the current
@@ -89,7 +89,7 @@
GridData gd = null;
Composite composite = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(composite, SQLBuilderContextIds.SQLB_ADD_TABLE_DIALOG); // TODO
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, SQLBuilderContextIds.SQLB_ADD_TABLE_DIALOG); // TODO
GridLayout compositeLayout = new GridLayout(1, true);
composite.setLayout(compositeLayout);
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/SourceTargetDialog.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/SourceTargetDialog.java
index 229e6be..ad5b3ee 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/SourceTargetDialog.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/dialogs/SourceTargetDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -40,7 +40,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
@@ -222,7 +222,7 @@
public Control createDialogArea(Composite parent) {
Composite client = (Composite) super.createDialogArea(parent);
- WorkbenchHelp.setHelp(client, SQLBuilderContextIds.SQLG_CREATE_JOIN_DIALOG);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(client, SQLBuilderContextIds.SQLG_CREATE_JOIN_DIALOG);
GridLayout layout = (GridLayout) client.getLayout();
layout.numColumns = 1;
layout.makeColumnsEqualWidth = true;
@@ -237,13 +237,13 @@
ViewUtility.createLabel(grp1,
Messages._UI_LABEL_TARGET_TABLE);
srcTableField = ViewUtility.createComboBox(grp1);
- WorkbenchHelp.setHelp(srcTableField,
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(srcTableField,
SQLBuilderContextIds.SQLG_CREATE_JOIN_DIALOG);
ViewUtility.createLabel(grp1,
Messages._UI_LABEL_COLUMN);
srcColumnField = ViewUtility.createComboBox(grp1);
- WorkbenchHelp.setHelp(srcColumnField,
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(srcColumnField,
SQLBuilderContextIds.SQLG_CREATE_JOIN_DIALOG);
ViewUtility.createLabel(grp1,
@@ -254,11 +254,11 @@
Messages._UI_GROUP_TARGET, false);
ViewUtility.createLabel(grp2, Messages._UI_LABEL_TABLE);
tgtTableField = ViewUtility.createComboBox(grp2);
- WorkbenchHelp.setHelp(tgtTableField, SQLBuilderContextIds.SQLG_CREATE_JOIN_DIALOG);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(tgtTableField, SQLBuilderContextIds.SQLG_CREATE_JOIN_DIALOG);
ViewUtility.createLabel(grp2, Messages._UI_LABEL_TARGET_COLUMN);
tgtColumnField = ViewUtility.createComboBox(grp2);
- WorkbenchHelp.setHelp(tgtColumnField, SQLBuilderContextIds.SQLG_CREATE_JOIN_DIALOG);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(tgtColumnField, SQLBuilderContextIds.SQLG_CREATE_JOIN_DIALOG);
ViewUtility.createLabel(grp2, Messages._UI_LABEL_JOIN_TGTCOL_TYPE);
targetType = ViewUtility.createLabel(grp2, "");
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/MainExpressionPage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/MainExpressionPage.java
index 499b998..f36b0a0 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/MainExpressionPage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/MainExpressionPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -23,7 +23,7 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class MainExpressionPage extends WizardPage implements SelectionListener {
@@ -62,7 +62,7 @@
public void createControl(Composite parent) {
Composite mainPanel = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(mainPanel, SQLBuilderContextIds.SQLE_SELECT_TYPE_PAGE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainPanel, SQLBuilderContextIds.SQLE_SELECT_TYPE_PAGE);
GridLayout mainPanelLayout = new GridLayout();
mainPanel.setLayout(mainPanelLayout);
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseOptionsPage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseOptionsPage.java
index 9254b6c..27c665e 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseOptionsPage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseOptionsPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -28,7 +28,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class CaseOptionsPage extends WizardPage implements SelectionListener {
@@ -56,7 +56,7 @@
public void createControl(Composite parent) {
mainPanel = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(mainPanel, SQLBuilderContextIds.SQLE_CASE_OPTIONS_PAGE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainPanel, SQLBuilderContextIds.SQLE_CASE_OPTIONS_PAGE);
GridLayout mainPanelLayout = new GridLayout();
mainPanel.setLayout(mainPanelLayout);
mainPanel.setLayoutData(ViewUtility.createFill());
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSearchPage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSearchPage.java
index adb9b41..5204d55 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSearchPage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSearchPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -38,7 +38,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class CaseSearchPage extends WizardPage implements SelectionListener {
@@ -74,7 +74,7 @@
public void createControl(Composite parent) {
Composite mainPanel = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(mainPanel, SQLBuilderContextIds.SQLE_SEARCH_TYPE_PAGE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainPanel, SQLBuilderContextIds.SQLE_SEARCH_TYPE_PAGE);
GridLayout mainPanelLayout = new GridLayout();
mainPanel.setLayout(mainPanelLayout);
mainPanel.setLayoutData(ViewUtility.createFill());
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSimplePage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSimplePage.java
index bb6a5aa..9711e20 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSimplePage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSimplePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007, 2018 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -60,7 +60,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class CaseSimplePage extends WizardPage implements SelectionListener {
@@ -107,7 +107,7 @@
public void createControl(Composite parent) {
Composite mainPanel = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(mainPanel, SQLBuilderContextIds.SQLE_SIMPLE_TYPE_PAGE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainPanel, SQLBuilderContextIds.SQLE_SIMPLE_TYPE_PAGE);
GridLayout mainPanelLayout = new GridLayout();
mainPanel.setLayout(mainPanelLayout);
mainPanel.setLayoutData(ViewUtility.createFill());
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/cast/CastBuilderPage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/cast/CastBuilderPage.java
index 562b9ac..b9087a1 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/cast/CastBuilderPage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/cast/CastBuilderPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -43,7 +43,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class CastBuilderPage extends WizardPage implements SelectionListener, KeyListener {
@@ -86,7 +86,7 @@
public void createControl(Composite parent) {
mainPanel = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(mainPanel, SQLBuilderContextIds.SQLE_CAST_BUILDER_PAGE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainPanel, SQLBuilderContextIds.SQLE_CAST_BUILDER_PAGE);
GridLayout mainPanelLayout = new GridLayout();
mainPanel.setLayout(mainPanelLayout);
mainPanel.setLayoutData(ViewUtility.createFill());
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/constant/ConstantOptionsPage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/constant/ConstantOptionsPage.java
index 2df8114..06aa6eb 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/constant/ConstantOptionsPage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/constant/ConstantOptionsPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -25,7 +25,7 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class ConstantOptionsPage extends WizardPage implements SelectionListener {
@@ -53,7 +53,7 @@
public void createControl(Composite parent) {
mainPanel = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(mainPanel, SQLBuilderContextIds.SQLE_CONSTANT_OPTIONS_PAGE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainPanel, SQLBuilderContextIds.SQLE_CONSTANT_OPTIONS_PAGE);
GridLayout mainPanelLayout = new GridLayout();
mainPanel.setLayout(mainPanelLayout);
mainPanel.setLayoutData(ViewUtility.createFill());
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/constant/StringConstantBuilderPage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/constant/StringConstantBuilderPage.java
index 9a6ba35..499f904 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/constant/StringConstantBuilderPage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/constant/StringConstantBuilderPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -32,7 +32,7 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class StringConstantBuilderPage extends WizardPage implements SelectionListener, KeyListener {
@@ -79,7 +79,7 @@
public void createControl(Composite parent) {
Composite mainPanel = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(mainPanel, SQLBuilderContextIds.SQLE_STRING_CONSTANT_PAGE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainPanel, SQLBuilderContextIds.SQLE_STRING_CONSTANT_PAGE);
GridLayout mainPanelLayout = new GridLayout();
mainPanel.setLayout(mainPanelLayout);
mainPanel.setLayoutData(ViewUtility.createFill());
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/function/FunctionBuilderPage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/function/FunctionBuilderPage.java
index a36b2a0..e60c203 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/function/FunctionBuilderPage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/function/FunctionBuilderPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -47,7 +47,7 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class FunctionBuilderPage extends WizardPage implements SelectionListener {
@@ -100,7 +100,7 @@
public void createControl(Composite parent) {
Composite mainPanel = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(mainPanel, SQLBuilderContextIds.SQLE_FUNCTION_BUILDER_PAGE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainPanel, SQLBuilderContextIds.SQLE_FUNCTION_BUILDER_PAGE);
GridLayout mainPanelLayout = new GridLayout();
mainPanel.setLayout(mainPanelLayout);
mainPanel.setLayoutData(ViewUtility.createFill());
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/multiexpr/ExpressionsByOperatorsPage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/multiexpr/ExpressionsByOperatorsPage.java
index 7a79405..22b4d5c 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/multiexpr/ExpressionsByOperatorsPage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/multiexpr/ExpressionsByOperatorsPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -27,7 +27,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class ExpressionsByOperatorsPage extends WizardPage implements SelectionListener {
@@ -62,7 +62,7 @@
public void createControl(Composite parent) {
Composite mainPanel = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(mainPanel, SQLBuilderContextIds.SQLE_EXPRESSIONS_BY_OPERATOR_PAGE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainPanel, SQLBuilderContextIds.SQLE_EXPRESSIONS_BY_OPERATOR_PAGE);
GridLayout mainPanelLayout = new GridLayout();
mainPanel.setLayout(mainPanelLayout);
mainPanel.setLayoutData(ViewUtility.createFill());
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/subquery/SubQueryPage.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/subquery/SubQueryPage.java
index 18c5e66..29411c9 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/subquery/SubQueryPage.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/subquery/SubQueryPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -47,7 +47,7 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.PageBook;
@@ -80,7 +80,7 @@
public void createControl(Composite parent) {
mainPanel = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(mainPanel, SQLBuilderContextIds.SQLE_SUBQUERY_PAGE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainPanel, SQLBuilderContextIds.SQLE_SUBQUERY_PAGE);
GridLayout mainPanelLayout = new GridLayout();
mainPanel.setLayout(mainPanelLayout);
mainPanel.setLayoutData(ViewUtility.createFill());
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/DesignViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/DesignViewer.java
index 3ad015e..1148bb6 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/DesignViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/DesignViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -12,11 +12,6 @@
import java.util.List;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.part.PageBook;
import org.eclipse.datatools.modelbase.sql.query.QueryCombined;
import org.eclipse.datatools.modelbase.sql.query.QueryDeleteStatement;
import org.eclipse.datatools.modelbase.sql.query.QueryExpressionBody;
@@ -39,6 +34,11 @@
import org.eclipse.datatools.sqltools.sqlbuilder.views.update.UpdateViewer;
import org.eclipse.datatools.sqltools.sqlbuilder.views.with.WithStatementViewer;
import org.eclipse.datatools.sqltools.sqlbuilder.views.with.WithTableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.PageBook;
/**
* Design Pane
@@ -122,17 +122,17 @@
if (input instanceof QueryInsertStatement) {
showPage(insertViewer.getControl());
insertViewer.setInput(input);
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_INSERT_VIEW);
}
else if (input instanceof QueryUpdateStatement) {
showPage(updateViewer.getControl());
updateViewer.setInput(input);
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_UPDATE_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_UPDATE_VIEW);
}
else if (input instanceof QueryDeleteStatement) {
showPage(deleteViewer.getControl());
deleteViewer.setInput(input);
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_DELETE_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_DELETE_VIEW);
}
else if (input instanceof QuerySelectStatement) {
QueryExpressionBody queryBody = SelectHelper.getQueryExpressionBody((QuerySelectStatement) input);
@@ -144,54 +144,54 @@
List withClause = sqlSelectStatement.getQueryExpr().getWithClause();
if(withClause.isEmpty())
{
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_SELECT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_SELECT_VIEW);
}
else
{
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_WITH_STATEMENT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_WITH_STATEMENT_VIEW);
}
}
else if (queryBody instanceof QueryCombined) {
showPage(fullSelect);
fullSelectViewer.setInput(queryBody);
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_FULL_SELECT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_FULL_SELECT_VIEW);
}
else if (queryBody instanceof QueryValues) {
showPage(valuesRowPage);
valuesRowViewer.setInput(queryBody);
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_VALUES_CLAUSE_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_VALUES_CLAUSE_VIEW);
}
else {
selectViewer.setInput(input);
showPage(selectViewer.getControl());
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_SELECT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_SELECT_VIEW);
}
}
else if (input instanceof WithTableSpecification) {
showPage(withTable);
withTableViewer.setInput(input);
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_WITH_TABLE_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_WITH_TABLE_VIEW);
}
else if (input instanceof QuerySelect) {
selectViewer.setInput(input);
showPage(selectViewer.getControl());
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_SELECT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_SELECT_VIEW);
}
else if (input instanceof QueryCombined) {
showPage(fullSelect);
fullSelectViewer.setInput(input);
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_FULL_SELECT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_FULL_SELECT_VIEW);
}
else if (input instanceof QueryValues) {
showPage(valuesClause);
valuesViewer.setInput(input);
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_VALUES_CLAUSE_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_VALUES_CLAUSE_VIEW);
}
else if (input instanceof ValuesRow) {
showPage(valuesRowPage);
valuesRowViewer.setInput(input);
- WorkbenchHelp.setHelp(getParent(), SQLBuilderContextIds.SQLB_VALUES_ROW_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getParent(), SQLBuilderContextIds.SQLB_VALUES_ROW_VIEW);
}
}
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/criteria/CriteriaGridViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/criteria/CriteriaGridViewer.java
index 8510330..f2c762c 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/criteria/CriteriaGridViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/criteria/CriteriaGridViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -44,7 +44,7 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class CriteriaGridViewer extends NavigableTableViewer implements IMenuListener {
@@ -87,7 +87,7 @@
table.setHeaderVisible(true);
table.setLinesVisible(true);
- WorkbenchHelp.setHelp(table, SQLBuilderContextIds.SQSS_SHARED_SEL_UP_DEL_GRID);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(table, SQLBuilderContextIds.SQSS_SHARED_SEL_UP_DEL_GRID);
columnEditor = new DynamicComboBoxCellEditor(table, null, this);
ITextProvider columnTextProvider = new ITextProvider() {
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/fullselect/FullSelectGridViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/fullselect/FullSelectGridViewer.java
index 1440295..82080bd 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/fullselect/FullSelectGridViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/fullselect/FullSelectGridViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2009 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -48,7 +48,7 @@
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class FullSelectGridViewer extends NavigableTableViewer implements IMenuListener {
@@ -74,7 +74,7 @@
table.setLinesVisible(true);
table.setHeaderVisible(true);
table.setLayoutData(ViewUtility.createFill());
- WorkbenchHelp.setHelp(table, SQLBuilderContextIds.SQDF_STMT_OPER_GRID);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(table, SQLBuilderContextIds.SQDF_STMT_OPER_GRID);
TableLayout layout = new TableLayout();
layout.addColumnData(new ColumnWeightData(50, true)); // statement
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/fullselect/FullSelectOrderViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/fullselect/FullSelectOrderViewer.java
index 2a1f26d..b462732 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/fullselect/FullSelectOrderViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/fullselect/FullSelectOrderViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -57,7 +57,7 @@
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class FullSelectOrderViewer extends NavigableTableViewer implements IMenuListener {
@@ -81,7 +81,7 @@
table.setLinesVisible(true);
table.setHeaderVisible(true);
table.setLayoutData(ViewUtility.createFill());
- WorkbenchHelp.setHelp(table, SQLBuilderContextIds.SQDF_COL_SORTT_SORTO_GRID);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(table, SQLBuilderContextIds.SQDF_COL_SORTT_SORTO_GRID);
TableLayout layout = new TableLayout();
layout.addColumnData(new ColumnWeightData(50, true)); // statement
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertGridViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertGridViewer.java
index d97660f..be15efb 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertGridViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertGridViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -10,6 +10,17 @@
*******************************************************************************/
package org.eclipse.datatools.sqltools.sqlbuilder.views.insert;
+import org.eclipse.datatools.modelbase.sql.datatypes.CharacterStringDataType;
+import org.eclipse.datatools.modelbase.sql.datatypes.XMLDataType;
+import org.eclipse.datatools.modelbase.sql.query.ValueExpressionColumn;
+import org.eclipse.datatools.sqltools.sqlbuilder.Messages;
+import org.eclipse.datatools.sqltools.sqlbuilder.SQLBuilderContextIds;
+import org.eclipse.datatools.sqltools.sqlbuilder.model.SQLBuilderConstants;
+import org.eclipse.datatools.sqltools.sqlbuilder.model.SQLDomainModel;
+import org.eclipse.datatools.sqltools.sqlbuilder.util.LabelValuePair;
+import org.eclipse.datatools.sqltools.sqlbuilder.views.DynamicComboBoxCellEditor;
+import org.eclipse.datatools.sqltools.sqlbuilder.views.GridViewer;
+import org.eclipse.datatools.sqltools.sqlbuilder.views.Modifier;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnPixelData;
@@ -20,19 +31,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.datatools.modelbase.sql.datatypes.CharacterStringDataType;
-import org.eclipse.datatools.modelbase.sql.datatypes.XMLDataType;
-
-import org.eclipse.datatools.modelbase.sql.query.ValueExpressionColumn;
-import org.eclipse.datatools.sqltools.sqlbuilder.Messages;
-import org.eclipse.datatools.sqltools.sqlbuilder.SQLBuilderContextIds;
-import org.eclipse.datatools.sqltools.sqlbuilder.model.SQLBuilderConstants;
-import org.eclipse.datatools.sqltools.sqlbuilder.model.SQLDomainModel;
-import org.eclipse.datatools.sqltools.sqlbuilder.util.LabelValuePair;
-import org.eclipse.datatools.sqltools.sqlbuilder.views.DynamicComboBoxCellEditor;
-import org.eclipse.datatools.sqltools.sqlbuilder.views.GridViewer;
-import org.eclipse.datatools.sqltools.sqlbuilder.views.Modifier;
+import org.eclipse.ui.PlatformUI;
public class InsertGridViewer extends GridViewer {
@@ -45,7 +44,7 @@
this.domainModel = domainModel;
- WorkbenchHelp.setHelp(table, SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(table, SQLBuilderContextIds.SQLB_INSERT_VIEW);
c2 = new TableColumn(table, SWT.NULL);
c2.setText(Messages._UI_COLUMN_INSERT_VALUE);
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertSelectViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertSelectViewer.java
index 2b3f3dc..2cbb494 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertSelectViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertSelectViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -53,7 +53,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
@@ -92,7 +92,7 @@
// ratio 0.45
listPanel.setData("layout ratio", new Long((((long) 45 << 16) + 99) / 100)); //$NON-NLS-1$
columnList = new org.eclipse.swt.widgets.List(listPanel, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER);
- WorkbenchHelp.setHelp(columnList, SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(columnList, SQLBuilderContextIds.SQLB_INSERT_VIEW);
GridData gridData = ViewUtility.createFill();
gridData.horizontalSpan = 2;
gridData.widthHint = 10;
@@ -108,27 +108,27 @@
addButton = ViewUtility.createPushButton(buttonPanel, ">"); //$NON-NLS-1$
SelectListener addButtonListener = new SelectListener();
addButton.addSelectionListener(addButtonListener);
- WorkbenchHelp.setHelp(addButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(addButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
removeButton = ViewUtility.createPushButton(buttonPanel, "<"); //$NON-NLS-1$
SelectListener removeButtonListener = new SelectListener();
removeButton.addSelectionListener(removeButtonListener);
- WorkbenchHelp.setHelp(removeButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(removeButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
addAllButton = ViewUtility.createPushButton(buttonPanel, ">>"); //$NON-NLS-1$
SelectListener addAllButtonListener = new SelectListener();
addAllButton.addSelectionListener(addAllButtonListener);
- WorkbenchHelp.setHelp(addAllButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(addAllButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
removeAllButton = ViewUtility.createPushButton(buttonPanel, "<<"); //$NON-NLS-1$
SelectListener removeAllButtonListener = new SelectListener();
removeAllButton.addSelectionListener(removeAllButtonListener);
- WorkbenchHelp.setHelp(removeAllButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(removeAllButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
Composite colGroup = ViewUtility.createComposite(canvas, 2, true);
// ratio 0.45
colGroup.setData("layout ratio", new Long((((long) 45 << 16) + 99) / 100)); //$NON-NLS-1$
- WorkbenchHelp.setHelp(colGroup, SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(colGroup, SQLBuilderContextIds.SQLB_INSERT_VIEW);
columnGrid = new ColumnListGridViewer(domainModel, colGroup);
gridData = ViewUtility.createFill();
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertTypeViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertTypeViewer.java
index 8ac9974..0f8c7e9 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertTypeViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/insert/InsertTypeViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -42,7 +42,7 @@
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.PageBook;
@@ -90,12 +90,12 @@
valuesButton = ViewUtility.createRadioButton(buttonGroup, Messages._UI_RADIO_VALUES);
SelectListener valuesButtonSelectListener = new SelectListener();
valuesButton.addSelectionListener(valuesButtonSelectListener);
- WorkbenchHelp.setHelp(valuesButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(valuesButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
queryButton = ViewUtility.createRadioButton(buttonGroup, Messages._UI_RADIO_INSERT_FROM_SUBQUERY);
SelectListener queryButtonSelectListener = new SelectListener();
queryButton.addSelectionListener(queryButtonSelectListener);
- WorkbenchHelp.setHelp(queryButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(queryButton, SQLBuilderContextIds.SQLB_INSERT_VIEW);
valuesButton.setSelection(true);
queryButton.setSelection(false);
@@ -103,7 +103,7 @@
ViewUtility.createLabel(buttonGroup, Messages._UI_LABEL_QUERY_NAME);
insertQueryCombo = ViewUtility.createComboBox(buttonGroup);
insertQueryCombo.setText(""); //$NON-NLS-1$
- WorkbenchHelp.setHelp(insertQueryCombo, SQLBuilderContextIds.SQLB_INSERT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(insertQueryCombo, SQLBuilderContextIds.SQLB_INSERT_VIEW);
SelectListener queryComboListener = new SelectListener();
insertQueryCombo.addSelectionListener(queryComboListener);
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/GroupByContentViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/GroupByContentViewer.java
index 84dea87..88649b9 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/GroupByContentViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/GroupByContentViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -75,7 +75,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class GroupByContentViewer extends ContentViewer {
@@ -306,7 +306,7 @@
canvas = sashForm;
groupByContentList = ViewUtility.createListBox(canvas, 10, false);
- WorkbenchHelp.setHelp(groupByContentList, SQLBuilderContextIds.SQDS_SELECT_GROUPS_WHITE_FIELD);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(groupByContentList, SQLBuilderContextIds.SQDS_SELECT_GROUPS_WHITE_FIELD);
// ratio 0.3
groupByContentList.setData("layout ratio", new Long((((long) 30 << 16) + 99) / 100)); //$NON-NLS-1$
@@ -329,7 +329,7 @@
});
Composite typeGroup = ViewUtility.createComposite(canvas, 2, true);
- WorkbenchHelp.setHelp(typeGroup, SQLBuilderContextIds.SQDS_SELECT_GROUPS_WHITE_FIELD);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(typeGroup, SQLBuilderContextIds.SQDS_SELECT_GROUPS_WHITE_FIELD);
// ratio 0.7
typeGroup.setData("layout ratio", new Long((((long) 70 << 16) + 99) / 100)); //$NON-NLS-1$
@@ -337,7 +337,7 @@
label.setText(Messages._UI_LABEL_GROUPS_TYPE);
typeCombo = new Combo(typeGroup, SWT.READ_ONLY);
- WorkbenchHelp.setHelp(typeCombo, SQLBuilderContextIds.SQDS_SELECT_GROUPS_WHITE_FIELD);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(typeCombo, SQLBuilderContextIds.SQDS_SELECT_GROUPS_WHITE_FIELD);
typeCombo.add(P_NONE);
typeCombo.add(P_ROLLUP);
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectGridViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectGridViewer.java
index 34a2d4a..0f73110 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectGridViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectGridViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -51,7 +51,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
* Grid viewer for select statement
@@ -71,7 +71,7 @@
public SelectGridViewer(SQLDomainModel domainModel, Composite parent) {
super(domainModel, parent);
- WorkbenchHelp.setHelp(table, SQLBuilderContextIds.SQDS_COLUMNS_TAB_GRID);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(table, SQLBuilderContextIds.SQDS_COLUMNS_TAB_GRID);
c2 = new TableColumn(table, SWT.NULL);
c2.setText(Messages._UI_COLUMN_SELECT_ALIAS);
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectStatementDistinctViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectStatementDistinctViewer.java
index 90c44c0..838e62c 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectStatementDistinctViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectStatementDistinctViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -27,7 +27,7 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
@@ -97,7 +97,7 @@
checkBox = ViewUtility.createCheckBox(mainUIComponent, "DISTINCT"); //$NON-NLS-1$
checkBox.addSelectionListener(this);
- WorkbenchHelp.setHelp(checkBox, SQLBuilderContextIds.SQLB_SELECT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(checkBox, SQLBuilderContextIds.SQLB_SELECT_VIEW);
hookControl(getControl());
return getControl();
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectViewer.java
index 88e8354..64f9176 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/select/SelectViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -23,7 +23,7 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
public class SelectViewer extends ContentViewer {
@@ -58,7 +58,7 @@
selectStatementDistinctViewer = new SelectStatementDistinctViewer(sqlDomainModel);
selectStatementDistinctViewer.createControl(canvas);
- WorkbenchHelp.setHelp(canvas, SQLBuilderContextIds.SQLB_SELECT_VIEW);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(canvas, SQLBuilderContextIds.SQLB_SELECT_VIEW);
Workbook workbook = new Workbook(canvas);
selectGridViewer = new SelectGridViewer(sqlDomainModel, workbook.getClientComposite());
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/update/UpdateDesignViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/update/UpdateDesignViewer.java
index 0784f46..0d34fd9 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/update/UpdateDesignViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/update/UpdateDesignViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -52,7 +52,7 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
@@ -106,7 +106,7 @@
setContentList = new org.eclipse.swt.widgets.List(canvas, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
// ratio 0.35
- WorkbenchHelp.setHelp(setContentList, SQLBuilderContextIds.SQDU_SET_TAB);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(setContentList, SQLBuilderContextIds.SQDU_SET_TAB);
setContentHelper = new ObjectListHelper(setContentList);
SetContentListener setContentListener = new SetContentListener();
@@ -118,19 +118,19 @@
ButtonSelectListener addButtonListener = new ButtonSelectListener();
addButton.addSelectionListener(addButtonListener);
addButton.setToolTipText(Messages._UI_TOOLTIP_UPDATE_ADD_COL);
- WorkbenchHelp.setHelp(addButton, SQLBuilderContextIds.SQDU_SET_TAB);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(addButton, SQLBuilderContextIds.SQDU_SET_TAB);
removeButton = ViewUtility.createPushButton(buttonPanel, "<");
ButtonSelectListener removeButtonListener = new ButtonSelectListener();
removeButton.addSelectionListener(removeButtonListener);
- WorkbenchHelp.setHelp(removeButton, SQLBuilderContextIds.SQDU_SET_TAB);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(removeButton, SQLBuilderContextIds.SQDU_SET_TAB);
groupButton = ViewUtility.createPushButton(buttonPanel, ">");
groupButton.setImage(SQLBuilderPlugin.getPlugin().getImage(SQLResource.SQL_COLUMN_GROUP));
groupButton.setToolTipText(Messages._UI_TOOLTIP_UPDATE_ADD_GRP);
ButtonSelectListener groupButtonListener = new ButtonSelectListener();
groupButton.addSelectionListener(groupButtonListener);
- WorkbenchHelp.setHelp(groupButton, SQLBuilderContextIds.SQDU_SET_TAB);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(groupButton, SQLBuilderContextIds.SQDU_SET_TAB);
updateTreeViewer = new UpdateTreeViewer(domainModel, canvas);
// ratio 0.55
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/update/UpdateTreeViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/update/UpdateTreeViewer.java
index 6877af6..cd1d5d0 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/update/UpdateTreeViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/update/UpdateTreeViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -63,7 +63,7 @@
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
@@ -94,7 +94,7 @@
table = getTableTree().getTable();
final Table tbl = getTableTree().getTable();
- WorkbenchHelp.setHelp(tbl, SQLBuilderContextIds.SQDU_SET_TAB);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(tbl, SQLBuilderContextIds.SQDU_SET_TAB);
navigator = new TableNavigator(tbl, this);
for (int i = 0; i < 2; i++) {
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/with/WithStatementViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/with/WithStatementViewer.java
index 162773a..59427d5 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/with/WithStatementViewer.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/with/WithStatementViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright � 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which is available at
@@ -23,7 +23,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
/**
@@ -45,7 +45,7 @@
ViewUtility.createLabel(client, Messages._UI_LABEL_WITH_STATEMENT);
nameField = new Text(client, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
- WorkbenchHelp.setHelp(nameField, SQLBuilderContextIds.SQDW_STMT_NAME_FIELD);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(nameField, SQLBuilderContextIds.SQDW_STMT_NAME_FIELD);
GridData data = new GridData();
data.horizontalAlignment = GridData.FILL;
data.grabExcessHorizontalSpace = true;