use renamed class names

bob/bio/base/script/annotate.py

@@ -5,22 +5,22 @@ import json
 import click
 from os.path import dirname, isfile
 from bob.extension.scripts.click_helper import (
-    verbosity_option, Command, Option)
+    verbosity_option, ConfigCommand, ResourceOption)
 from bob.io.base import create_directories_safe
 from bob.bio.base.tools.grid import indices
 
 logger = logging.getLogger(__name__)
 
 
-@click.command(entry_point_group='bob.bio.config', cls=Command)
-@click.option('--database', '-d', required=True, cls=Option,
+@click.command(entry_point_group='bob.bio.config', cls=ConfigCommand)
+@click.option('--database', '-d', required=True, cls=ResourceOption,
               entry_point_group='bob.bio.database')
-@click.option('--annotator', '-a', required=True, cls=Option,
+@click.option('--annotator', '-a', required=True, cls=ResourceOption,
               entry_point_group='bob.bio.annotator')
-@click.option('--output-dir', '-o', required=True, cls=Option)
-@click.option('--force', '-f', is_flag=True, cls=Option)
+@click.option('--output-dir', '-o', required=True, cls=ResourceOption)
+@click.option('--force', '-f', is_flag=True, cls=ResourceOption)
 @click.option('--array', type=click.INT, default=1,)
-@verbosity_option(cls=Option)
+@verbosity_option(cls=ResourceOption)
 def annotate(database, annotator, output_dir, force, array, **kwargs):
     """Annotates a database.
     The annotations are written in text file (json) format which can be read