Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2013-07-17 04:15:55 -0400
committerVincent Lorenzo2013-07-17 04:15:55 -0400
commit87c57c60c3d17a57b9dc659bf795dab24edd0177 (patch)
treed069cca265557d8df1730b6d3638251e07efd94e /sandbox
parent8e8c38056a11a5b00fe91be7ea33d8a342cfeea3 (diff)
downloadorg.eclipse.papyrus-87c57c60c3d17a57b9dc659bf795dab24edd0177.tar.gz
org.eclipse.papyrus-87c57c60c3d17a57b9dc659bf795dab24edd0177.tar.xz
org.eclipse.papyrus-87c57c60c3d17a57b9dc659bf795dab24edd0177.zip
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
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/cell/PreferencesCellManager.java6
-rw-r--r--sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/DerivedUMLPropertiesAxisManager.java5
-rw-r--r--sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellManager.java3
3 files changed, 10 insertions, 4 deletions
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;

Back to the top