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/21 23:47:19 UTC
svn commit: r912430 - in /pivot/trunk:
web-server/src/org/apache/pivot/web/server/QueryServlet.java
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
wtk/src/org/apache/pivot/wtk/SuggestionPopup.java
Author: gbrown
Date: Sun Feb 21 22:47:19 2010
New Revision: 912430
URL: http://svn.apache.org/viewvc?rev=912430&view=rev
Log:
Various minor fixes.
Modified:
pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java
Modified: pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java?rev=912430&r1=912429&r2=912430&view=diff
==============================================================================
--- pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java (original)
+++ pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java Sun Feb 21 22:47:19 2010
@@ -306,9 +306,6 @@
System.err.println(exception);
throw exception;
} finally {
- // Clean up any allocated resources
- dispose();
-
// Clean up thread local variables
hostname.remove();
port.remove();
@@ -317,6 +314,9 @@
parameters.remove();
requestHeaders.remove();
responseHeaders.remove();
+
+ // Clean up any allocated resources
+ dispose();
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java?rev=912430&r1=912429&r2=912430&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java Sun Feb 21 22:47:19 2010
@@ -269,7 +269,7 @@
// Reposition under text input
Point location = textInput.mapPointToAncestor(textInput.getDisplay(), 0, 0);
suggestionPopup.setLocation(location.x, location.y + textInput.getHeight() - 1);
- suggestionPopup.setPreferredWidth(textInput.getWidth());
+ suggestionPopup.setMinimumPreferredWidth(textInput.getWidth());
}
@Override
@@ -353,9 +353,7 @@
textInput.getComponentStateListeners().remove(textInputStateListener);
textInput.getComponentKeyListeners().remove(textInputKeyListener);
- if (suggestionPopup.getResult()) {
- textInput.requestFocus();
- }
+ textInput.requestFocus();
suggestionListViewBorder.setEnabled(true);
closeTransition = null;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java?rev=912430&r1=912429&r2=912430&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java Sun Feb 21 22:47:19 2010
@@ -216,6 +216,8 @@
throw new IllegalStateException("textInput is null.");
}
+ setSelectedIndex(-1);
+
super.open(display, owner);
}