diff options
author | Alexander Kurtakov | 2016-01-07 19:15:42 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2016-01-07 19:15:42 +0000 |
commit | db81cae862c88eaf5211866cce13b638beb646e8 (patch) | |
tree | 5f325c604e9a5a6c386a4f70353e442fdde1db13 /bundles/org.eclipse.swt/Eclipse SWT AWT | |
parent | 62396e7f197b93c20522ab3007183e0650d01964 (diff) | |
download | eclipse.platform.swt-db81cae862c88eaf5211866cce13b638beb646e8.tar.gz eclipse.platform.swt-db81cae862c88eaf5211866cce13b638beb646e8.tar.xz eclipse.platform.swt-db81cae862c88eaf5211866cce13b638beb646e8.zip |
Bug 485369 - Remove pre Java 1.5 workarounds
There are few code branches for pre Java 1.5, that serve no purpose
nowadays as SWT require 1.5 or newer.
Change-Id: Ieb5d4ce0da8407d32b907b71d1721ef07bf11f18
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT AWT')
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java | 46 |
1 files changed, 13 insertions, 33 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java index 7a815ee1db..a61d2cde26 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java @@ -263,51 +263,31 @@ public static Frame new_Frame (final Composite parent) { case SWT.Activate: EventQueue.invokeLater(new Runnable () { public void run () { - if (Library.JAVA_VERSION < Library.JAVA_VERSION(1, 4, 0)) { - frame.dispatchEvent (new WindowEvent (frame, WindowEvent.WINDOW_ACTIVATED)); - frame.dispatchEvent (new FocusEvent (frame, FocusEvent.FOCUS_GAINED)); - } else if (Library.JAVA_VERSION < Library.JAVA_VERSION(1, 5, 0)) { - frame.dispatchEvent (new WindowEvent (frame, WindowEvent.WINDOW_ACTIVATED)); - frame.dispatchEvent (new WindowEvent (frame, 207 /*WindowEvent.WINDOW_GAINED_FOCUS*/)); - } else { - if (frame.isActive()) return; - try { - Class<?> clazz = frame.getClass(); - Method method = clazz.getMethod("synthesizeWindowActivation", boolean.class); - if (method != null) method.invoke(frame, Boolean.TRUE); - } catch (Throwable e) {} - } + if (frame.isActive()) return; + try { + Class<?> clazz = frame.getClass(); + Method method = clazz.getMethod("synthesizeWindowActivation", boolean.class); + if (method != null) method.invoke(frame, Boolean.TRUE); + } catch (Throwable e) {} } }); break; case SWT.Deactivate: EventQueue.invokeLater(new Runnable () { public void run () { - if (Library.JAVA_VERSION < Library.JAVA_VERSION(1, 4, 0)) { - frame.dispatchEvent (new WindowEvent (frame, WindowEvent.WINDOW_DEACTIVATED)); - frame.dispatchEvent (new FocusEvent (frame, FocusEvent.FOCUS_LOST)); - } else if (Library.JAVA_VERSION < Library.JAVA_VERSION(1, 5, 0)) { - frame.dispatchEvent (new WindowEvent (frame, 208 /*WindowEvent.WINDOW_LOST_FOCUS*/)); - frame.dispatchEvent (new WindowEvent (frame, WindowEvent.WINDOW_DEACTIVATED)); - } else { - if (!frame.isActive()) return; - try { - Class<?> clazz = frame.getClass(); - Method method = clazz.getMethod("synthesizeWindowActivation", boolean.class); - if (method != null) method.invoke(frame, Boolean.FALSE); - } catch (Throwable e) {} - } + if (!frame.isActive()) return; + try { + Class<?> clazz = frame.getClass(); + Method method = clazz.getMethod("synthesizeWindowActivation", boolean.class); + if (method != null) method.invoke(frame, Boolean.FALSE); + } catch (Throwable e) {} } }); break; } } }; - if (Library.JAVA_VERSION < Library.JAVA_VERSION(1, 5, 0)) { - parent.addListener (SWT.Activate, listener); - } else { - parent.addListener (SWT.FocusIn, listener); - } + parent.addListener (SWT.FocusIn, listener); parent.addListener (SWT.Deactivate, listener); parent.addListener (SWT.Dispose, listener); |