convert annotation files to filesets too

bob/pad/base/test/dummy/database.py

@@ -190,5 +190,8 @@ class TestDatabase(PadDatabase):
                 fileset += [TestFile(dummy_test_list[1], 6)]
         return fileset
 
+    def annotations(self, file):
+        return None
+
 
 database = TestDatabase(original_directory=data_dir, original_extension='')

bob/pad/base/test/dummy/database_sql.py

@@ -56,4 +56,7 @@ class TestDatabaseSql (bob.pad.base.database.PadDatabase, bob.db.base.SQLiteData
     def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs):
         return list(self.query(TestFileSql))
 
+    def annotations(self, file):
+        return None
+
 database = TestDatabaseSql()
\ No newline at end of file

bob/pad/base/tools/FileSelector.py

@@ -149,7 +149,11 @@ class FileSelector(object):
 
     def annotation_list(self, groups=None):
         """Returns the list of annotations objects."""
-        return self.database.all_files(groups=groups)
+        files = self.database.all_files(groups=groups)
+        if len(files) != 2:
+            return files
+        else:
+            return files[0] + files[1]
 
     def get_annotations(self, annotation_file):
         """Returns the annotations of the given file."""