Skip to content

Commit

Permalink
Removed commented out deDuplicationProcessor references in Configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
cbdmaul committed Dec 5, 2015
1 parent ff1493f commit c29f6c0
Showing 1 changed file with 5 additions and 17 deletions.
22 changes: 5 additions & 17 deletions src/main/java/com/shootoff/config/Configuration.java
Original file line number Diff line number Diff line change
Expand Up @@ -138,22 +138,18 @@ public class Configuration {
private final Set<ShotProcessor> shotProcessors = new HashSet<ShotProcessor>();
private VirtualMagazineProcessor magazineProcessor = null;
private MalfunctionsProcessor malfunctionsProcessor = null;
//private DeduplicationProcessor deduplicationProcessor = null;


protected Configuration(InputStream configInputStream, String name) throws IOException, ConfigurationException {
configInput = configInputStream;
configName = name;
readConfigurationFile();

//deduplicationProcessor = new DeduplicationProcessor();
//shotProcessors.add(deduplicationProcessor);

}

public Configuration(String name) throws IOException, ConfigurationException {
configName = name;
readConfigurationFile();
//deduplicationProcessor = new DeduplicationProcessor();
//shotProcessors.add(deduplicationProcessor);

}

protected Configuration(InputStream configInputStream, String name, String[] args) throws IOException, ConfigurationException {
Expand All @@ -162,8 +158,7 @@ protected Configuration(InputStream configInputStream, String name, String[] arg
parseCmdLine(args);
readConfigurationFile();
parseCmdLine(args); // Parse twice so that we guarantee debug is set and override config file
//deduplicationProcessor = new DeduplicationProcessor();
//shotProcessors.add(deduplicationProcessor);

}

/**
Expand All @@ -181,15 +176,12 @@ public Configuration(String name, String[] args) throws IOException, Configurati
parseCmdLine(args);
readConfigurationFile();
parseCmdLine(args);
//deduplicationProcessor = new DeduplicationProcessor();
//shotProcessors.add(deduplicationProcessor);

}

public Configuration(String[] args) throws ConfigurationException {
configName = DEFAULT_CONFIG_FILE;
parseCmdLine(args);
//deduplicationProcessor = new DeduplicationProcessor();
//shotProcessors.add(deduplicationProcessor);
}

private void readConfigurationFile() throws ConfigurationException, IOException {
Expand Down Expand Up @@ -804,10 +796,6 @@ public Set<CameraManager> getRecordingManagers() {
return recordingManagers;
}

/*public DeduplicationProcessor getDeduplicationProcessor() {
return deduplicationProcessor;
}*/

public Set<ShotProcessor> getShotProcessors() {
return shotProcessors;
}
Expand Down

0 comments on commit c29f6c0

Please sign in to comment.