From 0af952e6d3dbfdc06930f62303c5015801210dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20SVENSSON?= Date: Sun, 1 Oct 2023 23:07:43 +0200 Subject: [PATCH] Format java files in o.e.osgi.compatibility.state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was achieved by running: eclipse -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \ -config .settings/org.eclipse.jdt.core.prefs . -data `mktemp -d` Signed-off-by: Torbjörn SVENSSON --- .../src/org/eclipse/osgi/internal/module/GroupingChecker.java | 2 +- .../src/org/eclipse/osgi/internal/module/ResolverImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java index fdccbf30fea..e07819ba6e5 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java +++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java @@ -420,7 +420,7 @@ List addConflicts(ResolverBundle bundle, String usedPackage, Lis // TODO this is a behavioral change; before we only required 1 supplier to match; now roots must be subsets private boolean subSet(ResolverExport[] superSet, ResolverExport[] subSet) { - for (ResolverExport subexport : subSet) { + for (ResolverExport subexport : subSet) { boolean found = false; for (ResolverExport superexport : superSet) { // compare by exporter in case the bundle exports the package multiple times diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java index e79db308fdc..693bd6f27b2 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java +++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java @@ -592,8 +592,8 @@ private BundleDescription[] addDevConstraints(BundleDescription[] reRefresh) { // when in develoment mode we need to reRefresh hosts of unresolved fragments that add new constraints // and reRefresh and unresolved bundles that have dependents Set additionalRefresh = new HashSet<>(); - ResolverBundle[] allUnresolved = unresolvedBundles.toArray(new ResolverBundle[unresolvedBundles.size()]); - for (ResolverBundle unresolved : allUnresolved ) { + ResolverBundle[] allUnresolved = unresolvedBundles.toArray(new ResolverBundle[unresolvedBundles.size()]); + for (ResolverBundle unresolved : allUnresolved) { addUnresolvedWithDependents(unresolved, additionalRefresh); addHostsFromFragmentConstraints(unresolved, additionalRefresh); }