From: Hendrik <nh...@us...> - 2007-11-13 21:38:03
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/scripting In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8713/src/games/stendhal/server/scripting Modified Files: ScriptInJava.java Log Message: applied patch 1830745 fix java 5 related compiler warnings by martin fuchs Index: ScriptInJava.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/scripting/ScriptInJava.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ScriptInJava.java 1 Nov 2007 23:32:53 -0000 1.13 --- ScriptInJava.java 13 Nov 2007 21:38:05 -0000 1.14 *************** *** 58,62 **** ClassLoader loader = new URLClassLoader(new URL[] { file.toURL() }); // load class through new loader ! Class aClass = loader.loadClass(classname); script = (Script) aClass.newInstance(); } --- 58,62 ---- ClassLoader loader = new URLClassLoader(new URL[] { file.toURL() }); // load class through new loader ! Class<?> aClass = loader.loadClass(classname); script = (Script) aClass.newInstance(); } *************** *** 64,68 **** @Override public boolean load(Player admin, String[] args) { ! Class[] signature = new Class[] { Player.class, List.class, ScriptingSandbox.class }; Object[] params = new Object[] { admin, Arrays.asList(args), this }; --- 64,68 ---- @Override public boolean load(Player admin, String[] args) { ! Class<?>[] signature = new Class<?>[] { Player.class, List.class, ScriptingSandbox.class }; Object[] params = new Object[] { admin, Arrays.asList(args), this }; *************** *** 85,89 **** @Override public boolean execute(Player admin, String[] args) { ! Class[] signature = new Class[] { Player.class, List.class }; Object[] params = new Object[] { admin, Arrays.asList(args) }; --- 85,89 ---- @Override public boolean execute(Player admin, String[] args) { ! Class<?>[] signature = new Class[] { Player.class, List.class }; Object[] params = new Object[] { admin, Arrays.asList(args) }; *************** *** 101,105 **** @Override public void unload(Player admin, String[] args) { ! Class[] signature = new Class[] { Player.class, List.class }; Object[] params = new Object[] { admin, Arrays.asList(args) }; try { --- 101,105 ---- @Override public void unload(Player admin, String[] args) { ! Class<?>[] signature = new Class<?>[] { Player.class, List.class }; Object[] params = new Object[] { admin, Arrays.asList(args) }; try { |