You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/11/20 09:53:38 UTC
svn commit: r1037139 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
Author: jdonnerstag
Date: Sat Nov 20 08:53:38 2010
New Revision: 1037139
URL: http://svn.apache.org/viewvc?rev=1037139&view=rev
Log:
removed transient markupIdFromMarkup from Component since it's not reset in development mode when markup gets changed. Instead we check the markup directly. Overhead should be minimal.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=1037139&r1=1037138&r2=1037139&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Sat Nov 20 08:53:38 2010
@@ -463,9 +463,6 @@ public abstract class Component
/** Must only be used by auto components */
private transient IMarkupFragment markup;
- /** 'id' attribute from the associated markup */
- private transient String markupIdFromMarkup;
-
/**
* The object that holds the component state.
* <p>
@@ -753,9 +750,6 @@ public abstract class Component
log.debug("Markup available " + toString());
}
- // get the markup ID from the markup if available
- markupIdFromMarkup = getMarkupIdFromMarkup();
-
// move the component to its real parent if necessary
// moveComponentToItsRealParent();
}
@@ -935,7 +929,6 @@ public abstract class Component
*/
protected void onConfigure()
{
-
}
/**
@@ -1486,9 +1479,10 @@ public abstract class Component
*/
public final Object getMarkupIdImpl()
{
- if (markupIdFromMarkup != null)
+ String id = getMarkupIdFromMarkup();
+ if (id != null)
{
- return markupIdFromMarkup;
+ return id;
}
if (generatedMarkupId != -1)
@@ -2776,6 +2770,8 @@ public abstract class Component
generatedMarkupId = -1;
setMetaData(MARKUP_ID_KEY, (String)markupId);
+
+ setOutputMarkupId(true);
}
/**
@@ -2806,7 +2802,6 @@ public abstract class Component
// on previous id
setMarkupIdImpl(markupId);
-
return this;
}