summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Becker2011-09-27 05:34:42 (EDT)
committerJuergen Becker2011-09-27 05:34:42 (EDT)
commitf12e52c86e9588d5285831fc4bef5e168b9d677c (patch)
treef38f8a73878afdab60c098d19e63d5f2d1f3b5f3
parent5523b22f845fa2ab12f42151e9707204c197aadb (diff)
downloadorg.eclipse.riena-f12e52c86e9588d5285831fc4bef5e168b9d677c.zip
org.eclipse.riena-f12e52c86e9588d5285831fc4bef5e168b9d677c.tar.gz
org.eclipse.riena-f12e52c86e9588d5285831fc4bef5e168b9d677c.tar.bz2
Fixes a bug on OS X/Linux, where hidden/internal controls (for toolbars) are assigned a ridget id, causing an exception during updateBindings(). Riena Bug #333146
-rw-r--r--org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/uibinding/DefaultBindingManager.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/uibinding/DefaultBindingManager.java b/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/uibinding/DefaultBindingManager.java
index 7a146f6..c82f0c5 100644
--- a/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/uibinding/DefaultBindingManager.java
+++ b/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/uibinding/DefaultBindingManager.java
@@ -16,8 +16,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.eclipse.core.runtime.Assert;
-
import org.eclipse.riena.core.util.ReflectionFailure;
import org.eclipse.riena.core.wire.Wire;
import org.eclipse.riena.internal.ui.ridgets.Activator;
@@ -180,8 +178,9 @@ public class DefaultBindingManager implements IBindingManager {
}
} else {
final IRidget ridget = getRidget(bindingProperty, controller);
- Assert.isNotNull(ridget, "Null ridget for property: " + bindingProperty); //$NON-NLS-1$
- bindRidget(ridget, control, unbind);
+ if (ridget != null) {
+ bindRidget(ridget, control, unbind);
+ }
}
}
}