You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2010/02/26 17:16:09 UTC
svn commit: r916738 - in
/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository:
Capability.java Requirement.java impl/CapabilityImpl.java
impl/RequirementImpl.java impl/ResolverImpl.java
Author: gnodet
Date: Fri Feb 26 16:16:09 2010
New Revision: 916738
URL: http://svn.apache.org/viewvc?rev=916738&view=rev
Log:
FELIX-2127: The explanation why a resource is included is nearly useless
Modified:
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Capability.java
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/CapabilityImpl.java
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RequirementImpl.java
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java
Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Capability.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Capability.java?rev=916738&r1=916737&r2=916738&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Capability.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Capability.java Fri Feb 26 16:16:09 2010
@@ -45,4 +45,11 @@
* @return a Map<String,List>
*/
Map getProperties();
+
+ /**
+ * Return the resource this capability belongs to
+ *
+ * @return the resource
+ */
+ Resource getResource();
}
\ No newline at end of file
Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java?rev=916738&r1=916737&r2=916738&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java Fri Feb 26 16:16:09 2010
@@ -50,4 +50,12 @@
String getComment();
boolean isSatisfied(Capability capability);
+
+ /**
+ * Return the resource this requirement belongs to
+ * or <code>null</code
+ *
+ * @return the resource
+ */
+ Resource getResource();
}
\ No newline at end of file
Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/CapabilityImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/CapabilityImpl.java?rev=916738&r1=916737&r2=916738&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/CapabilityImpl.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/CapabilityImpl.java Fri Feb 26 16:16:09 2010
@@ -21,6 +21,7 @@
import java.util.*;
import org.apache.felix.bundlerepository.Capability;
+import org.apache.felix.bundlerepository.Resource;
public class CapabilityImpl implements Capability
{
@@ -32,7 +33,7 @@
{
}
- public ResourceImpl getResource()
+ public Resource getResource()
{
return m_resource;
}
Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RequirementImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RequirementImpl.java?rev=916738&r1=916737&r2=916738&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RequirementImpl.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RequirementImpl.java Fri Feb 26 16:16:09 2010
@@ -116,6 +116,10 @@
public synchronized boolean equals(Object o)
{
+ if (this == o)
+ {
+ return true;
+ }
if (o instanceof Requirement)
{
Requirement r = (Requirement) o;
Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java?rev=916738&r1=916737&r2=916738&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java Fri Feb 26 16:16:09 2010
@@ -175,7 +175,9 @@
ResourceImpl fake = new ResourceImpl();
for (Iterator iter = m_addedRequirementSet.iterator(); iter.hasNext(); )
{
- fake.addRequire((Requirement) iter.next());
+ Requirement req = (Requirement) iter.next();
+ fake.addRequire(req);
+ ((RequirementImpl) req).setResource(null);
}
if (!resolve(fake, locals, remotes, false))
{
@@ -638,13 +640,6 @@
}
else
{
- for (int reqIdx = 0; reqIdx < reasons.length; reqIdx++)
- {
- if (req.equals(reasons[reqIdx]))
- {
- return;
- }
- }
Requirement[] tmp = new Requirement[reasons.length + 1];
System.arraycopy(reasons, 0, tmp, 0, reasons.length);
tmp[reasons.length] = req;