Commit c2783e57 authored by Jakob Schöttl's avatar Jakob Schöttl

Fix keywords of logger and fix warnings

parent fb80126a
......@@ -119,11 +119,11 @@ public class DataProcessingJsonManager {
this.dataProcessors.add(dataProcessor);
}
public void addInstantiatedProcessor(final DataProcessor dataProcessor) {
public void addInstantiatedProcessor(final DataProcessor<?, ?> dataProcessor) {
this.dataProcessors.add(dataProcessor);
}
public void updateDataProcessor(final DataProcessor oldDataProcessor, final DataProcessorStore newDataProcessorStore) {
public void updateDataProcessor(final DataProcessor<?, ?> oldDataProcessor, final DataProcessorStore newDataProcessorStore) {
this.dataProcessors.remove(oldDataProcessor);
addProcessor(newDataProcessorStore);
}
......@@ -136,7 +136,7 @@ public class DataProcessingJsonManager {
this.isTimestamped = isTimestamped;
}
private static JsonNode serializeOutputFile(final OutputFile outputFile) {
private static JsonNode serializeOutputFile(final OutputFile<?> outputFile) {
ObjectNode node = mapper.createObjectNode();
node.put(TYPE_KEY, outputFile.getClass().getName());
......@@ -151,7 +151,7 @@ public class DataProcessingJsonManager {
return node;
}
public static JsonNode serializeProcessor(final DataProcessor dataProcessor) {
public static JsonNode serializeProcessor(final DataProcessor<?, ?> dataProcessor) {
ObjectNode node = mapper.createObjectNode();
node.put(TYPE_KEY, dataProcessor.getClass().getName());
......
......@@ -25,7 +25,7 @@ import org.vadere.util.geometry.shapes.VShape;
public class Topography {
/** Transient to prevent JSON serialization. */
private transient Logger logger = Logger.getLogger(Topography.class);
private static Logger logger = Logger.getLogger(Topography.class);
// TODO [priority=low] [task=feature] magic number, use attributes / parameter?
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment