You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2015/04/22 00:18:59 UTC
svn commit: r1675205 - in /pivot/branches/2.0.x: ./
wtk/src/org/apache/pivot/wtk/Container.java
Author: rwhitcomb
Date: Tue Apr 21 22:18:58 2015
New Revision: 1675205
URL: http://svn.apache.org/r1675205
Log:
This is a merge of revision 1675204 from "trunk" to "branches/2.0.x".
Code cleanup: Fix the Javadoc for Container.requestFocus to correctly document
the return value (it actually returns a boolean, not a Component reference, just
like the Component base class method).
Modified:
pivot/branches/2.0.x/ (props changed)
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Container.java
Propchange: pivot/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 22:18:58 2015
@@ -1 +1 @@
-/pivot/trunk:1346574,1347051,1394847,1394858,1398511,1399331,1401781,1405882,1407585,1409081,1410536,1410555,1417081,1417258,1428056,1428650,1435351,1436707,1438126,1438659,1444260,1444910,1502657,1510821,1516518,1519859,1522078,1523205,1523736,1523776,1525982,1526005,1536829,1537222,1604238,1610563,1611829,1614462,1624381
+/pivot/trunk:1346574,1347051,1394847,1394858,1398511,1399331,1401781,1405882,1407585,1409081,1410536,1410555,1417081,1417258,1428056,1428650,1435351,1436707,1438126,1438659,1444260,1444910,1502657,1510821,1516518,1519859,1522078,1523205,1523736,1523776,1525982,1526005,1536829,1537222,1604238,1610563,1611829,1614462,1624381,1675204
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Container.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Container.java?rev=1675205&r1=1675204&r2=1675205&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Container.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Container.java Tue Apr 21 22:18:58 2015
@@ -492,9 +492,8 @@ public abstract class Container extends
* focusable, this requests that focus be set to the first focusable
* descendant in this container.
*
- * @return
- * The component that got the focus, or <tt>null</tt> if the focus request
- * was denied
+ * @return <tt>true</tt> if the container or one of its descendants gained
+ * the focus or <tt>false</tt> if no component was found to gain the focus.
*/
@Override
public boolean requestFocus() {