diff -r 6bdb45af26d9 -r b6ff5b7a8422 java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/ColumnsHeader.java --- a/java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/ColumnsHeader.java Mon Mar 04 22:28:29 2019 +0100 +++ b/java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/ColumnsHeader.java Tue Mar 05 21:22:33 2019 +0100 @@ -27,13 +27,13 @@ * @author Ing. František Kučera (frantovo.cz) */ public class ColumnsHeader { - - private ResultSetMetaData metaData; - + + private final ResultSetMetaData metaData; + public ColumnsHeader(ResultSetMetaData metaData) { this.metaData = metaData; } - + public int getColumnCount() { try { return metaData.getColumnCount(); @@ -41,27 +41,27 @@ throw new IllegalStateException("Error during getting column count.", e); } } - + public List getColumnDescriptors() { try { int count = metaData.getColumnCount(); List list = new ArrayList<>(count); - + for (int i = 1; i <= count; i++) { ColumnDescriptor cd = new ColumnDescriptor(); - + cd.setFirstColumn(i == 1); cd.setLastColumn(i == count); cd.setColumnNumber(i); - + cd.setLabel(metaData.getColumnLabel(i)); cd.setName(metaData.getColumnName(i)); cd.setType(metaData.getColumnType(i)); cd.setTypeName(metaData.getColumnTypeName(i)); - /** TODO: more properties */ + cd.setTableName(metaData.getTableName(i)); list.add(cd); } - + return list; } catch (SQLException e) { throw new IllegalStateException("Error during building column descriptors.", e);