Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/BacklogXViewerFactory.java5
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java5
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATasksTab.java20
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/AbstractMemberProvider.java18
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java5
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewerFactory.java5
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManagerFactory.java7
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java9
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java7
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java20
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java13
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java20
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java17
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java20
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionXViewerFactory.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java31
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java7
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/PolicyTableXViewerFactory.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java19
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewer.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewerFactory.java11
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java11
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java7
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java21
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/IOseeTreeReportProvider.java21
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java25
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/OseeTreeReportAdapter.java36
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java12
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewerFactory.java3
39 files changed, 332 insertions, 88 deletions
diff --git a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
index f0198894e31..e243b0ebb00 100644
--- a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
@@ -210,6 +210,7 @@ Import-Package: com.google.common.cache,
org.eclipse.osee.framework.ui.skynet.widgets.xbargraph,
org.eclipse.osee.framework.ui.skynet.widgets.xmerge,
org.eclipse.osee.framework.ui.skynet.widgets.xnavigate,
+ org.eclipse.osee.framework.ui.skynet.widgets.xviewer,
org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet,
org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column,
org.eclipse.osee.framework.ui.swt,
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/BacklogXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/BacklogXViewerFactory.java
index c7aa1e572c4..7aaefdb4ad6 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/BacklogXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/BacklogXViewerFactory.java
@@ -30,6 +30,7 @@ import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn;
import org.eclipse.osee.ats.world.WorldXViewerFactory;
import org.eclipse.osee.ats.world.WorldXViewerSorter;
import org.eclipse.osee.ats.world.WorldXViewerUtil;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -39,8 +40,8 @@ public class BacklogXViewerFactory extends SkynetXViewerFactory {
private GoalArtifact soleBacklogArtifact;
- public BacklogXViewerFactory(GoalArtifact soleBacklogArtifact) {
- super("org.eclipse.osee.ats.BacklogXViewer");
+ public BacklogXViewerFactory(GoalArtifact soleBacklogArtifact, IOseeTreeReportProvider reportProvider) {
+ super("org.eclipse.osee.ats.BacklogXViewer", reportProvider);
this.soleBacklogArtifact = soleBacklogArtifact;
List<XViewerAtsAttributeValueColumn> configCols = WorldXViewerUtil.getConfigurationColumns();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java
index 17828010245..2aeeb7fb879 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java
@@ -73,7 +73,7 @@ public class SprintMemberProvider extends AbstractMemberProvider {
@Override
public IXViewerFactory getXViewerFactory(Artifact awa) {
- return new SprintXViewerFactory((SprintArtifact) awa);
+ return new SprintXViewerFactory((SprintArtifact) awa, this);
}
@Override
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java
index 04f6a164070..3047abab774 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintXViewerFactory.java
@@ -27,6 +27,7 @@ import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn;
import org.eclipse.osee.ats.world.WorldXViewerFactory;
import org.eclipse.osee.ats.world.WorldXViewerSorter;
import org.eclipse.osee.ats.world.WorldXViewerUtil;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -36,8 +37,8 @@ public class SprintXViewerFactory extends SkynetXViewerFactory {
private SprintArtifact soleSprintArtifact;
- public SprintXViewerFactory(SprintArtifact soleSprintArtifact) {
- super("org.eclipse.osee.ats.SprintXViewer");
+ public SprintXViewerFactory(SprintArtifact soleSprintArtifact, IOseeTreeReportProvider reportProvider) {
+ super("org.eclipse.osee.ats.SprintXViewer", reportProvider);
this.soleSprintArtifact = soleSprintArtifact;
List<XViewerAtsAttributeValueColumn> configCols = WorldXViewerUtil.getConfigurationColumns();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATasksTab.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATasksTab.java
index 8f66ade3b85..b29fc56be6d 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATasksTab.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATasksTab.java
@@ -85,6 +85,7 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.action.RefreshAction;
import org.eclipse.osee.framework.ui.skynet.util.FormsUtil;
import org.eclipse.osee.framework.ui.skynet.util.LoadingComposite;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.ExceptionComposite;
import org.eclipse.osee.framework.ui.swt.ImageManager;
@@ -109,7 +110,7 @@ import org.eclipse.ui.progress.UIJob;
/**
* @author Donald G. Dunne
*/
-public class SMATasksTab extends FormPage implements IWorldEditor, ISelectedAtsArtifacts, IWorldViewerEventHandler, IMenuActionProvider, IXTaskViewer {
+public class SMATasksTab extends FormPage implements IWorldEditor, ISelectedAtsArtifacts, IWorldViewerEventHandler, IMenuActionProvider, IXTaskViewer, IOseeTreeReportProvider {
private IManagedForm managedForm;
private Composite bodyComp;
private ScrolledForm scrolledForm;
@@ -260,7 +261,7 @@ public class SMATasksTab extends FormPage implements IWorldEditor, ISelectedAtsA
*/
private boolean createMembersBody() {
if (!Widgets.isAccessible(taskComposite)) {
- taskComposite = new TaskComposite(this, this, new TaskXViewerFactory(), bodyComp, SWT.BORDER, editor,
+ taskComposite = new TaskComposite(this, this, new TaskXViewerFactory(this), bodyComp, SWT.BORDER, editor,
teamWf.isInWork(), teamWf);
taskComposite.getWorldXViewer().addMenuActionProvider(this);
getSite().setSelectionProvider(taskComposite.getWorldXViewer());
@@ -738,4 +739,19 @@ public class SMATasksTab extends FormPage implements IWorldEditor, ISelectedAtsA
return editor.isTasksEditable();
}
+ @Override
+ public String getEditorTitle() {
+ try {
+ return String.format("Table Report - Tasks for [%s]", getTeamWf());
+ } catch (Exception ex) {
+ // do nothing
+ }
+ return "Table Report - Tasks";
+ }
+
+ @Override
+ public String getReportTitle() {
+ return getEditorTitle();
+ }
+
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/AbstractMemberProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/AbstractMemberProvider.java
index 67c57eac1e9..84212037b54 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/AbstractMemberProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/AbstractMemberProvider.java
@@ -18,11 +18,12 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.ats.editor.IMemberProvider;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
/**
* @author Donald G. Dunne
*/
-public abstract class AbstractMemberProvider implements IMemberProvider {
+public abstract class AbstractMemberProvider implements IMemberProvider, IOseeTreeReportProvider {
@Override
public void deCacheAndReload(boolean forcePend, IJobChangeListener listener) {
@@ -56,4 +57,19 @@ public abstract class AbstractMemberProvider implements IMemberProvider {
getArtifact().reloadAttributesAndRelations();
}
+ @Override
+ public String getEditorTitle() {
+ try {
+ return String.format("Table Report - %s - %s", getMembersName(), getCollectorName());
+ } catch (Exception ex) {
+ // do nothing
+ }
+ return "Table Report - " + getMembersName();
+ }
+
+ @Override
+ public String getReportTitle() {
+ return getEditorTitle();
+ }
+
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java
index 0ebef0487ee..886146502a4 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java
@@ -85,9 +85,9 @@ public class GoalMemberProvider extends AbstractMemberProvider {
@Override
public IXViewerFactory getXViewerFactory(Artifact awa) {
if (isBacklog()) {
- return new BacklogXViewerFactory((GoalArtifact) awa);
+ return new BacklogXViewerFactory((GoalArtifact) awa, this);
}
- return new GoalXViewerFactory((GoalArtifact) awa);
+ return new GoalXViewerFactory((GoalArtifact) awa, this);
}
@Override
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java
index 496894d26b3..ec7918f5b83 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java
@@ -29,6 +29,7 @@ import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn;
import org.eclipse.osee.ats.world.WorldXViewerFactory;
import org.eclipse.osee.ats.world.WorldXViewerSorter;
import org.eclipse.osee.ats.world.WorldXViewerUtil;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -62,8 +63,8 @@ public class GoalXViewerFactory extends SkynetXViewerFactory {
50,
80};
- public GoalXViewerFactory(GoalArtifact soleGoalArtifact) {
- super("org.eclipse.osee.ats.GoalXViewer");
+ public GoalXViewerFactory(GoalArtifact soleGoalArtifact, IOseeTreeReportProvider reportProvider) {
+ super("org.eclipse.osee.ats.GoalXViewer", reportProvider);
this.soleGoalArtifact = soleGoalArtifact;
int widthIndex = 0;
// Create new column from world columns but set show and width for task
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java
index a8075b8f03e..24ae8749e6c 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java
@@ -43,6 +43,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditorInput;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserListDialog;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.OseeTreeReportAdapter;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactNameColumn;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactTypeColumn;
@@ -150,7 +151,8 @@ public class GenerateReviewParticipationReport extends XNavigateItemAction {
public class ReviewParticipationXViewerFactory extends SkynetXViewerFactory {
public ReviewParticipationXViewerFactory(IAtsUser user) {
- super(MASS_XVIEWER_CUSTOMIZE_NAMESPACE);
+ super(MASS_XVIEWER_CUSTOMIZE_NAMESPACE,
+ new OseeTreeReportAdapter("Table Report - Review Participation Report"));
registerColumns(ArtifactTypeColumn.getInstance());
registerColumns(WorldXViewerFactory.getColumnServiceColumn(AtsColumnToken.AtsIdColumnShow));
registerColumns(new XViewerAtsAttributeValueColumn(AtsColumnToken.LegacyPcrIdColumn));
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewerFactory.java
index 2396675538f..db749264668 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewerFactory.java
@@ -32,6 +32,7 @@ import org.eclipse.osee.ats.world.WorldXViewerFactory;
import org.eclipse.osee.ats.world.WorldXViewerSorter;
import org.eclipse.osee.ats.world.WorldXViewerUtil;
import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -47,8 +48,8 @@ public class TaskXViewerFactory extends SkynetXViewerFactory {
WorldXViewerFactory.getColumnServiceColumn(AtsColumnToken.StateColumn));
public static Integer[] widths = new Integer[] {450, 60, 150, 40, 40, 100, 50, 50, 50, 80, 80};
- public TaskXViewerFactory() {
- super("org.eclipse.osee.ats.TaskXViewer");
+ public TaskXViewerFactory(IOseeTreeReportProvider reportProvider) {
+ super("org.eclipse.osee.ats.TaskXViewer", reportProvider);
int widthIndex = 0;
// Create new column from world columns but set show and width for task
for (XViewerColumn taskCol : TaskViewerVisibleColumns) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java
index cb6c82a8d85..2e032944a31 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java
@@ -33,6 +33,7 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.util.RebaselineInProgressHandler;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.OseeTreeReportAdapter;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.TreeItem;
@@ -45,7 +46,7 @@ public class CommitXManager extends XViewer {
private final XCommitManager xCommitManager;
public CommitXManager(Composite parent, int style, XCommitManager xRoleViewer) {
- super(parent, style, new CommitXManagerFactory());
+ super(parent, style, new CommitXManagerFactory(new OseeTreeReportAdapter("Table Report - Commit Manager")));
this.xCommitManager = xRoleViewer;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManagerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManagerFactory.java
index aa96a42e378..9dc337417af 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManagerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManagerFactory.java
@@ -10,9 +10,10 @@
*******************************************************************************/
package org.eclipse.osee.ats.util.widgets.commit;
-import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -41,8 +42,8 @@ public class CommitXManagerFactory extends SkynetXViewerFactory {
public static XViewerColumn Commit_Comment = new XViewerColumn("osee.commit.commitComment", "Commit Comment", 200,
XViewerAlign.Left, true, SortDataType.String, false, null);
- public CommitXManagerFactory() {
- super("osee.skynet.gui.CommitXViewer");
+ public CommitXManagerFactory(IOseeTreeReportProvider reportProvider) {
+ super("osee.skynet.gui.CommitXViewer", reportProvider);
registerColumns(Empty_Col, Action_Col, Status_Col, Merge_Col, Dest_Branch_Col, Dest_Branch_Create_Date_Col,
Version_Col, Configuring_Object_Col, Commit_Date, Commit_Comment);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java
index 3440e808b39..2d1a12b4f1c 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java
@@ -38,6 +38,7 @@ import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserListDialog;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
@@ -61,8 +62,8 @@ public class DefectXViewer extends XViewer {
private Action editLocationAction;
private Action editResolutionAction;
- DefectXViewer(Composite parent, int style, XDefectViewer xDefectViewer) {
- this(parent, style, new DefectXViewerFactory(), xDefectViewer);
+ DefectXViewer(Composite parent, int style, XDefectViewer xDefectViewer, IOseeTreeReportProvider reportProvider) {
+ this(parent, style, new DefectXViewerFactory(reportProvider), xDefectViewer);
}
public DefectXViewer(Composite parent, int style, IXViewerFactory xViewerFactory, XDefectViewer xDefectViewer) {
@@ -300,8 +301,8 @@ public class DefectXViewer extends XViewer {
XViewerColumn xCol = (XViewerColumn) treeColumn.getData();
if (xCol.equals(DefectXViewerFactory.User_Col) || xCol.equals(
DefectXViewerFactory.Disposition_Col) || xCol.equals(
- DefectXViewerFactory.Injection_Activity_Col) || xCol.equals(DefectXViewerFactory.Closed_Col) || xCol.equals(
- DefectXViewerFactory.Severity_Col)) {
+ DefectXViewerFactory.Injection_Activity_Col) || xCol.equals(
+ DefectXViewerFactory.Closed_Col) || xCol.equals(DefectXViewerFactory.Severity_Col)) {
return handleAltLeftClick(treeColumn, treeItem);
}
return false;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java
index 035be2d2e2d..45f25b4b5b7 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java
@@ -10,9 +10,10 @@
*******************************************************************************/
package org.eclipse.osee.ats.util.widgets.defect;
-import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -41,8 +42,8 @@ public class DefectXViewerFactory extends SkynetXViewerFactory {
private final static String NAMESPACE = "osee.ats.DefectXViewer";
- public DefectXViewerFactory() {
- super(NAMESPACE);
+ public DefectXViewerFactory(IOseeTreeReportProvider reportProvider) {
+ super(NAMESPACE, reportProvider);
registerColumns(Severity_Col, Disposition_Col, Closed_Col, User_Col, Created_Date_Col, Injection_Activity_Col,
Description_Col, Location_Col, Resolution_Col);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java
index aa347a78025..12ad3082585 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java
@@ -53,6 +53,7 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.widgets.GenericXWidget;
import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.swt.ALayout;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
@@ -81,7 +82,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
/**
* @author Donald G. Dunne
*/
-public class XDefectViewer extends GenericXWidget implements IArtifactWidget, IArtifactEventListener {
+public class XDefectViewer extends GenericXWidget implements IArtifactWidget, IArtifactEventListener, IOseeTreeReportProvider {
private DefectXViewer xViewer;
private IDirtiableEditor editor;
@@ -126,7 +127,7 @@ public class XDefectViewer extends GenericXWidget implements IArtifactWidget, IA
createTaskActionBar(mainComp);
- xViewer = new DefectXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION, this);
+ xViewer = new DefectXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION, this, this);
xViewer.setContentProvider(new DefectContentProvider(xViewer));
xViewer.setLabelProvider(new DefectLabelProvider(xViewer));
xViewer.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -604,4 +605,19 @@ public class XDefectViewer extends GenericXWidget implements IArtifactWidget, IA
return defectManager;
}
+ @Override
+ public String getEditorTitle() {
+ try {
+ return String.format("Table Report - Defects for [%s]", getReviewArt());
+ } catch (Exception ex) {
+ // do nothing
+ }
+ return "Table Report - Defects";
+ }
+
+ @Override
+ public String getReportTitle() {
+ return getEditorTitle();
+ }
+
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java
index d528ff25778..9023dbb4826 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java
@@ -10,9 +10,10 @@
*******************************************************************************/
package org.eclipse.osee.ats.util.widgets.role;
-import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.OseeTreeReportAdapter;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -29,15 +30,15 @@ public class UserRoleXViewerFactory extends SkynetXViewerFactory {
XViewerAlign.Left, true, SortDataType.Float, false, null);
public static XViewerColumn Completed_Col = new XViewerColumn("osee.userRole.completed", "Completed", 80,
XViewerAlign.Left, true, SortDataType.String, false, null);
- public static XViewerColumn Num_Major_Col = new XViewerColumn("osee.userRole.major", "Major", 60, XViewerAlign.Center,
- true, SortDataType.Integer, false, null);
- public static XViewerColumn Num_Minor_Col = new XViewerColumn("osee.userRole.minor", "Minor", 60, XViewerAlign.Center,
- true, SortDataType.Integer, false, null);
+ public static XViewerColumn Num_Major_Col = new XViewerColumn("osee.userRole.major", "Major", 60,
+ XViewerAlign.Center, true, SortDataType.Integer, false, null);
+ public static XViewerColumn Num_Minor_Col = new XViewerColumn("osee.userRole.minor", "Minor", 60,
+ XViewerAlign.Center, true, SortDataType.Integer, false, null);
public static XViewerColumn Num_Issues_Col = new XViewerColumn("osee.userRole.issues", "Issues", 60,
XViewerAlign.Center, true, SortDataType.Integer, false, null);
public UserRoleXViewerFactory() {
- super(NAMESPACE);
+ super(NAMESPACE, new OseeTreeReportAdapter("Table Report - User Roles"));
registerColumns(Role_Col, User_Col, Hours_Spent_Col, Completed_Col, Num_Major_Col, Num_Minor_Col, Num_Issues_Col);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
index 45919741c1d..5c471f90343 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
@@ -63,6 +63,7 @@ import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionH
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.DbConnectionExceptionComposite;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.swt.SWT;
@@ -75,7 +76,7 @@ import org.eclipse.swt.widgets.Control;
/**
* @author Donald G. Dunne
*/
-public class WorldComposite extends Composite implements ISelectedAtsArtifacts, IWorldViewerEventHandler, IOpenNewAtsWorldEditorHandler, IOpenNewAtsWorldEditorSelectedHandler, IOpenNewAtsTaskEditorHandler, IOpenNewAtsTaskEditorSelectedHandler, IRefreshActionHandler, ITaskAddActionHandler {
+public class WorldComposite extends Composite implements IOseeTreeReportProvider, ISelectedAtsArtifacts, IWorldViewerEventHandler, IOpenNewAtsWorldEditorHandler, IOpenNewAtsWorldEditorSelectedHandler, IOpenNewAtsTaskEditorHandler, IOpenNewAtsTaskEditorSelectedHandler, IRefreshActionHandler, ITaskAddActionHandler {
private final WorldXViewer worldXViewer;
private final Set<Artifact> worldArts = new HashSet<>(200);
@@ -117,7 +118,7 @@ public class WorldComposite extends Composite implements ISelectedAtsArtifacts,
protected WorldXViewer createXViewer(IXViewerFactory xViewerFactory, Composite mainComp) {
return new WorldXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION,
- xViewerFactory != null ? xViewerFactory : new WorldXViewerFactory(), null);
+ xViewerFactory != null ? xViewerFactory : new WorldXViewerFactory(this), null);
}
public double getManHoursPerDayPreference() throws OseeCoreException {
@@ -416,4 +417,19 @@ public class WorldComposite extends Composite implements ISelectedAtsArtifacts,
((TaskXViewer) worldXViewer).handleNewTask();
}
+ @Override
+ public String getEditorTitle() {
+ try {
+ return String.format("Table Report - %s", iWorldEditor.getCurrentTitleLabel());
+ } catch (Exception ex) {
+ // do nothing
+ }
+ return "Table Report - World Editor";
+ }
+
+ @Override
+ public String getReportTitle() {
+ return iWorldEditor.getCurrentTitleLabel();
+ }
+
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
index 941e231600c..dd43629d02f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
@@ -123,6 +123,7 @@ import org.eclipse.osee.ats.core.client.artifact.GoalArtifact;
import org.eclipse.osee.ats.core.column.AtsColumnToken;
import org.eclipse.osee.ats.internal.AtsClientService;
import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactTokenColumn;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactTypeColumn;
@@ -146,6 +147,16 @@ public class WorldXViewerFactory extends SkynetXViewerFactory {
public final static String NAMESPACE = "org.eclipse.osee.ats.WorldXViewer";
private static AtsConfigurations atsConfigurations;
+ public WorldXViewerFactory() {
+ this(null);
+ }
+
+ public WorldXViewerFactory(IOseeTreeReportProvider reportProvider) {
+ super(NAMESPACE, reportProvider);
+ registerColumns(getWorldViewColumns());
+ WorldXViewerUtil.registerOtherColumns(this);
+ }
+
public static final XViewerColumn[] getWorldViewColumns() {
return new XViewerColumn[] {
getColumnServiceColumn(AtsColumnToken.TypeColumn),
@@ -304,12 +315,6 @@ public class WorldXViewerFactory extends SkynetXViewerFactory {
return result;
}
- public WorldXViewerFactory() {
- super(NAMESPACE);
- registerColumns(getWorldViewColumns());
- WorldXViewerUtil.registerOtherColumns(this);
- }
-
@Override
public XViewerSorter createNewXSorter(XViewer xViewer) {
return new WorldXViewerSorter(xViewer);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
index 89060f2e641..f5986809ab2 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
@@ -263,6 +263,7 @@ Export-Package: org.eclipse.osee.framework.ui.skynet,
org.eclipse.osee.framework.ui.skynet.widgets.xchange,
org.eclipse.osee.framework.ui.skynet.widgets.xmerge,
org.eclipse.osee.framework.ui.skynet.widgets.xnavigate,
+ org.eclipse.osee.framework.ui.skynet.widgets.xviewer,
org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet,
org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column
Require-Bundle: org.eclipse.ui.workbench
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java
index 01d53eafa1d..3ab01e19625 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.artifact.massEditor;
import java.util.Collection;
import org.eclipse.nebula.widgets.xviewer.core.model.CustomizeData;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.OseeTreeReportAdapter;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactNameColumn;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactTokenColumn;
@@ -34,7 +35,7 @@ public class MassXViewerFactory extends SkynetXViewerFactory {
private static ArtifactNameColumn nameCol = new ArtifactNameColumn(true, true);
public MassXViewerFactory(Collection<? extends Artifact> artifacts) {
- super(NAMESPACE);
+ super(NAMESPACE, new OseeTreeReportAdapter("Table Report - Mass Editor"));
registerColumns(nameCol);
registerColumns(ArtifactTypeColumn.getInstance());
registerColumns(new GuidColumn(true));
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java
index b4c978641b6..3408b9e65a7 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionPage.java
@@ -51,6 +51,7 @@ import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.XBranchContentProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.XBranchWidget;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.XBranchWidget.IBranchWidgetMenuListener;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.swt.layout.GridData;
@@ -66,7 +67,7 @@ import org.eclipse.ui.progress.UIJob;
/**
* @author Donald G. Dunne
*/
-public class BranchTransactionPage extends FormPage implements IBranchWidgetMenuListener, ITransactionEventListener, ITransactionRecordSelectionProvider {
+public class BranchTransactionPage extends FormPage implements IBranchWidgetMenuListener, ITransactionEventListener, ITransactionRecordSelectionProvider, IOseeTreeReportProvider {
private XBranchWidget xBranchWidget;
private final BranchId branch;
@@ -106,7 +107,7 @@ public class BranchTransactionPage extends FormPage implements IBranchWidgetMenu
if (DbConnectionExceptionComposite.dbConnectionIsOk(parent)) {
- xBranchWidget = new XBranchWidget(new BranchTransactionXViewerFactory(), this);
+ xBranchWidget = new XBranchWidget(new BranchTransactionXViewerFactory(this), this);
xBranchWidget.setDisplayLabel(false);
xBranchWidget.createWidgets(parent, 1);
xBranchWidget.adaptControls(toolkit);
@@ -270,4 +271,19 @@ public class BranchTransactionPage extends FormPage implements IBranchWidgetMenu
getSite().setSelectionProvider(xBranchWidget.getXViewer());
}
+ @Override
+ public String getEditorTitle() {
+ try {
+ return String.format("Branch Transactions - %s", branch);
+ } catch (Exception ex) {
+ // do nothing
+ }
+ return "Table Report - Branch Transactions";
+ }
+
+ @Override
+ public String getReportTitle() {
+ return getEditorTitle();
+ }
+
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionXViewerFactory.java
index d908cef6ce7..726d10f79c9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/BranchTransactionXViewerFactory.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.change.view;
import org.eclipse.nebula.widgets.xviewer.core.model.CustomizeData;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchXViewerFactory;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
/**
* @author Donald G. Dunne
@@ -21,7 +22,8 @@ public class BranchTransactionXViewerFactory extends BranchXViewerFactory {
public final static String NAMESPACE = "osee.skynet.gui.BranchTransactionXViewer";
- public BranchTransactionXViewerFactory() {
+ public BranchTransactionXViewerFactory(IOseeTreeReportProvider reportProvider) {
+ super(reportProvider);
setNamespace(NAMESPACE);
this.clearColumnRegistration();
registerColumns(transaction, timeStamp, author, comment);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java
index ee5dc09d74e..09a0c983842 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java
@@ -15,7 +15,10 @@ import java.util.Arrays;
import java.util.Collection;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.core.data.BranchId;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop;
@@ -23,6 +26,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeXViewer;
import org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeXViewerFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.xchange.XChangeContentProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xchange.XChangeLabelProvider;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.swt.ALayout;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.swt.SWT;
@@ -37,7 +41,7 @@ import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
-public class ChangeReportTable implements EditorSection.IWidget {
+public class ChangeReportTable implements EditorSection.IWidget, IOseeTreeReportProvider {
private ChangeXViewer xChangeViewer;
private final ChangeUiData changeData;
@@ -73,7 +77,7 @@ public class ChangeReportTable implements EditorSection.IWidget {
toolkit.paintBordersFor(composite);
int viewerStyle = SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION;
- xChangeViewer = new ChangeXViewer(composite, viewerStyle, new ChangeXViewerFactory());
+ xChangeViewer = new ChangeXViewer(composite, viewerStyle, new ChangeXViewerFactory(this));
xChangeViewer.setContentProvider(new XChangeContentProvider());
xChangeViewer.setLabelProvider(new XChangeLabelProvider(xChangeViewer));
@@ -152,4 +156,27 @@ public class ChangeReportTable implements EditorSection.IWidget {
}
}
+ @Override
+ public String getEditorTitle() {
+ try {
+ if (changeData.getAssociatedArtifact() != null) {
+ return String.format("Table Report - Change Report - %s", changeData.getAssociatedArtifact());
+ } else if (!changeData.getChanges().isEmpty()) {
+ BranchId branchId = changeData.getChanges().iterator().next().getBranch();
+ if (branchId != null) {
+ Branch branch = BranchManager.getBranch(branchId);
+ return String.format("Table Report - Change Report - %s", branch.getName());
+ }
+ }
+ } catch (Exception ex) {
+ // do nothing
+ }
+ return "Table Report - Change Report";
+ }
+
+ @Override
+ public String getReportTitle() {
+ return getEditorTitle();
+ }
+
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java
index 690edd64904..ee693de4041 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java
@@ -181,6 +181,7 @@ public class HtmlExportTable {
if (writer == null) {
writer = new ExcelXmlWriter(file);
writer.startSheet(title, cells.size());
+ writer.writeRow(title);
}
for (String cell : cells) {
writer.writeCell(cell);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java
index 3d78012dab1..741c2c7ec77 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java
@@ -45,10 +45,6 @@ public class BranchXViewer extends XViewer {
this.xBranchViewer = xBranchViewer;
}
- public BranchXViewer(Composite parent, int style, XBranchWidget xBranchViewer, boolean filterRealTime, boolean searchRealTime) {
- this(parent, style, new BranchXViewerFactory(), xBranchViewer, filterRealTime, searchRealTime);
- }
-
@Override
public void handleDoubleClick() {
ArrayList<IOseeBranch> branches = xBranchViewer.getSelectedBranches();
@@ -103,9 +99,6 @@ public class BranchXViewer extends XViewer {
}
}
- /**
- * Release resources
- */
@Override
public void dispose() {
if (getLabelProvider() != null) {
@@ -113,9 +106,6 @@ public class BranchXViewer extends XViewer {
}
}
- /**
- * @return the xHistoryViewer
- */
public XBranchWidget getXBranchViewer() {
return xBranchViewer;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java
index cd707c082a4..638e147611f 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java
@@ -12,9 +12,10 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xBranch;
import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
-import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -49,8 +50,8 @@ public class BranchXViewerFactory extends SkynetXViewerFactory {
public final static String NAMESPACE = "osee.skynet.gui.BranchXViewer";
- public BranchXViewerFactory() {
- super(NAMESPACE);
+ public BranchXViewerFactory(IOseeTreeReportProvider reportProvider) {
+ super(NAMESPACE, reportProvider);
registerColumns(branchName, branchType, branchState, timeStamp, author, comment, associatedArtifact, parentBranch,
branchUuid, branchUuid, archivedState, inheritAccessControl);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/PolicyTableXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/PolicyTableXViewerFactory.java
index 2021754e988..e5556dba8d5 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/PolicyTableXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/PolicyTableXViewerFactory.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xBranch;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
import org.eclipse.osee.framework.ui.skynet.access.PolicyTableColumns;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.OseeTreeReportAdapter;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -21,7 +22,7 @@ public class PolicyTableXViewerFactory extends SkynetXViewerFactory {
public static final String namespace = "osee.skynet.gui.branchAccessViewer";
public PolicyTableXViewerFactory() {
- super(namespace);
+ super(namespace, new OseeTreeReportAdapter("Table Report - Policy View"));
PolicyTableColumns[] columns = PolicyTableColumns.values();
XViewerColumn[] xColumns = new XViewerColumn[columns.length];
for (int i = 0; i < columns.length; i++) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java
index 431da23b21a..b35e200dc04 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java
@@ -37,6 +37,7 @@ import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.skynet.change.BranchTransactionUiData;
import org.eclipse.osee.framework.ui.skynet.internal.Activator;
import org.eclipse.osee.framework.ui.skynet.widgets.GenericXWidget;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.swt.ALayout;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.FontManager;
@@ -58,7 +59,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
* @author Karol M. Wilk
* @author Jeff C. Phillips
*/
-public class XBranchWidget extends GenericXWidget {
+public class XBranchWidget extends GenericXWidget implements IOseeTreeReportProvider {
private BranchXViewer branchXViewer;
public final static String normalColor = "#EEEEEE";
private static final String LOADING = "Loading ...";
@@ -86,7 +87,7 @@ public class XBranchWidget extends GenericXWidget {
this.selectedBranch = selectedBranch;
this.menuListener = menuListener;
branchSelectedListeners = new CopyOnWriteArrayList<>();
- branchXViewerFactory = new BranchXViewerFactory();
+ branchXViewerFactory = new BranchXViewerFactory(this);
}
public XBranchWidget(BranchXViewerFactory branchXViewerFactory, IBranchWidgetMenuListener menuListener) {
@@ -364,4 +365,18 @@ public class XBranchWidget extends GenericXWidget {
}
+ @Override
+ public String getEditorTitle() {
+ if (selectedBranch != null) {
+ Branch branch = BranchManager.getBranch(selectedBranch);
+ return String.format("Table Report - Branch View %s", branch.getName());
+ }
+ return "Table Report - Branch View";
+ }
+
+ @Override
+ public String getReportTitle() {
+ return getEditorTitle();
+ }
+
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewer.java
index bb6a72c1393..0e814924e92 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewer.java
@@ -21,6 +21,7 @@ import org.eclipse.nebula.widgets.xviewer.core.model.CustomizeData;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
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.widgets.xviewer.skynet.OseeTreeReportAdapter;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.TreeItem;
@@ -31,7 +32,7 @@ public class HistoryXViewer extends XViewer {
private final XHistoryWidget xHistoryViewer;
public HistoryXViewer(Composite parent, int style, XHistoryWidget xRoleViewer) {
- super(parent, style, new HistoryXViewerFactory());
+ super(parent, style, new HistoryXViewerFactory(new OseeTreeReportAdapter("Table Report - History View")));
this.xHistoryViewer = xRoleViewer;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewerFactory.java
index 941076f4af0..cd9b2e898d7 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewerFactory.java
@@ -12,10 +12,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xHistory;
import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
-import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.CustomizeData;
import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -24,8 +25,8 @@ import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewer
public class HistoryXViewerFactory extends SkynetXViewerFactory {
public final static XViewerColumn transaction = new XViewerColumn("framework.history.transaction", "Transaction", 90,
XViewerAlign.Left, true, SortDataType.Integer, false, null);
- public final static XViewerColumn gamma = new XViewerColumn("framework.history.gamma", "Gamma", 60, XViewerAlign.Left,
- false, SortDataType.Integer, false, null);
+ public final static XViewerColumn gamma = new XViewerColumn("framework.history.gamma", "Gamma", 60,
+ XViewerAlign.Left, false, SortDataType.Integer, false, null);
public final static XViewerColumn itemType = new XViewerColumn("framework.history.itemType", "Item Type", 150,
XViewerAlign.Left, true, SortDataType.String, false, null);
public final static XViewerColumn itemChange = new XViewerColumn("framework.history.itemChange", "Item Kind", 100,
@@ -47,8 +48,8 @@ public class HistoryXViewerFactory extends SkynetXViewerFactory {
public final static String NAMESPACE = "osee.skynet.gui.HisotryXViewer";
- public HistoryXViewerFactory() {
- super(NAMESPACE);
+ public HistoryXViewerFactory(IOseeTreeReportProvider reportProvider) {
+ super(NAMESPACE, reportProvider);
registerColumns(transaction, gamma, itemType, itemChange, modType, itemId, was, is, timeStamp, author, comment);
registerAllAttributeColumns();
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
index 296615a0adc..98f98af14cc 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
@@ -16,6 +16,7 @@ import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactTypeColumn;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.GuidColumn;
@@ -49,8 +50,8 @@ public class ChangeXViewerFactory extends SkynetXViewerFactory {
public final static String NAMESPACE = "osee.skynet.gui.ChangeXViewer";
- public ChangeXViewerFactory() {
- super(NAMESPACE);
+ public ChangeXViewerFactory(IOseeTreeReportProvider reportProvider) {
+ super(NAMESPACE, reportProvider);
registerColumns(Name, Item_Type, Item_Kind, Change_Type, Is_Value, Was_Value, paraNumber);
registerColumns(HierarchyIndexColumn.getInstance());
registerColumns(new GuidColumn(false));
@@ -67,5 +68,4 @@ public class ChangeXViewerFactory extends SkynetXViewerFactory {
public XViewerSorter createNewXSorter(XViewer xViewer) {
return new XViewerSorter(xViewer);
}
-
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java
index 5ad10043838..77f8d85f2a6 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java
@@ -35,6 +35,7 @@ import org.eclipse.osee.framework.ui.skynet.compare.CompareHandler;
import org.eclipse.osee.framework.ui.skynet.internal.Activator;
import org.eclipse.osee.framework.ui.skynet.mergeWizard.ConflictResolutionWizard;
import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.swt.graphics.Image;
@@ -55,8 +56,8 @@ public class MergeXViewer extends XViewer {
private ConflictResolutionWizard conWizard;
private XMergeLabelProvider labelProvider;
- public MergeXViewer(Composite parent, int style, MergeXWidget xMergeViewer) {
- super(parent, style, new MergeXViewerFactory());
+ public MergeXViewer(Composite parent, int style, MergeXWidget xMergeViewer, IOseeTreeReportProvider reportProvider) {
+ super(parent, style, new MergeXViewerFactory(reportProvider));
this.mergeXWidget = xMergeViewer;
}
@@ -108,9 +109,9 @@ public class MergeXViewer extends XViewer {
private boolean hasInteractiveIcon(TreeColumn treeColumn) {
return isXViewerColumn(treeColumn, MergeXViewerFactory.Source) //
- || isXViewerColumn(treeColumn, MergeXViewerFactory.Destination) //
- || isXViewerColumn(treeColumn, MergeXViewerFactory.Conflict_Resolved) //
- || isXViewerColumn(treeColumn, MergeXViewerFactory.Merged);
+ || isXViewerColumn(treeColumn, MergeXViewerFactory.Destination) //
+ || isXViewerColumn(treeColumn, MergeXViewerFactory.Conflict_Resolved) //
+ || isXViewerColumn(treeColumn, MergeXViewerFactory.Merged);
}
private boolean isXViewerColumn(TreeColumn treeColumn, XViewerColumn expected) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java
index 5dbc806e70d..474566fe1d9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java
@@ -10,10 +10,11 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.widgets.xmerge;
-import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.customize.XViewerCustomMenu;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
/**
@@ -38,8 +39,8 @@ public class MergeXViewerFactory extends SkynetXViewerFactory {
public final static XViewerColumn Art_Id = new XViewerColumn("framework.merge.artId", "Artifact Id", 75,
XViewerAlign.Left, true, SortDataType.String, false, null);
- public MergeXViewerFactory() {
- super("osee.skynet.gui.MergeXViewer");
+ public MergeXViewerFactory(IOseeTreeReportProvider reportProvider) {
+ super("osee.skynet.gui.MergeXViewer", reportProvider);
registerColumns(Conflict_Resolved, Artifact_Name, Type, Change_Item, Source, Destination, Merged, Art_Id);
registerAllAttributeColumns();
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
index e62ca1c562f..59b12a56c27 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
@@ -61,6 +61,7 @@ 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.widgets.GenericXWidget;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.CheckBoxDialog;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.swt.ALayout;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
@@ -79,7 +80,7 @@ import org.eclipse.ui.PlatformUI;
* @author Donald G. Dunne
* @author Theron Virgin
*/
-public class MergeXWidget extends GenericXWidget {
+public class MergeXWidget extends GenericXWidget implements IOseeTreeReportProvider {
private static final String COMPLETE_COMMIT_ACTION_ID = "complete.commit.action.id";
private static final String REFRESH_ACTION_ID = "refresh.action.id";
private MergeXViewer mergeXViewer;
@@ -112,7 +113,7 @@ public class MergeXWidget extends GenericXWidget {
taskComp.setLayout(ALayout.getZeroMarginLayout());
createTextWidgets(parent);
createMainComposite(mainComp);
- mergeXViewer = new MergeXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION, this);
+ mergeXViewer = new MergeXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION, this, this);
createMergeXViewer();
createTaskActionBar(taskComp);
if (toolkit != null) {
@@ -722,4 +723,20 @@ public class MergeXWidget extends GenericXWidget {
}
}
}
+
+ @Override
+ public String getEditorTitle() {
+ try {
+ return String.format("Table Report - Merge View [%s]", getEditorTitle());
+ } catch (Exception ex) {
+ // do nothing
+ }
+ return "Table Report - Merge View";
+ }
+
+ @Override
+ public String getReportTitle() {
+ return getEditorTitle();
+ }
+
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/IOseeTreeReportProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/IOseeTreeReportProvider.java
new file mode 100644
index 00000000000..af5012f029e
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/IOseeTreeReportProvider.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2016 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.widgets.xviewer;
+
+/**
+ * @author Donald G. Dunne
+ */
+public interface IOseeTreeReportProvider {
+
+ public String getEditorTitle();
+
+ public String getReportTitle();
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java
index cf165c3ca81..510cd306ca8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java
@@ -14,6 +14,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xviewer;
import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerTreeReport;
import org.eclipse.osee.framework.core.util.XResultData;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.internal.Activator;
@@ -23,24 +24,44 @@ import org.eclipse.swt.widgets.TreeItem;
public class OseeXViewerTreeReport extends XViewerTreeReport {
+ private IOseeTreeReportProvider provider;
+
public OseeXViewerTreeReport(String title, XViewer treeViewer) {
super(title, treeViewer);
}
- public OseeXViewerTreeReport(XViewer xViewer) {
+ public OseeXViewerTreeReport(XViewer xViewer, IOseeTreeReportProvider provider) {
super("Table View Report", xViewer);
+ this.provider = provider;
+ }
+
+ public OseeXViewerTreeReport(XViewer xViewer) {
+ this(xViewer, null);
}
@Override
public void open(TreeItem items[], String defaultString) {
try {
String html = getHtml(items);
+ if (provider != null && Strings.isValid(provider.getReportTitle())) {
+ html = html.replaceFirst("<body>", "<body><b>" + provider.getReportTitle() + "</b></br>");
+ }
XResultData xResultData = new XResultData();
xResultData.addRaw(html);
- XResultDataUI.report(xResultData, title, Manipulations.RAW_HTML);
+ String useTitle = getUseTitle();
+ XResultDataUI.report(xResultData, useTitle, Manipulations.RAW_HTML);
} catch (Exception ex) {
OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
}
}
+ private String getUseTitle() {
+ if (Strings.isValid(provider.getEditorTitle())) {
+ return provider.getEditorTitle();
+ } else if (Strings.isValid(title)) {
+ return title;
+ }
+ return "Table Report";
+ }
+
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/OseeTreeReportAdapter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/OseeTreeReportAdapter.java
new file mode 100644
index 00000000000..c66b63784ac
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/OseeTreeReportAdapter.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2016 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.widgets.xviewer.skynet;
+
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class OseeTreeReportAdapter implements IOseeTreeReportProvider {
+
+ private final String title;
+
+ public OseeTreeReportAdapter(String title) {
+ this.title = title;
+ }
+
+ @Override
+ public String getEditorTitle() {
+ return title;
+ }
+
+ @Override
+ public String getReportTitle() {
+ return title;
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java
index 9dbd2f9c5b5..b95c6f5e8bd 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java
@@ -32,6 +32,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.ui.skynet.internal.Activator;
import org.eclipse.osee.framework.ui.skynet.util.DbConnectionUtility;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IOseeTreeReportProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.OseeXViewerTreeReport;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactNameColumn;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.AttributeColumn;
@@ -41,8 +42,11 @@ import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.Attrib
*/
public class SkynetXViewerFactory extends XViewerFactory {
- public SkynetXViewerFactory(String namespace) {
+ private IOseeTreeReportProvider reportProvider;
+
+ public SkynetXViewerFactory(String namespace, IOseeTreeReportProvider reportProvider) {
super(namespace);
+ this.reportProvider = reportProvider;
}
private IXViewerCustomizations xViewerCustomizations;
@@ -148,7 +152,11 @@ public class SkynetXViewerFactory extends XViewerFactory {
@Override
public XViewerTreeReport getXViewerTreeReport(XViewer viewer) {
- return new OseeXViewerTreeReport(viewer);
+ return new OseeXViewerTreeReport(viewer, reportProvider);
+ }
+
+ public void setReportProvider(IOseeTreeReportProvider reportProvider) {
+ this.reportProvider = reportProvider;
}
}
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewerFactory.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewerFactory.java
index ea7c999e80b..b8208d665fc 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewerFactory.java
@@ -14,6 +14,7 @@ import org.eclipse.nebula.widgets.xviewer.core.model.CustomizeData;
import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.OseeTreeReportAdapter;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
import org.eclipse.osee.ote.ui.define.views.TestRunView;
@@ -26,7 +27,7 @@ public class TestRunXViewerFactory extends SkynetXViewerFactory {
300, XViewerAlign.Left, true, SortDataType.String, true, null);
public TestRunXViewerFactory() {
- super(TestRunView.VIEW_ID);
+ super(TestRunView.VIEW_ID, new OseeTreeReportAdapter("Test Run View"));
registerAllAttributeColumns();
registerColumns(new XViewerColumn("ote.test.run.view.Name", "Name", 150, XViewerAlign.Left, true,
SortDataType.String, false, null));

Back to the top