From 98b63122d4f506dddec79070b05959d5388b0539 Mon Sep 17 00:00:00 2001 From: Tom Conkling Date: Sat, 1 May 2010 00:38:34 +0000 Subject: [PATCH] Properly handle getter and setter methods git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6062 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../presents/tools/ActionScriptSource.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/java/com/threerings/presents/tools/ActionScriptSource.java b/src/java/com/threerings/presents/tools/ActionScriptSource.java index 49706ee53..631640f31 100644 --- a/src/java/com/threerings/presents/tools/ActionScriptSource.java +++ b/src/java/com/threerings/presents/tools/ActionScriptSource.java @@ -21,20 +21,18 @@ package com.threerings.presents.tools; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; - -import java.util.ArrayList; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import com.google.common.collect.Lists; @@ -1071,7 +1069,7 @@ public class ActionScriptSource ".*(?:public|protected)" + "(?:\\s+static)?" + "(?:\\s+/\\*\\s*abstract\\s*\\*/)?" + - "\\s+function\\s+([a-zA-Z]\\w*) \\(.*"); + "\\s+function\\s+((?:get\\s+|set\\s+)?[a-zA-Z]\\w*) \\(.*"); protected static Pattern ARRAYINIT = Pattern.compile("new (\\w+)\\[0\\]"); }