AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Have ServiceDescription carry skipAS like it does the rest of the processing information

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6130 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Charlie Groves
2010-08-12 21:00:49 +00:00
parent c12e1e44b3
commit 2cdc445b1f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/tools/GenServiceTask.java
+6 -6
View File
@@ -204,18 +204,15 @@ public class GenServiceTask extends InvocationTask
return; return;
} }
ActionScript asa = service.getAnnotation(ActionScript.class);
boolean skipAS = (asa != null) && asa.omit();
ServiceDescription desc = new ServiceDescription(service); ServiceDescription desc = new ServiceDescription(service);
generateMarshaller(source, desc, skipAS); generateMarshaller(source, desc);
generateDispatcher(source, desc); generateDispatcher(source, desc);
if (!_providerless.contains(service.getSimpleName())) { if (!_providerless.contains(service.getSimpleName())) {
generateProvider(source, desc); generateProvider(source, desc);
} }
} }
protected void generateMarshaller (File source, ServiceDescription sdesc, boolean skipAS) protected void generateMarshaller (File source, ServiceDescription sdesc)
throws Exception throws Exception
{ {
if (_verbose) { if (_verbose) {
@@ -282,7 +279,7 @@ public class GenServiceTask extends InvocationTask
// if we're not configured with an ActionScript source root, don't generate the // if we're not configured with an ActionScript source root, don't generate the
// ActionScript versions // ActionScript versions
if (_asroot == null || skipAS) { if (_asroot == null || sdesc.skipAS) {
return; return;
} }
@@ -635,12 +632,15 @@ public class GenServiceTask extends InvocationTask
new ComparableArrayList<ServiceMethod>(); new ComparableArrayList<ServiceMethod>();
public ComparableArrayList<ServiceListener> listeners = public ComparableArrayList<ServiceListener> listeners =
new ComparableArrayList<ServiceListener>(); new ComparableArrayList<ServiceListener>();
public final boolean skipAS;
public ServiceDescription (Class<?> serviceClass) public ServiceDescription (Class<?> serviceClass)
{ {
service = serviceClass; service = serviceClass;
sname = service.getSimpleName(); sname = service.getSimpleName();
spackage = service.getPackage().getName(); spackage = service.getPackage().getName();
ActionScript asa = service.getAnnotation(ActionScript.class);
skipAS = (asa != null) && asa.omit();
// look through and locate our service methods, also locating any // look through and locate our service methods, also locating any
// custom InvocationListener derivations along the way // custom InvocationListener derivations along the way