feature[ats_DQ40X]: Display better client connection messages

Change-Id: I8f5b20486c4324d30ec1037dc19f8d781782b8ef

9 files changed, 393 insertions, 364 deletions

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 ce1632a869d..c4c4e562849 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
@@ -77,7 +77,6 @@ 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.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-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;
@@ -268,113 +267,113 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
    @Override
    public void createPartControl(Composite parent) {
       try {
-         if (!DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
-            return;
-         }
-         // TODO: Trigger User Loading to prevent lock up -- Need to remove this once service based
-         UserManager.getUser();
-         GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-         gridData.heightHint = 1000;
-         gridData.widthHint = 1000;
+         if (DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
 
-         parent.setLayout(new GridLayout(1, false));
-         parent.setLayoutData(gridData);
+            // TODO: Trigger User Loading to prevent lock up -- Need to remove this once service based
+            UserManager.getUser();
+            GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+            gridData.heightHint = 1000;
+            gridData.widthHint = 1000;
 
-         branchSelect = new XBranchSelectWidget("");
-         branchSelect.setDisplayLabel(false);
-         branchSelect.setSelection(branch);
-         branchSelect.createWidgets(parent, 1);
+            parent.setLayout(new GridLayout(1, false));
+            parent.setLayoutData(gridData);
 
-         branchSelect.addListener(new Listener() {
-            @Override
-            public void handleEvent(Event event) {
-               try {
-                  IOseeBranch selectedBranch = branchSelect.getData();
-                  if (selectedBranch != null) {
-                     branch = BranchManager.getBranch(selectedBranch);
-                     dragAndDropWorker.updateBranch(selectedBranch);
-                     explore(OseeSystemArtifacts.getDefaultHierarchyRootArtifact(branch));
+            branchSelect = new XBranchSelectWidget("");
+            branchSelect.setDisplayLabel(false);
+            branchSelect.setSelection(branch);
+            branchSelect.createWidgets(parent, 1);
+
+            branchSelect.addListener(new Listener() {
+               @Override
+               public void handleEvent(Event event) {
+                  try {
+                     IOseeBranch selectedBranch = branchSelect.getData();
+                     if (selectedBranch != null) {
+                        branch = BranchManager.getBranch(selectedBranch);
+                        dragAndDropWorker.updateBranch(selectedBranch);
+                        explore(OseeSystemArtifacts.getDefaultHierarchyRootArtifact(branch));
+                     }
+                  } catch (Exception ex) {
+                     setErrorString("Error loading branch (see error log for details): " + ex.getLocalizedMessage());
+                     OseeLog.log(getClass(), Level.SEVERE, ex);
                   }
-               } catch (Exception ex) {
-                  setErrorString("Error loading branch (see error log for details): " + ex.getLocalizedMessage());
-                  OseeLog.log(getClass(), Level.SEVERE, ex);
                }
-            }
 
-         });
+            });
 
-         stackComposite = new Composite(parent, SWT.NONE);
-         stackLayout = new StackLayout();
-         stackComposite.setLayout(stackLayout);
-         stackComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+            stackComposite = new Composite(parent, SWT.NONE);
+            stackLayout = new StackLayout();
+            stackComposite.setLayout(stackLayout);
+            stackComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
-         branchWarningComposite = createBranchWarningComposite(stackComposite);
+            branchWarningComposite = createBranchWarningComposite(stackComposite);
 
-         treeViewer = new TreeViewer(stackComposite);
-         myTree = treeViewer.getTree();
-         Tree tree = treeViewer.getTree();
-         final ArtifactExplorer fArtExplorere = this;
-         tree.addDisposeListener(new DisposeListener() {
+            treeViewer = new TreeViewer(stackComposite);
+            myTree = treeViewer.getTree();
+            Tree tree = treeViewer.getTree();
+            final ArtifactExplorer fArtExplorere = this;
+            tree.addDisposeListener(new DisposeListener() {
 
-            @Override
-            public void widgetDisposed(DisposeEvent e) {
-               ArtifactExplorerEventManager.remove(fArtExplorere);
-            }
-         });
-         treeViewer.setContentProvider(new ArtifactContentProvider());
+               @Override
+               public void widgetDisposed(DisposeEvent e) {
+                  ArtifactExplorerEventManager.remove(fArtExplorere);
+               }
+            });
+            treeViewer.setContentProvider(new ArtifactContentProvider());
 
-         treeViewer.setLabelProvider(new ArtifactLabelProvider(artifactDecorator));
-         treeViewer.addDoubleClickListener(new ArtifactDoubleClick());
-         treeViewer.getControl().setLayoutData(gridData);
+            treeViewer.setLabelProvider(new ArtifactLabelProvider(artifactDecorator));
+            treeViewer.addDoubleClickListener(new ArtifactDoubleClick());
+            treeViewer.getControl().setLayoutData(gridData);
 
-         // We can not use the hash lookup because an artifact may not have a
-         // good equals.
-         // This can be added back once the content provider is converted over to
-         // use job node.
-         treeViewer.setUseHashlookup(false);
+            // We can not use the hash lookup because an artifact may not have a
+            // good equals.
+            // This can be added back once the content provider is converted over to
+            // use job node.
+            treeViewer.setUseHashlookup(false);
 
-         treeViewer.addSelectionChangedListener(new SelectionCountChangeListener(getViewSite()));
-         globalMenuHelper = new ArtifactTreeViewerGlobalMenuHelper(treeViewer);
+            treeViewer.addSelectionChangedListener(new SelectionCountChangeListener(getViewSite()));
+            globalMenuHelper = new ArtifactTreeViewerGlobalMenuHelper(treeViewer);
 
-         IToolBarManager toolbarManager = getViewSite().getActionBars().getToolBarManager();
-         createCollapseAllAction(toolbarManager);
-         createUpAction(toolbarManager);
-         createNewArtifactExplorerAction(toolbarManager);
-         createShowChangeReportAction(toolbarManager);
-         addOpenQuickSearchAction(toolbarManager);
-         toolbarManager.add(new OpenAssociatedArtifactFromBranchProvider(this));
+            IToolBarManager toolbarManager = getViewSite().getActionBars().getToolBarManager();
+            createCollapseAllAction(toolbarManager);
+            createUpAction(toolbarManager);
+            createNewArtifactExplorerAction(toolbarManager);
+            createShowChangeReportAction(toolbarManager);
+            addOpenQuickSearchAction(toolbarManager);
+            toolbarManager.add(new OpenAssociatedArtifactFromBranchProvider(this));
 
-         artifactDecorator.setViewer(treeViewer);
-         artifactDecorator.addActions(getViewSite().getActionBars().getMenuManager(), this);
+            artifactDecorator.setViewer(treeViewer);
+            artifactDecorator.addActions(getViewSite().getActionBars().getMenuManager(), this);
 
-         getSite().setSelectionProvider(treeViewer);
-         addExploreSelection();
+            getSite().setSelectionProvider(treeViewer);
+            addExploreSelection();
 
-         setupPopupMenu();
+            setupPopupMenu();
 
-         myTreeEditor = new TreeEditor(myTree);
-         myTreeEditor.horizontalAlignment = SWT.LEFT;
-         myTreeEditor.grabHorizontal = true;
-         myTreeEditor.minimumWidth = 50;
+            myTreeEditor = new TreeEditor(myTree);
+            myTreeEditor.horizontalAlignment = SWT.LEFT;
+            myTreeEditor.grabHorizontal = true;
+            myTreeEditor.minimumWidth = 50;
 
-         dragAndDropWorker = new ArtifactExplorerDragAndDrop(treeViewer, VIEW_ID, this, branch);
+            dragAndDropWorker = new ArtifactExplorerDragAndDrop(treeViewer, VIEW_ID, this, branch);
 
-         OseeStatusContributionItemFactory.addTo(this, false);
+            OseeStatusContributionItemFactory.addTo(this, false);
 
-         updateEnablementsEtAl();
-         trees.add(tree);
-         HelpUtil.setHelp(treeViewer.getControl(), OseeHelpContext.ARTIFACT_EXPLORER);
+            updateEnablementsEtAl();
+            trees.add(tree);
+            HelpUtil.setHelp(treeViewer.getControl(), OseeHelpContext.ARTIFACT_EXPLORER);
 
-         refreshBranchWarning();
-         getViewSite().getActionBars().updateActionBars();
-         setFocusWidget(treeViewer.getControl());
+            refreshBranchWarning();
+            getViewSite().getActionBars().updateActionBars();
+            setFocusWidget(treeViewer.getControl());
 
+            OseeEventManager.addListener(this);
+            ArtifactExplorerEventManager.add(this);
+         }
       } catch (Exception ex) {
          OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
       }
 
-      OseeEventManager.addListener(this);
-      ArtifactExplorerEventManager.add(this);
    }
 
    private void refreshBranchWarning() {
@@ -1218,43 +1217,42 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
    @Override
    public void init(IViewSite site, IMemento memento) throws PartInitException {
       super.init(site, memento);
+      if (DbConnectionExceptionComposite.dbConnectionIsOk()) {
+         try {
+            if (memento != null && memento.getString(ROOT_GUID) != null && memento.getString(ROOT_BRANCH) != null) {
+               Branch branch = BranchManager.getBranch(Long.parseLong(memento.getString(ROOT_BRANCH)));
 
-      if (OseeUiActivator.areOSEEServicesAvailable().isFalse()) {
-         return;
-      }
-
-      try {
-         if (memento != null && memento.getString(ROOT_GUID) != null && memento.getString(ROOT_BRANCH) != null) {
-            Branch branch = BranchManager.getBranch(Long.parseLong(memento.getString(ROOT_BRANCH)));
-
-            if (!branch.getArchiveState().isArchived() || AccessControlManager.isOseeAdmin()) {
-               Artifact previousArtifact = ArtifactQuery.checkArtifactFromId(memento.getString(ROOT_GUID), branch);
-               if (previousArtifact != null) {
-                  explore(previousArtifact);
-               } else {
-                  /*
-                   * simply means that the previous artifact that was used as the root for the artiactExplorer does not
-                   * exist because it was deleted or this workspace was last used with a different branch or database,
-                   * so let the logic below get the default hierarchy root artifact
-                   */
+               if (!branch.getArchiveState().isArchived() || AccessControlManager.isOseeAdmin()) {
+                  Artifact previousArtifact = ArtifactQuery.checkArtifactFromId(memento.getString(ROOT_GUID), branch);
+                  if (previousArtifact != null) {
+                     explore(previousArtifact);
+                  } else {
+                     /*
+                      * simply means that the previous artifact that was used as the root for the artiactExplorer does
+                      * not exist because it was deleted or this workspace was last used with a different branch or
+                      * database, so let the logic below get the default hierarchy root artifact
+                      */
+                  }
+                  return;
                }
-               return;
             }
+         } catch (Exception ex) {
+            OseeLog.log(Activator.class, Level.SEVERE, ex);
          }
-      } catch (Exception ex) {
-         OseeLog.log(Activator.class, Level.SEVERE, ex);
       }
    }
 
    @Override
    public void saveState(IMemento memento) {
       super.saveState(memento);
-      if (explorerRoot != null) {
-         memento.putString(ROOT_GUID, explorerRoot.getGuid());
-         try {
-            memento.putString(ROOT_BRANCH, String.valueOf(explorerRoot.getFullBranch().getId()));
-         } catch (OseeCoreException ex) {
-            OseeLog.log(Activator.class, Level.SEVERE, ex);
+      if (DbConnectionExceptionComposite.dbConnectionIsOk()) {
+         if (explorerRoot != null) {
+            memento.putString(ROOT_GUID, explorerRoot.getGuid());
+            try {
+               memento.putString(ROOT_BRANCH, String.valueOf(explorerRoot.getFullBranch().getId()));
+            } catch (OseeCoreException ex) {
+               OseeLog.log(Activator.class, Level.SEVERE, ex);
+            }
          }
       }
    }
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java
index 38d34eb0b04..f156d1c010c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java
@@ -17,6 +17,7 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
+import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
 import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop;
 import org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeXViewer;
 import org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeXViewerFactory;
@@ -51,40 +52,44 @@ public class ChangeReportTable implements EditorSection.IWidget {
 
    @Override
    public void onCreate(IManagedForm managedForm, Composite parent) {
-      FormToolkit toolkit = managedForm.getToolkit();
-      ScrolledForm form = managedForm.getForm();
-      form.getBody().setLayout(new GridLayout());
-      form.getBody().setBackground(parent.getBackground());
-
-      Composite composite = toolkit.createComposite(parent, SWT.BORDER);
-
-      GridLayout layout = new GridLayout();
-      layout.marginBottom = 5;
-      layout.marginHeight = 0;
-      layout.marginWidth = 0;
-      composite.setLayout(layout);
-      GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-      gd.widthHint = 300;
-      composite.setLayoutData(gd);
-      toolkit.paintBordersFor(composite);
-
-      int viewerStyle = SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION;
-      xChangeViewer = new ChangeXViewer(composite, viewerStyle, new ChangeXViewerFactory());
-      xChangeViewer.setContentProvider(new XChangeContentProvider());
-      xChangeViewer.setLabelProvider(new XChangeLabelProvider(xChangeViewer));
-
-      Tree tree = xChangeViewer.getTree();
-      GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-      gridData.heightHint = 100;
-      tree.setLayout(ALayout.getZeroMarginLayout());
-      tree.setLayoutData(gridData);
-      tree.setHeaderVisible(true);
-      tree.setLinesVisible(true);
-
-      adaptAll(toolkit, composite);
-
-      new ChangeDragAndDrop(tree, ChangeXViewerFactory.NAMESPACE);
-      onUpdate();
+
+      if (DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
+
+         FormToolkit toolkit = managedForm.getToolkit();
+         ScrolledForm form = managedForm.getForm();
+         form.getBody().setLayout(new GridLayout());
+         form.getBody().setBackground(parent.getBackground());
+
+         Composite composite = toolkit.createComposite(parent, SWT.BORDER);
+
+         GridLayout layout = new GridLayout();
+         layout.marginBottom = 5;
+         layout.marginHeight = 0;
+         layout.marginWidth = 0;
+         composite.setLayout(layout);
+         GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
+         gd.widthHint = 300;
+         composite.setLayoutData(gd);
+         toolkit.paintBordersFor(composite);
+
+         int viewerStyle = SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION;
+         xChangeViewer = new ChangeXViewer(composite, viewerStyle, new ChangeXViewerFactory());
+         xChangeViewer.setContentProvider(new XChangeContentProvider());
+         xChangeViewer.setLabelProvider(new XChangeLabelProvider(xChangeViewer));
+
+         Tree tree = xChangeViewer.getTree();
+         GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+         gridData.heightHint = 100;
+         tree.setLayout(ALayout.getZeroMarginLayout());
+         tree.setLayoutData(gridData);
+         tree.setHeaderVisible(true);
+         tree.setLinesVisible(true);
+
+         adaptAll(toolkit, composite);
+
+         new ChangeDragAndDrop(tree, ChangeXViewerFactory.NAMESPACE);
+         onUpdate();
+      }
    }
 
    private void adaptAll(FormToolkit toolkit, Composite composite) {
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 81bd361e6d7..a708d3a8b88 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
@@ -89,64 +89,63 @@ public class GroupExplorer extends GenericViewPart implements IArtifactEventList
    @Override
    public void createPartControl(Composite parent) {
 
-      if (!DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
-         return;
-      }
+      if (DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
 
-      GridData gridData = new GridData();
-      gridData.verticalAlignment = GridData.FILL;
-      gridData.horizontalAlignment = GridData.FILL;
-      gridData.grabExcessVerticalSpace = true;
-      gridData.grabExcessHorizontalSpace = true;
+         GridData gridData = new GridData();
+         gridData.verticalAlignment = GridData.FILL;
+         gridData.horizontalAlignment = GridData.FILL;
+         gridData.grabExcessVerticalSpace = true;
+         gridData.grabExcessHorizontalSpace = true;
 
-      GridLayout gridLayout = new GridLayout(1, false);
-      gridData.heightHint = 1000;
-      gridData.widthHint = 1000;
+         GridLayout gridLayout = new GridLayout(1, false);
+         gridData.heightHint = 1000;
+         gridData.widthHint = 1000;
 
-      parentComp = parent;
+         parentComp = parent;
 
-      parentComp.setLayout(gridLayout);
-      parentComp.setLayoutData(gridData);
+         parentComp.setLayout(gridLayout);
+         parentComp.setLayoutData(gridData);
 
-      branchSelect = new XBranchSelectWidget("");
-      branchSelect.setDisplayLabel(false);
-      branchSelect.setSelection(branch);
-      branchSelect.createWidgets(parentComp, 1);
+         branchSelect = new XBranchSelectWidget("");
+         branchSelect.setDisplayLabel(false);
+         branchSelect.setSelection(branch);
+         branchSelect.createWidgets(parentComp, 1);
 
-      branchSelect.addListener(new Listener() {
-         @Override
-         public void handleEvent(Event event) {
-            try {
-               branch = BranchManager.getBranch(branchSelect.getData());
-               refresh();
-               groupExpDnd.setBranch(branch);
-            } catch (Exception ex) {
-               OseeLog.log(Activator.class, Level.SEVERE, ex);
+         branchSelect.addListener(new Listener() {
+            @Override
+            public void handleEvent(Event event) {
+               try {
+                  branch = BranchManager.getBranch(branchSelect.getData());
+                  refresh();
+                  groupExpDnd.setBranch(branch);
+               } catch (Exception ex) {
+                  OseeLog.log(Activator.class, Level.SEVERE, ex);
+               }
             }
-         }
 
-      });
+         });
 
-      treeViewer = new GroupTreeViewer(this, parentComp);
-      treeViewer.setContentProvider(new GroupContentProvider());
-      treeViewer.setLabelProvider(new GroupLabelProvider());
-      treeViewer.setUseHashlookup(true);
-      treeViewer.addDoubleClickListener(new ArtifactDoubleClick());
-      treeViewer.getControl().setLayoutData(gridData);
+         treeViewer = new GroupTreeViewer(this, parentComp);
+         treeViewer.setContentProvider(new GroupContentProvider());
+         treeViewer.setLabelProvider(new GroupLabelProvider());
+         treeViewer.setUseHashlookup(true);
+         treeViewer.addDoubleClickListener(new ArtifactDoubleClick());
+         treeViewer.getControl().setLayoutData(gridData);
 
-      OseeStatusContributionItemFactory.addTo(this, true);
+         OseeStatusContributionItemFactory.addTo(this, true);
 
-      OseeEventManager.addListener(this);
+         OseeEventManager.addListener(this);
 
-      groupExpDnd = new GroupExplorerDragAndDrop(treeViewer, VIEW_ID, branch);
+         groupExpDnd = new GroupExplorerDragAndDrop(treeViewer, VIEW_ID, branch);
 
-      getSite().setSelectionProvider(treeViewer);
-      parentComp.layout();
-      createActions();
-      getViewSite().getActionBars().updateActionBars();
-      rebuildMenu();
-      refresh();
-      setFocusWidget(parentComp);
+         getSite().setSelectionProvider(treeViewer);
+         parentComp.layout();
+         createActions();
+         getViewSite().getActionBars().updateActionBars();
+         rebuildMenu();
+         refresh();
+         setFocusWidget(parentComp);
+      }
    }
 
    @Override
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 d193caead57..117d9139ba1 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
@@ -109,8 +109,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl
    @Override
    public void createControl(Composite parent) {
       initializeDialogUnits(parent);
-      boolean isConnectionOk = DbConnectionExceptionComposite.dbConnectionIsOk(parent);
-      if (isConnectionOk != false) {
+      if (DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
          Composite mainComposite = new Composite(parent, SWT.NONE);
          mainComposite.setFont(parent.getFont());
          mainComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
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 98fc7769868..073816f81c9 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
@@ -91,7 +91,7 @@ public class QuickSearchView extends GenericViewPart {
 
    @Override
    public void saveState(IMemento memento) {
-      if (memento != null) {
+      if (DbConnectionExceptionComposite.dbConnectionIsOk() && memento != null) {
          if (Widgets.isAccessible(attrSearchComposite)) {
             memento.putString(LAST_QUERY_KEY_ID, attrSearchComposite.getQuery());
             IOseeBranch branch = branchSelect.getData();
@@ -119,7 +119,7 @@ public class QuickSearchView extends GenericViewPart {
    }
 
    private void loadState() {
-      if (memento != null) {
+      if (DbConnectionExceptionComposite.dbConnectionIsOk() && memento != null) {
          if (Widgets.isAccessible(attrSearchComposite)) {
             String lastQuery = memento.getString(LAST_QUERY_KEY_ID);
             List<String> queries = new ArrayList<String>();
@@ -155,64 +155,63 @@ public class QuickSearchView extends GenericViewPart {
 
    @Override
    public void createPartControl(Composite parent) {
-      if (!DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
-         return;
-      }
-
-      Group group = new Group(parent, SWT.NONE);
-      group.setLayout(new GridLayout());
-      group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-      branchSelect = new XBranchSelectWidget("");
-      branchSelect.setDisplayLabel(false);
-      branchSelect.createWidgets(group, 2);
-      branchSelect.addListener(attrSearchListener);
-      branchSelect.addListener(guidSearchListener);
-      // allow user to double click the branch text area to select the branch
-      if (Widgets.isAccessible(branchSelect.getSelectComposite())) {
-         if (Widgets.isAccessible(branchSelect.getSelectComposite().getBranchSelectText())) {
-            branchSelect.getSelectComposite().getBranchSelectText().setDoubleClickEnabled(true);
+      if (DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
+
+         Group group = new Group(parent, SWT.NONE);
+         group.setLayout(new GridLayout());
+         group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+         branchSelect = new XBranchSelectWidget("");
+         branchSelect.setDisplayLabel(false);
+         branchSelect.createWidgets(group, 2);
+         branchSelect.addListener(attrSearchListener);
+         branchSelect.addListener(guidSearchListener);
+         // allow user to double click the branch text area to select the branch
+         if (Widgets.isAccessible(branchSelect.getSelectComposite())) {
+            if (Widgets.isAccessible(branchSelect.getSelectComposite().getBranchSelectText())) {
+               branchSelect.getSelectComposite().getBranchSelectText().setDoubleClickEnabled(true);
+            }
          }
-      }
-      OseeStatusContributionItemFactory.addTo(this, true);
+         OseeStatusContributionItemFactory.addTo(this, true);
 
-      Composite panel = new Composite(group, SWT.NONE);
-      GridLayout gL = new GridLayout();
-      gL.marginHeight = 0;
-      gL.marginWidth = 0;
-      panel.setLayout(gL);
-      panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+         Composite panel = new Composite(group, SWT.NONE);
+         GridLayout gL = new GridLayout();
+         gL.marginHeight = 0;
+         gL.marginWidth = 0;
+         panel.setLayout(gL);
+         panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
-      Group attrSearchGroup = new Group(panel, SWT.NONE);
-      attrSearchGroup.setLayout(new GridLayout());
-      attrSearchGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-      attrSearchGroup.setText("Search by Attributes:");
+         Group attrSearchGroup = new Group(panel, SWT.NONE);
+         attrSearchGroup.setLayout(new GridLayout());
+         attrSearchGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+         attrSearchGroup.setText("Search by Attributes:");
 
-      attrSearchComposite = new SearchComposite(attrSearchGroup, SWT.NONE, "Search", null);
-      attrSearchComposite.addListener(attrSearchListener);
+         attrSearchComposite = new SearchComposite(attrSearchGroup, SWT.NONE, "Search", null);
+         attrSearchComposite.addListener(attrSearchListener);
 
-      optionsComposite = new QuickSearchOptionComposite(attrSearchGroup, SWT.NONE);
-      optionsComposite.setLayout(ALayout.getZeroMarginLayout());
-      optionsComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+         optionsComposite = new QuickSearchOptionComposite(attrSearchGroup, SWT.NONE);
+         optionsComposite.setLayout(ALayout.getZeroMarginLayout());
+         optionsComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
-      guidSearchComposite = new SearchComposite(panel, SWT.NONE, "Search", "Search by GUID:");
-      guidSearchComposite.addListener(guidSearchListener);
+         guidSearchComposite = new SearchComposite(panel, SWT.NONE, "Search", "Search by GUID:");
+         guidSearchComposite.addListener(guidSearchListener);
 
-      includeDeleted = new Button(group, SWT.CHECK);
-      includeDeleted.setToolTipText("When selected, does not filter out deleted artifacts from search results.");
-      includeDeleted.setText("Include Deleted");
+         includeDeleted = new Button(group, SWT.CHECK);
+         includeDeleted.setToolTipText("When selected, does not filter out deleted artifacts from search results.");
+         includeDeleted.setText("Include Deleted");
 
-      loadState();
-      compositeEnablement(attrSearchComposite, false);
-      attrSearchComposite.setHelpContext(OseeHelpContext.QUICK_SEARCH);
+         loadState();
+         compositeEnablement(attrSearchComposite, false);
+         attrSearchComposite.setHelpContext(OseeHelpContext.QUICK_SEARCH);
 
-      branchLabel = new Label(group, SWT.NONE);
-      branchLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-      branchLabel.setText("");
+         branchLabel = new Label(group, SWT.NONE);
+         branchLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+         branchLabel.setText("");
 
-      createClearHistoryAction();
+         createClearHistoryAction();
 
-      setFocusWidget(attrSearchComposite);
+         setFocusWidget(attrSearchComposite);
+      }
    }
 
    private void createClearHistoryAction() {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java
index 6925463661f..1e60a4cf946 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java
@@ -71,8 +71,10 @@ public class UserNavigateView extends ViewPart implements IXNavigateEventListene
    @Override
    public void createPartControl(Composite parent) {
       this.parent = parent;
-      loadingComposite = new LoadingComposite(parent);
-      refreshData();
+      if (DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
+         loadingComposite = new LoadingComposite(parent);
+         refreshData();
+      }
    }
 
    @Override
@@ -107,44 +109,44 @@ public class UserNavigateView extends ViewPart implements IXNavigateEventListene
                      loadingComposite.dispose();
                   }
 
-                  if (!DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
-                     return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Navigate View - !dbConnectionIsOk");
-                  }
+                  if (DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
 
-                  xNavComp = new XNavigateComposite(UserNavigateViewItems.getInstance(), parent, SWT.NONE);
+                     xNavComp = new XNavigateComposite(UserNavigateViewItems.getInstance(), parent, SWT.NONE);
 
-                  createToolBar();
+                     createToolBar();
 
-                  Label label = new Label(xNavComp, SWT.None);
-                  String str = getWhoAmI();
-                  if (SystemGroup.OseeAdmin.isCurrentUserMember()) {
-                     str += " - Admin";
-                  }
-                  if (!str.equals("")) {
+                     Label label = new Label(xNavComp, SWT.None);
+                     String str = getWhoAmI();
                      if (SystemGroup.OseeAdmin.isCurrentUserMember()) {
-                        label.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
-                     } else {
-                        label.setForeground(Displays.getSystemColor(SWT.COLOR_BLUE));
+                        str += " - Admin";
                      }
-                  }
-                  label.setText(str);
-                  label.setToolTipText(str);
+                     if (!str.equals("")) {
+                        if (SystemGroup.OseeAdmin.isCurrentUserMember()) {
+                           label.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
+                        } else {
+                           label.setForeground(Displays.getSystemColor(SWT.COLOR_BLUE));
+                        }
+                     }
+                     label.setText(str);
+                     label.setToolTipText(str);
 
-                  GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, true, false);
-                  gridData.heightHint = 15;
-                  label.setLayoutData(gridData);
+                     GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, true, false);
+                     gridData.heightHint = 15;
+                     label.setLayoutData(gridData);
 
-                  if (savedFilterStr != null) {
-                     xNavComp.getFilteredTree().getFilterControl().setText(savedFilterStr);
-                  }
-                  xNavComp.refresh();
-                  xNavComp.getFilteredTree().getFilterControl().setFocus();
+                     if (savedFilterStr != null) {
+                        xNavComp.getFilteredTree().getFilterControl().setText(savedFilterStr);
+                     }
+                     xNavComp.refresh();
+                     xNavComp.getFilteredTree().getFilterControl().setFocus();
 
-                  parent.getParent().layout(true);
-                  parent.layout(true);
+                     parent.getParent().layout(true);
+                     parent.layout(true);
 
-                  OseeStatusContributionItemFactory.addTo(navView, false);
-                  addExtensionPointListenerBecauseOfWorkspaceLoading();
+                     OseeStatusContributionItemFactory.addTo(navView, false);
+                     addExtensionPointListenerBecauseOfWorkspaceLoading();
+
+                  }
 
                } catch (Exception ex) {
                   OseeLog.log(Activator.class, Level.SEVERE, ex);
@@ -216,9 +218,11 @@ public class UserNavigateView extends ViewPart implements IXNavigateEventListene
       super.saveState(memento);
       memento = memento.createChild(INPUT);
 
-      if (xNavComp != null && xNavComp.getFilteredTree().getFilterControl() != null && !xNavComp.getFilteredTree().isDisposed()) {
-         String filterStr = xNavComp.getFilteredTree().getFilterControl().getText();
-         memento.putString(FILTER_STR, filterStr);
+      if (DbConnectionExceptionComposite.dbConnectionIsOk()) {
+         if (xNavComp != null && xNavComp.getFilteredTree().getFilterControl() != null && !xNavComp.getFilteredTree().isDisposed()) {
+            String filterStr = xNavComp.getFilteredTree().getFilterControl().getText();
+            memento.putString(FILTER_STR, filterStr);
+         }
       }
    }
 
@@ -226,19 +230,21 @@ public class UserNavigateView extends ViewPart implements IXNavigateEventListene
    public void init(IViewSite site, IMemento memento) throws PartInitException {
       super.init(site, memento);
 
-      // set the context (org.eclipse.ui.contexts) to osee to make the osee hotkeys available
-      IContextService contextService = (IContextService) getSite().getService(IContextService.class);
-      contextService.activateContext("org.eclipse.osee.contexts.window");
+      if (DbConnectionExceptionComposite.dbConnectionIsOk()) {
+         // set the context (org.eclipse.ui.contexts) to osee to make the osee hotkeys available
+         IContextService contextService = (IContextService) getSite().getService(IContextService.class);
+         contextService.activateContext("org.eclipse.osee.contexts.window");
 
-      try {
-         if (memento != null) {
-            memento = memento.getChild(INPUT);
+         try {
             if (memento != null) {
-               savedFilterStr = memento.getString(FILTER_STR);
+               memento = memento.getChild(INPUT);
+               if (memento != null) {
+                  savedFilterStr = memento.getString(FILTER_STR);
+               }
             }
+         } catch (Exception ex) {
+            OseeLog.log(Activator.class, Level.WARNING, "NavigateView error on init", ex);
          }
-      } catch (Exception ex) {
-         OseeLog.log(Activator.class, Level.WARNING, "NavigateView error on init", ex);
       }
    }
 
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/DbConnectionExceptionComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/DbConnectionExceptionComposite.java
index 740819da2c5..ee1d6db3da7 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/DbConnectionExceptionComposite.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/DbConnectionExceptionComposite.java
@@ -21,7 +21,11 @@ import org.eclipse.swt.widgets.Composite;
 public class DbConnectionExceptionComposite extends ExceptionComposite {
 
    public DbConnectionExceptionComposite(Composite parent, Exception ex) {
-      super(parent, ex);
+      this(parent, ex.toString());
+   }
+
+   public DbConnectionExceptionComposite(Composite parent, String message) {
+      super(parent, message);
    }
 
    /**
@@ -29,16 +33,26 @@ public class DbConnectionExceptionComposite extends ExceptionComposite {
     * DbConnectionExceptionComposite will be displayed in parent giving exception information.
     */
    public static boolean dbConnectionIsOk(Composite parent) {
-      //      try {
-      //         ConnectionHandler.getConnection();
-      //      } catch (Exception ex) {
-      //         if (parent != null) new DbConnectionExceptionComposite(parent, ex);
-      //      }
-      Result result = OseeUiActivator.areOSEEServicesAvailable();
+      Result result = dbConnectionIsOkResult();
       if (result.isFalse()) {
-         new DbConnectionExceptionComposite(parent, new Exception(
-            "OSEE Service(s) Unavailable:\n\t" + result.getText().replaceAll("\n", "\n\t")));
+         new DbConnectionExceptionComposite(parent, result.getText());
+         parent.layout();
       }
       return result.isTrue();
    }
+
+   public static Result dbConnectionIsOkResult() {
+      Result result = Result.TrueResult;
+      if (!OseeUiActivator.isApplicationServerAlive()) {
+         result = new Result("The OSEE Application Server is not available.\n\nDatabase capability disabled.");
+      } else {
+         result = OseeUiActivator.areOSEEServicesAvailable();
+      }
+      return result;
+   }
+
+   public static boolean dbConnectionIsOk() {
+      return dbConnectionIsOkResult().isTrue();
+   }
+
 }
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 2f49cab250c..bb567dbc619 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
@@ -47,6 +47,7 @@ import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory;
 import org.eclipse.osee.framework.ui.skynet.action.EditTransactionComment;
 import org.eclipse.osee.framework.ui.skynet.action.ITransactionRecordSelectionProvider;
 import org.eclipse.osee.framework.ui.skynet.internal.Activator;
+import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
 import org.eclipse.osee.framework.ui.skynet.widgets.GenericViewPart;
 import org.eclipse.osee.framework.ui.swt.Displays;
 import org.eclipse.swt.dnd.Clipboard;
@@ -98,51 +99,54 @@ public class BranchView extends GenericViewPart implements IBranchEventListener,
       parent.setLayout(layout);
       parent.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-      xBranchWidget = new XBranchWidget();
-      xBranchWidget.setDisplayLabel(false);
-      xBranchWidget.createWidgets(parent, 1);
-
-      branchViewPresentationPreferences = new BranchViewPresentationPreferences(this);
-      xBranchWidget.loadData();
-      final BranchView fBranchView = this;
-
-      final XViewer branchWidget = xBranchWidget.getXViewer();
-
-      MenuManager menuManager = new MenuManager();
-      menuManager.setRemoveAllWhenShown(true);
-      menuManager.addMenuListener(new IMenuListener() {
-         @Override
-         public void menuAboutToShow(IMenuManager manager) {
-            MenuManager menuManager = (MenuManager) manager;
-            branchWidget.setColumnMultiEditEnabled(true);
-            menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-            menuManager.add(new EditTransactionComment(fBranchView));
-            menuManager.add(new Separator());
-            menuManager.add(new TableCustomizationAction(branchWidget));
-            menuManager.add(new ViewTableReportAction(branchWidget));
-            menuManager.add(new ViewSelectedCellDataAction(branchWidget, clipboard, Option.Copy));
-            menuManager.add(new ViewSelectedCellDataAction(branchWidget, null, Option.View));
-            try {
-               if (AccessControlManager.isOseeAdmin()) {
-                  menuManager.add(new ColumnMultiEditAction(branchWidget));
+      if (DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
+
+         xBranchWidget = new XBranchWidget();
+         xBranchWidget.setDisplayLabel(false);
+         xBranchWidget.createWidgets(parent, 1);
+
+         branchViewPresentationPreferences = new BranchViewPresentationPreferences(this);
+         xBranchWidget.loadData();
+         final BranchView fBranchView = this;
+
+         final XViewer branchWidget = xBranchWidget.getXViewer();
+
+         MenuManager menuManager = new MenuManager();
+         menuManager.setRemoveAllWhenShown(true);
+         menuManager.addMenuListener(new IMenuListener() {
+            @Override
+            public void menuAboutToShow(IMenuManager manager) {
+               MenuManager menuManager = (MenuManager) manager;
+               branchWidget.setColumnMultiEditEnabled(true);
+               menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+               menuManager.add(new EditTransactionComment(fBranchView));
+               menuManager.add(new Separator());
+               menuManager.add(new TableCustomizationAction(branchWidget));
+               menuManager.add(new ViewTableReportAction(branchWidget));
+               menuManager.add(new ViewSelectedCellDataAction(branchWidget, clipboard, Option.Copy));
+               menuManager.add(new ViewSelectedCellDataAction(branchWidget, null, Option.View));
+               try {
+                  if (AccessControlManager.isOseeAdmin()) {
+                     menuManager.add(new ColumnMultiEditAction(branchWidget));
+                  }
+               } catch (OseeCoreException ex) {
+                  OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
                }
-            } catch (OseeCoreException ex) {
-               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
             }
-         }
-      });
+         });
 
-      menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-      branchWidget.getTree().setMenu(menuManager.createContextMenu(branchWidget.getTree()));
-      getSite().registerContextMenu(VIEW_ID, menuManager, branchWidget);
-      getSite().setSelectionProvider(branchWidget);
-      HelpUtil.setHelp(parent, OseeHelpContext.BRANCH_MANAGER);
-      OseeStatusContributionItemFactory.addTo(this, true);
-      getViewSite().getActionBars().updateActionBars();
+         menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+         branchWidget.getTree().setMenu(menuManager.createContextMenu(branchWidget.getTree()));
+         getSite().registerContextMenu(VIEW_ID, menuManager, branchWidget);
+         getSite().setSelectionProvider(branchWidget);
+         HelpUtil.setHelp(parent, OseeHelpContext.BRANCH_MANAGER);
+         OseeStatusContributionItemFactory.addTo(this, true);
+         getViewSite().getActionBars().updateActionBars();
 
-      setFocusWidget(xBranchWidget.getControl());
+         setFocusWidget(xBranchWidget.getControl());
 
-      OseeEventManager.addListener(this);
+         OseeEventManager.addListener(this);
+      }
    }
 
    public static void revealBranch(Branch branch) throws OseeCoreException {
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 ca78e9178d5..18905e73a1b 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
@@ -61,6 +61,7 @@ import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil;
 import org.eclipse.osee.framework.ui.skynet.internal.Activator;
 import org.eclipse.osee.framework.ui.skynet.listener.IRebuildMenuListener;
 import org.eclipse.osee.framework.ui.skynet.menu.CompareArtifactAction;
+import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
 import org.eclipse.osee.framework.ui.skynet.util.SkynetViews;
 import org.eclipse.osee.framework.ui.skynet.widgets.GenericViewPart;
 import org.eclipse.osee.framework.ui.swt.Displays;
@@ -113,51 +114,55 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener
 
    @Override
    public void createPartControl(Composite parent) {
-      GridLayout layout = new GridLayout();
-      layout.numColumns = 1;
-      layout.verticalSpacing = 0;
-      layout.marginWidth = 0;
-      layout.marginHeight = 0;
-      parent.setLayout(layout);
-      parent.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-      xHistoryWidget = new XHistoryWidget() {
+      if (DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
 
-         @Override
-         protected void onRefresh() {
-            refreshTitle();
-         }
-      };
-      xHistoryWidget.setDisplayLabel(false);
-      xHistoryWidget.createWidgets(parent, 1);
+         GridLayout layout = new GridLayout();
+         layout.numColumns = 1;
+         layout.verticalSpacing = 0;
+         layout.marginWidth = 0;
+         layout.marginHeight = 0;
+         parent.setLayout(layout);
+         parent.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-      MenuManager menuManager = new MenuManager();
-      menuManager.setRemoveAllWhenShown(true);
-      menuManager.addMenuListener(new IMenuListener() {
-         @Override
-         public void menuAboutToShow(IMenuManager manager) {
-            MenuManager menuManager = (MenuManager) manager;
-            menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-         }
-      });
+         xHistoryWidget = new XHistoryWidget() {
 
-      menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+            @Override
+            protected void onRefresh() {
+               refreshTitle();
+            }
+         };
+         xHistoryWidget.setDisplayLabel(false);
+         xHistoryWidget.createWidgets(parent, 1);
 
-      xHistoryWidget.getXViewer().getTree().setMenu(
-         menuManager.createContextMenu(xHistoryWidget.getXViewer().getTree()));
+         MenuManager menuManager = new MenuManager();
+         menuManager.setRemoveAllWhenShown(true);
+         menuManager.addMenuListener(new IMenuListener() {
+            @Override
+            public void menuAboutToShow(IMenuManager manager) {
+               MenuManager menuManager = (MenuManager) manager;
+               menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+            }
+         });
 
-      getSite().registerContextMenu(VIEW_ID, menuManager, xHistoryWidget.getXViewer());
-      getSite().setSelectionProvider(xHistoryWidget.getXViewer());
+         menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 
-      HelpUtil.setHelp(parent, OseeHelpContext.HISTORY_VIEW);
+         xHistoryWidget.getXViewer().getTree().setMenu(
+            menuManager.createContextMenu(xHistoryWidget.getXViewer().getTree()));
 
-      OseeStatusContributionItemFactory.addTo(this, true);
+         getSite().registerContextMenu(VIEW_ID, menuManager, xHistoryWidget.getXViewer());
+         getSite().setSelectionProvider(xHistoryWidget.getXViewer());
 
-      setupMenus();
+         HelpUtil.setHelp(parent, OseeHelpContext.HISTORY_VIEW);
 
-      setFocusWidget(xHistoryWidget.getXViewer().getControl());
+         OseeStatusContributionItemFactory.addTo(this, true);
 
-      OseeEventManager.addListener(this);
+         setupMenus();
+
+         setFocusWidget(xHistoryWidget.getXViewer().getControl());
+
+         OseeEventManager.addListener(this);
+      }
    }
 
    private void setupMenus() {