You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2014/10/04 18:38:13 UTC

svn commit: r1629413 - in /felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot: DeviceAccessImpl.java DeviceAndParameterFactory.java

Author: pderop
Date: Sat Oct  4 16:38:12 2014
New Revision: 1629413

URL: http://svn.apache.org/r1629413
Log:
code cleanup

Modified:
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAndParameterFactory.java

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessImpl.java?rev=1629413&r1=1629412&r2=1629413&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessImpl.java Sat Oct  4 16:38:12 2014
@@ -28,7 +28,7 @@ public class DeviceAccessImpl implements
     }
     
     @Start
-    Map start() {
+    Map<?,?> start() {
         Helper.log("device.annot", "DeviceAccessImpl.start");
         // Dynamically add a service property, using the device.id
         Map<String, Object> props = new Hashtable<>();

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAndParameterFactory.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAndParameterFactory.java?rev=1629413&r1=1629412&r2=1629413&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAndParameterFactory.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAndParameterFactory.java Sat Oct  4 16:38:12 2014
@@ -16,10 +16,10 @@ import org.apache.felix.dm.annotation.ap
 @Component
 public class DeviceAndParameterFactory {
     @ServiceDependency(filter = "(" + Component.FACTORY_NAME + "=Device)")
-    volatile Set<Dictionary> m_deviceFactory;
+    volatile Set<Dictionary<?,?>> m_deviceFactory;
     
     @ServiceDependency(filter = "(" + Component.FACTORY_NAME + "=DeviceParameter)")
-    volatile Set<Dictionary> m_deviceParameterFactory;
+    volatile Set<Dictionary<?,?>> m_deviceParameterFactory;
 
     @Start
     public void start() {
@@ -32,11 +32,11 @@ public class DeviceAndParameterFactory {
     private void createDeviceAndParameter(int id) {
         Helper.log("device.annot", "DeviceAndParameterFactory: creating Device/DeviceParameter with id=" + id);
 
-        Dictionary device = new Hashtable<>();
+        Dictionary<String,Object> device = new Hashtable<>();
         device.put("device.id", new Integer(id));
         m_deviceFactory.add(device);
         
-        Dictionary param = new Hashtable<>();
+        Dictionary<String, Object> param = new Hashtable<>();
         param.put("device.id", new Integer(id));
         m_deviceParameterFactory.add(param);
     }