From 2f3ecdf86dbcf0c058d317eb8afa468948df0e3d Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 21 Jun 2006 08:40:20 +0000 Subject: [PATCH] Some backwards compatibility bits. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4207 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/presents/dobj/DSet.java | 8 + src/java/com/threerings/util/RandomUtil.java | 139 ++++++++++++++++++ 2 files changed, 147 insertions(+) create mode 100644 src/java/com/threerings/util/RandomUtil.java diff --git a/src/java/com/threerings/presents/dobj/DSet.java b/src/java/com/threerings/presents/dobj/DSet.java index fe6f5e122..0010a1af5 100644 --- a/src/java/com/threerings/presents/dobj/DSet.java +++ b/src/java/com/threerings/presents/dobj/DSet.java @@ -234,6 +234,14 @@ public class DSet return array; } + /** + * @deprecated use {@link #toArray(E[])}. + */ + public Object[] toArray (Object[] array) + { + return toArray((E[])array); + } + /** * Adds the specified entry to the set. This should not be called * directly, instead the associated addTo{Set}() method diff --git a/src/java/com/threerings/util/RandomUtil.java b/src/java/com/threerings/util/RandomUtil.java new file mode 100644 index 000000000..898027bb7 --- /dev/null +++ b/src/java/com/threerings/util/RandomUtil.java @@ -0,0 +1,139 @@ +// +// $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved +// http://www.threerings.net/code/narya/ +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +package com.threerings.util; + +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Random; + +/** + * Maintained for backwards compatibility with old Game Gardens games. + * + * @deprecated moved to {@link com.samskivert.util.RandomUtil}. + */ +public class RandomUtil +{ + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static int getInt (int high) + { + return com.samskivert.util.RandomUtil.getInt(high); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static int getInt (int high, int low) + { + return com.samskivert.util.RandomUtil.getInt(high, low); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static float getFloat (float high) + { + return com.samskivert.util.RandomUtil.getFloat(high); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static int getWeightedIndex (int[] weights) + { + return com.samskivert.util.RandomUtil.getWeightedIndex(weights); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static int getWeightedIndex (float[] weights) + { + return com.samskivert.util.RandomUtil.getWeightedIndex(weights); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static T pickRandom (T[] values) + { + return com.samskivert.util.RandomUtil.pickRandom(values); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static T pickRandom (T[] values, T skip) + { + return com.samskivert.util.RandomUtil.pickRandom(values, skip); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static T pickRandom (Collection values) + { + return com.samskivert.util.RandomUtil.pickRandom(values); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static T pickRandom (List values) + { + return com.samskivert.util.RandomUtil.pickRandom(values); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static T pickRandom (List values, T skip) + { + return com.samskivert.util.RandomUtil.pickRandom(values, skip); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static T pickRandom (List values, T skip, Random r) + { + return com.samskivert.util.RandomUtil.pickRandom(values, skip, r); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static T pickRandom (Iterator iter, int count) + { + return com.samskivert.util.RandomUtil.pickRandom(iter, count); + } + + /** + * @deprecated use {@link com.samskivert.util.RandomUtil}. + */ + public static T pickRandom (Iterator iter, int count, T skip) + { + return com.samskivert.util.RandomUtil.pickRandom(iter, count, skip); + } +}