diff options
| author | Steve Northover <steve> | 2005-11-07 16:49:21 +0000 |
|---|---|---|
| committer | Steve Northover <steve> | 2005-11-07 16:49:21 +0000 |
| commit | 93775a1fbc788cf9a4bee043883199be184003c2 (patch) | |
| tree | 64ada1ea8634ea80e00749621c8a8bae12660886 /bundles/org.eclipse.swt | |
| parent | ee2558f9e4d4629a5c86ee2f982b0dfe01202831 (diff) | |
| download | eclipse.platform.swt-93775a1fbc788cf9a4bee043883199be184003c2.tar.gz eclipse.platform.swt-93775a1fbc788cf9a4bee043883199be184003c2.tar.xz eclipse.platform.swt-93775a1fbc788cf9a4bee043883199be184003c2.zip | |
fix formatting, reorder return to happen first to avoid another test
Diffstat (limited to 'bundles/org.eclipse.swt')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java index dabec138a6..a7bc78646f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java @@ -3194,14 +3194,6 @@ public void setData (String key, Object value) { checkDevice (); if (key == null) error (SWT.ERROR_NULL_ARGUMENT); - if (key.equals (ADD_WIDGET_KEY)) { - Object [] data = (Object [])value; - int /*long*/ handle = ((LONG)data [0]).value; - Widget widget = (Widget)data [1]; - if (widget == null) removeWidget (handle); - else addWidget (handle, widget); - } - if (key.equals (DISPATCH_EVENT_KEY)) { if (value == null || value instanceof int []) { dispatchEvents = (int []) value; @@ -3209,6 +3201,17 @@ public void setData (String key, Object value) { return; } } + + if (key.equals (ADD_WIDGET_KEY)) { + Object [] data = (Object []) value; + int /*long*/ handle = ((LONG) data [0]).value; + Widget widget = (Widget) data [1]; + if (widget != null) { + addWidget (handle, widget); + } else { + removeWidget (handle); + } + } /* Remove the key/value pair */ if (value == null) { |