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/18 21:33:50 UTC
svn commit: r892375 - in /tiles/sandbox/trunk/tiles3:
tiles-compat/src/test/java/org/apache/tiles/compat/preparer/
tiles-core/src/main/java/org/apache/tiles/definition/digester/
tiles-core/src/main/java/org/apache/tiles/factory/ tiles-core/src/main/jav...
Author: apetrelli
Date: Fri Dec 18 20:33:45 2009
New Revision: 892375
URL: http://svn.apache.org/viewvc?rev=892375&view=rev
Log:
TILESSB-19
Fixed some warnings.
Modified:
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/DefinitionAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactoryTest.java?rev=892375&r1=892374&r2=892375&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactoryTest.java Fri Dec 18 20:33:45 2009
@@ -40,7 +40,7 @@
/** {@inheritDoc} */
@Override
- protected void setUp() throws Exception {
+ protected void setUp() {
factory = new CompatibilityPreparerFactory();
}
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java?rev=892375&r1=892374&r2=892375&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java Fri Dec 18 20:33:45 2009
@@ -53,7 +53,7 @@
/** {@inheritDoc} */
@Override
- protected void setUp() throws Exception {
+ protected void setUp() {
preparer = new UrlPreparer("/my/url.do");
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?rev=892375&r1=892374&r2=892375&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java Fri Dec 18 20:33:45 2009
@@ -157,8 +157,7 @@
/** {@inheritDoc} */
@Override
- public void begin(String namespace, String name, Attributes attributes)
- throws Exception {
+ public void begin(String namespace, String name, Attributes attributes) {
Definition definition = (Definition) digester.peek();
definition.setName(attributes.getValue("name"));
definition.setPreparer(attributes.getValue("preparer"));
@@ -187,8 +186,7 @@
/** {@inheritDoc} */
@Override
- public void begin(String namespace, String name, Attributes attributes)
- throws Exception {
+ public void begin(String namespace, String name, Attributes attributes) {
Attribute attribute = (Attribute) digester.peek();
attribute.setValue(attributes.getValue("value"));
String expression = attributes.getValue("expression");
@@ -209,8 +207,7 @@
/** {@inheritDoc} */
@Override
- public void begin(String namespace, String name, Attributes attributes)
- throws Exception {
+ public void begin(String namespace, String name, Attributes attributes) {
Attribute attribute = (Attribute) digester.peek(0);
Definition definition = (Definition) digester.peek(1);
definition.putAttribute(attributes.getValue("name"), attribute,
@@ -228,8 +225,7 @@
/** {@inheritDoc} */
@Override
- public void begin(String namespace, String name, Attributes attributes)
- throws Exception {
+ public void begin(String namespace, String name, Attributes attributes) {
Definition definition = (Definition) digester.peek(0);
if (definition.getName() == null) {
definition.setName(getNextUniqueDefinitionName(definitions));
@@ -249,8 +245,7 @@
/** {@inheritDoc} */
@Override
- public void begin(String namespace, String name, Attributes attributes)
- throws Exception {
+ public void begin(String namespace, String name, Attributes attributes) {
Object obj = digester.pop();
Attribute attribute = new Attribute(obj);
digester.push(attribute);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=892375&r1=892374&r2=892375&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java Fri Dec 18 20:33:45 2009
@@ -56,8 +56,6 @@
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Factory that builds a standard Tiles container using only Java code.
@@ -65,6 +63,7 @@
* @version $Rev$ $Date$
* @since 2.1.0
*/
+@SuppressWarnings("unused")
public class BasicTilesContainerFactory extends AbstractTilesContainerFactory {
/**
@@ -81,11 +80,6 @@
* The definition renderer name.
*/
protected static final String DEFINITION_RENDERER_NAME = "definition";
- /**
- * The logging object.
- */
- private final Logger log = LoggerFactory
- .getLogger(BasicTilesContainerFactory.class);
/** {@inheritDoc} */
@Override
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/DefinitionAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/DefinitionAttributeRenderer.java?rev=892375&r1=892374&r2=892375&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/DefinitionAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/DefinitionAttributeRenderer.java Fri Dec 18 20:33:45 2009
@@ -20,8 +20,6 @@
*/
package org.apache.tiles.renderer.impl;
-import java.io.IOException;
-
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.awareness.TilesContainerAware;
@@ -50,9 +48,7 @@
/** {@inheritDoc} */
@Override
- public void write(Object value, Attribute attribute,
- Request request)
- throws IOException {
+ public void write(Object value, Attribute attribute, Request request) {
container.render(value.toString(), request);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?rev=892375&r1=892374&r2=892375&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Fri Dec 18 20:33:45 2009
@@ -178,7 +178,7 @@
assertTrue("Attribute not of valid type",
attribute instanceof ListAttribute);
ListAttribute listAttribute = (ListAttribute) attribute;
- List<Attribute> list = (List<Attribute>) listAttribute.getValue();
+ List<Attribute> list = listAttribute.getValue();
assertEquals("The list is not of correct size", 1, list.size());
attribute = list.get(0);
assertNotNull("Couldn't Find element attribute.", attribute);
@@ -314,9 +314,9 @@
source.close();
Definition root = name2defs.get("root");
Attribute attribute = root.getAttribute("body");
- Definition child = name2defs.get((String) attribute.getValue());
+ Definition child = name2defs.get(attribute.getValue());
ListAttribute listAttribute = (ListAttribute) child.getAttribute("list");
List<Attribute> list = listAttribute.getValue();
- assertEquals(((Attribute) list.get(0)).getValue(), "This is a value");
+ assertEquals((list.get(0)).getValue(), "This is a value");
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java?rev=892375&r1=892374&r2=892375&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java Fri Dec 18 20:33:45 2009
@@ -118,7 +118,6 @@
* Test method for
* {@link PatternUtil#replacePlaceholders(Definition, String, Object[])}.
*/
- @SuppressWarnings("unchecked")
@Test
public void testReplacePlaceholdersListAttribute() {
Map<String, Attribute> attributes = new HashMap<String, Attribute>();
@@ -140,7 +139,7 @@
assertEquals("templatevalue1", attribute.getValue());
ListAttribute nuListAttribute = (ListAttribute) nudef.getAttribute("myList");
assertTrue(nuListAttribute.isInherit());
- List<Attribute> list = (List<Attribute>) nuListAttribute.getValue();
+ List<Attribute> list = nuListAttribute.getValue();
assertEquals(LIST_ATTRIBUTE_SIZE, list.size());
attribute = list.get(0);
assertEquals("valuevalue2", attribute.getValue());
@@ -148,7 +147,7 @@
assertEquals("valuevalue2value3", attribute.getValue());
ListAttribute evaluatedListAttribute = (ListAttribute) list.get(2);
assertFalse(evaluatedListAttribute.isInherit());
- list = (List<Attribute>) evaluatedListAttribute.getValue();
+ list = evaluatedListAttribute.getValue();
assertEquals(2, list.size());
attribute = list.get(0);
assertEquals("secondvaluevalue2", attribute.getValue());
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java?rev=892375&r1=892374&r2=892375&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java Fri Dec 18 20:33:45 2009
@@ -40,7 +40,7 @@
/** {@inheritDoc} */
@Override
- public void setUp() throws Exception {
+ public void setUp() {
evaluator = new DirectAttributeEvaluator();
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRendererTest.java?rev=892375&r1=892374&r2=892375&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRendererTest.java Fri Dec 18 20:33:45 2009
@@ -21,10 +21,8 @@
package org.apache.tiles.renderer.impl;
-import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
-
-import java.io.IOException;
+import static org.junit.Assert.*;
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
@@ -66,8 +64,7 @@
}
@Override
- public void write(Object value, Attribute attribute,
- Request request) throws IOException {
+ public void write(Object value, Attribute attribute, Request request) {
// Does nothing.
}
};
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java?rev=892375&r1=892374&r2=892375&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java Fri Dec 18 20:33:45 2009
@@ -115,7 +115,7 @@
*/
@SuppressWarnings("unchecked")
protected DbDefinition getDefinition(String name, Long baseCustomizationId,
- Long baseParentCustomizationId, Locale locale) {
+ Long baseParentCustomizationId, @SuppressWarnings("unused") Locale locale) {
DbDefinition definition = null;
Long customizationId = baseCustomizationId;
Long parentCustomizationId = baseParentCustomizationId;