Author: apetrelli
Date: Fri May 2 11:22:56 2008
New Revision: 652862
URL: http://svn.apache.org/viewvc?rev=652862&view=rev
Log:
Adapted code to Checkstyle rules.
Modified:
tiles/framework/trunk/tiles-core/pom.xml
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java
Modified: tiles/framework/trunk/tiles-core/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?rev=652862&r1=652861&r2=652862&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Fri May 2 11:22:56 2008
@@ -173,6 +173,13 @@
</dependency>
<dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java?rev=652862&r1=652861&r2=652862&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
Fri May 2 11:22:56 2008
@@ -55,7 +55,7 @@
* @throws NoSuchDefinitionException if a Definition extends from
* one that doesn't exist.
*/
- void addDefinitions(Map<String, Definition> defsMap) throws
NoSuchDefinitionException;
+ void addDefinitions(Map<String, Definition> defsMap);
/**
* Adds new locale-specific Definition objects to the internal
@@ -66,8 +66,7 @@
* @throws NoSuchDefinitionException if a Definition extends from
* one that doesn't exist.
*/
- void addDefinitions(Map<String, Definition> defsMap, Locale locale)
- throws NoSuchDefinitionException;
+ void addDefinitions(Map<String, Definition> defsMap, Locale locale);
/**
* Returns a Definition object that matches the given name and locale.
@@ -84,7 +83,7 @@
*
* @throws NoSuchDefinitionException If parent definitions are not found.
*/
- void resolveInheritances() throws NoSuchDefinitionException;
+ void resolveInheritances();
/**
* Resolves locale-specific configuration inheritance properties.
@@ -92,7 +91,7 @@
* @param locale The locale object to use.
* @throws NoSuchDefinitionException If parent definitions are not found.
*/
- void resolveInheritances(Locale locale) throws NoSuchDefinitionException;
+ void resolveInheritances(Locale locale);
/**
* Clears definitions.
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java?rev=652862&r1=652861&r2=652862&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
Fri May 2 11:22:56 2008
@@ -79,8 +79,7 @@
* @throws NoSuchDefinitionException If something goes wrong during
* addition.
*/
- public void addDefinitions(Map<String, Definition> defsMap)
- throws NoSuchDefinitionException {
+ public void addDefinitions(Map<String, Definition> defsMap) {
this.baseDefinitions.putAll(defsMap);
resolveInheritances();
}
@@ -95,7 +94,7 @@
* inheritance resolution.
*/
public void addDefinitions(Map<String, Definition> defsMap,
- Locale locale) throws NoSuchDefinitionException {
+ Locale locale) {
localeSpecificDefinitions.put(locale, defsMap);
resolveInheritances(locale);
}
@@ -131,7 +130,7 @@
*
* @throws NoSuchDefinitionException If a parent definition is not found.
*/
- public void resolveInheritances() throws NoSuchDefinitionException {
+ public void resolveInheritances() {
Set<String> alreadyResolvedDefinitions = new HashSet<String>();
for (Definition definition : baseDefinitions.values()) {
@@ -145,7 +144,7 @@
* @param locale The locale to use.
* @throws NoSuchDefinitionException If a parent definition is not found.
*/
- public void resolveInheritances(Locale locale) throws
NoSuchDefinitionException {
+ public void resolveInheritances(Locale locale) {
resolveInheritances();
Map<String, Definition> map = localeSpecificDefinitions.get(locale);
@@ -211,8 +210,7 @@
* @throws NoSuchDefinitionException If an inheritance can not be solved.
*/
protected void resolveInheritance(Definition definition, Locale locale,
- Set<String> alreadyResolvedDefinitions)
- throws NoSuchDefinitionException {
+ Set<String> alreadyResolvedDefinitions) {
// Already done, or not needed ?
if (!definition.isExtending()
|| alreadyResolvedDefinitions.contains(definition.getName())) {
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java?rev=652862&r1=652861&r2=652862&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
Fri May 2 11:22:56 2008
@@ -49,7 +49,7 @@
* @throws DefinitionsFactoryException if required properties are not
* passed in or the initialization
fails.
*/
- void init(Map<String, String> params) throws DefinitionsFactoryException;
+ void init(Map<String, String> params);
/**
* Reads <code>[EMAIL PROTECTED] Definition}</code> objects from a source.
@@ -62,6 +62,6 @@
* @throws DefinitionsFactoryException if the source is invalid or
* an error occurs when reading
definitions.
*/
- Map<String, Definition> read(Object source) throws
DefinitionsFactoryException;
+ Map<String, Definition> read(Object source);
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java?rev=652862&r1=652861&r2=652862&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
Fri May 2 11:22:56 2008
@@ -24,7 +24,6 @@
import org.apache.tiles.Definition;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
-import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.NoSuchDefinitionException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -107,11 +106,11 @@
* @param definition The name of the definition.
* @param request The current request.
* @return The requested definition, either main or custom.
- * @throws DefinitionsFactoryException If something goes wrong when
- * obtaining a main definition.
+ * @throws org.apache.tiles.definition.DefinitionsFactoryException If
+ * something goes wrong when obtaining a main definition.
*/
- public Definition getDefinition(String definition, TilesRequestContext
request)
- throws DefinitionsFactoryException {
+ public Definition getDefinition(String definition,
+ TilesRequestContext request) {
Map<String, Definition> definitions =
getDefinitions(request);
if (definitions != null && definitions.containsKey(definition)) {
@@ -125,12 +124,11 @@
*
* @param definition The definition to add.
* @param request The current request.
- * @throws DefinitionsFactoryException If something goes wrong during the
- * addition.
+ * @throws org.apache.tiles.definition.DefinitionsFactoryException If
+ * something goes wrong during the addition.
*/
public void addDefinition(Definition definition,
- TilesRequestContext request)
- throws DefinitionsFactoryException {
+ TilesRequestContext request) {
Map<String, Definition> definitions = getOrCreateDefinitions(request);
if (definition.getName() == null) {
definition.setName(getNextUniqueDefinitionName(definitions));
@@ -182,11 +180,11 @@
* @param definition The definition that needs to have its inheritances
* resolved.
* @param request The current request.
- * @throws DefinitionsFactoryException If an inheritance can not be solved.
+ * @throws org.apache.tiles.definition.DefinitionsFactoryException If an
+ * inheritance can not be solved.
*/
protected void resolveInheritance(Definition definition,
- TilesRequestContext request)
- throws DefinitionsFactoryException {
+ TilesRequestContext request) {
// Already done, or not needed ?
if (!definition.isExtending()) {
return;
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java?rev=652862&r1=652861&r2=652862&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
Fri May 2 11:22:56 2008
@@ -101,14 +101,14 @@
/** [EMAIL PROTECTED] */
@SuppressWarnings("unchecked")
- public Set<Map.Entry<String, String[]>> entrySet() {
+ public Set<Map.Entry<String, String[]>> entrySet() {
Set<Map.Entry<String, String[]>> set = new HashSet<Map.Entry<String,
String[]>>();
Enumeration<String> keys = request.getParameterNames();
String key;
while (keys.hasMoreElements()) {
- key = keys.nextElement();
+ key = keys.nextElement();
set.add(new MapEntry<String, String[]>(key, (request
- .getParameterValues(key)), false));
+ .getParameterValues(key)), false));
}
return (set);
}
@@ -153,7 +153,7 @@
/** [EMAIL PROTECTED] */
@SuppressWarnings("unchecked")
- public Set<String> keySet() {
+ public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
@@ -183,7 +183,7 @@
/** [EMAIL PROTECTED] */
@SuppressWarnings("unchecked")
- public int size() {
+ public int size() {
int n = 0;
Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
@@ -196,7 +196,7 @@
/** [EMAIL PROTECTED] */
@SuppressWarnings("unchecked")
- public Collection<String[]> values() {
+ public Collection<String[]> values() {
List<String[]> list = new ArrayList<String[]>();
Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java?rev=652862&r1=652861&r2=652862&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java
Fri May 2 11:22:56 2008
@@ -54,6 +54,5 @@
* @throws PreparerException If something goes wrong during execution.
*/
void execute(TilesRequestContext tilesContext,
- AttributeContext attributeContext)
- throws PreparerException;
+ AttributeContext attributeContext);
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java?rev=652862&r1=652861&r2=652862&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java
Fri May 2 11:22:56 2008
@@ -35,6 +35,6 @@
/** [EMAIL PROTECTED] */
public void execute(TilesRequestContext tilesContext,
- AttributeContext attributeContext) throws
PreparerException {
+ AttributeContext attributeContext) {
}
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java?rev=652862&r1=652861&r2=652862&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java
Fri May 2 11:22:56 2008
@@ -21,10 +21,18 @@
package org.apache.tiles.servlet.context;
-import org.apache.tiles.context.MapEntry;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+
+import org.apache.tiles.context.MapEntry;
/**
@@ -109,7 +117,7 @@
/** [EMAIL PROTECTED] */
@SuppressWarnings("unchecked")
- public boolean equals(Object o) {
+ public boolean equals(Object o) {
HttpServletRequest otherRequest = ((ServletHeaderValuesMap) o).request;
boolean retValue = true;
synchronized (request) {
@@ -128,7 +136,7 @@
/** [EMAIL PROTECTED] */
@SuppressWarnings("unchecked")
- public String[] get(Object key) {
+ public String[] get(Object key) {
List<String> list = new ArrayList<String>();
Enumeration<String> values = request.getHeaders(key(key));
while (values.hasMoreElements()) {
@@ -196,7 +204,7 @@
/** [EMAIL PROTECTED] */
@SuppressWarnings("unchecked")
- public Collection<String[]> values() {
+ public Collection<String[]> values() {
List<String[]> list = new ArrayList<String[]>();
Enumeration<String> keys = request.getHeaderNames();
while (keys.hasMoreElements()) {
@@ -236,7 +244,7 @@
while (enumeration.hasMoreElements()) {
list1.add(enumeration.nextElement());
}
-
+
return list1.toArray(new String[list1.size()]);
}
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java?rev=652862&r1=652861&r2=652862&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java
Fri May 2 11:22:56 2008
@@ -20,10 +20,18 @@
*/
package org.apache.tiles.servlet.context;
-import org.apache.tiles.context.MapEntry;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import javax.servlet.ServletRequest;
-import java.util.*;
+
+import org.apache.tiles.context.MapEntry;
/**
@@ -107,7 +115,7 @@
/** [EMAIL PROTECTED] */
@SuppressWarnings("unchecked")
- public boolean equals(Object o) {
+ public boolean equals(Object o) {
ServletRequest otherRequest = ((ServletParamValuesMap) o).request;
boolean retValue = true;
synchronized (request) {
