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/org.eclipse.osee.ote.ui.message
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/org.eclipse.osee.ote.ui.message')
-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
3 files changed, 14 insertions, 12 deletions
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

Back to the top