From e899d798bb8099aa0c9911a03db5a58e235496f0 Mon Sep 17 00:00:00 2001
From: ddunne
Date: Fri, 24 Sep 2010 14:04:44 -0700
Subject: refactor: Cleanup activators and unnecessary usage of OseeUiActivator

---
 .../org/eclipse/osee/ote/ui/message/internal/Activator.java   | 10 +++++-----
 .../src/org/eclipse/osee/ote/ui/message/view/MessageView.java | 11 ++++++-----
 .../src/org/eclipse/osee/ote/ui/message/watch/WatchView.java  |  5 +++--
 3 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'plugins/org.eclipse.osee.ote.ui.message')

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 7c7c5a82e1c..583954abb48 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 3a5692b255f..734ede1afd2 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 96c2ab84a2c..96258234407 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
-- 
cgit v1.2.3