bug[ats_ATS249985]: Declutter ArtifactExplorerOSEE_0.23.0_RC_201511302143

Change-Id: I0520389270969ccc7d0efdc93f0c59d06151e443

11 files changed, 1394 insertions, 1040 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactData.java
new file mode 100644
index 00000000000..abbce7c3bfe
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactData.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.skynet.explorer;
+
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+
+/**
+ * @author Donald G. Dunne
+ */
+class ArtifactData {
+   private Artifact artifact;
+
+   ArtifactData(Artifact artifact) {
+      this.artifact = artifact;
+   }
+
+   Artifact getArtifact() {
+      return artifact;
+   }
+
+   void setArtifact(Artifact artifact) {
+      this.artifact = artifact;
+   }
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java
index 76720cc2275..55fe1717c60 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java
@@ -11,14 +11,10 @@
 
 package org.eclipse.osee.framework.ui.skynet.explorer;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 import java.util.logging.Level;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -26,42 +22,24 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.window.Window;
 import org.eclipse.osee.framework.access.AccessControlManager;
-import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
 import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.access.PermissionStatus;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
 import org.eclipse.osee.framework.core.operation.IOperation;
 import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.help.ui.OseeHelpContext;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
-import org.eclipse.osee.framework.jdk.core.util.Conditions;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.AccessPolicy;
 import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
 import org.eclipse.osee.framework.skynet.core.UserManager;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-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.artifact.IBranchProvider;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -74,8 +52,6 @@ import org.eclipse.osee.framework.skynet.core.event.model.AccessControlEventType
 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.skynet.core.transaction.SkynetTransaction;
-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.HelpUtil;
 import org.eclipse.osee.framework.ui.plugin.util.SelectionCountChangeListener;
@@ -84,76 +60,35 @@ import org.eclipse.osee.framework.ui.skynet.ArtifactDecorator;
 import org.eclipse.osee.framework.ui.skynet.ArtifactDoubleClick;
 import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider;
 import org.eclipse.osee.framework.ui.skynet.ArtifactStructuredSelection;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
 import org.eclipse.osee.framework.ui.skynet.IArtifactExplorerEventHandler;
-import org.eclipse.osee.framework.ui.skynet.OpenContributionItem;
 import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory;
-import org.eclipse.osee.framework.ui.skynet.access.PolicyDialog;
-import org.eclipse.osee.framework.ui.skynet.action.OpenAssociatedArtifactFromBranchProvider;
-import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactNameConflictHandler;
-import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPasteOperation;
-import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil;
-import org.eclipse.osee.framework.ui.skynet.dialogs.ArtifactPasteSpecialDialog;
-import org.eclipse.osee.framework.ui.skynet.explorer.menu.CreateRelatedMenuItem;
+import org.eclipse.osee.framework.ui.skynet.explorer.menu.ArtifactExplorerMenu;
 import org.eclipse.osee.framework.ui.skynet.internal.Activator;
-import org.eclipse.osee.framework.ui.skynet.internal.ServiceUtil;
 import org.eclipse.osee.framework.ui.skynet.listener.IRebuildMenuListener;
 import org.eclipse.osee.framework.ui.skynet.menu.ArtifactTreeViewerGlobalMenuHelper;
-import org.eclipse.osee.framework.ui.skynet.menu.GlobalMenu;
-import org.eclipse.osee.framework.ui.skynet.menu.GlobalMenuPermissions;
 import org.eclipse.osee.framework.ui.skynet.menu.IGlobalMenuHelper;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
-import org.eclipse.osee.framework.ui.skynet.search.QuickSearchView;
-import org.eclipse.osee.framework.ui.skynet.util.ArtifactClipboard;
-import org.eclipse.osee.framework.ui.skynet.util.ArtifactPasteConfiguration;
 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.skynet.widgets.XBranchSelectWidget;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.FilteredTreeArtifactTypeEntryDialog;
 import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.osee.framework.ui.swt.FontManager;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.osee.framework.ui.swt.MenuItems;
 import org.eclipse.osee.framework.ui.swt.TreeViewerUtility;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.custom.TreeEditor;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.events.MenuListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.IMemento;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IViewSite;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ExportResourcesAction;
-import org.eclipse.ui.actions.ImportResourcesAction;
 import org.eclipse.ui.progress.UIJob;
 
 /**
@@ -163,31 +98,10 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
    public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.ArtifactExplorer";
    private static final String ROOT_UUID = "artifact.explorer.last.root_uuid";
    private static final String ROOT_BRANCH = "artifact.explorer.last.root_branch";
-   private static final ArtifactClipboard artifactClipboard = new ArtifactClipboard(VIEW_ID);
-   private static final LinkedList<Tree> trees = new LinkedList<>();
 
    private TreeViewer treeViewer;
-   private Action upAction;
    private Artifact explorerRoot;
-   private MenuItem createMenuItem;
-   private CreateRelatedMenuItem createRelatedMenuItem;
-   private MenuItem accessControlMenuItem;
-   private MenuItem lockMenuItem;
-   private MenuItem goIntoMenuItem;
-   private MenuItem copyMenuItem;
-   private MenuItem pasteMenuItem;
-   private MenuItem pasteSpecialMenuItem;
-   private MenuItem renameArtifactMenuItem;
-   private MenuItem refreshMenuItem;
-   private MenuItem findOnAnotherBranch;
-   private NeedArtifactMenuListener needArtifactListener;
-   private NeedProjectMenuListener needProjectListener;
-   private Tree myTree;
    private TreeEditor myTreeEditor;
-   private Text myTextBeingRenamed;
-   private Action newArtifactExplorer;
-   private Action collapseAllAction;
-   private Action showChangeReport;
    private XBranchSelectWidget branchSelect;
    private Branch branch;
    private IGlobalMenuHelper globalMenuHelper;
@@ -195,22 +109,19 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
    private ArtifactExplorerDragAndDrop dragAndDropWorker;
 
    private Composite stackComposite;
-   private Control branchWarningComposite;
+   private BranchWarningComposite branchWarningComposite;
    private StackLayout stackLayout;
-   private final ArtifactDecorator artifactDecorator = new ArtifactDecorator(
-      Activator.ARTIFACT_EXPLORER_ATTRIBUTES_PREF);
-   private Label branchWarningLabel;
+   private ArtifactDecorator artifactDecorator;
+   public ArtifactExplorerMenu artifactExplorerMenu;
+   private ArtifactExplorerToolbar artifactExplorerToolbar;
 
    public static void explore(Collection<Artifact> artifacts) {
       explore(artifacts, AWorkbench.getActivePage());
    }
 
    private void setErrorString(String str) {
-      Control control = branchWarningComposite;
-      branchWarningLabel.setText(str);
-      branchWarningLabel.update();
-      branchWarningComposite.update();
-      stackLayout.topControl = control;
+      branchWarningComposite.updateLabel(str);
+      stackLayout.topControl = branchWarningComposite;
       stackComposite.layout();
       stackComposite.getParent().layout();
    }
@@ -222,7 +133,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
          sampleArtifact = artifacts.iterator().next();
          inputBranch = sampleArtifact.getBranch();
       }
-      ArtifactExplorer artifactExplorer = findView(inputBranch, page);
+      ArtifactExplorer artifactExplorer = ArtifactExplorerUtil.findView(inputBranch, page);
 
       artifactExplorer.setPartName("Artifacts");
       artifactExplorer.setContentDescription("These artifacts could not be handled");
@@ -230,50 +141,6 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
       artifactExplorer.initializeSelectionBox();
    }
 
-   private static ArtifactExplorer findView(IOseeBranch inputBranch, IWorkbenchPage page) {
-      for (IViewReference view : page.getViewReferences()) {
-         if (view.getId().equals(ArtifactExplorer.VIEW_ID)) {
-            if (view.getView(false) != null && inputBranch.equals(((ArtifactExplorer) view.getView(false)).branch)) {
-               try {
-                  return (ArtifactExplorer) page.showView(view.getId(), view.getSecondaryId(),
-                     IWorkbenchPage.VIEW_ACTIVATE);
-               } catch (Exception ex) {
-                  throw new RuntimeException(ex);
-               }
-            }
-         }
-      }
-      try {
-         ArtifactExplorer explorer =
-            (ArtifactExplorer) page.showView(ArtifactExplorer.VIEW_ID, GUID.create(), IWorkbenchPage.VIEW_ACTIVATE);
-         explorer.explore(OseeSystemArtifacts.getDefaultHierarchyRootArtifact(inputBranch));
-         return explorer;
-      } catch (Exception ex) {
-         throw new RuntimeException(ex);
-      }
-   }
-
-   private Control createBranchWarningComposite(Composite parent) {
-      Composite composite = new Composite(parent, SWT.BORDER);
-      composite.setLayout(new GridLayout(2, false));
-      composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-      composite.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-
-      Label image = new Label(composite, SWT.NONE);
-      image.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
-      image.setImage(ImageManager.getImage(FrameworkImage.LOCKED_KEY));
-      image.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-
-      branchWarningLabel = new Label(composite, SWT.NONE);
-      branchWarningLabel.setFont(FontManager.getFont("Courier New", 10, SWT.BOLD));
-      branchWarningLabel.setForeground(Displays.getSystemColor(SWT.COLOR_DARK_RED));
-      branchWarningLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
-      branchWarningLabel.setText("None");
-      branchWarningLabel.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-
-      return composite;
-   }
-
    @Override
    public void createPartControl(Composite parent) {
       try {
@@ -316,10 +183,9 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
             stackComposite.setLayout(stackLayout);
             stackComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
-            branchWarningComposite = createBranchWarningComposite(stackComposite);
+            branchWarningComposite = new BranchWarningComposite(stackComposite);
 
             treeViewer = new TreeViewer(stackComposite);
-            myTree = treeViewer.getTree();
             Tree tree = treeViewer.getTree();
             final ArtifactExplorer fArtExplorere = this;
             tree.addDisposeListener(new DisposeListener() {
@@ -329,28 +195,24 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
                   ArtifactExplorerEventManager.remove(fArtExplorere);
                }
             });
-            treeViewer.setContentProvider(new ArtifactContentProvider(artifactDecorator));
+            artifactDecorator = new ArtifactDecorator(Activator.ARTIFACT_EXPLORER_ATTRIBUTES_PREF);
 
+            treeViewer.setContentProvider(new ArtifactContentProvider(artifactDecorator));
             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.
+            /**
+             * 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);
 
-            IToolBarManager toolbarManager = getViewSite().getActionBars().getToolBarManager();
-            createCollapseAllAction(toolbarManager);
-            createUpAction(toolbarManager);
-            createNewArtifactExplorerAction(toolbarManager);
-            createShowChangeReportAction(toolbarManager);
-            addOpenQuickSearchAction(toolbarManager);
-            toolbarManager.add(new OpenAssociatedArtifactFromBranchProvider(this));
+            artifactExplorerToolbar = new ArtifactExplorerToolbar(this);
+            artifactExplorerToolbar.createToolbar();
 
             artifactDecorator.setViewer(treeViewer);
             artifactDecorator.addActions(getViewSite().getActionBars().getMenuManager(), this);
@@ -358,9 +220,11 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
             getSite().setSelectionProvider(treeViewer);
             addExploreSelection();
 
-            setupPopupMenu();
+            artifactExplorerMenu = new ArtifactExplorerMenu(this);
+            artifactExplorerMenu.create();
+            artifactExplorerMenu.setupPopupMenu();
 
-            myTreeEditor = new TreeEditor(myTree);
+            myTreeEditor = new TreeEditor(getTreeViewer().getTree());
             myTreeEditor.horizontalAlignment = SWT.LEFT;
             myTreeEditor.grabHorizontal = true;
             myTreeEditor.minimumWidth = 50;
@@ -369,11 +233,11 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
 
             OseeStatusContributionItemFactory.addTo(this, false);
 
-            updateEnablementsEtAl();
-            trees.add(tree);
+            artifactExplorerToolbar.updateEnablement();
             HelpUtil.setHelp(treeViewer.getControl(), OseeHelpContext.ARTIFACT_EXPLORER);
 
             refreshBranchWarning();
+
             getViewSite().getActionBars().updateActionBars();
             setFocusWidget(treeViewer.getControl());
 
@@ -386,70 +250,9 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
 
    }
 
-   private void refreshBranchWarning() {
-      Displays.ensureInDisplayThread(new Runnable() {
-         @Override
-         public void run() {
-            try {
-               if (treeViewer == null) {
-                  return;
-               }
-
-               Control control = treeViewer.getTree();
-               if (branch != null) {
-                  String warningStr = null;
-                  if (!new GlobalMenuPermissions(globalMenuHelper).isBranchReadable(branch)) {
-                     warningStr = "Branch Read Access Denied.\nContact your administrator.";
-                  } else {
-                     switch (branch.getBranchState()) {
-                        case CREATION_IN_PROGRESS:
-                           warningStr = "Branch Creation in Progress, Please Wait.";
-                           break;
-                        case COMMIT_IN_PROGRESS:
-                           warningStr = "Branch Commit in Progress, Please Close Artifact Explorer.";
-                           break;
-                        case COMMITTED:
-                           warningStr = "Branch Committed, Please Close Artifact Explorer.";
-                           break;
-                        case DELETED:
-                           warningStr = "Branch Deleted, Please Close Artifact Explorer.";
-                           break;
-                        case REBASELINE_IN_PROGRESS:
-                           warningStr = "Branch Rebaseline in Progress, Please Wait.";
-                           break;
-                        case REBASELINED:
-                           warningStr = "Branch Rebaselined, Please Close Artifact Explorer.";
-                           break;
-                        case DELETE_IN_PROGRESS:
-                           warningStr = "Branch Delete in Progress, Please Close Artifact Explorer.";
-                           break;
-                        case PURGE_IN_PROGRESS:
-                           warningStr = "Branch Purge in Progress, Please Close Artifact Explorer.";
-                           break;
-                        case PURGED:
-                           warningStr = "Branch Purged, Please Close Artifact Explorer.";
-                           break;
-                        default:
-                           break;
-                     }
-                  }
-
-                  if (warningStr != null) {
-                     control = branchWarningComposite;
-                     branchWarningLabel.setText(warningStr);
-                     branchWarningLabel.update();
-                     branchWarningComposite.update();
-                  }
-               }
-
-               stackLayout.topControl = control;
-               stackComposite.layout();
-               stackComposite.getParent().layout();
-            } catch (OseeCoreException ex) {
-               OseeLog.log(Activator.class, Level.SEVERE, ex);
-            }
-         }
-      });
+   public void refreshBranchWarning() {
+      ArtifactExplorerUtil.refreshBranchWarning(this, treeViewer, globalMenuHelper, getBranch(),
+         branchWarningComposite);
    }
 
    /**
@@ -458,613 +261,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
    public static void exploreBranch(IOseeBranch branch) {
       if (branch != null) {
          IWorkbenchPage page = AWorkbench.getActivePage();
-         findView(branch, page);
-      }
-   }
-
-   private void setupPopupMenu() {
-
-      Menu popupMenu = new Menu(treeViewer.getTree().getParent());
-      needArtifactListener = new NeedArtifactMenuListener();
-      needProjectListener = new NeedProjectMenuListener();
-      popupMenu.addMenuListener(needArtifactListener);
-      popupMenu.addMenuListener(needProjectListener);
-
-      OpenContributionItem openWithMenu = new OpenContributionItem(getClass().getSimpleName() + ".open");
-      openWithMenu.fill(popupMenu, -1);
-      needArtifactListener.add(popupMenu.getItem(0));
-      new MenuItem(popupMenu, SWT.SEPARATOR);
-
-      createFindOnDifferentBranchItem(popupMenu);
-      new MenuItem(popupMenu, SWT.SEPARATOR);
-
-      createNewChildMenuItem(popupMenu);
-      createNewRelatedMenuItem(popupMenu);
-      createGoIntoMenuItem(popupMenu);
-      new MenuItem(popupMenu, SWT.SEPARATOR);
-
-      new GlobalMenu(popupMenu, globalMenuHelper);
-      new MenuItem(popupMenu, SWT.SEPARATOR);
-
-      createRenameArtifactMenuItem(popupMenu);
-      createRefreshMenuItem(popupMenu);
-      new MenuItem(popupMenu, SWT.SEPARATOR);
-
-      createImportExportMenuItems(popupMenu);
-      new MenuItem(popupMenu, SWT.SEPARATOR);
-
-      createLockMenuItem(popupMenu);
-      new MenuItem(popupMenu, SWT.SEPARATOR);
-
-      createCopyMenuItem(popupMenu);
-      createPasteMenuItem(popupMenu);
-      createPasteSpecialMenuItem(popupMenu);
-      new MenuItem(popupMenu, SWT.SEPARATOR);
-
-      createExpandAllMenuItem(popupMenu);
-      createSelectAllMenuItem(popupMenu);
-      new MenuItem(popupMenu, SWT.SEPARATOR);
-
-      createAccessControlMenuItem(popupMenu);
-      treeViewer.getTree().setMenu(popupMenu);
-   }
-
-   private void addOpenQuickSearchAction(IToolBarManager toolbarManager) {
-      Action openQuickSearch =
-         new Action("Quick Search", ImageManager.getImageDescriptor(FrameworkImage.ARTIFACT_SEARCH)) {
-            @Override
-            public void run() {
-               Job job = new UIJob("Open Quick Search") {
-
-                  @Override
-                  public IStatus runInUIThread(IProgressMonitor monitor) {
-                     IStatus status = Status.OK_STATUS;
-                     try {
-                        IViewPart viewPart =
-                           PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(
-                              QuickSearchView.VIEW_ID);
-                        if (viewPart != null) {
-                           Branch branch = getBranch(monitor);
-                           if (branch != null) {
-                              ((QuickSearchView) viewPart).setBranch(branch);
-                           }
-                        }
-                     } catch (Exception ex) {
-                        status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error opening quick search", ex);
-                     }
-                     return status;
-                  }
-               };
-               Jobs.startJob(job);
-            }
-         };
-      openQuickSearch.setToolTipText("Open Quick Search View");
-      toolbarManager.add(openQuickSearch);
-   }
-
-   protected void createUpAction(IToolBarManager toolbarManager) {
-      upAction = new Action("View Parent") {
-         @Override
-         public void run() {
-            try {
-               Artifact parent = explorerRoot.getParent();
-
-               if (parent == null) {
-                  return;
-               }
-
-               Object[] expanded = treeViewer.getExpandedElements();
-               Object[] expandedPlus = new Object[expanded.length + 1];
-               for (int i = 0; i < expanded.length; i++) {
-                  expandedPlus[i] = expanded[i];
-               }
-               expandedPlus[expandedPlus.length - 1] = explorerRoot;
-
-               explore(parent);
-
-               treeViewer.setExpandedElements(expandedPlus);
-            } catch (Exception ex) {
-               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
-            }
-         }
-      };
-
-      upAction.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.ARROW_UP_YELLOW));
-      upAction.setToolTipText("View Parent");
-      updateEnablementsEtAl();
-      toolbarManager.add(upAction);
-   }
-
-   private void createNewArtifactExplorerAction(IToolBarManager toolbarManager) {
-
-      newArtifactExplorer = new Action("New Artifact Explorer") {
-         @Override
-         public void run() {
-            IWorkbenchPage page = AWorkbench.getActivePage();
-            ArtifactExplorer artifactExplorer;
-            try {
-               artifactExplorer =
-                  (ArtifactExplorer) page.showView(ArtifactExplorer.VIEW_ID, GUID.create(),
-                     IWorkbenchPage.VIEW_ACTIVATE);
-               artifactExplorer.explore(OseeSystemArtifacts.getDefaultHierarchyRootArtifact(branch));
-               artifactExplorer.setExpandedArtifacts(treeViewer.getExpandedElements());
-            } catch (Exception ex) {
-               throw new RuntimeException(ex);
-            }
-         }
-      };
-
-      newArtifactExplorer.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.ARTIFACT_EXPLORER));
-      toolbarManager.add(newArtifactExplorer);
-   }
-
-   private void createShowChangeReportAction(IToolBarManager toolbarManager) {
-      showChangeReport = new Action("Show Change Report") {
-         @Override
-         public void run() {
-            try {
-               ChangeUiUtil.open(branch);
-            } catch (OseeCoreException ex) {
-               OseeLog.log(Activator.class, Level.SEVERE, ex);
-            }
-         }
-      };
-
-      showChangeReport.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.BRANCH_CHANGE));
-      toolbarManager.add(showChangeReport);
-   }
-
-   private void createCollapseAllAction(IToolBarManager toolbarManager) {
-      collapseAllAction = new Action("Collapse All") {
-         @Override
-         public void run() {
-            if (treeViewer != null) {
-               treeViewer.collapseAll();
-            }
-         }
-      };
-
-      collapseAllAction.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.COLLAPSE_ALL));
-      toolbarManager.add(collapseAllAction);
-   }
-
-   private void createNewChildMenuItem(Menu parentMenu) {
-      createMenuItem = new MenuItem(parentMenu, SWT.PUSH);
-      needProjectListener.add(createMenuItem);
-      createMenuItem.setText("&New Child");
-      createMenuItem.addSelectionListener(new SelectionAdapter() {
-         @Override
-         public void widgetSelected(SelectionEvent e) {
-            try {
-               Artifact parent = getParent();
-
-               AccessPolicy policy = ServiceUtil.getAccessPolicy();
-
-               PermissionStatus status =
-                  policy.canRelationBeModified(parent, null, CoreRelationTypes.Default_Hierarchical__Child, Level.FINE);
-
-               if (status.matched()) {
-                  FilteredTreeArtifactTypeEntryDialog dialog = getDialog();
-                  if (dialog.open() == Window.OK) {
-                     IArtifactType type = dialog.getSelection();
-                     String name = dialog.getEntryValue();
-
-                     SkynetTransaction transaction =
-                        TransactionManager.createTransaction(branch,
-                           String.format("Created new %s \"%s\" in artifact explorer", type.getName(), name));
-                     Artifact newChildArt = parent.addNewChild(RelationOrderBaseTypes.PREEXISTING, type, name);
-                     parent.persist(transaction);
-                     transaction.execute();
-                     RendererManager.open(newChildArt, PresentationType.GENERALIZED_EDIT);
-                     treeViewer.refresh();
-                     treeViewer.refresh(false);
-                  }
-               } else {
-                  MessageDialog.openError(
-                     AWorkbench.getActiveShell(),
-                     "New Child Error",
-                     "Access control has restricted this action. The current user does not have sufficient permission to create relations on this artifact.");
-               }
-            } catch (Exception ex) {
-               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
-            }
-         }
-
-         private FilteredTreeArtifactTypeEntryDialog getDialog() throws OseeCoreException {
-            List<IArtifactType> artifactTypes = new ArrayList<>();
-            for (IArtifactType artifactType : ArtifactTypeManager.getConcreteArtifactTypes(branchSelect.getData())) {
-               if (ArtifactTypeManager.isUserCreationAllowed(artifactType)) {
-                  artifactTypes.add(artifactType);
-               }
-            }
-
-            FilteredTreeArtifactTypeEntryDialog dialog =
-               new FilteredTreeArtifactTypeEntryDialog("New Child", "Enter name and select Artifact type to create",
-                  "Artifact Name", artifactTypes);
-            return dialog;
-         }
-
-         private Artifact getParent() throws OseeCoreException {
-            IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-
-            if (selection.size() > 1) {
-               throw new OseeCoreException("Please select a single artifact to create a new child.");
-            }
-
-            Iterator<?> itemsIter = selection.iterator();
-            Artifact parent;
-            if (!itemsIter.hasNext()) {
-               parent = explorerRoot;
-            } else {
-               parent = (Artifact) itemsIter.next();
-            }
-
-            return parent;
-         }
-      });
-   }
-
-   private void createNewRelatedMenuItem(Menu parentMenu) {
-      createRelatedMenuItem = new CreateRelatedMenuItem(parentMenu, this);
-      needProjectListener.add(createRelatedMenuItem.getMenuItem());
-   }
-
-   private void createGoIntoMenuItem(Menu parentMenu) {
-      goIntoMenuItem = new MenuItem(parentMenu, SWT.PUSH);
-      goIntoMenuItem.setText("&Go Into");
-      needArtifactListener.add(goIntoMenuItem);
-
-      ArtifactMenuListener listener = new ArtifactMenuListener();
-      parentMenu.addMenuListener(listener);
-      goIntoMenuItem.addSelectionListener(new SelectionAdapter() {
-
-         @Override
-         public void widgetSelected(SelectionEvent ev) {
-
-            IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-            Iterator<?> itemsIter = selection.iterator();
-            if (itemsIter.hasNext()) {
-               try {
-                  Object[] expanded = treeViewer.getExpandedElements();
-                  explore((Artifact) itemsIter.next());
-                  treeViewer.setExpandedElements(expanded);
-               } catch (Exception ex) {
-                  OseeLog.log(Activator.class, Level.SEVERE, ex);
-               }
-            }
-         }
-      });
-   }
-
-   private void createFindOnDifferentBranchItem(Menu parentMenu) {
-      findOnAnotherBranch = new MenuItem(parentMenu, SWT.PUSH);
-      findOnAnotherBranch.setText("Reveal On Another Branch");
-      needArtifactListener.add(findOnAnotherBranch);
-
-      ArtifactMenuListener listener = new ArtifactMenuListener();
-      parentMenu.addMenuListener(listener);
-      findOnAnotherBranch.addSelectionListener(new SelectionAdapter() {
-
-         @Override
-         public void widgetSelected(SelectionEvent ev) {
-            Branch branch = BranchSelectionDialog.getBranchFromUser();
-            if (branch != null) {
-               for (Artifact artifact : getSelection().toList()) {
-                  try {
-                     ArtifactExplorer.revealArtifact(ArtifactQuery.getArtifactFromId(artifact.getArtId(), branch));
-                  } catch (OseeCoreException ex) {
-                     OseeLog.logf(Activator.class, OseeLevel.SEVERE_POPUP,
-                        "Could not find Artifact \'%s\' on Branch \'%s\'", artifact.getName(), branch.getName());
-                  }
-               }
-
-            }
-         }
-      });
-   }
-
-   private void createRefreshMenuItem(Menu parentMenu) {
-      refreshMenuItem = new MenuItem(parentMenu, SWT.PUSH);
-      refreshMenuItem.setText("Refresh");
-      needArtifactListener.add(refreshMenuItem);
-
-      ArtifactMenuListener listener = new ArtifactMenuListener();
-      parentMenu.addMenuListener(listener);
-      refreshMenuItem.addSelectionListener(new SelectionAdapter() {
-
-         @Override
-         public void widgetSelected(SelectionEvent mySelectionEvent) {
-            for (Artifact artifact : getSelection().toList()) {
-               treeViewer.refresh(artifact);
-            }
-         }
-      });
-   }
-
-   private void createRenameArtifactMenuItem(Menu parentMenu) {
-      renameArtifactMenuItem = new MenuItem(parentMenu, SWT.PUSH);
-      renameArtifactMenuItem.setText("Rename Artifact");
-      needArtifactListener.add(renameArtifactMenuItem);
-
-      ArtifactMenuListener listener = new ArtifactMenuListener();
-      parentMenu.addMenuListener(listener);
-      renameArtifactMenuItem.addSelectionListener(new SelectionAdapter() {
-
-         @Override
-         public void widgetSelected(SelectionEvent mySelectionEvent) {
-            handleRenameArtifactSelectionEvent(mySelectionEvent);
-         }
-      });
-   }
-
-   private void handleRenameArtifactSelectionEvent(SelectionEvent mySelectionEvent) {
-      // Clean up any previous editor control
-      Control oldEditor = myTreeEditor.getEditor();
-
-      if (oldEditor != null) {
-         oldEditor.dispose();
-      }
-
-      // Identify the selected row, only allow input if there is a single
-      // selected row
-      TreeItem[] selection = myTree.getSelection();
-
-      if (selection.length != 1) {
-         return;
-      }
-
-      final TreeItem myTreeItem = selection[0];
-
-      if (myTreeItem == null) {
-         return;
-      }
-      myTextBeingRenamed = new Text(myTree, SWT.BORDER);
-      Object myTreeItemObject = myTreeItem.getData();
-      myTextBeingRenamed.setText(((Artifact) myTreeItemObject).getName());
-      myTextBeingRenamed.addFocusListener(new FocusAdapter() {
-         @Override
-         public void focusLost(FocusEvent e) {
-            updateText(myTextBeingRenamed.getText(), myTreeItem);
-            myTextBeingRenamed.dispose();
-
-         }
-
-         @Override
-         public void focusGained(FocusEvent e) {
-            // do nothing
-         }
-      });
-
-      myTextBeingRenamed.addKeyListener(new KeyAdapter() {
-         @Override
-         public void keyReleased(KeyEvent e) {
-            if (e.character == SWT.CR) {
-               updateText(myTextBeingRenamed.getText(), myTreeItem);
-               myTextBeingRenamed.dispose();
-            } else if (e.keyCode == SWT.ESC) {
-               myTextBeingRenamed.dispose();
-            }
-         }
-      });
-      myTextBeingRenamed.selectAll();
-      myTextBeingRenamed.setFocus();
-      myTreeEditor.setEditor(myTextBeingRenamed, myTreeItem);
-   }
-
-   private void updateText(String newLabel, TreeItem item) {
-      myTreeEditor.getItem().setText(newLabel);
-      Object myTreeItemObject = item.getData();
-      if (myTreeItemObject instanceof Artifact) {
-         Artifact myArtifact = (Artifact) myTreeItemObject;
-         try {
-            myArtifact.setName(newLabel);
-            myArtifact.persist(getClass().getSimpleName());
-         } catch (Exception ex) {
-            OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
-         }
-      }
-      treeViewer.refresh();
-   }
-
-   private void createSelectAllMenuItem(Menu parentMenu) {
-      MenuItem menuItem = new MenuItem(parentMenu, SWT.PUSH);
-      menuItem.setText("&Select All\tCtrl+A");
-      menuItem.addListener(SWT.Selection, new Listener() {
-         @Override
-         public void handleEvent(org.eclipse.swt.widgets.Event event) {
-            treeViewer.getTree().selectAll();
-         }
-      });
-   }
-
-   private void createImportExportMenuItems(Menu parentMenu) {
-      MenuItems.createMenuItem(parentMenu, SWT.PUSH, new ImportResourcesAction(getViewSite().getWorkbenchWindow()));
-      MenuItems.createMenuItem(parentMenu, SWT.PUSH, new ExportResourcesAction(getViewSite().getWorkbenchWindow()));
-   }
-
-   private void createAccessControlMenuItem(Menu parentMenu) {
-      accessControlMenuItem = new MenuItem(parentMenu, SWT.PUSH);
-      accessControlMenuItem.setImage(ImageManager.getImage(FrameworkImage.AUTHENTICATED));
-      accessControlMenuItem.setText("&Access Control ");
-      // accessControlMenuItem.setEnabled(false);
-      accessControlMenuItem.addSelectionListener(new SelectionAdapter() {
-
-         @Override
-         public void widgetSelected(SelectionEvent e) {
-            IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-            Artifact selectedArtifact = (Artifact) selection.getFirstElement();
-            try {
-               if (selectedArtifact != null) {
-                  PolicyDialog pd = new PolicyDialog(Displays.getActiveShell(), selectedArtifact);
-                  pd.open();
-                  refreshBranchWarning();
-               }
-            } catch (Exception ex) {
-               OseeLog.log(Activator.class, Level.SEVERE, ex);
-            }
-         }
-      });
-   }
-
-   private void createLockMenuItem(Menu parentMenu) {
-      lockMenuItem = new MenuItem(parentMenu, SWT.PUSH);
-      lockMenuItem.addSelectionListener(new SelectionAdapter() {
-
-         @Override
-         public void widgetSelected(SelectionEvent e) {
-            IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-            Iterator<?> iterator = selection.iterator();
-            Set<Artifact> lockArtifacts = new HashSet<>();
-            Set<Artifact> unlockArtifacts = new HashSet<>();
-            while (iterator.hasNext()) {
-               try {
-                  Artifact object = (Artifact) iterator.next();
-                  if (new GlobalMenuPermissions(object).isLocked()) {
-                     unlockArtifacts.add(object);
-                  } else {
-                     lockArtifacts.add(object);
-                  }
-               } catch (Exception ex) {
-                  OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
-               }
-            }
-
-            try {
-               AccessControlManager.unLockObjects(unlockArtifacts, UserManager.getUser());
-               AccessControlManager.lockObjects(lockArtifacts, UserManager.getUser());
-            } catch (Exception ex) {
-               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
-            }
-         }
-
-      });
-   }
-
-   private void createCopyMenuItem(Menu parentMenu) {
-      copyMenuItem = new MenuItem(parentMenu, SWT.PUSH);
-      copyMenuItem.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_COPY));
-      copyMenuItem.setText("Copy \tCtrl+C");
-      copyMenuItem.addSelectionListener(new SelectionAdapter() {
-
-         @Override
-         public void widgetSelected(SelectionEvent e) {
-            try {
-               performCopy();
-            } catch (OseeCoreException ex) {
-               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
-            }
-         }
-      });
-   }
-
-   private void performCopy() throws OseeCoreException {
-      IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-      List<Artifact> artifactTransferData = new ArrayList<>();
-      Artifact artifact;
-
-      if (selection != null && !selection.isEmpty()) {
-         for (Object object : selection.toArray()) {
-            if (object instanceof Artifact) {
-               artifact = (Artifact) object;
-               if (!ArtifactTypeManager.isUserCreationAllowed(artifact.getArtifactType())) {
-                  throw new OseeArgumentException("Artifact Type [%s] can not be copied",
-                     artifact.getArtifactTypeName());
-               }
-               artifactTransferData.add(artifact);
-            }
-         }
-         artifactClipboard.setArtifactsToClipboard(ServiceUtil.getAccessPolicy(), artifactTransferData);
-      }
-   }
-
-   private void createPasteMenuItem(Menu parentMenu) {
-      pasteMenuItem = new MenuItem(parentMenu, SWT.PUSH);
-      pasteMenuItem.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_PASTE));
-      pasteMenuItem.setText("Paste \tCtrl+V");
-      pasteMenuItem.addSelectionListener(new SelectionAdapter() {
-
-         @Override
-         public void widgetSelected(SelectionEvent e) {
-            performPasteOperation(false);
-         }
-      });
-   }
-
-   private void createPasteSpecialMenuItem(Menu parentMenu) {
-      pasteSpecialMenuItem = new MenuItem(parentMenu, SWT.PUSH);
-      pasteSpecialMenuItem.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_PASTE));
-      pasteSpecialMenuItem.setText("Paste Special... \tCtrl+S");
-      pasteSpecialMenuItem.addSelectionListener(new SelectionAdapter() {
-
-         @Override
-         public void widgetSelected(SelectionEvent e) {
-            performPasteOperation(true);
-         }
-
-      });
-   }
-
-   private void performPasteOperation(boolean isPasteSpecial) {
-      boolean performPaste = true;
-      Artifact destinationArtifact = null;
-      IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-      if (selection != null && !selection.isEmpty()) {
-         Object object = selection.getFirstElement();
-
-         if (object instanceof Artifact) {
-            Artifact artifact = (Artifact) object;
-            if (!ArtifactTypeManager.isUserCreationAllowed(artifact.getArtifactType())) {
-               throw new OseeArgumentException("Artifact Type [%s] can not be copied", artifact.getArtifactTypeName());
-            }
-            destinationArtifact = (Artifact) object;
-         }
-      }
-
-      ArtifactPasteConfiguration config = new ArtifactPasteConfiguration();
-
-      if (isPasteSpecial) {
-         Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-         List<Artifact> copiedArtifacts = artifactClipboard.getCopiedContents();
-         ArtifactPasteSpecialDialog dialog =
-            new ArtifactPasteSpecialDialog(shell, config, destinationArtifact, copiedArtifacts);
-         performPaste = dialog.open() == Window.OK;
-      }
-
-      if (performPaste) {
-         Operations.executeAsJob(
-            new ArtifactPasteOperation(config, destinationArtifact, artifactClipboard.getCopiedContents(),
-               new ArtifactNameConflictHandler()), true);
-      }
-   }
-
-   private void createExpandAllMenuItem(Menu parentMenu) {
-      MenuItem menuItem = new MenuItem(parentMenu, SWT.PUSH);
-      menuItem.setImage(ImageManager.getImage(FrameworkImage.EXPAND_ALL));
-      menuItem.setText("Expand All\tCtrl++");
-      menuItem.addSelectionListener(new ExpandListener());
-   }
-
-   public class ExpandListener extends SelectionAdapter {
-      @Override
-      public void widgetSelected(SelectionEvent event) {
-         expandAll((IStructuredSelection) treeViewer.getSelection());
-      }
-   }
-
-   private void expandAll(IStructuredSelection selection) {
-      Iterator<?> iter = selection.iterator();
-      while (iter.hasNext()) {
-         Object obj = iter.next();
-         expandAll(obj);
-      }
-   }
-
-   private void expandAll(Object object) {
-      if (!(object instanceof ArtifactExplorerLinkNode)) {
-         treeViewer.expandToLevel(object, 1);
-         for (Object child : ((ArtifactContentProvider) getTreeViewer().getContentProvider()).getChildren(object)) {
-            expandAll(child);
-         }
+         ArtifactExplorerUtil.findView(branch, page);
       }
    }
 
@@ -1087,13 +284,14 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
       }
 
       refreshBranchWarning();
+
       initializeSelectionBox();
 
       if (treeViewer != null) {
          Object objects[] = treeViewer.getExpandedElements();
          treeViewer.setInput(explorerRoot);
-         setupPopupMenu();
-         updateEnablementsEtAl();
+         artifactExplorerMenu.setupPopupMenu();
+         artifactExplorerToolbar.updateEnablement();
          // Attempt to re-expand what was expanded
          treeViewer.setExpandedElements(objects);
       }
@@ -1105,87 +303,6 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
       }
    }
 
-   private void updateEnablementsEtAl() {
-      // The upAction may be null if this viewpart has not been layed out yet
-      if (upAction != null) {
-         try {
-            upAction.setEnabled(explorerRoot != null && explorerRoot.hasParent());
-         } catch (OseeCoreException ex) {
-            upAction.setEnabled(false);
-            OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
-         }
-      }
-   }
-
-   private class NeedArtifactMenuListener implements MenuListener {
-      private final HashCollection<Class<? extends Artifact>, MenuItem> menuItemMap;
-
-      public NeedArtifactMenuListener() {
-         menuItemMap = new HashCollection<>();
-      }
-
-      public void add(MenuItem item) {
-         menuItemMap.put(Artifact.class, item);
-      }
-
-      @Override
-      public void menuHidden(MenuEvent e) {
-         // do nothing
-      }
-
-      @Override
-      public void menuShown(MenuEvent e) {
-         IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-
-         Object obj = selection.getFirstElement();
-         if (obj != null && obj instanceof Artifact) {
-            Class<? extends Artifact> selectedClass = obj.getClass().asSubclass(Artifact.class);
-
-            for (Class<? extends Artifact> artifactClass : menuItemMap.keySet()) {
-               boolean valid = artifactClass.isAssignableFrom(selectedClass);
-
-               for (MenuItem item : menuItemMap.getValues(artifactClass)) {
-                  if (!(item.getData() instanceof Exception)) {
-                     // Only modify enabling if no error is associated
-                     item.setEnabled(valid);
-                  }
-               }
-            }
-         }
-      }
-   }
-
-   private class NeedProjectMenuListener implements MenuListener {
-      Collection<MenuItem> items;
-
-      public NeedProjectMenuListener() {
-         items = new LinkedList<>();
-      }
-
-      public void add(MenuItem item) {
-         items.add(item);
-      }
-
-      @Override
-      public void menuHidden(MenuEvent e) {
-         // do nothing
-      }
-
-      @Override
-      public void menuShown(MenuEvent e) {
-         boolean valid = treeViewer.getInput() != null;
-         for (MenuItem item : items) {
-            if (!(item.getData() instanceof Exception)) {
-               // Only modify
-               // enabling if no
-               // error is
-               // associated
-               item.setEnabled(valid);
-            }
-         }
-      }
-   }
-
    /**
     * Add the selection from the define explorer
     */
@@ -1200,64 +317,6 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
       }
    }
 
