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 2015/07/13 17:17:22 UTC
svn commit: r1690707 -
/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
Author: gnodet
Date: Mon Jul 13 15:17:22 2015
New Revision: 1690707
URL: http://svn.apache.org/r1690707
Log:
[FELIX-4942] Remove dead code
Modified:
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java?rev=1690707&r1=1690706&r2=1690707&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java Mon Jul 13 15:17:22 2015
@@ -1944,145 +1944,6 @@ public class ResolverImpl implements Res
}
}
- private static String toStringBlame(
- ResolveContext rc, Candidates allCandidates, Blame blame)
- {
- StringBuilder sb = new StringBuilder();
- if ((blame.m_reqs != null) && !blame.m_reqs.isEmpty())
- {
- for (int i = 0; i < blame.m_reqs.size(); i++)
- {
- Requirement req = blame.m_reqs.get(i);
- sb.append(" ");
- sb.append(Util.getSymbolicName(req.getResource()));
- sb.append(" [");
- sb.append(req.getResource().toString());
- sb.append("]\n");
- if (req.getNamespace().equals(PackageNamespace.PACKAGE_NAMESPACE))
- {
- sb.append(" import: ");
- }
- else
- {
- sb.append(" require: ");
- }
- sb.append(req.getDirectives().get(Namespace.REQUIREMENT_FILTER_DIRECTIVE));
- sb.append("\n |");
- if (req.getNamespace().equals(PackageNamespace.PACKAGE_NAMESPACE))
- {
- sb.append("\n export: ");
- }
- else
- {
- sb.append("\n provide: ");
- }
- if ((i + 1) < blame.m_reqs.size())
- {
- Capability cap = getSatisfyingCapability(
- rc,
- allCandidates,
- blame.m_reqs.get(i));
- if (cap.getNamespace().equals(PackageNamespace.PACKAGE_NAMESPACE))
- {
- sb.append(PackageNamespace.PACKAGE_NAMESPACE);
- sb.append("=");
- sb.append(cap.getAttributes()
- .get(PackageNamespace.PACKAGE_NAMESPACE).toString());
- Capability usedCap =
- getSatisfyingCapability(
- rc,
- allCandidates,
- blame.m_reqs.get(i + 1));
- sb.append("; uses:=");
- sb.append(usedCap.getAttributes()
- .get(PackageNamespace.PACKAGE_NAMESPACE));
- }
- else
- {
- sb.append(cap);
- }
- sb.append("\n");
- }
- else
- {
- Capability export = getSatisfyingCapability(
- rc,
- allCandidates,
- blame.m_reqs.get(i));
- sb.append(export.getNamespace());
- sb.append(": ");
- Object namespaceVal = export.getAttributes().get(export.getNamespace());
- if (namespaceVal != null)
- {
- sb.append(namespaceVal.toString());
- }
- else
- {
- for (Entry<String, Object> attrEntry : export.getAttributes().entrySet())
- {
- sb.append(attrEntry.getKey()).append('=')
- .append(attrEntry.getValue()).append(';');
- }
- }
- if (export.getNamespace().equals(PackageNamespace.PACKAGE_NAMESPACE)
- && !export.getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE)
- .equals(blame.m_cap.getAttributes().get(
- PackageNamespace.PACKAGE_NAMESPACE)))
- {
- sb.append("; uses:=");
- sb.append(blame.m_cap.getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE));
- sb.append("\n export: ");
- sb.append(PackageNamespace.PACKAGE_NAMESPACE);
- sb.append("=");
- sb.append(blame.m_cap.getAttributes()
- .get(PackageNamespace.PACKAGE_NAMESPACE).toString());
- }
- sb.append("\n ");
- sb.append(Util.getSymbolicName(blame.m_cap.getResource()));
- sb.append(" [");
- sb.append(blame.m_cap.getResource().toString());
- sb.append("]");
- }
- }
- }
- else
- {
- sb.append(blame.m_cap.getResource().toString());
- }
- return sb.toString();
- }
-
- private static Capability getSatisfyingCapability(
- ResolveContext rc, Candidates allCandidates, Requirement req)
- {
- // If the requiring revision is not resolved, then check in the
- // candidate map for its matching candidate.
- Capability cap = allCandidates.getFirstCandidate(req);
- // Otherwise, if the requiring revision is resolved then check
- // in its wires for the capability satisfying the requirement.
- if (cap == null && rc.getWirings().containsKey(req.getResource()))
- {
- List<Wire> wires =
- rc.getWirings().get(req.getResource()).getRequiredResourceWires(null);
- req = getDeclaredRequirement(req);
- for (Wire w : wires)
- {
- if (w.getRequirement().equals(req))
- {
-// TODO: RESOLVER - This is not 100% correct, since requirements for
-// dynamic imports with wildcards will reside on many wires and
-// this code only finds the first one, not necessarily the correct
-// one. This is only used for the diagnostic message, but it still
-// could confuse the user.
- cap = w.getCapability();
- break;
- }
- }
- }
-
- return cap;
- }
-
private static class Packages
{
public final OpenHashMap<String, Blame> m_exportedPkgs;