Author: apetrelli
Date: Thu Mar 22 09:21:41 2007
New Revision: 521325
URL: http://svn.apache.org/viewvc?view=rev&rev=521325
Log:
TILES-138
Removed the "component scope" that was not used in any way.
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/ComponentConstants.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/ComponentConstants.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/ComponentConstants.java?view=diff&rev=521325&r1=521324&r2=521325
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/ComponentConstants.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/ComponentConstants.java
Thu Mar 22 09:21:41 2007
@@ -35,12 +35,6 @@
public static final String COMPONENT_CONTEXT_STACK =
"org.apache.tiles.ComponentContext.STACK";
/**
- * It represents the scope under Tiles attributes are stored.
- */
- // FIXME Probably it is not needed
- public static final int COMPONENT_SCOPE = 8;
-
- /**
* The attribute name that is used to store the current locale.
*/
public static final String LOCALE_KEY = "org.apache.tiles.LOCALE";
Modified:
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java?view=diff&rev=521325&r1=521324&r2=521325
==============================================================================
---
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
(original)
+++
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
Thu Mar 22 09:21:41 2007
@@ -22,7 +22,6 @@
package org.apache.tiles.jsp.taglib;
import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.ComponentConstants;
import org.apache.tiles.ComponentContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
@@ -143,7 +142,8 @@
try {
execute();
} catch (IOException e) {
- throw new JspException("io error while executing tag '" +
getClass().getName() + "'.");
+ throw new JspException("io error while executing tag '"
+ + getClass().getName() + "'.", e);
}
return SKIP_BODY;
@@ -173,18 +173,7 @@
return PageContext.PAGE_SCOPE;
}
- if (scopeName.equalsIgnoreCase("component")) {
- return ComponentConstants.COMPONENT_SCOPE;
-
- } else if (scopeName.equalsIgnoreCase("template")) {
- return ComponentConstants.COMPONENT_SCOPE;
-
- } else if (scopeName.equalsIgnoreCase("tile")) {
- return ComponentConstants.COMPONENT_SCOPE;
-
- } else {
- return getScope(scopeName);
- }
+ return getScope(scopeName);
}
/**
