From bf215119c4808b828f2a111ea9baf773dcab240f Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Thu, 9 Dec 2010 21:49:51 +0000 Subject: [PATCH] Changed the names of generated signals to match their Java equivalents and to feel nicer with plural field names. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6355 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../tools/GenActionScriptStreamableTask.java | 2 ++ .../presents/tools/streamable_as.tmpl | 20 +++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java b/src/main/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java index f58c24a0f..776f03b0d 100644 --- a/src/main/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java +++ b/src/main/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java @@ -119,6 +119,7 @@ public class GenActionScriptStreamableTask extends GenTask protected static class ASField { public final String name; + public final String capitalName; public final String simpleType; public final String reader; public final String writer; @@ -129,6 +130,7 @@ public class GenActionScriptStreamableTask extends GenTask public ASField (Field f, Set imports) { name = f.getName(); + capitalName = StringUtil.capitalize(name); dobjectField = StringUtil.unStudlyName(name).toUpperCase(); simpleType = ActionScriptUtils.addImportAndGetShortType(f.getType(), true, imports); diff --git a/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl b/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl index ffdface1e..a30da00db 100644 --- a/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl +++ b/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl @@ -22,14 +22,14 @@ public class {{classname}} {{^extends.isEmpty}}extends {{extends}} {{/fields}} {{#dobject}} {{#fields}} - public var {{name}}Changed :Signal = new Signal({{simpleType}}, {{simpleType}}); + public var set{{capitalName}} :Signal = new Signal({{simpleType}}, {{simpleType}}); {{#dset}} - public var {{name}}Added :Signal = new Signal(DSet_Entry); - public var {{name}}Removed :Signal = new Signal(DSet_Entry); - public var {{name}}Updated :Signal = new Signal(DSet_Entry, DSet_Entry); + public var addedTo{{capitalName}} :Signal = new Signal(DSet_Entry); + public var removedFrom{{capitalName}} :Signal = new Signal(DSet_Entry); + public var updated{{capitalName}} :Signal = new Signal(DSet_Entry, DSet_Entry); {{/dset}} {{#array}} - public var {{name}}Updated :Signal = new Signal(int, Object, Object); + public var updated{{capitalName}} :Signal = new Signal(int, Object, Object); {{/array}} {{/fields}} @@ -103,7 +103,7 @@ class Signaller switch (event.getName()) { {{#fields}} case "{{name}}": - signal = _obj.{{name}}Changed; + signal = _obj.set{{capitalName}}; break; {{/fields}} default: @@ -118,7 +118,7 @@ class Signaller switch (event.getName()) { {{#fields}}{{#dset}} case "{{name}}": - signal = _obj.{{name}}Added; + signal = _obj.addedTo{{capitalName}}; break; {{/dset}}{{/fields}} default: @@ -133,7 +133,7 @@ class Signaller switch (event.getName()) { {{#fields}}{{#dset}} case "{{name}}": - signal = _obj.{{name}}Removed; + signal = _obj.removedFrom{{capitalName}}; break; {{/dset}}{{/fields}} default: @@ -148,7 +148,7 @@ class Signaller switch (event.getName()) { {{#fields}}{{#dset}} case "{{name}}": - signal = _obj.{{name}}Updated; + signal = _obj.updated{{capitalName}}; break; {{/dset}}{{/fields}} default: @@ -163,7 +163,7 @@ class Signaller switch (event.getName()) { {{#fields}}{{#array}} case "{{name}}": - signal = _obj.{{name}}Updated; + signal = _obj.updated{{capitalName}}; break; {{/array}}{{/fields}} default: