commit c2d4ee14dd8577784523a9af40227939cda5c445
author Richard S. Hall <rickhall@apache.org> Mon Jan 22 07:13:57 2007 +0000
committer Richard S. Hall <rickhall@apache.org> Mon Jan 22 07:13:57 2007 +0000
tree c27488fb6ab3cb7d3f51eaabc8b967f8c8234c3b
parent 99a8b8689fc5ab2a87757df5ba9c1d48f31925f1

Removed and/or modified some utility methods as a result of changes to 
the capability/requirement model. (FELIX-28)


git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@498552 13f79535-47bb-0310-9956-ffa450edef68

framework/src/main/java/org/apache/felix/framework/util/Util.java

diff --git a/framework/src/main/java/org/apache/felix/framework/util/Util.java b/framework/src/main/java/org/apache/felix/framework/util/Util.java
index bc915a6..d0e9bb9 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/Util.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/Util.java
@@ -20,10 +20,8 @@
 
 import java.io.*;
 
-import org.apache.felix.framework.util.manifestparser.R4Export;
-import org.apache.felix.framework.util.manifestparser.R4Import;
-import org.apache.felix.moduleloader.IModule;
-import org.apache.felix.moduleloader.IWire;
+import org.apache.felix.framework.util.manifestparser.Capability;
+import org.apache.felix.moduleloader.*;
 
 public class Util
 {
@@ -189,27 +187,18 @@
         return null;
     }
 
-    public static R4Export getExportPackage(IModule m, String name)
+    public static ICapability getSatisfyingCapability(IModule m, IRequirement req)
     {
-        R4Export[] pkgs = m.getDefinition().getExports();
-        for (int i = 0; (pkgs != null) && (i < pkgs.length); i++)
+        if (req.getNamespace().equals(ICapability.PACKAGE_NAMESPACE))
         {
-            if (pkgs[i].getName().equals(name))
+            ICapability[] caps = m.getDefinition().getCapabilities();
+            for (int i = 0; (caps != null) && (i < caps.length); i++)
             {
-                return pkgs[i];
-            }
-        }
-        return null;
-    }
-
-    public static R4Import getImportPackage(IModule m, String name)
-    {
-        R4Import[] pkgs = m.getDefinition().getImports();
-        for (int i = 0; (pkgs != null) && (i < pkgs.length); i++)
-        {
-            if (pkgs[i].getName().equals(name))
-            {
-                return pkgs[i];
+                if (caps[i].getNamespace().equals(ICapability.PACKAGE_NAMESPACE) &&
+                    req.isSatisfied(caps[i]))
+                {
+                    return caps[i];
+                }
             }
         }
         return null;
@@ -220,7 +209,8 @@
         IWire[] wires = m.getWires();
         for (int i = 0; (wires != null) && (i < wires.length); i++)
         {
-            if (wires[i].getExport().getName().equals(name))
+            if (wires[i].getCapability().getNamespace().equals(ICapability.PACKAGE_NAMESPACE) &&
+                ((Capability) wires[i].getCapability()).getPackageName().equals(name))
             {
                 return wires[i];
             }