Get rid of GetDetectionType

detection/examples/AudioVideoComponent/plugin-files/descriptor/descriptor.json

@@ -9,6 +9,7 @@
     "name": "JavaAudioVideo",
     "description": "An example detection component for audio processing of audio and video media.",
     "actionType": "DETECTION",
+    "trackType": "AUDIOVIDEO",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

detection/examples/AudioVideoComponent/src/main/java/org/mitre/mpf/examples/audiovideo/AudioVideoComponent.java

@@ -94,8 +94,4 @@ public List<MPFAudioTrack> getDetections(MPFAudioJob mpfAudioJob) throws MPFComp
 
         return tracks;
     }
-
-    public String getDetectionType() {
-        return "AUDIOVIDEO";
-    }
 }

detection/examples/HelloWorldComponent/plugin-files/descriptor/descriptor.json

@@ -9,6 +9,7 @@
     "name": "JavaHelloWorld",
     "description": "A simple example detection component.",
     "actionType": "DETECTION",
+    "trackType": "HELLO",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

detection/examples/HelloWorldComponent/src/main/java/org/mitre/mpf/examples/hello/HelloWorldComponent.java

@@ -282,8 +282,4 @@ public boolean supports(MPFDataType mpfDataType) {
         }
         return false;
     }
-
-    public String getDetectionType() {
-        return "HELLO";
-    }
 }

detection/java-component-api/src/main/java/org/mitre/mpf/component/api/detection/MPFDetectionComponentInterface.java

@@ -89,11 +89,4 @@ public interface MPFDetectionComponentInterface extends MPFComponentInterface {
      * @return  True if the data type is supported by this component.
      */
     boolean supports(MPFDataType dataType);
-
-    /**
-     * Gets the detection type for the component.
-     *
-     * @return The detection type.
-     */
-    String getDetectionType();
 }

detection/java-component-api/src/main/java/org/mitre/mpf/component/api/detection/adapters/MPFAudioAndVideoDetectionComponentAdapter.java

@@ -141,6 +141,4 @@ public List<MPFGenericTrack> getDetections(MPFGenericJob job) throws MPFComponen
     public boolean supports(MPFDataType dataType) {
         return (MPFDataType.AUDIO == dataType) || (MPFDataType.VIDEO == dataType);
     }
-
-    public abstract String getDetectionType();
 }

detection/java-component-api/src/test/java/org/mitre/mpf/component/api/detection/adapters/MPFAudioAndVideoDetectionComponentAdapterTest.java

@@ -93,12 +93,6 @@ public List<MPFAudioTrack> getDetections(MPFAudioJob job) throws MPFComponentDet
             }
             return tracks;
         }
-
-        @Override
-        public String getDetectionType() {
-            return "TEST";
-        }
-
     }
 
-}
+}