Permalink
Browse files

Update to jline2.

  • Loading branch information...
1 parent 8e640ec commit a00e2780893646b88dad049f2bb44f09a2119d2c @headius headius committed Apr 4, 2012
View
Binary file not shown.
Binary file not shown.
View
@@ -96,7 +96,7 @@ tzdata.ftp.dir=/tz/releases
tzdata.ftp.anonymous.userid=jruby@jruby.org
tzdata.distributed.version=2011n
tzdata.latest.version=2012b
-jline.version=1.0
+jline.version=2.7-SNAPSHOT
asm.version=4.0
shared.lib.dir=lib/ruby/shared
asm.jar=${build.lib.dir}/asm-${asm.version}.jar
View
@@ -118,7 +118,7 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>1.0</version>
+ <version>2.7</version>
<scope>${jar.scope}</scope>
</dependency>
<dependency>
View
@@ -279,15 +279,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/build_lib/jline-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$MODULE_DIR$/build_lib/jnr-netdb.jar!/" />
</CLASSES>
<JAVADOC />
@@ -514,6 +505,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/build_lib/jline-2.7-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
</component>
</module>
@@ -382,7 +382,7 @@ protected void upAction(KeyEvent event) {
if (!Readline.getHistory(Readline.getHolder(runtime)).previous()) return;
- String oldLine = Readline.getHistory(Readline.getHolder(runtime)).current().trim();
+ String oldLine = Readline.getHistory(Readline.getHolder(runtime)).current().toString().trim();
replaceText(startPos, area.getDocument().getLength(), oldLine);
}
@@ -403,7 +403,7 @@ protected void downAction(KeyEvent event) {
oldLine = currentLine; // at end
} else {
Readline.getHistory(Readline.getHolder(runtime)).previous(); // undo check
- oldLine = Readline.getHistory(Readline.getHolder(runtime)).current().trim();
+ oldLine = Readline.getHistory(Readline.getHolder(runtime)).current().toString().trim();
}
replaceText(startPos, area.getDocument().getLength(), oldLine);
Oops, something went wrong.

0 comments on commit a00e278

Please sign in to comment.