You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/12/06 21:30:52 UTC
svn commit: r887764 - in /tiles/sandbox/trunk/tiles3:
tiles-template/src/main/java/org/apache/tiles/template/
tiles-template/src/test/java/org/apache/tiles/template/
tiles-velocity/src/main/java/org/apache/tiles/velocity/template/
Author: apetrelli
Date: Sun Dec 6 20:30:51 2009
New Revision: 887764
URL: http://svn.apache.org/viewvc?rev=887764&view=rev
Log:
TILESSB-15
ImportAttributeModel.getImportedAttributes now is private.
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java?rev=887764&r1=887763&r2=887764&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java Sun Dec 6 20:30:51 2009
@@ -57,7 +57,7 @@
Map<String, Object> attributes = getImportedAttributes(
name, toName, ignore, request);
if (scope == null) {
- scope = request.getAvailableScopes()[0];
+ scope = request.getAvailableScopes()[0];
}
request.getContext(scope).putAll(attributes);
}
@@ -78,7 +78,7 @@
* attribute, the value is the value of that attribute.
* @since 2.2.0
*/
- public Map<String, Object> getImportedAttributes(String name,
+ private Map<String, Object> getImportedAttributes(String name,
String toName, boolean ignore, Request request) {
TilesContainer container = TilesAccess.getCurrentContainer(request);
Map<String, Object> retValue = new HashMap<String, Object>();
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java?rev=887764&r1=887763&r2=887764&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java Sun Dec 6 20:30:51 2009
@@ -65,8 +65,7 @@
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
- * #getImportedAttributes(java.lang.String, java.lang.String,
- * boolean, Request)}.
+ * #execute(String, String, String, boolean, Request).
*/
@Test
public void testExecuteSingle() {
@@ -94,8 +93,7 @@
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
- * #getImportedAttributes(java.lang.String, java.lang.String,
- * boolean, Request)}.
+ * #execute(String, String, String, boolean, Request).
*/
@Test
public void testExecuteSingleToName() {
@@ -123,8 +121,7 @@
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
- * #getImportedAttributes(java.lang.String, java.lang.String,
- * boolean, Request)}.
+ * #execute(String, String, String, boolean, Request).
*/
@Test
public void testExecuteAll() {
@@ -168,8 +165,7 @@
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
- * #getImportedAttributes(java.lang.String, java.lang.String,
- * boolean, Request)}.
+ * #execute(String, String, String, boolean, Request).
*/
@Test(expected = NoSuchAttributeException.class)
public void testExecuteSingleNullAttributeException() {
@@ -195,8 +191,7 @@
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
- * #getImportedAttributes(java.lang.String, java.lang.String,
- * boolean, Request)}.
+ * #execute(String, String, String, boolean, Request).
*/
@Test(expected = NoSuchAttributeException.class)
public void testExecuteSingleNullAttributeValueException() {
@@ -224,8 +219,7 @@
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
- * #getImportedAttributes(java.lang.String, java.lang.String,
- * boolean, Request)}.
+ * #execute(String, String, String, boolean, Request).
*/
@Test(expected = RuntimeException.class)
public void testExecuteSingleRuntimeException() {
@@ -253,8 +247,7 @@
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
- * #getImportedAttributes(java.lang.String, java.lang.String,
- * boolean, Request)}.
+ * #execute(String, String, String, boolean, Request).
*/
@Test
public void testExecuteSingleNullAttributeIgnore() {
@@ -277,8 +270,7 @@
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
- * #getImportedAttributes(java.lang.String, java.lang.String,
- * boolean, Request)}.
+ * #execute(String, String, String, boolean, Request).
*/
@Test
public void testExecuteSingleNullAttributeValueIgnore() {
@@ -303,8 +295,7 @@
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
- * #getImportedAttributes(java.lang.String, java.lang.String,
- * boolean, Request)}.
+ * #execute(String, String, String, boolean, Request).
*/
@Test
public void testExecuteSingleRuntimeIgnore() {
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java?rev=887764&r1=887763&r2=887764&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java Sun Dec 6 20:30:51 2009
@@ -40,8 +40,7 @@
/**
* Wraps {@link ImportAttributeModel} to be used in Velocity. For the list of
* parameters, see
- * {@link ImportAttributeModel#getImportedAttributes(String,
- * String, boolean, Request)}.
+ * {@link ImportAttributeModel#execute(String, String, String, boolean, Request).
*
* @version $Rev$ $Date$
* @since 2.2.0