Merge into master from pull request #153:

add FlowReconcileService to DeviceManager's dependency list (https://github.com/floodlight/floodlight/pull/153)

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

@@ -599,6 +599,7 @@ public class DeviceManagerImpl implements
         l.add(ITopologyService.class);
         l.add(IRestApiService.class);
         l.add(IThreadPoolService.class);
+        l.add(IFlowReconcileService.class);
         return l;
     }
 

src/main/java/net/floodlightcontroller/flowcache/FlowReconcileManager.java

@@ -17,15 +17,6 @@ import org.openflow.protocol.OFType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- * This class registers for various network events that may require flow 
- * reconciliation. Examples include host-move, new attachment-point,
- * switch connection etc. 
- * 
- * @author subrata
- *
- */
 public class FlowReconcileManager 
         implements IFloodlightModule, IFlowReconcileService {
 
@@ -100,7 +91,7 @@ public class FlowReconcileManager
     @Override
     public Collection<Class<? extends IFloodlightService>> getModuleServices() {
         Collection<Class<? extends IFloodlightService>> l = 
-                new ArrayList<Class<? extends IFloodlightService>>();
+            new ArrayList<Class<? extends IFloodlightService>>();
         l.add(IFlowReconcileService.class);
         return l;
     }
@@ -108,8 +99,8 @@ public class FlowReconcileManager
     @Override
     public Map<Class<? extends IFloodlightService>, IFloodlightService> 
                                                             getServiceImpls() {
-    	Map<Class<? extends IFloodlightService>,
-    	IFloodlightService> m = 
+        Map<Class<? extends IFloodlightService>,
+        IFloodlightService> m = 
             new HashMap<Class<? extends IFloodlightService>,
                 IFloodlightService>();
         m.put(IFlowReconcileService.class, this);