From 806e41dd17798d1b65b6091deeda65a758a9f083 Mon Sep 17 00:00:00 2001 From: James Roseborough Date: Tue, 6 Jul 2010 16:25:24 +0000 Subject: [PATCH] Convert to midp apis --- src/core/org/luaj/vm2/LuaTable.java | 6 ++++-- src/core/org/luaj/vm2/WeakTable.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/org/luaj/vm2/LuaTable.java b/src/core/org/luaj/vm2/LuaTable.java index 387e4d8a..1dd43e12 100644 --- a/src/core/org/luaj/vm2/LuaTable.java +++ b/src/core/org/luaj/vm2/LuaTable.java @@ -569,8 +569,10 @@ public class LuaTable extends LuaValue { Varargs n = next(k); if ( (k = n.arg1()).isnil() ) break; - l.add( k ); + l.addElement( k ); } - return (LuaValue[]) l.toArray(new LuaValue[l.size()]); + LuaValue[] a = new LuaValue[l.size()]; + l.copyInto(a); + return a; } } diff --git a/src/core/org/luaj/vm2/WeakTable.java b/src/core/org/luaj/vm2/WeakTable.java index 87f770ef..92da21a6 100644 --- a/src/core/org/luaj/vm2/WeakTable.java +++ b/src/core/org/luaj/vm2/WeakTable.java @@ -61,7 +61,7 @@ public class WeakTable extends LuaTable { return super.getHashLength(); } - protected WeakTable changemode(boolean weakkeys, boolean weakvalues) { + protected LuaTable changemode(boolean weakkeys, boolean weakvalues) { this.weakkeys = weakkeys; this.weakvalues = weakvalues; return this;