initial FC re-work

src/main/java/net/floodlightcontroller/core/IListener.java

@@ -17,14 +17,11 @@
 
 package net.floodlightcontroller.core;
 
-/**
- * Interface for implementing an event listener with support for ordering 
- * based on prerequisites and postrequisites.
- * @author readams
- *
- * @param <T> The event type
- */
 public interface IListener<T> {
+    public enum Command {
+        CONTINUE, STOP
+    }
+    
     /**
      * The name assigned to this listener
      * @return

src/main/java/net/floodlightcontroller/core/IOFMessageListener.java

@@ -26,10 +26,6 @@ import org.openflow.protocol.OFType;
  * @author David Erickson (daviderickson@cs.stanford.edu)
  */
 public interface IOFMessageListener extends IListener<OFType> {
-    public enum Command {
-        CONTINUE, STOP
-    }
-
   /**
    * This is the method Floodlight uses to call listeners with OpenFlow messages
    * @param sw the OpenFlow switch that sent this message

src/main/java/net/floodlightcontroller/core/internal/Controller.java

@@ -51,7 +51,7 @@ import net.floodlightcontroller.core.IFloodlightProviderService;
 import net.floodlightcontroller.core.IHAListener;
 import net.floodlightcontroller.core.IInfoProvider;
 import net.floodlightcontroller.core.IOFMessageListener;
-import net.floodlightcontroller.core.IOFMessageListener.Command;
+import net.floodlightcontroller.core.IListener.Command;
 import net.floodlightcontroller.core.IOFSwitch;
 import net.floodlightcontroller.core.IOFSwitchFilter;
 import net.floodlightcontroller.core.IOFSwitchListener;

src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java

@@ -38,7 +38,7 @@ import net.floodlightcontroller.core.IHAListener;
 import net.floodlightcontroller.core.IFloodlightProviderService.Role;
 import net.floodlightcontroller.core.IOFMessageFilterManagerService;
 import net.floodlightcontroller.core.IOFMessageListener;
-import net.floodlightcontroller.core.IOFMessageListener.Command;
+import net.floodlightcontroller.core.IListener.Command;
 import net.floodlightcontroller.core.IOFSwitch;
 import net.floodlightcontroller.core.IOFSwitchListener;
 import net.floodlightcontroller.core.OFMessageFilterManager;

src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java

@@ -33,7 +33,7 @@ import net.floodlightcontroller.core.IOFMessageListener;
 import net.floodlightcontroller.core.IOFSwitch;
 import net.floodlightcontroller.core.IOFSwitchFilter;
 import net.floodlightcontroller.core.IOFSwitchListener;
-import net.floodlightcontroller.core.IOFMessageListener.Command;
+import net.floodlightcontroller.core.IListener.Command;
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.FloodlightModuleException;
 import net.floodlightcontroller.core.module.IFloodlightModule;