[116538] missing some infopop hooks
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/IHelpContextIds.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/IHelpContextIds.java
index 522aa51..ddbf091 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/IHelpContextIds.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/IHelpContextIds.java
@@ -20,39 +20,32 @@
*
*/
public interface IHelpContextIds {
-
- // not in use yet, so keep commented out
- // // Import button in Customize dialog
- // public static final String CUSTOMIZE_IMPORT_BUTTON = PREFIX +
- // "snip0010"; //$NON-NLS-1$
- // // Export button in Customize dialog
- // public static final String CUSTOMIZE_EXPORT_BUTTON = PREFIX +
- // "snip0020"; //$NON-NLS-1$
-
// org.eclipse.wst.common.snippets.
public static final String PREFIX = SnippetsPlugin.BUNDLE_ID + "."; //$NON-NLS-1$
- // Content type selection dialog
- public static final String DIALOG_CONTENT_TYPE_SELECTION = PREFIX + "snip0030"; //$NON-NLS-1$
-
// New/Edit Category (dialog)
public static final String DIALOG_EDIT_CATEGORY = PREFIX + "libv1300"; //$NON-NLS-1$
// New/Edit Item (dialog)
public static final String DIALOG_EDIT_VARITEM = PREFIX + "libv1200"; //$NON-NLS-1$
- // Selection Needed [for Filter Shown Categories] (dialog) (no longer
- // needed??)
- public static final String DIALOG_FILTER_CATEGORY = PREFIX + "libv1400"; //$NON-NLS-1$
-
// Insert Template (dialog)
public static final String DIALOG_INSERT_VARITEM = PREFIX + "libv1100"; //$NON-NLS-1$
// Snippets view (general)
public static final String MAIN_VIEW_GENERAL = PREFIX + "libv1000"; //$NON-NLS-1$
- // Add to snippets menu item
- public static final String MENU_ADD_TO_SNIPPETS = PREFIX + "snip0040"; //$NON-NLS-1$
+ // Import button in Customize dialog
+ public static final String CUSTOMIZE_IMPORT_BUTTON = PREFIX + "snip0010"; //$NON-NLS-1$
+
+ // Export button in Customize dialog
+ public static final String CUSTOMIZE_EXPORT_BUTTON = PREFIX + "snip0020"; //$NON-NLS-1$
+
+ // Content type selection dialog
+ public static final String DIALOG_CONTENT_TYPE_SELECTION = PREFIX + "snip0030"; //$NON-NLS-1$
+
+// // Add to snippets menu item
+// public static final String MENU_ADD_TO_SNIPPETS = PREFIX + "snip0040"; //$NON-NLS-1$
// Copy snippet menu item
public static final String MENU_COPY_SNIPPET = PREFIX + "snip0060"; //$NON-NLS-1$
@@ -62,4 +55,7 @@
// Paste snippet menu item
public static final String MENU_PASTE_SNIPPET = PREFIX + "snip0070"; //$NON-NLS-1$
+
+ // Add to snippets New/Edit Category (dialog)
+ public static final String ADD_TO_SNIPPETS_DIALOG_CATEGORY = PREFIX + "snip0080"; //$NON-NLS-1$
}
\ No newline at end of file
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetCustomizerDialog.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetCustomizerDialog.java
index df39345..5b8be85 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetCustomizerDialog.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetCustomizerDialog.java
@@ -30,7 +30,9 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.snippets.core.ISnippetCategory;
+import org.eclipse.wst.common.snippets.internal.IHelpContextIds;
import org.eclipse.wst.common.snippets.internal.SnippetDefinitions;
import org.eclipse.wst.common.snippets.internal.SnippetsMessages;
import org.eclipse.wst.common.snippets.internal.SnippetsPluginImageHelper;
@@ -47,6 +49,7 @@
setImageDescriptor(SnippetsPluginImageHelper.getInstance().getImageDescriptor(SnippetsPluginImages.IMG_ELCL_EXPORT));
setDisabledImageDescriptor(SnippetsPluginImageHelper.getInstance().getImageDescriptor(SnippetsPluginImages.IMG_DLCL_EXPORT));
setHoverImageDescriptor(SnippetsPluginImageHelper.getInstance().getImageDescriptor(SnippetsPluginImages.IMG_CLCL_EXPORT));
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.CUSTOMIZE_EXPORT_BUTTON);
}
protected void handleExport() {
@@ -122,6 +125,7 @@
setImageDescriptor(SnippetsPluginImageHelper.getInstance().getImageDescriptor(SnippetsPluginImages.IMG_ELCL_IMPORT));
setDisabledImageDescriptor(SnippetsPluginImageHelper.getInstance().getImageDescriptor(SnippetsPluginImages.IMG_DLCL_IMPORT));
setHoverImageDescriptor(SnippetsPluginImageHelper.getInstance().getImageDescriptor(SnippetsPluginImages.IMG_CLCL_IMPORT));
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.CUSTOMIZE_IMPORT_BUTTON);
}
protected PaletteContainer determineContainerForNewEntry(PaletteEntry selected) {
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetDrawerEntryPage.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetDrawerEntryPage.java
index 0571ef2..15270e8 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetDrawerEntryPage.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetDrawerEntryPage.java
@@ -46,7 +46,6 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
import org.eclipse.ui.dialogs.ListSelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
import org.eclipse.wst.common.snippets.core.ISnippetsEntry;
import org.eclipse.wst.common.snippets.internal.IHelpContextIds;
import org.eclipse.wst.common.snippets.internal.SnippetsMessages;
@@ -161,7 +160,7 @@
// create the dialog
// first to get the dialog shell and set the infopop on it
dialog.create();
- WorkbenchHelp.setHelp(dialog.getShell(), IHelpContextIds.DIALOG_CONTENT_TYPE_SELECTION);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IHelpContextIds.DIALOG_CONTENT_TYPE_SELECTION);
if (dialog.open() == Window.OK) {
fContentTypes = dialog.getResult();
@@ -232,7 +231,7 @@
}
public void createControl(Composite parent, PaletteEntry entry) {
- WorkbenchHelp.setHelp(parent, IHelpContextIds.DIALOG_EDIT_CATEGORY);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.DIALOG_EDIT_CATEGORY);
super.createControl(parent, entry);
Composite panel = (Composite) getControl();
Control[] tablist = new Control[panel.getTabList().length + 2];
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetsView.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetsView.java
index 8118a69..8e65f72 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetsView.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetsView.java
@@ -57,7 +57,7 @@
import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.wst.common.snippets.core.ISnippetCategory;
import org.eclipse.wst.common.snippets.core.ISnippetItem;
@@ -519,7 +519,7 @@
// drawers initially collapsed through model setup
fViewer.getControl().addMouseListener(insertListener);
- WorkbenchHelp.setHelp(getViewer().getControl(), IHelpContextIds.MAIN_VIEW_GENERAL);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getViewer().getControl(), IHelpContextIds.MAIN_VIEW_GENERAL);
fPartActionUpdateListener = new PartActivationListener();
getViewSite().getPage().addPartListener(fPartActionUpdateListener);
@@ -606,7 +606,7 @@
public Action getCopyAction() {
if (copyAction == null) {
copyAction = new CopyAction();
- WorkbenchHelp.setHelp(copyAction, IHelpContextIds.MENU_COPY_SNIPPET);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(copyAction, IHelpContextIds.MENU_COPY_SNIPPET);
}
return copyAction;
}
@@ -619,7 +619,7 @@
public Action getCutAction() {
if (cutAction == null) {
cutAction = new CutAction();
- WorkbenchHelp.setHelp(cutAction, IHelpContextIds.MENU_CUT_SNIPPET);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(cutAction, IHelpContextIds.MENU_CUT_SNIPPET);
}
return cutAction;
}
@@ -683,7 +683,7 @@
public PasteAction getPasteAction() {
if (pasteAction == null) {
pasteAction = new PasteAction();
- WorkbenchHelp.setHelp(pasteAction, IHelpContextIds.MENU_PASTE_SNIPPET);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(pasteAction, IHelpContextIds.MENU_PASTE_SNIPPET);
}
return pasteAction;
}
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/util/UserDrawerSelector.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/util/UserDrawerSelector.java
index fab9dbb..fea1c18 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/util/UserDrawerSelector.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/util/UserDrawerSelector.java
@@ -23,7 +23,7 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.snippets.internal.IHelpContextIds;
import org.eclipse.wst.common.snippets.internal.Logger;
import org.eclipse.wst.common.snippets.internal.SnippetsMessages;
@@ -96,7 +96,7 @@
CComboSelectionDialog dlg = new CComboSelectionDialog(fShell, SnippetsMessages.New_Category_Title, (fSelectionPrompt != null ? fSelectionPrompt : SnippetsMessages.choose_or_create), userDrawers, 0, new CategoryNameValidator()) { //$NON-NLS-1$ //$NON-NLS-2$
protected Control createDialogArea(Composite parent) {
Control mainHook = super.createDialogArea(parent);
- WorkbenchHelp.setHelp(mainHook, IHelpContextIds.DIALOG_EDIT_CATEGORY);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainHook, IHelpContextIds.ADD_TO_SNIPPETS_DIALOG_CATEGORY);
return mainHook;
}
};
@@ -150,7 +150,7 @@
InputDialog d = new InputDialog(fShell, SnippetsMessages.New_Category_Title, (fInputPrompt != null ? fInputPrompt : SnippetsMessages.force_create), defaultNewDrawerName, new CategoryNameValidator()) {//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
protected Control createContents(Composite parent) {
Control mainHook = super.createContents(parent);
- WorkbenchHelp.setHelp(mainHook, IHelpContextIds.DIALOG_EDIT_CATEGORY);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(mainHook, IHelpContextIds.ADD_TO_SNIPPETS_DIALOG_CATEGORY);
return mainHook;
}
};
