diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2008-04-01 19:31:19 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2008-04-01 19:31:19 +0000 |
| commit | d8b7aa3c9deb7a733ae750aaa33b2eab6063aac7 (patch) | |
| tree | 3cb838e06d30225d13398b6df3c769ac7db4877c /src/bind | |
| parent | Switch menu to combobox (diff) | |
| download | inkscape-d8b7aa3c9deb7a733ae750aaa33b2eab6063aac7.tar.gz inkscape-d8b7aa3c9deb7a733ae750aaa33b2eab6063aac7.zip | |
Improve script engine listing
(bzr r5298)
Diffstat (limited to 'src/bind')
| -rw-r--r-- | src/bind/java/org/inkscape/script/ScriptConsole.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/bind/java/org/inkscape/script/ScriptConsole.java b/src/bind/java/org/inkscape/script/ScriptConsole.java index 890d78189..c7d71b575 100644 --- a/src/bind/java/org/inkscape/script/ScriptConsole.java +++ b/src/bind/java/org/inkscape/script/ScriptConsole.java @@ -133,10 +133,13 @@ public boolean setEngine(String langName) { for (ScriptEngine engine : engines) { - if (langName.equalsIgnoreCase(engine.getFactory().getLanguageName())) - { - setEngine(engine); - return true; + for(String name: engine.getFactory().getNames()) + { + if (langName.equalsIgnoreCase(name)) + { + setEngine(engine); + return true; + } } } return false; @@ -326,18 +329,19 @@ private void initScripts() trace("ScriptEngineFactory Info"); String engName = factory.getEngineName(); String engVersion = factory.getEngineVersion(); + String fullEngName = engName + " (" + engVersion + ")"; String langName = factory.getLanguageName(); String langVersion = factory.getLanguageVersion(); - trace("\tScript Engine: %s (%s)", engName, engVersion); + String fullLangName = langName + " (" + langVersion + ")"; + trace("\t" + fullEngName); List<String> engNames = factory.getNames(); for(String name: engNames) { - trace("\tEngine Alias: %s", name); + trace("\tEngine Alias: " + name); } - trace("\tLanguage: %s (%s)", langName, langVersion); + trace("\t" + fullLangName); engines.add(factory.getScriptEngine()); - //JLabel item = new JLabel(langName); - engineBox.addItem(langName); + engineBox.addItem(fullLangName + " / " + fullEngName); } if (engineBox.getItemCount()>0) { |