diff options
author | rescobar | 2010-12-15 02:15:09 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2010-12-15 02:15:09 +0000 |
commit | 4f237742eb03a951705157422438107e6c022bc3 (patch) | |
tree | 9456c1b4423aeb39806aa9aaebee972b593ac63a | |
parent | e778460dc46b3065046810d057fc0717be73a062 (diff) | |
download | org.eclipse.osee-4f237742eb03a951705157422438107e6c022bc3.tar.gz org.eclipse.osee-4f237742eb03a951705157422438107e6c022bc3.tar.xz org.eclipse.osee-4f237742eb03a951705157422438107e6c022bc3.zip |
bug[ats_JGX6U]: Fix OSEE framework context sensitive help
30 files changed, 327 insertions, 364 deletions
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java index ef54c13fbce..4cb01a5dee8 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.define.DefinePlugin; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.OseeUiActions; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; @@ -38,7 +39,6 @@ import org.eclipse.ui.part.ViewPart; public class DefineNavigateView extends ViewPart implements IActionable { public static final String VIEW_ID = "org.eclipse.osee.define.DefineNavigateView"; - public static final String HELP_CONTEXT_ID = "defineNavigator"; private XNavigateComposite xNavComp; /** @@ -63,7 +63,7 @@ public class DefineNavigateView extends ViewPart implements IActionable { xNavComp = new XNavigateComposite(new DefineNavigateViewItems(), parent, SWT.NONE); xNavComp.getFilteredTree().getViewer().setSorter(new DefineNavigateViewerSorter()); - HelpUtil.setHelp(xNavComp, HELP_CONTEXT_ID, "org.eclipse.osee.define.help.ui"); + HelpUtil.setHelp(xNavComp, OseeHelpContext.DEFINE_NAVIGATOR); createActions(); xNavComp.refresh(); addExtensionPointListenerBecauseOfWorkspaceLoading(); diff --git a/plugins/org.eclipse.osee.framework.help.ui/.classpath b/plugins/org.eclipse.osee.framework.help.ui/.classpath index bc74aabe31c..ad32c83a788 100644 --- a/plugins/org.eclipse.osee.framework.help.ui/.classpath +++ b/plugins/org.eclipse.osee.framework.help.ui/.classpath @@ -2,5 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.osee.framework.help.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.help.ui/META-INF/MANIFEST.MF index bde6c94fcb2..21108b6cebc 100644 --- a/plugins/org.eclipse.osee.framework.help.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.help.ui/META-INF/MANIFEST.MF @@ -7,3 +7,5 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.apache.ant;bundle-version="1.7.1" Bundle-ActivationPolicy: lazy +Import-Package: org.eclipse.osee.framework.ui.plugin.util +Export-Package: org.eclipse.osee.framework.help.ui diff --git a/plugins/org.eclipse.osee.framework.help.ui/build.properties b/plugins/org.eclipse.osee.framework.help.ui/build.properties index fd0c4254d0f..1a287be387a 100644 --- a/plugins/org.eclipse.osee.framework.help.ui/build.properties +++ b/plugins/org.eclipse.osee.framework.help.ui/build.properties @@ -1,3 +1,5 @@ +source.. = src/ +output.. = bin/ bin.includes = META-INF/,\ plugin.xml,\ intro/,\ 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 6437a2f1216..961a6d93a9c 100644 --- a/plugins/org.eclipse.osee.framework.help.ui/contexts/contexts.xml +++ b/plugins/org.eclipse.osee.framework.help.ui/contexts/contexts.xml @@ -1,140 +1,182 @@ -<contexts>
- <context id="table_customization" title="Table Customization">
- <description>Allows the table to be customized, saved and loaded.</description>
- <topic label="Table Customization" href="userguide/OSEE Features.html#Table_Customizations"/>
- </context>
- <context id="mass_artifact_editor" title="Mass Artifact Editor">
- <description>Allows viewing and editing of attributes from multiple artifacts.</description>
- <topic label="Mass Artifact Editor" href="userguide/OSEE Features.html#Mass_Artifact_Editor"/>
- <topic label="Table Customization" href="userguide/OSEE Features.html#Table_Customizations"/>
- <topic label="Table Customization" href="userguide/OSEE Features.html#Table_Customizations"/>
- </context>
-
- <context id="artifact_editor" title="Artifact Editor">
- <description>Artifact Editor</description>
- <topic href="userguide/Views-and-Editors.html#Artifact Editor" label="Details"/>
-<!-- <topic href="reference/creating_new_links.html" label="Creating a new Link"/>
- <topic href="reference/reorder_links.html" label="Reordering links"/>
- <topic label="Report a bug" href="../osee.ats/reference/report_a_bug.html"/>-->
- </context>
-
- <context id="artifact_explorer_tree" title="Artifact Explorer">
- <description>Displays artifacts in a relational hierarchy for navigation.</description>
- <topic href="userguide/Views-and-Editors.html#Artifact Explorer View" label="Details"/>
-<!-- <topic label="Report a bug" href="../osee.ats/reference/report_a_bug.html"/>-->
- </context>
-
- <context id="xResultView" title="Result View">
- <description>Show reports, errors, metrics and other data in a multi-paged view with print, email and exporting capabilities.</description>
- <topic href="userguide/Views-and-Editors.html#Result View" label="Result View"/>
- </context>
-
-<!--
- <context id="oseeBranchGraph" title="OSEE Branch Graph">
- <description>Shows a graphical representation of branches in the system</description>
- <topic href="help/oseeBranchGraph.html" label="OSEE Branch Graph"/>
- </context>
--->
-<!--
- <context id="oseeDataModelEditor" title="OSEE Data Model Editor">
- <description>Create and modify OSEE Data Types</description>
- <topic href="help/oseeDataModelEditor.html" label="OSEE Data Model Editor"/>
- </context>
--->
-<!-- <context id="artifact_editor" title="Artifact Editor">
- <description>Artifact Editor</description>
- <topic href="reference/creating_new_links.html" label="Creating a new Link"/>
- <topic href="reference/reorder_links.html" label="Reordering links"/>
- <topic label="Report a bug" href="../osee.ats/reference/report_a_bug.html"/>
- </context>
- <context id="artifact_explorer_tree" title="Artifact Explorer">
- <description>Displays artifacts in a relational hierarchy for navigation.</description>
- <topic href="reference/artifact_explorer_tree.html" label="Drag and Drop"/>
- <topic label="Report a bug" href="../osee.ats/reference/report_a_bug.html"/>
- </context>
- <context id="xResultView" title="Result View">
- <description>Show reports, errors, metrics and other data in a multi-paged view with print, email and exporting capabilities.</description>
- <topic href="reference/result_view.html" label="Result View"/>
- </context>-->
-
- <context id="table_customization" title="Table Customization">
- <description>Allows the table to be customized, saved and loaded.</description>
- <topic label="Table Customization" href="userguide/OSEE Features.html#Table_Customizations"/>
- </context>
-
- <context id="mass_artifact_editor" title="Mass Artifact Editor">
- <description>Allows viewing and editing of attributes from multiple artifacts.</description>
- <topic label="Mass Artifact Editor" href="userguide/OSEE Features.html#Mass_Artifact_Editor"/>
- <topic label="Table Customization" href="userguide/OSEE Features.html#Table_Customizations"/>
- </context>
-
- <context id="quick_search_text" title="Quick Search">
- <description>Provides quick access to search for artifacts</description>
- <topic label="Quick Search" href="userguide/Views-and-Editors.html#Quick_Search_View"/>
- </context>
-
- <context id="query_log_table" title="Query Log">
- <description>Displays queries that have been run, along with their run time, bind variables, and the time when they were ran. If a SQLException occurred during execution then it will also be shown.</description>
- <topic label="Query Log" href="userguide/Views-and-Editors.html#Query Log View"/>
- <topic label="Refreshing the log" href="userguide/Views-and-Editors.html#Refresh_Query_Log"/>
- <topic label="Deleting the log" href="userguide/Views-and-Editors.html#Delete_Query_Log"/>
- </context>-
-
- <context id="oteNavigator" title="OTE Navigator">
- <description>Shortcut view to common OTE tasks.</description>
- <topic href="src/org/eclipse/osee/ote/ui/navigate/package.html" label="OTE Navigator"/>
- </context>
-<!--
- <context id="testRunView" title="Test Run View">
- <description>View current and saved test runs.</description>
- <topic href="help/testRunView.html" label="Test Run View"/>
- </context>
--->
-<!--
- <context id="messageView" title="Message View">
- <description>Message View</description>
- <topic href="reference/messageView/index.html" label="Message View Overview"/>
- <topic href="reference/messageView/watch.html" label="Watching Messages/Elements"/>
- <topic href="reference/messageView/search.html" label="Search"/>
- </context>
- <context id="messageViewSearch" title="Search">
- <description>Message View Search</description>
- <topic href="reference/messageView/search.html" label="Search"/>
- <topic href="reference/messageView/index.html" label="Message View Overview"/>
- </context>
- <context id="messageViewWatch" title="Watch">
- <description>Message View Right-Click Menu</description>
- <topic href="reference/messageView/watch.html" label="Watching Messages/Elements"/>
- <topic href="reference/messageView/index.html" label="Message View Overview"/>
- </context>
-
- <context id="messageWatch" title="Message Watch">
- <description>Message View Right-Click Menu</description>
- <topic href="reference/messageWatch/index.html" label="Message Watch Overview"/>
- <topic href="reference/messageWatch/sort.html" label="Sorting the Table"/>
- <topic href="reference/messageWatch/read_vs_write.html" label="Reader vs. Writer"/>
- <topic href="reference/messageWatch/set.html" label="Set Value"/>
- <topic href="reference/messageWatch/add.html" label="Add Elements"/>
- <topic href="reference/messageWatch/remove.html" label="Removing Items"/>
- </context>-->
-
- <!--
- <context id="muxView" title="Mux View">
- <description>Mux View</description>
- <topic href="help/package.html" label="Mux View"/>
- </context>
- -->
- <!--
- <context id="artifact_explorer_tree_viewer" title="Artifact Explorer">
- <description>Displays artifacts in a relational hierarchy for navigation.</description>
- <topic href="reference/creating_new_artifact.html" label="Creating a new artifact"/>
- <topic href="reference/deleting_artifacts.html" label="Deleting artifacts"/>
- <topic href="reference/go_into.html" label="Rooting on an artifact"/>
- <topic label="Report a bug" href="../org.eclipse.osee.ats/reference/report_a_bug.html"/>
- </context>
--->
- <context id="defineNavigator" title="Define Navigator View">
- <description>Perform Define navigation capabilities.</description>
- <topic href="userguide/OSEE Define Concepts.html" label="Define Navigator View"/>
- </context>
+<contexts> + + <context id="artifact_editor" title="Artifact Editor"> + <description>The Artifact Editor provides specialized features for editing artifacts (this is the default editor for editing attributes and relations).</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Artifact_Editor" label="Artifact Editor"/> + </context> + + <context id="artifact_editor_attributes" title="Artifact Editor - Attributes"> + <description>The attributes area allows for editing and viewing of attribute values contained by the artifact being edited.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Attributes_Section" label="Artifact Editor - Attributes Section"/> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Artifact_Editor" label="Artifact Editor"/> + </context> + + <context id="artifact_editor_relations" title="Artifact Editor - Relations"> + <description>The relations area allows for editing and viewing of artifacts related to the artifact being edited.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Relations_Section" label="Artifact Editor - Relations Section"/> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Artifact_Editor" label="Artifact Editor"/> + </context> + + <context id="artifact_editor_details" title="Artifact Editor - Details"> + <description>The details area displays artifact metadata such as guid, version, branch etc...</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Details_Section" label="Artifact Editor - Details Section"/> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Artifact_Editor" label="Artifact Editor"/> + </context> + + <context id="artifact_explorer" title="Artifact Explorer"> + <description>Shows the artifact hierarchy of the selected branch for navigation.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Artifact_Explorer_View" label="Artifact Explorer"/> + </context> + + <context id="artifact_search" title="Artifact Search"> + <description>The advanced artifact search allows users to create custom searches.</description> + <topic href="OSEE/Users_Guide/Features/Search.html" label="Advanced Artifact Search"/> + </context> + + <context id="branch_manager" title="Branch Manager"> + <description>Shows all branches and transactions on each branch managed by OSEE in a hierarchical fashion.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Branch_Manager_View" label="Branch Manager"/> + <topic href="OSEE/Users_Guide/Concepts/Branches.html" label="Concepts - Branches"/> + </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"/> + </context> + + <context id="resource_history_view" title="Resource History View"> + <description>Shows a detailed view of the changes made to an artifact over time.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Resource_History_View" label="Resource History"/> + </context> + + <context id="mass_artifact_editor" title="Mass Artifact Editor"> + <description>The Mass Artifact Editor allows the easy view and editing of multiple artifacts.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Mass_Artifact_Editor" label="Mass Artifact Editor"/> + </context> + + <context id="merge_manager" title="Artifact Merge Manager"> + <description>The Merge Manager allows users to resolve artifact conflicts detected during branch commits.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Merge_Manager" label="Merge Manager"/> + </context> + + <context id="quick_search_view" title="Quick Search"> + <description>The Quick Search view allows users to perform searches for information contained by artifact attributes in a selected branch.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_View" label="Quick Search View"/> + <topic href="OSEE/Users_Guide/Features/Services.html#Attribute_Tagging_for_Quick_Search" label="Attribute Tagging"/> + </context> + + <context id="quick_search_attribute_type_filter" title="Quick Search - Attribute Type Filter Option"> + <description>Search for artifacts by searching specific attribute types for work matches on the selected branch.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_Options" label="Attribute Type Filter Option"/> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_View" label="Quick Search View"/> + <topic href="OSEE/Users_Guide/Features/Services.html#Attribute_Tagging_for_Quick_Search" label="Attribute Tagging"/> + </context> + + <context id="quick_search_by_id_option" title="Quick Search - By Id Option"> + <description>Search for artifacts with a particular GUID or HRID on the selected branch.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_Options" label="By Id Option"/> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_View" label="Quick Search View"/> + <topic href="OSEE/Users_Guide/Features/Services.html#Attribute_Tagging_for_Quick_Search" label="Attribute Tagging"/> + </context> + + <context id="quick_search_deleted_option" title="Quick Search - Include Deleted Option"> + <description>Include deleted artifacts in the search.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_Options" label="Include Deleted Option"/> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_View" label="Quick Search View"/> + <topic href="OSEE/Users_Guide/Features/Services.html#Attribute_Tagging_for_Quick_Search" label="Attribute Tagging"/> + </context> + + <context id="quick_search_word_order_option" title="Quick Search - Match Word Order Option"> + <description>Match the phrase instead of the existence of words in the search.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_Options" label="Match Word Order Option"/> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_View" label="Quick Search View"/> + <topic href="OSEE/Users_Guide/Features/Services.html#Attribute_Tagging_for_Quick_Search" label="Attribute Tagging"/> + </context> + + <context id="quick_search_all_match_locations_option" title="Quick Search - Match All Locations Option"> + <description>During a word order match, gather all matches locations to display a summary in the search results.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_Options" label="Match All Locations Option"/> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_View" label="Quick Search View"/> + <topic href="OSEE/Users_Guide/Features/Services.html#Attribute_Tagging_for_Quick_Search" label="Attribute Tagging"/> + </context> + + <context id="quick_search_case_sensitive_option" title="Quick Search - Match Case Sensitive Option"> + <description>During a word order match, makes the search for the phrase case sensitive.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_Options" label="Match Case Sensitive Option"/> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Quick_Search_View" label="Quick Search View"/> + <topic href="OSEE/Users_Guide/Features/Services.html#Attribute_Tagging_for_Quick_Search" label="Attribute Tagging"/> + </context> + + <context id="sky_walker_view" title="Sky Walker View"> + <description>Displays a graphical representation of artifacts and their relations for navigation.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Sky_Walker_View" label="Sky Walker View"/> + </context> + + <context id="change_report_editor" title="Change Report Editor"> + <description>Shows all changes made to a branch.</description> + <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Change_Report_Editor" label="Change Report Editor"/> + </context> + + <context id="xviewer_table_customization" title="XViewer - Table Customizations"> + <description>Allows the table to be customized, saved and loaded.</description> + <topic href="OSEE/Users_Guide/Features/Custom-Widgets.html#Table_Customizations" label="XViewer - Table Customizations"/> + </context> + + <context id="xviewer_xresult_view" title="XViewer - Results View"> + <description>Show reports, errors, metrics and other data in a multi-paged view with print, email and exporting capabilities.</description> + <topic href="OSEE/Users_Guide/Features/Custom-Widgets.html#HTML_Report_and_CSV_Export" label="XViewer - Results View"/> + <topic href="OSEE/Users_Guide/Features/Custom-Widgets.html#Table_Customizations" label="XViewer - Table Customizations"/> + </context> + + <!-- ////////////////////////////////////////////////////////////////////////////////////////////// --> +<!-- + <context id="oseeBranchGraph" title="OSEE Branch Graph"> + <description>Shows a graphical representation of branches in the system</description> + <topic href="help/oseeBranchGraph.html" label="OSEE Branch Graph"/> + </context> + <context id="oseeDataModelEditor" title="OSEE Data Model Editor"> + <description>Create and modify OSEE Data Types</description> + <topic href="help/oseeDataModelEditor.html" label="OSEE Data Model Editor"/> + </context> +--> +<!-- OTE STUFF + <context id="oteNavigator" title="OTE Navigator"> + <description>Shortcut view to common OTE tasks.</description> + <topic href="src/org/eclipse/osee/ote/ui/navigate/package.html" label="OTE Navigator"/> + </context> + <context id="testRunView" title="Test Run View"> + <description>View current and saved test runs.</description> + <topic href="help/testRunView.html" label="Test Run View"/> + </context> + <context id="messageView" title="Message View"> + <description>Message View</description> + <topic href="reference/messageView/index.html" label="Message View Overview"/> + <topic href="reference/messageView/watch.html" label="Watching Messages/Elements"/> + <topic href="reference/messageView/search.html" label="Search"/> + </context> + <context id="messageViewSearch" title="Search"> + <description>Message View Search</description> + <topic href="reference/messageView/search.html" label="Search"/> + <topic href="reference/messageView/index.html" label="Message View Overview"/> + </context> + <context id="messageViewWatch" title="Watch"> + <description>Message View Right-Click Menu</description> + <topic href="reference/messageView/watch.html" label="Watching Messages/Elements"/> + <topic href="reference/messageView/index.html" label="Message View Overview"/> + </context> + <context id="messageWatch" title="Message Watch"> + <description>Message View Right-Click Menu</description> + <topic href="reference/messageWatch/index.html" label="Message Watch Overview"/> + <topic href="reference/messageWatch/sort.html" label="Sorting the Table"/> + <topic href="reference/messageWatch/read_vs_write.html" label="Reader vs. Writer"/> + <topic href="reference/messageWatch/set.html" label="Set Value"/> + <topic href="reference/messageWatch/add.html" label="Add Elements"/> + <topic href="reference/messageWatch/remove.html" label="Removing Items"/> + </context> + <context id="muxView" title="Mux View"> + <description>Mux View</description> + <topic href="help/package.html" label="Mux View"/> + </context> + --> + </contexts>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.help.ui/customBuildCallbacks.xml b/plugins/org.eclipse.osee.framework.help.ui/customBuildCallbacks.xml deleted file mode 100644 index 26354d81057..00000000000 --- a/plugins/org.eclipse.osee.framework.help.ui/customBuildCallbacks.xml +++ /dev/null @@ -1,161 +0,0 @@ -<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
- <!-- ===================================================================== -->
- <!-- Default target -->
- <!-- ===================================================================== -->
- <target name="noDefault">
- <echo message="This file must be called with explicit targets" />
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target build.jars -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="pre.build.jars">
- <!-- automatic generation of the user guide is disabled, see bug 242979
- <ant antfile="build-helper.xml" target="all"/>
- -->
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target build.jars -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="post.build.jars">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target build.sources -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="pre.build.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target build.sources -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="post.build.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the compilation target <name> -->
- <!-- Substitute "name" with the name of the compilation target, eg @dot -->
- <!-- Available parameters : -->
- <!-- source.foldern : n = 1 ... N, the source folders -->
- <!-- target.folder : where the results of the compilation go -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="pre.name">
- </target>
-
- <target name="pre.@dot">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do during the compilation target <name>, after the compile -->
- <!-- but before jaring. Substitute "name" with the name of the compilation-->
- <!-- target, eg @dot -->
- <!-- Available parameters : -->
- <!-- source.foldern : n = 1 ... N, the source folders -->
- <!-- target.folder : where the results of the compilation go -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="post.compile.name">
- </target>
-
- <target name="post.compile.@dot">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the compilation target <name> -->
- <!-- Substitute "name" with the name of the compilation target, eg @dot -->
- <!-- Available parameters : -->
- <!-- jar.location - the location of the compilation results -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="post.name">
- </target>
-
- <target name="post.@dot">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder containing the build results -->
- <!-- target.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.bin.parts">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder containing the build results -->
- <!-- target.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.bin.parts">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.sources -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.sources -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.logs -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.logs">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.logs -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.logs">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target clean -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.clean">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target clean -->
- <!-- Available parameters : -->
- <!-- plugin.destination - final destination of the build -->
- <!-- build.result.folder - results of the compilation -->
- <!-- temp.folder - temporary folder -->
- <!-- ===================================================================== -->
- <target name="post.clean">
- </target>
-</project>
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 new file mode 100644 index 00000000000..1a29c6cb98f --- /dev/null +++ b/plugins/org.eclipse.osee.framework.help.ui/src/org/eclipse/osee/framework/help/ui/OseeHelpContext.java @@ -0,0 +1,57 @@ +/******************************************************************************* + * 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.help.ui; + +import org.eclipse.osee.framework.ui.plugin.util.HelpContext; +import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; + +/** + * @author Roberto E. Escobar + */ +public final class OseeHelpContext { + + private OseeHelpContext() { + // Private Constructor + } + + private static final String PLUGIN_ID = "org.eclipse.osee.framework.help.ui"; + + public static final HelpContext ARTIFACT_EDITOR = toContext("artifact_editor"); + public static final HelpContext ARTIFACT_EDITOR__ATTRIBUTES = toContext("artifact_editor_attributes"); + public static final HelpContext ARTIFACT_EDITOR__RELATIONS = toContext("artifact_editor_relations"); + public static final HelpContext ARTIFACT_EDITOR__DETAILS = toContext("artifact_editor_details"); + + public static final HelpContext ARTIFACT_EXPLORER = toContext("artifact_explorer"); + public static final HelpContext ARTIFACT_SEARCH = toContext("artifact_search"); + 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"); + public static final HelpContext HISTORY_VIEW = toContext("resource_history_view"); + public static final HelpContext MASS_EDITOR = toContext("mass_artifact_editor"); + public static final HelpContext MERGE_MANAGER = toContext("merge_manager"); + + public static final HelpContext QUICK_SEARCH = toContext("quick_search_view"); + public static final HelpContext QUICK_SEARCH_TYPE_FILTER = toContext("quick_search_attribute_type_filter"); + public static final HelpContext QUICK_SEARCH_BY_ID = toContext("quick_search_by_id_option"); + public static final HelpContext QUICK_SEARCH_INCLUDE_DELETED = toContext("quick_search_deleted_option"); + public static final HelpContext QUICK_SEARCH_WORD_ORDER = toContext("quick_search_word_order_option"); + public static final HelpContext QUICK_SEARCH_MATCH_ALL = toContext("quick_search_all_match_locations_option"); + public static final HelpContext QUICK_SEARCH_CASE_SENSITIVE = toContext("quick_search_case_sensitive_option"); + + public static final HelpContext SKY_WALKER_VIEW = toContext("sky_walker_view"); + + public static final HelpContext TABLE_CUSTOMIZATIONS = toContext("xviewer_table_customization"); + public static final HelpContext RESULTS_VIEW = toContext("xviewer_xresult_view"); + + private static HelpContext toContext(String id) { + return HelpUtil.asContext(PLUGIN_ID, id); + } +} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF index f8fa95779e2..0d5e994974f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Require-Bundle: javax.mail.glassfish, org.eclipse.zest.core, org.eclipse.osee.framework.jdk.core, org.eclipse.osee.framework.ui.ws, - org.eclipse.osee.framework.help.ui;bundle-version="0.9.4";resolution:=optional, + org.eclipse.osee.framework.help.ui;resolution:=optional, org.eclipse.osee.framework.access;bundle-version="0.9.5", org.junit Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml b/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml index 5477fbf4562..3f9db923f20 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml +++ b/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml @@ -129,23 +129,6 @@ </page> </extension> - <extension point="org.eclipse.help.contexts"> - <contexts file="contexts/artifactExplorerContexts.xml"/> - <contexts file="contexts/artifactSearchContexts.xml"/> - <contexts file="contexts/branchManagerContexts.xml"/> - <contexts file="contexts/changeReportContexts.xml"/> - <contexts file="contexts/contexts.xml"/> - <contexts file="contexts/relationPageContexts.xml"/> - <contexts file="contexts/revisionHistoryContexts.xml"/> - <contexts file="reference/queryLog/contexts.xml"/> - <contexts file="reference/quickSearch/contexts.xml"/> - <contexts file="reference/contexts.xml"/> - <contexts file="contexts/mergeMangerContexts.xml"> - </contexts> - <contexts - file="../org.eclipse.osee.framework.help.ui/contexts/contexts.xml"> - </contexts> - </extension> <extension id="org.eclipse.osee.framework.ui.skynet" name="OSEE" point="org.eclipse.ui.views"> <view allowMultiple="true" category="osee.jdk.core.category" class="org.eclipse.osee.framework.ui.skynet.ArtifactExplorer" icon="images/artifact_explorer.gif" id="org.eclipse.osee.framework.ui.skynet.ArtifactExplorer" name="Artifact Explorer"/> <view allowMultiple="true" category="osee.jdk.core.category" class="org.eclipse.osee.framework.ui.skynet.group.GroupExplorer" icon="images/group.gif" id="org.eclipse.osee.framework.ui.skynet.group.GroupExplorer" name="OSEE Group Explorer"/> diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java index cb20ad104c7..a933f3c1445 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java @@ -47,6 +47,7 @@ import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.core.util.Conditions; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.logging.OseeLevel; @@ -363,7 +364,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent updateEnablementsEtAl(); trees.add(tree); - setHelpContexts(); + HelpUtil.setHelp(treeViewer.getControl(), OseeHelpContext.ARTIFACT_EXPLORER); checkBranchReadable(); getViewSite().getActionBars().updateActionBars(); @@ -1281,10 +1282,6 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent treeViewer.setSelection(selection); } - private void setHelpContexts() { - HelpUtil.setHelp(treeViewer.getControl(), "artifact_explorer_tree_viewer", "org.eclipse.osee.framework.help.ui"); - } - @Override public void handleAccessControlArtifactsEvent(Sender sender, AccessControlEvent accessControlEvent) { try { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java index 686a3430ba0..d7c46097f99 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java @@ -24,6 +24,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -115,7 +116,7 @@ public class AttributesComposite extends Composite { mainSash.setWeights(new int[] {8, 2}); sashForm.setWeights(new int[] {5, 5}); - setHelpContexts(); + HelpUtil.setHelp(tableViewer.getControl(), OseeHelpContext.ARTIFACT_EDITOR__ATTRIBUTES); } private void createTableArea(Composite parent) { @@ -348,10 +349,6 @@ public class AttributesComposite extends Composite { } } - private void setHelpContexts() { - HelpUtil.setHelp(tableViewer.getControl(), "artifact_editor", "org.eclipse.osee.framework.help.ui"); - } - /** * @return the toolBar */ diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java index 9bfc34306c0..c232db22395 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java @@ -33,6 +33,7 @@ import org.eclipse.osee.framework.core.enums.IRelationEnumeration; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.RelationTypeSide; import org.eclipse.osee.framework.core.model.type.RelationType; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -806,7 +807,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { } private void setHelpContexts() { - HelpUtil.setHelp(treeViewer.getControl(), "relation_page_tree_viewer", "org.eclipse.osee.framework.help.ui"); + HelpUtil.setHelp(treeViewer.getControl(), OseeHelpContext.ARTIFACT_EDITOR__RELATIONS); } public ToolBar getToolBar() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactFormPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactFormPage.java index b423444a118..5cf0379cbb0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactFormPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactFormPage.java @@ -16,10 +16,12 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.ReservedCharacters; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; +import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.RelationsComposite; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; @@ -107,6 +109,8 @@ public class ArtifactFormPage extends FormPage { section.marginHeight = 2; } form.layout(); + + HelpUtil.setHelp(form.getBody(), OseeHelpContext.ARTIFACT_EDITOR); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java index c25416608cd..d30f88738c5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java @@ -19,11 +19,13 @@ import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute; +import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; @@ -121,6 +123,7 @@ public class AttributeFormPart extends AbstractFormPart { internalComposite = createAttributeTypeControls(composite, artifact, attributeType, isEditable, false, 20); } setLabelFonts(internalComposite, FontManager.getDefaultLabelFont()); + HelpUtil.setHelp(internalComposite, OseeHelpContext.ARTIFACT_EDITOR__ATTRIBUTES); xWidgetsMap.put(attributeType, internalComposite); } refresh(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributesFormSection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributesFormSection.java index a004a009291..1d052fc71e9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributesFormSection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributesFormSection.java @@ -13,6 +13,8 @@ package org.eclipse.osee.framework.ui.skynet.artifact.editor.sections; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.ToolBarManager; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; +import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.skynet.artifact.editor.IActionContributor; import org.eclipse.osee.framework.ui.skynet.artifact.editor.parts.AttributeFormPart; @@ -102,6 +104,8 @@ public class AttributesFormSection extends ArtifactEditorFormSection { section.layout(true); form.getForm().getBody().layout(true); + + HelpUtil.setHelp(sectionBody, OseeHelpContext.ARTIFACT_EDITOR__ATTRIBUTES); } private void updateToolBarVisibility() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/DetailsFormSection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/DetailsFormSection.java index 880b2be5511..24bd9340a9c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/DetailsFormSection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/DetailsFormSection.java @@ -10,8 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.artifact.editor.sections; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; +import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; @@ -71,6 +73,9 @@ public class DetailsFormSection extends ArtifactEditorFormSection { getSection().setClient(composite); toolkit.paintBordersFor(composite); sectionCreated = true; + + HelpUtil.setHelp(composite, OseeHelpContext.ARTIFACT_EDITOR__DETAILS); + HelpUtil.setHelp(formText, OseeHelpContext.ARTIFACT_EDITOR__DETAILS); } if (Widgets.isAccessible(formText)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/RelationsFormSection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/RelationsFormSection.java index 1198a85cd21..f7f2624dec7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/RelationsFormSection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/RelationsFormSection.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.artifact.editor.sections; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; +import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.RelationsComposite; import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; @@ -86,6 +88,8 @@ public class RelationsFormSection extends ArtifactEditorFormSection { section.setClient(sectionBody); toolkit.paintBordersFor(section); + HelpUtil.setHelp(sectionBody, OseeHelpContext.ARTIFACT_EDITOR__RELATIONS); + relationComposite.getTreeViewer().getTree().addMouseListener(new MouseListener() { private void redrawPage() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java index 67a28f88afd..9f56936630e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java @@ -21,6 +21,7 @@ import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.IActionable; @@ -223,7 +224,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IActio setPartName(((MassArtifactEditorInput) editorInput).getName()); } - HelpUtil.setHelp(getContainer(), "mass_artifact_editor", "org.eclipse.osee.framework.help.ui"); + HelpUtil.setHelp(getContainer(), OseeHelpContext.MASS_EDITOR); Composite comp = new Composite(getContainer(), SWT.NONE); comp.setLayout(new GridLayout(1, true)); 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 e2707c0ce0a..edeb892609b 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 @@ -28,9 +28,11 @@ import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.osee.framework.core.operation.CompositeOperation; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeReportEditorInput; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; @@ -116,6 +118,7 @@ public class ChangeReportPage extends FormPage { bindMenu(); recomputeChangeReport(uiData.isLoadOnOpenEnabled()); + HelpUtil.setHelp(form.getBody(), OseeHelpContext.CHANGE_REPORT_EDITOR); } private void bindMenu() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java index 12dc0c7bd21..f22ee683b2e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java @@ -19,6 +19,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.ui.plugin.util.HelpContext; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; @@ -273,11 +274,11 @@ public class SearchComposite extends Composite implements Listener { } } - public void setHelpContext(String helpContext) { + public void setHelpContext(HelpContext helpContext) { if (Widgets.isAccessible(this.searchArea) && Widgets.isAccessible(this.executeSearch) && Widgets.isAccessible(this.clear)) { - HelpUtil.setHelp(searchArea, helpContext, "org.eclipse.osee.framework.help.ui"); - HelpUtil.setHelp(executeSearch, helpContext, "org.eclipse.osee.framework.help.ui"); - HelpUtil.setHelp(clear, helpContext, "org.eclipse.osee.framework.help.ui"); + HelpUtil.setHelp(searchArea, helpContext); + HelpUtil.setHelp(executeSearch, helpContext); + HelpUtil.setHelp(clear, helpContext); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java index a8858aaa7f3..157f9969e4d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; import org.eclipse.jface.action.ActionContributionItem; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.util.AFile; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; @@ -47,7 +48,6 @@ public class ResultsEditorHtmlTab implements IResultsEditorHtmlTab, IBrowserActi private final String tabName; private XResultsComposite xResultsComposite; - private static String HELP_CONTEXT_ID = "xResultView"; private ResultsEditor resultsEditor; private XResultPage xResultPage; @@ -94,8 +94,8 @@ public class ResultsEditorHtmlTab implements IResultsEditorHtmlTab, IBrowserActi xResultsComposite.setLayoutData(gd); xResultsComposite.setHtmlText(xResultPage.getManipulatedHtml(Arrays.asList(Manipulations.NONE))); - HelpUtil.setHelp(xResultsComposite, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui"); - HelpUtil.setHelp(xResultsComposite.getBrowser(), HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui"); + HelpUtil.setHelp(xResultsComposite, OseeHelpContext.RESULTS_VIEW); + HelpUtil.setHelp(xResultsComposite.getBrowser(), OseeHelpContext.RESULTS_VIEW); return comp; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java index 456e9753ceb..a0a84774ac4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java @@ -33,6 +33,7 @@ import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.RelationType; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -128,7 +129,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl setControl(parent); aContainer.setPerformActionEnabled(false); - HelpUtil.setHelp(mainComposite, "artifact_search", "org.eclipse.osee.framework.help.ui"); + HelpUtil.setHelp(mainComposite, OseeHelpContext.ARTIFACT_SEARCH); updateWidgets(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java index f7f06f4b78e..d55ea4e980d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java @@ -29,9 +29,11 @@ import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.AttributeType; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; +import org.eclipse.osee.framework.ui.plugin.util.HelpContext; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; @@ -318,10 +320,10 @@ public class QuickSearchOptionComposite extends Composite { } } - private void setHelpContextForOption(String optionId, String helpContext) { + private void setHelpContextForOption(String optionId, HelpContext helpContext) { Control control = getOrCreateOptionsButton(optionId); if (Widgets.isAccessible(control)) { - HelpUtil.setHelp(control, helpContext, "org.eclipse.osee.framework.help.ui"); + HelpUtil.setHelp(control, helpContext); } } @@ -350,27 +352,27 @@ public class QuickSearchOptionComposite extends Composite { } private enum SearchOption { - Attribute_Type_Filter("quick_search_attribute_type_filter", "When selected, searches only through the artifact's containing the selected attribute types.", true, new AttributeTypeFilterConfigHandler()), - By_Id("quick_search_by_id_option", "When selected, searches by GUID(s) or HRID(s). Accepts comma or space separated ids.", true), - Include_Deleted("quick_search_deleted_option", "When selected, does not filter out deleted artifacts from search results.", false), - Match_Word_Order("quick_search_word_order_option", "When selected, search will match query word order.", false), - All_Match_Locations("quick_search_all_match_locations_option", "When selected, returns all match locations. NOTE: If the search matches many artifacts, performance may be slow.", false), - Case_Sensitive("quick_search_case_sensitive_option", "When selected, performs a case sensitive search. NOTE: This is only applicable if match word order is also selected.", false); + Attribute_Type_Filter(OseeHelpContext.QUICK_SEARCH_TYPE_FILTER, "When selected, searches only through the artifact's containing the selected attribute types.", true, new AttributeTypeFilterConfigHandler()), + By_Id(OseeHelpContext.QUICK_SEARCH_BY_ID, "When selected, searches by GUID(s) or HRID(s). Accepts comma or space separated ids.", true), + Include_Deleted(OseeHelpContext.QUICK_SEARCH_INCLUDE_DELETED, "When selected, does not filter out deleted artifacts from search results.", false), + Match_Word_Order(OseeHelpContext.QUICK_SEARCH_WORD_ORDER, "When selected, search will match query word order.", false), + All_Match_Locations(OseeHelpContext.QUICK_SEARCH_MATCH_ALL, "When selected, returns all match locations. NOTE: If the search matches many artifacts, performance may be slow.", false), + Case_Sensitive(OseeHelpContext.QUICK_SEARCH_CASE_SENSITIVE, "When selected, performs a case sensitive search. NOTE: This is only applicable if match word order is also selected.", false); private static String[] labels = null; private static String[] mutuallyExclusive = null; private static Map<String, IOptionConfigurationHandler<?>> configurable = null; - private final String helpContext; + private final HelpContext helpContext; private final String toolTip; private final boolean isRadio; private final IOptionConfigurationHandler<?> configHandler; - SearchOption(String helpContext, String toolTip, boolean isRadio) { + SearchOption(HelpContext helpContext, String toolTip, boolean isRadio) { this(helpContext, toolTip, isRadio, null); } - SearchOption(String helpContext, String toolTip, boolean isRadio, IOptionConfigurationHandler<?> configHandler) { - this.helpContext = ""; + SearchOption(HelpContext helpContext, String toolTip, boolean isRadio, IOptionConfigurationHandler<?> configHandler) { + this.helpContext = helpContext; this.toolTip = toolTip; this.isRadio = isRadio; this.configHandler = configHandler; @@ -380,7 +382,7 @@ public class QuickSearchOptionComposite extends Composite { return name().replaceAll("_", " "); } - public String getHelpContext() { + public HelpContext getHelpContext() { return helpContext; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java index 8b9ca0b1e2e..ed793c08b51 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java @@ -23,6 +23,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.message.SearchOptions; import org.eclipse.osee.framework.core.message.SearchRequest; import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; @@ -63,8 +64,6 @@ public class QuickSearchView extends ViewPart implements IActionable, Listener { private static final String LAST_BRANCH_GUID = "lastBranch"; private static final String QUERY_HISTORY_KEY_ID = "queryHistory"; - private static final String MAIN_HELP_CONTEXT = "quick_search_text"; - private Label branchLabel; private XBranchSelectWidget branchSelect; private SearchComposite searchComposite; @@ -182,7 +181,7 @@ public class QuickSearchView extends ViewPart implements IActionable, Listener { loadState(); compositeEnablement(searchComposite, false); - searchComposite.setHelpContext(MAIN_HELP_CONTEXT); + searchComposite.setHelpContext(OseeHelpContext.QUICK_SEARCH); branchLabel = new Label(parent, SWT.NONE); branchLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerTabOptions.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerTabOptions.java index 89d5e86cde2..4682bf27983 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerTabOptions.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerTabOptions.java @@ -30,4 +30,8 @@ public class SkyWalkerTabOptions { new SkyWalkerShowAttributeTabItem(tabFolder, options); } + public TabFolder getControl() { + return tabFolder; + } + } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java index e7660fa29fe..3fb354734be 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java @@ -25,6 +25,7 @@ import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.core.data.SystemUser; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.util.AFile; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Lib; @@ -36,6 +37,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.ArtifactDoubleClick; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; @@ -111,7 +113,7 @@ public class SkyWalkerView extends ViewPart { Composite child1 = new Composite(sashForm, SWT.BORDER); child1.setLayout(new FillLayout()); - new SkyWalkerTabOptions(child1, SWT.NONE, options); + SkyWalkerTabOptions tabOptions = new SkyWalkerTabOptions(child1, SWT.NONE, options); options.addSkyWalkerOptionsChangeListener(new ISkyWalkerOptionsChangeListener() { @Override @@ -158,6 +160,9 @@ public class SkyWalkerView extends ViewPart { } catch (Exception ex) { OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); } + + HelpUtil.setHelp(viewer.getControl(), OseeHelpContext.SKY_WALKER_VIEW); + HelpUtil.setHelp(tabOptions.getControl(), OseeHelpContext.SKY_WALKER_VIEW); } protected void createActions() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java index f1e804684ff..9c6df602a7a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java @@ -28,6 +28,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionRecord; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.IActionable; @@ -63,7 +64,6 @@ import org.eclipse.ui.part.ViewPart; public class BranchView extends ViewPart implements IActionable, IBranchEventListener, ITransactionEventListener, ITransactionRecordSelectionProvider { public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView"; private BranchViewPresentationPreferences branchViewPresentationPreferences; - private static String HELP_CONTEXT_ID = "BranchView"; public static final String BRANCH_ID = "branchId"; private XBranchWidget xBranchWidget; private final Clipboard clipboard = new Clipboard(null); @@ -137,7 +137,9 @@ public class BranchView extends ViewPart implements IActionable, IBranchEventLis getSite().registerContextMenu(VIEW_ID, menuManager, xBranchWidget.getXViewer()); getSite().setSelectionProvider(xBranchWidget.getXViewer()); - HelpUtil.setHelp(parent, HELP_CONTEXT_ID, "org.eclipse.osee.framework.help.ui"); + + HelpUtil.setHelp(parent, OseeHelpContext.BRANCH_MANAGER); + OseeStatusContributionItemFactory.addTo(this, true); getViewSite().getActionBars().updateActionBars(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java index 9fca0ef0e11..936a2e62025 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java @@ -23,12 +23,14 @@ import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerTextFilter; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; @@ -84,6 +86,7 @@ public class BranchXViewer extends XViewer { protected void createSupportWidgets(Composite parent) { super.createSupportWidgets(parent); getFilterDataUI().setFocus(); + HelpUtil.setHelp(getControl(), OseeHelpContext.BRANCH_MANAGER); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java index 71994a9123c..e025e70aacd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java @@ -30,6 +30,7 @@ import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.exception.OseeArgumentException; 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.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.IActionable; @@ -84,7 +85,6 @@ import org.eclipse.ui.part.ViewPart; public class HistoryView extends ViewPart implements IActionable, IBranchEventListener, ITransactionRecordSelectionProvider, IRebuildMenuListener { public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.widgets.xHistory.HistoryView"; - private static String HELP_CONTEXT_ID = "HistoryView"; private XHistoryWidget xHistoryWidget; private Artifact artifact; @@ -169,7 +169,9 @@ public class HistoryView extends ViewPart implements IActionable, IBranchEventLi getSite().registerContextMenu(VIEW_ID, menuManager, xHistoryWidget.getXViewer()); getSite().setSelectionProvider(xHistoryWidget.getXViewer()); - HelpUtil.setHelp(parent, HELP_CONTEXT_ID, "org.eclipse.osee.framework.help.ui"); + + HelpUtil.setHelp(parent, OseeHelpContext.HISTORY_VIEW); + OseeStatusContributionItemFactory.addTo(this, true); setupMenus(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java index 2320a7e8a46..add690d2559 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java @@ -16,7 +16,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.logging.Level; - import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -33,6 +32,7 @@ import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionRecord; +import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.IActionable; @@ -88,7 +88,6 @@ import org.eclipse.ui.part.ViewPart; */ public class MergeView extends ViewPart implements IActionable, IBranchEventListener, IArtifactEventListener { public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeView"; - public static final String HELP_CONTEXT_ID = "Merge_Manager_View"; private MergeXWidget mergeXWidget; private IHandlerService handlerService; private Branch sourceBranch; @@ -230,7 +229,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList mergeXWidget.getXViewer()); getSite().setSelectionProvider(mergeXWidget.getXViewer()); - HelpUtil.setHelp(parent, HELP_CONTEXT_ID, "org.eclipse.osee.framework.help.ui"); + HelpUtil.setHelp(parent, OseeHelpContext.MERGE_MANAGER); OseeEventManager.addListener(this); OseeEventManager.addListener(this); |