Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Motsch2018-04-12 09:09:42 +0000
committerIvan Motsch2018-04-12 09:09:42 +0000
commitcdf8981bfe392e29c90be93b84193a60b40b808c (patch)
tree42f3bc38fbe5387366912f6958dabc17651e10af
parent1ddcc02e3b22f13adaf60035dbb0361993c79744 (diff)
downloadorg.eclipse.scout.rt-cdf8981bfe392e29c90be93b84193a60b40b808c.tar.gz
org.eclipse.scout.rt-cdf8981bfe392e29c90be93b84193a60b40b808c.tar.xz
org.eclipse.scout.rt-cdf8981bfe392e29c90be93b84193a60b40b808c.zip
Fix obvious copy/paste code in VirtualDesktop
Signed-off-by: Ivan Motsch <ivan.motsch@bsiag.com>
-rw-r--r--org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/internal/VirtualDesktop.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/internal/VirtualDesktop.java b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/internal/VirtualDesktop.java
index 0a61320500..54cf2c2870 100644
--- a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/internal/VirtualDesktop.java
+++ b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/internal/VirtualDesktop.java
@@ -106,10 +106,10 @@ public class VirtualDesktop implements IDesktop {
@Override
public void removePropertyChangeListener(PropertyChangeListener listener) {
- for (Iterator<EventListenerList> it = m_dataChangeListenerMap.values().iterator(); it.hasNext();) {
+ for (Iterator<EventListenerList> it = m_propertyChangeListenerMap.values().iterator(); it.hasNext();) {
EventListenerList list = it.next();
list.remove(PropertyChangeListener.class, listener);
- if (list.getListenerCount(DataChangeListener.class) == 0) {
+ if (list.getListenerCount(PropertyChangeListener.class) == 0) {
it.remove();
}
}
@@ -117,11 +117,11 @@ public class VirtualDesktop implements IDesktop {
@Override
public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
- for (Iterator<EventListenerList> it = m_dataChangeListenerMap.values().iterator(); it.hasNext();) {
- EventListenerList list = it.next();
+ EventListenerList list = m_propertyChangeListenerMap.get(propertyName);
+ if (list != null) {
list.remove(PropertyChangeListener.class, listener);
- if (list.getListenerCount(DataChangeListener.class) == 0) {
- it.remove();
+ if (list.getListenerCount(PropertyChangeListener.class) == 0) {
+ m_propertyChangeListenerMap.remove(propertyName);
}
}
}

Back to the top