Revision: 1293
http://stripes.svn.sourceforge.net/stripes/?rev=1293&view=rev
Author: bengunter
Date: 2010-09-29 19:31:50 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
STS-391: Renamed LayoutTag.getLayoutAncestor() to getLayoutParent()
Modified Paths:
--------------
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutRenderTag.java
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutTag.java
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
2010-09-29 19:06:17 UTC (rev 1292)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
2010-09-29 19:31:50 UTC (rev 1293)
@@ -43,7 +43,7 @@
if (context == null) {
context = LayoutContext.lookup(pageContext);
- if (context == null || getLayoutAncestor() != null) {
+ if (context == null || getLayoutParent() != null) {
throw new StripesJspException("The JSP page " +
getCurrentPagePath()
+ " contains a layout-definition tag and was invoked
directly. "
+ "A layout-definition can only be invoked by a page
that contains "
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutRenderTag.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutRenderTag.java
2010-09-29 19:06:17 UTC (rev 1292)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutRenderTag.java
2010-09-29 19:31:50 UTC (rev 1293)
@@ -64,7 +64,7 @@
/** True if this is the outermost layout tag, the one that initiated the
render process. */
public boolean isOuterLayoutTag() {
- return getLayoutAncestor() == null;
+ return getLayoutParent() == null;
}
/** Used by the JSP container to provide the tag with dynamic attributes.
*/
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutTag.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutTag.java
2010-09-29 19:06:17 UTC (rev 1292)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutTag.java
2010-09-29 19:31:50 UTC (rev 1293)
@@ -43,7 +43,7 @@
* instance of {...@link LayoutRenderTag}.
*/
public boolean isChildOfRender() {
- return getLayoutAncestor() instanceof LayoutRenderTag;
+ return getLayoutParent() instanceof LayoutRenderTag;
}
/**
@@ -51,7 +51,7 @@
* instance of {...@link LayoutDefinitionTag}.
*/
public boolean isChildOfDefinition() {
- return getLayoutAncestor() instanceof LayoutDefinitionTag;
+ return getLayoutParent() instanceof LayoutDefinitionTag;
}
/**
@@ -59,7 +59,7 @@
* instance of {...@link LayoutComponentTag}.
*/
public boolean isChildOfComponent() {
- return getLayoutAncestor() instanceof LayoutComponentTag;
+ return getLayoutParent() instanceof LayoutComponentTag;
}
/**
@@ -67,7 +67,7 @@
* of that type is found then null.
*/
@SuppressWarnings("unchecked")
- public <T extends LayoutTag> T getLayoutAncestor() {
+ public <T extends LayoutTag> T getLayoutParent() {
return (T) getParentTag(LayoutTag.class);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