-   /**
-    * @author Jeff C. Phillips
-    */
-   public class ArtifactMenuListener implements MenuListener {
-
-      @Override
-      public void menuHidden(MenuEvent e) {
-         // do nothing
-      }
-
-      @Override
-      public void menuShown(MenuEvent e) {
-         // Use this menu listener until all menu items can be moved to
-         // GlobaMenu
-         try {
-            IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-            Object obj = selection.getFirstElement();
-            AccessPolicy service = ServiceUtil.getAccessPolicy();
-            boolean canModifyDH = false;
-            boolean isArtifact = false;
-            if (obj instanceof Artifact) {
-               isArtifact = true;
-               Artifact art = (Artifact) obj;
-               canModifyDH =
-                  service.canRelationBeModified(art, null, CoreRelationTypes.Default_Hierarchical__Child, Level.FINE).matched();
-            }
-
-            GlobalMenuPermissions permiss = new GlobalMenuPermissions(globalMenuHelper);
-
-            if (isArtifact) {
-               lockMenuItem.setText((permiss.isLocked() ? "Unlock: (" + permiss.getSubjectFromLockedObjectName() + ")" : "Lock"));
-            }
-
-            lockMenuItem.setEnabled(isArtifact && permiss.isWritePermission() && (!permiss.isLocked() || permiss.isAccessToRemoveLock()));
-
-            createMenuItem.setEnabled(isArtifact && permiss.isWritePermission() || canModifyDH);
-
-            goIntoMenuItem.setEnabled(isArtifact && permiss.isReadPermission());
-            copyMenuItem.setEnabled(isArtifact && permiss.isReadPermission());
-
-            boolean clipboardEmpty = artifactClipboard.isEmpty();
-            pasteMenuItem.setEnabled(isArtifact && canModifyDH && !clipboardEmpty);
-            pasteSpecialMenuItem.setEnabled(isArtifact && canModifyDH && !clipboardEmpty);
-            renameArtifactMenuItem.setEnabled(isArtifact && permiss.isWritePermission());
-            findOnAnotherBranch.setEnabled(isArtifact);
-            accessControlMenuItem.setEnabled(isArtifact);
-            refreshMenuItem.setEnabled(isArtifact);
-
-            createRelatedMenuItem.setCreateRelatedEnabled(obj, service);
-
-         } catch (Exception ex) {
-            OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
-         }
-
-      }
-
-   }
-
    @Override
    public void init(IViewSite site, IMemento memento) throws PartInitException {
       super.init(site, memento);
@@ -1306,7 +365,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
    public void dispose() {
       OseeEventManager.removeListener(this);
       ArtifactExplorerEventManager.remove(this);
-      artifactClipboard.dispose();
+      artifactExplorerMenu.dispose();
       super.dispose();
    }
 
@@ -1358,7 +417,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
 
    @Override
    public void rebuildMenu() {
-      setupPopupMenu();
+      artifactExplorerMenu.setupPopupMenu();
    }
 
    public void setBranch(Branch branch) {
@@ -1399,7 +458,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
                   public IStatus runInUIThread(IProgressMonitor monitor) {
                      Artifact artifact = data.getArtifact();
                      IWorkbenchPage page = AWorkbench.getActivePage();
-                     ArtifactExplorer artifactExplorer = findView(artifact.getBranch(), page);
+                     ArtifactExplorer artifactExplorer = ArtifactExplorerUtil.findView(artifact.getBranch(), page);
                      artifactExplorer.treeViewer.setSelection(new StructuredSelection(artifact), true);
                      return Status.OK_STATUS;
                   }
@@ -1408,53 +467,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
             }
          }
       });
