Loading src/adql/db/DBCommonColumn.java +1 −1 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ package adql.db; * You should have received a copy of the GNU Lesser General Public License * along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2014 - Astronomishes Rechen Institute (ARI) * Copyright 2014 - Astronomishes Rechen Institut (ARI) */ import java.util.ArrayList; Loading src/adql/db/DefaultDBTable.java +1 −1 Original line number Diff line number Diff line Loading @@ -17,7 +17,7 @@ package adql.db; * along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2012-2014 - UDS/Centre de Données astronomiques de Strasbourg (CDS), * Astronomisches Rechen Institute (ARI) * Astronomisches Rechen Institut (ARI) */ import java.util.Collection; Loading src/adql/db/SearchColumnList.java +1 −1 Original line number Diff line number Diff line Loading @@ -17,7 +17,7 @@ package adql.db; * along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2012-2014 - UDS/Centre de Données astronomiques de Strasbourg (CDS), * Astronomishes Rechen Institute (ARI) * Astronomishes Rechen Institut (ARI) */ import java.util.ArrayList; Loading src/adql/db/SearchTableList.java +7 −5 Original line number Diff line number Diff line Loading @@ -16,13 +16,14 @@ package adql.db; * You should have received a copy of the GNU Lesser General Public License * along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2012 - UDS/Centre de Données astronomiques de Strasbourg (CDS) * Copyright 2012,2014 - UDS/Centre de Données astronomiques de Strasbourg (CDS) * Astronomisches Rechen Institut (ARI) */ import java.util.ArrayList; import java.util.Collection; import adql.query.IdentifierField; import adql.query.IdentifierField; import adql.query.from.ADQLTable; import cds.utils.TextualSearchList; Loading @@ -34,8 +35,8 @@ import cds.utils.TextualSearchList; * These last information will be used only if the ADQL table name is ambiguous, otherwise all matching elements are returned. * </p> * * @author Grégory Mantelet (CDS) * @version 09/2011 * @author Grégory Mantelet (CDS;ARI) * @version 1.3 (08/2014) */ public class SearchTableList extends TextualSearchList<DBTable> { private static final long serialVersionUID = 1L; Loading @@ -58,7 +59,7 @@ public class SearchTableList extends TextualSearchList<DBTable> { * * @param collection Collection of {@link DBTable} to copy. */ public SearchTableList(final Collection<DBTable> collection){ public SearchTableList(final Collection<? extends DBTable> collection){ super(collection, new DBTableKeyExtractor()); } Loading Loading @@ -199,6 +200,7 @@ public class SearchTableList extends TextualSearchList<DBTable> { * @version 09/2011 */ private static class DBTableKeyExtractor implements KeyExtractor<DBTable> { @Override public String getKey(DBTable obj){ return obj.getADQLName(); } Loading src/adql/db/exception/UnresolvedJoin.java +1 −1 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ package adql.db.exception; * You should have received a copy of the GNU Lesser General Public License * along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2013-2014 - Astronomishes Rechen Institute (ARI) * Copyright 2013-2014 - Astronomishes Rechen Institut (ARI) */ import adql.parser.ParseException; Loading Loading
src/adql/db/DBCommonColumn.java +1 −1 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ package adql.db; * You should have received a copy of the GNU Lesser General Public License * along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2014 - Astronomishes Rechen Institute (ARI) * Copyright 2014 - Astronomishes Rechen Institut (ARI) */ import java.util.ArrayList; Loading
src/adql/db/DefaultDBTable.java +1 −1 Original line number Diff line number Diff line Loading @@ -17,7 +17,7 @@ package adql.db; * along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2012-2014 - UDS/Centre de Données astronomiques de Strasbourg (CDS), * Astronomisches Rechen Institute (ARI) * Astronomisches Rechen Institut (ARI) */ import java.util.Collection; Loading
src/adql/db/SearchColumnList.java +1 −1 Original line number Diff line number Diff line Loading @@ -17,7 +17,7 @@ package adql.db; * along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2012-2014 - UDS/Centre de Données astronomiques de Strasbourg (CDS), * Astronomishes Rechen Institute (ARI) * Astronomishes Rechen Institut (ARI) */ import java.util.ArrayList; Loading
src/adql/db/SearchTableList.java +7 −5 Original line number Diff line number Diff line Loading @@ -16,13 +16,14 @@ package adql.db; * You should have received a copy of the GNU Lesser General Public License * along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2012 - UDS/Centre de Données astronomiques de Strasbourg (CDS) * Copyright 2012,2014 - UDS/Centre de Données astronomiques de Strasbourg (CDS) * Astronomisches Rechen Institut (ARI) */ import java.util.ArrayList; import java.util.Collection; import adql.query.IdentifierField; import adql.query.IdentifierField; import adql.query.from.ADQLTable; import cds.utils.TextualSearchList; Loading @@ -34,8 +35,8 @@ import cds.utils.TextualSearchList; * These last information will be used only if the ADQL table name is ambiguous, otherwise all matching elements are returned. * </p> * * @author Grégory Mantelet (CDS) * @version 09/2011 * @author Grégory Mantelet (CDS;ARI) * @version 1.3 (08/2014) */ public class SearchTableList extends TextualSearchList<DBTable> { private static final long serialVersionUID = 1L; Loading @@ -58,7 +59,7 @@ public class SearchTableList extends TextualSearchList<DBTable> { * * @param collection Collection of {@link DBTable} to copy. */ public SearchTableList(final Collection<DBTable> collection){ public SearchTableList(final Collection<? extends DBTable> collection){ super(collection, new DBTableKeyExtractor()); } Loading Loading @@ -199,6 +200,7 @@ public class SearchTableList extends TextualSearchList<DBTable> { * @version 09/2011 */ private static class DBTableKeyExtractor implements KeyExtractor<DBTable> { @Override public String getKey(DBTable obj){ return obj.getADQLName(); } Loading
src/adql/db/exception/UnresolvedJoin.java +1 −1 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ package adql.db.exception; * You should have received a copy of the GNU Lesser General Public License * along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>. * * Copyright 2013-2014 - Astronomishes Rechen Institute (ARI) * Copyright 2013-2014 - Astronomishes Rechen Institut (ARI) */ import adql.parser.ParseException; Loading