From a0ad08bb71b38bb0d9e234f0677d8243e6cce8c0 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann@fedoraproject.org>
Date: Fri, 15 Jun 2012 13:09:59 +0200
Subject: [PATCH 2/2] JDK7 support
---
src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java | 6 +++---
src/main/java/org/osgi/service/resolver/Resolver.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java b/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java
index 1f44d0d..9bac315 100644
--- a/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java
+++ b/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java
@@ -73,8 +73,8 @@ public class ResolverImpl implements FelixResolver
public Map<Resource, List<Wire>> resolve(
Environment env,
- Collection<? extends Resource> mandatoryRevisions,
- Collection<? extends Resource> optionalRevisions)
+ Collection<Resource> mandatoryRevisions,
+ Collection<Resource> optionalRevisions)
{
return resolve((FelixEnvironment)env, mandatoryRevisions, optionalRevisions, Collections.EMPTY_SET);
}
@@ -1787,4 +1787,4 @@ public class ResolverImpl implements FelixResolver
&& m_cap.equals(((Blame) o).m_cap);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/osgi/service/resolver/Resolver.java b/src/main/java/org/osgi/service/resolver/Resolver.java
index 7c7bbe4..f4bb536 100644
--- a/src/main/java/org/osgi/service/resolver/Resolver.java
+++ b/src/main/java/org/osgi/service/resolver/Resolver.java
@@ -105,7 +105,7 @@ public interface Resolver {
* if environment is null
*/
Map<Resource, List<Wire>> resolve(Environment environment,
- Collection<? extends Resource> mandatoryResources,
- Collection<? extends Resource> optionalResources)
+ Collection<Resource> mandatoryResources,
+ Collection<Resource> optionalResources)
throws ResolutionException;
}
--
1.7.10.2