Update to latest (stable) samskivert; fix some deprecations.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1185 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Michael Bayne
2011-12-13 23:21:24 +00:00
parent 5633f9ce9b
commit 9ec03e6512
3 changed files with 4 additions and 13 deletions
+1 -12
View File
@@ -59,77 +59,66 @@
<dependency> <dependency>
<groupId>com.samskivert</groupId> <groupId>com.samskivert</groupId>
<artifactId>samskivert</artifactId> <artifactId>samskivert</artifactId>
<version>1.3</version> <version>1.5</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>10.0</version> <version>10.0</version>
<scope>compile</scope>
</dependency> </dependency>
<!-- optional dependencies --> <!-- optional dependencies -->
<dependency> <dependency>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>narya</artifactId> <artifactId>narya</artifactId>
<version>1.8</version> <version>1.8</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl</artifactId> <artifactId>lwjgl</artifactId>
<version>2.6</version> <version>2.6</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl_util</artifactId> <artifactId>lwjgl_util</artifactId>
<version>2.6</version> <version>2.6</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.javazoom</groupId> <groupId>net.javazoom</groupId>
<artifactId>jlayer</artifactId> <artifactId>jlayer</artifactId>
<version>1.0</version> <version>1.0</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>
<artifactId>jorbis</artifactId> <artifactId>jorbis</artifactId>
<version>0.0.15</version> <version>0.0.15</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>
<artifactId>jogg</artifactId> <artifactId>jogg</artifactId>
<version>0.0.7</version> <version>0.0.7</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javassist</groupId> <groupId>javassist</groupId>
<artifactId>javassist</artifactId> <artifactId>javassist</artifactId>
<version>3.8.0.GA</version> <version>3.8.0.GA</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-digester</groupId> <groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId> <artifactId>commons-digester</artifactId>
<version>1.8</version> <version>1.8</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.megginson.sax</groupId> <groupId>com.megginson.sax</groupId>
<artifactId>xml-writer</artifactId> <artifactId>xml-writer</artifactId>
<version>0.2</version> <version>0.2</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- testing and other dependencies --> <!-- testing and other dependencies -->
@@ -79,7 +79,7 @@ public abstract class CalibratingTimer
_startStamp = _priorCurrent = current(); _startStamp = _priorCurrent = current();
_driftMilliStamp = System.currentTimeMillis(); _driftMilliStamp = System.currentTimeMillis();
_driftTimerStamp = current(); _driftTimerStamp = current();
_calibrateInterval = new Interval() { _calibrateInterval = new Interval(Interval.RUN_DIRECT) {
@Override public void expired () { @Override public void expired () {
calibrate(); calibrate();
} }
@@ -447,6 +447,7 @@ public class KeyboardManager
*/ */
public KeyInfo (int keyCode) public KeyInfo (int keyCode)
{ {
super(RUN_DIRECT);
_keyCode = keyCode; _keyCode = keyCode;
_keyText = KeyEvent.getKeyText(_keyCode); _keyText = KeyEvent.getKeyText(_keyCode);
_pressCommand = _xlate.getPressCommand(_keyCode); _pressCommand = _xlate.getPressCommand(_keyCode);
@@ -461,6 +462,7 @@ public class KeyboardManager
*/ */
public KeyInfo (char keyChar) public KeyInfo (char keyChar)
{ {
super(RUN_DIRECT);
_keyChar = keyChar; _keyChar = keyChar;
_keyText = "" +_keyChar; _keyText = "" +_keyChar;
_pressCommand = _xlate.getPressCommand(_keyChar); _pressCommand = _xlate.getPressCommand(_keyChar);