Got a little too excited about using 1.5 features and some slipped into
Narya. I added directives to the compile line to prevent that from happening again. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3247 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -36,7 +36,8 @@
|
||||
classpathref="classpath"/>
|
||||
<!-- make sure the service class files are all compiled -->
|
||||
<javac srcdir="src/java" destdir="${classes.dir}"
|
||||
debug="on" optimize="${build.optimize}" deprecation="on">
|
||||
debug="on" optimize="${build.optimize}" deprecation="on"
|
||||
source="1.4" target="1.4">
|
||||
<classpath refid="classpath"/>
|
||||
<include name="**/*Service.java"/>
|
||||
<exclude name="**/InvocationService.java"/>
|
||||
@@ -84,7 +85,8 @@
|
||||
<!-- build the java class files -->
|
||||
<target name="compile" depends="prepare">
|
||||
<javac srcdir="src/java" destdir="${classes.dir}"
|
||||
debug="on" optimize="{$build.optimize}" deprecation="on">
|
||||
debug="on" optimize="{$build.optimize}" deprecation="on"
|
||||
source="1.4" target="1.4">
|
||||
<classpath refid="classpath"/>
|
||||
<exclude name="**/OggPlayer.java"/>
|
||||
<exclude name="**/ModPlayer.java"/>
|
||||
|
||||
@@ -35,7 +35,7 @@ import com.threerings.presents.server.InvocationException;
|
||||
public class GenServiceTask extends InvocationTask
|
||||
{
|
||||
/** Used to keep track of custom InvocationListener derivations. */
|
||||
public class ServiceListener implements Comparable<ServiceListener>
|
||||
public class ServiceListener implements Comparable
|
||||
{
|
||||
public Class listener;
|
||||
|
||||
@@ -57,9 +57,9 @@ public class GenServiceTask extends InvocationTask
|
||||
methods.sort();
|
||||
}
|
||||
|
||||
public int compareTo (ServiceListener other)
|
||||
public int compareTo (Object other)
|
||||
{
|
||||
return getName().compareTo(other.getName());
|
||||
return getName().compareTo(((ServiceListener)other).getName());
|
||||
}
|
||||
|
||||
public boolean equals (Object other)
|
||||
|
||||
@@ -69,7 +69,7 @@ public abstract class InvocationTask extends Task
|
||||
}
|
||||
|
||||
/** Used to keep track of invocation service methods. */
|
||||
public class ServiceMethod implements Comparable<ServiceMethod>
|
||||
public class ServiceMethod implements Comparable
|
||||
{
|
||||
public Method method;
|
||||
|
||||
@@ -154,9 +154,9 @@ public abstract class InvocationTask extends Task
|
||||
return (method.getParameterTypes().length > 1);
|
||||
}
|
||||
|
||||
public int compareTo (ServiceMethod other)
|
||||
public int compareTo (Object other)
|
||||
{
|
||||
return getCode().compareTo(other.getCode());
|
||||
return getCode().compareTo(((ServiceMethod)other).getCode());
|
||||
}
|
||||
|
||||
public String getUnwrappedArgList (boolean listenerMode)
|
||||
|
||||
Reference in New Issue
Block a user