From 3a3dcb0f885a097fc8075ddab618e6f780e38ee7 Mon Sep 17 00:00:00 2001
From: Lukas Ladenberger
Date: Wed, 28 Mar 2012 13:58:21 +0200
Subject: column width is now refreshed after configured in column
 configuration wizard + added test

---
 .../configuration/provider/ColumnItemProvider.java        |  9 +++------
 .../tests/ProrSpecViewConfigurationTest.java              | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/org.eclipse.rmf.pror.reqif10.edit/src/org/eclipse/rmf/pror/reqif10/configuration/provider/ColumnItemProvider.java b/org.eclipse.rmf.pror.reqif10.edit/src/org/eclipse/rmf/pror/reqif10/configuration/provider/ColumnItemProvider.java
index e24ec718..6d2d8773 100644
--- a/org.eclipse.rmf.pror.reqif10.edit/src/org/eclipse/rmf/pror/reqif10/configuration/provider/ColumnItemProvider.java
+++ b/org.eclipse.rmf.pror.reqif10.edit/src/org/eclipse/rmf/pror/reqif10/configuration/provider/ColumnItemProvider.java
@@ -30,7 +30,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.rmf.pror.reqif10.configuration.Column;
 import org.eclipse.rmf.pror.reqif10.configuration.ConfigPackage;
 import org.eclipse.rmf.pror.reqif10.configuration.ProrSpecViewConfiguration;
@@ -162,8 +161,9 @@ public class ColumnItemProvider
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		switch (notification.getFeatureID(Column.class)) {
-			case ConfigPackage.COLUMN__LABEL:
+		int featureID = notification.getFeatureID(Column.class);
+		if (featureID == ConfigPackage.COLUMN__LABEL
+				|| featureID == ConfigPackage.COLUMN__WIDTH) {
 			// inform the parent
 			InternalEObject parent = (InternalEObject) ((EObject) notification
 					.getNotifier()).eContainer();
@@ -174,9 +174,6 @@ public class ColumnItemProvider
 						ConfigPackage.Literals.PROR_SPEC_VIEW_CONFIGURATION__COLUMNS,
 						notification.getNotifier(), notification.getNotifier()));
 			}
-			case ConfigPackage.COLUMN__WIDTH:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
 		}
 		super.notifyChanged(notification);
 	}
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java b/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java
index b4b933bf..deaa1a0c 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java
+++ b/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.rmf.reqif10.configuration.tests;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.eclipse.rmf.pror.reqif10.configuration.Column;
 import org.eclipse.rmf.pror.reqif10.configuration.ConfigFactory;
@@ -70,6 +70,19 @@ public class ProrSpecViewConfigurationTest extends AbstractItemProviderTest {
 		getItemProvider(getFixture()).addListener(listener);
 		setViaCommand(column, ConfigPackage.Literals.COLUMN__LABEL, "Bar");
 		assertEquals(1, notifications.size());
+		assertEquals("Bar", column.getLabel());
+	}
+
+	@Test
+	public void testResizeColumn() {
+		Column column = ConfigFactory.eINSTANCE.createColumn();
+		column.setLabel("Foo");
+		column.setWidth(50);
+		getFixture().getColumns().add(column);
+		getItemProvider(getFixture()).addListener(listener);
+		setViaCommand(column, ConfigPackage.Literals.COLUMN__WIDTH, 100);
+		assertEquals(1, notifications.size());
+		assertEquals(100, column.getWidth());
 	}
 
 } //ProrSpecViewConfigurationTest
-- 
cgit v1.2.3