bug 342541: [History View] New Branches column: column widths need some work - rename + additional test

2 files changed, 38 insertions, 3 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java
index bcb2d9cdf..7b43cb59c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java
@@ -645,15 +645,15 @@ public class CVSHistoryTableProvider {
 	}
 
 	private ColumnLayoutData[] getWeightData(int[] widths) {
-		boolean onlyZeroes = true;
+		boolean reset = true;
 		for (int i = 0; i < widths.length; i++) {
 			if (widths[i] > 0) {
-				onlyZeroes = false;
+				reset = false;
 			}
 		}
 		ColumnLayoutData[] ret = new ColumnLayoutData[widths.length];
 		for (int i = 0; i < widths.length; i++) {
-			if (onlyZeroes) {
+			if (reset) {
 				// use same weight for all columns
 				ret[i] = new ColumnWeightData(10, true);
 			} else {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSHisoryTableProviderTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSHisoryTableProviderTest.java
index 23b9681da..9391db539 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSHisoryTableProviderTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSHisoryTableProviderTest.java
@@ -176,6 +176,41 @@ public class CVSHisoryTableProviderTest extends EclipseTest {
 		}
 	}
 
+	public void testHiddenColumn() throws Exception {
+		Display display = Display.getCurrent();
+		Shell shell = new Shell(display);
+		Composite composite = new Composite(shell, SWT.NONE);
+		composite.setLayout(new FillLayout());
+
+		CVSHistoryTableProvider provider = new CVSHistoryTableProvider();
+		// provider.settings = createDialogSettings(...);
+		ReflectionUtils.setField(
+				provider,
+				"settings",
+				createDialogSettings(provider, new int[] { 100, 0, 100, 100,
+						100, 100 }));
+		TreeViewer treeViewer = provider.createTree(composite);
+		Tree tree = treeViewer.getTree();
+		Layout layout = tree.getLayout();
+
+		// layout.getColumns(tree);
+		Item[] items = (Item[]) ReflectionUtils.callMethod(layout,
+				"getColumns", new Class[] { Composite.class },
+				new Object[] { tree });
+		assertEquals(6, items.length);
+
+		// List columns = layout.columns;
+		List/* <ColumnLayoutData> */columns = (List) ReflectionUtils.getField(
+				layout, "columns");
+		ColumnPixelData[] columnsArray = (ColumnPixelData[]) columns.toArray(new ColumnPixelData[0]);
+		assertEquals(100, columnsArray[0].width);
+		assertEquals(0, columnsArray[1].width); // keep user settings
+		assertEquals(100, columnsArray[2].width);
+		assertEquals(100, columnsArray[3].width);
+		assertEquals(100, columnsArray[4].width);
+		assertEquals(100, columnsArray[5].width);
+	}
+
 	private IDialogSettings createDialogSettings(
 			CVSHistoryTableProvider provider, int[] widths) {
 		String sectionName = (String) ReflectionUtils.getField(provider,