Adjusts code base to be compliant with Java 1.7

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1412316 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2012-11-21 21:43:04 +00:00
parent edbfa6716c
commit 0802b09ea1
@@ -40,11 +40,11 @@ public class GxpInstance extends Gxp {
private static final Logger logger = Logger.getLogger(GxpInstance.class.getCanonicalName());
private Class<?> gxpInterface;
private Class<?> gxpInstance;
private Class gxpInterface;
private Class gxpInstance;
private ObjectFactory objectFactory;
GxpInstance(Class<?> gxpClass) {
GxpInstance(Class gxpClass) {
super(gxpClass,
lookupMethodByName(getNestedClass(gxpClass, "Interface"), "write"),
lookupMethodByName(getNestedClass(gxpClass, "Interface"), "getGxpClosure"));
@@ -52,8 +52,8 @@ public class GxpInstance extends Gxp {
this.gxpInstance = getNestedClass(gxpClass, "Instance");
}
private static Class<?> getNestedClass(Class<?> clazz, String nestedClassName) {
for (Class<?> nested : clazz.getDeclaredClasses()) {
private static Class getNestedClass(Class clazz, String nestedClassName) {
for (Class nested : clazz.getDeclaredClasses()) {
if (nestedClassName.equals(nested.getSimpleName())) {
return nested;
}
@@ -92,9 +92,9 @@ public class GxpInstance extends Gxp {
return this.gxpInterface;
}
private static final Map<Class<?>, GxpInstance> classToGxpInstance = new MapMaker().weakKeys().softValues()
.makeComputingMap(new Function<Class<?>, GxpInstance>() {
public GxpInstance apply(Class<?> from) {
private static final Map<Class, GxpInstance> classToGxpInstance = new MapMaker().weakKeys().softValues()
.makeComputingMap(new Function<Class, GxpInstance>() {
public GxpInstance apply(Class from) {
return classToGxpInstance.containsKey(from) ? classToGxpInstance.get(from) : new GxpInstance(from);
}
});
@@ -126,7 +126,7 @@ public class GxpInstance extends Gxp {
/**
* Looks up {@code GxpInstance} instance for the given GXP class.
*/
public static GxpInstance getInstance(Class<?> gxpClass) {
public static GxpInstance getInstance(Class gxpClass) {
return classToGxpInstance.get(gxpClass);
}