Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorrescobar2010-12-18 00:09:27 +0000
committerRyan D. Brooks2010-12-18 00:09:27 +0000
commit87923194cbbcda2d35d64a0a2101957bd1727100 (patch)
treef9263e3966b740426b5c0a131703363080e63595 /plugins
parent55f469aacda8af7dcaf14759732932e26efc36bb (diff)
downloadorg.eclipse.osee-87923194cbbcda2d35d64a0a2101957bd1727100.tar.gz
org.eclipse.osee-87923194cbbcda2d35d64a0a2101957bd1727100.tar.xz
org.eclipse.osee-87923194cbbcda2d35d64a0a2101957bd1727100.zip
bug[ats_JGX6U]: Fix test run view help content
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.framework.help.ui/contexts/contexts.xml5
-rw-r--r--plugins/org.eclipse.osee.framework.help.ui/src/org/eclipse/osee/framework/help/ui/OseeHelpContext.java2
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/build.properties3
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/help/contexts.xml8
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/help/testRunView.html14
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/help/testrunview.jpgbin97568 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/help/testrunview.xcfbin110263 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/help/toc.xml9
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/plugin.xml13
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunView.java6
11 files changed, 14 insertions, 47 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 5f6a7fd453f..8d167e9695e 100644
--- a/plugins/org.eclipse.osee.framework.help.ui/contexts/contexts.xml
+++ b/plugins/org.eclipse.osee.framework.help.ui/contexts/contexts.xml
@@ -117,6 +117,11 @@
<topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Sky_Walker_View" label="Sky Walker View"/>
</context>
+ <context id="test_run_view" title="Test Run View">
+ <description>The Test Run View provides an integration point with OTE (OSEE Test Environment).</description>
+ <topic href="OSEE/Users_Guide/Features/Views-and-Editors.html#Test_Run_View" label="Test Run 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"/>
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 4253b125e23..07f7b6a65ba 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
@@ -49,6 +49,8 @@ public final class OseeHelpContext {
public static final HelpContext SKY_WALKER_VIEW = toContext("sky_walker_view");
+ public static final HelpContext TEST_RUN_VIEW = toContext("test_run_view");
+
public static final HelpContext TABLE_CUSTOMIZATIONS = toContext("xviewer_table_customization");
public static final HelpContext RESULTS_VIEW = toContext("xviewer_xresult_view");
diff --git a/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF
index 43324635d46..a7ef6b8ad0b 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF
@@ -44,6 +44,7 @@ Import-Package: com.lowagie.text;version="2.1.7",
org.eclipse.osee.framework.core.model,
org.eclipse.osee.framework.core.model.type,
org.eclipse.osee.framework.core.util,
+ org.eclipse.osee.framework.help.ui,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.jdk.core.util.io.xml,
diff --git a/plugins/org.eclipse.osee.ote.ui.define/build.properties b/plugins/org.eclipse.osee.ote.ui.define/build.properties
index 97ff2f7c567..36d75b6762f 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/build.properties
+++ b/plugins/org.eclipse.osee.ote.ui.define/build.properties
@@ -4,5 +4,4 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
images/,\
- templates/,\
- help/
+ templates/
diff --git a/plugins/org.eclipse.osee.ote.ui.define/help/contexts.xml b/plugins/org.eclipse.osee.ote.ui.define/help/contexts.xml
deleted file mode 100644
index bd5c792932f..00000000000
--- a/plugins/org.eclipse.osee.ote.ui.define/help/contexts.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<contexts>
-<!--
- <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>
--->
-</contexts>
diff --git a/plugins/org.eclipse.osee.ote.ui.define/help/testRunView.html b/plugins/org.eclipse.osee.ote.ui.define/help/testRunView.html
deleted file mode 100644
index 1c5beff934a..00000000000
--- a/plugins/org.eclipse.osee.ote.ui.define/help/testRunView.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body>
-<h1>Test Run View</h1>
-
-<img src="testrunview.jpg"/>
-
-<p>
-The test run view is used for viewing test run results. It can view a summary of output files that exist on a file system and it will upload those output files to the OSEE data store. It can also be used to view previous test runs that have been uploaded to the OSEE data store.
-</p>
-</body>
-</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ote.ui.define/help/testrunview.jpg b/plugins/org.eclipse.osee.ote.ui.define/help/testrunview.jpg
deleted file mode 100644
index f7fb3967e0b..00000000000
--- a/plugins/org.eclipse.osee.ote.ui.define/help/testrunview.jpg
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.ote.ui.define/help/testrunview.xcf b/plugins/org.eclipse.osee.ote.ui.define/help/testrunview.xcf
deleted file mode 100644
index 75d3f072d17..00000000000
--- a/plugins/org.eclipse.osee.ote.ui.define/help/testrunview.xcf
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.ote.ui.define/help/toc.xml b/plugins/org.eclipse.osee.ote.ui.define/help/toc.xml
deleted file mode 100644
index 8359ba92cdf..00000000000
--- a/plugins/org.eclipse.osee.ote.ui.define/help/toc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc link_to="../org.eclipse.osee.ote.core/help/toc.xml#tools" label="Mux View">
- <topic href="help/testRunView.html" label="Test Run View">
- </topic>
-
-
-</toc> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ote.ui.define/plugin.xml b/plugins/org.eclipse.osee.ote.ui.define/plugin.xml
index 0aa9d779a07..989f787b889 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/plugin.xml
+++ b/plugins/org.eclipse.osee.ote.ui.define/plugin.xml
@@ -170,19 +170,6 @@
</PropertyStoreControl>
</extension>
<extension
- point="org.eclipse.help.contexts">
- <contexts
- file="help/contexts.xml">
- </contexts>
- </extension>
- <extension
- point="org.eclipse.help.toc">
- <toc
- file="help/toc.xml"
- primary="false">
- </toc>
- </extension>
- <extension
point="org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider">
<ArtifactImageProvider
class="org.eclipse.osee.ote.ui.define.OteArtifactImageProvider">
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunView.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunView.java
index d498a48f6d6..8059bbcaf7d 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunView.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunView.java
@@ -23,10 +23,12 @@ import org.eclipse.jface.action.Separator;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.osee.framework.help.ui.OseeHelpContext;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.osee.ote.ui.define.OteDefineImage;
@@ -104,11 +106,13 @@ public class TestRunView extends ViewPart implements IActionable, IDataChangedLi
});
onDataChanged();
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, "org.eclipse.osee.ote.ui.define.testRunView");
+ HelpUtil.setHelp(parent, OseeHelpContext.TEST_RUN_VIEW);
+ HelpUtil.setHelp(viewer.getTree(), OseeHelpContext.TEST_RUN_VIEW);
}
@Override
public void setFocus() {
+ //
}
@Override

Back to the top