Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddunne2010-09-24 17:04:44 -0400
committerRyan D. Brooks2010-09-24 17:04:44 -0400
commite899d798bb8099aa0c9911a03db5a58e235496f0 (patch)
treee249b0bc8ef0c07cdd6c6eaf16f73b8c5e2b0fae /plugins
parentf7668b3e4e34dfe032ee7b68b77d08061f6e155b (diff)
downloadorg.eclipse.osee-e899d798bb8099aa0c9911a03db5a58e235496f0.tar.gz
org.eclipse.osee-e899d798bb8099aa0c9911a03db5a58e235496f0.tar.xz
org.eclipse.osee-e899d798bb8099aa0c9911a03db5a58e235496f0.zip
refactor: Cleanup activators and unnecessary usage of OseeUiActivator
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/internal/OseeAtsConfigDemoActivator.java13
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java5
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/help/WorkAttrHelpResource.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java7
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsPlugin.java30
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsQuickSearchComposite.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java5
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorXWidgetActionPage.java5
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskTabXWidgetActionPage.java8
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsActionBrowserListener.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsNotifyUsers.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPriority.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ActionImportWizard.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsPriorityDialog.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorPaletteFactory.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXWidgetActionPage.java2
-rw-r--r--plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java31
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java2
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java3
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/Activator.java22
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java2
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/DefinePlugin.java2
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java5
-rw-r--r--plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/OseeActivator.java5
-rw-r--r--plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/PluginUtil.java (renamed from plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/ActivatorHelper.java)30
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/Activator.java (renamed from plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminPlugin.java)33
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminAction.java54
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java7
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/ClientsStatsTab.java5
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbCellModifier.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbModel.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/Activator.java (renamed from plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/BranchGraphActivator.java)10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphActionBarContributor.java16
-rw-r--r--plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditor.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphPaletteProvider.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPart.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeFormActivator.java5
-rw-r--r--plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeUiActions.java89
-rw-r--r--plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeUiActivator.java39
-rw-r--r--plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/internal/OseePluginUiActivator.java1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/HelpUtil.java40
-rw-r--r--plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/ControlPlugin.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/view/ServiceManagerView.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditorActionBarContributor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportActionBarContributor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java2
-rw-r--r--plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/OteDefinePlugin.java11
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/OteUiDefinePlugin.java4
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunView.java2
-rw-r--r--plugins/org.eclipse.osee.ote.ui.host.cmd/src/org/eclipse/osee/ote/ui/host/cmd/UiPlugin.java1
-rw-r--r--plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/MarkerPlugin.java39
-rw-r--r--plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ProcessOutfileSax.java6
-rw-r--r--plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/internal/Activator.java10
-rw-r--r--plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/view/MessageView.java11
-rw-r--r--plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java5
-rw-r--r--plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/internal/TestManagerPlugin.java2
-rw-r--r--plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/jobs/StoreOutfileJob.java2
-rw-r--r--plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/AdvancedPage.java3
-rw-r--r--plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/HostPage.java4
-rw-r--r--plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java7
-rw-r--r--plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/ScriptPage.java3
-rw-r--r--plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/scriptTable/ScriptTableViewer.java2
-rw-r--r--plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/TestCoreGuiPlugin.java2
-rw-r--r--plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java2
97 files changed, 339 insertions, 439 deletions
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/internal/OseeAtsConfigDemoActivator.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/internal/OseeAtsConfigDemoActivator.java
index 63aaf190ff..46ee812c3e 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/internal/OseeAtsConfigDemoActivator.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/internal/OseeAtsConfigDemoActivator.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.ats.config.demo.internal;
import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -25,7 +24,7 @@ public class OseeAtsConfigDemoActivator extends OseeUiActivator {
* The constructor.
*/
public OseeAtsConfigDemoActivator() {
- super();
+ super(PLUGIN_ID);
plugin = this;
}
@@ -33,14 +32,4 @@ public class OseeAtsConfigDemoActivator extends OseeUiActivator {
return plugin;
}
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
index c521a0ae4a..924779284a 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
@@ -31,6 +31,7 @@ import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
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.ArtifactLabelProvider;
import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter;
import org.eclipse.osee.framework.ui.skynet.util.filteredTree.OSEECheckedFilteredTree;
@@ -159,7 +160,7 @@ public class NewActionPage1 extends WizardPage {
}
private void setHelpContexts() {
- AtsPlugin.getInstance().setHelp(this.getControl(), "new_action_wizard_page_1", "org.eclipse.osee.ats.help.ui");
+ HelpUtil.setHelp(this.getControl(), "new_action_wizard_page_1", "org.eclipse.osee.ats.help.ui");
}
public Set<ActionableItemArtifact> getSelectedActionableItemArtifacts() {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java
index abc4836a13..b99a4e0448 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java
@@ -19,6 +19,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.skynet.widgets.XCombo;
import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;
import org.eclipse.osee.framework.ui.skynet.widgets.XText;
@@ -105,7 +106,7 @@ public class NewActionPage2 extends WizardPage {
}
private void setHelpContexts() {
- AtsPlugin.getInstance().setHelp(this.getControl(), "new_action_wizard_page_2", "org.eclipse.osee.ats.help.ui");
+ HelpUtil.setHelp(this.getControl(), "new_action_wizard_page_2", "org.eclipse.osee.ats.help.ui");
}
private void handlePopulateWithDebugInfo() {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
index 0be1330986..37c733dd0b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
@@ -348,7 +348,7 @@ public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEvent
private ToolBar createToolBar(Composite parent) {
ToolBar toolBar = AtsUtil.createCommonToolBar(parent);
- OseeUiActions.addButtonToEditorToolBar(this, SkynetGuiPlugin.getInstance(), toolBar, EDITOR_ID, "ATS Editor");
+ OseeUiActions.addButtonToEditorToolBar(this, SkynetGuiPlugin.PLUGIN_ID, toolBar, EDITOR_ID, "ATS Editor");
AtsUtil.actionToToolItem(toolBar, new ResourceHistoryAction(sma), FrameworkImage.EDIT_BLUE);
AtsUtil.actionToToolItem(toolBar, new AccessControlAction(sma), FrameworkImage.AUTHENTICATED);
AtsUtil.actionToToolItem(toolBar, new DirtyReportAction(sma), FrameworkImage.DIRTY);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
index e73bd82338..2b9ac843ee 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
@@ -54,6 +54,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
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.util.HelpUtil;
import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
@@ -141,7 +142,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable {
setLoading(true);
if (sma.getHelpContext() != null) {
- AtsPlugin.getInstance().setHelp(scrolledForm, sma.getHelpContext(), "org.eclipse.osee.ats.help.ui");
+ HelpUtil.setHelp(scrolledForm, sma.getHelpContext(), "org.eclipse.osee.ats.help.ui");
}
refreshData();
@@ -467,7 +468,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable {
toolBarMgr.add(new ResourceHistoryAction(sma));
toolBarMgr.add(new ReloadAction(sma));
- OseeUiActions.addButtonToEditorToolBar(sma.getEditor(), this, AtsPlugin.getInstance(),
+ OseeUiActions.addButtonToEditorToolBar(sma.getEditor(), this, AtsPlugin.PLUGIN_ID,
scrolledForm.getToolBarManager(), SMAEditor.EDITOR_ID, "ATS Editor");
scrolledForm.updateToolBar();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/help/WorkAttrHelpResource.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/help/WorkAttrHelpResource.java
index e40c3e58b4..b8f185e249 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/help/WorkAttrHelpResource.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/help/WorkAttrHelpResource.java
@@ -18,6 +18,7 @@ import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.plugin.core.PluginUtil;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
/**
@@ -34,7 +35,7 @@ public class WorkAttrHelpResource implements IHelpResource {
@Override
public String getHref() {
if (layoutData != null) {
- File file = AtsPlugin.getInstance().getPluginStoreFile(layoutData.getStoreName() + ".html");
+ File file = (new PluginUtil(AtsPlugin.PLUGIN_ID)).getPluginStoreFile(layoutData.getStoreName() + ".html");
String absFile = "file:\\/\\/" + file.getAbsolutePath();
StringBuffer sb = new StringBuffer();
sb.append(AHTML.heading(1, layoutData.getName()));
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java
index cd08d13d0e..196db5e8e0 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java
@@ -39,6 +39,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event.model.Sender;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
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.util.DbConnectionExceptionComposite;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
@@ -83,9 +84,9 @@ public class ActionHyperView extends HyperView implements IActionable, IArtifact
}
AtsBulkLoad.loadConfig(false);
super.createPartControl(top);
- OseeUiActions.addBugToViewToolbar(this, this, AtsPlugin.getInstance(), VIEW_ID, "SkyWalker");
- AtsPlugin.getInstance().setHelp(top, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
- AtsPlugin.getInstance().setHelp(composite, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
+ OseeUiActions.addBugToViewToolbar(this, this, AtsPlugin.PLUGIN_ID, VIEW_ID, "SkyWalker");
+ HelpUtil.setHelp(top, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
+ HelpUtil.setHelp(composite, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
OseeEventManager.addListener(this);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java
index 95909d62c0..3f749bb63d 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java
@@ -97,7 +97,7 @@ public class ArtifactHyperView extends HyperView implements IArtifactEventListen
return;
}
super.createPartControl(top);
- OseeUiActions.addBugToViewToolbar(this, this, AtsPlugin.getInstance(), VIEW_ID, "ATS Action View");
+ OseeUiActions.addBugToViewToolbar(this, this, AtsPlugin.PLUGIN_ID, VIEW_ID, "ATS Action View");
OseeEventManager.addListener(this);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsPlugin.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsPlugin.java
index 060cffff79..20d25518a8 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsPlugin.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsPlugin.java
@@ -15,11 +15,11 @@ import org.eclipse.osee.ats.config.AtsCacheManager;
import org.eclipse.osee.ats.util.AtsNotifyUsers;
import org.eclipse.osee.ats.util.AtsPreSaveCacheRemoteEventHandler;
import org.eclipse.osee.framework.core.services.CmAccessControl;
+import org.eclipse.osee.framework.core.util.OsgiUtil;
import org.eclipse.osee.framework.core.util.ServiceDependencyTracker;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.plugin.core.IActionReportingService;
-import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
+import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -28,14 +28,12 @@ import org.osgi.framework.ServiceRegistration;
*
* @author Donald G. Dunne
*/
-public class AtsPlugin extends OseeUiActivator {
+public class AtsPlugin implements BundleActivator {
public static final String PLUGIN_ID = "org.eclipse.osee.ats";
private static AtsPlugin pluginInstance;
-
private ServiceRegistration service1;
private ServiceRegistration service2;
-
private ServiceDependencyTracker tracker;
private AtsCmAccessControlRegHandler cmAccessHandler;
@@ -44,12 +42,11 @@ public class AtsPlugin extends OseeUiActivator {
AtsPlugin.pluginInstance = this;
AtsPreSaveCacheRemoteEventHandler.start();
AtsCacheManager.start();
- AtsNotifyUsers.getInstance();
+ AtsNotifyUsers.start();
}
@Override
public void start(BundleContext context) throws Exception {
- super.start(context);
service1 =
context.registerService(IActionReportingService.class.getName(), new AtsActionReportingServiceImpl(), null);
service2 = context.registerService(IOseeCmService.class.getName(), new OseeAtsServiceImpl(), null);
@@ -64,21 +61,9 @@ public class AtsPlugin extends OseeUiActivator {
@Override
public void stop(BundleContext context) throws Exception {
- if (tracker != null) {
- Lib.close(tracker);
- }
- if (service1 != null) {
- service1.unregister();
- }
- if (service2 != null) {
- service2.unregister();
- }
- super.stop(context);
- }
-
- @Override
- protected String getPluginName() {
- return PLUGIN_ID;
+ OsgiUtil.close(tracker);
+ OsgiUtil.close(service1);
+ OsgiUtil.close(service2);
}
public static AtsPlugin getInstance() {
@@ -88,4 +73,5 @@ public class AtsPlugin extends OseeUiActivator {
public CmAccessControl getCmService() {
return cmAccessHandler.getCmService();
}
+
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsQuickSearchComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsQuickSearchComposite.java
index 3ef8da30e3..f8b4931f9d 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsQuickSearchComposite.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsQuickSearchComposite.java
@@ -17,6 +17,7 @@ import org.eclipse.osee.ats.world.WorldEditor;
import org.eclipse.osee.ats.world.WorldEditorOperationProvider;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.plugin.core.PluginUtil;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox;
import org.eclipse.osee.framework.ui.swt.ALayout;
@@ -65,7 +66,7 @@ public class AtsQuickSearchComposite extends Composite {
public void mouseDoubleClick(MouseEvent mouseEvent) {
if (mouseEvent.button == 3) {
try {
- File file = AtsPlugin.getInstance().getPluginFile("support/OSEEDay.wav");
+ File file = (new PluginUtil(AtsPlugin.PLUGIN_ID)).getPluginFile("support/OSEEDay.wav");
Program.launch(file.getAbsolutePath());
} catch (Exception ex) {
OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java
index 5abfd5c5b2..51200032b3 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java
@@ -46,6 +46,7 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory;
import org.eclipse.osee.framework.ui.skynet.action.CollapseAllAction;
@@ -133,7 +134,7 @@ public class NavigateView extends ViewPart implements IActionable {
}
xNavComp = new AtsNavigateComposite(AtsNavigateViewItems.getInstance(), parent, SWT.NONE);
- AtsPlugin.getInstance().setHelp(xNavComp, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
+ HelpUtil.setHelp(xNavComp, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
createToolBar();
// add search text box
@@ -241,7 +242,7 @@ public class NavigateView extends ViewPart implements IActionable {
IMenuManager mm = bars.getMenuManager();
mm.add(new NewAction());
mm.add(new NewGoal());
- mm.add(OseeUiActions.createBugAction(AtsPlugin.getInstance(), this, VIEW_ID, "ATS Navigator"));
+ mm.add(OseeUiActions.createBugAction(AtsPlugin.PLUGIN_ID, this, VIEW_ID, "ATS Navigator"));
toolbarManager.update(true);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorXWidgetActionPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorXWidgetActionPage.java
index 2bf955ff37..29a47c2093 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorXWidgetActionPage.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorXWidgetActionPage.java
@@ -36,6 +36,7 @@ import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+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.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.action.RefreshAction;
@@ -81,7 +82,7 @@ public class TaskEditorXWidgetActionPage extends AtsXWidgetActionFormPage implem
resultsContainer = toolkit.createClientContainer(resultsSection, 1);
taskComposite = new TaskComposite(taskEditor, resultsContainer, SWT.BORDER, null);
- AtsPlugin.getInstance().setHelp(taskComposite, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
+ HelpUtil.setHelp(taskComposite, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
return resultsSection;
}
@@ -157,7 +158,7 @@ public class TaskEditorXWidgetActionPage extends AtsXWidgetActionFormPage implem
toolBarManager.add(new RefreshAction(taskComposite));
toolBarManager.add(new Separator());
toolBarManager.add(new NewAction());
- OseeUiActions.addButtonToEditorToolBar(taskEditor, taskEditor, AtsPlugin.getInstance(), toolBarManager,
+ OseeUiActions.addButtonToEditorToolBar(taskEditor, taskEditor, AtsPlugin.PLUGIN_ID, toolBarManager,
TaskEditor.EDITOR_ID, "ATS Task Tab");
toolBarManager.add(new Separator());
createDropDownMenuActions();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskTabXWidgetActionPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskTabXWidgetActionPage.java
index 2aa6593278..fc50000c74 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskTabXWidgetActionPage.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskTabXWidgetActionPage.java
@@ -11,6 +11,7 @@
package org.eclipse.osee.ats.task;
import java.util.logging.Level;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IAction;
@@ -38,6 +39,7 @@ import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+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.ArtifactImageManager;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
@@ -54,6 +56,7 @@ import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.Section;
+import org.osgi.framework.Bundle;
/**
* @author Donald G. Dunne
@@ -80,7 +83,7 @@ public class TaskTabXWidgetActionPage extends AtsXWidgetActionFormPage implement
resultsContainer = toolkit.createClientContainer(resultsSection, 1);
taskComposite = new TaskComposite(smaEditor, resultsContainer, SWT.BORDER, null);
- AtsPlugin.getInstance().setHelp(taskComposite, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
+ HelpUtil.setHelp(taskComposite, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
taskComposite.loadTable();
return resultsSection;
}
@@ -152,7 +155,8 @@ public class TaskTabXWidgetActionPage extends AtsXWidgetActionFormPage implement
toolBarManager.add(new RefreshAction(taskComposite));
toolBarManager.add(new Separator());
toolBarManager.add(new NewAction());
- OseeUiActions.addButtonToEditorToolBar(smaEditor, smaEditor, AtsPlugin.getInstance(), toolBarManager,
+ Bundle bundle = Platform.getBundle(AtsPlugin.PLUGIN_ID);
+ OseeUiActions.addButtonToEditorToolBar(smaEditor, smaEditor, AtsPlugin.PLUGIN_ID, toolBarManager,
TaskEditor.EDITOR_ID, "ATS Task Tab");
toolBarManager.add(new Separator());
createDropDownMenuActions();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsActionBrowserListener.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsActionBrowserListener.java
index da01dddc07..f65aa60bf6 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsActionBrowserListener.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsActionBrowserListener.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.ats.util;
-import org.eclipse.osee.ats.internal.AtsPlugin;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultBrowserHyperCmd;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultBrowserListener;
import org.eclipse.swt.browser.LocationEvent;
@@ -31,7 +31,7 @@ public class AtsActionBrowserListener extends XResultBrowserListener {
XResultBrowserHyperCmd xResultBrowserHyperCmd = XResultBrowserHyperCmd.getCmdStrHyperCmd(cmdStr);
if (xResultBrowserHyperCmd == XResultBrowserHyperCmd.openPriorityHelp) {
event.doit = false;
- AtsPlugin.getInstance().getWorkbench().getHelpSystem().displayHelp(AtsPriority.PRIORITY_HELP_CONTEXT_ID);
+ HelpUtil.displayHelp(AtsPriority.PRIORITY_HELP_CONTEXT_ID);
}
super.changing(event);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsNotifyUsers.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsNotifyUsers.java
index 511a5811dc..9e6ef0688f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsNotifyUsers.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsNotifyUsers.java
@@ -65,6 +65,10 @@ public class AtsNotifyUsers implements IArtifactEventListener {
return instance;
}
+ public static void start() {
+ getInstance();
+ }
+
private AtsNotifyUsers(INotificationManager notificationManager) {
if (DbUtil.isDbInit()) {
return;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPriority.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPriority.java
index 8f503b5d93..495b2b1b29 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPriority.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPriority.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.osee.ats.util;
-import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
/**
* @author Donald G. Dunne
@@ -80,7 +80,7 @@ public class AtsPriority {
};
public static void openHelp() {
- AtsPlugin.getInstance().displayHelp(PRIORITY_HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
+ HelpUtil.displayHelp(PRIORITY_HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ActionImportWizard.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ActionImportWizard.java
index f4812798de..f4aaee8bd6 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ActionImportWizard.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ActionImportWizard.java
@@ -10,11 +10,13 @@
*******************************************************************************/
package org.eclipse.osee.ats.util.Import;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.ui.IImportWizard;
import org.eclipse.ui.IWorkbench;
+import org.osgi.framework.Bundle;
/**
* @author Donald G. Dunne
@@ -25,7 +27,7 @@ public class ActionImportWizard extends Wizard implements IImportWizard {
public ActionImportWizard() {
super();
- setDialogSettings(AtsPlugin.getInstance().getDialogSettings());
+ Bundle bundle = Platform.getBundle(AtsPlugin.PLUGIN_ID);
setWindowTitle("Action Import Wizard");
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java
index 0eabd65315..3daaa03886 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java
@@ -153,7 +153,7 @@ public class XWorkingBranch extends XWidget implements IArtifactWidget, IArtifac
}
});
- if (AtsPlugin.getInstance() != null) {
+ if (SkynetGuiPlugin.getInstance().getOseeCmService() != null) {
createBranchButton.setImage(ImageManager.getImage(FrameworkImage.BRANCH));
deleteBranchButton.setImage(ImageManager.getImage(FrameworkImage.TRASH));
favoriteBranchButton.setImage(ImageManager.getImage(AtsImage.FAVORITE));
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsPriorityDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsPriorityDialog.java
index 0352750a16..b772ddbf22 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsPriorityDialog.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsPriorityDialog.java
@@ -15,10 +15,10 @@ import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsPriority;
import org.eclipse.osee.ats.util.AtsPriority.PriorityType;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.swt.HyperLinkLabel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -74,7 +74,7 @@ public class AtsPriorityDialog extends ListDialog {
getTableViewer().setSelection(new StructuredSelection(sel.toArray(new Object[sel.size()])));
getTableViewer().getTable().setFocus();
}
- AtsPlugin.getInstance().setHelp(getTableViewer().getControl(), AtsPriority.PRIORITY_HELP_CONTEXT_ID,
+ HelpUtil.setHelp(getTableViewer().getControl(), AtsPriority.PRIORITY_HELP_CONTEXT_ID,
"org.eclipse.osee.ats.help.ui");
return c;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java
index 0afef5de62..11587a9665 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java
@@ -64,6 +64,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.EventModType;
import org.eclipse.osee.framework.skynet.core.event.model.Sender;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+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.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
@@ -119,7 +120,7 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im
ContextMenuProvider cmProvider = new AtsWorkflowConfigEditorContextMenuProvider(viewer, getActionRegistry());
viewer.setContextMenu(cmProvider);
getSite().registerContextMenu(cmProvider, viewer);
- AtsPlugin.getInstance().setHelp(viewer.getControl(), "atsConfigureWorkflow", "org.eclipse.osee.ats.help.ui");
+ HelpUtil.setHelp(viewer.getControl(), "atsConfigureWorkflow", "org.eclipse.osee.ats.help.ui");
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorPaletteFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorPaletteFactory.java
index a2e86630aa..ab14734306 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorPaletteFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditorPaletteFactory.java
@@ -155,7 +155,7 @@ final class AtsWorkflowConfigEditorPaletteFactory {
toolbar.add(new ValidateDiagramToolEntry());
final Action action =
- OseeUiActions.createBugAction(AtsPlugin.getInstance(), editor, AtsWorkflowConfigEditor.EDITOR_ID,
+ OseeUiActions.createBugAction(AtsPlugin.PLUGIN_ID, editor, AtsWorkflowConfigEditor.EDITOR_ID,
"ATS Workflow Config Editor");
final ImageDescriptor img = action.getImageDescriptor();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java
index 30a2e7e721..0d5bad89da 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java
@@ -28,6 +28,7 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
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.OseeStatusContributionItemFactory;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
@@ -156,7 +157,7 @@ public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableE
setActivePage(mainPageIndex);
// Until WorldEditor has different help, just use WorldView's help
- AtsPlugin.getInstance().setHelp(worldXWidgetActionPage.getWorldComposite().getControl(), HELP_CONTEXT_ID,
+ HelpUtil.setHelp(worldXWidgetActionPage.getWorldComposite().getControl(), HELP_CONTEXT_ID,
"org.eclipse.osee.ats.help.ui");
} catch (Exception ex) {
OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXWidgetActionPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXWidgetActionPage.java
index 582be5860a..9b4d90b2b7 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXWidgetActionPage.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXWidgetActionPage.java
@@ -124,7 +124,7 @@ public class WorldXWidgetActionPage extends AtsXWidgetActionFormPage {
toolBarManager.add(new RefreshAction(worldComposite));
toolBarManager.add(new Separator());
toolBarManager.add(new NewAction());
- toolBarManager.add(OseeUiActions.createBugAction(AtsPlugin.getInstance(), worldEditor, WorldEditor.EDITOR_ID,
+ toolBarManager.add(OseeUiActions.createBugAction(AtsPlugin.PLUGIN_ID, worldEditor, WorldEditor.EDITOR_ID,
"ATS World"));
toolBarManager.add(new Separator());
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java
index 00e200a5bd..1cdbfe7603 100644
--- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java
@@ -39,6 +39,7 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.AFile;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
+import org.eclipse.osee.framework.plugin.core.PluginUtil;
import org.eclipse.osee.framework.plugin.core.util.OseeData;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
@@ -282,40 +283,34 @@ public class VectorCastImportTest {
* Create dir structure for importer to read
*/
private static void createVCastFileset() throws OseeCoreException, IOException {
+ PluginUtil helper = new PluginUtil(Activator.PLUGIN_ID);
OseeData.getFolder("vcast.wrk").getLocation().toFile();
- Lib.writeStringToFile(AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast.vcp")),
+ Lib.writeStringToFile(AFile.readFile(helper.getPluginFile("support/vcastData/vcast.vcp")),
OseeData.getFile("vcast.wrk/vcast.vcp"));
- Lib.writeStringToFile(AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/CCAST_.CFG")),
+ Lib.writeStringToFile(AFile.readFile(helper.getPluginFile("support/vcastData/CCAST_.CFG")),
OseeData.getFile("vcast.wrk/CCAST_.CFG"));
- Lib.writeStringToFile(AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/CCAST_.CFG")),
+ Lib.writeStringToFile(AFile.readFile(helper.getPluginFile("support/vcastData/CCAST_.CFG")),
OseeData.getFile("vcast.wrk/build_info.xml"));
// create vcast dir and files within
OseeData.getFolder("vcast.wrk/vcast").getLocation().toFile();
Lib.writeStringToFile(
- AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast_aggregate_coverage_report.html")),
+ AFile.readFile(helper.getPluginFile("support/vcastData/vcast_aggregate_coverage_report.html")),
OseeData.getFile("vcast.wrk/vcast/vcast_aggregate_coverage_report.html"));
- Lib.writeStringToFile(
- AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast/test_main.2.LIS")),
+ Lib.writeStringToFile(AFile.readFile(helper.getPluginFile("support/vcastData/vcast/test_main.2.LIS")),
OseeData.getFile("vcast.wrk/vcast/test_main.2.LIS"));
- Lib.writeStringToFile(
- AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast/test_main.2.xml")),
+ Lib.writeStringToFile(AFile.readFile(helper.getPluginFile("support/vcastData/vcast/test_main.2.xml")),
OseeData.getFile("vcast.wrk/vcast/test_main.2.xml"));
- Lib.writeStringToFile(
- AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast/test_scheduler.2.LIS")),
+ Lib.writeStringToFile(AFile.readFile(helper.getPluginFile("support/vcastData/vcast/test_scheduler.2.LIS")),
OseeData.getFile("vcast.wrk/vcast/test_scheduler.2.LIS"));
- Lib.writeStringToFile(
- AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast/test_scheduler.2.xml")),
+ Lib.writeStringToFile(AFile.readFile(helper.getPluginFile("support/vcastData/vcast/test_scheduler.2.xml")),
OseeData.getFile("vcast.wrk/vcast/test_scheduler.2.xml"));
OseeData.getFolder("vcast.wrk/vcast/results").getLocation().toFile();
- Lib.writeStringToFile(
- AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast/results/test_unit_1")),
+ Lib.writeStringToFile(AFile.readFile(helper.getPluginFile("support/vcastData/vcast/results/test_unit_1")),
OseeData.getFile("vcast.wrk/vcast/results/test_unit_1"));
- Lib.writeStringToFile(
- AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast/results/test_unit_2")),
+ Lib.writeStringToFile(AFile.readFile(helper.getPluginFile("support/vcastData/vcast/results/test_unit_2")),
OseeData.getFile("vcast.wrk/vcast/results/test_unit_2"));
- Lib.writeStringToFile(
- AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast/results/test_unit_3")),
+ Lib.writeStringToFile(AFile.readFile(helper.getPluginFile("support/vcastData/vcast/results/test_unit_3")),
OseeData.getFile("vcast.wrk/vcast/results/test_unit_3"));
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java
index bb253f2547..1b40aa359b 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java
@@ -186,7 +186,7 @@ public class CoverageEditor extends FormEditor implements IActionable {
}
public static void addToToolBar(IToolBarManager manager, CoverageEditor coverageEditor) {
- manager.add(OseeUiActions.createBugAction(SkynetGuiPlugin.getInstance(), coverageEditor, EDITOR_ID,
+ manager.add(OseeUiActions.createBugAction(SkynetGuiPlugin.PLUGIN_ID, coverageEditor, EDITOR_ID,
"Lba Code Promote"));
manager.update(true);
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java
index b76a683025..34a0b6dd84 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java
@@ -11,6 +11,7 @@
package org.eclipse.osee.coverage.event;
import java.util.logging.Level;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.coverage.internal.Activator;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -27,7 +28,7 @@ public class OseeMessagingTracker extends ServiceTracker {
private ConnectionNode connectionNode;
public OseeMessagingTracker() {
- super(Activator.getInstance().getBundle().getBundleContext(), MessageService.class.getName(), null);
+ super(Platform.getBundle(Activator.PLUGIN_ID).getBundleContext(), MessageService.class.getName(), null);
}
@Override
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/Activator.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/Activator.java
index 642b905f48..8bb05f8c04 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/Activator.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/Activator.java
@@ -10,29 +10,23 @@
*******************************************************************************/
package org.eclipse.osee.coverage.internal;
-import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
/**
* @author Donald G. Dunne
*/
-public class Activator extends OseeUiActivator {
- private static Activator pluginInstance; // The shared instance.
+public class Activator implements BundleActivator {
public static final String PLUGIN_ID = "org.eclipse.osee.coverage";
- public Activator() {
- super();
- pluginInstance = this;
+ @Override
+ public void start(BundleContext context) throws Exception {
+ // do nothing
}
@Override
- protected String getPluginName() {
- return PLUGIN_ID;
+ public void stop(BundleContext context) throws Exception {
+ // do nothing
}
- /**
- * Returns the shared instance.
- */
- public static Activator getInstance() {
- return pluginInstance;
- }
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java
index 648c93f7f5..bdb0ce06d7 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java
@@ -167,7 +167,7 @@ public class CoverageNavigateView extends ViewPart implements IActionable {
refreshAction.setToolTipText("Refresh");
getViewSite().getActionBars().getMenuManager().add(refreshAction);
- OseeUiActions.addBugToViewToolbar(this, this, Activator.getInstance(), VIEW_ID, "Coverage Navigator");
+ OseeUiActions.addBugToViewToolbar(this, this, Activator.PLUGIN_ID, VIEW_ID, "Coverage Navigator");
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/DefinePlugin.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/DefinePlugin.java
index a5be791f5a..d23860c9be 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/DefinePlugin.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/DefinePlugin.java
@@ -17,7 +17,7 @@ public class DefinePlugin extends OseeUiActivator {
public static final String PLUGIN_ID = "org.eclipse.osee.define";
public DefinePlugin() {
- super();
+ super(PLUGIN_ID);
pluginInstance = this;
}
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 dc24dd68cf..ef54c13fbc 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
@@ -21,6 +21,7 @@ import org.eclipse.osee.define.DefinePlugin;
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.plugin.xnavigate.XNavigateComposite;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
@@ -62,7 +63,7 @@ public class DefineNavigateView extends ViewPart implements IActionable {
xNavComp = new XNavigateComposite(new DefineNavigateViewItems(), parent, SWT.NONE);
xNavComp.getFilteredTree().getViewer().setSorter(new DefineNavigateViewerSorter());
- DefinePlugin.getInstance().setHelp(xNavComp, HELP_CONTEXT_ID, "org.eclipse.osee.define.help.ui");
+ HelpUtil.setHelp(xNavComp, HELP_CONTEXT_ID, "org.eclipse.osee.define.help.ui");
createActions();
xNavComp.refresh();
addExtensionPointListenerBecauseOfWorkspaceLoading();
@@ -105,7 +106,7 @@ public class DefineNavigateView extends ViewPart implements IActionable {
refreshAction.setImageDescriptor(ImageManager.getImageDescriptor(PluginUiImage.REFRESH));
refreshAction.setToolTipText("Refresh");
- OseeUiActions.addBugToViewToolbar(this, this, DefinePlugin.getInstance(), VIEW_ID, "Define Navigator");
+ OseeUiActions.addBugToViewToolbar(this, this, DefinePlugin.PLUGIN_ID, VIEW_ID, "Define Navigator");
}
diff --git a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/OseeActivator.java b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/OseeActivator.java
index 4666f3b597..20d1e91503 100644
--- a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/OseeActivator.java
+++ b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/OseeActivator.java
@@ -19,7 +19,8 @@ import org.osgi.framework.BundleContext;
* @author Ryan D. Brooks
*/
public class OseeActivator extends Plugin {
- private ActivatorHelper helper;
+ private PluginUtil helper;
+ public static String PLUGIN_ID = "PLUGIN_ID";
/**
* The constructor.
@@ -43,7 +44,7 @@ public class OseeActivator extends Plugin {
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
- helper = new ActivatorHelper(context, this);
+ helper = new PluginUtil(PLUGIN_ID);
}
}
diff --git a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/ActivatorHelper.java b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/PluginUtil.java
index 4ee982616c..ec634e5555 100644
--- a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/ActivatorHelper.java
+++ b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/PluginUtil.java
@@ -16,25 +16,19 @@ import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.osgi.framework.BundleContext;
+import org.osgi.framework.Bundle;
/**
* @author Ryan D. Brooks
*/
-public class ActivatorHelper {
- private static Map<String, Plugin> pluginIdToOseePlugin = new HashMap<String, Plugin>();
- private final BundleContext context;
- private final Plugin plugin;
+public class PluginUtil {
+ private final String pluginId;
- public ActivatorHelper(BundleContext context, Plugin plugin) {
- pluginIdToOseePlugin.put(plugin.getBundle().getSymbolicName(), plugin);
- this.context = context;
- this.plugin = plugin;
+ public PluginUtil(String pluginId) {
+ this.pluginId = pluginId;
}
/**
@@ -42,7 +36,8 @@ public class ActivatorHelper {
* myworkspace/.metadata/.plugins/org.eclipse.pde.core/myPlugin/...
*/
public File getPluginStoreFile(String path) {
- return context.getDataFile(path);
+ Bundle bundle = Platform.getBundle(pluginId);
+ return bundle.getBundleContext().getDataFile(path);
}
/**
@@ -62,15 +57,18 @@ public class ActivatorHelper {
}
public InputStream getInputStream(String resource) throws IOException {
- return plugin.getBundle().getEntry(resource).openStream();
+ Bundle bundle = Platform.getBundle(pluginId);
+ return bundle.getEntry(resource).openStream();
}
- public List<URL> getInputStreams(String directory, String pattern, boolean recurse) throws IOException {
- Enumeration<?> enumeration = plugin.getBundle().findEntries(directory, pattern, recurse);
+ public List<URL> getInputStreams(String directory, String pattern, boolean recurse) {
+ Bundle bundle = Platform.getBundle(pluginId);
+ Enumeration<?> enumeration = bundle.findEntries(directory, pattern, recurse);
List<URL> inputs = new ArrayList<URL>();
while (enumeration.hasMoreElements()) {
inputs.add(((URL) enumeration.nextElement()));
}
return inputs;
}
+
}
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.admin/META-INF/MANIFEST.MF
index 8d54a05d2e..fe272360d8 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.admin/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Admin Plug-in (Incubation)
Bundle-SymbolicName: org.eclipse.osee.framework.ui.admin;singleton:=true
Bundle-Version: 0.9.6.qualifier
-Bundle-Activator: org.eclipse.osee.framework.ui.admin.AdminPlugin
+Bundle-Activator: org.eclipse.osee.framework.ui.admin.Activator
Bundle-Vendor: Eclipse Open System Engineering Environment
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminPlugin.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/Activator.java
index d101b2ad15..43ed7e87c1 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminPlugin.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/Activator.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.admin;
-import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
+import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
/**
@@ -18,37 +18,18 @@ import org.osgi.framework.BundleContext;
*
* @author Jeff C. Phillips
*/
-public class AdminPlugin extends OseeUiActivator {
+public class Activator implements BundleActivator {
- // The shared instance.
- private static AdminPlugin pluginInstance;
+ public static String PLUGIN_ID = "org.eclipse.osee.framework.ui.admin";
- /**
- * The constructor.
- */
- public AdminPlugin() {
- pluginInstance = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
@Override
public void start(BundleContext context) throws Exception {
- super.start(context);
+ // do nothing
}
- /**
- * Returns the shared instance.
- */
- public static AdminPlugin getDefault() {
- return pluginInstance;
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ // do nothing
}
- /**
- * Returns the shared instance.
- */
- public static AdminPlugin getInstance() {
- return pluginInstance;
- }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminAction.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminAction.java
deleted file mode 100644
index 0accc21823..0000000000
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminAction.java
+++ /dev/null
@@ -1,54 +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.admin;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Jeff C. Phillips
- */
-public class AdminAction implements IWorkbenchWindowActionDelegate {
-
- @Override
- public void run(IAction proxyAction) {
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- try {
- page.showView(AdminView.VIEW_ID);
- } catch (PartInitException e1) {
- MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "Launch Error",
- "Couldn't Launch Admin View " + e1.getMessage());
- }
- }
-
- // IActionDelegate method
- @Override
- public void selectionChanged(IAction proxyAction, ISelection selection) {
-
- }
-
- // IWorkbenchWindowActionDelegate method
- @Override
- public void init(IWorkbenchWindow window) {
- }
-
- // IWorkbenchWindowActionDelegate method
- @Override
- public void dispose() {
- // nothing to do
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
index ec1272150e..b1b870adee 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
@@ -28,7 +28,6 @@ import org.eclipse.osee.framework.ui.admin.dbtabletab.DbItem;
import org.eclipse.osee.framework.ui.admin.dbtabletab.DbTableTab;
import org.eclipse.osee.framework.ui.admin.dbtabletab.SiteGssflRpcr;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
-import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
@@ -52,7 +51,6 @@ import org.eclipse.ui.part.ViewPart;
*/
public class AdminView extends ViewPart implements IActionable {
- public static final OseeUiActivator plugin = AdminPlugin.getInstance();
public static final String VIEW_ID = "org.eclipse.osee.framework.ui.admin.AdminView";
private static Action saveAction;
private TabFolder tabFolder;
@@ -78,6 +76,7 @@ public class AdminView extends ViewPart implements IActionable {
@Override
public void setFocus() {
+ // do nothing
}
protected void createActions() throws OseeCoreException {
@@ -128,7 +127,7 @@ public class AdminView extends ViewPart implements IActionable {
pingAction.setToolTipText("Ping OSEE Clients");
pingAction.setEnabled(AccessControlManager.isOseeAdmin());
- OseeUiActions.addBugToViewToolbar(this, this, AdminPlugin.getInstance(), VIEW_ID, "Admin");
+ OseeUiActions.addBugToViewToolbar(this, this, Activator.PLUGIN_ID, VIEW_ID, "Admin");
IToolBarManager toolbarManager = getViewSite().getActionBars().getToolBarManager();
toolbarManager.add(saveAction);
@@ -205,7 +204,7 @@ public class AdminView extends ViewPart implements IActionable {
createActions();
} catch (Exception ex) {
- OseeLog.log(AdminPlugin.class, Level.SEVERE, ex);
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/ClientsStatsTab.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/ClientsStatsTab.java
index 6a5a740ffb..4d6b30b16b 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/ClientsStatsTab.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/ClientsStatsTab.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.admin;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -27,12 +26,12 @@ public class ClientsStatsTab {
private Text reportText;
- public ClientsStatsTab(TabFolder tabFolder) throws OseeCoreException {
+ public ClientsStatsTab(TabFolder tabFolder) {
super();
createControl(tabFolder);
}
- private void createControl(TabFolder tabFolder) throws OseeCoreException {
+ private void createControl(TabFolder tabFolder) {
Composite mainComposite = new Composite(tabFolder, SWT.NONE);
mainComposite.setLayout(new GridLayout(2, false));
mainComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java
index 471539fed5..7701988e23 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java
@@ -191,7 +191,7 @@ public class OseeClientsTab {
}
}
} catch (Exception ex) {
- OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
}
return toReturn;
}
@@ -264,8 +264,8 @@ public class OseeClientsTab {
return false;
}
+ @SuppressWarnings("rawtypes")
@Override
- @SuppressWarnings("unchecked")
public Object[] getElements(Object inputElement) {
return ((ArrayList) inputElement).toArray();
}
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbCellModifier.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbCellModifier.java
index a0e014e26f..2197d17a8b 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbCellModifier.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbCellModifier.java
@@ -16,7 +16,7 @@ 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.ui.admin.AdminPlugin;
+import org.eclipse.osee.framework.ui.admin.Activator;
import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.EnumeratedValue;
import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.StringValue;
import org.eclipse.swt.widgets.TableItem;
@@ -76,7 +76,7 @@ public class DbCellModifier implements ICellModifier {
enumeratedValue.setValue(u.getName());
}
} catch (Exception ex) {
- OseeLog.log(AdminPlugin.class, Level.SEVERE, ex);
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
}
return enumeratedValue;
} else if (obj instanceof String) {
@@ -103,7 +103,7 @@ public class DbCellModifier implements ICellModifier {
if (wasObj instanceof Long) {
Long newLong = new Long((String) value);
Long wasLong = (Long) wasObj;
- if (newLong != null && !wasLong.equals(newLong)) {
+ if (!wasLong.equals(newLong)) {
dbModel.setColumn(columnIndex, newLong);
dbModel.setNeedSave(true);
dbModel.setColumnChanged(property);
@@ -119,7 +119,7 @@ public class DbCellModifier implements ICellModifier {
dbModel.setColumnChanged(property);
}
} catch (Exception ex) {
- OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
}
} else if (wasObj instanceof String) {
if (!((String) wasObj).equals(value)) {
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbModel.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbModel.java
index 5f08c85526..66356398ef 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbModel.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbModel.java
@@ -21,9 +21,6 @@ public class DbModel {
private boolean needSave = false;
private final ArrayList<String> changedColumns = new ArrayList<String>();
- public DbModel() {
- }
-
public Object getColumn(int num) {
if (columns.isEmpty() || num > columns.size()) {
return "";
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java
index e09196570a..9f4f884e57 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java
@@ -15,7 +15,7 @@ import java.util.logging.Level;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.ui.admin.AdminPlugin;
+import org.eclipse.osee.framework.ui.admin.Activator;
import org.eclipse.osee.framework.ui.admin.AdminView;
import org.eclipse.osee.framework.ui.skynet.widgets.XCombo;
import org.eclipse.osee.framework.ui.swt.Displays;
@@ -76,7 +76,7 @@ public class DbTableTab {
try {
handleTableSelect();
} catch (OseeCoreException ex) {
- OseeLog.log(AdminPlugin.class, Level.SEVERE, ex);
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
}
AdminView.setSaveNeeded(false);
}
@@ -107,6 +107,7 @@ public class DbTableTab {
@Override
public void mouseHover(MouseEvent e) {
+ // do nothing
}
});
@@ -132,6 +133,7 @@ public class DbTableTab {
@Override
public void mouseHover(MouseEvent e) {
+ // do nothing
}
});
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java
index 404b4f281e..3653f29d3a 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java
@@ -226,8 +226,7 @@ public class DbTableViewer {
* Create the TableViewer
*/
private void createTableViewer() {
- tableViewer = new TableViewer(table) {
- };
+ tableViewer = new TableViewer(table);
tableViewer.setUseHashlookup(true);
if (dbItem.isWriteAccess()) {
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java
index b2b5f9c8f9..baac0132e3 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java
@@ -15,7 +15,7 @@ import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.admin.AdminPlugin;
+import org.eclipse.osee.framework.ui.admin.Activator;
public class OseeInfoDbItem extends DbItem {
@@ -51,7 +51,7 @@ public class OseeInfoDbItem extends DbItem {
chStmt.runPreparedQuery(query);
toReturn = chStmt.next();
} catch (OseeCoreException ex) {
- OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
} finally {
if (chStmt != null) {
chStmt.close();
@@ -74,7 +74,7 @@ public class OseeInfoDbItem extends DbItem {
ConnectionHandler.runPreparedUpdate(query, key, value);
}
} catch (OseeCoreException ex) {
- OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java
index 39fe43babe..f1b5659e7b 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java
@@ -15,7 +15,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.admin.AdminPlugin;
+import org.eclipse.osee.framework.ui.admin.Activator;
public class SiteGssflRpcr extends DbItem {
@@ -50,7 +50,7 @@ public class SiteGssflRpcr extends DbItem {
return ConnectionHandler.runPreparedQueryFetchInt(0,
"SELECT count(1) FROM " + getTableName() + " WHERE PROGRAM = ?", returnTic(program)) > 0;
} catch (OseeDataStoreException ex) {
- OseeLog.log(AdminPlugin.class, Level.SEVERE, ex);
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
return false;
}
}
@@ -70,7 +70,7 @@ public class SiteGssflRpcr extends DbItem {
ConnectionHandler.runPreparedUpdate(query, program, dir, programId);
}
} catch (OseeCoreException ex) {
- OseeLog.log(AdminPlugin.class, Level.SEVERE, ex);
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF
index 83aac45c7c..5bd94811b1 100644
--- a/plugins/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/META-INF/MANIFEST.MF
@@ -24,5 +24,5 @@ Import-Package: org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.logging,
org.eclipse.osee.framework.ui.swt
-Bundle-Activator: org.eclipse.osee.framework.ui.branch.graph.BranchGraphActivator
+Bundle-Activator: org.eclipse.osee.framework.ui.branch.graph.Activator
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/BranchGraphActivator.java b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/Activator.java
index 8df9bf282a..72133a08b7 100644
--- a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/BranchGraphActivator.java
+++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/Activator.java
@@ -16,13 +16,13 @@ import org.osgi.framework.BundleContext;
/**
* @author Roberto E. Escobar
*/
-public class BranchGraphActivator extends OseeUiActivator {
+public class Activator extends OseeUiActivator {
public static final String PLUGIN_ID = "org.eclipse.osee.framework.ui.branch.graph";
+ private static Activator plugin;
- private static BranchGraphActivator plugin;
-
- public BranchGraphActivator() {
+ protected Activator() {
+ super(PLUGIN_ID);
}
@Override
@@ -37,7 +37,7 @@ public class BranchGraphActivator extends OseeUiActivator {
super.stop(context);
}
- public static BranchGraphActivator getInstance() {
+ public static Activator getInstance() {
return plugin;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphActionBarContributor.java b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphActionBarContributor.java
index c50f4ada31..be321997ba 100644
--- a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphActionBarContributor.java
+++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphActionBarContributor.java
@@ -17,8 +17,7 @@ import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IMenuCreator;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.osee.framework.ui.branch.graph.BranchGraphActivator;
+import org.eclipse.osee.framework.ui.branch.graph.Activator;
import org.eclipse.osee.framework.ui.branch.graph.parts.GraphEditPart;
import org.eclipse.osee.framework.ui.branch.graph.utility.GraphOptions;
import org.eclipse.osee.framework.ui.branch.graph.utility.GraphOptions.ConnectionFilter;
@@ -34,7 +33,6 @@ import org.eclipse.ui.IEditorPart;
*/
public class BranchGraphActionBarContributor extends ActionBarContributor {
private BranchGraphEditor editor;
- private final IPreferenceStore store = BranchGraphActivator.getInstance().getPreferenceStore();
private static ToggleFilterConnectionAction[] toggleFilterConnectionAction;
private static ToggleTxFilterAction[] toggleTxFilterAction;
@@ -47,6 +45,7 @@ public class BranchGraphActionBarContributor extends ActionBarContributor {
@Override
protected void buildActions() {
+ // do nothing
}
@Override
@@ -84,13 +83,15 @@ public class BranchGraphActionBarContributor extends ActionBarContributor {
public ToggleFilterConnectionAction(String text, ConnectionFilter show) {
super(text, AS_RADIO_BUTTON);
this.show = show;
- setChecked(show.ordinal() == store.getInt(GraphOptions.FILTER_CONNECTIONS_PREFERENCE));
+ setChecked(show.ordinal() == Activator.getInstance().getPreferenceStore().getInt(
+ GraphOptions.FILTER_CONNECTIONS_PREFERENCE));
}
@Override
public void run() {
if (isChecked()) {
- store.setValue(GraphOptions.FILTER_CONNECTIONS_PREFERENCE, show.ordinal());
+ Activator.getInstance().getPreferenceStore().setValue(GraphOptions.FILTER_CONNECTIONS_PREFERENCE,
+ show.ordinal());
GraphEditPart graphEditPart = (GraphEditPart) editor.getViewer().getContents();
graphEditPart.setConnectionVisibility();
}
@@ -104,13 +105,14 @@ public class BranchGraphActionBarContributor extends ActionBarContributor {
public ToggleTxFilterAction(String text, TxFilter show) {
super(text, AS_RADIO_BUTTON);
this.show = show;
- setChecked(show.ordinal() == store.getInt(GraphOptions.TRANSACTION_FILTER));
+ setChecked(show.ordinal() == Activator.getInstance().getPreferenceStore().getInt(
+ GraphOptions.TRANSACTION_FILTER));
}
@Override
public void run() {
if (isChecked()) {
- store.setValue(GraphOptions.TRANSACTION_FILTER, show.ordinal());
+ Activator.getInstance().getPreferenceStore().setValue(GraphOptions.TRANSACTION_FILTER, show.ordinal());
GraphEditPart graphEditPart = (GraphEditPart) editor.getViewer().getContents();
graphEditPart.setTxVisibility();
}
diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditor.java b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditor.java
index 77ad051966..3af01c92c4 100644
--- a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditor.java
+++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditor.java
@@ -39,7 +39,7 @@ import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
import org.eclipse.jface.action.IAction;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.ui.branch.graph.BranchGraphActivator;
+import org.eclipse.osee.framework.ui.branch.graph.Activator;
import org.eclipse.osee.framework.ui.branch.graph.model.GraphCache;
import org.eclipse.osee.framework.ui.branch.graph.operation.LoadGraphOperation;
import org.eclipse.osee.framework.ui.branch.graph.parts.GraphEditPartFactory;
@@ -85,7 +85,7 @@ public class BranchGraphEditor extends GraphicalEditorWithFlyoutPalette {
setPartName(editorInput.getName() + " Graph");
LoadGraphOperation task =
new LoadGraphOperation(getSite().getPart(), getGraphicalViewer(), this, editorInput.getBranch());
- Jobs.runInJob(task.getName(), task, BranchGraphActivator.class, BranchGraphActivator.PLUGIN_ID, true);
+ Jobs.runInJob(task.getName(), task, Activator.class, Activator.PLUGIN_ID, true);
}
@SuppressWarnings("unchecked")
@@ -189,7 +189,7 @@ public class BranchGraphEditor extends GraphicalEditorWithFlyoutPalette {
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(
"org.eclipse.ui.views.ContentOutline");
} catch (PartInitException ex) {
- OseeLog.log(BranchGraphActivator.class, Level.SEVERE, ex);
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
}
// viewer.setHelpContext(MAIN_HELP_CONTEXT);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphPaletteProvider.java b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphPaletteProvider.java
index ecd520826d..df770593e0 100644
--- a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphPaletteProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphPaletteProvider.java
@@ -21,7 +21,7 @@ import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.tools.AbstractTool;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.framework.ui.branch.graph.BranchGraphActivator;
+import org.eclipse.osee.framework.ui.branch.graph.Activator;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.swt.Displays;
@@ -84,7 +84,7 @@ public class BranchGraphPaletteProvider {
toolbar.add(new MarqueeToolEntry());
final Action action =
- OseeUiActions.createBugAction(BranchGraphActivator.getInstance(), editor, BranchGraphEditor.EDITOR_ID,
+ OseeUiActions.createBugAction(Activator.PLUGIN_ID, editor, BranchGraphEditor.EDITOR_ID,
"Branch Graph");
final ImageDescriptor img = action.getImageDescriptor();
diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java
index aaa38c5a00..be9ad56b07 100644
--- a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java
+++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.framework.database.core.JoinUtility;
import org.eclipse.osee.framework.database.core.JoinUtility.TransactionJoinQuery;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.ui.branch.graph.BranchGraphActivator;
+import org.eclipse.osee.framework.ui.branch.graph.Activator;
import org.eclipse.osee.framework.ui.branch.graph.operation.IProgressListener;
/**
@@ -97,7 +97,7 @@ public class GraphLoader {
try {
parentTxId = branchModel.getBranch().getSourceTransaction().getId();
} catch (OseeCoreException ex) {
- OseeLog.log(BranchGraphActivator.class, Level.SEVERE, ex);
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
}
if (parentTxId > 0) {
TxModel txModel = branchModel.getFirstTx();
@@ -107,7 +107,7 @@ public class GraphLoader {
connect(source, txModel);
} else {
OseeLog.log(
- BranchGraphActivator.class,
+ Activator.class,
Level.SEVERE,
String.format("Invalid parent transaction id of [%s] for branch [%s]", parentTxId,
branchModel.getBranch()));
diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPart.java b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPart.java
index 80542d3f2d..115d58e0f5 100644
--- a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPart.java
+++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/parts/GraphEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.branch.graph.BranchGraphActivator;
+import org.eclipse.osee.framework.ui.branch.graph.Activator;
import org.eclipse.osee.framework.ui.branch.graph.figure.BranchFigure;
import org.eclipse.osee.framework.ui.branch.graph.figure.FigureFactory;
import org.eclipse.osee.framework.ui.branch.graph.figure.TxFigure;
@@ -84,7 +84,7 @@ public class GraphEditPart extends AbstractGraphicalEditPart {
this.txNumberToTxFigureMap = new HashMap<Long, TxFigure>();
this.branchesByLevel = new HashCollection<Integer, BranchModel>();
this.connectionMap = new HashCollection<ConnectionType, Connection>();
- this.preferenceStore = BranchGraphActivator.getInstance().getPreferenceStore();
+ this.preferenceStore = Activator.getInstance().getPreferenceStore();
}
/*
@@ -175,7 +175,7 @@ public class GraphEditPart extends AbstractGraphicalEditPart {
txNumberToTxModelMap.put(txNumber, model);
txNumberToTxFigureMap.put(txNumber, FigureFactory.createTxFigure(model));
} else {
- OseeLog.log(BranchGraphActivator.class, Level.SEVERE,
+ OseeLog.log(Activator.class, Level.SEVERE,
String.format("Orphan TxModel: [%s]", model.toString()));
}
}
@@ -281,7 +281,7 @@ public class GraphEditPart extends AbstractGraphicalEditPart {
} else {
TxModel txModel = branchModel.getFirstTx();
if (txModel == null) {
- OseeLog.log(BranchGraphActivator.class, Level.SEVERE,
+ OseeLog.log(Activator.class, Level.SEVERE,
String.format("Branch did not have a starting tx [%s]", branchModel));
} else {
if (txModel.getSourceTx() != null) {
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeFormActivator.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeFormActivator.java
index 845befe4a4..7455f7ad3d 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeFormActivator.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeFormActivator.java
@@ -18,8 +18,13 @@ import org.osgi.framework.BundleContext;
* @author Ryan D. Brooks
*/
public abstract class OseeFormActivator extends OseeUiActivator {
+
private FormColors formColors;
+ protected OseeFormActivator(String pluginId) {
+ super(pluginId);
+ }
+
/**
* This method is called when the plug-in is stopped
*/
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeUiActions.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeUiActions.java
index 7d5f04f14b..cae6c975f7 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeUiActions.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeUiActions.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.framework.ui.plugin;
import java.util.logging.Level;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IToolBarManager;
@@ -31,7 +32,7 @@ import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.part.ViewPart;
-import org.osgi.framework.Version;
+import org.osgi.framework.Bundle;
public final class OseeUiActions {
private static final String BUG_TITLE = "Generate Action Against This Tool";
@@ -62,21 +63,14 @@ public final class OseeUiActions {
}
}
- public static void addButtonToEditorToolBar(final MultiPageEditorPart editorPart, IActionable actionableObject, final OseeUiActivator oseePlugin, IToolBarManager toolBar, final String editorId, final String actionableItem) {
+ public static void addButtonToEditorToolBar(final MultiPageEditorPart editorPart, final IActionable actionableObject, final String pluginId, IToolBarManager toolBar, final String editorId, final String actionableItem) {
if (!isActionReportingServiceAvailable()) {
return;
}
Action bugAction = new Action(BUG_TITLE, IAction.AS_PUSH_BUTTON) {
@Override
public void run() {
- String version = (String) oseePlugin.getBundle().getHeaders().get("Bundle-Version");
- String desc = String.format("Found in \"%s\" version %s.", editorId, version);
- if (editorPart instanceof IActionable) {
- String moreDesc = ((IActionable) editorPart).getActionDescription();
- if (Strings.isValid(moreDesc)) {
- desc += "\n" + moreDesc;
- }
- }
+ String desc = getActionDescription(editorId, pluginId, actionableObject);
reportLogException(actionableItem, desc);
}
};
@@ -85,15 +79,15 @@ public final class OseeUiActions {
toolBar.add(bugAction);
}
- public static void addButtonToEditorToolBar(IActionable actionableObject, final OseeUiActivator oseePlugin, ToolBar toolBar, final String editorId, String actionableItem) {
- addButtonToEditorToolBar(actionableObject, oseePlugin, toolBar, null, editorId, actionableItem);
+ public static void addButtonToEditorToolBar(IActionable actionableObject, final String pluginId, ToolBar toolBar, final String editorId, String actionableItem) {
+ addButtonToEditorToolBar(actionableObject, pluginId, toolBar, null, editorId, actionableItem);
}
- public static void addButtonToEditorToolBar(IActionable actionableObject, final OseeUiActivator oseePlugin, Composite comp, final String editorId, String actionableItem) {
- addButtonToEditorToolBar(actionableObject, oseePlugin, null, comp, editorId, actionableItem);
+ public static void addButtonToEditorToolBar(IActionable actionableObject, final String pluginId, Composite comp, final String editorId, String actionableItem) {
+ addButtonToEditorToolBar(actionableObject, pluginId, null, comp, editorId, actionableItem);
}
- private static void addButtonToEditorToolBar(final IActionable actionableObject, final OseeUiActivator oseePlugin, ToolBar toolBar, Composite comp, final String editorId, final String actionableItem) {
+ private static void addButtonToEditorToolBar(final IActionable actionableObject, final String pluginId, ToolBar toolBar, Composite comp, final String editorId, final String actionableItem) {
if (!isActionReportingServiceAvailable()) {
return;
}
@@ -115,12 +109,7 @@ public final class OseeUiActions {
item.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- String version = (String) oseePlugin.getBundle().getHeaders().get("Bundle-Version");
- String desc = String.format("\n\nItem: %s\nVersion: %s", editorId, version);
- String moreDesc = actionableObject.getActionDescription();
- if (Strings.isValid(moreDesc)) {
- desc += "\n" + moreDesc;
- }
+ String desc = getActionDescription(editorId, pluginId, actionableObject);
reportLogException(actionableItem, desc);
}
});
@@ -132,12 +121,7 @@ public final class OseeUiActions {
@Override
public void widgetSelected(SelectionEvent e) {
- String version = (String) oseePlugin.getBundle().getHeaders().get("Bundle-Version");
- String desc = String.format("\n\nItem: %s\nVersion: %s", editorId, version);
- String moreDesc = actionableObject.getActionDescription();
- if (Strings.isValid(moreDesc)) {
- desc += "\n" + moreDesc;
- }
+ String desc = getActionDescription(editorId, pluginId, actionableObject);
reportLogException(actionableItem, desc);
}
@@ -147,7 +131,29 @@ public final class OseeUiActions {
}
}
- public static void addBugToViewToolbar(final ViewPart viewPart, final IActionable actionableObject, final OseeUiActivator oseePlugin, final String viewId, final String actionableItem) {
+ public static String getActionDescription(String itemId, String pluginId, IActionable actionable) {
+ String desc = "";
+ try {
+ Bundle bundle = Platform.getBundle(pluginId);
+ if (bundle != null) {
+ String version = (String) bundle.getHeaders().get("Bundle-Version");
+ desc = String.format("\n\nItem: %s\nVersion: %s", itemId, version);
+ }
+ String moreDesc = actionable.getActionDescription();
+ if (Strings.isValid(moreDesc)) {
+ if (Strings.isValid(desc)) {
+ desc += "\n" + moreDesc;
+ } else {
+ desc = moreDesc;
+ }
+ }
+ } catch (Exception ex) {
+ OseeLog.log(OseeUiActivator.class, Level.SEVERE, ex);
+ }
+ return desc;
+ }
+
+ public static void addBugToViewToolbar(final ViewPart viewPart, final IActionable actionableObject, final String pluginId, final String viewId, final String actionableItem) {
if (!isActionReportingServiceAvailable()) {
return;
}
@@ -160,12 +166,7 @@ public final class OseeUiActions {
Action bugAction = new Action("Generate Action Against This View") {
@Override
public void run() {
- String version = (String) oseePlugin.getBundle().getHeaders().get("Bundle-Version");
- String desc = String.format("\n\nItem: %s\nVersion: %s", viewId, version);
- String moreDesc = actionableObject.getActionDescription();
- if (!moreDesc.equals("")) {
- desc += "\n" + moreDesc;
- }
+ String desc = getActionDescription(viewId, pluginId, actionableObject);
reportLogException(actionableItem, desc);
}
};
@@ -176,20 +177,20 @@ public final class OseeUiActions {
toolbarManager.add(bugAction);
}
- public static Action createBugAction(OseeUiActivator oseePlugin, IAdaptable target, String itemId, String actionableItem) {
- return new BugAction(oseePlugin, target, itemId, actionableItem);
+ public static Action createBugAction(String pluginId, IAdaptable target, String itemId, String actionableItem) {
+ return new BugAction(pluginId, target, itemId, actionableItem);
}
private static final class BugAction extends Action {
private static String BUG_TITLE = "Generate Action Against This Tool";
- private final OseeUiActivator oseePlugin;
+ private final String pluginId;
private final String itemId;
private final IAdaptable target;
private final String actionableItem;
- public BugAction(OseeUiActivator oseePlugin, IAdaptable target, String itemId, String actionableItem) {
+ public BugAction(String pluginId, IAdaptable target, String itemId, String actionableItem) {
super(BUG_TITLE, IAction.AS_PUSH_BUTTON);
- this.oseePlugin = oseePlugin;
+ this.pluginId = pluginId;
this.itemId = itemId;
this.target = target;
this.actionableItem = actionableItem;
@@ -199,16 +200,8 @@ public final class OseeUiActions {
@Override
public void run() {
- Version version =
- new Version((String) oseePlugin.getBundle().getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION));
- String desc = String.format("Found in \"%s\" version %s.", itemId, version);
IActionable actionable = (IActionable) target.getAdapter(IActionable.class);
- if (actionable != null) {
- String moreDesc = actionable.getActionDescription();
- if (Strings.isValid(moreDesc)) {
- desc += "\n" + moreDesc;
- }
- }
+ String desc = getActionDescription(itemId, pluginId, actionable);
reportLogException(actionableItem, desc);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeUiActivator.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeUiActivator.java
index c55216b449..35a82ba4d7 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeUiActivator.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/OseeUiActivator.java
@@ -22,18 +22,13 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.plugin.core.ActivatorHelper;
+import org.eclipse.osee.framework.plugin.core.PluginUtil;
import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -42,13 +37,12 @@ import org.osgi.framework.BundleContext;
*/
public abstract class OseeUiActivator extends AbstractUIPlugin {
private OseeUiActivator parentPlugin;
- private ActivatorHelper helper;
+ private PluginUtil helper;
+ private final String pluginId;
- /**
- * The constructor.
- */
- protected OseeUiActivator() {
+ protected OseeUiActivator(String pluginId) {
super();
+ this.pluginId = pluginId;
}
/**
@@ -91,8 +85,7 @@ public abstract class OseeUiActivator extends AbstractUIPlugin {
parentPlugin = null;
}
- helper = new ActivatorHelper(context, this);
-
+ helper = new PluginUtil(pluginId);
}
/**
@@ -124,26 +117,6 @@ public abstract class OseeUiActivator extends AbstractUIPlugin {
return null;
}
- public void setHelp(Control control, String name, String library) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(control, library + "." + name);
- }
-
- public void setHelp(IAction action, String name, String library) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(action, library + "." + name);
- }
-
- public void setHelp(Menu menu, String name, String library) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(menu, library + "." + name);
- }
-
- public void setHelp(MenuItem menuItem, String name, String library) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(menuItem, library + "." + name);
- }
-
- public void displayHelp(String name, String library) {
- PlatformUI.getWorkbench().getHelpSystem().displayHelp(library + "." + name);
- }
-
protected String getPluginName() {
throw new UnsupportedOperationException();
}
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/internal/OseePluginUiActivator.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/internal/OseePluginUiActivator.java
index b8626adfb9..d17d4f93a1 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/internal/OseePluginUiActivator.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/internal/OseePluginUiActivator.java
@@ -28,6 +28,7 @@ public class OseePluginUiActivator extends OseeUiActivator {
private ServiceTracker tracker;
public OseePluginUiActivator() {
+ super(PLUGIN_ID);
plugin = this;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/HelpUtil.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/HelpUtil.java
new file mode 100644
index 0000000000..450ccffc6f
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/HelpUtil.java
@@ -0,0 +1,40 @@
+/*
+ * Created on Sep 24, 2010
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.framework.ui.plugin.util;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.ui.PlatformUI;
+
+public class HelpUtil {
+
+ public static void setHelp(Control control, String name, String library) {
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(control, library + "." + name);
+ }
+
+ public static void setHelp(IAction action, String name, String library) {
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(action, library + "." + name);
+ }
+
+ public static void setHelp(Menu menu, String name, String library) {
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(menu, library + "." + name);
+ }
+
+ public static void setHelp(MenuItem menuItem, String name, String library) {
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(menuItem, library + "." + name);
+ }
+
+ public static void displayHelp(String name, String library) {
+ PlatformUI.getWorkbench().getHelpSystem().displayHelp(library + "." + name);
+ }
+
+ public static void displayHelp(String contextId) {
+ PlatformUI.getWorkbench().getHelpSystem().displayHelp();
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/ControlPlugin.java b/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/ControlPlugin.java
index a8646a0cc3..5f1565d475 100644
--- a/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/ControlPlugin.java
+++ b/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/ControlPlugin.java
@@ -26,10 +26,8 @@ public class ControlPlugin extends OseeUiActivator {
private static ControlPlugin pluginInstance; // The shared instance.
private ServiceTracker tracker;
- /**
- * The constructor.
- */
public ControlPlugin() {
+ super(PLUGIN_ID);
pluginInstance = this;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/view/ServiceManagerView.java b/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/view/ServiceManagerView.java
index 64d12b8d70..51d3a931b2 100644
--- a/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/view/ServiceManagerView.java
+++ b/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/view/ServiceManagerView.java
@@ -49,7 +49,7 @@ public class ServiceManagerView extends ViewPart implements IActionable {
this.setContentDescription("Jini Groups { " + StringUtils.join(JiniLookupGroupConfig.getOseeJiniServiceGroups(),
",") + " }");
- OseeUiActions.addBugToViewToolbar(this, this, ControlPlugin.getInstance(), VIEW_ID, "Service Manager");
+ OseeUiActions.addBugToViewToolbar(this, this, ControlPlugin.PLUGIN_ID, VIEW_ID, "Service Manager");
}
private void createServicesViewerPopUp() {
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 d30f03f852..a76abfc511 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
@@ -73,6 +73,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.plugin.util.SelectionCountChangeListener;
import org.eclipse.osee.framework.ui.skynet.access.PolicyDialog;
import org.eclipse.osee.framework.ui.skynet.action.OpenAssociatedArtifactFromBranchProvider;
@@ -355,7 +356,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent
new ArtifactExplorerDragAndDrop(treeViewer, VIEW_ID, this);
- OseeUiActions.addBugToViewToolbar(this, this, SkynetGuiPlugin.getInstance(), VIEW_ID, "Artifact Explorer");
+ OseeUiActions.addBugToViewToolbar(this, this, SkynetGuiPlugin.PLUGIN_ID, VIEW_ID, "Artifact Explorer");
OseeStatusContributionItemFactory.addTo(this, false);
@@ -1280,8 +1281,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent
}
private void setHelpContexts() {
- SkynetGuiPlugin.getInstance().setHelp(treeViewer.getControl(), "artifact_explorer_tree_viewer",
- "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(treeViewer.getControl(), "artifact_explorer_tree_viewer", "org.eclipse.osee.framework.help.ui");
}
@Override
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 4e86e0be76..6d6fef8e9a 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
@@ -26,6 +26,7 @@ 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.artifact.Attribute;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.UniversalCellEditor;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
@@ -326,8 +327,7 @@ public class AttributesComposite extends Composite {
}
private void setHelpContexts() {
- SkynetGuiPlugin.getInstance().setHelp(tableViewer.getControl(), "artifact_editor",
- "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(tableViewer.getControl(), "artifact_editor", "org.eclipse.osee.framework.help.ui");
}
/**
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 a43553f921..bbb5070f3b 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
@@ -42,6 +42,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData;
import org.eclipse.osee.framework.skynet.core.artifact.ISelectedArtifact;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.skynet.action.RevealInExplorerAction;
import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.relation.explorer.RelationExplorerWindow;
@@ -807,8 +808,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact {
}
private void setHelpContexts() {
- SkynetGuiPlugin.getInstance().setHelp(treeViewer.getControl(), "relation_page_tree_viewer",
- "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(treeViewer.getControl(), "relation_page_tree_viewer", "org.eclipse.osee.framework.help.ui");
}
public ToolBar getToolBar() {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java
index ae8df7e5f1..57ea69cd35 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java
@@ -64,7 +64,7 @@ public class SkynetGuiPlugin extends OseeFormActivator implements IBroadcastEven
private final Map<String, ServiceDependencyTracker> trackers = new HashMap<String, ServiceDependencyTracker>();
public SkynetGuiPlugin() {
- super();
+ super(PLUGIN_ID);
pluginInstance = this;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java
index ef62c9374f..1f1feeaf5e 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java
@@ -100,8 +100,7 @@ public class ArtifactEditorActionBarContributor implements IActionContributor {
private final Action createAtsBugAction() {
IEditorSite site = editor.getEditorSite();
- return OseeUiActions.createBugAction(SkynetGuiPlugin.getInstance(), editor, site.getId(),
- site.getRegisteredName());
+ return OseeUiActions.createBugAction(SkynetGuiPlugin.PLUGIN_ID, editor, site.getId(), site.getRegisteredName());
}
private final class RevealBranchAction extends Action {
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 33e4409164..67a28f88af 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
@@ -30,6 +30,7 @@ import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
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.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor;
@@ -151,7 +152,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IActio
}
});
- OseeUiActions.addButtonToEditorToolBar(this, SkynetGuiPlugin.getInstance(), toolBar, EDITOR_ID,
+ OseeUiActions.addButtonToEditorToolBar(this, SkynetGuiPlugin.PLUGIN_ID, toolBar, EDITOR_ID,
"Mass Artifact Editor");
}
@@ -222,8 +223,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IActio
setPartName(((MassArtifactEditorInput) editorInput).getName());
}
- SkynetGuiPlugin.getInstance().setHelp(getContainer(), "mass_artifact_editor",
- "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(getContainer(), "mass_artifact_editor", "org.eclipse.osee.framework.help.ui");
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/blam/BlamEditorActionBarContributor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditorActionBarContributor.java
index a7f059c96c..e61d63cefe 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditorActionBarContributor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditorActionBarContributor.java
@@ -48,7 +48,7 @@ public class BlamEditorActionBarContributor implements IActionContributor {
if (bugAction == null) {
IEditorSite site = editor.getEditorSite();
bugAction =
- OseeUiActions.createBugAction(SkynetGuiPlugin.getInstance(), editor, site.getId(), site.getRegisteredName());
+ OseeUiActions.createBugAction(SkynetGuiPlugin.PLUGIN_ID, editor, site.getId(), site.getRegisteredName());
}
return bugAction;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportActionBarContributor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportActionBarContributor.java
index bc0c2d81a8..f25daaa805 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportActionBarContributor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportActionBarContributor.java
@@ -83,7 +83,7 @@ public class ChangeReportActionBarContributor implements IActionContributor {
if (bugAction == null) {
IEditorSite site = editor.getEditorSite();
bugAction =
- OseeUiActions.createBugAction(SkynetGuiPlugin.getInstance(), editor, site.getId(), site.getRegisteredName());
+ OseeUiActions.createBugAction(SkynetGuiPlugin.PLUGIN_ID, editor, site.getId(), site.getRegisteredName());
}
return bugAction;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
index a6f61c5293..69216f2522 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
@@ -303,7 +303,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I
IToolBarManager toolbarManager = getViewSite().getActionBars().getToolBarManager();
toolbarManager.add(refreshAction);
- OseeUiActions.addBugToViewToolbar(this, this, SkynetGuiPlugin.getInstance(), VIEW_ID, "Group Explorer");
+ OseeUiActions.addBugToViewToolbar(this, this, SkynetGuiPlugin.PLUGIN_ID, VIEW_ID, "Group Explorer");
}
private void handleNewGroup() {
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 695e74777b..12dc0c7bd2 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,7 +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.skynet.SkynetGuiPlugin;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyAdapter;
@@ -275,9 +275,9 @@ public class SearchComposite extends Composite implements Listener {
public void setHelpContext(String helpContext) {
if (Widgets.isAccessible(this.searchArea) && Widgets.isAccessible(this.executeSearch) && Widgets.isAccessible(this.clear)) {
- SkynetGuiPlugin.getInstance().setHelp(searchArea, helpContext, "org.eclipse.osee.framework.help.ui");
- SkynetGuiPlugin.getInstance().setHelp(executeSearch, helpContext, "org.eclipse.osee.framework.help.ui");
- SkynetGuiPlugin.getInstance().setHelp(clear, helpContext, "org.eclipse.osee.framework.help.ui");
+ 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");
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java
index aebc2e20f3..f1b42849ec 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java
@@ -93,7 +93,7 @@ public class ResultsEditor extends AbstractArtifactEditor implements IActionable
public ToolBar createToolBar(Composite parent) {
ToolBar toolBar = ALayout.createCommonToolBar(parent);
- OseeUiActions.addButtonToEditorToolBar(this, SkynetGuiPlugin.getInstance(), toolBar, getEditorId(),
+ OseeUiActions.addButtonToEditorToolBar(this, SkynetGuiPlugin.PLUGIN_ID, toolBar, getEditorId(),
getActionableItemName());
return toolBar;
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 00f77105bc..a8858aaa7f 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
@@ -19,6 +19,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
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.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.action.browser.BrowserPrintAction;
@@ -93,9 +94,8 @@ public class ResultsEditorHtmlTab implements IResultsEditorHtmlTab, IBrowserActi
xResultsComposite.setLayoutData(gd);
xResultsComposite.setHtmlText(xResultPage.getManipulatedHtml(Arrays.asList(Manipulations.NONE)));
- SkynetGuiPlugin.getInstance().setHelp(xResultsComposite, HELP_CONTEXT_ID, "org.eclipse.osee.ats.help.ui");
- SkynetGuiPlugin.getInstance().setHelp(xResultsComposite.getBrowser(), HELP_CONTEXT_ID,
- "org.eclipse.osee.ats.help.ui");
+ 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");
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 0b53788629..1fc9bd0c2c 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
@@ -40,6 +40,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.search.filter.FilterModel;
import org.eclipse.osee.framework.ui.skynet.search.filter.FilterModelList;
@@ -127,7 +128,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl
setControl(parent);
aContainer.setPerformActionEnabled(false);
- SkynetGuiPlugin.getInstance().setHelp(mainComposite, "artifact_search", "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(mainComposite, "artifact_search", "org.eclipse.osee.framework.help.ui");
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 e0b528ae8d..57592246ba 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
@@ -32,6 +32,7 @@ import org.eclipse.osee.framework.core.model.type.AttributeType;
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.HelpUtil;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.AttributeTypeFilteredCheckTreeDialog;
@@ -320,7 +321,7 @@ public class QuickSearchOptionComposite extends Composite {
private void setHelpContextForOption(String optionId, String helpContext) {
Control control = getOrCreateOptionsButton(optionId);
if (Widgets.isAccessible(control)) {
- SkynetGuiPlugin.getInstance().setHelp(control, helpContext, "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(control, helpContext, "org.eclipse.osee.framework.help.ui");
}
}
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 15bfe44ad4..8b9ca0b1e2 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
@@ -206,7 +206,7 @@ public class QuickSearchView extends ViewPart implements IActionable, Listener {
}
private void createActions() {
- OseeUiActions.addBugToViewToolbar(this, this, SkynetGuiPlugin.getInstance(), VIEW_ID, "Quick Search");
+ OseeUiActions.addBugToViewToolbar(this, this, SkynetGuiPlugin.PLUGIN_ID, VIEW_ID, "Quick Search");
}
private void compositeEnablement(SearchComposite composite, boolean enable) {
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 712e9c89da..c98b60376d 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
@@ -40,6 +40,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.Sender;
import org.eclipse.osee.framework.skynet.core.event.model.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event.model.TransactionEventType;
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.OseeStatusContributionItemFactory;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.action.EditTransactionComment;
@@ -131,7 +132,7 @@ public class BranchView extends ViewPart implements IActionable, IBranchEventLis
getSite().registerContextMenu(VIEW_ID, menuManager, xBranchWidget.getXViewer());
getSite().setSelectionProvider(xBranchWidget.getXViewer());
- SkynetGuiPlugin.getInstance().setHelp(parent, HELP_CONTEXT_ID, "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(parent, HELP_CONTEXT_ID, "org.eclipse.osee.framework.help.ui");
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/XBranchWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java
index 4b90d05e20..8b1546d329 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java
@@ -178,7 +178,7 @@ public class XBranchWidget extends XWidget implements IActionable {
}
});
- OseeUiActions.addButtonToEditorToolBar(this, SkynetGuiPlugin.getInstance(), toolBar, BranchView.VIEW_ID,
+ OseeUiActions.addButtonToEditorToolBar(this, SkynetGuiPlugin.PLUGIN_ID, toolBar, BranchView.VIEW_ID,
"Branch Manager");
}
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 2c30066c5f..12c170af40 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
@@ -45,6 +45,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.BranchEvent;
import org.eclipse.osee.framework.skynet.core.event.model.BranchEventType;
import org.eclipse.osee.framework.skynet.core.event.model.Sender;
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.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.OpenWithMenuListener;
import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory;
@@ -167,7 +168,7 @@ public class HistoryView extends ViewPart implements IActionable, IBranchEventLi
getSite().registerContextMenu(VIEW_ID, menuManager, xHistoryWidget.getXViewer());
getSite().setSelectionProvider(xHistoryWidget.getXViewer());
- SkynetGuiPlugin.getInstance().setHelp(parent, HELP_CONTEXT_ID, "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(parent, HELP_CONTEXT_ID, "org.eclipse.osee.framework.help.ui");
OseeStatusContributionItemFactory.addTo(this, true);
setupMenus();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java
index 7fb982f94b..3e95a62a3d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java
@@ -153,7 +153,7 @@ public class XHistoryWidget extends XWidget implements IActionable {
}
});
- OseeUiActions.addButtonToEditorToolBar(this, SkynetGuiPlugin.getInstance(), toolBar, HistoryView.VIEW_ID,
+ OseeUiActions.addButtonToEditorToolBar(this, SkynetGuiPlugin.PLUGIN_ID, toolBar, HistoryView.VIEW_ID,
"Resource History");
new ActionContributionItem(xHistoryViewer.getCustomizeAction()).fill(toolBar, -1);
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 ee6e9b0127..4fa68b610e 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
@@ -54,6 +54,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.AbstractSelectionEnabledHandler;
import org.eclipse.osee.framework.ui.plugin.util.Commands;
+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.OseeStatusContributionItemFactory;
@@ -228,7 +229,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList
mergeXWidget.getXViewer());
getSite().setSelectionProvider(mergeXWidget.getXViewer());
- SkynetGuiPlugin.getInstance().setHelp(parent, HELP_CONTEXT_ID, "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(parent, HELP_CONTEXT_ID, "org.eclipse.osee.framework.help.ui");
OseeEventManager.addListener(this);
OseeEventManager.addListener(this);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
index 9bfc8a6b62..7e5d1dbc1c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
@@ -179,7 +179,7 @@ public class MergeXWidget extends XWidget implements IAdaptable {
manager.add(new ShowDestinationBranchChangeReportAction());
manager.add(new Separator());
manager.add(mergeXViewer.getCustomizeAction());
- manager.add(OseeUiActions.createBugAction(SkynetGuiPlugin.getInstance(), this, MergeView.VIEW_ID, "Merge Manager"));
+ manager.add(OseeUiActions.createBugAction(SkynetGuiPlugin.PLUGIN_ID, this, MergeView.VIEW_ID, "Merge Manager"));
manager.update(true);
}
diff --git a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/OteDefinePlugin.java b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/OteDefinePlugin.java
index bcfde36059..d4d0ba1ace 100644
--- a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/OteDefinePlugin.java
+++ b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/OteDefinePlugin.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.ote.define;
import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -20,15 +19,7 @@ public class OteDefinePlugin extends OseeUiActivator {
public static final String PLUGIN_ID = "org.eclipse.osee.ote.define";
public OteDefinePlugin() {
+ super(PLUGIN_ID);
}
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
}
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/OteUiDefinePlugin.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/OteUiDefinePlugin.java
index 4607ef4df5..c86edef0f6 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/OteUiDefinePlugin.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/OteUiDefinePlugin.java
@@ -20,6 +20,10 @@ public class OteUiDefinePlugin extends OseeUiActivator {
public static final String PLUGIN_ID = "org.eclipse.osee.ote.ui.define";
+ public OteUiDefinePlugin() {
+ super(PLUGIN_ID);
+ }
+
private static OteUiDefinePlugin plugin;
@Override
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 ee8753ed94..d498a48f6d 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
@@ -165,7 +165,7 @@ public class TestRunView extends ViewPart implements IActionable, IDataChangedLi
menuManager.setParent(getViewSite().getActionBars().getMenuManager());
fillMenu(menuManager);
getSite().setSelectionProvider(viewer);
- OseeUiActions.addBugToViewToolbar(this, this, OteUiDefinePlugin.getInstance(), VIEW_ID, "Test Run View");
+ OseeUiActions.addBugToViewToolbar(this, this, OteUiDefinePlugin.PLUGIN_ID, VIEW_ID, "Test Run View");
}
private void fillMenu(IMenuManager menuManager) {
diff --git a/plugins/org.eclipse.osee.ote.ui.host.cmd/src/org/eclipse/osee/ote/ui/host/cmd/UiPlugin.java b/plugins/org.eclipse.osee.ote.ui.host.cmd/src/org/eclipse/osee/ote/ui/host/cmd/UiPlugin.java
index 31e63566a8..e68c04bc5f 100644
--- a/plugins/org.eclipse.osee.ote.ui.host.cmd/src/org/eclipse/osee/ote/ui/host/cmd/UiPlugin.java
+++ b/plugins/org.eclipse.osee.ote.ui.host.cmd/src/org/eclipse/osee/ote/ui/host/cmd/UiPlugin.java
@@ -20,6 +20,7 @@ public class UiPlugin extends OseeUiActivator {
private static UiPlugin plugin;
public UiPlugin() {
+ super(PLUGIN_ID);
plugin = this;
}
diff --git a/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/MarkerPlugin.java b/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/MarkerPlugin.java
index ac79fa1c34..ae181200f8 100644
--- a/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/MarkerPlugin.java
+++ b/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/MarkerPlugin.java
@@ -23,31 +23,19 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
+import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
-public class MarkerPlugin extends OseeUiActivator {
+public class MarkerPlugin implements BundleActivator {
- private FileWatchList filesToWatch;
- // The plug-in ID
+ private static FileWatchList filesToWatch;
public static final String PLUGIN_ID = "org.eclipse.osee.ote.ui.markers";
- // The shared instance
- private static MarkerPlugin plugin;
-
- /**
- * The constructor
- */
- public MarkerPlugin() {
- }
-
@Override
public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
filesToWatch = new FileWatchList();
ResourcesPlugin.getWorkspace().addResourceChangeListener(new IResourceChangeListener() {
@@ -101,26 +89,15 @@ public class MarkerPlugin extends OseeUiActivator {
@Override
public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static MarkerPlugin getDefault() {
- return plugin;
}
- public void addMarkers(IFile file) {
+ public static void addMarkers(IFile file) {
removeMarkers(file);
- Jobs.runInJob("OTE Marker Processing", new ProcessOutfileSax(this, file), MarkerPlugin.class,
- MarkerPlugin.PLUGIN_ID, false);
+ Jobs.runInJob("OTE Marker Processing", new ProcessOutfileSax(file), MarkerPlugin.class, MarkerPlugin.PLUGIN_ID,
+ false);
}
- public void removeMarkers(IFile file) {
+ public static void removeMarkers(IFile file) {
List<IMarker> markers = filesToWatch.get(file);
if (markers != null) {
for (IMarker marker : markers) {
@@ -132,7 +109,7 @@ public class MarkerPlugin extends OseeUiActivator {
}
}
- synchronized void updateMarkerInfo(IFile file, List<IMarker> markers) {
+ static synchronized void updateMarkerInfo(IFile file, List<IMarker> markers) {
List<IMarker> oldMarkers = filesToWatch.get(file);
if (oldMarkers != null) {
oldMarkers.addAll(markers);
diff --git a/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ProcessOutfileSax.java b/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ProcessOutfileSax.java
index 6613532a26..d69d470945 100644
--- a/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ProcessOutfileSax.java
+++ b/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ProcessOutfileSax.java
@@ -40,7 +40,6 @@ import org.xml.sax.helpers.XMLReaderFactory;
public class ProcessOutfileSax implements IExceptionableRunnable {
private final IFile file;
- private final MarkerPlugin plugin;
private static final int _1_MB = 1048576;
private static final int _20_MB = _1_MB * 20;
@@ -50,9 +49,8 @@ public class ProcessOutfileSax implements IExceptionableRunnable {
private CheckPointData currentCheckPoint = null;
protected StackTraceCollection currentStackTrace;
- public ProcessOutfileSax(MarkerPlugin plugin, IFile file) {
+ public ProcessOutfileSax(IFile file) {
this.file = file;
- this.plugin = plugin;
}
@Override
@@ -75,7 +73,7 @@ public class ProcessOutfileSax implements IExceptionableRunnable {
parseContents(contents);
OteMarkerHelper helper = new OteMarkerHelper(this.testPointDatas);
- plugin.updateMarkerInfo(file, helper.getMarkers());
+ MarkerPlugin.updateMarkerInfo(file, helper.getMarkers());
return Status.OK_STATUS;
}
diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/internal/Activator.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/internal/Activator.java
index 7c7c5a82e1..583954abb4 100644
--- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/internal/Activator.java
+++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/internal/Activator.java
@@ -16,15 +16,15 @@ import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
public class Activator extends OseeUiActivator {
- private static Activator pluginInstance;
+ private static Activator pluginInstance;
public static final String PLUGIN_ID = "org.eclipse.osee.ote.ui.message";
-
private ServiceTracker oteClientServiceTracker;
- /**
- * Returns the shared instance.
- */
+ protected Activator() {
+ super(PLUGIN_ID);
+ }
+
public static Activator getDefault() {
return pluginInstance;
}
diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/view/MessageView.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/view/MessageView.java
index 3a5692b255..734ede1afd 100644
--- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/view/MessageView.java
+++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/view/MessageView.java
@@ -34,6 +34,7 @@ import org.eclipse.jface.viewers.ViewerSorter;
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.util.HelpUtil;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.osee.framework.ui.swt.Widgets;
@@ -146,7 +147,7 @@ public class MessageView extends ViewPart implements IActionable, IMessageDictio
contextMenu.setLocation(p);
contextMenu.setVisible(true);
- Activator.getDefault().setHelp(contextMenu, "messageViewWatch", "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(contextMenu, "messageViewWatch", "org.eclipse.osee.framework.help.ui");
}
}
}
@@ -227,9 +228,9 @@ public class MessageView extends ViewPart implements IActionable, IMessageDictio
}
private void setHelpContexts() {
- Activator.getDefault().setHelp(parentComposite.getParent(), "messageView", "org.eclipse.osee.framework.help.ui");
- Activator.getDefault().setHelp(searchButton, "messageViewSearch", "org.eclipse.osee.framework.help.ui");
- Activator.getDefault().setHelp(searchText, "messageViewSearch", "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(parentComposite.getParent(), "messageView", "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(searchButton, "messageViewSearch", "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(searchText, "messageViewSearch", "org.eclipse.osee.framework.help.ui");
}
/**
@@ -485,7 +486,7 @@ public class MessageView extends ViewPart implements IActionable, IMessageDictio
refreshAction.setToolTipText("Reload Messages from JAR");
refreshAction.setImageDescriptor(ImageManager.getImageDescriptor(OteMessageImage.REFRESH));
- OseeUiActions.addBugToViewToolbar(this, this, Activator.getDefault(), VIEW_ID, "Message View");
+ OseeUiActions.addBugToViewToolbar(this, this, Activator.PLUGIN_ID, VIEW_ID, "Message View");
}
protected void createMenus() {
diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java
index 96c2ab84a2..9625823440 100644
--- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java
+++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java
@@ -57,6 +57,7 @@ import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.plugin.core.util.OseeData;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
+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.framework.ui.swt.Widgets;
@@ -392,7 +393,7 @@ public final class WatchView extends ViewPart implements IActionable, IMessageDi
getSite().setSelectionProvider(treeViewer);
treeViewer.addCustomizeToViewToolbar(this);
- OseeUiActions.addBugToViewToolbar(this, this, Activator.getDefault(), VIEW_ID, "Message Watch");
+ OseeUiActions.addBugToViewToolbar(this, this, Activator.PLUGIN_ID, VIEW_ID, "Message Watch");
createMenuActions();
@@ -564,7 +565,7 @@ public final class WatchView extends ViewPart implements IActionable, IMessageDi
}
private void setHelpContexts() {
- Activator.getDefault().setHelp(parentComposite, "messageWatch", "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(parentComposite, "messageWatch", "org.eclipse.osee.framework.help.ui");
}
@Override
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/internal/TestManagerPlugin.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/internal/TestManagerPlugin.java
index 35571785dd..f2ee038b63 100644
--- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/internal/TestManagerPlugin.java
+++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/internal/TestManagerPlugin.java
@@ -57,7 +57,7 @@ public class TestManagerPlugin extends OseeUiActivator {
* The constructor.
*/
public TestManagerPlugin() {
- super();
+ super(PLUGIN_ID);
pluginInstance = this;
}
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/jobs/StoreOutfileJob.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/jobs/StoreOutfileJob.java
index bdae93a4c1..1cde7d5678 100644
--- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/jobs/StoreOutfileJob.java
+++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/jobs/StoreOutfileJob.java
@@ -131,7 +131,7 @@ public class StoreOutfileJob extends Job {
IFile file = AIFile.constructIFile(clientOutfilePath);
if (file != null) {
AIFile.writeToFile(file, new ByteArrayInputStream(outBytes));
- MarkerPlugin.getDefault().addMarkers(file);
+ MarkerPlugin.addMarkers(file);
} else {
Lib.writeBytesToFile(outBytes, new File(clientOutfilePath));
}
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/AdvancedPage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/AdvancedPage.java
index 5b03dc18ea..448a738dce 100644
--- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/AdvancedPage.java
+++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/AdvancedPage.java
@@ -18,6 +18,7 @@ import java.util.logging.Level;
import org.eclipse.osee.framework.jdk.core.type.IPropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.plugin.widgets.IPropertyStoreBasedControl;
import org.eclipse.osee.framework.ui.plugin.widgets.PropertyStoreControlContributions;
import org.eclipse.osee.ote.service.ConnectionEvent;
@@ -79,7 +80,7 @@ public class AdvancedPage extends TestManagerPage {
createBlankArea(parent, 0, true);
computeScrollSize();
- TestManagerPlugin.getInstance().setHelp(this, "tm_advanced_page", "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(this, "tm_advanced_page", "org.eclipse.osee.framework.help.ui");
}
@Override
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/HostPage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/HostPage.java
index 08d9d21beb..8be7ee7fce 100644
--- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/HostPage.java
+++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/HostPage.java
@@ -10,9 +10,9 @@
*******************************************************************************/
package org.eclipse.osee.ote.ui.test.manager.pages;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.ote.service.ConnectionEvent;
import org.eclipse.osee.ote.ui.test.manager.core.TestManagerEditor;
-import org.eclipse.osee.ote.ui.test.manager.internal.TestManagerPlugin;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -26,7 +26,7 @@ public class HostPage extends TestManagerPage {
public HostPage(Composite parent, int style, TestManagerEditor parentTestManager) {
super(parent, style, parentTestManager);
createPage();
- TestManagerPlugin.getInstance().setHelp(this, "tm_hosts_page", "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(this, "tm_hosts_page", "org.eclipse.osee.framework.help.ui");
}
@Override
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java
index 0eb689d833..89dce530ad 100644
--- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java
+++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java
@@ -14,6 +14,7 @@ import java.util.HashMap;
import java.util.Map;
import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
+import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.ote.service.ConnectionEvent;
import org.eclipse.osee.ote.ui.test.manager.core.TestManagerEditor;
import org.eclipse.osee.ote.ui.test.manager.internal.TestManagerPlugin;
@@ -66,7 +67,7 @@ public class OverviewPage extends TestManagerPage implements IActionable {
createPage();
updateLabelText();
computeScrollSize();
- TestManagerPlugin.getInstance().setHelp(this, "tm_overview_page", "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(this, "tm_overview_page", "org.eclipse.osee.framework.help.ui");
}
/**
@@ -122,8 +123,8 @@ public class OverviewPage extends TestManagerPage implements IActionable {
labelMap.put(enumEntry, updateableLabel);
}
- OseeUiActions.addButtonToEditorToolBar(this, TestManagerPlugin.getInstance(), composite,
- TestManagerEditor.namespace, "Test Manager");
+ OseeUiActions.addButtonToEditorToolBar(this, TestManagerPlugin.PLUGIN_ID, composite, TestManagerEditor.namespace,
+ "Test Manager");
}
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/ScriptPage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/ScriptPage.java
index fd54965904..1dac7972a8 100644
--- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/ScriptPage.java
+++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/ScriptPage.java
@@ -20,6 +20,7 @@ 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.OseeUiActivator;
+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.service.ConnectionEvent;
@@ -102,7 +103,7 @@ public abstract class ScriptPage extends TestManagerPage {
sashForm.setWeights(new int[] {8, 2});
computeScrollSize();
- TestManagerPlugin.getInstance().setHelp(this, "tm_scripts_page", "org.eclipse.osee.framework.help.ui");
+ HelpUtil.setHelp(this, "tm_scripts_page", "org.eclipse.osee.framework.help.ui");
}
public void loadStorageString() {
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/scriptTable/ScriptTableViewer.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/scriptTable/ScriptTableViewer.java
index 21c4d8c68b..ad975f9caa 100644
--- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/scriptTable/ScriptTableViewer.java
+++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/scriptTable/ScriptTableViewer.java
@@ -442,7 +442,7 @@ public class ScriptTableViewer {
// newTask.computeExists();
if (newTask.getScriptModel().getOutputModel() != null) {
if (newTask.getScriptModel().getOutputModel().getIFile() != null) {
- MarkerPlugin.getDefault().addMarkers(newTask.getScriptModel().getOutputModel().getIFile());
+ MarkerPlugin.addMarkers(newTask.getScriptModel().getOutputModel().getIFile());
}
}
taskList.addTask(newTask);
diff --git a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/TestCoreGuiPlugin.java b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/TestCoreGuiPlugin.java
index e48750e1b1..14696f906c 100644
--- a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/TestCoreGuiPlugin.java
+++ b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/TestCoreGuiPlugin.java
@@ -44,7 +44,7 @@ public class TestCoreGuiPlugin extends OseeFormActivator {
private RemoteConsoleLauncher tracker;
public TestCoreGuiPlugin() {
- super();
+ super(PLUGIN_ID);
pluginInstance = this;
}
diff --git a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java
index 96b78c326c..edc74c2b00 100644
--- a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java
+++ b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java
@@ -102,7 +102,7 @@ public class OteNavigateView extends ViewPart implements IActionable {
refreshAction.setImageDescriptor(ImageManager.getImageDescriptor(PluginUiImage.REFRESH));
refreshAction.setToolTipText("Refresh");
- OseeUiActions.addBugToViewToolbar(this, this, TestCoreGuiPlugin.getDefault(), VIEW_ID, "OTE Navigator");
+ OseeUiActions.addBugToViewToolbar(this, this, TestCoreGuiPlugin.PLUGIN_ID, VIEW_ID, "OTE Navigator");
}

Back to the top