test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-04 20:28:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refs #1800 Make method Scripting.loadClass() generic to avoid type cast warnings

Browse Source
This commit is contained in:
Konstantin Krivopustov 2013-01-16 13:27:59 +00:00
parent b30972a371
commit 06cfa265a9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/global/src/com/haulmont/cuba/core/global/Scripting.java
View File

@ -92,7 +92,7 @@ public interface Scripting {
* @return class or null if not found
*/
@Nullable
Class loadClass(String name);
<T> Class<T> loadClass(String name);
/**
* DEPRECATED - use {@link Resources#getResourceAsStream(String)}

7
modules/global/src/com/haulmont/cuba/core/sys/AbstractScripting.java
View File

@ -37,9 +37,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* <p>$Id$</p>
*
* @author krivopustov
* @version $Id$
*/
public abstract class AbstractScripting implements Scripting {
@ -227,6 +226,7 @@ public abstract class AbstractScripting implements Scripting {
@Override
public <T> T runGroovyScript(String name, Map<String, Object> context) {
Binding binding = createBinding(context);
//noinspection unchecked
return (T) runGroovyScript(name, binding);
}
@ -236,8 +236,9 @@ public abstract class AbstractScripting implements Scripting {
}
@Override
public Class loadClass(String name) {
public <T> Class<T> loadClass(String name) {
try {
//noinspection unchecked
return getGroovyClassLoader().loadClass(name, true, false);
} catch (ClassNotFoundException e) {
return null;