From 67c7dd27785689515be374c77e972ee8b430768b Mon Sep 17 00:00:00 2001 From: Deepika Udayagiri Date: Tue, 6 Jun 2023 12:08:44 +0530 Subject: [PATCH 01/24] POM and product version changes for 4.29 release Tracked https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1100 --- bundles/org.eclipse.swt.tools.base/pom.xml | 2 +- bundles/org.eclipse.swt.tools.spies/pom.xml | 2 +- bundles/org.eclipse.swt.tools/pom.xml | 2 +- bundles/org.eclipse.swt/pom.xml | 2 +- examples/org.eclipse.swt.examples.browser.demos/pom.xml | 2 +- examples/org.eclipse.swt.examples.launcher/pom.xml | 2 +- examples/org.eclipse.swt.examples.ole.win32/pom.xml | 2 +- examples/org.eclipse.swt.examples.views/pom.xml | 2 +- examples/org.eclipse.swt.examples/pom.xml | 2 +- features/org.eclipse.swt.tools.feature/pom.xml | 2 +- local-build/local-build-parent/pom.xml | 2 +- local-build/org.eclipse.swt.fragments.localbuild/pom.xml | 2 +- pom.xml | 2 +- tests/org.eclipse.swt.tests.cocoa/pom.xml | 2 +- tests/org.eclipse.swt.tests.gtk/pom.xml | 2 +- tests/org.eclipse.swt.tests.win32/pom.xml | 2 +- tests/org.eclipse.swt.tests/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bundles/org.eclipse.swt.tools.base/pom.xml b/bundles/org.eclipse.swt.tools.base/pom.xml index e08efdc8cb7..05919c0435a 100644 --- a/bundles/org.eclipse.swt.tools.base/pom.xml +++ b/bundles/org.eclipse.swt.tools.base/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt diff --git a/bundles/org.eclipse.swt.tools.spies/pom.xml b/bundles/org.eclipse.swt.tools.spies/pom.xml index e7021c3cd43..79abc57f7bd 100644 --- a/bundles/org.eclipse.swt.tools.spies/pom.xml +++ b/bundles/org.eclipse.swt.tools.spies/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt diff --git a/bundles/org.eclipse.swt.tools/pom.xml b/bundles/org.eclipse.swt.tools/pom.xml index 13c7f071866..25d6d0e6e5f 100644 --- a/bundles/org.eclipse.swt.tools/pom.xml +++ b/bundles/org.eclipse.swt.tools/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index bc16c4978b8..339f5c5f407 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -16,7 +16,7 @@ eclipse.platform.swt eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../ org.eclipse.swt diff --git a/examples/org.eclipse.swt.examples.browser.demos/pom.xml b/examples/org.eclipse.swt.examples.browser.demos/pom.xml index e781a5a2649..2a77981e455 100644 --- a/examples/org.eclipse.swt.examples.browser.demos/pom.xml +++ b/examples/org.eclipse.swt.examples.browser.demos/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt diff --git a/examples/org.eclipse.swt.examples.launcher/pom.xml b/examples/org.eclipse.swt.examples.launcher/pom.xml index 26e70a4f018..b1b857432b3 100644 --- a/examples/org.eclipse.swt.examples.launcher/pom.xml +++ b/examples/org.eclipse.swt.examples.launcher/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt diff --git a/examples/org.eclipse.swt.examples.ole.win32/pom.xml b/examples/org.eclipse.swt.examples.ole.win32/pom.xml index f6832378f14..ced2183c6ed 100644 --- a/examples/org.eclipse.swt.examples.ole.win32/pom.xml +++ b/examples/org.eclipse.swt.examples.ole.win32/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../ org.eclipse.swt diff --git a/examples/org.eclipse.swt.examples.views/pom.xml b/examples/org.eclipse.swt.examples.views/pom.xml index 26e192968a1..76937fdd4af 100644 --- a/examples/org.eclipse.swt.examples.views/pom.xml +++ b/examples/org.eclipse.swt.examples.views/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt diff --git a/examples/org.eclipse.swt.examples/pom.xml b/examples/org.eclipse.swt.examples/pom.xml index 0090688d0b9..01f956d5103 100644 --- a/examples/org.eclipse.swt.examples/pom.xml +++ b/examples/org.eclipse.swt.examples/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt diff --git a/features/org.eclipse.swt.tools.feature/pom.xml b/features/org.eclipse.swt.tools.feature/pom.xml index 6c80df406b6..b22e59ba034 100644 --- a/features/org.eclipse.swt.tools.feature/pom.xml +++ b/features/org.eclipse.swt.tools.feature/pom.xml @@ -15,7 +15,7 @@ eclipse.platform.swt eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../ org.eclipse.swt.tools.feature diff --git a/local-build/local-build-parent/pom.xml b/local-build/local-build-parent/pom.xml index 54b955eaafa..29f4e285ee0 100644 --- a/local-build/local-build-parent/pom.xml +++ b/local-build/local-build-parent/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../ eclipse.platform.swt.localbuild diff --git a/local-build/org.eclipse.swt.fragments.localbuild/pom.xml b/local-build/org.eclipse.swt.fragments.localbuild/pom.xml index 83680e580fa..214fad618ae 100644 --- a/local-build/org.eclipse.swt.fragments.localbuild/pom.xml +++ b/local-build/org.eclipse.swt.fragments.localbuild/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../ org.eclipse.swt diff --git a/pom.xml b/pom.xml index d751dfc65ad..7007456ba34 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.eclipse eclipse-platform-parent - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../eclipse-platform-parent diff --git a/tests/org.eclipse.swt.tests.cocoa/pom.xml b/tests/org.eclipse.swt.tests.cocoa/pom.xml index 094f4d21499..5d6a6105971 100644 --- a/tests/org.eclipse.swt.tests.cocoa/pom.xml +++ b/tests/org.eclipse.swt.tests.cocoa/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt diff --git a/tests/org.eclipse.swt.tests.gtk/pom.xml b/tests/org.eclipse.swt.tests.gtk/pom.xml index e1133ff5da8..1194b3e51e6 100644 --- a/tests/org.eclipse.swt.tests.gtk/pom.xml +++ b/tests/org.eclipse.swt.tests.gtk/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt diff --git a/tests/org.eclipse.swt.tests.win32/pom.xml b/tests/org.eclipse.swt.tests.win32/pom.xml index 37a9b373a23..41391307baf 100644 --- a/tests/org.eclipse.swt.tests.win32/pom.xml +++ b/tests/org.eclipse.swt.tests.win32/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt diff --git a/tests/org.eclipse.swt.tests/pom.xml b/tests/org.eclipse.swt.tests/pom.xml index d3aa6fae86e..2472919ab17 100644 --- a/tests/org.eclipse.swt.tests/pom.xml +++ b/tests/org.eclipse.swt.tests/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.swt.localbuild eclipse.platform.swt - 4.28.0-SNAPSHOT + 4.29.0-SNAPSHOT ../../local-build/local-build-parent/ org.eclipse.swt From 89166c3cdd4d50d057620a1f50d499e5c07b54e1 Mon Sep 17 00:00:00 2001 From: Deepika Udayagiri Date: Thu, 8 Jun 2023 13:05:02 +0530 Subject: [PATCH 02/24] Configure SWT build scripts for 4.29 Fixes https://github.com/eclipse-platform/eclipse.platform.swt/issues/690 --- .../common/org/eclipse/swt/internal/Library.java | 4 ++-- .../Eclipse SWT/common/library/make_common.mak | 6 +++--- bundles/org.eclipse.swt/Eclipse SWT/common/version.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java index 9e667689a8f..1b885c76d10 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java @@ -30,12 +30,12 @@ public class Library { /** * SWT Minor version number (must be in the range 0..999) */ - static int MINOR_VERSION = 960; + static int MINOR_VERSION = 962; /** * SWT revision number (must be >= 0) */ - static int REVISION = 6; + static int REVISION = 1; /** * The JAVA and SWT versions diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak index 14b00687f64..41c70d08ab0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak @@ -13,6 +13,6 @@ #******************************************************************************* maj_ver=4 -min_ver=960 -rev=6 -comma_ver=4,960,6,0 \ No newline at end of file +min_ver=962 +rev=1 +comma_ver=4,962,1,0 \ No newline at end of file diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt b/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt index aeadd8662b5..1b457ec1023 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt @@ -1 +1 @@ -version 4.960 \ No newline at end of file +version 4.962 \ No newline at end of file From 60ac391c23114bcdba536a3675f3c6d2600057eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Tue, 6 Jun 2023 09:27:42 +0200 Subject: [PATCH 03/24] OleClientSite: use try-with-resource --- .../org/eclipse/swt/ole/win32/OleClientSite.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java index 0cc24ac86f2..7dcb01ec57c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java @@ -369,9 +369,8 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); } IStream stream = new IStream(address[0]); - try { + try (FileInputStream fileInput = new FileInputStream(file)){ // Copy over data in file to named stream - FileInputStream fileInput = new FileInputStream(file); int increment = 1024*4; byte[] buffer = new byte[increment]; int count = 0; @@ -387,7 +386,6 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); } } - fileInput.close(); stream.Commit(COM.STGC_DEFAULT); stream.Release(); } catch (IOException err) { @@ -1202,8 +1200,7 @@ private boolean saveFromContents(long address, File file) { IStream tempContents = new IStream(address); tempContents.AddRef(); - try { - FileOutputStream writer = new FileOutputStream(file); + try (FileOutputStream writer = new FileOutputStream(file)){ int increment = 1024 * 4; long pv = OS.CoTaskMemAlloc(increment); @@ -1216,9 +1213,6 @@ private boolean saveFromContents(long address, File file) { success = true; } OS.CoTaskMemFree(pv); - - writer.close(); - } catch (IOException err) { } @@ -1250,11 +1244,8 @@ private boolean saveFromOle10Native(long address, File file) { OS.CoTaskMemFree(pv); // open the file and write data into it - try { - FileOutputStream writer = new FileOutputStream(file); + try (FileOutputStream writer = new FileOutputStream(file)){ writer.write(buffer); // Note: if file does not exist, this will create the file - writer.close(); - success = true; } catch (IOException err) { } From f524bcd45e9bf4a39e1867c4eab528e2a8a605dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 8 Jun 2023 19:23:50 +0300 Subject: [PATCH 04/24] Version bump for 4.29 stream Tracked in https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1125 --- bundles/org.eclipse.swt/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.swt/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF index b4faaf83e1a..10f89ee0b7d 100644 --- a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.swt; singleton:=true -Bundle-Version: 3.124.0.qualifier +Bundle-Version: 3.124.100.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: plugin DynamicImport-Package: org.eclipse.swt.accessibility2 diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index 339f5c5f407..17afa507673 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -21,7 +21,7 @@ org.eclipse.swt org.eclipse.swt - 3.124.0-SNAPSHOT + 3.124.100-SNAPSHOT eclipse-plugin From 27a57c00dd8fdc8e9ab5a8882cfe59f05fe9d0f1 Mon Sep 17 00:00:00 2001 From: Eclipse Releng Bot Date: Thu, 8 Jun 2023 17:03:41 +0000 Subject: [PATCH 05/24] v4962r2 --- .../common/org/eclipse/swt/internal/Library.java | 2 +- .../Eclipse SWT/common/library/make_common.mak | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java index 1b885c76d10..35340bbc012 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java @@ -35,7 +35,7 @@ public class Library { /** * SWT revision number (must be >= 0) */ - static int REVISION = 1; + static int REVISION = 2; /** * The JAVA and SWT versions diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak index 41c70d08ab0..fe727b05234 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak @@ -14,5 +14,5 @@ maj_ver=4 min_ver=962 -rev=1 -comma_ver=4,962,1,0 \ No newline at end of file +rev=2 +comma_ver=4,962,2,0 \ No newline at end of file From 88ff64c9c689baac10ba30ae9bc18b0c2fed9174 Mon Sep 17 00:00:00 2001 From: Eclipse Releng Bot Date: Thu, 8 Jun 2023 17:07:12 +0000 Subject: [PATCH 06/24] v4962r2 --- bundles/org.eclipse.swt/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index 17afa507673..149618e3dc9 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -29,7 +29,7 @@ forceContextQualifier gets updated during build input process using ant script /bundles/org.eclipse.swt/buildInternal.xml --> - v20230523-1044 + v20230608-1707 Eclipse SWT Accessibility/cocoa,Eclipse SWT Accessibility/common,Eclipse SWT Accessibility/gtk,Eclipse SWT Accessibility/win32,Eclipse SWT AWT/cocoa,Eclipse SWT AWT/common,Eclipse SWT AWT/gtk,Eclipse SWT AWT/win32,Eclipse SWT Browser/cocoa,Eclipse SWT Browser/common,Eclipse SWT Browser/gtk,Eclipse SWT Browser/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/cocoa,Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/win32,Eclipse SWT OLE Win32/win32,Eclipse SWT OpenGL/cocoa,Eclipse SWT OpenGL/common,Eclipse SWT OpenGL/glx,Eclipse SWT OpenGL/gtk,Eclipse SWT OpenGL/win32,Eclipse SWT PI/cairo,Eclipse SWT PI/cocoa,Eclipse SWT PI/common,Eclipse SWT PI/gtk,Eclipse SWT PI/win32,Eclipse SWT Printing/cocoa,Eclipse SWT Printing/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/win32,Eclipse SWT Program/cocoa,Eclipse SWT Program/common,Eclipse SWT Program/gtk,Eclipse SWT Program/win32,Eclipse SWT WebKit/cocoa,Eclipse SWT WebKit/gtk,Eclipse SWT/cairo,Eclipse SWT/cocoa,Eclipse SWT/common,Eclipse SWT/emulated/bidi,Eclipse SWT/emulated/coolbar,Eclipse SWT/emulated/expand,Eclipse SWT/emulated/taskbar,Eclipse SWT/emulated/tooltip,Eclipse SWT/gtk,Eclipse SWT/win32 From bef152a26c7fb41eeeb1a22591103a29868f0eb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 13:07:24 +0000 Subject: [PATCH 07/24] Bump eclipsecbi/fedora-gtk3-mutter in /container Bumps eclipsecbi/fedora-gtk3-mutter from 37-gtk3.24 to 38-gtk3.24. --- updated-dependencies: - dependency-name: eclipsecbi/fedora-gtk3-mutter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- container/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile b/container/Dockerfile index 7f48b11723b..897b4e7ef60 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipsecbi/fedora-gtk3-mutter:37-gtk3.24@sha256:d9549b458baff5d9e288076770c0bb21c75dbdc1ec09bcf569e60c8b1be2699e +FROM eclipsecbi/fedora-gtk3-mutter:38-gtk3.24@sha256:a21f39b4281f08ed0917c25090b9f715f32170617ec43d3edbe0ce0b8b27e30e # Back to root for install USER 0 From 1004cd1646b3a48df33106496eb31502f2bf2f1b Mon Sep 17 00:00:00 2001 From: Eclipse Releng Bot Date: Thu, 8 Jun 2023 18:31:56 +0000 Subject: [PATCH 08/24] v4962r2 --- bundles/org.eclipse.swt/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index 149618e3dc9..39da3fbab6d 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -29,7 +29,7 @@ forceContextQualifier gets updated during build input process using ant script /bundles/org.eclipse.swt/buildInternal.xml --> - v20230608-1707 + v20230608-1831 Eclipse SWT Accessibility/cocoa,Eclipse SWT Accessibility/common,Eclipse SWT Accessibility/gtk,Eclipse SWT Accessibility/win32,Eclipse SWT AWT/cocoa,Eclipse SWT AWT/common,Eclipse SWT AWT/gtk,Eclipse SWT AWT/win32,Eclipse SWT Browser/cocoa,Eclipse SWT Browser/common,Eclipse SWT Browser/gtk,Eclipse SWT Browser/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/cocoa,Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/win32,Eclipse SWT OLE Win32/win32,Eclipse SWT OpenGL/cocoa,Eclipse SWT OpenGL/common,Eclipse SWT OpenGL/glx,Eclipse SWT OpenGL/gtk,Eclipse SWT OpenGL/win32,Eclipse SWT PI/cairo,Eclipse SWT PI/cocoa,Eclipse SWT PI/common,Eclipse SWT PI/gtk,Eclipse SWT PI/win32,Eclipse SWT Printing/cocoa,Eclipse SWT Printing/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/win32,Eclipse SWT Program/cocoa,Eclipse SWT Program/common,Eclipse SWT Program/gtk,Eclipse SWT Program/win32,Eclipse SWT WebKit/cocoa,Eclipse SWT WebKit/gtk,Eclipse SWT/cairo,Eclipse SWT/cocoa,Eclipse SWT/common,Eclipse SWT/emulated/bidi,Eclipse SWT/emulated/coolbar,Eclipse SWT/emulated/expand,Eclipse SWT/emulated/taskbar,Eclipse SWT/emulated/tooltip,Eclipse SWT/gtk,Eclipse SWT/win32 From 522ec17fd1f94c95664ce5af7805cfda940ad2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 9 Jun 2023 10:06:35 +0300 Subject: [PATCH 09/24] Run GH actions maven with 3.9.2 --- .github/workflows/maven.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0ddae468287..d8c33e0fef9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -53,6 +53,10 @@ jobs: java-version: ${{ matrix.java }} distribution: 'temurin' cache: maven + - name: Set up Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.2 - name: Build swt.binaries fragments with Maven uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1 with: From d66b4da0701668351d316046c563b88d02215cbf Mon Sep 17 00:00:00 2001 From: Eclipse Releng Bot Date: Fri, 9 Jun 2023 07:30:06 +0000 Subject: [PATCH 10/24] v4962r2 --- bundles/org.eclipse.swt/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index 39da3fbab6d..2b507234f6f 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -29,7 +29,7 @@ forceContextQualifier gets updated during build input process using ant script /bundles/org.eclipse.swt/buildInternal.xml --> - v20230608-1831 + v20230609-0730 Eclipse SWT Accessibility/cocoa,Eclipse SWT Accessibility/common,Eclipse SWT Accessibility/gtk,Eclipse SWT Accessibility/win32,Eclipse SWT AWT/cocoa,Eclipse SWT AWT/common,Eclipse SWT AWT/gtk,Eclipse SWT AWT/win32,Eclipse SWT Browser/cocoa,Eclipse SWT Browser/common,Eclipse SWT Browser/gtk,Eclipse SWT Browser/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/cocoa,Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/win32,Eclipse SWT OLE Win32/win32,Eclipse SWT OpenGL/cocoa,Eclipse SWT OpenGL/common,Eclipse SWT OpenGL/glx,Eclipse SWT OpenGL/gtk,Eclipse SWT OpenGL/win32,Eclipse SWT PI/cairo,Eclipse SWT PI/cocoa,Eclipse SWT PI/common,Eclipse SWT PI/gtk,Eclipse SWT PI/win32,Eclipse SWT Printing/cocoa,Eclipse SWT Printing/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/win32,Eclipse SWT Program/cocoa,Eclipse SWT Program/common,Eclipse SWT Program/gtk,Eclipse SWT Program/win32,Eclipse SWT WebKit/cocoa,Eclipse SWT WebKit/gtk,Eclipse SWT/cairo,Eclipse SWT/cocoa,Eclipse SWT/common,Eclipse SWT/emulated/bidi,Eclipse SWT/emulated/coolbar,Eclipse SWT/emulated/expand,Eclipse SWT/emulated/taskbar,Eclipse SWT/emulated/tooltip,Eclipse SWT/gtk,Eclipse SWT/win32 From d23fcdf2d82c8339daebbdfa843196843cf49ca1 Mon Sep 17 00:00:00 2001 From: Joerg Kubitz Date: Tue, 16 May 2023 12:23:09 +0200 Subject: [PATCH 11/24] Copy HTML line fragment without block levels. fixes #593 Does not add additional newline when pasting words to Teams/Word. --- .../org/eclipse/swt/custom/HTMLWriter.java | 24 ++++++++++++------- .../org/eclipse/swt/custom/StyledText.java | 2 +- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/HTMLWriter.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/HTMLWriter.java index 7e621ef1fe1..e10873d14b0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/HTMLWriter.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/HTMLWriter.java @@ -21,24 +21,29 @@ *

