Author: apetrelli
Date: Wed Dec 15 19:38:54 2010
New Revision: 1049676
URL: http://svn.apache.org/viewvc?rev=1049676&view=rev
Log:
TILESSB-38
Fixed tiles-el checkstyle.
Added:
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/package-info.java
(with props)
Removed:
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/package.html
Modified:
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ScopeELResolver.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELContextImplTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ScopeELResolver.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ScopeELResolver.java?rev=1049676&r1=1049675&r2=1049676&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ScopeELResolver.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ScopeELResolver.java
Wed Dec 15 19:38:54 2010
@@ -40,6 +40,11 @@ import org.apache.tiles.request.Request;
*/
public class ScopeELResolver extends ELResolver {
+ /**
+ * The length of the suffix: "Scope".
+ */
+ private static final int SUFFIX_LENGTH = 5;
+
/** {...@inheritdoc} */
@Override
public Class<?> getCommonPropertyType(ELContext context, Object base) {
@@ -64,7 +69,7 @@ public class ScopeELResolver extends ELR
Request request = (Request) context
.getContext(Request.class);
- for (String scope: request.getAvailableScopes()) {
+ for (String scope : request.getAvailableScopes()) {
FeatureDescriptor descriptor = new FeatureDescriptor();
descriptor.setDisplayName(scope + "Scope");
descriptor.setExpert(false);
@@ -104,7 +109,7 @@ public class ScopeELResolver extends ELR
Request request = (Request) context
.getContext(Request.class);
retValue = request.getContext(propertyString.substring(0,
- propertyString.length() - 5));
+ propertyString.length() - SUFFIX_LENGTH));
}
if (retValue != null) {
Modified:
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java?rev=1049676&r1=1049675&r2=1049676&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
Wed Dec 15 19:38:54 2010
@@ -58,7 +58,7 @@ public class TilesContextBeanELResolver
Request request = (Request) context
.getContext(Request.class);
- for (String scope: request.getAvailableScopes()) {
+ for (String scope : request.getAvailableScopes()) {
collectBeanInfo(request.getContext(scope), list);
}
return list.iterator();
Modified:
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java?rev=1049676&r1=1049675&r2=1049676&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
Wed Dec 15 19:38:54 2010
@@ -39,8 +39,16 @@ import org.apache.tiles.util.CombinedBea
*/
public class TilesContextELResolver extends ELResolver {
+ /**
+ * Internal bean resolver to resolve beans in any context.
+ */
private ELResolver beanElResolver;
+ /**
+ * Constructor.
+ *
+ * @param beanElResolver The used bean resolver.
+ */
public TilesContextELResolver(ELResolver beanElResolver) {
this.beanElResolver = beanElResolver;
}
Added:
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/package-info.java?rev=1049676&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/package-info.java
Wed Dec 15 19:38:54 2010
@@ -0,0 +1,24 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/**
+ * Attribute evaluator classes that can perform EL evaluation for attributes.
+ */
+package org.apache.tiles.el;
Propchange:
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELContextImplTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELContextImplTest.java?rev=1049676&r1=1049675&r2=1049676&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELContextImplTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELContextImplTest.java
Wed Dec 15 19:38:54 2010
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.tiles.el;
@@ -21,8 +38,14 @@ import org.junit.Test;
*/
public class ELContextImplTest {
+ /**
+ * The EL context to test.
+ */
private ELContextImpl context;
+ /**
+ * The EL resolver.
+ */
private ELResolver resolver;
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java?rev=1049676&r1=1049675&r2=1049676&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java
Wed Dec 15 19:38:54 2010
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.tiles.el;
@@ -49,7 +66,7 @@ public class JspExpressionFactoryFactory
/**
* Test method for {...@link
org.apache.tiles.el.JspExpressionFactoryFactory#getExpressionFactory()}.
*/
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testSetApplicationContextIllegal() {
ApplicationContext applicationContext =
createMock(ApplicationContext.class);
Integer servletContext = new Integer(1);
Modified:
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java?rev=1049676&r1=1049675&r2=1049676&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java
Wed Dec 15 19:38:54 2010
@@ -1,3 +1,23 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.tiles.el;
import static org.easymock.classextension.EasyMock.*;
@@ -16,6 +36,11 @@ import org.junit.Before;
import org.junit.Test;
+/**
+ * Tests {...@link ScopeELResolver}.
+ *
+ * @version $Rev$ $Date$
+ */
public class ScopeELResolverTest {
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java?rev=1049676&r1=1049675&r2=1049676&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
Wed Dec 15 19:38:54 2010
@@ -223,7 +223,7 @@ public class TilesContextBeanELResolverT
* Test method for
* {...@link TilesContextBeanELResolver#isReadOnly(javax.el.ELContext,
java.lang.Object, java.lang.Object)}.
*/
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testIsReadOnlyNPE() {
resolver.isReadOnly(null, null, null);
}
Modified:
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java?rev=1049676&r1=1049675&r2=1049676&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
Wed Dec 15 19:38:54 2010
@@ -45,6 +45,9 @@ import org.junit.Test;
*/
public class TilesContextELResolverTest {
+ /**
+ * The bean resolver.
+ */
private ELResolver beanElResolver;
/**
@@ -101,7 +104,7 @@ public class TilesContextELResolverTest
/**
* Tests {...@link TilesContextBeanELResolver#getType(ELContext, Object,
Object)}.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testGetType() {
ELContext elContext = createMock(ELContext.class);
@@ -125,12 +128,12 @@ public class TilesContextELResolverTest
/**
* Tests {...@link TilesContextBeanELResolver#getValue(ELContext, Object,
Object)}.
*/
- @SuppressWarnings("unchecked")
@Test
public void testGetValue() {
ELContext elContext = createMock(ELContext.class);
Request request = createMock(Request.class);
ApplicationContext applicationContext =
createMock(ApplicationContext.class);
+ @SuppressWarnings("rawtypes")
Map map = createMock(Map.class);
expect(elContext.getContext(Request.class)).andReturn(request);
@@ -164,7 +167,7 @@ public class TilesContextELResolverTest
* Test method for
* {...@link TilesContextELResolver#isReadOnly(javax.el.ELContext,
java.lang.Object, java.lang.Object)}.
*/
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testIsReadOnlyNPE() {
replay(beanElResolver);
try {
