diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/datasource/AbstractDatabaseConnection.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/datasource/AbstractDatabaseConnection.java | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/datasource/AbstractDatabaseConnection.java b/src/de/lmu/ifi/dbs/elki/datasource/AbstractDatabaseConnection.java index dfd9f981..25afa6bc 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/AbstractDatabaseConnection.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/AbstractDatabaseConnection.java @@ -58,7 +58,7 @@ public abstract class AbstractDatabaseConnection implements DatabaseConnection { * Key: {@code -dbc.filter} * </p> */ - public static final OptionID FILTERS_ID = OptionID.getOrCreateOptionID("dbc.filter", "The filters to apply to the input data."); + public static final OptionID FILTERS_ID = new OptionID("dbc.filter", "The filters to apply to the input data."); /** * Parameter to specify the parser to provide a database. @@ -66,7 +66,7 @@ public abstract class AbstractDatabaseConnection implements DatabaseConnection { * Key: {@code -dbc.parser} * </p> */ - public static final OptionID PARSER_ID = OptionID.getOrCreateOptionID("dbc.parser", "Parser to provide the database."); + public static final OptionID PARSER_ID = new OptionID("dbc.parser", "Parser to provide the database."); /** * The filters to invoke @@ -182,15 +182,22 @@ public abstract class AbstractDatabaseConnection implements DatabaseConnection { * * @apiviz.exclude */ - public static abstract class Parameterizer extends AbstractParameterizer { + public abstract static class Parameterizer extends AbstractParameterizer { + /** + * Filters + */ protected List<ObjectFilter> filters; + + /** + * Parser to use + */ protected Parser parser = null; - @Override - protected void makeOptions(Parameterization config) { - super.makeOptions(config); - } - + /** + * Get the filters parameter + * + * @param config Parameterization + */ protected void configFilters(Parameterization config) { final ObjectListParameter<ObjectFilter> filterParam = new ObjectListParameter<ObjectFilter>(FILTERS_ID, ObjectFilter.class, true); if(config.grab(filterParam)) { @@ -198,6 +205,13 @@ public abstract class AbstractDatabaseConnection implements DatabaseConnection { } } + /** + * Get the parser parameter + * + * @param config Parameterization + * @param parserRestrictionClass Restriction class + * @param parserDefaultValueClass Default value + */ protected void configParser(Parameterization config, Class<?> parserRestrictionClass, Class<?> parserDefaultValueClass) { ObjectParameter<Parser> parserParam = new ObjectParameter<Parser>(PARSER_ID, parserRestrictionClass, parserDefaultValueClass); if(config.grab(parserParam)) { |