Commit abe6c66b authored by gmantele's avatar gmantele
Browse files

ALL: Reformat in the same way all classes (using Eclipse auto formatting and save actions).

parent 84c31b66

src/adql/db/DBChecker.java

+13 −19
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import java.util.ArrayList; 
import java.util.Collection;

import java.util.HashMap;





import adql.db.exception.UnresolvedColumnException;

import adql.db.exception.UnresolvedIdentifiersException;

import adql.db.exception.UnresolvedTableException;
@@ -71,7 +70,6 @@ public class DBChecker implements QueryChecker { 
	/** List of all available tables ({@link DBTable}). */

	protected SearchTableList lstTables;





	/* ************ */

	/* CONSTRUCTORS */

	/* ************ */
@@ -91,7 +89,6 @@ public class DBChecker implements QueryChecker { 
		setTables(tables);

	}





	/* ****** */

	/* SETTER */

	/* ****** */
@@ -114,7 +111,6 @@ public class DBChecker implements QueryChecker { 
			lstTables = new SearchTableList(tables);

	}





	/* ************* */

	/* CHECK METHODS */

	/* ************* */
@@ -363,7 +359,6 @@ public class DBChecker implements QueryChecker { 
		}

	}





	/* ************************************* */

	/* DBTABLE & DBCOLUMN GENERATION METHODS */

	/* ************************************* */
@@ -388,7 +383,6 @@ public class DBChecker implements QueryChecker { 
		return dbTable;

	}





	/* *************** */

	/* SEARCH HANDLERS */

	/* *************** */

src/adql/db/DefaultDBTable.java

+36 −39
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ public class DefaultDBTable implements DBTable { 


	protected HashMap<String,DBColumn> columns = new HashMap<String,DBColumn>();





	/**

	 * <p>Builds a default {@link DBTable} with the given DB name.</p>

	 *
@@ -111,9 +110,7 @@ public class DefaultDBTable implements DBTable { 
	 * @param dbName		Database table name.

	 * @param adqlName		Table name used in ADQL queries.

	 */

	public DefaultDBTable(final String dbCatName, final String adqlCatName

			, final String dbSchemName, final String adqlSchemName

			, final String dbName, final String adqlName){

	public DefaultDBTable(final String dbCatName, final String adqlCatName, final String dbSchemName, final String adqlSchemName, final String dbName, final String adqlName){



		if (dbName == null || dbName.length() == 0)

			throw new NullPointerException("Missing DB name !");

src/adql/db/SearchColumnList.java

+16 −20
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ public class SearchColumnList extends TextualSearchList<DBColumn> { 
	/** Case-insensitive dictionary of table aliases. (tablealias <-> List&lt;TableName&gt;) */

	private final HashMap<String,ArrayList<String>> mapAliases = new HashMap<String,ArrayList<String>>();





	/* ************ */

	/* CONSTRUCTORS */

	/* ************ */
@@ -87,7 +86,6 @@ public class SearchColumnList extends TextualSearchList<DBColumn> { 
		super(initialCapacity, new DBColumnKeyExtractor());

	}





	/* ******* */

	/* GETTERS */

	/* ******* */
@@ -109,7 +107,6 @@ public class SearchColumnList extends TextualSearchList<DBColumn> { 
		this.distinct = distinct;

	}





	/* ********************** */

	/* TABLE ALIAS MANAGEMENT */

	/* ********************** */
@@ -228,7 +225,8 @@ public class SearchColumnList extends TextualSearchList<DBColumn> { 
				DBTable dbTable = match.getTable();

				if (IdentifierField.TABLE.isCaseSensitive(caseSensitivity)){

					String tableName = tableAliases.get(table);

					if (tableName == null) tableName = table;

					if (tableName == null)

						tableName = table;

					if (!dbTable.getADQLName().equals(tableName))

						continue;

				}else{
@@ -289,7 +287,6 @@ public class SearchColumnList extends TextualSearchList<DBColumn> { 
		}

	}





	/* ***************** */

	/* INHERITED METHODS */

	/* ***************** */
@@ -331,7 +328,6 @@ public class SearchColumnList extends TextualSearchList<DBColumn> { 
		return changed;

	}





	/**

	 * Lets extracting the key to associate with a given {@link DBColumn} instance.

	 *

src/adql/db/SearchTableList.java

+7 −11
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ public class SearchTableList extends TextualSearchList<DBTable> { 
	/** Indicates whether multiple occurrences are allowed. */

	private boolean distinct = false;





	/* ************ */

	/* CONSTRUCTORS */

	/* ************ */
@@ -72,7 +71,6 @@ public class SearchTableList extends TextualSearchList<DBTable> { 
		super(initialCapacity, new DBTableKeyExtractor());

	}





	/* ******* */

	/* GETTERS */

	/* ******* */
@@ -183,7 +181,6 @@ public class SearchTableList extends TextualSearchList<DBTable> { 
			return tmpResult;

	}





	/* ***************** */

	/* INHERITED METHODS */

	/* ***************** */
@@ -195,7 +192,6 @@ public class SearchTableList extends TextualSearchList<DBTable> { 
			return super.add(item);

	}





	/**

	 * Lets extracting a key to associate with a given {@link DBTable} instance.

	 *

src/adql/db/exception/UnresolvedIdentifiersException.java

+5 −7
Original line number Diff line number Diff line
@@ -123,6 +123,4 @@ public class UnresolvedIdentifiersException extends ParseException implements It 
		return exceptions.size() + " unresolved identifiers" + ((unresolvedIdentifiers != null) ? (": " + unresolvedIdentifiers) : "") + " !";

	}







}