Simplify by using "switch (String)"
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ad1b70e2 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ad1b70e2 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ad1b70e2 Branch: refs/heads/master Commit: ad1b70e2fae5a8eb808dbb0fd27caf48ea0710be Parents: 279cf5c Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Sep 22 10:10:51 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Sep 22 10:22:23 2014 +0200 ---------------------------------------------------------------------- .../application/AbstractClassResolver.java | 78 +++++++++----------- 1 file changed, 36 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ad1b70e2/wicket-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java b/wicket-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java index 2cbc34b..de8a9b3 100644 --- a/wicket-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java +++ b/wicket-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java @@ -67,51 +67,45 @@ public abstract class AbstractClassResolver implements IClassResolver } if (clazz == null) { - if (className.equals("byte")) + switch (className) { - clazz = byte.class; - } - else if (className.equals("short")) - { - clazz = short.class; - } - else if (className.equals("int")) - { - clazz = int.class; - } - else if (className.equals("long")) - { - clazz = long.class; - } - else if (className.equals("float")) - { - clazz = float.class; - } - else if (className.equals("double")) - { - clazz = double.class; - } - else if (className.equals("boolean")) - { - clazz = boolean.class; - } - else if (className.equals("char")) - { - clazz = char.class; - } - else - { - // synchronize on the only class member to load only one class at a time and - // prevent LinkageError. See above for more info - synchronized (classes) - { - clazz = Class.forName(className, false, getClassLoader()); - if (clazz == null) + case "byte": + clazz = byte.class; + break; + case "short": + clazz = short.class; + break; + case "int": + clazz = int.class; + break; + case "long": + clazz = long.class; + break; + case "float": + clazz = float.class; + break; + case "double": + clazz = double.class; + break; + case "boolean": + clazz = boolean.class; + break; + case "char": + clazz = char.class; + break; + default: + // synchronize on the only class member to load only one class at a time and + // prevent LinkageError. See above for more info + synchronized (classes) { - throw new ClassNotFoundException(className); + clazz = Class.forName(className, false, getClassLoader()); + if (clazz == null) + { + throw new ClassNotFoundException(className); + } } - } - classes.put(className, new WeakReference<Class<?>>(clazz)); + classes.put(className, new WeakReference<Class<?>>(clazz)); + break; } } return clazz;
