diff options
Diffstat (limited to 'sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java')
| -rw-r--r-- | sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java index ad78005cb9c..e270e277d18 100644 --- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java +++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java @@ -39,17 +39,17 @@ public class NattableWidgetPropertyTester extends PropertyTester { if(IS_NATTABLE_WIDGET.equals(property) && expectedValue instanceof Boolean) {
return expectedValue.equals(manager != null);
}
- if(manager != null) {
- if(HAS_FEATURE_ROW_HEADER_CONFIGURATION.equals(property) && expectedValue instanceof Boolean) {
+ if(manager != null && expectedValue instanceof Boolean) {
+ if(HAS_FEATURE_ROW_HEADER_CONFIGURATION.equals(property)) {
LabelConfigurationManagementUtils.getRowFeatureLabelConfigurationInTable(manager.getTable());
return expectedValue.equals(LabelConfigurationManagementUtils.hasRowFeatureLabelConfiguration(manager.getTable()));
- } else if(HAS_FEATURE_COLUMN_HEADER_CONFIGURATION.equals(property) && expectedValue instanceof Boolean) {
+ } else if(HAS_FEATURE_COLUMN_HEADER_CONFIGURATION.equals(property)) {
return expectedValue.equals(LabelConfigurationManagementUtils.hasColumnFeatureLabelConfiguration(manager.getTable()));
- } else if(HAS_SLAVE_COLUMNS_AXIS_PROVIDER.equals(property) && expectedValue instanceof Boolean) {
+ } else if(HAS_SLAVE_COLUMNS_AXIS_PROVIDER.equals(property)) {
return expectedValue.equals(AxisUtils.getAxisProviderUsedForColumns(manager) instanceof ISlaveAxisProvider);
- } else if(HAS_SLAVE_ROWS_AXIS_PROVIDER.equals(property) && expectedValue instanceof Boolean) {
+ } else if(HAS_SLAVE_ROWS_AXIS_PROVIDER.equals(property)) {
return expectedValue.equals(AxisUtils.getAxisProviderUsedForRows(manager) instanceof ISlaveAxisProvider);
- } else if(CAN_INVERT_AXIS.equals(property) && expectedValue instanceof Boolean) {
+ } else if(CAN_INVERT_AXIS.equals(property)) {
return expectedValue.equals(manager.canInvertAxis());
}
}
|