Author: apetrelli
Date: Wed Dec 15 20:15:41 2010
New Revision: 1049688
URL: http://svn.apache.org/viewvc?rev=1049688&view=rev
Log:
TILESSB-38
Fixed tiles-mvel checkstyle.
Added:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java
(with props)
Removed:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/package.html
Modified:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactory.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/ScopeVariableResolverFactory.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverTest.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ScopeVariableResolverFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactory.java?rev=1049688&r1=1049687&r2=1049688&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactory.java
Wed Dec 15 20:15:41 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.mvel;
import java.util.HashMap;
@@ -7,6 +27,11 @@ import org.mvel2.UnresolveablePropertyEx
import org.mvel2.integration.VariableResolver;
import org.mvel2.integration.impl.BaseVariableResolverFactory;
+/**
+ * A base variable resolver factory that is read-only.
+ *
+ * @version $Rev$ $Date$
+ */
public abstract class ReadOnlyVariableResolverFactory extends
BaseVariableResolverFactory {
@@ -110,8 +135,7 @@ public abstract class ReadOnlyVariableRe
}
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
- public void setStaticType(Class type) {
+ public void setStaticType(@SuppressWarnings("rawtypes") Class type) {
// Does nothing for the moment.
}
Modified:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/ScopeVariableResolverFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/ScopeVariableResolverFactory.java?rev=1049688&r1=1049687&r2=1049688&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/ScopeVariableResolverFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/ScopeVariableResolverFactory.java
Wed Dec 15 20:15:41 2010
@@ -37,6 +37,11 @@ public class ScopeVariableResolverFactor
ReadOnlyVariableResolverFactory {
/**
+ * The length of the scope suffix: "Scope".
+ */
+ private static final int SCOPE_SUFFIX_LENGTH = 5;
+
+ /**
* Constructor.
*
* @param requestHolder The Tiles request holder.
@@ -56,7 +61,7 @@ public class ScopeVariableResolverFactor
public boolean isTarget(String name) {
Request request = requestHolder.getTilesRequestContext();
if (name.endsWith("Scope")) {
- String scopeName = name.substring(0, name.length() - 5);
+ String scopeName = name.substring(0, name.length() -
SCOPE_SUFFIX_LENGTH);
for (String availableScope : request.getAvailableScopes()) {
if (scopeName.equals(availableScope)) {
return true;
@@ -85,7 +90,7 @@ public class ScopeVariableResolverFactor
}
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Class getType() {
return Map.class;
}
@@ -93,7 +98,7 @@ public class ScopeVariableResolverFactor
/** {...@inheritdoc} */
public Object getValue() {
Request request = requestHolder.getTilesRequestContext();
- return request.getContext(name.substring(0, name.length() - 5));
+ return request.getContext(name.substring(0, name.length() -
SCOPE_SUFFIX_LENGTH));
}
}
}
Modified:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java?rev=1049688&r1=1049687&r2=1049688&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
Wed Dec 15 20:15:41 2010
@@ -80,7 +80,7 @@ public class TilesContextBeanVariableRes
}
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Class getType() {
Object value = getValue();
if (value != null) {
Modified:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java?rev=1049688&r1=1049687&r2=1049688&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
Wed Dec 15 20:15:41 2010
@@ -100,6 +100,7 @@ public class TilesContextVariableResolve
* Constructor.
*
* @param name The name of the property.
+ * @param descriptor The property descriptor.
* @since 2.2.0
*/
public RequestVariableResolver(String name, PropertyDescriptor
descriptor) {
@@ -108,7 +109,7 @@ public class TilesContextVariableResolve
}
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Class getType() {
return descriptor.getPropertyType();
}
@@ -155,6 +156,7 @@ public class TilesContextVariableResolve
* Constructor.
*
* @param name The name of the property.
+ * @param descriptor The property descriptor.
* @since 2.2.0
*/
public ApplicationVariableResolver(String name, PropertyDescriptor
descriptor) {
@@ -163,7 +165,7 @@ public class TilesContextVariableResolve
}
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Class getType() {
return descriptor.getPropertyType();
}
Added:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java?rev=1049688&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java
Wed Dec 15 20:15:41 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 MVEL evaluation for attributes.
+ */
+package org.apache.tiles.mvel;
Propchange:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java?rev=1049688&r1=1049687&r2=1049688&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
Wed Dec 15 20:15:41 2010
@@ -52,6 +52,9 @@ public class MVELAttributeEvaluatorTest
*/
private Request request;
+ /**
+ * The application context.
+ */
private ApplicationContext applicationContext;
/**
@@ -95,7 +98,7 @@ public class MVELAttributeEvaluatorTest
/**
* Tests {...@link MVELAttributeEvaluator#evaluate(String, Request)}.
*/
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testEvaluateNull() {
evaluator.evaluate((String) null, request);
verify(request, applicationContext);
Modified:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactoryTest.java?rev=1049688&r1=1049687&r2=1049688&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactoryTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactoryTest.java
Wed Dec 15 20:15:41 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.mvel;
import static org.easymock.EasyMock.*;
@@ -14,6 +34,11 @@ import org.mvel2.integration.VariableRes
import org.mvel2.integration.VariableResolverFactory;
+/**
+ * Tests {...@link ReadOnlyVariableResolverFactory}.
+ *
+ * @version $Rev$ $Date$
+ */
public class ReadOnlyVariableResolverFactoryTest {
/**
@@ -148,7 +173,7 @@ public class ReadOnlyVariableResolverFac
/**
* Test method for {...@link
ScopeVariableResolverFactory#getVariableResolver(String)}.
*/
- @Test(expected=UnresolveablePropertyException.class)
+ @Test(expected = UnresolveablePropertyException.class)
public void testGetVariableResolverNotResolvable() {
VariableResolverFactory nextFactory =
createMock(VariableResolverFactory.class);
Modified:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverTest.java?rev=1049688&r1=1049687&r2=1049688&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverTest.java
Wed Dec 15 20:15:41 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.mvel;
@@ -17,6 +34,9 @@ import org.junit.Test;
*/
public class ReadOnlyVariableResolverTest {
+ /**
+ * The resolver to test.
+ */
private ReadOnlyVariableResolver resolver;
/**
@@ -28,7 +48,7 @@ public class ReadOnlyVariableResolverTes
}
/**
- * Test method for {...@link
org.apache.tiles.mvel.ReadOnlyVariableResolverFactory.ReadOnlyVariableResolver#getFlags()}.
+ * Test method for {...@link
ReadOnlyVariableResolverFactory.ReadOnlyVariableResolver#getFlags()}.
*/
@Test
public void testGetFlags() {
@@ -38,7 +58,7 @@ public class ReadOnlyVariableResolverTes
}
/**
- * Test method for {...@link
org.apache.tiles.mvel.ReadOnlyVariableResolverFactory.ReadOnlyVariableResolver#getName()}.
+ * Test method for {...@link
ReadOnlyVariableResolverFactory.ReadOnlyVariableResolver#getName()}.
*/
@Test
public void testGetName() {
@@ -48,7 +68,7 @@ public class ReadOnlyVariableResolverTes
}
/**
- * Test method for {...@link
org.apache.tiles.mvel.ReadOnlyVariableResolverFactory.ReadOnlyVariableResolver#setStaticType(java.lang.Class)}.
+ * Test method for {...@link
ReadOnlyVariableResolverFactory.ReadOnlyVariableResolver#setStaticType(java.lang.Class)}.
*/
@Test
public void testSetStaticType() {
@@ -58,9 +78,9 @@ public class ReadOnlyVariableResolverTes
}
/**
- * Test method for {...@link
org.apache.tiles.mvel.ReadOnlyVariableResolverFactory.ReadOnlyVariableResolver#setValue(java.lang.Object)}.
+ * Test method for {...@link
ReadOnlyVariableResolverFactory.ReadOnlyVariableResolver#setValue(java.lang.Object)}.
*/
- @Test(expected=UnsupportedOperationException.class)
+ @Test(expected = UnsupportedOperationException.class)
public void testSetValue() {
replay(resolver);
resolver.setValue("whatever");
Modified:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ScopeVariableResolverFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ScopeVariableResolverFactoryTest.java?rev=1049688&r1=1049687&r2=1049688&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ScopeVariableResolverFactoryTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/ScopeVariableResolverFactoryTest.java
Wed Dec 15 20:15:41 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.mvel;
import static org.easymock.EasyMock.*;
@@ -15,6 +35,11 @@ import org.junit.Test;
import org.mvel2.integration.VariableResolver;
+/**
+ * Tests {...@link ScopeVariableResolverFactory}.
+ *
+ * @version $Rev$ $Date$
+ */
public class ScopeVariableResolverFactoryTest {
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java?rev=1049688&r1=1049687&r2=1049688&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
Wed Dec 15 20:15:41 2010
@@ -28,7 +28,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.tiles.context.TilesRequestContextHolder;
-import org.apache.tiles.mvel.TilesContextVariableResolverFactory;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.After;
