Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Liem PHAN2017-12-01 16:38:13 +0000
committervincent lorenzo2017-12-13 09:39:41 +0000
commit9e0e11f6bf5ca4222f9eefcfd4f65b0307e18636 (patch)
treec56f661e9b1569da24322b86633bfdb9267bb227 /plugins/infra
parentf6a57394b636e9b6bc34eb249f89b1120aeb4a43 (diff)
downloadorg.eclipse.papyrus-9e0e11f6bf5ca4222f9eefcfd4f65b0307e18636.tar.gz
org.eclipse.papyrus-9e0e11f6bf5ca4222f9eefcfd4f65b0307e18636.tar.xz
org.eclipse.papyrus-9e0e11f6bf5ca4222f9eefcfd4f65b0307e18636.zip
Bug 527734: [Table] [Properties View] radio button "display icon" in
column header did not work https://bugs.eclipse.org/bugs/show_bug.cgi?id=527734 - Correct functions of "Display icon" and "Display label" for column and row header style label in the Properties view Change-Id: I9cc5c963b9c1edcee3f53c4de581c598a1096880 Signed-off-by: Thanh Liem PHAN <thanhliem.phan@all4tec.net>
Diffstat (limited to 'plugins/infra')
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
index cb8341996fc..2b6ffeb1e21 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2013, 2017 CEA LIST.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,7 +9,7 @@
*
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
+ * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 527734
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.command;
@@ -205,7 +205,7 @@ public class TableCommands {
final AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(table);
EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
- if (!table.isInvertAxis()) {
+ if (table.isInvertAxis()) {
axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
}
@@ -228,9 +228,9 @@ public class TableCommands {
private static final ICommand getRegisterLocalRowLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {
AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);
- EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+ EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
if (table.isInvertAxis()) {
- axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+ axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
}
final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
@@ -268,14 +268,14 @@ public class TableCommands {
} else if (headerAxisConfigurationUsedInTable instanceof TableHeaderAxisConfiguration) {
// we can't edit it, because it's comes from the initial configuration
localConfig = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) headerAxisConfigurationUsedInTable);
- final IEditCommandRequest request = new SetRequest(domain, table, axisConfigurationFeature, headerAxisConfigurationUsedInTable);
+ final IEditCommandRequest request = new SetRequest(domain, table, axisConfigurationFeature, localConfig);
final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
cmd.add(provider.getEditCommand(request));
}
// 2. this one must store the new label configuration
- final IEditCommandRequest request = new SetRequest(domain, headerAxisConfigurationUsedInTable, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);
- final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(headerAxisConfigurationUsedInTable);
+ final IEditCommandRequest request = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);
+ final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(localConfig);
cmd.add(provider.getEditCommand(request));
// 3. we must get or create the AxisManagerConfiguration(s)

Back to the top