svn commit: r963393 - in /felix/trunk/ipojo/webconsole-plugin/src/main: java/org/apache/felix/ipojo/webconsole/IPOJOPlugin.java resources/res/instance.html resources/res/ui/instance_detail.js

[cl...@apache.org]

Author: clement
Date: Mon Jul 12 17:44:51 2010
New Revision: 963393

URL: http://svn.apache.org/viewvc?rev=963393&view=rev
Log:
Add filter in dependency requirements. (remove Id)

Modified:
    felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOPlugin.java
    felix/trunk/ipojo/webconsole-plugin/src/main/resources/res/instance.html
    felix/trunk/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js

Modified: felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOPlugin.java?rev=963393&r1=963392&r2=963393&view=diff
==============================================================================
--- felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOPlugin.java (original)
+++ felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/ipojo/webconsole/IPOJOPlugin.java Mon Jul 12 17:44:51 2010
@@ -505,7 +505,9 @@ public class IPOJOPlugin extends Abstrac
             req.put("policy", getDependencyBindingPolicy(dep.getPolicy()));
             req.put("optional", dep.isOptional());
             req.put("aggregate", dep.isMultiple());
-            //TODO Add filter support
+            if (dep.getFilter() != null) {
+                req.put("filter", dep.getFilter());
+            }
             if (dep.getServiceReferences() != null  && dep.getServiceReferences().size() != 0) {
                 req.put("matching",  getServiceReferenceList(dep.getServiceReferences()));
             }

Modified: felix/trunk/ipojo/webconsole-plugin/src/main/resources/res/instance.html
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/src/main/resources/res/instance.html?rev=963393&r1=963392&r2=963393&view=diff
==============================================================================
--- felix/trunk/ipojo/webconsole-plugin/src/main/resources/res/instance.html (original)
+++ felix/trunk/ipojo/webconsole-plugin/src/main/resources/res/instance.html Mon Jul 12 17:44:51 2010
@@ -64,8 +64,8 @@
                     <thead>
                         <tr>
                             <th class="col_Name">Specification</th>
-                            <th class="col_Id">Id</th>
                             <th class="col_State">State</th>
+                            <th class="col_Filter">Filter</th>
                             <th class="col_Policy">Binding Policy</th>
                             <th class="col_Optional">Optional</th>
                             <th class="col_Aggregate">Aggregate</th>
@@ -76,8 +76,8 @@
                     <tbody>
                        <tr class="ui-widget-content"><!-- template -->
                             <td class="ui-widget-content name">&nbsp; </td>
-                            <td class="ui-widget-content id">&nbsp; </td>
                             <td class="ui-widget-content state">&nbsp;</td>
+                            <td class="ui-widget-content filter">&nbsp; </td>                        
                             <td class="ui-widget-content policy">&nbsp;</td>
                             <td class="ui-widget-content optional">&nbsp; </td>
                             <td class="ui-widget-content aggregate">&nbsp; </td>

Modified: felix/trunk/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js?rev=963393&r1=963392&r2=963393&view=diff
==============================================================================
--- felix/trunk/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js (original)
+++ felix/trunk/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js Mon Jul 12 17:44:51 2010
@@ -79,7 +79,12 @@ function createDetail(instance) {
             // For each service clone the template
             var entry = reqEntryTemplate.clone().appendTo(tableReqBody).attr('id', 'req-' + service.id);
             entry.find('td.name').text(service.specification);
-            entry.find('td.id').text(service.id);
+            if (service.filter) {
+                entry.find('td.filter').text(service.filter);    
+            } else {
+                entry.find('td.filter').html('<i>no filter</i>');
+            }
+            
             entry.find('td.state').text(service.state);
             
             entry.find('td.policy').text(service.policy);