Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2013-09-05 13:57:51 +0000
committerVincent Lorenzo2013-09-05 14:14:37 +0000
commitd761ecc300b10390d5c2eb266145f2b9082bc9de (patch)
treeb7e002be0a4cec180875b55f0a6b381961a437f5 /sandbox
parent73f0e782074f676d171ca1aeab3225609f2b361f (diff)
downloadorg.eclipse.papyrus-d761ecc300b10390d5c2eb266145f2b9082bc9de.tar.gz
org.eclipse.papyrus-d761ecc300b10390d5c2eb266145f2b9082bc9de.tar.xz
org.eclipse.papyrus-d761ecc300b10390d5c2eb266145f2b9082bc9de.zip
415754: [Table 2] The label and the icon for existing property of
streotype column is not correct https://bugs.eclipse.org/bugs/show_bug.cgi?id=415754 416626: [Table 2] The order of the columns can't be changed in the dialog Create/Destroy Columns https://bugs.eclipse.org/bugs/show_bug.cgi?id=416626 416627: [Table 2] The dialog to Create/Destroy columns doesn't manage properly existing stereotypes properties columns https://bugs.eclipse.org/bugs/show_bug.cgi?id=416627
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/celleditor/config/FilePropertyCellEditorConfiguration.java5
-rw-r--r--sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/SynchronizedFeatureValueAxisManager.java9
-rw-r--r--sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellEditorConfiguration.java7
3 files changed, 10 insertions, 11 deletions
diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/celleditor/config/FilePropertyCellEditorConfiguration.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/celleditor/config/FilePropertyCellEditorConfiguration.java
index ba171944ca3..421461e682f 100644
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/celleditor/config/FilePropertyCellEditorConfiguration.java
+++ b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/celleditor/config/FilePropertyCellEditorConfiguration.java
@@ -34,11 +34,6 @@ public class FilePropertyCellEditorConfiguration extends EStructuralFeatureEdito
}
@Override
- public String getEditorId() {
- return super.getEditorId();
- }
-
- @Override
protected IComboBoxDataProvider getComboDataProvider(Table table, Object axisElement, ITableAxisElementProvider elementProvider) {
return super.getComboDataProvider(table, axisElement, elementProvider);
}
diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/SynchronizedFeatureValueAxisManager.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/SynchronizedFeatureValueAxisManager.java
index 0d6fab4fb35..df38aa0a10e 100644
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/SynchronizedFeatureValueAxisManager.java
+++ b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/SynchronizedFeatureValueAxisManager.java
@@ -13,7 +13,6 @@
*****************************************************************************/
package org.eclipse.papyrus.views.properties.table.axis;
-import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
@@ -23,7 +22,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager;
+import org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
@@ -35,13 +34,13 @@ import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
* @author Camille Letavernier
*
*/
-public class SynchronizedFeatureValueAxisManager extends AbstractSynchronizedOnFeatureAxisManager {
+public class SynchronizedFeatureValueAxisManager extends AbstractSynchronizedOnEStructuralFeatureAxisManager {
public static final String AXIS_MANAGER_ID = "org.eclipse.papyrus.emf.nattable.synchronized.featurevalue.axis.manager"; //$NON-NLS-1$
@Override
- public Collection<Object> getAllManagedAxis() {
- Collection<Object> result = new LinkedList<Object>();
+ public List<Object> getAllManagedAxis() {
+ List<Object> result = new LinkedList<Object>();
EStructuralFeatureValueFillingConfiguration config = null;
for(final IAxisConfiguration current : this.representedAxisManager.getSpecificAxisConfigurations()) {
diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellEditorConfiguration.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellEditorConfiguration.java
index f18ac497bdf..49ed8bc76ed 100644
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellEditorConfiguration.java
+++ b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellEditorConfiguration.java
@@ -70,7 +70,7 @@ public class DerivedUMLPropertiesCellEditorConfiguration extends AbstractCellEdi
};
}
- public String getEditorId() {
+ public String getEditorConfigId() {
return DerivedUMLPropertiesAxisManager.MULTIPLICITY;
}
@@ -83,4 +83,9 @@ public class DerivedUMLPropertiesCellEditorConfiguration extends AbstractCellEdi
return "Specific editor for Multiplicities";
}
+ @Override
+ public IDisplayConverter getDisplayConvert(Table table, Object axisElement, ILabelProvider provider) {
+ return null;
+ }
+
}

Back to the top