Merges from master branch.

src/main/java/io/github/dsheirer/module/decode/tait/Tait1200Decoder.java

@@ -40,7 +40,6 @@ import io.github.dsheirer.sample.real.RealBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * TAIT 1200 - 1200 baud 2FSK decoder
@@ -189,25 +188,4 @@ public class Tait1200Decoder extends Decoder implements IFilteredRealBufferListe
 	{
 		return DecoderType.TAIT_1200;
 	}
-
-	@Override
-	public void reset()
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void start( ScheduledExecutorService executor )
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void stop()
-	{
-		// TODO Auto-generated method stub
-		
-	}
 }

src/main/java/io/github/dsheirer/module/decode/tait/Tait1200DecoderState.java

@@ -38,7 +38,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.TreeSet;
-import java.util.concurrent.ScheduledExecutorService;
 
 public class Tait1200DecoderState extends DecoderState
 {
@@ -65,16 +64,6 @@ public class Tait1200DecoderState extends DecoderState
         return DecoderType.TAIT_1200;
     }
 
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-    }
-
-    @Override
-    public void stop()
-    {
-    }
-
     @Override
     public void reset()
     {
@@ -83,6 +72,24 @@ public class Tait1200DecoderState extends DecoderState
         resetState();
     }
 
+    @Override
+    public void start()
+    {
+
+    }
+
+    @Override
+    public void stop()
+    {
+
+    }
+
+    @Override
+    public void init()
+    {
+
+    }
+
     private void resetState()
     {
         mFromAttribute.reset();
@@ -176,12 +183,6 @@ public class Tait1200DecoderState extends DecoderState
         return sb.toString();
     }
 
-    @Override
-    public void init()
-    {
-        /* No initialization required */
-    }
-
     /**
      * Responds to reset events issued by the channel state
      */