Author: ehillenius
Date: Wed Jun 6 16:52:23 2007
New Revision: 544996
URL: http://svn.apache.org/viewvc?view=rev&rev=544996
Log:
FLAG_HAS_BEEN_RENDERED is a better name for the field (only internal change)
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?view=diff&rev=544996&r1=544995&r2=544996
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
Wed Jun 6 16:52:23 2007
@@ -549,8 +549,11 @@
/** True when a component is enabled for model updates and is
reachable. */
private static final int FLAG_ENABLED = 0x0080;
- /** Boolean whether this component was rendered once for tracking
changes. */
- private static final int FLAG_IS_RENDERED_ONCE = 0x1000;
+ /**
+ * Boolean whether this component was rendered at least once for
tracking
+ * changes.
+ */
+ private static final int FLAG_HAS_BEEN_RENDERED = 0x1000;
/**
* Internal indicator of whether this component may be rendered given
the
@@ -1151,9 +1154,10 @@
{
return getModelObjectAsString(getModelObject());
}
-
+
/**
- * @param modelObject Model object to convert to string
+ * @param modelObject
+ * Model object to convert to string
* @return The string
*/
public final String getModelObjectAsString(final Object modelObject)
@@ -1162,10 +1166,10 @@
{
// Get converter
final IConverter converter =
getConverter(modelObject.getClass());
-
+
// Model string from property
final String modelString =
converter.convertToString(modelObject, getLocale());
-
+
if (modelString != null)
{
// If we should escape the markup
@@ -1496,7 +1500,7 @@
public boolean isVersioned()
{
// Is the component itself versioned?
- if (!getFlag(FLAG_VERSIONED) || !getFlag(FLAG_IS_RENDERED_ONCE))
+ if (!getFlag(FLAG_VERSIONED) ||
!getFlag(FLAG_HAS_BEEN_RENDERED))
{
return false;
}
@@ -1669,7 +1673,7 @@
public final void render(final MarkupStream markupStream)
{
setMarkupStream(markupStream);
- setFlag(FLAG_IS_RENDERED_ONCE, true);
+ setFlag(FLAG_HAS_BEEN_RENDERED, true);
// Determine if component is visible using it's authorization
status
// and the isVisible property.
