Skip to content

Commit

Permalink
Format java files in o.e.osgi.compatibility.state
Browse files Browse the repository at this point in the history
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 <torbjorn.svensson@st.com>
  • Loading branch information
Torbjorn-Svensson authored and akurtakov committed Nov 6, 2023
1 parent d07b5d3 commit 0af952e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ List<PackageRoots[]> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<BundleDescription> 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);
}
Expand Down

0 comments on commit 0af952e

Please sign in to comment.