Author: rickhall
Date: Wed Dec 23 15:04:06 2009
New Revision: 893540
URL: http://svn.apache.org/viewvc?rev=893540&view=rev
Log:
Minor edits.
Modified:
felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/proto2/Proto2Resolver.java
Modified:
felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/proto2/Proto2Resolver.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/proto2/Proto2Resolver.java?rev=893540&r1=893539&r2=893540&view=diff
==============================================================================
---
felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/proto2/Proto2Resolver.java
(original)
+++
felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/proto2/Proto2Resolver.java
Wed Dec 23 15:04:06 2009
@@ -273,10 +273,6 @@
Module current, String pkgName, List<Constraint> existingConstraints,
Constraint candConstraint)
{
-if (pkgName.equals("foo"))
-{
- System.out.println("+++ CHECKING " + pkgName + " - " + existingConstraints
+ " - " + candConstraint.m_sources);
-}
for (int i = 0; (existingConstraints != null) && (i <
existingConstraints.size()); i++)
{
if
(!existingConstraints.get(i).m_sources.containsAll(candConstraint.m_sources))
@@ -547,6 +543,15 @@
private class Packages
{
+ public final Map<String, Constraint> m_exportedPkgs
+ = new HashMap<String, Constraint>();
+ public final Map<String, Constraint> m_importedPkgs
+ = new HashMap<String, Constraint>();
+ public final Map<String, Constraint> m_requiredPkgs
+ = new HashMap<String, Constraint>();
+ public final Map<String, List<Constraint>> m_usedPkgs
+ = new HashMap<String, List<Constraint>>();
+
public Packages()
{
}
@@ -558,15 +563,6 @@
m_requiredPkgs.putAll(packages.m_requiredPkgs);
m_usedPkgs.putAll(packages.m_usedPkgs);
}
-
- public final Map<String, Constraint> m_exportedPkgs
- = new HashMap<String, Constraint>();
- public final Map<String, Constraint> m_importedPkgs
- = new HashMap<String, Constraint>();
- public final Map<String, Constraint> m_requiredPkgs
- = new HashMap<String, Constraint>();
- public final Map<String, List<Constraint>> m_usedPkgs
- = new HashMap<String, List<Constraint>>();
}
private class Constraint
