japi-cvs

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

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

Revision: 1295
          http://japi.svn.sourceforge.net/japi/?rev=1295&view=rev
Author:   christianhujer
Date:     2009-05-12 23:39:00 +0000 (Tue, 12 May 2009)

Log Message:
-----------
Fix checkstyle issues.

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

Modified: libs/sql/trunk/src/prj/net/sf/japi/sql/DatabaseTreeModel.java
===================================================================
--- libs/sql/trunk/src/prj/net/sf/japi/sql/DatabaseTreeModel.java	2009-05-12 23:31:25 UTC (rev 1294)
+++ libs/sql/trunk/src/prj/net/sf/japi/sql/DatabaseTreeModel.java	2009-05-12 23:39:00 UTC (rev 1295)
@@ -74,7 +74,7 @@
                         catalogs.add(new CatalogTreeNode(rs.getString(1)));
                     } catch (final SQLException e) {
                         System.err.println(e);
-                        // TODO
+                        // TODO:2009-05-13:christianhujer:Improve error handling.
                     }
                 }
             } finally {

Modified: libs/sql/trunk/src/prj/net/sf/japi/sql/ResultSetTableModel.java
===================================================================
--- libs/sql/trunk/src/prj/net/sf/japi/sql/ResultSetTableModel.java	2009-05-12 23:31:25 UTC (rev 1294)
+++ libs/sql/trunk/src/prj/net/sf/japi/sql/ResultSetTableModel.java	2009-05-12 23:39:00 UTC (rev 1295)
@@ -23,7 +23,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import javax.swing.table.TableModel;
-import net.sf.japi.util.ThrowableHandler;import org.jetbrains.annotations.Nullable;
+import net.sf.japi.util.ThrowableHandler;
+import org.jetbrains.annotations.Nullable;
 
 /** Interface for TableModels which handle information from ResultSets.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>

Modified: libs/sql/trunk/src/prj/net/sf/japi/sql/SQLHelper.java
===================================================================
--- libs/sql/trunk/src/prj/net/sf/japi/sql/SQLHelper.java	2009-05-12 23:31:25 UTC (rev 1294)
+++ libs/sql/trunk/src/prj/net/sf/japi/sql/SQLHelper.java	2009-05-12 23:39:00 UTC (rev 1295)
@@ -29,8 +29,12 @@
 /** A Helper Class to make work with JDBC less painful in some situations.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
  */
-public class SQLHelper {
+public final class SQLHelper {
 
+    /** Utility class - do not instantiate. */
+    private SQLHelper() {
+    }
+
     /** The Type information for a two-dimensional Object Array. */
     private static final Object[][] OBJECT_ARRAY_ARRAY_INSTANCE = new Object[0][0];
 

Modified: libs/sql/trunk/src/prj/net/sf/japi/sql/ScrollResultSetTableModel.java
===================================================================
--- libs/sql/trunk/src/prj/net/sf/japi/sql/ScrollResultSetTableModel.java	2009-05-12 23:31:25 UTC (rev 1294)
+++ libs/sql/trunk/src/prj/net/sf/japi/sql/ScrollResultSetTableModel.java	2009-05-12 23:39:00 UTC (rev 1295)
@@ -101,7 +101,7 @@
         for (int i = listeners.length - 2; i >= 0; i -= 2) {
             //noinspection ObjectEquality
             if (listeners[i] == ThrowableHandler.class) {
-                ((ThrowableHandler<? super SQLException>)listeners[i+1]).handleThrowable(exception);
+                ((ThrowableHandler<? super SQLException>) listeners[i + 1]).handleThrowable(exception);
             }
         }
     }
@@ -207,13 +207,13 @@
         final int type;
         try {
             if (metaData == null) {
-                // TODO: Display error to usage, reset state
+                // TODO:2009-05-13:christianhujer:Display error to usage, reset state
                 return super.getColumnClass(columnIndex);
             }
             type = metaData.getColumnType(columnIndex + 1);
         } catch (final SQLException e) {
             handleException(e);
-            // TODO: reset state
+            // TODO:2009-05-13:christianhujer:reset state
             return super.getColumnClass(columnIndex);
         }
         switch (type) {
@@ -249,7 +249,7 @@
     /** {@inheritDoc} */
     @Override @Nullable public String getColumnName(final int column) {
         if (metaData == null) {
-            // TODO
+            // TODO:2009-05-13:christianhujer:Return alternative name?
             return null;
         }
         try {
@@ -288,7 +288,7 @@
             return resultSet != null && resultSet.getConcurrency() == CONCUR_UPDATABLE;
         } catch (final SQLException e) {
             handleException(e);
-            // TODO: reset state
+            // TODO:2009-05-13:christianhujer:Reset state.
             return false;
         }
     }
@@ -302,14 +302,14 @@
         }
         try {
             if (!resultSet.absolute(rowIndex + 1)) {
-                // TODO: Display error to usage, reset state
+                // TODO:2009-05-13:christianhujer:Display error to usage, reset state
                 return;
             }
             resultSet.updateObject(columnIndex + 1, aValue);
             resultSet.updateRow();
         } catch (final SQLException e) {
             handleException(e);
-            // TODO: reset state
+            // TODO:2009-05-13:christianhujer:reset state
         }
     }
 


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

[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.