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

And finally, narya gets the imports/overrides/regen love.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5241 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Dave Hoover
2008-07-18 23:20:17 +00:00
parent e41dda3018
commit 6b1d65553f
129 changed files with 383 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/tools/ActionScriptSource.java
+1
View File
@@ -975,6 +975,7 @@ public class ActionScriptSource
writer.flush();
}
@Override
public String toString ()
{
StringBuilder builder = new StringBuilder();
src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java
+1 -4
View File
@@ -31,14 +31,10 @@ import java.util.Date;
import java.util.Map;
import java.util.Properties;
import com.samskivert.util.StringUtil;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Reference;
import org.apache.tools.ant.util.ClasspathUtils;
/**
* Generates our own ResourceBundle classes.
@@ -58,6 +54,7 @@ public class GenActionScriptBundlesTask extends Task
_asroot = asroot;
}
@Override
public void execute ()
throws BuildException
{
src/java/com/threerings/presents/tools/GenActionScriptTask.java
+1 -9
View File
@@ -21,16 +21,12 @@
package com.threerings.presents.tools;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -40,15 +36,10 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Reference;
import org.apache.tools.ant.util.ClasspathUtils;
import org.apache.commons.io.IOUtils;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import com.samskivert.util.StringUtil;
import com.samskivert.velocity.VelocityUtil;
import com.threerings.io.Streamable;
@@ -94,6 +85,7 @@ public class GenActionScriptTask extends Task
/**
* Performs the actual work of the task.
*/
@Override
public void execute () throws BuildException
{
try {
src/java/com/threerings/presents/tools/GenDObjectTask.java
+1 -18
View File
@@ -21,11 +21,7 @@
package com.threerings.presents.tools;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.StringWriter;
@@ -35,15 +31,6 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.tools.ant.AntClassLoader;
@@ -57,14 +44,10 @@ import org.apache.tools.ant.util.ClasspathUtils;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import com.samskivert.util.ObjectUtil;
import com.samskivert.util.SortableArrayList;
import com.samskivert.util.StringUtil;
import com.samskivert.velocity.VelocityUtil;
import com.threerings.presents.annotation.TransportHint;
import com.threerings.presents.net.Transport;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.DSet;
import com.threerings.presents.dobj.OidList;
@@ -96,7 +79,7 @@ public class GenDObjectTask extends Task
((AntClassLoader)_cloader).setParent(getClass().getClassLoader());
}
/** Performs the actual work of the task. */
@Override
public void execute () throws BuildException
{
if (_cloader == null) {
src/java/com/threerings/presents/tools/GenReceiverTask.java
+1 -1
View File
@@ -46,7 +46,7 @@ import com.threerings.presents.server.InvocationSender;
*/
public class GenReceiverTask extends InvocationTask
{
// documentation inherited
@Override
protected void processService (File source, Class receiver)
{
System.out.println("Processing " + receiver.getName() + "...");
src/java/com/threerings/presents/tools/GenServiceTask.java
+2
View File
@@ -94,6 +94,7 @@ public class GenServiceTask extends InvocationTask
return getName().compareTo(other.getName());
}
@Override
public boolean equals (Object other)
{
return getClass().equals(other.getClass()) &&
@@ -134,6 +135,7 @@ public class GenServiceTask extends InvocationTask
}
// documentation inherited
@Override
protected void processService (File source, Class service)
{
System.out.println("Processing " + service.getName() + "...");
src/java/com/threerings/presents/tools/GenStreamableTask.java
+1 -4
View File
@@ -37,7 +37,6 @@ import org.apache.tools.ant.types.FileSet;
import com.threerings.io.SimpleStreamableObject;
import com.threerings.io.Streamable;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.DObject;
/**
@@ -55,9 +54,7 @@ public class GenStreamableTask extends Task
_filesets.add(set);
}
/**
* Performs the actual work of the task.
*/
@Override
public void execute () throws BuildException
{
for (FileSet fs : _filesets) {
src/java/com/threerings/presents/tools/GenUtil.java
-2
View File
@@ -27,8 +27,6 @@ import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.regex.Matcher;
src/java/com/threerings/presents/tools/ImportSet.java
+2 -4
View File
@@ -91,9 +91,7 @@ public class ImportSet
_imports.add(name);
}
/**
* Makes a copy of this import set.
*/
@Override
public ImportSet clone ()
{
ImportSet newset = new ImportSet();
@@ -322,7 +320,7 @@ public class ImportSet
return list;
}
@Override // from Object
@Override
public String toString ()
{
return StringUtil.toString(_imports);
src/java/com/threerings/presents/tools/InstrumentStreamableTask.java
+1 -3
View File
@@ -79,9 +79,7 @@ public class InstrumentStreamableTask extends Task
_outdir = outdir;
}
/**
* Performs the actual work of the task.
*/
@Override
public void execute () throws BuildException
{
// configure our ClassPool with our classpath
src/java/com/threerings/presents/tools/InvocationTask.java
+1 -3
View File
@@ -48,8 +48,6 @@ import com.samskivert.util.StringUtil;
import com.samskivert.velocity.VelocityUtil;
import com.threerings.presents.annotation.TransportHint;
import com.threerings.presents.net.Transport;
import com.threerings.presents.client.InvocationService.InvocationListener;
/**
@@ -331,7 +329,7 @@ public abstract class InvocationTask extends Task
((AntClassLoader)_cloader).setParent(getClass().getClassLoader());
}
/** Performs the actual work of the task. */
@Override
public void execute () throws BuildException
{
if (_cloader == null) {