bug[ats_ATS175097]: Fix current assignee(s) not selected.
Change-Id: Iea29c954b129d8ba2517ad1eeeb9b3d458f9e63d
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeArtifactDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeArtifactDialog.java
index 35fa0dc..83b273d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeArtifactDialog.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeArtifactDialog.java
@@ -17,12 +17,9 @@
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.osee.framework.core.util.Result;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider;
import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider;
-import org.eclipse.osee.framework.ui.skynet.internal.Activator;
import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -32,8 +29,6 @@
*/
public class FilteredCheckboxTreeArtifactDialog extends FilteredCheckboxTreeDialog {
- private Collection<? extends Artifact> selectable;
-
public FilteredCheckboxTreeArtifactDialog(String title, String message, Collection<? extends Artifact> selectable) {
this(title, message, selectable, new ArrayTreeContentProvider(), new ArtifactLabelProvider());
}
@@ -43,8 +38,7 @@
}
public FilteredCheckboxTreeArtifactDialog(String title, String message, Collection<? extends Artifact> selectable, ITreeContentProvider contentProvider, ILabelProvider labelProvider) {
- super(title, message, contentProvider, labelProvider, new ArtifactNameSorter());
- this.selectable = selectable;
+ super(title, message, new HashSet<Artifact>(selectable), contentProvider, labelProvider, new ArtifactNameSorter());
}
public FilteredCheckboxTreeArtifactDialog(String title, Collection<? extends Artifact> selectable) {
@@ -66,13 +60,7 @@
@Override
protected Control createDialogArea(Composite container) {
- Control comp = super.createDialogArea(container);
- try {
- getTreeViewer().getViewer().setInput(selectable);
- } catch (Exception ex) {
- OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
- }
- return comp;
+ return super.createDialogArea(container);
}
@Override
@@ -80,12 +68,4 @@
return super.isComplete();
}
- public Collection<? extends Artifact> getSelectable() {
- return selectable;
- }
-
- public void setSelectable(Collection<Artifact> selectable) {
- this.selectable = selectable;
- }
-
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java
index 32052d7..359d7fc 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java
@@ -23,9 +23,6 @@
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.osee.framework.core.util.Result;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.ArtifactContentProvider;
-import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider;
-import org.eclipse.osee.framework.ui.skynet.ArtifactViewerSorter;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.FilteredCheckboxTree.FilterableCheckboxTreeViewer;
import org.eclipse.osee.framework.ui.swt.ALayout;
import org.eclipse.osee.framework.ui.swt.Displays;
@@ -54,6 +51,7 @@
private boolean expandChecked = false;
private boolean multiSelect = true;
private PatternFilter patternFilter;
+ private Set<Artifact> selectables;
public FilteredCheckboxTreeDialog(String dialogTitle, String dialogMessage, IContentProvider contentProvider, IBaseLabelProvider labelProvider) {
this(dialogTitle, dialogMessage, contentProvider, labelProvider, null);
@@ -70,8 +68,9 @@
setShellStyle(getShellStyle() | SWT.RESIZE);
}
- public FilteredCheckboxTreeDialog(String title, Set<Artifact> artifacts) {
- this(title, title, new ArtifactContentProvider(), new ArtifactLabelProvider(), new ArtifactViewerSorter());
+ public FilteredCheckboxTreeDialog(String dialogTitle, String dialogMessage, Set<Artifact> artifacts, IContentProvider contentProvider, IBaseLabelProvider labelProvider, ViewerSorter viewerSorter) {
+ this(dialogTitle, dialogMessage, contentProvider, labelProvider, viewerSorter);
+ this.selectables = artifacts;
}
public void setShowSelectButtons(boolean showSelectButtons) {
@@ -111,7 +110,7 @@
}
protected FilterableCheckboxTreeViewer getCheckboxTreeViewer() {
- return (FilterableCheckboxTreeViewer) treeViewer.getViewer();
+ return treeViewer.getCheckboxTreeViewer();
}
public Object[] getResult() {
@@ -152,11 +151,19 @@
updateStatusLabel();
}
});
+
+ if (selectables != null && !selectables.isEmpty()) {
+ setInput(selectables);
+ for (Artifact selectable : selectables) {
+ treeViewer.getCheckboxTreeViewer().getOrCreateItem(selectable);
+ }
+ }
+
if (input != null) {
treeViewer.getViewer().setInput(input);
}
if (initialSelections != null) {
- getCheckboxTreeViewer().setCheckedElements(initialSelections.toArray());
+ treeViewer.setInitalChecked(initialSelections);
}
updateStatusLabel();
