Fixed an apparent type. (FELIX-2115)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@915184 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
index 32b6318..79cc0c7 100644
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
+++ b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
@@ -481,7 +481,7 @@
{
if (Thread.interrupted())
{
- throw new InterrupteResolutionException();
+ throw new InterruptedResolutionException();
}
}
diff --git a/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java b/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java
index c38394b..3fc88d5 100644
--- a/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java
+++ b/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java
@@ -119,4 +119,4 @@
dict.put("PACKAGE", "org.eclipse.core.runtime");
assertFalse(filterImpl.matchCase(dict));
}
-}
+}
\ No newline at end of file
diff --git a/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java b/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java
index 1680886..d08cdf1 100644
--- a/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java
+++ b/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java
@@ -27,7 +27,6 @@
public class RepositoryAdminTest extends TestCase
{
-
public void testResourceFilterOnCapabilities() throws Exception
{
URL url = getClass().getResource("/repo_for_resolvertest.xml");
@@ -44,7 +43,6 @@
assertEquals(1, resources.length);
}
-
private RepositoryAdminImpl createRepositoryAdmin()
{
final MockBundleContext bundleContext = new MockBundleContext() {
@@ -63,5 +61,4 @@
return repoAdmin;
}
-
-}
+}
\ No newline at end of file
diff --git a/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java b/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java
index 5f71856..e55288d 100644
--- a/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java
+++ b/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.osgi.service.obr.InterrupteResolutionException;
+import org.osgi.service.obr.InterruptedResolutionException;
import org.osgi.service.obr.Repository;
import org.osgi.service.obr.Requirement;
import org.osgi.service.obr.Resolver;
@@ -91,7 +91,7 @@
resolver.resolve();
fail("An excepiton should have been thrown");
}
- catch (InterrupteResolutionException e)
+ catch (InterruptedResolutionException e)
{
// ok
}
diff --git a/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterrupteResolutionException.java b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterruptedResolutionException.java
similarity index 77%
rename from org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterrupteResolutionException.java
rename to org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterruptedResolutionException.java
index c12b3c5..88a47e3 100644
--- a/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterrupteResolutionException.java
+++ b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterruptedResolutionException.java
@@ -22,27 +22,24 @@
*
* Exception thrown by the resolver if the resolution has been interrupted.
*/
-public class InterrupteResolutionException extends RuntimeException
+public class InterruptedResolutionException extends RuntimeException
{
-
- public InterrupteResolutionException()
+ public InterruptedResolutionException()
{
}
- public InterrupteResolutionException(String message)
+ public InterruptedResolutionException(String message)
{
super(message);
}
- public InterrupteResolutionException(String message, Throwable cause)
+ public InterruptedResolutionException(String message, Throwable cause)
{
super(message, cause);
}
- public InterrupteResolutionException(Throwable cause)
+ public InterruptedResolutionException(Throwable cause)
{
super(cause);
}
-
-}
-
+}
\ No newline at end of file
diff --git a/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java
index fd096a4..8124a2c 100644
--- a/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java
+++ b/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java
@@ -77,7 +77,7 @@
* time. The result will be to stop the resolver and throw an InterruptedException.
*
* @return <code>true</code> if the resolution has succeeded else <code>false</code>
- * @throws InterrupteResolutionException if the resolution has been interrupted
+ * @throws InterruptedResolutionException if the resolution has been interrupted
*/
boolean resolve();