From be8a755dad289b7d8b3112723ab92e9f63981e43 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Mon, 28 Mar 2005 22:31:46 +0000 Subject: [PATCH] The generic set updaters weren't working because proguard renamed the methods they were looking for. Since it's probably impossible to have proguard generically skip renaming for these generated method names, let's update the fields in a different way. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3434 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/presents/dobj/DObject.java | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java index c809e2c33..ea78c6232 100644 --- a/src/java/com/threerings/presents/dobj/DObject.java +++ b/src/java/com/threerings/presents/dobj/DObject.java @@ -23,7 +23,6 @@ package com.threerings.presents.dobj; import java.lang.reflect.Array; import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.Arrays; import java.util.Comparator; @@ -295,13 +294,7 @@ public class DObject extends TrackedObject */ public void addToSet (String setName, DSet.Entry entry) { - String mname = "addTo" + StringUtils.capitalize(setName); - try { - Method m = getClass().getMethod(mname, ENTRY_CLASS_ARGS); - m.invoke(this, new Object[] { entry }); - } catch (Exception e) { - throw new IllegalArgumentException("No such set: " + setName); - } + requestEntryAdd(setName, getSet(setName), entry); } /** @@ -309,13 +302,7 @@ public class DObject extends TrackedObject */ public void updateSet (String setName, DSet.Entry entry) { - String mname = "update" + StringUtils.capitalize(setName); - try { - Method m = getClass().getMethod(mname, ENTRY_CLASS_ARGS); - m.invoke(this, new Object[] { entry }); - } catch (Exception e) { - throw new IllegalArgumentException("No such set: " + setName); - } + requestEntryUpdate(setName, getSet(setName), entry); } /** @@ -323,13 +310,7 @@ public class DObject extends TrackedObject */ public void removeFromSet (String setName, Comparable key) { - String mname = "removeFrom" + StringUtils.capitalize(setName); - try { - Method m = getClass().getMethod(mname, KEY_CLASS_ARGS); - m.invoke(this, new Object[] { key }); - } catch (Exception e) { - throw new IllegalArgumentException("No such set: " + setName); - } + requestEntryRemove(setName, getSet(setName), key); } /**