svn commit: r901777 - in /felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework: Felix.java capabilityset/CapabilitySet.java util/manifestparser/CapabilityImpl.java util/manifestparser/ManifestParser.java

[rickhall]

Author: rickhall
Date: Thu Jan 21 17:12:03 2010
New Revision: 901777

URL: http://svn.apache.org/viewvc?rev=901777&view=rev
Log:
More fixes, getting close to doing something.

Modified:
    
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/Felix.java
    
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
    
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/CapabilityImpl.java
    
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java

Modified: 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/Felix.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/Felix.java?rev=901777&r1=901776&r2=901777&view=diff
==============================================================================
--- 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/Felix.java
 (original)
+++ 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/Felix.java
 Thu Jan 21 17:12:03 2010
@@ -4002,16 +4002,13 @@
 
                     // Only add wires attribute if some exist; export
                     // only modules may not have wires.
-                    if (wires.size() > 0)
+                    for (int wireIdx = 0; wireIdx < wires.size(); wireIdx++)
                     {
-                        for (int wireIdx = 0; wireIdx < wires.size(); 
wireIdx++)
-                        {
-                            m_logger.log(
-                                Logger.LOG_DEBUG,
-                                "WIRE: " + wires.get(wireIdx));
-                        }
-                        ((ModuleImpl) module).setWires(wires);
+                        m_logger.log(
+                            Logger.LOG_DEBUG,
+                            "WIRE: " + wires.get(wireIdx));
                     }
+                    ((ModuleImpl) module).setWires(wires);
 
                     // Resolve all attached fragments.
                     List<Module> fragments = ((ModuleImpl) 
module).getFragments();

Modified: 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java?rev=901777&r1=901776&r2=901777&view=diff
==============================================================================
--- 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
 (original)
+++ 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
 Thu Jan 21 17:12:03 2010
@@ -85,7 +85,7 @@
                 }
             }
 
-            System.out.println("+++ INDICES " + m_indices);
+//            System.out.println("+++ INDICES " + m_indices);
         }
     }
 

Modified: 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/CapabilityImpl.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/CapabilityImpl.java?rev=901777&r1=901776&r2=901777&view=diff
==============================================================================
--- 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/CapabilityImpl.java
 (original)
+++ 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/CapabilityImpl.java
 Thu Jan 21 17:12:03 2010
@@ -53,7 +53,7 @@
 
         // Find all export directives: uses, mandatory, include, and exclude.
         String mandatory = "";
-        List<String> uses = null;
+        List<String> uses = new ArrayList(0);
         List<List<String>> includeFilter = null, excludeFilter = null;
         for (int dirIdx = 0; dirIdx < m_dirs.size(); dirIdx++)
         {

Modified: 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java?rev=901777&r1=901776&r2=901777&view=diff
==============================================================================
--- 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
 (original)
+++ 
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
 Thu Jan 21 17:12:03 2010
@@ -182,6 +182,12 @@
             exportCaps = calculateImplicitUses(exportCaps, allImportClauses);
         }
 
+        // Combine all capabilities.
+        m_capabilities = new ArrayList(
+             capList.size() + exportCaps.size());
+        m_capabilities.addAll(capList);
+        m_capabilities.addAll(exportCaps);
+
         // Combine all requirements.
         m_requirements = new ArrayList(
              importReqs.size() + requireReqs.size() + hostReqs.size());