You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/02/14 17:08:31 UTC
svn commit: r910030 - in /pivot/trunk:
tests/src/org/apache/pivot/tests/sql/ResultListTest.java
wtk/src/org/apache/pivot/wtk/TextInput.java
Author: gbrown
Date: Sun Feb 14 16:08:30 2010
New Revision: 910030
URL: http://svn.apache.org/viewvc?rev=910030&view=rev
Log:
Close connection in ResultListTest; set caret to end of text rather than beginning when text node changes in TextInput.
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/sql/ResultListTest.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/sql/ResultListTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/sql/ResultListTest.java?rev=910030&r1=910029&r2=910030&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/sql/ResultListTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/sql/ResultListTest.java Sun Feb 14 16:08:30 2010
@@ -33,50 +33,58 @@
// e.g. jdbc:mysql://localhost/test
String connectionURL = args[0];
- Connection connection = DriverManager.getConnection(connectionURL);
- Statement statement = connection.createStatement();
- ResultSet resultSet;
- ResultList resultList;
-
- resultSet = statement.executeQuery("SELECT * FROM result_list_test");
- resultList = new ResultList(resultSet,
- new ResultList.Field("i"),
- new ResultList.Field("f"),
- new ResultList.Field("s"),
- new ResultList.Field("b"));
- out.println(JSONSerializer.toString(resultList));
-
- resultSet = statement.executeQuery("SELECT * FROM result_list_test");
- resultList = new ResultList(resultSet,
- new ResultList.Field("i", "integer"),
- new ResultList.Field("f", "float"),
- new ResultList.Field("s", "string"),
- new ResultList.Field("b", "boolean"));
- out.println(JSONSerializer.toString(resultList));
-
- resultSet = statement.executeQuery("SELECT * FROM result_list_test");
- resultList = new ResultList(resultSet,
- new ResultList.Field("i", "integer", Integer.class),
- new ResultList.Field("f", "float", Float.class),
- new ResultList.Field("s", "string", String.class),
- new ResultList.Field("b", "boolean", Boolean.class));
- out.println(JSONSerializer.toString(resultList));
-
- // Test forward and backward iteration
- resultSet = statement.executeQuery("SELECT * FROM result_list_test");
- resultList = new ResultList(resultSet,
- new ResultList.Field("i"),
- new ResultList.Field("f"),
- new ResultList.Field("s"),
- new ResultList.Field("b"));
-
- List.ItemIterator<Map<String, Object>> iterator = resultList.iterator();
- while (iterator.hasNext()) {
- out.println(JSONSerializer.toString(iterator.next()));
- }
+ Connection connection = null;
- while(iterator.hasPrevious()) {
- out.println(JSONSerializer.toString(iterator.previous()));
+ try {
+ connection = DriverManager.getConnection(connectionURL);
+ Statement statement = connection.createStatement();
+ ResultSet resultSet;
+ ResultList resultList;
+
+ resultSet = statement.executeQuery("SELECT * FROM result_list_test");
+ resultList = new ResultList(resultSet,
+ new ResultList.Field("i"),
+ new ResultList.Field("f"),
+ new ResultList.Field("s"),
+ new ResultList.Field("b"));
+ out.println(JSONSerializer.toString(resultList));
+
+ resultSet = statement.executeQuery("SELECT * FROM result_list_test");
+ resultList = new ResultList(resultSet,
+ new ResultList.Field("i", "integer"),
+ new ResultList.Field("f", "float"),
+ new ResultList.Field("s", "string"),
+ new ResultList.Field("b", "boolean"));
+ out.println(JSONSerializer.toString(resultList));
+
+ resultSet = statement.executeQuery("SELECT * FROM result_list_test");
+ resultList = new ResultList(resultSet,
+ new ResultList.Field("i", "integer", Integer.class),
+ new ResultList.Field("f", "float", Float.class),
+ new ResultList.Field("s", "string", String.class),
+ new ResultList.Field("b", "boolean", Boolean.class));
+ out.println(JSONSerializer.toString(resultList));
+
+ // Test forward and backward iteration
+ resultSet = statement.executeQuery("SELECT * FROM result_list_test");
+ resultList = new ResultList(resultSet,
+ new ResultList.Field("i"),
+ new ResultList.Field("f"),
+ new ResultList.Field("s"),
+ new ResultList.Field("b"));
+
+ List.ItemIterator<Map<String, Object>> iterator = resultList.iterator();
+ while (iterator.hasNext()) {
+ out.println(JSONSerializer.toString(iterator.next()));
+ }
+
+ while(iterator.hasPrevious()) {
+ out.println(JSONSerializer.toString(iterator.previous()));
+ }
+ } finally {
+ if (connection != null) {
+ connection.close();
+ }
}
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java?rev=910030&r1=910029&r2=910030&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java Sun Feb 14 16:08:30 2010
@@ -252,13 +252,15 @@
previousTextNode.getNodeListeners().remove(textNodeListener);
}
- if (textNode != null) {
+ this.textNode = textNode;
+
+ if (textNode == null) {
+ selectionStart = 0;
+ } else {
+ selectionStart = textNode.getCharacterCount();
textNode.getNodeListeners().add(textNodeListener);
}
- this.textNode = textNode;
-
- selectionStart = 0;
selectionLength = 0;
textInputListeners.textNodeChanged(this, previousTextNode);