Change View attribute columns
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java
index 6614495..0e45a57 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewerFactory.java
@@ -41,7 +41,6 @@
ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>();
for (DefectColumn atsXCol : DefectColumn.values()) {
XViewerColumn newCol = atsXCol.getXViewerColumn(atsXCol);
- newCol.setOrderNum(x++);
newCol.setXViewer(xViewer);
cols.add(newCol);
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java
index 6730023..f398870 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewerFactory.java
@@ -41,7 +41,6 @@
ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>();
for (UserRoleColumn atsXCol : UserRoleColumn.values()) {
XViewerColumn newCol = atsXCol.getXViewerColumn(atsXCol);
- newCol.setOrderNum(x++);
newCol.setXViewer(xViewer);
cols.add(newCol);
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskXViewerFactory.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskXViewerFactory.java
index a136777..24e0b1a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskXViewerFactory.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/task/TaskXViewerFactory.java
@@ -53,7 +53,6 @@
for (AtsXColumn atsXCol : taskColumnOrder) {
XViewerColumn newCol = atsXCol.getXViewerColumn(atsXCol);
newCol.setWidth(widths.get(x));
- newCol.setOrderNum(x++);
newCol.setXViewer(xViewer);
newCol.setShow(true);
cols.add(newCol);
@@ -64,7 +63,6 @@
for (AtsXColumn atsXCol : AtsXColumn.values()) {
if (!handled.contains(atsXCol)) {
XViewerColumn newCol = atsXCol.getXViewerColumn(atsXCol);
- newCol.setOrderNum(x++);
newCol.setXViewer(xViewer);
newCol.setShow(false);
cols.add(newCol);
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
index 3e2076c..19c9274 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
@@ -37,11 +37,9 @@
public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) {
CustomizeData custData = new CustomizeData();
- int x = 0;
ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>();
for (AtsXColumn atsXCol : AtsXColumn.values()) {
XViewerColumn newCol = atsXCol.getXViewerColumn(atsXCol);
- newCol.setOrderNum(x++);
newCol.setXViewer(xViewer);
cols.add(newCol);
}
diff --git a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewerFactory.java b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewerFactory.java
index b372ebb..e2a869b 100644
--- a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewerFactory.java
+++ b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewerFactory.java
@@ -41,7 +41,6 @@
ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>();
for (AutoRunColumn atsXCol : AutoRunColumn.values()) {
XViewerColumn newCol = atsXCol.getXViewerColumn(atsXCol);
- newCol.setOrderNum(x++);
newCol.setXViewer(xViewer);
cols.add(newCol);
}
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 7ab64a5..2e9571d 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
@@ -282,9 +282,7 @@
columns = getDefaultArtifactColumns(this, artifacts);
custData.getSortingData().setSortingNames(Arrays.asList("Name"));
}
- int order = 0;
for (XViewerColumn col : columns) {
- col.setOrderNum(order++);
col.setXViewer(this);
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/queryLog/QueryLogLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/queryLog/QueryLogLabelProvider.java
index 35b4e3f..e101955 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/queryLog/QueryLogLabelProvider.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/queryLog/QueryLogLabelProvider.java
@@ -39,21 +39,30 @@
sharedImages = PlatformUI.getWorkbench().getSharedImages();
}
- protected Image getColumnImage(Object element, XViewerColumn column) {
-
- if (element instanceof QueryRecord && column.getColumnNum() == 0) {
+ public Image getColumnImage(Object element, int columnIndex) {
+ if (element instanceof QueryRecord) {
if (((QueryRecord) element).getSqlException() != null) {
return sharedImages.getImage(ISharedImages.IMG_OBJS_WARN_TSK);
}
- } else if (element instanceof Exception && column.getColumnNum() == 0) {
+ } else if (element instanceof Exception) {
return sharedImages.getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
- } else if (element instanceof String && column.getColumnNum() == 0) {
+ } else if (element instanceof String) {
return sharedImages.getImage(ISharedImages.IMG_OBJ_ELEMENT);
}
return null;
+
}
- protected String getColumnText(Object element, XViewerColumn column) {
+ /* (non-Javadoc)
+ * @see org.eclipse.osee.framework.ui.skynet.widgets.xviewer.XViewerLabelProvider#getColumnImage(java.lang.Object, org.eclipse.osee.framework.ui.skynet.widgets.xviewer.XViewerColumn)
+ */
+ @Override
+ public Image getColumnImage(Object element, XViewerColumn column) {
+ // Since getColumnimage is overridden, this method will not be called
+ return null;
+ }
+
+ public String getColumnText(Object element, XViewerColumn column) {
String columnName = column.getDisplayName();
if (element instanceof QueryRecord) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
index 7ff8427..471a7e3 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
@@ -12,6 +12,7 @@
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.List;
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;
@@ -45,11 +46,9 @@
public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) {
CustomizeData custData = new CustomizeData();
- int columnNum = 0;
- ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>();
+ List<XViewerColumn> cols = new ArrayList<XViewerColumn>();
for (ChangeColumn atsXCol : ChangeColumn.values()) {
XViewerColumn newCol = atsXCol.getXViewerColumn(atsXCol);
- newCol.setOrderNum(columnNum++);
newCol.setXViewer(xViewer);
cols.add(newCol);
}
@@ -58,7 +57,6 @@
XViewerAttributeFromChangeColumn newCol =
new XViewerAttributeFromChangeColumn(xViewer, attributeType.getName(), attributeType.getName(), 75,
75, SWT.LEFT, false, XViewerAttributeSortDataType.get(attributeType), 0);
- newCol.setOrderNum(columnNum++);
newCol.setXViewer(xViewer);
cols.add(newCol);
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitXViewerFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitXViewerFactory.java
index 2604f0b..7dc97e2 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitXViewerFactory.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitXViewerFactory.java
@@ -37,11 +37,9 @@
public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) {
CustomizeData custData = new CustomizeData();
- int x = 0;
ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>();
for (CommitColumn atsXCol : CommitColumn.values()) {
XViewerColumn newCol = atsXCol.getXViewerColumn(atsXCol);
- newCol.setOrderNum(x++);
newCol.setXViewer(xViewer);
cols.add(newCol);
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java
index 62fb51c..18c847d 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewerFactory.java
@@ -37,11 +37,9 @@
public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) {
CustomizeData custData = new CustomizeData();
- int x = 0;
ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>();
for (MergeColumn atsXCol : MergeColumn.values()) {
XViewerColumn newCol = atsXCol.getXViewerColumn(atsXCol);
- newCol.setOrderNum(x++);
newCol.setXViewer(xViewer);
cols.add(newCol);
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewer.java
index c216503..a7fe6c0 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewer.java
@@ -240,26 +240,9 @@
}
public XViewerColumn getXTreeColumn(int columnIndex) {
- // Setting current customize data happens in a job, the currentCustData could be null
- // depending on order of threads
- if (customize.getCurrentCustData() != null) {
- for (XViewerColumn xCol : customize.getCurrentCustData().getColumnData().getColumns()) {
- if (xCol.getColumnNum() == columnIndex) return xCol;
- }
- }
- return null;
+ return (XViewerColumn) getTree().getColumn(columnIndex).getData();
}
- public XViewerColumn getXTreeColumn(String columnName) {
- // Setting current customize data happens in a job, the currentCustData could be null
- // depending on order of threads
- if (customize.getCurrentCustData() != null) {
- for (XViewerColumn xCol : customize.getCurrentCustData().getColumnData().getColumns()) {
- if (xCol.getDisplayName() == columnName) return xCol;
- }
- }
- return null;
- }
Listener displayKeysListener = new Listener() {
public void handleEvent(org.eclipse.swt.widgets.Event event) {
if (event.keyCode == SWT.CTRL) {
@@ -380,11 +363,9 @@
}
public void addColumns() {
- int colNum = 0;
for (final XViewerColumn xCol : customize.getCurrentCustData().getColumnData().getColumns()) {
- TreeColumn column = new TreeColumn(getTree(), xCol.getAlign(), colNum);
+ TreeColumn column = new TreeColumn(getTree(), xCol.getAlign());
xCol.setTreeColumn(column);
- xCol.setColumnNum(colNum++);
column.setData(xCol);
if (xCol.getToolTip().equals(""))
column.setToolTipText(xCol.getDisplayName());
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 2d4ed2f..d9a9963 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
@@ -27,10 +27,8 @@
private int defaultWidth;
private int align;
private boolean sortForward = true; // if true, sort alphabetically; else reverse
- private int columnNum = Integer.MAX_VALUE;
private boolean show = true;
private TreeColumn treeColumn;
- private int orderNum = Integer.MAX_VALUE;
private SortDataType sortDataType = SortDataType.String;
private static ArrayList<XViewerColumn> registeredColumns = new ArrayList<XViewerColumn>();
private String toolTip = "";
@@ -46,7 +44,6 @@
this.width = defaultWidth;
this.align = align;
this.show = show;
- this.orderNum = orderNum;
this.sortDataType = sortDataType;
}
@@ -97,7 +94,6 @@
sb.append(AXml.addTagData(ALIGN, getAlignStoreName(align)));
sb.append(AXml.addTagData(SORT_FORWARD, sortForward + ""));
sb.append(AXml.addTagData(SHOW, show + ""));
- sb.append(AXml.addTagData(ORDER_NUM, orderNum + ""));
sb.append("</" + XTREECOLUMN_TAG + ">");
return sb.toString();
}
@@ -112,7 +108,6 @@
align = getAlignStoreValue(AXml.getTagData(xml, ALIGN));
sortForward = AXml.getTagBooleanData(xml, SORT_FORWARD);
show = AXml.getTagBooleanData(xml, SHOW);
- orderNum = AXml.getTagIntData(xml, ORDER_NUM);
}
public static String getSystemName(String xml) {
@@ -195,14 +190,6 @@
setSortForward(!sortForward);
}
- public int getColumnNum() {
- return columnNum;
- }
-
- public void setColumnNum(int columnNum) {
- this.columnNum = columnNum;
- }
-
public boolean isShow() {
return show;
}
@@ -219,14 +206,6 @@
this.treeColumn = treeColumn;
}
- public int getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(int orderNum) {
- this.orderNum = orderNum;
- }
-
public String getAlternateName() {
return alternateName;
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerColumnLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerColumnLabelProvider.java
index 3717f31..635049a 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerColumnLabelProvider.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerColumnLabelProvider.java
@@ -12,7 +12,6 @@
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.osee.framework.ui.skynet.ats.OseeAts;
import org.eclipse.swt.graphics.Image;
/**
@@ -40,7 +39,7 @@
public String getText(Object element) {
if (!(element instanceof XViewerColumn)) return "";
XViewerColumn xCol = (XViewerColumn) element;
- return xCol.getNameAlternate() + " (" + xCol.getWidth() + ") " + (OseeAts.isAtsAdmin() ? " - " + xCol.getOrderNum() : "");
+ return xCol.getNameAlternate() + " (" + xCol.getWidth() + ") ";
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerLabelProvider.java
index ad525ba..24f484e 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerLabelProvider.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerLabelProvider.java
@@ -60,7 +60,7 @@
return "";
}
- protected abstract Image getColumnImage(Object element, XViewerColumn column);
+ public abstract Image getColumnImage(Object element, XViewerColumn column);
- protected abstract String getColumnText(Object element, XViewerColumn column);
+ public abstract String getColumnText(Object element, XViewerColumn column);
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerSorter.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerSorter.java
index 50c47a7..fa23609 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerSorter.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerSorter.java
@@ -15,7 +15,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
-import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
@@ -72,8 +71,8 @@
}
private String getTreeColumnText(XViewerColumn xCol, Object obj) {
- ITableLabelProvider labelProv = (ITableLabelProvider) treeViewer.getLabelProvider();
- return labelProv.getColumnText(obj, xCol.getColumnNum());
+ XViewerLabelProvider labelProv = (XViewerLabelProvider) treeViewer.getLabelProvider();
+ return labelProv.getColumnText(obj, xCol);
}
public int getCompareBasedOnDirection(XViewerColumn sortXCol, int compareInt, Viewer viewer, Object o1, Object o2, int sortXColIndex) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerTextFilter.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerTextFilter.java
index e48ec49..d88ba27 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerTextFilter.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/XViewerTextFilter.java
@@ -37,7 +37,7 @@
if (labelProv == null) labelProv = (ITableLabelProvider) xViewer.getLabelProvider();
for (XViewerColumn xCol : xViewer.getCustomize().getCurrentCustData().getColumnData().getColumns()) {
if (xCol.isShow()) {
- String cellStr = labelProv.getColumnText(element, xCol.getColumnNum());
+ String cellStr = ((XViewerLabelProvider) labelProv).getColumnText(element, xCol);
if (cellStr != null) {
matcher = pattern.matcher(cellStr);
if (matcher.find()) return true;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/ColumnData.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/ColumnData.java
index c59285a..431b503 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/ColumnData.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/ColumnData.java
@@ -43,9 +43,7 @@
xCol.setFromXml(colXml);
xCols.add(xCol);
}
- int x = 0;
- for (XViewerColumn xCol : XViewerCustomize.getColumnOrder(xCols)) {
- xCol.setColumnNum(x++);
+ for (XViewerColumn xCol : xCols) {
columns.add(xCol);
nameToCol.put(xCol.getSystemName(), xCol);
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomize.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomize.java
index d371b3e..4f30e28 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomize.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomize.java
@@ -14,8 +14,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -39,6 +37,7 @@
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.HtmlDialog;
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.XViewerLabelProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.XViewerSorter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.Clipboard;
@@ -105,24 +104,6 @@
}
/**
- * @param xTreeCols
- * @return order of columns based on column number and then system name
- */
- public static List<XViewerColumn> getColumnOrder(Collection<XViewerColumn> xTreeCols) {
- List<XViewerColumn> sortCols = new ArrayList<XViewerColumn>(xTreeCols);
- Collections.sort(sortCols, new Comparator<XViewerColumn>() {
- public int compare(XViewerColumn o1, XViewerColumn o2) {
- if (o1.getOrderNum() == o2.getOrderNum()) {
- return o1.getSystemName().compareTo(o2.getSystemName());
- } else {
- return o1.getOrderNum() - o2.getOrderNum();
- }
- }
- });
- return sortCols;
- }
-
- /**
*
*/
protected void setupMenu() {
@@ -169,8 +150,12 @@
public void run() {
TreeViewerReport tvr = new TreeViewerReport(xViewer);
ArrayList<Integer> ignoreCols = new ArrayList<Integer>();
+ int columnNum = 0;
for (XViewerColumn xCol : xViewer.getCustomize().getCurrentCustData().getColumnData().getColumns()) {
- if (!xCol.isShow()) ignoreCols.add(xCol.getColumnNum());
+ columnNum++;
+ if (!xCol.isShow()) {
+ ignoreCols.add(columnNum);
+ }
}
tvr.setIgnoreColumns(ignoreCols);
tvr.open();
@@ -216,9 +201,8 @@
TreeColumn treeCol = xViewer.getRightClickSelectedColumn();
TreeItem treeItem = xViewer.getRightClickSelectedItem();
if (treeCol != null) {
- XViewerColumn xCol = xViewer.getXTreeColumn(treeCol.getText());
- String data =
- ((ITableLabelProvider) xViewer.getLabelProvider()).getColumnText(treeItem.getData(), xCol.getColumnNum());
+ XViewerColumn xCol = (XViewerColumn) treeCol.getData();
+ String data = ((XViewerLabelProvider) xViewer.getLabelProvider()).getColumnText(treeItem.getData(), xCol);
if (data != null && !data.equals("")) new HtmlDialog(treeCol.getText() + " Data", treeCol.getText() + " Data",
data).open();
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomizeDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomizeDialog.java
index 528ab85..32d1f45 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomizeDialog.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/customize/XViewerCustomizeDialog.java
@@ -534,17 +534,13 @@
*/
private List<XViewerColumn> getConfigCustXViewerColumns() {
List<XViewerColumn> xCols = new ArrayList<XViewerColumn>();
- int x = 0;
for (XViewerColumn xCol : getTableXViewerColumns(visibleColTable)) {
xCol.setShow(true);
- xCol.setOrderNum(x);
- xCol.setColumnNum(x++);
xCol.setXViewer(xViewer);
xCols.add(xCol);
}
for (XViewerColumn xCol : getTableXViewerColumns(hiddenColTable)) {
xCol.setShow(false);
- xCol.setOrderNum(x++);
xCol.setXViewer(xViewer);
xCols.add(xCol);
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/test/XViewerTestFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/test/XViewerTestFactory.java
index 2031fa6..2b328a8 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/test/XViewerTestFactory.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/test/XViewerTestFactory.java
@@ -35,11 +35,9 @@
@Override
public CustomizeData getDefaultTableCustomizeData(XViewer xViewer) {
CustomizeData custData = new CustomizeData();
- int x = 0;
ArrayList<XViewerColumn> cols = new ArrayList<XViewerColumn>();
for (XViewerTestColumns atsXCol : XViewerTestColumns.values()) {
XViewerColumn newCol = atsXCol.getXViewerColumn(atsXCol);
- newCol.setOrderNum(x++);
newCol.setXViewer(xViewer);
cols.add(newCol);
}
