Author: apetrelli
Date: Wed Dec 15 20:30:10 2010
New Revision: 1049696
URL: http://svn.apache.org/viewvc?rev=1049696&view=rev
Log:
TILESSB-38
Fixed tiles-ognl checkstyle.
Added:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java
(with props)
Removed:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/package.html
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/ScopePropertyAccessorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java
Wed Dec 15 20:30:10 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.ognl;
import java.util.Map;
@@ -7,14 +27,18 @@ import ognl.PropertyAccessor;
import org.apache.tiles.request.Request;
+/**
+ * Accesses attributes in any scope.
+ *
+ * @version $Rev$ $Date$
+ */
public class AnyScopePropertyAccessor implements PropertyAccessor {
- @SuppressWarnings("unchecked")
@Override
- public Object getProperty(Map context, Object target, Object name) {
+ public Object getProperty(@SuppressWarnings("rawtypes") Map context,
Object target, Object name) {
Request request = (Request) target;
String attributeName = (String) name;
- for (String scopeName: request.getAvailableScopes()) {
+ for (String scopeName : request.getAvailableScopes()) {
Map<String, Object> scope = request.getContext(scopeName);
if (scope.containsKey(attributeName)) {
return scope.get(attributeName);
@@ -28,7 +52,7 @@ public class AnyScopePropertyAccessor im
Object index) {
Request request = (Request) target;
String attributeName = (String) index;
- for (String scopeName: request.getAvailableScopes()) {
+ for (String scopeName : request.getAvailableScopes()) {
Map<String, Object> scope = request.getContext(scopeName);
if (scope.containsKey(attributeName)) {
return ".getContext(\"" + scopeName + "\").get(index)";
@@ -43,7 +67,7 @@ public class AnyScopePropertyAccessor im
Request request = (Request) target;
String attributeName = (String) index;
String[] availableScopes = request.getAvailableScopes();
- for (String scopeName: availableScopes) {
+ for (String scopeName : availableScopes) {
Map<String, Object> scope = request.getContext(scopeName);
if (scope.containsKey(attributeName)) {
return ".getContext(\"" + scopeName + "\").put(index, target)";
@@ -52,14 +76,13 @@ public class AnyScopePropertyAccessor im
return ".getContext(\"" + availableScopes[0] + "\").put(index,
target)";
}
- @SuppressWarnings("unchecked")
@Override
- public void setProperty(Map context, Object target, Object name,
+ public void setProperty(@SuppressWarnings("rawtypes") Map context, Object
target, Object name,
Object value) {
Request request = (Request) target;
String attributeName = (String) name;
String[] availableScopes = request.getAvailableScopes();
- for (String scopeName: availableScopes) {
+ for (String scopeName : availableScopes) {
Map<String, Object> scope = request.getContext(scopeName);
if (scope.containsKey(attributeName)) {
scope.put(attributeName, value);
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
Wed Dec 15 20:30:10 2010
@@ -56,7 +56,7 @@ public class DelegatePropertyAccessor<T>
/** {...@inheritdoc} */
@SuppressWarnings("unchecked")
- public Object getProperty(Map context, Object target, Object name)
+ public Object getProperty(@SuppressWarnings("rawtypes") Map context,
Object target, Object name)
throws OgnlException {
return factory.getPropertyAccessor((String) name, (T)
target).getProperty(
context, target, name);
@@ -64,7 +64,7 @@ public class DelegatePropertyAccessor<T>
/** {...@inheritdoc} */
@SuppressWarnings("unchecked")
- public void setProperty(Map context, Object target, Object name,
+ public void setProperty(@SuppressWarnings("rawtypes") Map context, Object
target, Object name,
Object value) throws OgnlException {
factory.getPropertyAccessor((String) name, (T)
target).setProperty(context,
target, name, value);
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
Wed Dec 15 20:30:10 2010
@@ -69,7 +69,7 @@ public class NestedObjectDelegatePropert
/** {...@inheritdoc} */
@SuppressWarnings("unchecked")
- public Object getProperty(Map context, Object target, Object name)
+ public Object getProperty(@SuppressWarnings("rawtypes") Map context,
Object target, Object name)
throws OgnlException {
return propertyAccessor.getProperty(context, nestedObjectExtractor
.getNestedObject((T) target), name);
@@ -77,7 +77,7 @@ public class NestedObjectDelegatePropert
/** {...@inheritdoc} */
@SuppressWarnings("unchecked")
- public void setProperty(Map context, Object target, Object name,
+ public void setProperty(@SuppressWarnings("rawtypes") Map context, Object
target, Object name,
Object value) throws OgnlException {
propertyAccessor.setProperty(context, nestedObjectExtractor
.getNestedObject((T) target), name, value);
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java
Wed Dec 15 20:30:10 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.ognl;
import java.util.Map;
@@ -7,15 +27,24 @@ import ognl.PropertyAccessor;
import org.apache.tiles.request.Request;
+/**
+ * Accesses a scope.
+ *
+ * @version $Rev$ $Date$
+ */
public class ScopePropertyAccessor implements PropertyAccessor {
- @SuppressWarnings("unchecked")
+ /**
+ * The length of the scope suffix: "Scope".
+ */
+ static final int SCOPE_SUFFIX_LENGTH = 5;
+
@Override
- public Object getProperty(Map context, Object target, Object name) {
+ public Object getProperty(@SuppressWarnings("rawtypes") Map context,
Object target, Object name) {
Request request = (Request) target;
String scope = (String) name;
if (scope.endsWith("Scope")) {
- String scopeName = scope.substring(0, scope.length() - 5);
+ String scopeName = scope.substring(0, scope.length() -
SCOPE_SUFFIX_LENGTH);
return request.getContext(scopeName);
}
return null;
@@ -26,7 +55,7 @@ public class ScopePropertyAccessor imple
Object index) {
String scope = (String) index;
if (scope.endsWith("Scope")) {
- String scopeName = scope.substring(0, scope.length() - 5);
+ String scopeName = scope.substring(0, scope.length() -
SCOPE_SUFFIX_LENGTH);
return ".getContext(\"" + scopeName + "\")";
}
return null;
@@ -38,9 +67,8 @@ public class ScopePropertyAccessor imple
return null;
}
- @SuppressWarnings("unchecked")
@Override
- public void setProperty(Map context, Object target, Object name,
+ public void setProperty(@SuppressWarnings("rawtypes") Map context, Object
target, Object name,
Object value) {
// Does nothing.
}
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
Wed Dec 15 20:30:10 2010
@@ -92,7 +92,8 @@ public class TilesContextPropertyAccesso
Request request) {
PropertyAccessor retValue;
if (propertyName.endsWith("Scope")) {
- String scopeName = propertyName.substring(0, propertyName.length()
- 5);
+ String scopeName = propertyName.substring(0, propertyName.length()
+ - ScopePropertyAccessor.SCOPE_SUFFIX_LENGTH);
if (request.getContext(scopeName) != null) {
return scopePropertyAccessor;
}
Added:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java?rev=1049696&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java
Wed Dec 15 20:30:10 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 OGNL evaluation for attributes.
+ */
+package org.apache.tiles.ognl;
Propchange:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java
Wed Dec 15 20:30:10 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.ognl;
@@ -19,6 +36,9 @@ import org.junit.Test;
*/
public class AnyScopePropertyAccessorTest {
+ /**
+ * The accessor to test.
+ */
private AnyScopePropertyAccessor accessor;
/**
@@ -30,7 +50,7 @@ public class AnyScopePropertyAccessorTes
}
/**
- * Test method for {...@link
org.apache.tiles.ognl.AnyScopePropertyAccessor#getProperty(java.util.Map,
java.lang.Object, java.lang.Object)}.
+ * Test method for {...@link
AnyScopePropertyAccessor#getProperty(java.util.Map, java.lang.Object,
java.lang.Object)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -58,7 +78,7 @@ public class AnyScopePropertyAccessorTes
}
/**
- * Test method for {...@link
org.apache.tiles.ognl.AnyScopePropertyAccessor#getSourceAccessor(ognl.OgnlContext,
java.lang.Object, java.lang.Object)}.
+ * Test method for {...@link
AnyScopePropertyAccessor#getSourceAccessor(OgnlContext, Object, Object)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -84,7 +104,7 @@ public class AnyScopePropertyAccessorTes
}
/**
- * Test method for {...@link
org.apache.tiles.ognl.AnyScopePropertyAccessor#getSourceSetter(ognl.OgnlContext,
java.lang.Object, java.lang.Object)}.
+ * Test method for {...@link
AnyScopePropertyAccessor#getSourceSetter(OgnlContext, Object, Object)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -110,7 +130,7 @@ public class AnyScopePropertyAccessorTes
}
/**
- * Test method for {...@link
org.apache.tiles.ognl.AnyScopePropertyAccessor#setProperty(java.util.Map,
java.lang.Object, java.lang.Object, java.lang.Object)}.
+ * Test method for {...@link AnyScopePropertyAccessor#setProperty(Map,
Object, Object, Object)}.
*/
@SuppressWarnings("unchecked")
@Test
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
Wed Dec 15 20:30:10 2010
@@ -30,8 +30,6 @@ import ognl.OgnlContext;
import ognl.OgnlException;
import ognl.PropertyAccessor;
-import org.apache.tiles.ognl.DelegatePropertyAccessor;
-import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.junit.Test;
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
Wed Dec 15 20:30:10 2010
@@ -30,8 +30,6 @@ import ognl.OgnlContext;
import ognl.OgnlException;
import ognl.PropertyAccessor;
-import org.apache.tiles.ognl.NestedObjectDelegatePropertyAccessor;
-import org.apache.tiles.ognl.NestedObjectExtractor;
import org.junit.Test;
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
Wed Dec 15 20:30:10 2010
@@ -57,6 +57,9 @@ public class OGNLAttributeEvaluatorTest
*/
private Request request;
+ /**
+ * The application context.
+ */
private ApplicationContext applicationContext;
/**
@@ -184,7 +187,7 @@ public class OGNLAttributeEvaluatorTest
/**
* Tests {...@link OGNLAttributeEvaluator#evaluate(String, Request)}.
*/
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testEvaluateNull() {
evaluator.evaluate((String) null, request);
}
@@ -192,7 +195,7 @@ public class OGNLAttributeEvaluatorTest
/**
* Tests {...@link OGNLAttributeEvaluator#evaluate(String, Request)}.
*/
- @Test(expected=EvaluationException.class)
+ @Test(expected = EvaluationException.class)
public void testEvaluateOgnlException() {
evaluator.evaluate("wrong|||!!!!yes###", request);
}
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/ScopePropertyAccessorTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/ScopePropertyAccessorTest.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/ScopePropertyAccessorTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/ScopePropertyAccessorTest.java
Wed Dec 15 20:30:10 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.ognl;
@@ -19,6 +36,9 @@ import org.junit.Test;
*/
public class ScopePropertyAccessorTest {
+ /**
+ * The accessor to test.
+ */
private ScopePropertyAccessor accessor;
/**
@@ -30,7 +50,7 @@ public class ScopePropertyAccessorTest {
}
/**
- * Test method for {...@link
org.apache.tiles.ognl.ScopePropertyAccessor#getProperty(java.util.Map,
java.lang.Object, java.lang.Object)}.
+ * Test method for {...@link ScopePropertyAccessor#getProperty(Map,
Object, Object)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -47,7 +67,7 @@ public class ScopePropertyAccessorTest {
}
/**
- * Test method for {...@link
org.apache.tiles.ognl.ScopePropertyAccessor#getSourceAccessor(ognl.OgnlContext,
java.lang.Object, java.lang.Object)}.
+ * Test method for {...@link
ScopePropertyAccessor#getSourceAccessor(OgnlContext, Object, Object)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -63,7 +83,7 @@ public class ScopePropertyAccessorTest {
}
/**
- * Test method for {...@link
org.apache.tiles.ognl.ScopePropertyAccessor#getSourceSetter(ognl.OgnlContext,
java.lang.Object, java.lang.Object)}.
+ * Test method for {...@link
ScopePropertyAccessor#getSourceSetter(OgnlContext, Object, Object)}.
*/
@Test
public void testGetSourceSetter() {
@@ -71,7 +91,7 @@ public class ScopePropertyAccessorTest {
}
/**
- * Test method for {...@link
org.apache.tiles.ognl.ScopePropertyAccessor#setProperty(java.util.Map,
java.lang.Object, java.lang.Object, java.lang.Object)}.
+ * Test method for {...@link ScopePropertyAccessor#setProperty(Map,
Object, Object, Object)}.
*/
@Test
public void testSetProperty() {
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
Wed Dec 15 20:30:10 2010
@@ -24,8 +24,6 @@ package org.apache.tiles.ognl;
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
-import org.apache.tiles.ognl.NestedObjectExtractor;
-import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Test;
Modified:
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java?rev=1049696&r1=1049695&r2=1049696&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
Wed Dec 15 20:30:10 2010
@@ -29,8 +29,6 @@ import java.util.Map;
import ognl.PropertyAccessor;
-import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
-import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Test;
