You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by kr...@apache.org on 2007/05/08 09:52:05 UTC
svn commit: r536112 - in
/db/derby/code/branches/10.2/java/tools/org/apache/derby:
impl/tools/ij/ij.jj impl/tools/ij/ijResultImpl.java
tools/JDBCDisplayUtil.java
Author: kristwaa
Date: Tue May 8 00:52:04 2007
New Revision: 536112
URL: http://svn.apache.org/viewvc?view=rev&rev=536112
Log:
DERBY-2222: Merged from trunk, JavaDoc/formatting fixes.
Modified:
db/derby/code/branches/10.2/java/tools/org/apache/derby/impl/tools/ij/ij.jj
db/derby/code/branches/10.2/java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java
db/derby/code/branches/10.2/java/tools/org/apache/derby/tools/JDBCDisplayUtil.java
Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/impl/tools/ij/ij.jj
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/impl/tools/ij/ij.jj?view=diff&rev=536112&r1=536111&r2=536112
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/impl/tools/ij/ij.jj (original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/impl/tools/ij/ij.jj Tue May 8 00:52:04 2007
@@ -702,12 +702,14 @@
}
/**
- * Used to show all indices
+ * Used to show all indices.
+ *
* @param schema the schema indices are shown from.
- * @param table the table name to show indices for. If null, all
- * indices of the schema are returned.
+ * @param table the table name to show indices for. If <code>null</code>,
+ * all indices of the schema are returned.
*/
- public ijResult showIndexes(String schema, String table) throws SQLException {
+ public ijResult showIndexes(String schema, String table)
+ throws SQLException {
ijResult result = null;
Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java?view=diff&rev=536112&r1=536111&r2=536112
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java (original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java Tue May 8 00:52:04 2007
@@ -74,7 +74,7 @@
if (isException()) return LocalizedResource.getMessage("IJ_Exc0",getException().toString());
if (isMultipleResultSetResult())
return LocalizedResource.getMessage("IJ_MRS0",
- getMultipleResultSets().toString());
+ getMultipleResultSets().toString());
try {
if (isResultSet()) return LocalizedResource.getMessage("IJ_Rse0",getStatement().toString());
} catch(SQLException se) {
Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/tools/JDBCDisplayUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/tools/JDBCDisplayUtil.java?view=diff&rev=536112&r1=536111&r2=536112
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/tools/JDBCDisplayUtil.java (original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/tools/JDBCDisplayUtil.java Tue May 8 00:52:04 2007
@@ -291,10 +291,12 @@
/**
@param out the place to write to
- @param resultSets List of ResultSet to display
- @param conn the Connection against which the ResultSet was retrieved
- @param displayColumns Column numbers to display, or null if all
- @param displayColumnWidths Column widths, in characters, if displayColumns is specified.
+ @param resultSets list of <code>ResultSet</code>s to display
+ @param conn the connection against which the <code>ResultSet</code>s
+ were retrieved
+ @param displayColumns column numbers to display, <code>null</code> if all
+ @param displayColumnWidths column widths, in characters, if
+ <code>displayColumns</code> is specified
@exception SQLException on JDBC access failure
*/
@@ -304,16 +306,18 @@
int[] displayColumnWidths)
throws SQLException
{
- indent_DisplayResults( out, resultSets, conn, 0, displayColumns,
+ indent_DisplayResults( out, resultSets, conn, 0, displayColumns,
displayColumnWidths);
}
/**
@param out the place to write to
- @param rs the ResultSet to display
- @param conn the Connection against which the ResultSet was retrieved
- @param displayColumns Column numbers to display, or null if all
- @param displayColumnWidths Column widths, in characters, if displayColumns is specified.
+ @param rs the <code>ResultSet</code> to display
+ @param conn the connection against which the <code>ResultSet</code>
+ was retrieved
+ @param displayColumns column numbers to display, <code>null</code> if all
+ @param displayColumnWidths column widths, in characters, if
+ <code>displayColumns</code> is specified
@exception SQLException on JDBC access failure
*/
@@ -326,7 +330,7 @@
}
static private void indent_DisplayResults
- (PrintWriter out, ResultSet rs, Connection conn, int indentLevel,
+ (PrintWriter out, ResultSet rs, Connection conn, int indentLevel,
int[] displayColumns, int[] displayColumnWidths)
throws SQLException {
List resultSets = new ArrayList();
@@ -336,7 +340,7 @@
}
static private void indent_DisplayResults
- (PrintWriter out, List resultSets, Connection conn, int indentLevel,
+ (PrintWriter out, List resultSets, Connection conn, int indentLevel,
int[] displayColumns, int[] displayColumnWidths)
throws SQLException {
@@ -344,8 +348,8 @@
//get metadata from the first ResultSet
if (resultSets != null && resultSets.size() > 0)
- rsmd = ((ResultSet)resultSets.get(0)).getMetaData();
-
+ rsmd = ((ResultSet)resultSets.get(0)).getMetaData();
+
checkNotNull(rsmd, "ResultSetMetaData");
Vector nestedResults;
int numberOfRowsSelected = 0;
@@ -359,7 +363,7 @@
if(displayColumnWidths == null)
displayColumnWidths = getColumnDisplayWidths(rsmd,
- displayColumns,true);
+ displayColumns,true);
int len = indent_DisplayBanner(out,rsmd, indentLevel, displayColumns,
displayColumnWidths);
@@ -377,9 +381,9 @@
try {
doNext = rs.next();
if (doNext) {
-
- DisplayRow(out, rs, rsmd, len, nestedResults, conn,
- indentLevel, displayColumns,
+
+ DisplayRow(out, rs, rsmd, len, nestedResults, conn,
+ indentLevel, displayColumns,
displayColumnWidths);
ShowWarnings(out, rs);
numberOfRowsSelected++;
@@ -397,11 +401,13 @@
if (showSelectCount == true) {
if (numberOfRowsSelected == 1) {
out.println();
- indentedPrintLine( out, indentLevel, LocalizedResource.getMessage("UT_1RowSelec"));
+ indentedPrintLine(out, indentLevel,
+ LocalizedResource.getMessage("UT_1RowSelec"));
} else if (numberOfRowsSelected >= 0) {
out.println();
- indentedPrintLine( out, indentLevel,
- LocalizedResource.getMessage("UT_0RowsSelec", LocalizedResource.getNumber(numberOfRowsSelected)));
+ indentedPrintLine(out, indentLevel,
+ LocalizedResource.getMessage("UT_0RowsSelec",
+ LocalizedResource.getNumber(numberOfRowsSelected)));
}
}