Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddunne2008-08-04 15:59:54 +0000
committerddunne2008-08-04 15:59:54 +0000
commit62e6d72de598370838d6742766dd047008a75402 (patch)
tree7be302d85086e4da40257a9e14eebb792aaa7a1e
parent91f8a6e11eba41a2086b6c15204cbd7c15db5ad7 (diff)
downloadorg.eclipse.osee-62e6d72de598370838d6742766dd047008a75402.tar.gz
org.eclipse.osee-62e6d72de598370838d6742766dd047008a75402.tar.xz
org.eclipse.osee-62e6d72de598370838d6742766dd047008a75402.zip
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java4
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditorInput.java17
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java5
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java24
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerColumn.java3
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/CustomizeManager.java2
-rw-r--r--org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/dialog/XViewerCustomizeDialog.java15
7 files changed, 59 insertions, 11 deletions
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java
index 33a67add696..2526dd67722 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java
@@ -49,6 +49,8 @@ import org.eclipse.swt.widgets.Display;
*/
public class GenerateReviewParticipationReport extends XNavigateItemAction {
+ private final String MASS_XVIEWER_CUSTOMIZE_NAMESPACE = "org.eclipse.osee.ats.ReviewParticipationReport";
+
public GenerateReviewParticipationReport(XNavigateItem parent) {
super(parent, "Generate Review Participation Report");
}
@@ -87,6 +89,7 @@ public class GenerateReviewParticipationReport extends XNavigateItemAction {
Collection<Artifact> reviewArts = srch.performSearchGetResults();
MassArtifactEditorInput input =
new MassArtifactEditorInput(getName() + " as of " + XDate.getDateNow(), reviewArts, getColumns(user));
+ input.setCustomizeNamespace(MASS_XVIEWER_CUSTOMIZE_NAMESPACE);
MassArtifactEditor.editArtifacts(input);
} catch (Exception ex) {
return new Status(Status.ERROR, AtsPlugin.PLUGIN_ID, -1, ex.toString(), ex);
@@ -94,7 +97,6 @@ public class GenerateReviewParticipationReport extends XNavigateItemAction {
monitor.done();
return Status.OK_STATUS;
}
-
}
private static List<XViewerColumn> getColumns(User user) throws OseeCoreException, SQLException {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditorInput.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditorInput.java
index 460e8a39e0b..165afc2ff8c 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditorInput.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditorInput.java
@@ -24,10 +24,23 @@ import org.eclipse.ui.IPersistableElement;
public class MassArtifactEditorInput implements IEditorInput {
private final Collection<? extends Artifact> artifacts;
-
private final String name;
-
private final List<XViewerColumn> columns;
+ private String customizeNamespace = null;
+
+ /**
+ * @return the customizeNamespace
+ */
+ public String getCustomizeNamespace() {
+ return customizeNamespace;
+ }
+
+ /**
+ * @param customizeNamespace the customizeNamespace to set
+ */
+ public void setCustomizeNamespace(String customizeNamespace) {
+ this.customizeNamespace = customizeNamespace;
+ }
/**
* @param artifact
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java
index 67d60775264..7e38df70c28 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java
@@ -281,6 +281,11 @@ public class MassXViewer extends XViewer implements IEventReceiver {
}
custData.getColumnData().setColumns(columns);
((MassXViewerFactory) getXViewerFactory()).setDefaultCustData(custData);
+ String editorInputNamespace =
+ ((MassArtifactEditorInput) ((MassArtifactEditor) editor).getEditorInput()).getCustomizeNamespace();
+ if (editorInputNamespace != null && !editorInputNamespace.equals("")) {
+ ((MassXViewerFactory) getXViewerFactory()).setNamespace(editorInputNamespace);
+ }
((MassXViewerFactory) getXViewerFactory()).setColumns(columns);
getCustomizeMgr().loadCustomization(custData);
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java
index b2708398cb4..2d97cdb3e6f 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java
@@ -24,6 +24,14 @@ public class MassXViewerFactory extends SkynetXViewerFactory {
private static String NAMESPACE = "org.eclipse.osee.framework.ui.skynet.massEditor.ArtifactXViewer";
private CustomizeData custData;
+ private String namespace = NAMESPACE;
+
+ /**
+ * @param namespace the namespace to set
+ */
+ public void setNamespace(String namespace) {
+ this.namespace = namespace;
+ }
public MassXViewerFactory() {
super(NAMESPACE);
@@ -39,7 +47,12 @@ public class MassXViewerFactory extends SkynetXViewerFactory {
*/
@Override
public CustomizeData getDefaultTableCustomizeData() {
- if (custData != null) return custData;
+ if (custData != null) {
+ // Return a copy so don't corrupt original columns
+ CustomizeData custData = new CustomizeData();
+ custData.setNameSpace(custData.getNameSpace());
+ custData.getColumnData().setColumns(getColumns());
+ }
return super.getDefaultTableCustomizeData();
}
@@ -56,4 +69,13 @@ public class MassXViewerFactory extends SkynetXViewerFactory {
public void setDefaultCustData(CustomizeData custData) {
this.custData = custData;
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.osee.framework.ui.skynet.widgets.xviewer.XViewerFactory#getNamespace()
+ */
+ @Override
+ public String getNamespace() {
+ return namespace;
+ }
+
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerColumn.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerColumn.java
index b29c1a3345b..8c0fe176f19 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerColumn.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerColumn.java
@@ -126,9 +126,10 @@ public class XViewerColumn {
}
public String getDisplayName() {
- return name + " - " + id + " - width:" + width;
+ return name + " - " + id + " - width:" + width + " - show:" + show;
}
+ @Override
public String toString() {
return "column:[" + name + "][" + id + "][" + width + "][" + show + "][" + align + "]";
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/CustomizeManager.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/CustomizeManager.java
index 014cf1ce79a..51af50820cc 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/CustomizeManager.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/CustomizeManager.java
@@ -118,7 +118,7 @@ public class CustomizeManager {
if (resolvedCol != null && resolvedCol.getWidth() > 0) {
resolvedCol.setWidth(storedCol.getWidth());
resolvedCol.setName(storedCol.getName());
- resolvedCol.setShow(storedCol.isShow() || storedCol.getWidth() > 0);
+ resolvedCol.setShow(storedCol.isShow());
resolvedCol.setSortForward(storedCol.isSortForward());
resolvedColumns.add(resolvedCol);
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/dialog/XViewerCustomizeDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/dialog/XViewerCustomizeDialog.java
index 9e08b84c0ba..639e85c2282 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/dialog/XViewerCustomizeDialog.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/dialog/XViewerCustomizeDialog.java
@@ -15,8 +15,6 @@ import java.util.Iterator;
import java.util.List;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -104,6 +102,12 @@ public class XViewerCustomizeDialog extends MessageDialog {
gridLayout_2.numColumns = 2;
comp.setLayout(gridLayout_2);
+ final Label namespaceLabel = new Label(comp, SWT.NONE);
+ GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, false, false);
+ gridData.horizontalSpan = 2;
+ namespaceLabel.setLayoutData(gridData);
+ namespaceLabel.setText("Customization Namespace: " + xViewer.getXViewerFactory().getNamespace());
+
final Label selectCustomizationLabel = new Label(comp, SWT.NONE);
selectCustomizationLabel.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
selectCustomizationLabel.setText("Select Customization");
@@ -607,11 +611,11 @@ public class XViewerCustomizeDialog extends MessageDialog {
}
if (xViewer.getCustomizeMgr().isCustomizationUserDefault(custData)) {
if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Remove Default",
- "Remove \"" + custData + "\" as default for this table?")) {
+ "Remove \"" + custData.getName() + "\" as default for this table?")) {
xViewer.getCustomizeMgr().setUserDefaultCustData(custData, false);
}
} else if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Set Default",
- "Set \"" + custData + "\" as default for this table?")) {
+ "Set \"" + custData.getName() + "\" as default for this table?")) {
xViewer.getCustomizeMgr().setUserDefaultCustData(custData, true);
}
loadCustomizeTable();
@@ -638,7 +642,7 @@ public class XViewerCustomizeDialog extends MessageDialog {
return;
}
if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Delete Customization",
- "Delete \"" + custSel + "\" customization?")) {
+ "Delete \"" + custSel.getName() + "\" customization?")) {
xViewer.getCustomizeMgr().deleteCustomization(custSel);
loadCustomizeTable();
updateButtonEnablements();
@@ -746,6 +750,7 @@ public class XViewerCustomizeDialog extends MessageDialog {
filterText.setData(custData);
}
+ @Override
protected void buttonPressed(int buttonId) {
// Ok
if (buttonId == 0) {

Back to the top