[Japi-cvs] SF.net SVN: japi:[1344] libs/sql/trunk/src/prj/net/sf/japi/sql

[<chr...@us...>]

Revision: 1344
          http://japi.svn.sourceforge.net/japi/?rev=1344&view=rev
Author:   christianhujer
Date:     2009-06-14 09:27:41 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
Improve nullable / notnull states.

Modified Paths:
--------------
    libs/sql/trunk/src/prj/net/sf/japi/sql/CachedResultSetTableModel.java
    libs/sql/trunk/src/prj/net/sf/japi/sql/SQLHelper.java

Modified: libs/sql/trunk/src/prj/net/sf/japi/sql/CachedResultSetTableModel.java
===================================================================
--- libs/sql/trunk/src/prj/net/sf/japi/sql/CachedResultSetTableModel.java	2009-06-14 09:27:05 UTC (rev 1343)
+++ libs/sql/trunk/src/prj/net/sf/japi/sql/CachedResultSetTableModel.java	2009-06-14 09:27:41 UTC (rev 1344)
@@ -103,7 +103,7 @@
         } else {
             try {
                 columnTitles = SQLHelper.getColumnLabels(resultSet);
-                columnCount = columnTitles != null ? columnTitles.length : 0;
+                columnCount = columnTitles.length;
                 rowCount = SQLHelper.getRowCount(resultSet);
                 data = SQLHelper.getData(resultSet);
                 this.resultSet = resultSet;

Modified: libs/sql/trunk/src/prj/net/sf/japi/sql/SQLHelper.java
===================================================================
--- libs/sql/trunk/src/prj/net/sf/japi/sql/SQLHelper.java	2009-06-14 09:27:05 UTC (rev 1343)
+++ libs/sql/trunk/src/prj/net/sf/japi/sql/SQLHelper.java	2009-06-14 09:27:41 UTC (rev 1344)
@@ -25,6 +25,7 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import org.jetbrains.annotations.NotNull;
 
 /** A Helper Class to make work with JDBC less painful in some situations.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -62,6 +63,7 @@
      * @return column labels
      * @throws SQLException on SQL problems
      */
+    @NotNull
     public static String[] getColumnLabels(final ResultSet rs) throws SQLException {
         final ResultSetMetaData md = rs.getMetaData();
         final int columnCount = md.getColumnCount();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.