summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ross2012-09-11 07:57:31 (EDT)
committer Thomas Watson2012-09-11 11:00:59 (EDT)
commit9e892702ca0d2f4d960d4ce20c432121b2da3986 (patch)
tree0e9723f7d85e6dbd36084bf570f199293752e06c
parenta4835983ff42069b0cde7da988f8fe68caacb116 (diff)
downloadrt.equinox.framework-9e892702ca0d2f4d960d4ce20c432121b2da3986.zip
rt.equinox.framework-9e892702ca0d2f4d960d4ce20c432121b2da3986.tar.gz
rt.equinox.framework-9e892702ca0d2f4d960d4ce20c432121b2da3986.tar.bz2
Renamed report type indicating a bundle was filtered out by a resolver hook.
-rw-r--r--bundles/org.eclipse.osgi.container.tests/src/org/eclipse/osgi/container/tests/ResolutionReportTest.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/report/ResolutionReport.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi.container.tests/src/org/eclipse/osgi/container/tests/ResolutionReportTest.java b/bundles/org.eclipse.osgi.container.tests/src/org/eclipse/osgi/container/tests/ResolutionReportTest.java
index 61d705f..f24ebab 100644
--- a/bundles/org.eclipse.osgi.container.tests/src/org/eclipse/osgi/container/tests/ResolutionReportTest.java
+++ b/bundles/org.eclipse.osgi.container.tests/src/org/eclipse/osgi/container/tests/ResolutionReportTest.java
@@ -79,7 +79,7 @@ public class ResolutionReportTest extends AbstractTest {
assertNotNull("No entry for resource", entries);
assertEquals("Wrong number of entries", 1, entries.size());
ResolutionReport.Entry entry = entries.get(0);
- assertEquals("Wrong type", ResolutionReport.Entry.Type.FILTERED_BY_HOOK, entry.getType());
+ assertEquals("Wrong type", ResolutionReport.Entry.Type.FILTERED_BY_RESOLVER_HOOK, entry.getType());
}
@Test
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
index f290222..48c04a4 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
@@ -684,7 +684,7 @@ final class ModuleResolver {
hook.filterResolvable(Converters.asListBundleRevision((List<? extends BundleRevision>) enabledCandidates));
disabled.removeAll(enabledCandidates);
for (ModuleRevision revision : disabled)
- builder.addEntry(revision, Entry.Type.FILTERED_BY_HOOK);
+ builder.addEntry(revision, Entry.Type.FILTERED_BY_RESOLVER_HOOK);
}
private void selectSingletons(ResolutionReport.Builder builder) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/report/ResolutionReport.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/report/ResolutionReport.java
index ee55b60..ca8580e 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/report/ResolutionReport.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/report/ResolutionReport.java
@@ -20,7 +20,7 @@ import org.osgi.resource.Resource;
public interface ResolutionReport {
public interface Entry {
enum Type {
- FILTERED_BY_HOOK, SINGLETON
+ FILTERED_BY_RESOLVER_HOOK, SINGLETON
}
Type getType();