493143: TreeViewerColumnBuilder does not use custom weight for firstcol

Change-Id: Id057e17fe2c02964280a99899e652df7ff27ffe2 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=493143
eclipse-emf-parsley · May 7, 2016 · 0e4b033 · 0e4b033
1 parent 09b62c2
commit 0e4b033
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/...lipse.emf.parsley.common/src/org/eclipse/emf/parsley/viewers/TreeViewerColumnBuilder.java b/...lipse.emf.parsley.common/src/org/eclipse/emf/parsley/viewers/TreeViewerColumnBuilder.java
@@ -96,20 +96,22 @@ protected void buildTreeViewer(TreeViewer treeViewer, EClass eClass, List<EStruc
 		Layout layout = layoutHelper.adjustForTableLayout(treeViewer);
 
 		int i = 0;
-
-		createMainTreeViewerColumn(treeViewer, layout, defaultWeight);
+		createMainTreeViewerColumn(treeViewer, layout, customWeightOrDefaultWeight(i++));
 
 		for (EStructuralFeature eStructuralFeature : typeFeatures) {
-			int weight = defaultWeight;
-			if (weights.size() > i) {
-				weight = weights.get(i++);
-			}
-
 			buildTreeViewerColumn(treeViewer, layout,
 				(eClass != null ? eClass : eStructuralFeature.getEContainingClass()),
 				eStructuralFeature,
-				weight);
+				customWeightOrDefaultWeight(i++));
+		}
+	}
+
+	private int customWeightOrDefaultWeight(int i) {
+		int weight = defaultWeight;
+		if (weights.size() > i) {
+			weight = weights.get(i);
 		}
+		return weight;
 	}
 
 	protected TreeViewerColumn buildTreeViewerColumn(TreeViewer treeViewer, Layout layout, EClass eClass,

diff --git a/...pse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/TreeViewerColumnBuilderTest.xtend b/...pse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/TreeViewerColumnBuilderTest.xtend
@@ -94,17 +94,18 @@ class TreeViewerColumnBuilderTest extends AbstractViewerTest {
 		buildAndFillTreeViewer(
 			createInjector(new EmfParsleyGuiceModuleForTesting() {
 				override valueTableColumnWeights() {
-					#[5, 2]
+					#[5, 2, 4]
 				}
 			}),
 			testContainer.classesForControls,
 			testPackage.classForControls
 		)
 		syncExecVoid[
 			treeViewer.tree.getLayout.tableLayoutColumnData => [
-				// the first column is the tree so we skip it
-				get(1).assertColumnWeight(5)
-				get(2).assertColumnWeight(2)
+				// the first column is the tree
+				get(0).assertColumnWeight(5)
+				get(1).assertColumnWeight(2)
+				get(2).assertColumnWeight(4)
 				// 3 is the default one
 				get(3).assertColumnWeight(3)
 			]