| author | John Ross | 2012-09-11 07:58:36 (EDT) |
|---|---|---|
| committer | Thomas Watson | 2012-09-11 11:01:00 (EDT) |
| commit | 3f77a1c480c98f82477d82c33a34ac703bee2fe2 (patch) (side-by-side diff) | |
| tree | 2bf8772025dad8fe5b7e716bba8f9f4e0c1109b3 | |
| parent | 9e892702ca0d2f4d960d4ce20c432121b2da3986 (diff) | |
| download | rt.equinox.framework-3f77a1c480c98f82477d82c33a34ac703bee2fe2.zip rt.equinox.framework-3f77a1c480c98f82477d82c33a34ac703bee2fe2.tar.gz rt.equinox.framework-3f77a1c480c98f82477d82c33a34ac703bee2fe2.tar.bz2 | |
Renamed report type indicating a singleton collision to match name used in old framework.
3 files changed, 7 insertions, 7 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 f24ebab..93e60db 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 @@ -103,7 +103,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.SINGLETON, entry.getType()); + assertEquals("Wrong type", ResolutionReport.Entry.Type.SINGLETON_SELECTION, entry.getType()); } @Test @@ -129,7 +129,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.SINGLETON, entry.getType()); + assertEquals("Wrong type", ResolutionReport.Entry.Type.SINGLETON_SELECTION, entry.getType()); } @Test @@ -155,6 +155,6 @@ 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.SINGLETON, entry.getType()); + assertEquals("Wrong type", ResolutionReport.Entry.Type.SINGLETON_SELECTION, entry.getType()); } } 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 48c04a4..56a2c7e 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 @@ -725,7 +725,7 @@ final class ModuleResolver { disabled.add(singleton); // TODO add resolver diagnostics here //state.addResolverError(singleton.getBundleDescription(), ResolverError.SINGLETON_SELECTION, collision.getBundleDescription().toString(), null); - builder.addEntry(singleton, Type.SINGLETON); + builder.addEntry(singleton, Type.SINGLETON_SELECTION); break; } if (!pickOneToResolve.contains(collision)) @@ -740,7 +740,7 @@ final class ModuleResolver { disabled.add(singleton); // TODO add resolver diagnostics here // state.addResolverError(singleton.getBundleDescription(), ResolverError.SINGLETON_SELECTION, collisionEntry.getKey().getBundleDescription().toString(), null); - builder.addEntry(singleton, Type.SINGLETON); + builder.addEntry(singleton, Type.SINGLETON_SELECTION); break; } if (!pickOneToResolve.contains(collisionEntry.getKey())) @@ -797,7 +797,7 @@ final class ModuleResolver { disabled.add(singleton); // TODO add resolver diagnostic here. // state.addResolverError(singleton.getBundleDescription(), ResolverError.SINGLETON_SELECTION, selectedVersion.getBundleDescription().toString(), null); - builder.addEntry(singleton, Type.SINGLETON); + builder.addEntry(singleton, Type.SINGLETON_SELECTION); } } return selectedVersion; 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 ca8580e..c06942a 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_RESOLVER_HOOK, SINGLETON + FILTERED_BY_RESOLVER_HOOK, SINGLETON_SELECTION } Type getType(); |