You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2012/11/25 20:57:09 UTC
git commit: reuse class resolving code in class reference
Updated Branches:
refs/heads/master 84388e40c -> 61de675ec
reuse class resolving code in class reference
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/61de675e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/61de675e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/61de675e
Branch: refs/heads/master
Commit: 61de675eca6fbd4d8943d460c165f729538ddc36
Parents: 84388e4
Author: Igor Vaynberg <ig...@gmail.com>
Authored: Sun Nov 25 11:57:10 2012 -0800
Committer: Igor Vaynberg <ig...@gmail.com>
Committed: Sun Nov 25 11:57:10 2012 -0800
----------------------------------------------------------------------
.../wicket/util/reference/ClassReference.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/61de675e/wicket-core/src/main/java/org/apache/wicket/util/reference/ClassReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/reference/ClassReference.java b/wicket-core/src/main/java/org/apache/wicket/util/reference/ClassReference.java
index a5f0b02..f617ee8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/reference/ClassReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/reference/ClassReference.java
@@ -19,7 +19,7 @@ package org.apache.wicket.util.reference;
import java.io.Serializable;
import java.lang.ref.WeakReference;
-import org.apache.wicket.Application;
+import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.util.IProvider;
/**
@@ -51,22 +51,15 @@ public class ClassReference<T> implements Serializable, IProvider<Class<T>>
/**
* @return the {@link Class} stored in this reference
*/
- @SuppressWarnings("unchecked")
public Class<T> get()
{
Class<T> clazz = cache != null ? cache.get() : null;
if (clazz == null)
{
- try
+ clazz = WicketObjects.resolveClass(name);
+ if (clazz == null)
{
- clazz = (Class<T>)Application.get()
- .getApplicationSettings()
- .getClassResolver()
- .resolveClass(name);
- }
- catch (ClassNotFoundException e)
- {
- throw new RuntimeException("Could not resolve class: " + name, e);
+ throw new RuntimeException("Could not resolve class: " + name);
}
cache(clazz);
}