Author: tomdz
Date: Sun Mar 9 05:42:32 2008
New Revision: 635229
URL: http://svn.apache.org/viewvc?rev=635229&view=rev
Log:
Checkstyle & FindBugs fixes
Added:
db/ddlutils/trunk/src/test/org/apache/ddlutils/task/package.html
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/JdbcModelReader.java
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/mysql/MySql50Builder.java
db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestMisc.java
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/JdbcModelReader.java
URL:
http://svn.apache.org/viewvc/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/JdbcModelReader.java?rev=635229&r1=635228&r2=635229&view=diff
==============================================================================
---
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/JdbcModelReader.java
(original)
+++
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/JdbcModelReader.java
Sun Mar 9 05:42:32 2008
@@ -1262,6 +1262,11 @@
}
}
+ /**
+ * Closes the given result set. Any exceptions are logged on warn level
but otherwise swallowed.
+ *
+ * @param resultSet The result set
+ */
protected void closeResultSet(ResultSet resultSet)
{
if (resultSet != null)
@@ -1277,6 +1282,11 @@
}
}
+ /**
+ * Closes the given statement. Any exceptions are logged on warn level but
otherwise swallowed.
+ *
+ * @param stmt The statement
+ */
protected void closeStatement(Statement stmt)
{
if (stmt != null)
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/mysql/MySql50Builder.java
URL:
http://svn.apache.org/viewvc/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/mysql/MySql50Builder.java?rev=635229&r1=635228&r2=635229&view=diff
==============================================================================
---
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/mysql/MySql50Builder.java
(original)
+++
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/mysql/MySql50Builder.java
Sun Mar 9 05:42:32 2008
@@ -1,10 +1,5 @@
package org.apache.ddlutils.platform.mysql;
-import java.io.IOException;
-
-import org.apache.ddlutils.Platform;
-import org.apache.ddlutils.model.Table;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,6 +18,11 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+import java.io.IOException;
+
+import org.apache.ddlutils.Platform;
+import org.apache.ddlutils.model.Table;
/**
* The SQL Builder for MySQL version 5 and above.
Modified: db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestMisc.java
URL:
http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestMisc.java?rev=635229&r1=635228&r2=635229&view=diff
==============================================================================
--- db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestMisc.java (original)
+++ db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestMisc.java Sun Mar 9
05:42:32 2008
@@ -1150,7 +1150,10 @@
}
finally
{
- tmpFile.delete();
+ if (!tmpFile.delete())
+ {
+ getLog().warn("Could not delete the temporary file " +
tmpFile.getAbsolutePath());
+ }
}
}
}
Added: db/ddlutils/trunk/src/test/org/apache/ddlutils/task/package.html
URL:
http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/org/apache/ddlutils/task/package.html?rev=635229&view=auto
==============================================================================
--- db/ddlutils/trunk/src/test/org/apache/ddlutils/task/package.html (added)
+++ db/ddlutils/trunk/src/test/org/apache/ddlutils/task/package.html Sun Mar 9
05:42:32 2008
@@ -0,0 +1,29 @@
+<html>
+<head>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="Author" content="Thomas Dudziak">
+</head>
+<body bgcolor="white">
+ <p>
+ This package contains the tests for the Ant tasks.
+ </p>
+</body>
+</html>