svn commit: r947783 - in /felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver: WireImpl.java WireModuleImpl.java

[rickhall]

Author: rickhall
Date: Mon May 24 20:14:45 2010
New Revision: 947783

URL: http://svn.apache.org/viewvc?rev=947783&view=rev
Log:
Simplify wiring debug info. (FELIX-2035)

Modified:
    
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
    
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java

Modified: 
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/WireImpl.java?rev=947783&r1=947782&r2=947783&view=diff
==============================================================================
--- 
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
 (original)
+++ 
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
 Mon May 24 20:14:45 2010
@@ -62,7 +62,7 @@ public class WireImpl implements Wire
 
     public String toString()
     {
-        return m_req + " (" + m_importer + ") -> " + m_cap + " (" + m_exporter 
+ ")";
+        return m_req + " -> " + "[" + m_exporter + "]";
     }
 
     /* (non-Javadoc)

Modified: 
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java?rev=947783&r1=947782&r2=947783&view=diff
==============================================================================
--- 
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
 (original)
+++ 
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
 Mon May 24 20:14:45 2010
@@ -28,18 +28,18 @@ import org.apache.felix.framework.util.U
 public class WireModuleImpl implements Wire
 {
     private final Module m_importer;
-    private final Requirement m_requirement;
+    private final Requirement m_req;
     private final Module m_exporter;
-    private final Capability m_capability;
+    private final Capability m_cap;
     private final List<String> m_packages;
 
     public WireModuleImpl(Module importer, Requirement requirement,
         Module exporter, Capability capability, List<String> packages)
     {
         m_importer = importer;
-        m_requirement = requirement;
+        m_req = requirement;
         m_exporter = exporter;
-        m_capability = capability;
+        m_cap = capability;
         m_packages = packages;
     }
 
@@ -56,7 +56,7 @@ public class WireModuleImpl implements W
      */
     public Requirement getRequirement()
     {
-        return m_requirement;
+        return m_req;
     }
 
     /* (non-Javadoc)
@@ -72,7 +72,7 @@ public class WireModuleImpl implements W
      */
     public Capability getCapability()
     {
-        return m_capability;
+        return m_cap;
     }
 
     /* (non-Javadoc)
@@ -159,6 +159,6 @@ public class WireModuleImpl implements W
 
     public String toString()
     {
-        return m_importer + " -> " + m_capability + " -> " + m_exporter;
+        return m_req + " -> " + "[" + m_exporter + "]";
     }
 }
\ No newline at end of file