3 files changed, 24 insertions, 22 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
index 6c31fb4dfa5..60050a7c2fe 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
@@ -88,7 +88,7 @@ import org.eclipse.ui.PartInitException;
 public class WorldComposite extends Composite implements IFrameworkTransactionEventListener {

 

    private Action filterCompletedAction, releaseMetricsAction, selectionMetricsAction, toAction, toWorkFlow;

-   private final Label warningLabel, searchNameLabel, extraInfoLabel;

+   private Label warningLabel, searchNameLabel, extraInfoLabel;

    private WorldSearchItem lastSearchItem;

    private final WorldXViewer worldXViewer;

    private final WorldCompletedFilter worldCompletedFilter = new WorldCompletedFilter();

@@ -99,15 +99,16 @@ public class WorldComposite extends Composite implements IFrameworkTransactionEv
    private TableLoadOption[] tableLoadOptions;

    private Collection<? extends Artifact> arts;

    private String loadName;

-   private final Composite toolBarComposite;

+   private final ToolBar toolBar;

 

-   /**

-    * @param parent

-    * @param style

-    */

    public WorldComposite(String viewEditorId, IViewSite viewSite, Composite parent, int style) {

+      this(viewEditorId, viewSite, parent, style, null);

+   }

+

+   public WorldComposite(String viewEditorId, IViewSite viewSite, Composite parent, int style, ToolBar toolBar) {

       super(parent, style);

       this.viewSite = viewSite;

+      this.toolBar = toolBar;

 

       setLayout(new GridLayout(1, false));

       setLayoutData(new GridData(GridData.FILL_BOTH));

@@ -122,18 +123,12 @@ public class WorldComposite extends Composite implements IFrameworkTransactionEv
       searchNameLabel = new Label(headerComp, SWT.NONE);

 

       if (!DbConnectionExceptionComposite.dbConnectionIsOk(this)) {

-         toolBarComposite = null;

          extraInfoLabel = null;

          worldXViewer = null;

          return;

       }

 

-      if (viewSite == null) {

-         toolBarComposite = new Composite(headerComp, SWT.NONE);

-         toolBarComposite.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, false, 1, 1));

-         toolBarComposite.setLayout(ALayout.getZeroMarginLayout(1, false));

-      } else {

-         toolBarComposite = null;

+      if (viewSite != null) {

          String nameStr = getWhoAmI();

          if (AtsPlugin.isAtsAdmin()) nameStr += " - Admin";

          if (AtsPlugin.isAtsDisableEmail()) nameStr += " - Email Disabled";

@@ -622,16 +617,13 @@ public class WorldComposite extends Composite implements IFrameworkTransactionEv
          }

       } else {

 

-         ToolBar toolBar = new ToolBar(toolBarComposite, SWT.FLAT | SWT.RIGHT);

-         toolBar.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, true, 1, 1));

-

          actionToToolItem(toolBar, expandAllAction);

          actionToToolItem(toolBar, newWorldEditor);

          actionToToolItem(toolBar, newWorldEditorSelected);

          actionToToolItem(toolBar, refreshAction);

          actionToToolItem(toolBar, worldXViewer.getCustomizeAction());

 

-         createToolBarPulldown(toolBar, toolBarComposite);

+         createToolBarPulldown(toolBar, toolBar.getParent());

       }

    }

 

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java
index adee7354191..dd40a02792e 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java
@@ -15,6 +15,7 @@ import java.util.logging.Level;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.artifact.VersionArtifact;
+import org.eclipse.osee.ats.util.AtsLib;
 import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem;
 import org.eclipse.osee.ats.world.search.WorldSearchItem;
 import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
@@ -30,6 +31,8 @@ import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.customize.CustomizeData;
 import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
@@ -119,10 +122,7 @@ public class WorldEditor extends AbstractArtifactEditor implements IDirtiableEdi
 
          setPartName(editorInput.getName());
 
-         // Create Main tab
-         worldComposite = new WorldComposite(EDITOR_ID, null, getContainer(), SWT.NONE);
-         mainPageIndex = addPage(worldComposite);
-         setPageText(mainPageIndex, "Actions");
+         createMainTab();
 
          metricsComposite = new AtsMetricsComposite(this, getContainer(), SWT.NONE);
          metricsPageIndex = addPage(metricsComposite);
@@ -152,6 +152,16 @@ public class WorldEditor extends AbstractArtifactEditor implements IDirtiableEdi
       }
    }
 
+   private void createMainTab() throws OseeCoreException {
+      // Create Tasks tab
+      Composite comp = AtsLib.createCommonPageComposite(getContainer());
+      ToolBar toolBar = AtsLib.createCommonToolBar(comp);
+
+      worldComposite = new WorldComposite(EDITOR_ID, null, comp, SWT.NONE, toolBar);
+      mainPageIndex = addPage(comp);
+      setPageText(mainPageIndex, "Actions");
+   }
+
    /* (non-Javadoc)
     * @see org.eclipse.osee.ats.world.IAtsMetricsProvider#getArtifacts()
     */
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java
index 62c72a3cd72..732da7a31d1 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java
@@ -338,7 +338,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen
                return;
             }
             WorldEditorInput worldEditorInput =
-                  new WorldEditorInput("ATS - " + getSelectedArtifacts().size() + " Selected", getSelectedArtifacts(),
+                  new WorldEditorInput("ATS World", getSelectedArtifacts(),
                         getCustomizeMgr().generateCustDataFromTable(), TableLoadOption.None);
             if (worldEditorInput != null) {
                IWorkbenchPage page = AWorkbench.getActivePage();