Generics: make compiler happy about nested extends

Signed-off-by: Merlijn van Deen <m.vandeen@fugro.com>

src/annotation/DataAnnotationType.java

@@ -21,7 +21,7 @@ import generalDatabase.SQLLoggingAddon;
  * @see SoloAnnotationType
  *
  */
-public abstract class DataAnnotationType<TDataAnnotation extends DataAnnotation> {
+public abstract class DataAnnotationType<TDataAnnotation extends DataAnnotation<?>> {
 
 	public abstract String getAnnotationName();
 

src/annotation/dataselect/AnnotationDataSelCreator.java

@@ -5,7 +5,7 @@ import PamguardMVC.dataSelector.DataSelectorCreator;
 import annotation.DataAnnotation;
 import annotation.DataAnnotationType;
 
-public abstract class AnnotationDataSelCreator<TDataAnnotation extends DataAnnotation> extends DataSelectorCreator {
+public abstract class AnnotationDataSelCreator<TDataAnnotation extends DataAnnotation<?>> extends DataSelectorCreator {
 
 	private DataAnnotationType<TDataAnnotation> dataAnnotationType;
 	

src/annotation/dataselect/AnnotationDataSelector.java

@@ -7,7 +7,7 @@ import PamguardMVC.dataSelector.DataSelector;
 import annotation.DataAnnotation;
 import annotation.DataAnnotationType;
 
-public abstract class AnnotationDataSelector<TDataAnnotation extends DataAnnotation> extends DataSelector {
+public abstract class AnnotationDataSelector<TDataAnnotation extends DataAnnotation<?>> extends DataSelector {
 
 	private DataAnnotationType<TDataAnnotation> annotationType;
 

src/annotation/dataselect/ScalarDataSelector.java

@@ -8,7 +8,7 @@ import annotation.DataAnnotation;
 import annotation.DataAnnotationType;
 import pamViewFX.fxSettingsPanes.DynamicSettingsPane;
 
-public abstract class ScalarDataSelector<TDataAnnotation extends DataAnnotation> extends AnnotationDataSelector<TDataAnnotation> {
+public abstract class ScalarDataSelector<TDataAnnotation extends DataAnnotation<?>> extends AnnotationDataSelector<TDataAnnotation> {
 	
 	/**
 	 * @return the scalarDataParams

src/annotation/string/StringAnnotation.java

@@ -3,11 +3,11 @@ package annotation.string;
 import annotation.DataAnnotation;
 import annotation.DataAnnotationType;
 
-public class StringAnnotation extends DataAnnotation {
+public class StringAnnotation<T extends DataAnnotationType<?>> extends DataAnnotation<T> {
 
 	private String string; 
 	
-	public StringAnnotation(DataAnnotationType dataAnnotationType) {
+	public StringAnnotation(T dataAnnotationType) {
 		super(dataAnnotationType);
 	}
 

src/annotation/string/StringAnnotationType.java

@@ -13,7 +13,7 @@ import annotation.handler.AnnotationOptions;
  * @author Doug Gillespie
  *
  */
-public class StringAnnotationType extends DataAnnotationType<StringAnnotation> {
+public class StringAnnotationType extends DataAnnotationType<StringAnnotation<?>> {
 
 	private String annotationName;
 	private StringSQLLogging sqlAddon;

src/annotation/timestamp/TimestampAnnotation.java

@@ -4,11 +4,11 @@ import PamUtils.PamCalendar;
 import annotation.DataAnnotation;
 import annotation.DataAnnotationType;
 
-public class TimestampAnnotation extends DataAnnotation {
+public class TimestampAnnotation<T extends DataAnnotationType<?>> extends DataAnnotation<T> {
 
 	private long timestamp; 
 	
-	public TimestampAnnotation(DataAnnotationType dataAnnotationType) {
+	public TimestampAnnotation(T dataAnnotationType) {
 		super(dataAnnotationType);
 	}
 

src/annotation/timestamp/TimestampAnnotationType.java

@@ -12,7 +12,7 @@ import annotation.DataAnnotationType;
  * @author Doug Gillespie
  *
  */
-public class TimestampAnnotationType extends DataAnnotationType<TimestampAnnotation> {
+public class TimestampAnnotationType extends DataAnnotationType<TimestampAnnotation<?>> {
 
 	private String annotationName;
 	private TimestampSQLLogging sqlAddon;

src/annotation/userforms/UserFormAnnotation.java

@@ -3,14 +3,14 @@ package annotation.userforms;
 import annotation.DataAnnotation;
 import annotation.DataAnnotationType;
 
-public class UserFormAnnotation extends DataAnnotation {
+public class UserFormAnnotation<T extends DataAnnotationType<?>> extends DataAnnotation<T> {
 
 	/**
 	 * Data extracted from the logger form. 
 	 */
 	private Object[] loggerFormData;
 	
-	public UserFormAnnotation(DataAnnotationType dataAnnotationType, Object[] loggerFormData) {
+	public UserFormAnnotation(T dataAnnotationType, Object[] loggerFormData) {
 		super(dataAnnotationType);
 		this.setLoggerFormData(loggerFormData);
 	}

src/annotation/userforms/UserFormAnnotationType.java

@@ -17,7 +17,7 @@ import loggerForms.FormDescription;
 import loggerForms.FormsControl;
 import loggerForms.LoggerForm;
 
-public class UserFormAnnotationType extends DataAnnotationType<UserFormAnnotation> {
+public class UserFormAnnotationType extends DataAnnotationType<UserFormAnnotation<?>> {
 
 
 	private UserFormAnnotationOptions userFormAnnotationOptions;
@@ -201,7 +201,7 @@ public class UserFormAnnotationType extends DataAnnotationType<UserFormAnnotatio
 	}
 
 	@Override
-	public AnnotationBinaryHandler<UserFormAnnotation> getBinaryHandler() {
+	public AnnotationBinaryHandler<UserFormAnnotation<?>> getBinaryHandler() {
 		if (userFormBinaryHandler == null) {
 			synchronized (this) {
 				if (userFormBinaryHandler == null) {

src/export/MLExport/MLCPODExport.java

@@ -16,7 +16,7 @@ import us.hebi.matlab.mat.types.Struct;
  * @author Jamie Macaulay
  *
  */
-public class MLCPODExport extends MLDataUnitExport<PamDataUnit>{
+public class MLCPODExport extends MLDataUnitExport<PamDataUnit<?, ?>>{
 
 	@Override
 	public Struct addDetectionSpecificFields(Struct mlStruct, int index, PamDataUnit dataUnit) {

src/export/MLExport/MLRawExport.java

@@ -14,7 +14,7 @@ import us.hebi.matlab.mat.types.Struct;
  * @author Jamie Macaulay
  *
  */
-public class MLRawExport extends MLDataUnitExport<PamDataUnit>{
+public class MLRawExport extends MLDataUnitExport<PamDataUnit<?,?>>{
 
 	@Override
 	public Struct addDetectionSpecificFields(Struct mlStruct, int index, PamDataUnit dataUnit) {

src/export/RExport/RCPODExport.java

@@ -10,7 +10,7 @@ import cpod.CPODClick;
 import export.MLExport.MLCPODExport;
 
 
-public class RCPODExport extends RDataUnitExport<PamDataUnit> {
+public class RCPODExport extends RDataUnitExport<PamDataUnit<?, ?>> {
 
 	@Override
 	public NamedBuilder addDetectionSpecificFields(NamedBuilder rData, PamDataUnit dataUnit, int index) {

src/export/RExport/RRawExport.java

@@ -10,7 +10,7 @@ import org.renjin.sexp.ListVector.NamedBuilder;
 
 import clickDetector.ClickDetection;
 
-public class RRawExport extends RDataUnitExport<PamDataUnit> {
+public class RRawExport extends RDataUnitExport<PamDataUnit<?,?>> {
 
 	@Override
 	public NamedBuilder addDetectionSpecificFields(NamedBuilder rData, PamDataUnit dataUnit, int index) {

src/export/wavExport/RawHolderWavExport.java

@@ -9,7 +9,7 @@ import clickDetector.ClickDetection;
  * @author Jamie Macaulay 
  *
  */
-public class RawHolderWavExport extends WavDataUnitExport<PamDataUnit> {
+public class RawHolderWavExport extends WavDataUnitExport<PamDataUnit<?,?>> {
 
 	@Override
 	public double[][] getWavClip(PamDataUnit dataUnit) {