From 87c57c60c3d17a57b9dc659bf795dab24edd0177 Mon Sep 17 00:00:00 2001
From: Vincent Lorenzo
Date: Wed, 17 Jul 2013 10:15:55 +0200
Subject: 401764: [Table 2] The classes managing the table model and Nattable
 must be refactored https://bugs.eclipse.org/bugs/show_bug.cgi?id=401764

In AbstractCellManager : 
	the method getValue is now in final
	the developpers must override the method doGetValue---
 .../ws/preferences/manager/cell/PreferencesCellManager.java         | 6 +++---
 .../properties/table/axis/DerivedUMLPropertiesAxisManager.java      | 5 +++++
 .../properties/table/cell/DerivedUMLPropertiesCellManager.java      | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'sandbox')

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/cell/PreferencesCellManager.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/cell/PreferencesCellManager.java
index aac44eda215..8ee72f89d62 100644
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/cell/PreferencesCellManager.java
+++ b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/cell/PreferencesCellManager.java
@@ -38,7 +38,7 @@ public class PreferencesCellManager extends AbstractCellManager {
 	}
 
 	@Override
-	public Object getValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {
 		final List<Object> elements = organizedAndResolvedValue(columnElement, rowElement);
 		Properties prop = new Properties();
 		FileInputStream fis = null;
@@ -111,8 +111,8 @@ public class PreferencesCellManager extends AbstractCellManager {
 	}
 
 	@Override
-	public boolean isCellEditable(Object obj1, Object obj2) {
-		final List<Object> elements = organizedAndResolvedValue(obj1, obj2);
+	public boolean isCellEditable(Object columnElement, Object rowElement) {
+		final List<Object> elements = organizedAndResolvedValue(columnElement, rowElement);
 		Properties prop = new Properties();
 		FileInputStream fis = null;
 		try {
diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/DerivedUMLPropertiesAxisManager.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/DerivedUMLPropertiesAxisManager.java
index aa5cab2eff1..7c696ca2701 100644
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/DerivedUMLPropertiesAxisManager.java
+++ b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/DerivedUMLPropertiesAxisManager.java
@@ -51,4 +51,9 @@ public class DerivedUMLPropertiesAxisManager extends AbstractAxisManager {
 		return null;
 	}
 
+	@Override
+	public boolean canBeSavedAsConfig() {
+		return false;
+	}
+
 }
diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellManager.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellManager.java
index d2dbfa4a755..5e6639ff674 100644
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellManager.java
+++ b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellManager.java
@@ -46,7 +46,8 @@ public class DerivedUMLPropertiesCellManager extends AbstractCellManager impleme
 	/**
 	 * {@inheritDoc}
 	 */
-	public Object getValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+	@Override
+	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {
 		MultiplicityElement element = getMultiplicityElement(columnElement, rowElement);
 		if(element == null) {
 			return null;
-- 
cgit v1.2.3