aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2017-10-06 04:46:50 -0400
committerBenoit Maggi2017-10-18 09:44:11 -0400
commit0179002f8011b07b30d4136883d911ff715770dc (patch)
tree6a02fba407a902d2b981b614c6a5272812b7f636
parent0faedf6e769fab5361c7fc70bd99af21b1d42ff0 (diff)
downloadorg.eclipse.papyrus-0179002f8011b07b30d4136883d911ff715770dc.zip
org.eclipse.papyrus-0179002f8011b07b30d4136883d911ff715770dc.tar.gz
org.eclipse.papyrus-0179002f8011b07b30d4136883d911ff715770dc.tar.xz
Bug 522124 - [Property View] Interaction between Component of the
Property View must be easier to do - getter witch return set broke Appearance>Label Customization - removing the getter fix regression (still looks like some fishy introspection is going on) - add FIXME referencing the regression Change-Id: Id148f2edf2eaced4b9e2afdc6537e79df2a79db5 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
-rw-r--r--plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/AbstractPropertyEditor.java50
1 files changed, 24 insertions, 26 deletions
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/AbstractPropertyEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/AbstractPropertyEditor.java
index d644486..31793ef 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/AbstractPropertyEditor.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/AbstractPropertyEditor.java
@@ -520,8 +520,7 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
*/
@Override
public boolean getReadOnly() {
- boolean result = readOnly || !isEditable || getInputObservable() == null;
- return result;
+ return readOnly || !isEditable || getInputObservable() == null;
}
/**
@@ -566,7 +565,6 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
if (input == null || propertyPath == null) {
return null;
}
-
if (listEditor != null) {
return getInputObservableList();
}
@@ -757,15 +755,16 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
return listeningPropertyPaths;
}
- /**
- * Return the HashSet of listening property paths.
- *
- * @return the listeningPropertyPathsSet The HashSet of listening property paths.
- * @since 3.1
- */
- public Set<String> getListeningPropertyPathsSet() {
- return listeningPropertyPathsSet;
- }
+// /** FIXME: this getter introduce a regression
+// See Bug 522124 and https://dev.eclipse.org/mhonarc/lists/mdt-papyrus.dev/msg04151.html
+// * Return the HashSet of listening property paths.
+// *
+// * @return the listeningPropertyPathsSet The HashSet of listening property paths.
+// * @since 3.1
+// */
+// public Set<String> getListeningPropertyPathsSet() {
+// return listeningPropertyPathsSet;
+// }
/**
* Return the listener classes.
@@ -777,15 +776,16 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
return listenerClasses;
}
- /**
- * Return the HashSet of listener classes.
- *
- * @return the listenerClassesSet HashSet of listener classes.
- * @since 3.1
- */
- public Set<IPropertiesListener> getListenerClassesSet() {
- return listenerClassesSet;
- }
+// /**FIXME: this getter introduce a regression
+// See Bug 522124 and https://dev.eclipse.org/mhonarc/lists/mdt-papyrus.dev/msg04151.html
+// * Return the HashSet of listener classes.
+// *
+// * @return the listenerClassesSet HashSet of listener classes.
+// * @since 3.1
+// */
+// public Set<IPropertiesListener> getListenerClassesSet() {
+// return listenerClassesSet;
+// }
/**
* Set the HashSet of listening property paths.
@@ -855,9 +855,7 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
} catch (ClassNotFoundException e) {
Activator.log.error("The listener classes defined in listenerClasses are not correct.", e); //$NON-NLS-1$
- } catch (InstantiationException e) {
- Activator.log.error(e);
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException |IllegalAccessException e) {
Activator.log.error(e);
}
}
@@ -876,8 +874,8 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
final String property = getProperty();
final DataSource input = getInput();
if (null != property && !property.isEmpty() && null != input) {
- Set<String> propertyPathsSet = getListeningPropertyPathsSet();
- Set<IPropertiesListener> classesSet = getListenerClassesSet();
+ Set<String> propertyPathsSet = listeningPropertyPathsSet;
+ Set<IPropertiesListener> classesSet = listenerClassesSet;
if (null != propertyPathsSet && !propertyPathsSet.isEmpty() && null != classesSet && !classesSet.isEmpty()) {
for (String listeningPropertyPath : propertyPathsSet) {