bug[ats_JGX6U]: Fix OSEE framework context sensitive help

6 files changed, 12 insertions, 31 deletions

diff --git a/plugins/org.eclipse.osee.framework.help.ui/contexts/contexts.xml b/plugins/org.eclipse.osee.framework.help.ui/contexts/contexts.xml
index 84562fe00d5..5f6a7fd453f 100644
--- a/plugins/org.eclipse.osee.framework.help.ui/contexts/contexts.xml
+++ b/plugins/org.eclipse.osee.framework.help.ui/contexts/contexts.xml
@@ -39,6 +39,11 @@
 	   <topic href="OSEE/Users_Guide/Concepts/Branches.html" label="Concepts - Branches"/>
 	</context>
 	
+	<context id="blam_editor" title="Blam Editor">
+		<description>The BLAM (BLAM Lightweight Artifact Manipulation) Editor allows non-programmers to graphically construct workflows to automate repetitive tasks.</description>
+	   <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Blam_Editor" label="Blam Editor"/>
+	</context>
+	
 	<context id="define_navigator" title="Define Navigator">
 	   <description>The Define Navigator, shown by default in the Define Perspective, provides a central location to launch frequently user define operations.</description>
 	   <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Define_Navigator" label="Define Navigator"/>
diff --git a/plugins/org.eclipse.osee.framework.help.ui/src/org/eclipse/osee/framework/help/ui/OseeHelpContext.java b/plugins/org.eclipse.osee.framework.help.ui/src/org/eclipse/osee/framework/help/ui/OseeHelpContext.java
index 1a29c6cb98f..4253b125e23 100644
--- a/plugins/org.eclipse.osee.framework.help.ui/src/org/eclipse/osee/framework/help/ui/OseeHelpContext.java
+++ b/plugins/org.eclipse.osee.framework.help.ui/src/org/eclipse/osee/framework/help/ui/OseeHelpContext.java
@@ -31,6 +31,7 @@ public final class OseeHelpContext {
 
    public static final HelpContext ARTIFACT_EXPLORER = toContext("artifact_explorer");
    public static final HelpContext ARTIFACT_SEARCH = toContext("artifact_search");
+   public static final HelpContext BLAM_EDITOR = toContext("blam_editor");
    public static final HelpContext CHANGE_REPORT_EDITOR = toContext("change_report_editor");
    public static final HelpContext BRANCH_MANAGER = toContext("branch_manager");
    public static final HelpContext DEFINE_NAVIGATOR = toContext("define_navigator");
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/IHelpContextIds.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/IHelpContextIds.java
deleted file mode 100644
index 3b0ab8d09cd..00000000000
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/IHelpContextIds.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet;
-
-/**
- * @author Ryan D. Brooks
- */
-public interface IHelpContextIds {
-   public static final String PREFIX = "org.eclipse.osee.framework.ui.skynet.";
-   public static final String MAIN_WORKFLOW_PAGE = PREFIX + "main_workflow_page";
-}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamOverviewPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamOverviewPage.java
index f79ad7e5dea..c24c1d95602 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamOverviewPage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamOverviewPage.java
@@ -13,7 +13,8 @@ package org.eclipse.osee.framework.ui.skynet.blam;
 import java.util.Collection;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.ui.skynet.IHelpContextIds;
+import org.eclipse.osee.framework.help.ui.OseeHelpContext;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
 import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamInputSection;
 import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamOutputSection;
 import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamUsageSection;
@@ -22,7 +23,6 @@ import org.eclipse.osee.framework.ui.swt.Widgets;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.forms.IFormPart;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
@@ -69,7 +69,7 @@ public class BlamOverviewPage extends FormPage {
       updateImage(form);
       addToolBar(toolkit, form, true);
       managedForm.getMessageManager().setAutoUpdate(false);
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MAIN_WORKFLOW_PAGE);
+      HelpUtil.setHelp(form.getBody(), OseeHelpContext.BLAM_EDITOR);
 
       int sectionStyle = ExpandableComposite.TITLE_BAR | ExpandableComposite.EXPANDED | ExpandableComposite.TWISTIE;
 
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java
index edeb892609b..7a82f895d62 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java
@@ -49,7 +49,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.forms.IFormPart;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
@@ -62,7 +61,6 @@ import org.eclipse.ui.progress.UIJob;
  * @author Ryan D. Brooks
  */
 public class ChangeReportPage extends FormPage {
-   private static String HELP_CONTEXT_ID = "ChangeView";
 
    private ChangeReportTable changeReportTable;
    private ChangeReportInfoPresenter infoPresenter;
@@ -113,8 +111,6 @@ public class ChangeReportPage extends FormPage {
       addToolBar(toolkit, form, true);
       form.reflow(true);
 
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(),
-         "org.eclipse.osee.framework.help.ui." + HELP_CONTEXT_ID);
       bindMenu();
 
       recomputeChangeReport(uiData.isLoadOnOpenEnabled());
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java
index e3e0125d09c..27055edd49d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java
@@ -12,7 +12,6 @@
 package org.eclipse.osee.framework.ui.skynet.widgets.xmerge;
 
 import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
@@ -21,7 +20,6 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -32,6 +30,7 @@ import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
 import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.TransactionRecord;
+import org.eclipse.osee.framework.help.ui.OseeHelpContext;
 import org.eclipse.osee.framework.jdk.core.text.change.ChangeSet;
 import org.eclipse.osee.framework.jdk.core.util.AFile;
 import org.eclipse.osee.framework.logging.OseeLevel;
@@ -45,6 +44,7 @@ import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta;
 import org.eclipse.osee.framework.skynet.core.conflict.ArtifactConflict;
 import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;
 import org.eclipse.osee.framework.skynet.core.conflict.Conflict;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
 import org.eclipse.osee.framework.ui.skynet.render.IRenderer;
@@ -55,7 +55,6 @@ import org.eclipse.osee.framework.ui.skynet.revert.RevertWizard;
 import org.eclipse.osee.framework.ui.swt.Displays;
 import org.eclipse.osee.framework.ui.swt.NonmodalWizardDialog;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
 
 /**
  * @author Theron Virgin
@@ -265,8 +264,7 @@ public class MergeUtility {
                response++;
             }
             if (response == 2) {
-               PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(
-                  "/org.eclipse.osee.framework.ui.skynet/reference/Merge_Manager.html");
+               HelpUtil.displayHelp(OseeHelpContext.MERGE_MANAGER);
             } else if (response == 1) {
 
                Job job = new Job("Generate 3 Way Merge") {