Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 09:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleans up code

Browse Source
This commit is contained in:
Lukasz Lenart
2017-06-18 11:07:25 +02:00
parent 843693fdd4
commit 216c52095e
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesAnnotationProcessor.java
+2 -2
View File
@@ -54,14 +54,14 @@ public class StrutsTilesAnnotationProcessor {
* @return {@link TilesDefinition}
*/
public TilesDefinition findAnnotation(Object action, String tileName) {
Class<? extends Object> clazz = action.getClass();
Class<?> clazz = action.getClass();
TilesDefinition tilesDefinition = clazz.getAnnotation(TilesDefinition.class);
TilesDefinitions tilesDefinitions = clazz.getAnnotation(TilesDefinitions.class);
if (tilesDefinition == null && tilesDefinitions != null) {
if (!StringUtils.isEmpty(tileName)) {
for (TilesDefinition i : tilesDefinitions.value()) {
if (i.name() != null && i.name().equals(tileName)) {
if (i.name().equals(tileName)) {
tilesDefinition = i;
break;
}
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
-1
View File
@@ -20,7 +20,6 @@
package org.apache.struts2.tiles;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.LocaleProviderFactory;
import com.opensymphony.xwork2.config.ConfigurationException;
import org.apache.logging.log4j.LogManager;