feature[TW26637]: Add Artifact Id to Parallel Config Viewddunne/TW26637_ParllCfg

Change-Id: Ie2dd863a6d45d0a66737be050e843a8e279c4d6a

2 files changed, 24 insertions, 3 deletions

diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/version/ParallelConfigurationView.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/version/ParallelConfigurationView.java
index af1e2f727f8..bd4f96e6993 100644
--- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/version/ParallelConfigurationView.java
+++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/version/ParallelConfigurationView.java
@@ -50,7 +50,8 @@ public class ParallelConfigurationView extends XNavigateItemAction {
       Branch,
       AllowCreate,
       AllowCommit,
-      Released;
+      Released,
+      ArtId;
    };
 
    public ParallelConfigurationView() {
@@ -62,7 +63,9 @@ public class ParallelConfigurationView extends XNavigateItemAction {
       IAtsTeamDefinition teamDef;
       TeamDefinitionDialog dialog = new TeamDefinitionDialog(TITLE, "Select Team");
       dialog.setMultiSelect(false);
-      dialog.setInput(AtsApiService.get().getTeamDefinitionService().getTeamDefHoldingVersions());
+      Collection<IAtsTeamDefinition> teamDefs =
+         AtsApiService.get().getTeamDefinitionService().getTeamDefHoldingVersions();
+      dialog.setInput(teamDefs);
       if (dialog.open() == Window.OK) {
          teamDef = dialog.getSelectedFirst();
 
@@ -105,7 +108,9 @@ public class ParallelConfigurationView extends XNavigateItemAction {
          new XViewerColumn(Columns.AllowCommit.name(), Columns.AllowCommit.name(), 126, XViewerAlign.Left, true,
             SortDataType.String, false, ""),
          new XViewerColumn(Columns.Released.name(), Columns.Released.name(), 126, XViewerAlign.Left, true,
-            SortDataType.String, false, ""));
+            SortDataType.String, false, ""),
+         new XViewerColumn(Columns.ArtId.name(), Columns.ArtId.name(), 126, XViewerAlign.Left, true, SortDataType.Long,
+            false, ""));
 
       return new ResultsEditorTableTab("Versions", columns, rows);
    }
@@ -129,6 +134,7 @@ public class ParallelConfigurationView extends XNavigateItemAction {
          values.add(String.valueOf(version.isAllowCreateBranch()));
          values.add(String.valueOf(version.isAllowCommitBranch()));
          values.add(String.valueOf(version.isReleased()));
+         values.add(String.valueOf(version.getIdString()));
       }
 
       @Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java
index fe1b971720f..0eda8364796 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java
@@ -27,6 +27,8 @@ import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
 import org.eclipse.osee.framework.core.data.OseeData;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
+import org.eclipse.osee.framework.ui.skynet.action.ExpandAllAction;
 import org.eclipse.osee.framework.ui.skynet.internal.Activator;
 import org.eclipse.osee.framework.ui.skynet.results.IResultsEditorOutlineProvider;
 import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor;
@@ -240,6 +242,19 @@ public class ResultsEditorTableTab implements IResultsEditorTableTab {
          }
       });
 
+      new ToolItem(toolBar, SWT.SEPARATOR);
+
+      ToolItem expand = new ToolItem(toolBar, SWT.PUSH);
+      expand.setImage(ImageManager.getImage(FrameworkImage.EXPAND_ALL));
+      expand.setToolTipText("Expand All");
+      expand.addSelectionListener(new SelectionAdapter() {
+         @Override
+         public void widgetSelected(SelectionEvent event) {
+            ExpandAllAction expandAll = new ExpandAllAction(resultsXViewer);
+            expandAll.run();
+         }
+      });
+
    }
 
    public ResultsXViewer getResultsXViewer() {