Mercurial > hg > truffle
changeset 22277:412991d0359c
Deprecating method that does trivial, and not I18Ned, concatenation of other values. Just concatenate the values yourself.
author | Jaroslav Tulach <jaroslav.tulach@oracle.com> |
---|---|
date | Tue, 06 Oct 2015 12:23:07 +0200 |
parents | 6af6ca6c848e |
children | 85a6db6624ab |
files | truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java |
diffstat | 2 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java Tue Oct 06 11:10:02 2015 +0200 +++ b/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java Tue Oct 06 12:23:07 2015 +0200 @@ -847,10 +847,9 @@ } /** - * Human readable string that identifies the language and version. - * - * @return string describing the specific language version + * @deprecated concatenate {@link #getName()} and {@link #getVersion()} the way you want. */ + @Deprecated public String getShortName() { return getName() + "(" + getVersion() + ")"; }
--- a/truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java Tue Oct 06 11:10:02 2015 +0200 +++ b/truffle/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java Tue Oct 06 12:23:07 2015 +0200 @@ -78,7 +78,7 @@ public static void main(String[] args) { // Cheating for the prototype: start from SL, rather than from the client. final SLREPLServer server = new SLREPLServer(); - final SimpleREPLClient client = new SimpleREPLClient(server.language.getShortName(), server); + final SimpleREPLClient client = new SimpleREPLClient(getShortName(server.language), server); // Cheating for the prototype: allow server access to client for recursive debugging server.setClient(client); @@ -89,6 +89,10 @@ } } + private static String getShortName(Language language) { + return language.getName() + "(" + language.getVersion() + ")"; + } + private final Language language; private final PolyglotEngine vm; private Debugger db; @@ -145,7 +149,7 @@ assert language != null; this.vm = newVM; - this.statusPrefix = language.getShortName() + " REPL:"; + this.statusPrefix = getShortName(language) + " REPL:"; } private void setClient(SimpleREPLClient replClient) { @@ -160,7 +164,7 @@ // SL doesn't load modules (like other languages), so we just return a success final REPLMessage reply = new REPLMessage(); reply.put(REPLMessage.STATUS, REPLMessage.SUCCEEDED); - reply.put(REPLMessage.DISPLAY_MSG, language.getShortName() + " started"); + reply.put(REPLMessage.DISPLAY_MSG, getShortName(language) + " started"); return reply; }