Author: ehillenius
Date: Fri Aug 3 17:53:38 2007
New Revision: 562633
URL: http://svn.apache.org/viewvc?view=rev&rev=562633
Log:
format + result save action from Eclipse (which seems to be configured by
default for wicket now).
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?view=diff&rev=562633&r1=562632&r2=562633
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
Fri Aug 3 17:53:38 2007
@@ -258,7 +258,7 @@
*/
public void undo()
{
- setModel(this.model);
+ setModel(model);
}
}
@@ -412,7 +412,7 @@
EnabledChange(final Component component)
{
this.component = component;
- this.enabled = component.getFlag(FLAG_ENABLED);
+ enabled = component.getFlag(FLAG_ENABLED);
}
/**
@@ -453,7 +453,7 @@
VisibilityChange(final Component component)
{
this.component = component;
- this.visible = component.getFlag(FLAG_VISIBLE);
+ visible = component.getFlag(FLAG_VISIBLE);
}
/**
@@ -652,13 +652,6 @@
protected static final int FLAG_RESERVED8 = 0x80000;
/**
- * Flag that makes we are in before-render callback phase Set after
- * component.onBeforeRender is invoked (right before invoking
beforeRender
- * on children)
- */
- static final int FLAG_PREPARED_FOR_RENDER = 0x4000000;
-
- /**
* Meta data key for line precise error logging for the moment of
addition.
* Made package private for access in [EMAIL PROTECTED]
MarkupContainer} and
* [EMAIL PROTECTED] Page}
@@ -677,13 +670,20 @@
private static final long serialVersionUID = 1L;
};
-
static final int FLAG_ATTACH_SUPER_CALL_VERIFIED = 0x10000000;
+
static final int FLAG_ATTACHED = 0x20000000;
static final int FLAG_ATTACHING = 0x40000000;
+ /**
+ * Flag that makes we are in before-render callback phase Set after
+ * component.onBeforeRender is invoked (right before invoking
beforeRender
+ * on children)
+ */
+ static final int FLAG_PREPARED_FOR_RENDER = 0x4000000;
+
/** List of behaviors to be applied for this Component */
private ArrayList behaviors = null;
@@ -864,36 +864,6 @@
}
/**
- * Prepares the component and it's children for rendering. On whole page
- * render this method must be called on the page. On AJAX request, this
- * method must be called on updated component.
- */
- public void prepareForRender()
- {
- beforeRender();
- markRendering();
- }
-
- /**
- * Sets the RENDERING flag on component and it's children.
- */
- public final void markRendering()
- {
- internalMarkRendering();
- }
-
- boolean isPreparedForRender()
- {
- return getFlag(FLAG_PREPARED_FOR_RENDER);
- }
-
- void internalMarkRendering()
- {
- setFlag(FLAG_PREPARED_FOR_RENDER, false);
- setFlag(FLAG_RENDERING, true);
- }
-
- /**
* Redirects to any intercept page previously specified by a call to
* redirectToInterceptPage.
*
@@ -1216,14 +1186,6 @@
attrs.makeImmutable();
return attrs;
}
-
- /**
- * @return Component's markup stream
- */
- protected MarkupStream locateMarkupStream()
- {
- return new MarkupFragmentFinder().find(this);
- }
/**
* Retrieves id by which this component is represented within the
markup.
@@ -1280,33 +1242,6 @@
}
/**
- * Sets this component's markup id to a user defined value. It is up to
the
- * user to ensure this value is unique.
- * <p>
- * The recommended way is to let wicket generate the value
automatically,
- * this method is here to serve as an override for that value in cases
where
- * a specific id must be used.
- * <p>
- * If null is passed in the user defined value is cleared and markup id
- * value will fall back on automatically generated value
- *
- * @see #getMarkupId()
- *
- * @param markupId
- * markup id value or null to clear any previous user defined
- * value
- */
- public void setMarkupId(String markupId)
- {
- if (markupId != null && Strings.isEmpty(markupId))
- {
- throw new IllegalArgumentException("Markup id cannot be
an empty string");
- }
- setMetaData(MARKUP_ID_KEY, markupId);
-
- }
-
- /**
* Gets metadata for this component using the given key.
*
* @param key
@@ -1330,7 +1265,7 @@
if (model == null)
{
// give subclass a chance to lazy-init model
- this.model = initModel();
+ model = initModel();
}
return model;
@@ -1536,8 +1471,8 @@
*/
public long getSizeInBytes()
{
- final MarkupContainer originalParent = this.parent;
- this.parent = null;
+ final MarkupContainer originalParent = parent;
+ parent = null;
long size = -1;
try
{
@@ -1547,7 +1482,7 @@
{
log.error("Exception getting size for component " +
this, e);
}
- this.parent = originalParent;
+ parent = originalParent;
return size;
}
@@ -1755,6 +1690,18 @@
}
/**
+ * Checks the security strategy if the [EMAIL PROTECTED]
Component#RENDER} action is
+ * allowed on this component
+ *
+ * @return ture if [EMAIL PROTECTED] Component#RENDER} action is
allowed, false
+ * otherwise
+ */
+ public final boolean isRenderAllowed()
+ {
+ return getFlag(FLAG_IS_RENDER_ALLOWED);
+ }
+
+ /**
* Returns if the component is stateless or not. It checks the stateless
* hint if that is false it returns directly false. If that is still
true it
* checks all its behaviours if they can be stateless.
@@ -1845,6 +1792,14 @@
}
/**
+ * Sets the RENDERING flag on component and it's children.
+ */
+ public final void markRendering()
+ {
+ internalMarkRendering();
+ }
+
+ /**
* Called to indicate that the model content for this component has been
* changed
*/
@@ -1901,6 +1856,17 @@
}
/**
+ * Prepares the component and it's children for rendering. On whole page
+ * render this method must be called on the page. On AJAX request, this
+ * method must be called on updated component.
+ */
+ public void prepareForRender()
+ {
+ beforeRender();
+ markRendering();
+ }
+
+ /**
* Redirects browser to an intermediate page such as a sign-in page. The
* current request's url is saved for future use by method
* continueToOriginalDestination(); Only use this method when you plan
to
@@ -1918,7 +1884,6 @@
getPage().getPageMap().redirectToInterceptPage(page);
}
-
/**
* Removes this component from its parent. It's important to remember
that a
* component that is removed cannot be referenced from the markup still.
@@ -1968,7 +1933,6 @@
return this;
}
-
/**
* Performs a render of this component as part of a Page level render
* process.
@@ -1989,6 +1953,7 @@
render(markupStream);
}
+
/**
* Performs a render of this component as part of a Page level render
* process.
@@ -2149,6 +2114,7 @@
}
}
+
/**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT.
* <p>
@@ -2162,7 +2128,7 @@
*/
public final void renderComponent(final MarkupStream markupStream)
{
- this.markupIndex = markupStream.getCurrentIndex();
+ markupIndex = markupStream.getCurrentIndex();
// Get mutable copy of next tag
final ComponentTag openTag = markupStream.getTag();
@@ -2277,9 +2243,9 @@
// Ask all behaviors if they have something to
contribute to the
// header or body onLoad tag.
- if (this.behaviors != null)
+ if (behaviors != null)
{
- final Iterator iter = this.behaviors.iterator();
+ final Iterator iter = behaviors.iterator();
while (iter.hasNext())
{
IBehavior behavior =
(IBehavior)iter.next();
@@ -2421,6 +2387,33 @@
}
/**
+ * Sets this component's markup id to a user defined value. It is up to
the
+ * user to ensure this value is unique.
+ * <p>
+ * The recommended way is to let wicket generate the value
automatically,
+ * this method is here to serve as an override for that value in cases
where
+ * a specific id must be used.
+ * <p>
+ * If null is passed in the user defined value is cleared and markup id
+ * value will fall back on automatically generated value
+ *
+ * @see #getMarkupId()
+ *
+ * @param markupId
+ * markup id value or null to clear any previous user defined
+ * value
+ */
+ public void setMarkupId(String markupId)
+ {
+ if (markupId != null && Strings.isEmpty(markupId))
+ {
+ throw new IllegalArgumentException("Markup id cannot be
an empty string");
+ }
+ setMetaData(MARKUP_ID_KEY, markupId);
+
+ }
+
+ /**
* Sets the metadata for this component using the given key. If the
metadata
* object is not of the correct type for the metadata key, an
* IllegalArgumentException will be thrown. For information on creating
@@ -2581,7 +2574,6 @@
getRequestCycle().setRedirect(redirect);
}
-
/**
* If false the component's tag will be printed as well as its body
(which
* is default). If true only the body will be printed, but not the
@@ -2609,6 +2601,7 @@
getRequestCycle().setResponsePage(cls);
}
+
/**
* Sets the page class and its parameters that will respond to this
request
*
@@ -3084,7 +3077,7 @@
*/
protected final boolean getFlag(final int flag)
{
- return (this.flags & flag) != 0;
+ return (flags & flag) != 0;
}
/**
@@ -3262,15 +3255,11 @@
}
/**
- * Checks the security strategy if the [EMAIL PROTECTED]
Component#RENDER} action is
- * allowed on this component
- *
- * @return ture if [EMAIL PROTECTED] Component#RENDER} action is
allowed, false
- * otherwise
+ * @return Component's markup stream
*/
- public final boolean isRenderAllowed()
+ protected MarkupStream locateMarkupStream()
{
- return getFlag(FLAG_IS_RENDER_ALLOWED);
+ return new MarkupFragmentFinder().find(this);
}
/**
@@ -3322,9 +3311,9 @@
protected void onComponentTag(final ComponentTag tag)
{
// We can't try to get the ID from markup. This could be
different than
- // id returned from getMarkupId() prior first rendering the
component
- // (due to transparent resolvers and borders which break the
1:1
- // component <-> markup relation)
+ // id returned from getMarkupId() prior first rendering the
component
+ // (due to transparent resolvers and borders which break the 1:1
+ // component <-> markup relation)
if (getFlag(FLAG_OUTPUT_MARKUP_ID))
{
tag.put(MARKUP_ID_ATTR_NAME, getMarkupId());
@@ -3435,8 +3424,9 @@
}
// Write the tag
- tag.writeOutput(getResponse(), stripWicketTags,
this.findMarkupStream()
- .getWicketNamespace());
+ tag
+ .writeOutput(getResponse(),
stripWicketTags, findMarkupStream()
+ .getWicketNamespace());
}
}
@@ -3517,11 +3507,11 @@
{
if (set)
{
- this.flags |= flag;
+ flags |= flag;
}
else
{
- this.flags &= ~flag;
+ flags &= ~flag;
}
}
@@ -3652,6 +3642,12 @@
}
}
+ void internalMarkRendering()
+ {
+ setFlag(FLAG_PREPARED_FOR_RENDER, false);
+ setFlag(FLAG_RENDERING, true);
+ }
+
/**
* @return True if this component or any of its parents is in auto-add
mode
*/
@@ -3666,6 +3662,11 @@
}
}
return false;
+ }
+
+ boolean isPreparedForRender()
+ {
+ return getFlag(FLAG_PREPARED_FOR_RENDER);
}
void onAfterRenderChildren()