How the concepts are mapped to HTML:

*
    *
  • The global {@link StyledText} properties (for example {@link StyledText#getBackground()} - * are written in a wrapping {@code
    }.

    + * are written in a wrapping {@code
    } or {@code } (for line fragments).

    *
  • The line specific properties (for example {@link StyledText#getLineBackground(int)} - * are written the {@code

    } elements.

    • + * are written the {@code

    } elements - if the copied range contains more then a line fragment. *

  • The {@link StyleRange} properties inside the line are written the {@code } elements.
    • *
*/ class HTMLWriter extends StyledTextWriterBase { + private String tag; + private boolean multiline; - public HTMLWriter(StyledText styledText, int start, int length) { + public HTMLWriter(StyledText styledText, int start, int length, StyledTextContent content) { super(styledText, start, length); + String text = content.getTextRange(start, length); + multiline = text.contains("\n"); + tag = multiline ? "div" : "span"; writeHeader(); } @Override public void close() { if (!isClosed()) { - write(""); - write(""); + write(""); + write(""); super.close(); } } @@ -81,11 +86,11 @@ void writeHeader() { appendStyle(innerDivStyle, "direction:rtl;"); } - write("
"); + write("<"+ tag+" style='" + outerDivStyle + "'>"); if (language == null || language.isEmpty()) { - write("
"); + write("<"+ tag+" style='" + innerDivStyle + "'>"); } else { - write("
"); + write("<"+ tag+" lang='" + language + "' style='" + innerDivStyle + "'>"); } } @@ -116,6 +121,9 @@ String writeLineStart(Color lineBackground, int indent, int verticalIndent, int appendStyle(paragraphStyle, "margin:", verticalIndent, " 0 0 0;"); } + if (!multiline) { + return ""; + } if (paragraphStyle.length() == 0) { write("

"); } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java index e4a1ec171ff..e0d63ae5841 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java @@ -8629,7 +8629,7 @@ void setClipboardContent(int start, int length, int clipboardType) throws SWTErr String rtfText = getPlatformDelimitedText(rtfWriter); HTMLTransfer htmlTransfer = HTMLTransfer.getInstance(); - HTMLWriter htmlWriter = new HTMLWriter(this, start, length); + HTMLWriter htmlWriter = new HTMLWriter(this, start, length, content); String htmlText = getPlatformDelimitedText(htmlWriter); data = new Object[]{rtfText, htmlText, plainText}; From d9c1f3275cd443b08995207ab889b8ed5036bf8b Mon Sep 17 00:00:00 2001 From: Eclipse Releng Bot Date: Fri, 9 Jun 2023 08:06:49 +0000 Subject: [PATCH 12/24] v4962r2 --- bundles/org.eclipse.swt/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index 2b507234f6f..743c2630700 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -29,7 +29,7 @@ forceContextQualifier gets updated during build input process using ant script /bundles/org.eclipse.swt/buildInternal.xml --> - v20230609-0730 + v20230609-0806 Eclipse SWT Accessibility/cocoa,Eclipse SWT Accessibility/common,Eclipse SWT Accessibility/gtk,Eclipse SWT Accessibility/win32,Eclipse SWT AWT/cocoa,Eclipse SWT AWT/common,Eclipse SWT AWT/gtk,Eclipse SWT AWT/win32,Eclipse SWT Browser/cocoa,Eclipse SWT Browser/common,Eclipse SWT Browser/gtk,Eclipse SWT Browser/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/cocoa,Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/win32,Eclipse SWT OLE Win32/win32,Eclipse SWT OpenGL/cocoa,Eclipse SWT OpenGL/common,Eclipse SWT OpenGL/glx,Eclipse SWT OpenGL/gtk,Eclipse SWT OpenGL/win32,Eclipse SWT PI/cairo,Eclipse SWT PI/cocoa,Eclipse SWT PI/common,Eclipse SWT PI/gtk,Eclipse SWT PI/win32,Eclipse SWT Printing/cocoa,Eclipse SWT Printing/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/win32,Eclipse SWT Program/cocoa,Eclipse SWT Program/common,Eclipse SWT Program/gtk,Eclipse SWT Program/win32,Eclipse SWT WebKit/cocoa,Eclipse SWT WebKit/gtk,Eclipse SWT/cairo,Eclipse SWT/cocoa,Eclipse SWT/common,Eclipse SWT/emulated/bidi,Eclipse SWT/emulated/coolbar,Eclipse SWT/emulated/expand,Eclipse SWT/emulated/taskbar,Eclipse SWT/emulated/tooltip,Eclipse SWT/gtk,Eclipse SWT/win32 From 6f95c07559b45e618cf0b871149b4494e6aa33d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Wed, 7 Jun 2023 17:33:38 +0200 Subject: [PATCH 13/24] JNIGeneratorApp: fix char replacement the return value is not used. the replacement is undone in line 334. There will be a difference for qualifiedName in line 329. --- .../org/eclipse/swt/tools/internal/JNIGeneratorApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java index fbbdce9e4af..672e08609fb 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java @@ -286,7 +286,7 @@ String[] getClassNames() { String name = entry.getName(); if (name.startsWith(pkgZipPath) && name.indexOf('/', pkgZipPath.length() + 1) == -1 && name.endsWith(".class")) { String className = name.substring(pkgZipPath.length() + 1, name.length() - 6); - className.replace('/', '.'); + className= className.replace('/', '.'); classes.add(className); } } From 0251688f24882dec955da55564f3e9a77c1aeb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Fri, 9 Jun 2023 10:05:24 +0200 Subject: [PATCH 14/24] version bump org.eclipse.swt.tools --- bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.swt.tools/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF index 27f891ea894..a7fd869f0e4 100644 --- a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.swt.tools; singleton:=true -Bundle-Version: 3.110.0.qualifier +Bundle-Version: 3.110.100.qualifier Bundle-ManifestVersion: 2 Export-Package: org.eclipse.swt.tools.internal; x-internal:=true Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.swt.tools/pom.xml b/bundles/org.eclipse.swt.tools/pom.xml index 25d6d0e6e5f..a91b92ea2b9 100644 --- a/bundles/org.eclipse.swt.tools/pom.xml +++ b/bundles/org.eclipse.swt.tools/pom.xml @@ -19,6 +19,6 @@ org.eclipse.swt org.eclipse.swt.tools - 3.110.0-SNAPSHOT + 3.110.100-SNAPSHOT eclipse-plugin From c048f985369e20e4fabddeffb371763324dffd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Fri, 9 Jun 2023 10:44:55 +0200 Subject: [PATCH 15/24] version bump org.eclipse.swt.tools.feature --- features/org.eclipse.swt.tools.feature/feature.xml | 2 +- features/org.eclipse.swt.tools.feature/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features/org.eclipse.swt.tools.feature/feature.xml b/features/org.eclipse.swt.tools.feature/feature.xml index 968c2fad535..470b10db0bd 100644 --- a/features/org.eclipse.swt.tools.feature/feature.xml +++ b/features/org.eclipse.swt.tools.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.swt.tools.feature/pom.xml b/features/org.eclipse.swt.tools.feature/pom.xml index b22e59ba034..7fb8112f276 100644 --- a/features/org.eclipse.swt.tools.feature/pom.xml +++ b/features/org.eclipse.swt.tools.feature/pom.xml @@ -20,7 +20,7 @@ org.eclipse.swt.tools.feature org.eclipse.swt.tools.feature - 3.109.0-SNAPSHOT + 3.109.100-SNAPSHOT eclipse-feature From 69adf3891cb7e7786048613fe3856501f40b54a1 Mon Sep 17 00:00:00 2001 From: Eclipse Releng Bot Date: Fri, 9 Jun 2023 09:22:16 +0000 Subject: [PATCH 16/24] v4962r2 --- bundles/org.eclipse.swt/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index 743c2630700..2adec4f417d 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -29,7 +29,7 @@ forceContextQualifier gets updated during build input process using ant script /bundles/org.eclipse.swt/buildInternal.xml --> - v20230609-0806 + v20230609-0922 Eclipse SWT Accessibility/cocoa,Eclipse SWT Accessibility/common,Eclipse SWT Accessibility/gtk,Eclipse SWT Accessibility/win32,Eclipse SWT AWT/cocoa,Eclipse SWT AWT/common,Eclipse SWT AWT/gtk,Eclipse SWT AWT/win32,Eclipse SWT Browser/cocoa,Eclipse SWT Browser/common,Eclipse SWT Browser/gtk,Eclipse SWT Browser/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/cocoa,Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/win32,Eclipse SWT OLE Win32/win32,Eclipse SWT OpenGL/cocoa,Eclipse SWT OpenGL/common,Eclipse SWT OpenGL/glx,Eclipse SWT OpenGL/gtk,Eclipse SWT OpenGL/win32,Eclipse SWT PI/cairo,Eclipse SWT PI/cocoa,Eclipse SWT PI/common,Eclipse SWT PI/gtk,Eclipse SWT PI/win32,Eclipse SWT Printing/cocoa,Eclipse SWT Printing/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/win32,Eclipse SWT Program/cocoa,Eclipse SWT Program/common,Eclipse SWT Program/gtk,Eclipse SWT Program/win32,Eclipse SWT WebKit/cocoa,Eclipse SWT WebKit/gtk,Eclipse SWT/cairo,Eclipse SWT/cocoa,Eclipse SWT/common,Eclipse SWT/emulated/bidi,Eclipse SWT/emulated/coolbar,Eclipse SWT/emulated/expand,Eclipse SWT/emulated/taskbar,Eclipse SWT/emulated/tooltip,Eclipse SWT/gtk,Eclipse SWT/win32 From 07e15b369917ee9a2b66f37802bae2f777501817 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 13:04:37 +0000 Subject: [PATCH 17/24] Bump eclipsecbi/fedora-gtk3-mutter in /container Bumps eclipsecbi/fedora-gtk3-mutter from `a21f39b` to `711cb8a`. --- updated-dependencies: - dependency-name: eclipsecbi/fedora-gtk3-mutter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- container/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile b/container/Dockerfile index 897b4e7ef60..d590f77c755 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipsecbi/fedora-gtk3-mutter:38-gtk3.24@sha256:a21f39b4281f08ed0917c25090b9f715f32170617ec43d3edbe0ce0b8b27e30e +FROM eclipsecbi/fedora-gtk3-mutter:38-gtk3.24@sha256:711cb8a70ae564bafc22603acf50b9baa971a10810ea8087e5246cfcc50106a3 # Back to root for install USER 0 From aa69ac3ea2e75cc734675a814aae02e1a2dda887 Mon Sep 17 00:00:00 2001 From: Eclipse Releng Bot Date: Fri, 9 Jun 2023 15:59:00 +0000 Subject: [PATCH 18/24] v4962r2 --- bundles/org.eclipse.swt/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index 2adec4f417d..fdf8a9486d2 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -29,7 +29,7 @@ forceContextQualifier gets updated during build input process using ant script /bundles/org.eclipse.swt/buildInternal.xml --> - v20230609-0922 + v20230609-1558 Eclipse SWT Accessibility/cocoa,Eclipse SWT Accessibility/common,Eclipse SWT Accessibility/gtk,Eclipse SWT Accessibility/win32,Eclipse SWT AWT/cocoa,Eclipse SWT AWT/common,Eclipse SWT AWT/gtk,Eclipse SWT AWT/win32,Eclipse SWT Browser/cocoa,Eclipse SWT Browser/common,Eclipse SWT Browser/gtk,Eclipse SWT Browser/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/cocoa,Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/win32,Eclipse SWT OLE Win32/win32,Eclipse SWT OpenGL/cocoa,Eclipse SWT OpenGL/common,Eclipse SWT OpenGL/glx,Eclipse SWT OpenGL/gtk,Eclipse SWT OpenGL/win32,Eclipse SWT PI/cairo,Eclipse SWT PI/cocoa,Eclipse SWT PI/common,Eclipse SWT PI/gtk,Eclipse SWT PI/win32,Eclipse SWT Printing/cocoa,Eclipse SWT Printing/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/win32,Eclipse SWT Program/cocoa,Eclipse SWT Program/common,Eclipse SWT Program/gtk,Eclipse SWT Program/win32,Eclipse SWT WebKit/cocoa,Eclipse SWT WebKit/gtk,Eclipse SWT/cairo,Eclipse SWT/cocoa,Eclipse SWT/common,Eclipse SWT/emulated/bidi,Eclipse SWT/emulated/coolbar,Eclipse SWT/emulated/expand,Eclipse SWT/emulated/taskbar,Eclipse SWT/emulated/tooltip,Eclipse SWT/gtk,Eclipse SWT/win32 From 254f32607e20e17d13493ec0bd1f237aff459b1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 13:05:40 +0000 Subject: [PATCH 19/24] Bump actions/checkout from 3.5.2 to 3.5.3 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.2 to 3.5.3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/8e5e7e5ab8b370d6c329ec480221332ada57f0ab...c85c95e3d7251135ab7dc9ce3241c5835cc595a9) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d8c33e0fef9..8068a91b766 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,12 +35,12 @@ jobs: name: Verify ${{ matrix.config.name }} with Java-${{ matrix.java }} steps: - name: checkout swt - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: path: 'eclipse.platform.swt' fetch-depth: 0 # required for jgit timestamp provider to work - name: checkout swt.binaries - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: path: eclipse.platform.swt.binaries repository: 'eclipse-platform/eclipse.platform.swt.binaries' From fa6aaebc161c6d784694ed1b24b0548308020ecb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 13:08:57 +0000 Subject: [PATCH 20/24] Bump eclipsecbi/fedora-gtk3-mutter in /container Bumps eclipsecbi/fedora-gtk3-mutter from `711cb8a` to `2dc9af3`. --- updated-dependencies: - dependency-name: eclipsecbi/fedora-gtk3-mutter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- container/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile b/container/Dockerfile index d590f77c755..96f0809ff11 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipsecbi/fedora-gtk3-mutter:38-gtk3.24@sha256:711cb8a70ae564bafc22603acf50b9baa971a10810ea8087e5246cfcc50106a3 +FROM eclipsecbi/fedora-gtk3-mutter:38-gtk3.24@sha256:2dc9af3bf52e81ba819184de83f1755e5edef6f3b06a8e3dd824c9a29d0dcc4a # Back to root for install USER 0 From 28e331be115429a4dd0e965546a55c04a37d7ebd Mon Sep 17 00:00:00 2001 From: Eclipse Releng Bot Date: Mon, 12 Jun 2023 13:30:30 +0000 Subject: [PATCH 21/24] v4962r2 --- bundles/org.eclipse.swt/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index fdf8a9486d2..e7841591203 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -29,7 +29,7 @@ forceContextQualifier gets updated during build input process using ant script /bundles/org.eclipse.swt/buildInternal.xml --> - v20230609-1558 + v20230612-1330 Eclipse SWT Accessibility/cocoa,Eclipse SWT Accessibility/common,Eclipse SWT Accessibility/gtk,Eclipse SWT Accessibility/win32,Eclipse SWT AWT/cocoa,Eclipse SWT AWT/common,Eclipse SWT AWT/gtk,Eclipse SWT AWT/win32,Eclipse SWT Browser/cocoa,Eclipse SWT Browser/common,Eclipse SWT Browser/gtk,Eclipse SWT Browser/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/cocoa,Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/win32,Eclipse SWT OLE Win32/win32,Eclipse SWT OpenGL/cocoa,Eclipse SWT OpenGL/common,Eclipse SWT OpenGL/glx,Eclipse SWT OpenGL/gtk,Eclipse SWT OpenGL/win32,Eclipse SWT PI/cairo,Eclipse SWT PI/cocoa,Eclipse SWT PI/common,Eclipse SWT PI/gtk,Eclipse SWT PI/win32,Eclipse SWT Printing/cocoa,Eclipse SWT Printing/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/win32,Eclipse SWT Program/cocoa,Eclipse SWT Program/common,Eclipse SWT Program/gtk,Eclipse SWT Program/win32,Eclipse SWT WebKit/cocoa,Eclipse SWT WebKit/gtk,Eclipse SWT/cairo,Eclipse SWT/cocoa,Eclipse SWT/common,Eclipse SWT/emulated/bidi,Eclipse SWT/emulated/coolbar,Eclipse SWT/emulated/expand,Eclipse SWT/emulated/taskbar,Eclipse SWT/emulated/tooltip,Eclipse SWT/gtk,Eclipse SWT/win32 From 66114446d16cfdc8bb0de0c2677821132f9c7f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Mon, 12 Jun 2023 13:57:22 +0200 Subject: [PATCH 22/24] ImageLoader: Use try-with-resource Doesn't try to fix anything. Just code and warnings reduced. --- .../org/eclipse/swt/graphics/ImageLoader.java | 10 +------- .../org/eclipse/swt/snippets/Snippet319.java | 23 +++---------------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java index bbe5ac8d518..f309c6186a0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java @@ -176,18 +176,10 @@ public ImageData[] load(InputStream stream) { */ public ImageData[] load(String filename) { if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - InputStream stream = null; - try { - stream = new FileInputStream(filename); + try (InputStream stream = new FileInputStream(filename)) { return load(stream); } catch (IOException e) { SWT.error(SWT.ERROR_IO, e); - } finally { - try { - if (stream != null) stream.close(); - } catch (IOException e) { - // Ignore error - } } return null; } diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet319.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet319.java index 829621c5777..12af2f03a8b 100644 --- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet319.java +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet319.java @@ -186,10 +186,8 @@ protected boolean validate(Object object) { /* shared methods for converting instances of MyType <-> byte[] */ static byte[] convertToByteArray(MyType type) { - DataOutputStream dataOutStream = null; - try { - ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); - dataOutStream = new DataOutputStream(byteOutStream); + try (ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); + DataOutputStream dataOutStream = new DataOutputStream(byteOutStream)) { byte[] bytes = type.name.getBytes(); dataOutStream.writeInt(bytes.length); dataOutStream.write(bytes); @@ -197,20 +195,11 @@ static byte[] convertToByteArray(MyType type) { return byteOutStream.toByteArray(); } catch (IOException e) { return null; - } finally { - if (dataOutStream != null) { - try { - dataOutStream.close(); - } catch (IOException e) {} - } } } static MyType restoreFromByteArray(byte[] bytes) { - DataInputStream dataInStream = null; - try { - ByteArrayInputStream byteInStream = new ByteArrayInputStream(bytes); - dataInStream = new DataInputStream(byteInStream); + try (DataInputStream dataInStream = new DataInputStream(new ByteArrayInputStream(bytes))) { int size = dataInStream.readInt(); byte[] name = new byte[size]; dataInStream.read(name); @@ -220,12 +209,6 @@ static MyType restoreFromByteArray(byte[] bytes) { return result; } catch (IOException ex) { return null; - } finally { - if (dataInStream != null) { - try { - dataInStream.close(); - } catch (IOException e) {} - } } } From dd52936cb3756901b640c5a30ec71e72a6d7ede4 Mon Sep 17 00:00:00 2001 From: Eclipse Releng Bot Date: Tue, 13 Jun 2023 08:47:14 +0000 Subject: [PATCH 23/24] v4962r2 --- bundles/org.eclipse.swt/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index e7841591203..56d6d8ba411 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -29,7 +29,7 @@ forceContextQualifier gets updated during build input process using ant script /bundles/org.eclipse.swt/buildInternal.xml --> - v20230612-1330 + v20230613-0847 Eclipse SWT Accessibility/cocoa,Eclipse SWT Accessibility/common,Eclipse SWT Accessibility/gtk,Eclipse SWT Accessibility/win32,Eclipse SWT AWT/cocoa,Eclipse SWT AWT/common,Eclipse SWT AWT/gtk,Eclipse SWT AWT/win32,Eclipse SWT Browser/cocoa,Eclipse SWT Browser/common,Eclipse SWT Browser/gtk,Eclipse SWT Browser/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/cocoa,Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/win32,Eclipse SWT OLE Win32/win32,Eclipse SWT OpenGL/cocoa,Eclipse SWT OpenGL/common,Eclipse SWT OpenGL/glx,Eclipse SWT OpenGL/gtk,Eclipse SWT OpenGL/win32,Eclipse SWT PI/cairo,Eclipse SWT PI/cocoa,Eclipse SWT PI/common,Eclipse SWT PI/gtk,Eclipse SWT PI/win32,Eclipse SWT Printing/cocoa,Eclipse SWT Printing/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/win32,Eclipse SWT Program/cocoa,Eclipse SWT Program/common,Eclipse SWT Program/gtk,Eclipse SWT Program/win32,Eclipse SWT WebKit/cocoa,Eclipse SWT WebKit/gtk,Eclipse SWT/cairo,Eclipse SWT/cocoa,Eclipse SWT/common,Eclipse SWT/emulated/bidi,Eclipse SWT/emulated/coolbar,Eclipse SWT/emulated/expand,Eclipse SWT/emulated/taskbar,Eclipse SWT/emulated/tooltip,Eclipse SWT/gtk,Eclipse SWT/win32 From f1d2746ee46f40451e8b8a2093d7bc6de9c4e0e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Tue, 13 Jun 2023 14:32:13 +0200 Subject: [PATCH 24/24] MacGenerator: close InputStream after use --- .../swt/tools/internal/MacGenerator.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java index a7e023073d9..d923b2367af 100644 --- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java +++ b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java @@ -946,17 +946,27 @@ public void setSelectorEnum(String selectorEnumName) { } Document getDocument(String xmlPath) { - try { - InputStream is = null; - if (xmlPath.indexOf(File.separatorChar) == -1) is = getClass().getResourceAsStream(xmlPath); - if (is == null) is = new BufferedInputStream(new FileInputStream(xmlPath)); - if (is != null) return DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(is)); + try (InputStream is = createInputStream(xmlPath)) { + if (is != null) { + return DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(is)); + } } catch (Exception e) { -// e.printStackTrace(); + //ignored } return null; } +private InputStream createInputStream(String xmlPath) throws FileNotFoundException { + InputStream is = null; + if (xmlPath.indexOf(File.separatorChar) == -1) { + is = getClass().getResourceAsStream(xmlPath); // null if noresource is found + } + if (is == null) { + is = new BufferedInputStream(new FileInputStream(xmlPath)); + } + return is; +} + public String[] getExtraAttributeNames(Node node) { String name = node.getNodeName(); if (name.equals("method")) {