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

The provider needs to import the service for all of our javadoc to work. If

Browse Source 
Eclipse doesn't know about javadoc, we should file a bug.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5246 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2008-07-22 12:50:15 +00:00
parent 85b26867e3
commit 0aa0e48c28
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/tools/GenServiceTask.java
+17 -17
View File
@@ -520,8 +520,7 @@ public class GenServiceTask extends InvocationTask
} }
String name = StringUtil.replace(sdesc.sname, "Service", ""); String name = StringUtil.replace(sdesc.sname, "Service", "");
String mpackage = StringUtil.replace( String mpackage = StringUtil.replace(sdesc.spackage, ".client", ".server");
sdesc.spackage, ".client", ".server");
// start with imports required by service methods // start with imports required by service methods
ImportSet imports = sdesc.imports.clone(); ImportSet imports = sdesc.imports.clone();
@@ -530,8 +529,9 @@ public class GenServiceTask extends InvocationTask
imports.add(ClientObject.class); imports.add(ClientObject.class);
imports.remove(Client.class); imports.remove(Client.class);
// import superclass // import superclass and service
imports.add(InvocationProvider.class); imports.add(InvocationProvider.class);
imports.add(sdesc.service);
// any method that takes a listener may throw this // any method that takes a listener may throw this
if (sdesc.hasAnyListenerArgs()) { if (sdesc.hasAnyListenerArgs()) {
@@ -577,12 +577,21 @@ public class GenServiceTask extends InvocationTask
} }
} }
// rolls up everything needed for the generate* methods /** Rolls up everything needed for the generate* methods. */
protected class ServiceDescription protected class ServiceDescription
{ {
ServiceDescription (Class service) public Class service;
public String sname;
public String spackage;
public ImportSet imports = new ImportSet();
public ComparableArrayList<ServiceMethod> methods =
new ComparableArrayList<ServiceMethod>();
public ComparableArrayList<ServiceListener> listeners =
new ComparableArrayList<ServiceListener>();
public ServiceDescription (Class serviceClass)
{ {
this.service = service; service = serviceClass;
sname = service.getSimpleName(); sname = service.getSimpleName();
spackage = service.getPackage().getName(); spackage = service.getPackage().getName();
@@ -623,7 +632,7 @@ public class GenServiceTask extends InvocationTask
/** /**
* Checks if any of the service method arguments are listener types. * Checks if any of the service method arguments are listener types.
*/ */
boolean hasAnyListenerArgs () public boolean hasAnyListenerArgs ()
{ {
for (ServiceMethod sm : methods) { for (ServiceMethod sm : methods) {
if (!sm.listenerArgs.isEmpty()) { if (!sm.listenerArgs.isEmpty()) {
@@ -636,7 +645,7 @@ public class GenServiceTask extends InvocationTask
/** /**
* Constructs a union of the imports of the service methods and all listener methods. * Constructs a union of the imports of the service methods and all listener methods.
*/ */
ImportSet constructAllImports () public ImportSet constructAllImports ()
{ {
ImportSet allimports = imports.clone(); ImportSet allimports = imports.clone();
for (ServiceListener listener : listeners) { for (ServiceListener listener : listeners) {
@@ -644,15 +653,6 @@ public class GenServiceTask extends InvocationTask
} }
return allimports; return allimports;
} }
Class service;
String sname;
String spackage;
ImportSet imports = new ImportSet();
ComparableArrayList<ServiceMethod> methods =
new ComparableArrayList<ServiceMethod>();
ComparableArrayList<ServiceListener> listeners =
new ComparableArrayList<ServiceListener>();
} }
/** The path to our ActionScript source files. */ /** The path to our ActionScript source files. */