aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ross2013-11-19 16:42:06 (EST)
committerJohn Ross2013-11-19 16:42:06 (EST)
commit618982b49d72803c2479a461aff1b60d97acd63b (patch)
tree83778bc4bb3635575ef05afec5f472749dd3b5dd
parentee9d9dc88863b249ca0fce767216f09a6a94a2d5 (diff)
downloadrt.equinox.framework-618982b49d72803c2479a461aff1b60d97acd63b.zip
rt.equinox.framework-618982b49d72803c2479a461aff1b60d97acd63b.tar.gz
rt.equinox.framework-618982b49d72803c2479a461aff1b60d97acd63b.tar.bz2
Fix misspelling in ResolutionReport interface method name.
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java4
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolutionReport.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/report/resolution/ResolutionReport.java2
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 8e512ac..95f484d 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<Module> 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<Module> modules) {
ModuleResolutionReport report = container.resolve(modules, false);
- assertNull("Unexpected resolution exception", report.getResoltuionException());
+ assertNull("Unexpected resolution exception", report.getResolutionException());
}
private void assertResolutionReportEntriesNotNull(Map<Resource, List<ResolutionReport.Entry>> 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 85ce92b..a461c46 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 28b0f94..80a5947 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 7d447f0..3e66c4f 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 6358d97..21a4db2 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 0e5e160..04768c8 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.