You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by nl...@apache.org on 2012/02/28 05:44:55 UTC
svn commit: r1294456 - in /tiles/framework/trunk: ./
tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/
tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/collection/
tiles-request/tiles-request-freem...
Author: nlebas
Date: Tue Feb 28 04:44:55 2012
New Revision: 1294456
URL: http://svn.apache.org/viewvc?rev=1294456&view=rev
Log:
Removed the obsolete reference to java 1.5 in top-level pom.xml.
Removed class IteratorEnumeration (replaced with Collections.enumeration).
Removed interface AddOnlyMap (broken and unused).
Removed:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/AddOnlyMap.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/IteratorEnumeration.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/collection/AddOnlyMapTest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/collection/IteratorEnumerationTest.java
Modified:
tiles/framework/trunk/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/InitParamsServletConfig.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractorTest.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
Modified: tiles/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=1294456&r1=1294455&r2=1294456&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Tue Feb 28 04:44:55 2012
@@ -57,14 +57,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
Modified: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java?rev=1294456&r1=1294455&r2=1294456&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java Tue Feb 28 04:44:55 2012
@@ -20,10 +20,10 @@
*/
package org.apache.tiles.request.freemarker.extractor;
+import java.util.Collections;
import java.util.Enumeration;
import org.apache.tiles.request.attribute.AttributeExtractor;
-import org.apache.tiles.request.collection.IteratorEnumeration;
import org.apache.tiles.request.freemarker.FreemarkerRequestException;
import freemarker.core.Environment;
@@ -61,11 +61,9 @@ public class EnvironmentScopeExtractor i
@Override
public Enumeration<String> getKeys() {
try {
- return new IteratorEnumeration<String>(request
- .getKnownVariableNames().iterator());
+ return Collections.<String> enumeration(request.getKnownVariableNames());
} catch (TemplateModelException e) {
- throw new FreemarkerRequestException(
- "Cannot iterate variable names correctly", e);
+ throw new FreemarkerRequestException("Cannot iterate variable names correctly", e);
}
}
@@ -78,8 +76,7 @@ public class EnvironmentScopeExtractor i
}
return null;
} catch (TemplateModelException e) {
- throw new FreemarkerRequestException(
- "Cannot get attribute with name '" + key + "'", e);
+ throw new FreemarkerRequestException("Cannot get attribute with name '" + key + "'", e);
}
}
@@ -89,9 +86,7 @@ public class EnvironmentScopeExtractor i
TemplateModel model = request.getObjectWrapper().wrap(value);
request.setVariable(key, model);
} catch (TemplateModelException e) {
- throw new FreemarkerRequestException(
- "Error when wrapping an object setting the '" + key
- + "' attribute", e);
+ throw new FreemarkerRequestException("Error when wrapping an object setting the '" + key + "' attribute", e);
}
}
}
Modified: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/InitParamsServletConfig.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/InitParamsServletConfig.java?rev=1294456&r1=1294455&r2=1294456&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/InitParamsServletConfig.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/InitParamsServletConfig.java Tue Feb 28 04:44:55 2012
@@ -20,6 +20,7 @@
*/
package org.apache.tiles.request.freemarker.render;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -28,7 +29,6 @@ import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.collection.IteratorEnumeration;
/**
* Implements {@link ServletConfig} to initialize the internal servlet using parameters
@@ -68,9 +68,8 @@ public class InitParamsServletConfig imp
}
/** {@inheritDoc} */
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public Enumeration getInitParameterNames() {
- return new IteratorEnumeration(params.keySet().iterator());
+ public Enumeration<String> getInitParameterNames() {
+ return Collections.enumeration(params.keySet());
}
/** {@inheritDoc} */
Modified: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractorTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractorTest.java?rev=1294456&r1=1294455&r2=1294456&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractorTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractorTest.java Tue Feb 28 04:44:55 2012
@@ -26,11 +26,12 @@ import static org.junit.Assert.*;
import java.io.StringWriter;
import java.io.Writer;
+import java.util.Enumeration;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.tiles.request.collection.IteratorEnumeration;
import org.apache.tiles.request.freemarker.FreemarkerRequestException;
import org.junit.Test;
@@ -80,27 +81,28 @@ public class EnvironmentScopeExtractorTe
/**
* Test method for {@link EnvironmentScopeExtractor#getKeys()}.
*/
- @SuppressWarnings("unchecked")
@Test
public void testGetKeys() {
Template template = createMock(Template.class);
TemplateHashModel model = createMock(TemplateHashModel.class);
TemplateModel valueModel = createMock(TemplateModel.class);
Configuration configuration = createMock(Configuration.class);
- Set<String> names = createMock(Set.class);
- Iterator<String> namesIt = createMock(Iterator.class);
+ Set<String> names = new HashSet<String>();
+ names.add("testGetKeys");
+
Writer writer = new StringWriter();
expect(template.getMacros()).andReturn(new HashMap<Object, Object>());
expect(template.getConfiguration()).andReturn(configuration);
expect(configuration.getSharedVariableNames()).andReturn(names);
- expect(names.iterator()).andReturn(namesIt);
- replay(template, model, valueModel, configuration, names, namesIt);
+ replay(template, model, valueModel, configuration);
Environment env = new Environment(template, model, writer);
EnvironmentScopeExtractor extractor = new EnvironmentScopeExtractor(env);
- assertEquals(namesIt, ((IteratorEnumeration<String>) extractor.getKeys()).getIterator());
- verify(template, model, valueModel, configuration, names, namesIt);
+ Enumeration<String> keys = extractor.getKeys();
+ assertEquals("testGetKeys", keys.nextElement());
+ assertFalse(keys.hasMoreElements());
+ verify(template, model, valueModel, configuration);
}
/**
Modified: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java?rev=1294456&r1=1294455&r2=1294456&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java Tue Feb 28 04:44:55 2012
@@ -20,6 +20,7 @@
*/
package org.apache.tiles.request.velocity.render;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -27,7 +28,6 @@ import java.util.Map;
import javax.servlet.ServletContext;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.collection.IteratorEnumeration;
import org.apache.tiles.request.servlet.ServletUtil;
import org.apache.velocity.tools.view.JeeConfig;
@@ -72,9 +72,8 @@ public class ApplicationContextJeeConfig
}
/** {@inheritDoc} */
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public Enumeration getInitParameterNames() {
- return new IteratorEnumeration(params.keySet().iterator());
+ public Enumeration<String> getInitParameterNames() {
+ return Collections.enumeration(params.keySet());
}
/** {@inheritDoc} */