From acd58ebb0c562d1963b5884058570ce69ae4cddd Mon Sep 17 00:00:00 2001 From: Stephan Herrmann Date: Thu, 20 Jun 2024 17:26:09 +0200 Subject: [PATCH 1/3] Remove unnecessary casts --- .../org/eclipse/equinox/internal/app/EclipseAppContainer.java | 2 +- .../osgi/tests/serviceregistry/ServiceExceptionTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppContainer.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppContainer.java index 7c2c89d83c5..1b702bb7452 100644 --- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppContainer.java +++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppContainer.java @@ -568,7 +568,7 @@ else if (((EclipseAppDescriptor) appHandle.getApplicationDescriptor()) .getCardinalityType() == EclipseAppDescriptor.FLAG_CARD_LIMITED) { if (activeLimited != null) { ArrayList limited = activeLimited - .get(((EclipseAppDescriptor) appHandle.getApplicationDescriptor()).getApplicationId()); + .get(appHandle.getApplicationDescriptor().getApplicationId()); if (limited != null) limited.remove(appHandle); } diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceExceptionTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceExceptionTests.java index c109a4407b3..509662bb121 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceExceptionTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceExceptionTests.java @@ -212,7 +212,7 @@ public void frameworkEvent(FrameworkEvent event) { return; if (!(event.getThrowable() instanceof ServiceException)) return; - if (((ServiceException) event.getThrowable()).getCause() != exception) + if (event.getThrowable().getCause() != exception) return; if (((ServiceException) event.getThrowable()).getType() != exceptionType) return; From 12fd27df82d3aa62f3b451d80406e2ade88e9fc7 Mon Sep 17 00:00:00 2001 From: Stephan Herrmann Date: Thu, 20 Jun 2024 18:18:15 +0200 Subject: [PATCH 2/3] version bump --- bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF index 5b5da69a985..cc457569fac 100644 --- a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true -Bundle-Version: 1.7.100.qualifier +Bundle-Version: 1.7.200.qualifier Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.equinox.internal.app.Activator Bundle-Localization: plugin From 375d2181c3ccaf0357f1ce1f5b5e7aaf658673f3 Mon Sep 17 00:00:00 2001 From: Stephan Herrmann Date: Thu, 20 Jun 2024 18:57:22 +0200 Subject: [PATCH 3/3] feature version bump --- features/org.eclipse.equinox.compendium.sdk/feature.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/org.eclipse.equinox.compendium.sdk/feature.xml b/features/org.eclipse.equinox.compendium.sdk/feature.xml index fbc6b4f0110..f4ea7f32447 100644 --- a/features/org.eclipse.equinox.compendium.sdk/feature.xml +++ b/features/org.eclipse.equinox.compendium.sdk/feature.xml @@ -2,7 +2,7 @@