diff --git a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGF.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGF.java index 5a1a9e873..f6776597e 100644 --- a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGF.java +++ b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGF.java @@ -38,7 +38,6 @@ public class PGF { public final native String getName() /*-{ return this.name; }-*/; public final native String getLanguageCode() /*-{ return this.languageCode; }-*/; - public final native boolean canParse() /*-{ return this.canParse; }-*/; } /* Translation */ @@ -209,4 +208,4 @@ public class PGF { return JSONRequestBuilder.sendRequest(pgfURL, args, callback); } -} \ No newline at end of file +} diff --git a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGFWrapper.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGFWrapper.java index 4896dc151..b8087ab9b 100644 --- a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGFWrapper.java +++ b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGFWrapper.java @@ -35,8 +35,6 @@ public class PGFWrapper { private LinkedHashMap languages; - private List parseableLanguages; - private JsArrayString categories; private JsArrayString functions; @@ -107,13 +105,9 @@ public class PGFWrapper { public void onResult(PGF.Grammar grammar) { userLanguage = grammar.getUserLanguage(); languages = new LinkedHashMap(); - parseableLanguages = new ArrayList(); for (PGF.Language l : grammar.getLanguages().iterable()) { String name = l.getName(); languages.put(name, l); - if (l.canParse()) { - parseableLanguages.add(name); - } } categories = grammar.getCategories(); @@ -238,7 +232,6 @@ public class PGFWrapper { // private void clearCachedInfo () { languages = null; - parseableLanguages = null; } public String getUserLanguage () { @@ -249,10 +242,6 @@ public class PGFWrapper { PGF.Language l = languages.get(language); return l == null ? null : l.getLanguageCode(); } - - public Collection getParseableLanguages() { - return parseableLanguages; - } public Collection getAllLanguages() { return languages.keySet(); @@ -320,4 +309,4 @@ public class PGFWrapper { } } -} \ No newline at end of file +} diff --git a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SettingsPanel.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SettingsPanel.java index 3ae14d969..1ee3f71e1 100644 --- a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SettingsPanel.java +++ b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SettingsPanel.java @@ -78,7 +78,7 @@ public class SettingsPanel extends Composite { if (fromLangBox != null) { fromLangBox.clear(); fromLangBox.addItem("Any language", ""); - fromLangBox.addItems(pgf.getParseableLanguages()); + fromLangBox.addItems(pgf.getAllLanguages()); String inputLanguage = pgf.getInputLanguage(); if (inputLanguage != null) { fromLangBox.setSelectedValue(inputLanguage);