Author: smartini
Date: Mon Oct 24 20:53:29 2011
New Revision: 1188372
URL: http://svn.apache.org/viewvc?rev=1188372&view=rev
Log:
small fixes as suggested by FindBugs
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/ResultListTest.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/TreeNodeComparator.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentPropertyInspectorSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ResultListTest.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ResultListTest.java?rev=1188372&r1=1188371&r2=1188372&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ResultListTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ResultListTest.java Mon Oct 24
20:53:29 2011
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tests;
+import static java.lang.System.out;
+
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
@@ -26,20 +28,19 @@ import org.apache.pivot.collections.Map;
import org.apache.pivot.json.JSONSerializer;
import org.apache.pivot.sql.ResultList;
-import static java.lang.System.out;
-
public class ResultListTest {
public static void main(String[] args) throws Exception {
// e.g. jdbc:mysql://localhost/test
String connectionURL = args[0];
Connection connection = null;
+ Statement statement = null;
+ ResultSet resultSet = null;
+ ResultList resultList = null;
try {
connection = DriverManager.getConnection(connectionURL);
- Statement statement = connection.createStatement();
- ResultSet resultSet;
- ResultList resultList;
+ statement = connection.createStatement();
resultSet = statement.executeQuery("SELECT * FROM
result_list_test");
resultList = new ResultList(resultSet);
@@ -78,6 +79,14 @@ public class ResultListTest {
out.println(JSONSerializer.toString(iterator.next()));
}
} finally {
+ if (resultSet != null) {
+ resultSet.close();
+ }
+
+ if (statement != null) {
+ statement.close();
+ }
+
if (connection != null) {
connection.close();
}
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/TreeNodeComparator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/TreeNodeComparator.java?rev=1188372&r1=1188371&r2=1188372&view=diff
==============================================================================
---
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/TreeNodeComparator.java
(original)
+++
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/TreeNodeComparator.java
Mon Oct 24 20:53:29 2011
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials;
+import java.io.Serializable;
import java.util.Comparator;
import org.apache.pivot.wtk.content.TreeNode;
@@ -23,7 +24,9 @@ import org.apache.pivot.wtk.content.Tree
/**
* Orders TreeNode instances by their name using string comparison.
*/
-public class TreeNodeComparator implements Comparator<TreeNode> {
+public class TreeNodeComparator implements Comparator<TreeNode>, Serializable {
+ private static final long serialVersionUID = 1L;
+
@Override
public int compare(TreeNode treeNode1, TreeNode treeNode2) {
String text1 = treeNode1.getText();
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentPropertyInspectorSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentPropertyInspectorSkin.java?rev=1188372&r1=1188371&r2=1188372&view=diff
==============================================================================
---
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentPropertyInspectorSkin.java
(original)
+++
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentPropertyInspectorSkin.java
Mon Oct 24 20:53:29 2011
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.explorer.tools;
+import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.Comparator;
@@ -29,14 +30,18 @@ import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Form;
class ComponentPropertyInspectorSkin extends ComponentInspectorSkin {
- private static class NameComparator implements Comparator<String> {
+ private static class NameComparator implements Comparator<String>,
Serializable {
+ private static final long serialVersionUID = 1L;
+
@Override
public int compare(String propertyName1, String propertyName2) {
return propertyName1.compareTo(propertyName2);
}
}
- private static class ClassComparator implements Comparator<Class<?>> {
+ private static class ClassComparator implements Comparator<Class<?>>,
Serializable {
+ private static final long serialVersionUID = 1L;
+
@Override
public int compare(Class<?> class1, Class<?> class2) {
int result = 0;
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java?rev=1188372&r1=1188371&r2=1188372&view=diff
==============================================================================
---
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java
(original)
+++
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java
Mon Oct 24 20:53:29 2011
@@ -16,8 +16,9 @@
*/
package org.apache.pivot.tutorials.explorer.tools;
-import java.lang.reflect.Method;
import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Comparator;
@@ -40,7 +41,9 @@ import org.apache.pivot.wtk.content.Tree
import org.apache.pivot.wtk.skin.ContainerSkin;
class EventLoggerSkin extends ContainerSkin implements EventLogger.Skin,
EventLoggerListener {
- private static class TreeNodeComparator implements Comparator<TreeNode> {
+ private static class TreeNodeComparator implements Comparator<TreeNode>,
Serializable {
+ private static final long serialVersionUID = 1L;
+
public int compare(TreeNode treeNode1, TreeNode treeNode2) {
return treeNode1.getText().compareTo(treeNode2.getText());
}
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java?rev=1188372&r1=1188371&r2=1188372&view=diff
==============================================================================
---
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
(original)
+++
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
Mon Oct 24 20:53:29 2011
@@ -39,10 +39,9 @@ public class Expenses implements Applica
public static final String PORT_KEY = "port";
public static final String SECURE_KEY = "secure";
- private static Expenses instance = null;
+ private static Expenses instance = new Expenses();
public Expenses() {
- instance = this;
}
@Override
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java?rev=1188372&r1=1188371&r2=1188372&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java Mon
Oct 24 20:53:29 2011
@@ -80,10 +80,10 @@ public final class DesktopApplicationCon
private static class DesktopDisplayHost extends DisplayHost {
private static final long serialVersionUID = 0;
- private Window rootOwner = null;
- private Runnable updateHostWindowTitleBarCallback = null;
+ private transient Window rootOwner = null;
+ private transient Runnable updateHostWindowTitleBarCallback = null;
- private WindowListener rootOwnerListener = new
WindowListener.Adapter() {
+ private transient WindowListener rootOwnerListener = new
WindowListener.Adapter() {
@Override
public void titleChanged(Window window, String previousTitle) {
updateFrameTitleBar();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java?rev=1188372&r1=1188371&r2=1188372&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java Mon Oct 24 20:53:29
2011
@@ -111,7 +111,7 @@ public class TextPane extends Container
public void undo();
}
- private class RangeRemovedEdit implements Edit {
+ private static class RangeRemovedEdit implements Edit {
private final Node node;
private final int offset;
private final Sequence<Node> removed;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java?rev=1188372&r1=1188371&r2=1188372&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java Mon Oct 24 20:53:29
2011
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.wtk;
+import java.io.Serializable;
import java.util.Comparator;
import org.apache.pivot.beans.DefaultProperty;
@@ -412,7 +413,9 @@ public class TreeView extends Component
* A comparator that sorts paths by the order in which they would visually
* appear in a fully expanded tree, otherwise known as their "row order".
*/
- public static final class PathComparator implements Comparator<Path> {
+ public static final class PathComparator implements Comparator<Path>,
Serializable {
+ private static final long serialVersionUID = 1L;
+
@Override
public int compare(Path path1, Path path2) {
int path1Length = path1.getLength();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java?rev=1188372&r1=1188371&r2=1188372&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java Mon Oct 24
20:53:29 2011
@@ -233,8 +233,6 @@ public class FillPaneSkin extends Contai
}
}
- contentHeight -= spacing;
-
break;
}
}