-   }
-
-   private static final class ArtifactData {
-      private Artifact artifact;
-
-      ArtifactData(Artifact artifact) {
-         this.artifact = artifact;
-      }
 
-      Artifact getArtifact() {
-         return artifact;
-      }
-
-      void setArtifact(Artifact artifact) {
-         this.artifact = artifact;
-      }
-   }
-
-   private static final class CheckArtifactBeforeReveal extends AbstractOperation {
-
-      private final ArtifactData artifactData;
-
-      public CheckArtifactBeforeReveal(ArtifactData artifactData) {
-         super("Check Artifact Before Reveal", Activator.PLUGIN_ID);
-         this.artifactData = artifactData;
-      }
-
-      @Override
-      protected void doWork(IProgressMonitor monitor) throws Exception {
-         Conditions.checkNotNull(artifactData, "artifact data");
-
-         Artifact artifact = artifactData.getArtifact();
-         Conditions.checkNotNull(artifact, "artifact");
-         if (artifact.isDeleted()) {
-            throw new OseeStateException("The artifact [%s] has been deleted.", artifact.getName());
-         } else {
-            if (artifact.isHistorical()) {
-               artifactData.setArtifact(ArtifactQuery.getArtifactFromId(artifact.getArtId(), artifact.getBranch(),
-                  DeletionFlag.EXCLUDE_DELETED));
-            }
-
-            if (artifact.isNotRootedInDefaultRoot()) {
-               throw new OseeStateException("Artifact [%s] is not rooted in the default hierarchical root",
-                  artifact.getName());
-            }
-         }
-      }
    }
 
    @Override
@@ -1506,4 +519,24 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
       return null;
    }
 
+   public Artifact getExplorerRoot() {
+      return explorerRoot;
+   }
+
+   public TreeEditor getMyTreeEditor() {
+      return myTreeEditor;
+   }
+
+   public Label getBranchWarningLabel() {
+      return branchWarningComposite.getBranchWarningLabel();
+   }
+
+   public StackLayout getStackLayout() {
+      return stackLayout;
+   }
+
+   public Composite getStackComposite() {
+      return stackComposite;
+   }
+
 }
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java
index 1ad446b0f19..40b2891b33c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java
@@ -127,17 +127,15 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop {
                      artsOnSameBranchAsDestination.add(art);
                   }
                }
-               valid =
-                  policy.canRelationBeModified(dropTarget, artsOnSameBranchAsDestination,
-                     CoreRelationTypes.Default_Hierarchical__Child, Level.FINE).matched();
+               valid = policy.canRelationBeModified(dropTarget, artsOnSameBranchAsDestination,
+                  CoreRelationTypes.Default_Hierarchical__Child, Level.FINE).matched();
 
                // if we are deparenting ourself, make sure our parent's child side can be modified
                if (valid) {
                   for (Artifact art : artsOnSameBranchAsDestination) {
                      if (art.hasParent()) {
-                        valid =
-                           policy.canRelationBeModified(art.getParent(), null,
-                              CoreRelationTypes.Default_Hierarchical__Child, Level.FINE).matched();
+                        valid = policy.canRelationBeModified(art.getParent(), null,
+                           CoreRelationTypes.Default_Hierarchical__Child, Level.FINE).matched();
                      }
                      if (!valid) {
                         break;
@@ -182,8 +180,7 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop {
                InterArtifactExplorerDropHandlerOperation interDropHandler =
                   new InterArtifactExplorerDropHandlerOperation(parentArtifact, artifactsToBeRelated, true);
                Operations.executeAsJob(interDropHandler, true);
-            } else if (isValidForArtifactDrop(event) && MessageDialog.openQuestion(
-               viewPart.getViewSite().getShell(),
+            } else if (isValidForArtifactDrop(event) && MessageDialog.openQuestion(viewPart.getViewSite().getShell(),
                "Confirm Move",
                "Are you sure you want to make each of the selected artifacts a child of " + parentArtifact.getName() + "?")) {
                try {
@@ -218,10 +215,9 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop {
 
                String fileName = importFile.getName();
                if (isSameName(parentArtifact, fileName)) {
-                  String promptMsg =
-                     String.format(
-                        "Artifact [%s] has same base file name as [%s]. \n\nDo you want to update the exisiting file? \nIf 'NO' selected, you'll be taken to the Artifact Import Wizard",
-                        parentArtifact.getName(), FilenameUtils.getName(fileName));
+                  String promptMsg = String.format(
+                     "Artifact [%s] has same base file name as [%s]. \n\nDo you want to update the exisiting file? \nIf 'NO' selected, you'll be taken to the Artifact Import Wizard",
+                     parentArtifact.getName(), FilenameUtils.getName(fileName));
 
                   if (MessageDialog.openQuestion(viewPart.getViewSite().getShell(), "Confirm Import", promptMsg)) {
 
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerToolbar.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerToolbar.java
new file mode 100644
index 00000000000..1d4f07af87f
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerToolbar.java
@@ -0,0 +1,200 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.skynet.explorer;
+
+import java.util.logging.Level;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.plugin.core.util.Jobs;
+import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
+import org.eclipse.osee.framework.ui.skynet.action.OpenAssociatedArtifactFromBranchProvider;
+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.search.QuickSearchView;
+import org.eclipse.osee.framework.ui.swt.ImageManager;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.progress.UIJob;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class ArtifactExplorerToolbar {
+
+   private final ArtifactExplorer artifactExplorer;
+   private final IToolBarManager toolbarManager;
+   private Action newArtifactExplorer;
+   private Action collapseAllAction;
+   private Action showChangeReport;
+   private Action upAction;
+
+   public ArtifactExplorerToolbar(ArtifactExplorer artifactExplorer) {
+      this.artifactExplorer = artifactExplorer;
+      this.toolbarManager = artifactExplorer.getViewSite().getActionBars().getToolBarManager();
+   }
+
+   public void createToolbar() {
+      createCollapseAllAction(toolbarManager);
+      createUpAction(toolbarManager);
+      createNewArtifactExplorerAction(toolbarManager);
+      createShowChangeReportAction(toolbarManager);
+      addOpenQuickSearchAction(toolbarManager);
+      toolbarManager.add(new OpenAssociatedArtifactFromBranchProvider(artifactExplorer));
+
+   }
+
+   public void updateEnablement() {
+      // The upAction may be null if this viewpart has not been layed out yet
+      if (upAction != null) {
+         try {
+            Artifact explorerRoot = artifactExplorer.getExplorerRoot();
+            upAction.setEnabled(explorerRoot != null && explorerRoot.hasParent());
+         } catch (OseeCoreException ex) {
+            upAction.setEnabled(false);
+            OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+         }
+      }
+   }
+
+   private void addOpenQuickSearchAction(IToolBarManager toolbarManager) {
+      Action openQuickSearch =
+         new Action("Quick Search", ImageManager.getImageDescriptor(FrameworkImage.ARTIFACT_SEARCH)) {
+            @Override
+            public void run() {
+               Job job = new UIJob("Open Quick Search") {
+
+                  @Override
+                  public IStatus runInUIThread(IProgressMonitor monitor) {
+                     IStatus status = Status.OK_STATUS;
+                     try {
+                        IViewPart viewPart =
+                           PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(
+                              QuickSearchView.VIEW_ID);
+                        if (viewPart != null) {
+                           Branch branch = artifactExplorer.getBranch();
+                           if (branch != null) {
+                              ((QuickSearchView) viewPart).setBranch(branch);
+                           }
+                        }
+                     } catch (Exception ex) {
+                        status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error opening quick search", ex);
+                     }
+                     return status;
+                  }
+               };
+               Jobs.startJob(job);
+            }
+         };
+      openQuickSearch.setToolTipText("Open Quick Search View");
+      toolbarManager.add(openQuickSearch);
+   }
+
+   protected void createUpAction(IToolBarManager toolbarManager) {
+      upAction = new Action("View Parent") {
+         @Override
+         public void run() {
+            try {
+               Artifact explorerRoot = artifactExplorer.getExplorerRoot();
+               Artifact parent = explorerRoot.getParent();
+
+               if (parent == null) {
+                  return;
+               }
+
+               Object[] expanded = artifactExplorer.getTreeViewer().getExpandedElements();
+               Object[] expandedPlus = new Object[expanded.length + 1];
+               for (int i = 0; i < expanded.length; i++) {
+                  expandedPlus[i] = expanded[i];
+               }
+               expandedPlus[expandedPlus.length - 1] = explorerRoot;
+
+               artifactExplorer.explore(parent);
+
+               artifactExplorer.getTreeViewer().setExpandedElements(expandedPlus);
+            } catch (Exception ex) {
+               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+            }
+         }
+      };
+
+      upAction.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.ARROW_UP_YELLOW));
+      upAction.setToolTipText("View Parent");
+      updateEnablement();
+      toolbarManager.add(upAction);
+   }
+
+   private void createNewArtifactExplorerAction(IToolBarManager toolbarManager) {
+
+      newArtifactExplorer = new Action("New Artifact Explorer") {
+         @Override
+         public void run() {
+            IWorkbenchPage page = AWorkbench.getActivePage();
+            ArtifactExplorer artifactExplorer;
+            try {
+               artifactExplorer = (ArtifactExplorer) page.showView(ArtifactExplorer.VIEW_ID, GUID.create(),
+                  IWorkbenchPage.VIEW_ACTIVATE);
+               artifactExplorer.explore(
+                  OseeSystemArtifacts.getDefaultHierarchyRootArtifact(artifactExplorer.getBranch()));
+               artifactExplorer.setExpandedArtifacts(artifactExplorer.getTreeViewer().getExpandedElements());
+            } catch (Exception ex) {
+               throw new RuntimeException(ex);
+            }
+         }
+      };
+
+      newArtifactExplorer.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.ARTIFACT_EXPLORER));
+      toolbarManager.add(newArtifactExplorer);
+   }
+
+   private void createShowChangeReportAction(IToolBarManager toolbarManager) {
+      showChangeReport = new Action("Show Change Report") {
+         @Override
+         public void run() {
+            try {
+               ChangeUiUtil.open(artifactExplorer.getBranch());
+            } catch (OseeCoreException ex) {
+               OseeLog.log(Activator.class, Level.SEVERE, ex);
+            }
+         }
+      };
+
+      showChangeReport.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.BRANCH_CHANGE));
+      toolbarManager.add(showChangeReport);
+   }
+
+   private void createCollapseAllAction(IToolBarManager toolbarManager) {
+      collapseAllAction = new Action("Collapse All") {
+         @Override
+         public void run() {
+            if (artifactExplorer.getTreeViewer() != null) {
+               artifactExplorer.getTreeViewer().collapseAll();
+            }
+         }
+      };
+
+      collapseAllAction.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.COLLAPSE_ALL));
+      toolbarManager.add(collapseAllAction);
+   }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerUtil.java
new file mode 100644
index 00000000000..6bf076c1b6e
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerUtil.java
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.skynet.explorer;
+
+import java.util.logging.Level;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.operation.IOperation;
+import org.eclipse.osee.framework.core.operation.Operations;
+import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.plugin.core.util.Jobs;
+import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.skynet.internal.Activator;
+import org.eclipse.osee.framework.ui.skynet.menu.GlobalMenuPermissions;
+import org.eclipse.osee.framework.ui.skynet.menu.IGlobalMenuHelper;
+import org.eclipse.osee.framework.ui.swt.Displays;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IViewReference;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.progress.UIJob;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class ArtifactExplorerUtil {
+
+   private ArtifactExplorerUtil() {
+      // Utility Class
+   }
+
+   protected static ArtifactExplorer findView(IOseeBranch inputBranch, IWorkbenchPage page) {
+      for (IViewReference view : page.getViewReferences()) {
+         if (view.getId().equals(ArtifactExplorer.VIEW_ID)) {
+            if (view.getView(false) != null && inputBranch.equals(
+               ((ArtifactExplorer) view.getView(false)).getBranch())) {
+               try {
+                  return (ArtifactExplorer) page.showView(view.getId(), view.getSecondaryId(),
+                     IWorkbenchPage.VIEW_ACTIVATE);
+               } catch (Exception ex) {
+                  throw new RuntimeException(ex);
+               }
+            }
+         }
+      }
+      try {
+         ArtifactExplorer explorer =
+            (ArtifactExplorer) page.showView(ArtifactExplorer.VIEW_ID, GUID.create(), IWorkbenchPage.VIEW_ACTIVATE);
+         explorer.explore(OseeSystemArtifacts.getDefaultHierarchyRootArtifact(inputBranch));
+         return explorer;
+      } catch (Exception ex) {
+         throw new RuntimeException(ex);
+      }
+   }
+
+   public static void refreshBranchWarning(ArtifactExplorer artifactExplorer, TreeViewer treeViewer, IGlobalMenuHelper globalMenuHelper, Branch branch, BranchWarningComposite branchWarningComposite) {
+      Displays.ensureInDisplayThread(new Runnable() {
+         @Override
+         public void run() {
+            try {
+               if (treeViewer == null) {
+                  return;
+               }
+
+               Control control = treeViewer.getTree();
+               if (branch != null) {
+                  String warningStr = null;
+                  if (!new GlobalMenuPermissions(globalMenuHelper).isBranchReadable(branch)) {
+                     warningStr = "Branch Read Access Denied.\nContact your administrator.";
+                  } else {
+                     switch (branch.getBranchState()) {
+                        case CREATION_IN_PROGRESS:
+                           warningStr = "Branch Creation in Progress, Please Wait.";
+                           break;
+                        case COMMIT_IN_PROGRESS:
+                           warningStr = "Branch Commit in Progress, Please Close Artifact Explorer.";
+                           break;
+                        case COMMITTED:
+                           warningStr = "Branch Committed, Please Close Artifact Explorer.";
+                           break;
+                        case DELETED:
+                           warningStr = "Branch Deleted, Please Close Artifact Explorer.";
+                           break;
+                        case REBASELINE_IN_PROGRESS:
+                           warningStr = "Branch Rebaseline in Progress, Please Wait.";
+                           break;
+                        case REBASELINED:
+                           warningStr = "Branch Rebaselined, Please Close Artifact Explorer.";
+                           break;
+                        case DELETE_IN_PROGRESS:
+                           warningStr = "Branch Delete in Progress, Please Close Artifact Explorer.";
+                           break;
+                        case PURGE_IN_PROGRESS:
+                           warningStr = "Branch Purge in Progress, Please Close Artifact Explorer.";
+                           break;
+                        case PURGED:
+                           warningStr = "Branch Purged, Please Close Artifact Explorer.";
+                           break;
+                        default:
+                           break;
+                     }
+                  }
+                  if (warningStr != null) {
+                     control = branchWarningComposite;
+                     artifactExplorer.getBranchWarningLabel().setText(warningStr);
+                     artifactExplorer.getBranchWarningLabel().update();
+                     branchWarningComposite.update();
+                  }
+               }
+
+               artifactExplorer.getStackLayout().topControl = control;
+               artifactExplorer.getStackComposite().layout();
+               artifactExplorer.getStackComposite().getParent().layout();
+            } catch (OseeCoreException ex) {
+               OseeLog.log(Activator.class, Level.SEVERE, ex);
+            }
+         }
+      });
+   }
+
+   public static void revealArtifact(final ArtifactExplorer artifactExplorer, Artifact artifact) {
+      final ArtifactData data = new ArtifactData(artifact);
+      IOperation operation = new CheckArtifactBeforeReveal(data);
+      Operations.executeAsJob(operation, true, Job.SHORT, new JobChangeAdapter() {
+
+         @Override
+         public void done(IJobChangeEvent event) {
+            IStatus status = event.getResult();
+            if (status.isOK()) {
+               Job uiJob = new UIJob("Reveal in Artifact Explorer") {
+
+                  @Override
+                  public IStatus runInUIThread(IProgressMonitor monitor) {
+                     Artifact artifact = data.getArtifact();
+                     IWorkbenchPage page = AWorkbench.getActivePage();
+                     ArtifactExplorer artifactExplorer = ArtifactExplorerUtil.findView(artifact.getBranch(), page);
+                     artifactExplorer.getTreeViewer().setSelection(new StructuredSelection(artifact), true);
+                     return Status.OK_STATUS;
+                  }
+               };
+               Jobs.startJob(uiJob);
+            }
+         }
+      });
+   }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/BranchWarningComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/BranchWarningComposite.java
new file mode 100644
index 00000000000..b981364379c
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/BranchWarningComposite.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.skynet.explorer;
+
+import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
+import org.eclipse.osee.framework.ui.swt.Displays;
+import org.eclipse.osee.framework.ui.swt.FontManager;
+import org.eclipse.osee.framework.ui.swt.ImageManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class BranchWarningComposite extends Composite {
+
+   private final Label branchWarningLabel;
+
+   public BranchWarningComposite(Composite parent) {
+      super(parent, SWT.BORDER);
+      setLayout(new GridLayout(2, false));
+      setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+      setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+      Label image = new Label(this, SWT.NONE);
+      image.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
+      image.setImage(ImageManager.getImage(FrameworkImage.LOCKED_KEY));
+      image.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+      branchWarningLabel = new Label(this, SWT.NONE);
+      branchWarningLabel.setFont(FontManager.getFont("Courier New", 10, SWT.BOLD));
+      branchWarningLabel.setForeground(Displays.getSystemColor(SWT.COLOR_DARK_RED));
+      branchWarningLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
+      branchWarningLabel.setText("None");
+      branchWarningLabel.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+   }
+
+   public void updateLabel(String warningStr) {
+      if (warningStr != null) {
+         branchWarningLabel.setText(warningStr);
+         branchWarningLabel.update();
+         update();
+      }
+   }
+
+   public Label getBranchWarningLabel() {
+      return branchWarningLabel;
+   }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/CheckArtifactBeforeReveal.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/CheckArtifactBeforeReveal.java
new file mode 100644
index 00000000000..149bd8a4e2d
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/CheckArtifactBeforeReveal.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.skynet.explorer;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osee.framework.core.enums.DeletionFlag;
+import org.eclipse.osee.framework.core.operation.AbstractOperation;
+import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
+import org.eclipse.osee.framework.jdk.core.util.Conditions;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.eclipse.osee.framework.ui.skynet.internal.Activator;
+
+/**
+ * @author Donald G. Dunne
+ */
+class CheckArtifactBeforeReveal extends AbstractOperation {
+
+   private final ArtifactData artifactData;
+
+   public CheckArtifactBeforeReveal(ArtifactData artifactData) {
+      super("Check Artifact Before Reveal", Activator.PLUGIN_ID);
+      this.artifactData = artifactData;
+   }
+
+   @Override
+   protected void doWork(IProgressMonitor monitor) throws Exception {
+      Conditions.checkNotNull(artifactData, "artifact data");
+
+      Artifact artifact = artifactData.getArtifact();
+      Conditions.checkNotNull(artifact, "artifact");
+      if (artifact.isDeleted()) {
+         throw new OseeStateException("The artifact [%s] has been deleted.", artifact.getName());
+      } else {
+         if (artifact.isHistorical()) {
+            artifactData.setArtifact(ArtifactQuery.getArtifactFromId(artifact.getArtId(), artifact.getBranch(),
+               DeletionFlag.EXCLUDE_DELETED));
+         }
+
+         if (artifact.isNotRootedInDefaultRoot()) {
+            throw new OseeStateException("Artifact [%s] is not rooted in the default hierarchical root",
+               artifact.getName());
+         }
+      }
+   }
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/ArtifactExplorerMenu.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/ArtifactExplorerMenu.java
new file mode 100644
index 00000000000..51fb39525b3
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/ArtifactExplorerMenu.java
@@ -0,0 +1,696 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.skynet.explorer.menu;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.window.Window;
+import org.eclipse.osee.framework.access.AccessControlManager;
+import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
+import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.access.PermissionStatus;
+import org.eclipse.osee.framework.core.operation.Operations;
+import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
+import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.AccessPolicy;
+import org.eclipse.osee.framework.skynet.core.UserManager;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+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.util.AWorkbench;
+import org.eclipse.osee.framework.ui.skynet.ArtifactContentProvider;
+import org.eclipse.osee.framework.ui.skynet.ArtifactStructuredSelection;
+import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
+import org.eclipse.osee.framework.ui.skynet.OpenContributionItem;
+import org.eclipse.osee.framework.ui.skynet.access.PolicyDialog;
+import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactNameConflictHandler;
+import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPasteOperation;
+import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog;
+import org.eclipse.osee.framework.ui.skynet.dialogs.ArtifactPasteSpecialDialog;
+import org.eclipse.osee.framework.ui.skynet.explorer.ArtifactExplorer;
+import org.eclipse.osee.framework.ui.skynet.explorer.ArtifactExplorerLinkNode;
+import org.eclipse.osee.framework.ui.skynet.internal.Activator;
+import org.eclipse.osee.framework.ui.skynet.internal.ServiceUtil;
+import org.eclipse.osee.framework.ui.skynet.menu.ArtifactTreeViewerGlobalMenuHelper;
+import org.eclipse.osee.framework.ui.skynet.menu.GlobalMenu;
+import org.eclipse.osee.framework.ui.skynet.menu.GlobalMenuPermissions;
+import org.eclipse.osee.framework.ui.skynet.menu.IGlobalMenuHelper;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
+import org.eclipse.osee.framework.ui.skynet.util.ArtifactClipboard;
+import org.eclipse.osee.framework.ui.skynet.util.ArtifactPasteConfiguration;
+import org.eclipse.osee.framework.ui.skynet.widgets.dialog.FilteredTreeArtifactTypeEntryDialog;
+import org.eclipse.osee.framework.ui.swt.Displays;
+import org.eclipse.osee.framework.ui.swt.ImageManager;
+import org.eclipse.osee.framework.ui.swt.MenuItems;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.TreeEditor;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.MenuEvent;
+import org.eclipse.swt.events.MenuListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.ExportResourcesAction;
+import org.eclipse.ui.actions.ImportResourcesAction;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class ArtifactExplorerMenu {
+
+   private final TreeViewer treeViewer;
+   private MenuItem createMenuItem;
+   private CreateRelatedMenuItem createRelatedMenuItem;
+   private MenuItem accessControlMenuItem;
+   private MenuItem lockMenuItem;
+   private MenuItem goIntoMenuItem;
+   private MenuItem copyMenuItem;
+   private MenuItem pasteMenuItem;
+   private MenuItem pasteSpecialMenuItem;
+   private MenuItem renameArtifactMenuItem;
+   private MenuItem refreshMenuItem;
+   private MenuItem findOnAnotherBranch;
+   private IGlobalMenuHelper globalMenuHelper;
+   private static final ArtifactClipboard artifactClipboard = new ArtifactClipboard(ArtifactExplorer.VIEW_ID);
+   private NeedArtifactMenuListener needArtifactListener;
+   private NeedProjectMenuListener needProjectListener;
+   private final ArtifactExplorer artifactExplorer;
+   private Text myTextBeingRenamed;
+
+   public ArtifactExplorerMenu(ArtifactExplorer artifactExplorer) {
+      this.artifactExplorer = artifactExplorer;
+      treeViewer = artifactExplorer.getTreeViewer();
+   }
+
+   public void create() {
+      globalMenuHelper = new ArtifactTreeViewerGlobalMenuHelper(treeViewer);
+   }
+
+   public void dispose() {
+      artifactClipboard.dispose();
+
+   }
+
+   public void handleMenuShown(MenuEvent e) {
+      // Use this menu listener until all menu items can be moved to
+      // GlobaMenu
+      try {
+         IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+         Object obj = selection.getFirstElement();
+         AccessPolicy service = ServiceUtil.getAccessPolicy();
+         boolean canModifyDH = false;
+         boolean isArtifact = false;
+         if (obj instanceof Artifact) {
+            isArtifact = true;
+            Artifact art = (Artifact) obj;
+            canModifyDH = service.canRelationBeModified(art, null, CoreRelationTypes.Default_Hierarchical__Child,
+               Level.FINE).matched();
+         }
+
+         GlobalMenuPermissions permiss = new GlobalMenuPermissions(globalMenuHelper);
+
+         if (isArtifact) {
+            lockMenuItem.setText(
+               (permiss.isLocked() ? "Unlock: (" + permiss.getSubjectFromLockedObjectName() + ")" : "Lock"));
+         }
+
+         lockMenuItem.setEnabled(
+            isArtifact && permiss.isWritePermission() && (!permiss.isLocked() || permiss.isAccessToRemoveLock()));
+
+         createMenuItem.setEnabled(isArtifact && permiss.isWritePermission() || canModifyDH);
+
+         goIntoMenuItem.setEnabled(isArtifact && permiss.isReadPermission());
+         copyMenuItem.setEnabled(isArtifact && permiss.isReadPermission());
+
+         boolean clipboardEmpty = artifactClipboard.isEmpty();
+         pasteMenuItem.setEnabled(isArtifact && canModifyDH && !clipboardEmpty);
+         pasteSpecialMenuItem.setEnabled(isArtifact && canModifyDH && !clipboardEmpty);
+         renameArtifactMenuItem.setEnabled(isArtifact && permiss.isWritePermission());
+         findOnAnotherBranch.setEnabled(isArtifact);
+         accessControlMenuItem.setEnabled(isArtifact);
+         refreshMenuItem.setEnabled(isArtifact);
+
+         createRelatedMenuItem.setCreateRelatedEnabled(obj, service);
+
+      } catch (Exception ex) {
+         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+      }
+
+   }
+
+   public void setupPopupMenu() {
+
+      Menu popupMenu = new Menu(treeViewer.getTree().getParent());
+      needArtifactListener = new NeedArtifactMenuListener(artifactExplorer);
+      needProjectListener = new NeedProjectMenuListener(artifactExplorer);
+      popupMenu.addMenuListener(needArtifactListener);
+      popupMenu.addMenuListener(needProjectListener);
+
+      OpenContributionItem openWithMenu = new OpenContributionItem(getClass().getSimpleName() + ".open");
+      openWithMenu.fill(popupMenu, -1);
+      needArtifactListener.add(popupMenu.getItem(0));
+      new MenuItem(popupMenu, SWT.SEPARATOR);
+
+      createFindOnDifferentBranchItem(popupMenu);
+      new MenuItem(popupMenu, SWT.SEPARATOR);
+
+      createNewChildMenuItem(popupMenu);
+      createNewRelatedMenuItem(popupMenu);
+      createGoIntoMenuItem(popupMenu);
+      new MenuItem(popupMenu, SWT.SEPARATOR);
+
+      new GlobalMenu(popupMenu, globalMenuHelper);
+      new MenuItem(popupMenu, SWT.SEPARATOR);
+
+      createRenameArtifactMenuItem(popupMenu);
+      createRefreshMenuItem(popupMenu);
+      new MenuItem(popupMenu, SWT.SEPARATOR);
+
+      createImportExportMenuItems(popupMenu);
+      new MenuItem(popupMenu, SWT.SEPARATOR);
+
+      createLockMenuItem(popupMenu);
+      new MenuItem(popupMenu, SWT.SEPARATOR);
+
+      createCopyMenuItem(popupMenu);
+      createPasteMenuItem(popupMenu);
+      createPasteSpecialMenuItem(popupMenu);
+      new MenuItem(popupMenu, SWT.SEPARATOR);
+
+      createExpandAllMenuItem(popupMenu);
+      createSelectAllMenuItem(popupMenu);
+      new MenuItem(popupMenu, SWT.SEPARATOR);
+
+      createAccessControlMenuItem(popupMenu);
+      treeViewer.getTree().setMenu(popupMenu);
+   }
+
+   private Branch getBranch() {
+      return artifactExplorer.getBranch();
+   }
+
+   private void createNewChildMenuItem(Menu parentMenu) {
+      createMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+      needProjectListener.add(createMenuItem);
+      createMenuItem.setText("&New Child");
+      createMenuItem.addSelectionListener(new SelectionAdapter() {
+         @Override
+         public void widgetSelected(SelectionEvent e) {
+            try {
+               Artifact parent = getParent();
+
+               AccessPolicy policy = ServiceUtil.getAccessPolicy();
+
+               PermissionStatus status =
+                  policy.canRelationBeModified(parent, null, CoreRelationTypes.Default_Hierarchical__Child, Level.FINE);
+
+               if (status.matched()) {
+                  FilteredTreeArtifactTypeEntryDialog dialog = getDialog();
+                  if (dialog.open() == Window.OK) {
+                     IArtifactType type = dialog.getSelection();
+                     String name = dialog.getEntryValue();
+
+                     SkynetTransaction transaction = TransactionManager.createTransaction(getBranch(),
+                        String.format("Created new %s \"%s\" in artifact explorer", type.getName(), name));
+                     Artifact newChildArt = parent.addNewChild(RelationOrderBaseTypes.PREEXISTING, type, name);
+                     parent.persist(transaction);
+                     transaction.execute();
+                     RendererManager.open(newChildArt, PresentationType.GENERALIZED_EDIT);
+                     treeViewer.refresh();
+                     treeViewer.refresh(false);
+                  }
+               } else {
+                  MessageDialog.openError(AWorkbench.getActiveShell(), "New Child Error",
+                     "Access control has restricted this action. The current user does not have sufficient permission to create relations on this artifact.");
+               }
+            } catch (Exception ex) {
+               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+            }
+         }
+
+         private FilteredTreeArtifactTypeEntryDialog getDialog() throws OseeCoreException {
+            List<IArtifactType> artifactTypes = new ArrayList<>();
+            for (IArtifactType artifactType : ArtifactTypeManager.getConcreteArtifactTypes(getBranch())) {
+               if (ArtifactTypeManager.isUserCreationAllowed(artifactType)) {
+                  artifactTypes.add(artifactType);
+               }
+            }
+
+            FilteredTreeArtifactTypeEntryDialog dialog = new FilteredTreeArtifactTypeEntryDialog("New Child",
+               "Enter name and select Artifact type to create", "Artifact Name", artifactTypes);
+            return dialog;
+         }
+
+         private Artifact getParent() throws OseeCoreException {
+            IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+
+            if (selection.size() > 1) {
+               throw new OseeCoreException("Please select a single artifact to create a new child.");
+            }
+
+            Iterator<?> itemsIter = selection.iterator();
+            Artifact parent;
+            if (!itemsIter.hasNext()) {
+               parent = getExplorerRoot();
+            } else {
+               parent = (Artifact) itemsIter.next();
+            }
+
+            return parent;
+         }
+      });
+   }
+
+   private Artifact getExplorerRoot() {
+      return artifactExplorer.getExplorerRoot();
+   }
+
+   private void createRefreshMenuItem(Menu parentMenu) {
+      refreshMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+      refreshMenuItem.setText("Refresh");
+      needArtifactListener.add(refreshMenuItem);
+
+      ArtifactMenuListener listener = new ArtifactMenuListener();
+      parentMenu.addMenuListener(listener);
+      refreshMenuItem.addSelectionListener(new SelectionAdapter() {
+
+         @Override
+         public void widgetSelected(SelectionEvent mySelectionEvent) {
+            for (Artifact artifact : getSelection().toList()) {
+               treeViewer.refresh(artifact);
+            }
+         }
+      });
+   }
+
+   protected ArtifactStructuredSelection getSelection() {
+      return artifactExplorer.getSelection();
+   }
+
+   /**
+    * @author Jeff C. Phillips
+    */
+   public class ArtifactMenuListener implements MenuListener {
+
+      @Override
+      public void menuHidden(MenuEvent e) {
+         // do nothing
+      }
+
+      @Override
+      public void menuShown(MenuEvent e) {
+         handleMenuShown(e);
+      }
+
+   }
+
+   private void createRenameArtifactMenuItem(Menu parentMenu) {
+      renameArtifactMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+      renameArtifactMenuItem.setText("Rename Artifact");
+      needArtifactListener.add(renameArtifactMenuItem);
+
+      ArtifactMenuListener listener = new ArtifactMenuListener();
+      parentMenu.addMenuListener(listener);
+      renameArtifactMenuItem.addSelectionListener(new SelectionAdapter() {
+
+         @Override
+         public void widgetSelected(SelectionEvent mySelectionEvent) {
+            handleRenameArtifactSelectionEvent(mySelectionEvent);
+         }
+      });
+   }
+
+   private void handleRenameArtifactSelectionEvent(SelectionEvent mySelectionEvent) {
+      // Clean up any previous editor control
+      Control oldEditor = getMyTreeEditor().getEditor();
+
+      if (oldEditor != null) {
+         oldEditor.dispose();
+      }
+
+      // Identify the selected row, only allow input if there is a single
+      // selected row
+      Tree myTree = treeViewer.getTree();
+      TreeItem[] selection = myTree.getSelection();
+
+      if (selection.length != 1) {
+         return;
+      }
+
+      final TreeItem myTreeItem = selection[0];
+
+      if (myTreeItem == null) {
+         return;
+      }
+      myTextBeingRenamed = new Text(myTree, SWT.BORDER);
+      Object myTreeItemObject = myTreeItem.getData();
+      myTextBeingRenamed.setText(((Artifact) myTreeItemObject).getName());
+      myTextBeingRenamed.addFocusListener(new FocusAdapter() {
+         @Override
+         public void focusLost(FocusEvent e) {
+            updateText(myTextBeingRenamed.getText(), myTreeItem);
+            myTextBeingRenamed.dispose();
+
+         }
+
+         @Override
+         public void focusGained(FocusEvent e) {
+            // do nothing
+         }
+      });
+
+      myTextBeingRenamed.addKeyListener(new KeyAdapter() {
+         @Override
+         public void keyReleased(KeyEvent e) {
+            if (e.character == SWT.CR) {
+               updateText(myTextBeingRenamed.getText(), myTreeItem);
+               myTextBeingRenamed.dispose();
+            } else if (e.keyCode == SWT.ESC) {
+               myTextBeingRenamed.dispose();
+            }
+         }
+      });
+      myTextBeingRenamed.selectAll();
+      myTextBeingRenamed.setFocus();
+      getMyTreeEditor().setEditor(myTextBeingRenamed, myTreeItem);
+   }
+
+   private void updateText(String newLabel, TreeItem item) {
+      getMyTreeEditor().getItem().setText(newLabel);
+      Object myTreeItemObject = item.getData();
+      if (myTreeItemObject instanceof Artifact) {
+         Artifact myArtifact = (Artifact) myTreeItemObject;
+         try {
+            myArtifact.setName(newLabel);
+            myArtifact.persist(getClass().getSimpleName());
+         } catch (Exception ex) {
+            OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+         }
+      }
+      treeViewer.refresh();
+   }
+
+   private TreeEditor getMyTreeEditor() {
+      return artifactExplorer.getMyTreeEditor();
+   }
+
+   private void createNewRelatedMenuItem(Menu parentMenu) {
+      createRelatedMenuItem = new CreateRelatedMenuItem(parentMenu, artifactExplorer);
+      needProjectListener.add(createRelatedMenuItem.getMenuItem());
+   }
+
+   private void createGoIntoMenuItem(Menu parentMenu) {
+      goIntoMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+      goIntoMenuItem.setText("&Go Into");
+      needArtifactListener.add(goIntoMenuItem);
+
+      ArtifactMenuListener listener = new ArtifactMenuListener();
+      parentMenu.addMenuListener(listener);
+      goIntoMenuItem.addSelectionListener(new SelectionAdapter() {
+
+         @Override
+         public void widgetSelected(SelectionEvent ev) {
+
+            IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+            Iterator<?> itemsIter = selection.iterator();
+            if (itemsIter.hasNext()) {
+               try {
+                  Object[] expanded = treeViewer.getExpandedElements();
+                  artifactExplorer.explore((Artifact) itemsIter.next());
+                  treeViewer.setExpandedElements(expanded);
+               } catch (Exception ex) {
+                  OseeLog.log(Activator.class, Level.SEVERE, ex);
+               }
+            }
+         }
+      });
+   }
+
+   private void createFindOnDifferentBranchItem(Menu parentMenu) {
+      findOnAnotherBranch = new MenuItem(parentMenu, SWT.PUSH);
+      findOnAnotherBranch.setText("Reveal On Another Branch");
+      needArtifactListener.add(findOnAnotherBranch);
+
+      ArtifactMenuListener listener = new ArtifactMenuListener();
+      parentMenu.addMenuListener(listener);
+      findOnAnotherBranch.addSelectionListener(new SelectionAdapter() {
+
+         @Override
+         public void widgetSelected(SelectionEvent ev) {
+            Branch branch = BranchSelectionDialog.getBranchFromUser();
+            if (branch != null) {
+               for (Artifact artifact : getSelection().toList()) {
+                  try {
+                     ArtifactExplorer.revealArtifact(ArtifactQuery.getArtifactFromId(artifact.getArtId(), branch));
+                  } catch (OseeCoreException ex) {
+                     OseeLog.logf(Activator.class, OseeLevel.SEVERE_POPUP,
+                        "Could not find Artifact \'%s\' on Branch \'%s\'", artifact.getName(), branch.getName());
+                  }
+               }
+
+            }
+         }
+      });
+   }
+
+   private void createSelectAllMenuItem(Menu parentMenu) {
+      MenuItem menuItem = new MenuItem(parentMenu, SWT.PUSH);
+      menuItem.setText("&Select All\tCtrl+A");
+      menuItem.addListener(SWT.Selection, new Listener() {
+         @Override
+         public void handleEvent(org.eclipse.swt.widgets.Event event) {
+            treeViewer.getTree().selectAll();
+         }
+      });
+   }
+
+   private void createImportExportMenuItems(Menu parentMenu) {
+      MenuItems.createMenuItem(parentMenu, SWT.PUSH, new ImportResourcesAction(getViewSite().getWorkbenchWindow()));
+      MenuItems.createMenuItem(parentMenu, SWT.PUSH, new ExportResourcesAction(getViewSite().getWorkbenchWindow()));
+   }
+
+   private IViewSite getViewSite() {
+      return artifactExplorer.getViewSite();
+   }
+
+   private void createAccessControlMenuItem(Menu parentMenu) {
+      accessControlMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+      accessControlMenuItem.setImage(ImageManager.getImage(FrameworkImage.AUTHENTICATED));
+      accessControlMenuItem.setText("&Access Control ");
+      // accessControlMenuItem.setEnabled(false);
+      accessControlMenuItem.addSelectionListener(new SelectionAdapter() {
+
+         @Override
+         public void widgetSelected(SelectionEvent e) {
+            IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+            Artifact selectedArtifact = (Artifact) selection.getFirstElement();
+            try {
+               if (selectedArtifact != null) {
+                  PolicyDialog pd = new PolicyDialog(Displays.getActiveShell(), selectedArtifact);
+                  pd.open();
+                  artifactExplorer.refreshBranchWarning();
+               }
+            } catch (Exception ex) {
+               OseeLog.log(Activator.class, Level.SEVERE, ex);
+            }
+         }
+      });
+   }
+
+   private void createLockMenuItem(Menu parentMenu) {
+      lockMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+      lockMenuItem.addSelectionListener(new SelectionAdapter() {
+
+         @Override
+         public void widgetSelected(SelectionEvent e) {
+            IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+            Iterator<?> iterator = selection.iterator();
+            Set<Artifact> lockArtifacts = new HashSet<>();
+            Set<Artifact> unlockArtifacts = new HashSet<>();
+            while (iterator.hasNext()) {
+               try {
+                  Artifact object = (Artifact) iterator.next();
+                  if (new GlobalMenuPermissions(object).isLocked()) {
+                     unlockArtifacts.add(object);
+                  } else {
+                     lockArtifacts.add(object);
+                  }
+               } catch (Exception ex) {
+                  OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+               }
+            }
+
+            try {
+               AccessControlManager.unLockObjects(unlockArtifacts, UserManager.getUser());
+               AccessControlManager.lockObjects(lockArtifacts, UserManager.getUser());
+            } catch (Exception ex) {
+               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+            }
+         }
+
+      });
+   }
+
+   private void createCopyMenuItem(Menu parentMenu) {
+      copyMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+      copyMenuItem.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_COPY));
+      copyMenuItem.setText("Copy \tCtrl+C");
+      copyMenuItem.addSelectionListener(new SelectionAdapter() {
+
+         @Override
+         public void widgetSelected(SelectionEvent e) {
+            try {
+               performCopy();
+            } catch (OseeCoreException ex) {
+               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+            }
+         }
+      });
+   }
+
+   private void performCopy() throws OseeCoreException {
+      IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+      List<Artifact> artifactTransferData = new ArrayList<>();
+      Artifact artifact;
+
+      if (selection != null && !selection.isEmpty()) {
+         for (Object object : selection.toArray()) {
+            if (object instanceof Artifact) {
+               artifact = (Artifact) object;
+               if (!ArtifactTypeManager.isUserCreationAllowed(artifact.getArtifactType())) {
+                  throw new OseeArgumentException("Artifact Type [%s] can not be copied",
+                     artifact.getArtifactTypeName());
+               }
+               artifactTransferData.add(artifact);
+            }
+         }
+         artifactClipboard.setArtifactsToClipboard(ServiceUtil.getAccessPolicy(), artifactTransferData);
+      }
+   }
+
+   private void createPasteMenuItem(Menu parentMenu) {
+      pasteMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+      pasteMenuItem.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_PASTE));
+      pasteMenuItem.setText("Paste \tCtrl+V");
+      pasteMenuItem.addSelectionListener(new SelectionAdapter() {
+
+         @Override
+         public void widgetSelected(SelectionEvent e) {
+            performPasteOperation(false);
+         }
+      });
+   }
+
+   private void createPasteSpecialMenuItem(Menu parentMenu) {
+      pasteSpecialMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+      pasteSpecialMenuItem.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_PASTE));
+      pasteSpecialMenuItem.setText("Paste Special... \tCtrl+S");
+      pasteSpecialMenuItem.addSelectionListener(new SelectionAdapter() {
+
+         @Override
+         public void widgetSelected(SelectionEvent e) {
+            performPasteOperation(true);
+         }
+
+      });
+   }
+
+   private void performPasteOperation(boolean isPasteSpecial) {
+      boolean performPaste = true;
+      Artifact destinationArtifact = null;
+      IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+      if (selection != null && !selection.isEmpty()) {
+         Object object = selection.getFirstElement();
+
+         if (object instanceof Artifact) {
+            Artifact artifact = (Artifact) object;
+            if (!ArtifactTypeManager.isUserCreationAllowed(artifact.getArtifactType())) {
+               throw new OseeArgumentException("Artifact Type [%s] can not be copied", artifact.getArtifactTypeName());
+            }
+            destinationArtifact = (Artifact) object;
+         }
+      }
+
+      ArtifactPasteConfiguration config = new ArtifactPasteConfiguration();
+
+      if (isPasteSpecial) {
+         Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+         List<Artifact> copiedArtifacts = artifactClipboard.getCopiedContents();
+         ArtifactPasteSpecialDialog dialog =
+            new ArtifactPasteSpecialDialog(shell, config, destinationArtifact, copiedArtifacts);
+         performPaste = dialog.open() == Window.OK;
+      }
+
+      if (performPaste) {
+         Operations.executeAsJob(new ArtifactPasteOperation(config, destinationArtifact,
+            artifactClipboard.getCopiedContents(), new ArtifactNameConflictHandler()), true);
+      }
+   }
+
+   private void createExpandAllMenuItem(Menu parentMenu) {
+      MenuItem menuItem = new MenuItem(parentMenu, SWT.PUSH);
+      menuItem.setImage(ImageManager.getImage(FrameworkImage.EXPAND_ALL));
+      menuItem.setText("Expand All\tCtrl++");
+      menuItem.addSelectionListener(new ExpandListener());
+   }
+
+   public class ExpandListener extends SelectionAdapter {
+      @Override
+      public void widgetSelected(SelectionEvent event) {
+         expandAll((IStructuredSelection) treeViewer.getSelection());
+      }
+   }
+
+   private void expandAll(IStructuredSelection selection) {
+      Iterator<?> iter = selection.iterator();
+      while (iter.hasNext()) {
+         Object obj = iter.next();
+         expandAll(obj);
+      }
+   }
+
+   private void expandAll(Object object) {
+      if (!(object instanceof ArtifactExplorerLinkNode)) {
+         treeViewer.expandToLevel(object, 1);
+         for (Object child : ((ArtifactContentProvider) treeViewer.getContentProvider()).getChildren(object)) {
+            expandAll(child);
+         }
+      }
+   }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/NeedArtifactMenuListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/NeedArtifactMenuListener.java
new file mode 100644
index 00000000000..275a0ae8f3b
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/NeedArtifactMenuListener.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.skynet.explorer.menu;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.osee.framework.jdk.core.type.HashCollection;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.ui.skynet.explorer.ArtifactExplorer;
+import org.eclipse.swt.events.MenuEvent;
+import org.eclipse.swt.events.MenuListener;
+import org.eclipse.swt.widgets.MenuItem;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class NeedArtifactMenuListener implements MenuListener {
+
+   private final HashCollection<Class<? extends Artifact>, MenuItem> menuItemMap;
+   private final TreeViewer treeViewer;
+
+   public NeedArtifactMenuListener(ArtifactExplorer artifactExplorer) {
+      menuItemMap = new HashCollection<>();
+      treeViewer = artifactExplorer.getTreeViewer();
+   }
+
+   public void add(MenuItem item) {
+      menuItemMap.put(Artifact.class, item);
+   }
+
+   @Override
+   public void menuHidden(MenuEvent e) {
+      // do nothing
+   }
+
+   @Override
+   public void menuShown(MenuEvent e) {
+      IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+
+      Object obj = selection.getFirstElement();
+      if (obj != null && obj instanceof Artifact) {
+         Class<? extends Artifact> selectedClass = obj.getClass().asSubclass(Artifact.class);
+
+         for (Class<? extends Artifact> artifactClass : menuItemMap.keySet()) {
+            boolean valid = artifactClass.isAssignableFrom(selectedClass);
+
+            for (MenuItem item : menuItemMap.getValues(artifactClass)) {
+               if (!(item.getData() instanceof Exception)) {
+                  // Only modify enabling if no error is associated
+                  item.setEnabled(valid);
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/NeedProjectMenuListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/NeedProjectMenuListener.java
new file mode 100644
index 00000000000..76146798af9
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/NeedProjectMenuListener.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.skynet.explorer.menu;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.osee.framework.ui.skynet.explorer.ArtifactExplorer;
+import org.eclipse.swt.events.MenuEvent;
+import org.eclipse.swt.events.MenuListener;
+import org.eclipse.swt.widgets.MenuItem;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class NeedProjectMenuListener implements MenuListener {
+   Collection<MenuItem> items;
+   private final TreeViewer treeViewer;
+
+   public NeedProjectMenuListener(ArtifactExplorer artifactExplorer) {
+      items = new LinkedList<>();
+      treeViewer = artifactExplorer.getTreeViewer();
+   }
+
+   public void add(MenuItem item) {
+      items.add(item);
+   }
+
+   @Override
+   public void menuHidden(MenuEvent e) {
+      // do nothing
+   }
+
+   @Override
+   public void menuShown(MenuEvent e) {
+      boolean valid = treeViewer.getInput() != null;
+      for (MenuItem item : items) {
+         if (!(item.getData() instanceof Exception)) {
+            // Only modify
+            // enabling if no
+            // error is
+            // associated
+            item.setEnabled(valid);
+         }
+      }
+   }
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java
index 51ed2365eb4..1979e640ff3 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java
@@ -62,10 +62,8 @@ public abstract class SkynetDragAndDrop {
    }
 
    private void setupDragSupport() {
-      source.setTransfer(new Transfer[] {
-         HTMLTransfer.getInstance(),
-         ArtifactTransfer.getInstance(),
-         TextTransfer.getInstance()});
+      source.setTransfer(
+         new Transfer[] {HTMLTransfer.getInstance(), ArtifactTransfer.getInstance(), TextTransfer.getInstance()});
       source.addDragListener(new DragSourceListener() {
 
          @Override
@@ -96,10 +94,8 @@ public abstract class SkynetDragAndDrop {
    }
 
    private void setupDropSupport() {
-      target.setTransfer(new Transfer[] {
-         FileTransfer.getInstance(),
-         TextTransfer.getInstance(),
-         ArtifactTransfer.getInstance()});
+      target.setTransfer(
+         new Transfer[] {FileTransfer.getInstance(), TextTransfer.getInstance(), ArtifactTransfer.getInstance()});
       target.addDropListener(new DropTargetAdapter() {
 
          @Override