Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply project settings to o.e.osgi.compatibility.state #327

Merged
merged 2 commits into from
Nov 6, 2023
Merged

Apply project settings to o.e.osgi.compatibility.state #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
930cee2
Convert to LF and ensure LF at EOF in o.e.osgi.compatibility.state
Torbjorn-Svensson Oct 1, 2023
313f873
Format java files in o.e.osgi.compatibility.state
Torbjorn-Svensson Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.osgi.compatibility.state
Bundle-Version: 1.2.800.qualifier
Bundle-Version: 1.2.900.qualifier
ExtensionBundle-Activator: org.eclipse.osgi.compatibility.state.Activator
Fragment-Host: org.eclipse.osgi;bundle-version="3.12.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.osgi.compatibility.state/OSGI-INF/l10n/bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Properties file for org.eclipse.osgi.compatibility.state
Bundle-Vendor = Eclipse.org - Equinox
Bundle-Name = Equinox State and Resolver Compatibility Fragment
Bundle-Name = Equinox State and Resolver Compatibility Fragment
2 changes: 1 addition & 1 deletion bundles/org.eclipse.osgi.compatibility.state/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ <h3>License</h3>
</p>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion ...clipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...g.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMsg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ public class StateMsg extends NLS {
// initialize resource bundles
NLS.initializeMessages(BUNDLE_NAME, StateMsg.class);
}
}
}
Loading