diff options
author | ddunne | 2008-07-15 01:26:05 +0000 |
---|---|---|
committer | ddunne | 2008-07-15 01:26:05 +0000 |
commit | 8843ac86f23c2ef8d5dbb6e2060b141ec5f6bb4f (patch) | |
tree | cb2f06a6ca94756e9c5160796e3fe09b9804a685 | |
parent | 7114443197742e99182eefcc5e744de6c7fe2dbc (diff) | |
download | org.eclipse.osee-8843ac86f23c2ef8d5dbb6e2060b141ec5f6bb4f.tar.gz org.eclipse.osee-8843ac86f23c2ef8d5dbb6e2060b141ec5f6bb4f.tar.xz org.eclipse.osee-8843ac86f23c2ef8d5dbb6e2060b141ec5f6bb4f.zip |
16 files changed, 67 insertions, 19 deletions
diff --git a/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java index fdcea8bd5fb..29f3c86b6e6 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java @@ -35,7 +35,7 @@ public class DefectXViewerFactory extends SkynetXViewerFactory { return new XViewerSorter(xViewer); } - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { CustomizeData custData = new CustomizeData(); int x = 0; ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>(); diff --git a/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java index d9939daa75f..81eb39ce566 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java @@ -35,7 +35,7 @@ public class UserRoleXViewerFactory extends SkynetXViewerFactory { return new XViewerSorter(xViewer); } - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { CustomizeData custData = new CustomizeData(); int x = 0; ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>(); diff --git a/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskXViewerFactory.java index 53b456314f3..62b04661d02 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskXViewerFactory.java @@ -35,7 +35,7 @@ public class TaskXViewerFactory extends SkynetXViewerFactory { return new TaskXViewerSorter(xViewer); } - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { CustomizeData custData = new CustomizeData(); // Title, State, POC, Percent_Complete, Hours_Spent, Resolution, Est_Hours, Remain_Hours List<AtsXColumn> taskColumnOrder = diff --git a/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java index 93b4d94333e..054e0fbe005 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java @@ -35,7 +35,7 @@ public class WorldXViewerFactory extends SkynetXViewerFactory { return new WorldXViewerSorter(xViewer); } - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { CustomizeData custData = new CustomizeData(); int x = 0; ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>(); diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewerFactory.java index 5388a4cf3d7..9060ebe3565 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewerFactory.java @@ -35,7 +35,7 @@ public class AutoRunXViewerFactory extends SkynetXViewerFactory { return new XViewerSorter(xViewer); } - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { CustomizeData custData = new CustomizeData(); int x = 0; ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>(); diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java index 0008954d5b2..4b6e4044866 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerFactory.java @@ -37,7 +37,7 @@ public class MassXViewerFactory extends SkynetXViewerFactory { return new XViewerSorter(xViewer); } - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { CustomizeData custData = new CustomizeData(); int x = 0; ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>(); diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/queryLog/QueryLogXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/queryLog/QueryLogXViewerFactory.java index 36ab6064446..b763815663b 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/queryLog/QueryLogXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/queryLog/QueryLogXViewerFactory.java @@ -25,14 +25,17 @@ import org.eclipse.swt.SWT; */ public class QueryLogXViewerFactory extends SkynetXViewerFactory { + private XViewer viewer; + public QueryLogXViewerFactory() { } public XViewerSorter createNewXSorter(XViewer xViewer) { + viewer = xViewer; return new XViewerSorter(xViewer); } - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { CustomizeData custData = new CustomizeData(); List<XViewerColumn> defaultColumns = new ArrayList<XViewerColumn>(); defaultColumns.add(new XViewerColumn(QueryLogView.ITEM, 400, 400, SWT.LEFT, true, SortDataType.String, 0)); @@ -48,7 +51,7 @@ public class QueryLogXViewerFactory extends SkynetXViewerFactory { * @see org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IXViewerFactory#getDefaultXViewerColumn() */ public XViewerColumn getDefaultXViewerColumn(String name) { - for (XViewerColumn xCol : getDefaultTableCustomizeData().getColumnData().getColumns()) { + for (XViewerColumn xCol : getDefaultTableCustomizeData(viewer).getColumnData().getColumns()) { if (xCol.getSystemName().equals(name)) { return xCol; } diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java index c8fb55b96d7..9d32c738fbb 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java @@ -172,4 +172,11 @@ public class ChangeXViewer extends XViewer implements IEventReceiver { return true; } + /** + * @return the xChangeViewer + */ + public XChangeViewer getXChangeViewer() { + return xChangeViewer; + } + } diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java index 8370e7d00b3..ea45c19ab7e 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java @@ -10,7 +10,15 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.widgets.xchange; +import java.sql.SQLException; import java.util.ArrayList; +import org.eclipse.osee.framework.skynet.core.artifact.Branch; +import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; +import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; +import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException; +import org.eclipse.osee.framework.skynet.core.transaction.TransactionId; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.XViewer; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.XViewerColumn; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.XViewerSorter; @@ -22,8 +30,6 @@ import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewer */ public class ChangeXViewerFactory extends SkynetXViewerFactory { - private XViewer xViewer; - /** * */ @@ -31,11 +37,10 @@ public class ChangeXViewerFactory extends SkynetXViewerFactory { } public XViewerSorter createNewXSorter(XViewer xViewer) { - this.xViewer = xViewer; return new XViewerSorter(xViewer); } - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { CustomizeData custData = new CustomizeData(); int x = 0; ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>(); @@ -45,10 +50,26 @@ public class ChangeXViewerFactory extends SkynetXViewerFactory { newCol.setTreeViewer(xViewer); cols.add(newCol); } + try { + for (AttributeType attributeType : AttributeTypeManager.getTypes(getBranch(xViewer))) { + System.out.println("Attribute " + attributeType); + } + } catch (Exception ex) { + OSEELog.logException(SkynetGuiPlugin.class, ex, false); + } custData.getColumnData().setColumns(cols); return custData; } + private Branch getBranch(XViewer xViewer) throws OseeCoreException, SQLException { + Branch branch = ((ChangeXViewer) xViewer).getXChangeViewer().getBranch(); + if (branch == null) { + TransactionId transId = ((ChangeXViewer) xViewer).getXChangeViewer().getTransactionId(); + if (transId != null) return transId.getBranch(); + } + return null; + } + /* * (non-Javadoc) * diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java index e6863a43f82..17c66d9f5cf 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java @@ -14,7 +14,6 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xchange; import java.sql.SQLException; import java.util.ArrayList; import java.util.Iterator; - import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -375,4 +374,22 @@ public class XChangeViewer extends XWidget implements IEventReceiver, IActionabl sb.append("\nTransaction Id: " + transactionNumber); return sb.toString(); } + + /** + * @return the transactionNumber + */ + public int getTransactionNumber() { + return transactionNumber; + } + + public TransactionId getTransactionId() throws OseeCoreException, SQLException { + return TransactionIdManager.getInstance().getPossiblyEditableTransactionId(getTransactionNumber()); + } + + /** + * @return the branch + */ + public Branch getBranch() { + return branch; + } } diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitXViewerFactory.java index 1fe08046a71..25954a05baa 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitXViewerFactory.java @@ -35,7 +35,7 @@ public class CommitXViewerFactory extends SkynetXViewerFactory { return new XViewerSorter(xViewer); } - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { CustomizeData custData = new CustomizeData(); int x = 0; ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>(); diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java index eec27469f66..ec1611406a6 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java @@ -35,7 +35,7 @@ public class MergeXViewerFactory extends SkynetXViewerFactory { return new XViewerSorter(xViewer); } - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { CustomizeData custData = new CustomizeData(); int x = 0; ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>(); diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/IXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/IXViewerFactory.java index 9d3638f6f3c..182908ec186 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/IXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/IXViewerFactory.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.customize.IXViewerCu public interface IXViewerFactory { XViewerSorter createNewXSorter(XViewer viewer); - CustomizeData getDefaultTableCustomizeData(); + CustomizeData getDefaultTableCustomizeData(XViewer xViewer); XViewerColumn getDefaultXViewerColumn(String name); diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomize.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomize.java index 4577fd87cc7..d371b3ed91c 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomize.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomize.java @@ -420,7 +420,7 @@ public class XViewerCustomize { * @return the defaultCustData */ public CustomizeData getTableDefaultCustData() { - CustomizeData custData = xViewer.getXViewerFactory().getDefaultTableCustomizeData(); + CustomizeData custData = xViewer.getXViewerFactory().getDefaultTableCustomizeData(xViewer); if (custData.getName() == null || this.currentCustData.getName().equals("")) custData.setName(TABLE_DEFAULT_LABEL); custData.setNameSpace(xViewer.getViewerNamespace()); return custData; diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java index bb6c396fb83..08b9c4ca937 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java @@ -45,7 +45,7 @@ public class SkynetXViewerFactory implements IXViewerFactory { * * @see org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IXViewerFactory#getDefaultTableCustomizeData() */ - public CustomizeData getDefaultTableCustomizeData() { + public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) { return null; } diff --git a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/test/XViewerTestFactory.java b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/test/XViewerTestFactory.java index 3d2abc10331..e2a7c6acee5 100644 --- a/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/test/XViewerTestFactory.java +++ b/MS_0.2.0_20080619/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/test/XViewerTestFactory.java @@ -33,7 +33,7 @@ public class XViewerTestFactory implements IXViewerFactory { * @see org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IXViewerFactory#getDefaultTableCustomizeData()
*/
@Override
- public CustomizeData getDefaultTableCustomizeData() {
+ public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) {
CustomizeData custData = new CustomizeData();
int x = 0;
ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>();
|