diff --git a/src/java/com/threerings/presents/tools/GenDObjectTask.java b/src/java/com/threerings/presents/tools/GenDObjectTask.java index ab05544bc..19dc2b45b 100644 --- a/src/java/com/threerings/presents/tools/GenDObjectTask.java +++ b/src/java/com/threerings/presents/tools/GenDObjectTask.java @@ -216,13 +216,14 @@ public class GenDObjectTask extends Task } String transport; if (hint == null) { - transport = "DEFAULT"; + transport = ""; } else { - transport = "getInstance(\n" + + transport = ",\n" + + " com.threerings.presents.net.Transport.getInstance(\n" + " com.threerings.presents.net.Transport.Type." + hint.type().name() + ", " + hint.channel() + ")"; } - ctx.put("transport", "com.threerings.presents.net.Transport." + transport); + ctx.put("transport", transport); // if this field is an array, we need its component types if (ftype.isArray()) { diff --git a/src/java/com/threerings/presents/tools/InvocationTask.java b/src/java/com/threerings/presents/tools/InvocationTask.java index d9b6fc8fd..a4cb4b32a 100644 --- a/src/java/com/threerings/presents/tools/InvocationTask.java +++ b/src/java/com/threerings/presents/tools/InvocationTask.java @@ -261,9 +261,9 @@ public abstract class InvocationTask extends Task hint = method.getDeclaringClass().getAnnotation(TransportHint.class); } if (hint == null) { - return "Transport.DEFAULT"; + return ""; } - return "Transport.getInstance(Transport.Type." + + return ", Transport.getInstance(Transport.Type." + hint.type().name() + ", " + hint.channel() + ")"; } diff --git a/src/java/com/threerings/presents/tools/dobject_field.tmpl b/src/java/com/threerings/presents/tools/dobject_field.tmpl index 4fcecbfeb..6fbc712cd 100644 --- a/src/java/com/threerings/presents/tools/dobject_field.tmpl +++ b/src/java/com/threerings/presents/tools/dobject_field.tmpl @@ -10,8 +10,7 @@ { $type ovalue = this.$field; requestAttributeChange( - $capfield, $wrapfield, $wrapofield, - $transport); + $capfield, $wrapfield, $wrapofield$transport); this.$field = $clonefield; } #if ($elemtype) @@ -29,8 +28,7 @@ { $elemtype ovalue = this.$field[index]; requestElementUpdate( - $capfield, index, $wrapelem, $wrapoelem, - $transport); + $capfield, index, $wrapelem, $wrapoelem$transport); this.$field[index] = value; } #end diff --git a/src/java/com/threerings/presents/tools/dobject_set.tmpl b/src/java/com/threerings/presents/tools/dobject_set.tmpl index a6480909e..26f572591 100644 --- a/src/java/com/threerings/presents/tools/dobject_set.tmpl +++ b/src/java/com/threerings/presents/tools/dobject_set.tmpl @@ -25,9 +25,7 @@ */ public void update$upfield ($etype elem) { - requestEntryUpdate( - $capfield, $field, elem, - $transport); + requestEntryUpdate($capfield, $field, elem$transport); } /** diff --git a/src/java/com/threerings/presents/tools/marshaller.tmpl b/src/java/com/threerings/presents/tools/marshaller.tmpl index e2c06a7a3..21b1f69be 100644 --- a/src/java/com/threerings/presents/tools/marshaller.tmpl +++ b/src/java/com/threerings/presents/tools/marshaller.tmpl @@ -71,7 +71,7 @@ public class ${name}Marshaller extends InvocationMarshaller #end sendRequest(arg1, $m.code, new Object[] { $m.getWrappedArgList(true) - }, $m.transport); + }$m.transport); } #end } diff --git a/src/java/com/threerings/presents/tools/sender.tmpl b/src/java/com/threerings/presents/tools/sender.tmpl index c8ca62a2b..5774bb569 100644 --- a/src/java/com/threerings/presents/tools/sender.tmpl +++ b/src/java/com/threerings/presents/tools/sender.tmpl @@ -20,7 +20,7 @@ public class ${name}Sender extends InvocationSender { sendNotification( target, ${name}Decoder.RECEIVER_CODE, ${name}Decoder.$m.code, - new Object[] { $m.getWrappedArgList(false) }, $m.transport); + new Object[] { $m.getWrappedArgList(false) }$m.transport); } #end