From 618982b49d72803c2479a461aff1b60d97acd63b Mon Sep 17 00:00:00 2001 From: John Ross Date: Tue, 19 Nov 2013 15:42:06 -0600 Subject: Fix misspelling in ResolutionReport interface method name. --- .../src/org/eclipse/osgi/tests/container/ResolutionReportTest.java | 4 ++-- .../src/org/eclipse/osgi/tests/container/TestModuleContainer.java | 4 ++-- .../container/src/org/eclipse/osgi/container/Module.java | 2 +- .../src/org/eclipse/osgi/container/ModuleResolutionReport.java | 2 +- .../container/src/org/eclipse/osgi/container/SystemModule.java | 2 +- .../src/org/eclipse/osgi/report/resolution/ResolutionReport.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java index 8e512ac41..95f484d4a 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java @@ -212,12 +212,12 @@ public class ResolutionReportTest extends AbstractTest { private void assertResolutionDoesNotSucceed(ModuleContainer container, Collection modules) { ModuleResolutionReport report = container.resolve(modules, true); - assertNotNull("Resolution should not have succeeded", report.getResoltuionException()); + assertNotNull("Resolution should not have succeeded", report.getResolutionException()); } private void assertResolutionSucceeds(ModuleContainer container, Collection modules) { ModuleResolutionReport report = container.resolve(modules, false); - assertNull("Unexpected resolution exception", report.getResoltuionException()); + assertNull("Unexpected resolution exception", report.getResolutionException()); } private void assertResolutionReportEntriesNotNull(Map> entries) { diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java index 85ce92b51..a461c4666 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java @@ -197,12 +197,12 @@ public class TestModuleContainer extends AbstractTest { installDummyModule("c6_v1.MF", "c6", container); ModuleResolutionReport report = container.resolve(Arrays.asList(c7), true); - Assert.assertNotNull("Expected a resolution exception", report.getResoltuionException()); + Assert.assertNotNull("Expected a resolution exception", report.getResolutionException()); // Should resolve now installDummyModule("c4_v1.MF", "c4", container); report = container.resolve(Arrays.asList(c7), true); - Assert.assertNull("Unexpected resoltuion exception", report.getResoltuionException()); + Assert.assertNull("Unexpected resoltuion exception", report.getResolutionException()); } @Test diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java index 28b0f9495..80a5947ae 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java @@ -411,7 +411,7 @@ public abstract class Module implements BundleReference, BundleStartLevel, Compa } // need to check valid again in case someone uninstalled the bundle checkValid(); - ResolutionException e = report.getResoltuionException(); + ResolutionException e = report.getResolutionException(); if (e != null) { if (e.getCause() instanceof BundleException) { throw (BundleException) e.getCause(); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java index 7d447f0fd..3e66c4f0e 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java @@ -75,7 +75,7 @@ public class ModuleResolutionReport implements ResolutionReport { } @Override - public ResolutionException getResoltuionException() { + public ResolutionException getResolutionException() { return resolutionException; } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java index 6358d9778..21a4db2ca 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java @@ -54,7 +54,7 @@ public abstract class SystemModule extends Module { } // need to check valid again in case someone uninstalled the bundle checkValid(); - ResolutionException e = report.getResoltuionException(); + ResolutionException e = report.getResolutionException(); if (e != null) { if (e.getCause() instanceof BundleException) { throw (BundleException) e.getCause(); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/report/resolution/ResolutionReport.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/report/resolution/ResolutionReport.java index 0e5e160a0..04768c84b 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/report/resolution/ResolutionReport.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/report/resolution/ResolutionReport.java @@ -171,7 +171,7 @@ public interface ResolutionReport { * @return the resolution exception or {@code null} if there is * no resolution exception. */ - ResolutionException getResoltuionException(); + ResolutionException getResolutionException(); /** * Returns a resolution report message for the given resource. -- cgit v1.2.3