diff options
| author | Alexander Kurtakov | 2016-02-11 10:15:59 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2016-02-11 10:15:59 +0000 |
| commit | f2df2060979ba4c8ef9b181dc2b52ef3840b2444 (patch) | |
| tree | 3548ebcca7507c2a6658e190722dd53b62388cce /bundles | |
| parent | c791930f17fe9fa72f453e115c84c60c6e0cdf78 (diff) | |
| download | eclipse.platform.swt-f2df2060979ba4c8ef9b181dc2b52ef3840b2444.tar.gz eclipse.platform.swt-f2df2060979ba4c8ef9b181dc2b52ef3840b2444.tar.xz eclipse.platform.swt-f2df2060979ba4c8ef9b181dc2b52ef3840b2444.zip | |
Bug 487645 - Remove pre Java 1.7 workarounds
Java 1.7 is a prereq so no need for this guard.
Change-Id: Ic63114afc61c82f120abb2a5526dfdb0330f93a1
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java | 16 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java index f73f9261a4..9852f995f3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java @@ -249,15 +249,13 @@ public static Frame new_Frame (final Composite parent) { }); break; case SWT.Resize: - if (Library.JAVA_VERSION >= Library.JAVA_VERSION(1, 6, 0)) { - final Rectangle clientArea = parent.getClientArea(); - EventQueue.invokeLater(new Runnable () { - @Override - public void run () { - frame.setSize (clientArea.width, clientArea.height); - } - }); - } + final Rectangle clientArea = parent.getClientArea(); + EventQueue.invokeLater(new Runnable () { + @Override + public void run () { + frame.setSize (clientArea.width, clientArea.height); + } + }); break; } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java index 642aa57fc8..629009edde 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java @@ -2760,7 +2760,7 @@ protected void init () { * versions of Java starting at JDK 1.6 set the icon in the * executable instead of leaving the default. */ - if (!OS.IsWinCE && Library.JAVA_VERSION >= Library.JAVA_VERSION (1, 6, 0)) { + if (!OS.IsWinCE) { TCHAR lpszFile = new TCHAR (0, OS.MAX_PATH); while (OS.GetModuleFileName (0, lpszFile, lpszFile.length ()) == lpszFile.length ()) { lpszFile = new TCHAR (0, lpszFile.length () + OS.MAX_PATH); |