Author: jdonnerstag
Date: Sat Oct 17 11:31:46 2009
New Revision: 826233
URL: http://svn.apache.org/viewvc?rev=826233&view=rev
Log:
fixed javadox
Issue: WICKET-2516
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java?rev=826233&r1=826232&r2=826233&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java
Sat Oct 17 11:31:46 2009
@@ -1492,15 +1492,13 @@
/**
* Retrieves id by which this component is represented within the
markup. This is either the id
- * attribute set explicitly via a call to {...@link
#setMarkupId(String)}, id attribute defined in
- * the markup, or an automatically generated id - in that order.
+ * attribute set explicitly via a call to {...@link
#setMarkupId(String)}, [id attribute defined in
+ * the markup, - not yet working in 1.4] or an automatically generated
id - in that order.
* <p>
* If no id is set and <code>createIfDoesNotExist</code> is false, this
method will return null.
* Otherwise it will generate an id value which by default will be
unique in the page. This is
* the preferred way as there is no chance of id collision.
* <p>
- *
- * <p>
* Note: This method should only be called after the component or its
parent have been added to
* the page.
*
@@ -1568,16 +1566,9 @@
}
/**
- * Retrieves id by which this component is represented within the
markup. This is either the id
- * attribute set explicitly via a call to {...@link
#setMarkupId(String)}, id attribute defined in
- * the markup, or an automatically generated id - in that order.
- * <p>
- * If no explicit id is set this function will generate an id value
that will be unique in the
- * page. This is the preferred way as there is no chance of id
collision.
- * <p>
- * Note: This method should only be called after the component or its
parent have been added to
- * the page.
+ * Calls {...@link #getMarkupId(boolean)} with 'true'.
*
+ * @see #getMarkupId(boolean)
* @return markup id of the component
*/
public String getMarkupId()
