Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2017-08-04 14:40:33 +0000
committervincent lorenzo2017-08-08 09:51:01 +0000
commita8eff70353f9eed43cef212267a0117c458ab575 (patch)
treebf45dce421caf8498e7482e74aec80e41a7cc3a2 /plugins/infra/nattable
parentdf6704233ea18a2485de2709a6647ab9205cdba9 (diff)
downloadorg.eclipse.papyrus-a8eff70353f9eed43cef212267a0117c458ab575.tar.gz
org.eclipse.papyrus-a8eff70353f9eed43cef212267a0117c458ab575.tar.xz
org.eclipse.papyrus-a8eff70353f9eed43cef212267a0117c458ab575.zip
Bug 520566: [Matrix][Table] the second columns sources for Matrix is not persisted
- fix the initial bug - fix the same bug for row sources - fix a bug when there are several column sources : we made list = new list instead of list.addAll(newList) - fix undo/redo refresh in the property view Change-Id: I68dcefbb931fc13c49204e67d7f0bf7b31e5e57b Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Diffstat (limited to 'plugins/infra/nattable')
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectColumnMatrixAxisManager.java4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectColumnMatrixAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectColumnMatrixAxisManager.java
index 5d07f0e9f5c..115899fb2c0 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectColumnMatrixAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectColumnMatrixAxisManager.java
@@ -8,7 +8,7 @@
*
* Contributors:
* Vincent Lorenzo (CEA-LIST) - vincent.lorenzo@cea.fr - Initial API and implementation
- *
+ * Vincent Lorenzo (CEA-LIST) - bug 520566
*****************************************************************************/
package org.eclipse.papyrus.infra.emf.nattable.manager.axis;
@@ -509,7 +509,7 @@ public class EObjectColumnMatrixAxisManager extends AbstractSynchronizedOnEStruc
List<Object> allAxisToDisplay = new ArrayList<Object>();
for (final IWrapper current : ((IMasterAxisProvider) getTableManager().getTable().getCurrentColumnAxisProvider()).getSources()) {
- allAxisToDisplay = getListenFeatureValueFor((EObject) current.getElement());
+ allAxisToDisplay.addAll(getListenFeatureValueFor((EObject) current.getElement()));
}
List<Object> toAdd = new ArrayList<Object>(allAxisToDisplay);
toAdd.removeAll(this.managedObject);
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java
index 9e6eab56298..23d089f118d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java
@@ -93,7 +93,7 @@ public class FillingConfigurationUtils {
* an axis manager representation
* @return
* the list of {@link TreeFillingConfiguration} to use for the representedAxisManager defined as column axis manager
- * @since 3.1
+ * @since 4.0
*/
public static final List<TreeFillingConfiguration> getTreeFillingConfigurationForColumn(final Table table, final AxisManagerRepresentation representedAxisManager) {
Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

Back to the top