Skip to content

Commit 216c520

Browse files
committed
Cleans up code
1 parent 843693f commit 216c520

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesAnnotationProcessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ public class StrutsTilesAnnotationProcessor {
5454
* @return {@link TilesDefinition}
5555
*/
5656
public TilesDefinition findAnnotation(Object action, String tileName) {
57-
Class<? extends Object> clazz = action.getClass();
57+
Class<?> clazz = action.getClass();
5858
TilesDefinition tilesDefinition = clazz.getAnnotation(TilesDefinition.class);
5959
TilesDefinitions tilesDefinitions = clazz.getAnnotation(TilesDefinitions.class);
6060

6161
if (tilesDefinition == null && tilesDefinitions != null) {
6262
if (!StringUtils.isEmpty(tileName)) {
6363
for (TilesDefinition i : tilesDefinitions.value()) {
64-
if (i.name() != null && i.name().equals(tileName)) {
64+
if (i.name().equals(tileName)) {
6565
tilesDefinition = i;
6666
break;
6767
}

plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.apache.struts2.tiles;
2121

2222
import com.opensymphony.xwork2.ActionContext;
23-
import com.opensymphony.xwork2.LocaleProvider;
2423
import com.opensymphony.xwork2.LocaleProviderFactory;
2524
import com.opensymphony.xwork2.config.ConfigurationException;
2625
import org.apache.logging.log4j.LogManager;

0 commit comments

Comments
 (0)