bug: Move UI code from Activator to EarlyStartup

2 files changed, 40 insertions, 40 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java
index 4803caa0e1e..e41b8b07b5b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java
@@ -13,12 +13,18 @@ package org.eclipse.osee.framework.ui.skynet;
 import java.util.logging.Level;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.UserManager;
+import org.eclipse.osee.framework.skynet.core.utility.DbUtil;
+import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactSaveNotificationHandler;
+import org.eclipse.osee.framework.ui.skynet.blam.operation.SetWorkbenchOverrideIconBlam;
 import org.eclipse.osee.framework.ui.skynet.internal.Activator;
 import org.eclipse.osee.framework.ui.swt.Displays;
 import org.eclipse.ui.IPartListener;
 import org.eclipse.ui.IPerspectiveDescriptor;
 import org.eclipse.ui.IPerspectiveListener;
 import org.eclipse.ui.IStartup;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchListener;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
@@ -33,6 +39,39 @@ public class OseeUiEarlyStartup implements IStartup {
    @Override
    public void earlyStartup() {
       if (PlatformUI.isWorkbenchRunning()) {
+
+         OseeLog.registerLoggerListener(new DialogPopupLoggerListener());
+
+         Displays.ensureInDisplayThread(new Runnable() {
+            @Override
+            public void run() {
+               SetWorkbenchOverrideIconBlam.reloadOverrideImage();
+            }
+         });
+
+         IWorkbench workbench = PlatformUI.getWorkbench();
+         workbench.addWorkbenchListener(new IWorkbenchListener() {
+
+            @Override
+            public void postShutdown(IWorkbench workbench) {
+               // do nothing
+            }
+
+            @Override
+            public boolean preShutdown(IWorkbench workbench, boolean forced) {
+               if (!DbUtil.isDbInit()) {
+                  try {
+                     UserManager.getUser().saveSettings();
+                  } catch (Throwable th) {
+                     th.printStackTrace();
+                  }
+               }
+               return true;
+            }
+         });
+
+         workbench.addWorkbenchListener(new ArtifactSaveNotificationHandler());
+
          Displays.ensureInDisplayThread(new Runnable() {
             @Override
             public void run() {
@@ -77,6 +116,7 @@ public class OseeUiEarlyStartup implements IStartup {
                      }
 
                   });
+
                PlatformUI.getWorkbench().getActiveWorkbenchWindow().addPerspectiveListener(new IPerspectiveListener() {
 
                   @Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/Activator.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/Activator.java
index 7f48385da89..9ae522c0c2b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/Activator.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/Activator.java
@@ -32,14 +32,8 @@ import org.eclipse.osee.framework.skynet.core.event.listener.IBroadcastEventList
 import org.eclipse.osee.framework.skynet.core.event.model.BroadcastEvent;
 import org.eclipse.osee.framework.skynet.core.event.model.BroadcastEventType;
 import org.eclipse.osee.framework.skynet.core.event.model.Sender;
-import org.eclipse.osee.framework.skynet.core.utility.DbUtil;
 import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
-import org.eclipse.osee.framework.ui.skynet.DialogPopupLoggerListener;
-import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactSaveNotificationHandler;
-import org.eclipse.osee.framework.ui.skynet.blam.operation.SetWorkbenchOverrideIconBlam;
 import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchListener;
 import org.eclipse.ui.PlatformUI;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.packageadmin.PackageAdmin;
@@ -108,42 +102,8 @@ public class Activator extends OseeUiActivator implements IBroadcastEventListene
          tracker.open();
       }
 
-      Displays.ensureInDisplayThread(new Runnable() {
-         @Override
-         public void run() {
-            SetWorkbenchOverrideIconBlam.reloadOverrideImage();
-         }
-      });
-
       OseeEventManager.addListener(this);
 
-      if (PlatformUI.isWorkbenchRunning()) {
-
-         OseeLog.registerLoggerListener(new DialogPopupLoggerListener());
-
-         IWorkbench workbench = PlatformUI.getWorkbench();
-         workbench.addWorkbenchListener(new IWorkbenchListener() {
-
-            @Override
-            public void postShutdown(IWorkbench workbench) {
-               // do nothing
-            }
-
-            @Override
-            public boolean preShutdown(IWorkbench workbench, boolean forced) {
-               if (!DbUtil.isDbInit()) {
-                  try {
-                     UserManager.getUser().saveSettings();
-                  } catch (Throwable th) {
-                     th.printStackTrace();
-                  }
-               }
-               return true;
-            }
-         });
-
-         PlatformUI.getWorkbench().addWorkbenchListener(new ArtifactSaveNotificationHandler());
-      }
    }
 
    public static Activator getInstance() {