msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

remove the canParse flag from the GWT applications

Browse Source
This commit is contained in:
krasimir
2010-08-24 14:59:59 +00:00
parent af137d65a5
commit bd3c833b14
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGF.java
View File

@@ -38,7 +38,6 @@ public class PGF {
public final native String getName() /*-{ return this.name; }-*/; public final native String getName() /*-{ return this.name; }-*/;
public final native String getLanguageCode() /*-{ return this.languageCode; }-*/; public final native String getLanguageCode() /*-{ return this.languageCode; }-*/;
public final native boolean canParse() /*-{ return this.canParse; }-*/;
} }
/* Translation */ /* Translation */
@@ -209,4 +208,4 @@ public class PGF {
return JSONRequestBuilder.sendRequest(pgfURL, args, callback); return JSONRequestBuilder.sendRequest(pgfURL, args, callback);
} }
} }

13
src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGFWrapper.java
View File

@@ -35,8 +35,6 @@ public class PGFWrapper {
private LinkedHashMap<String,PGF.Language> languages; private LinkedHashMap<String,PGF.Language> languages;
private List<String> parseableLanguages;
private JsArrayString categories; private JsArrayString categories;
private JsArrayString functions; private JsArrayString functions;
@@ -107,13 +105,9 @@ public class PGFWrapper {
public void onResult(PGF.Grammar grammar) { public void onResult(PGF.Grammar grammar) {
userLanguage = grammar.getUserLanguage(); userLanguage = grammar.getUserLanguage();
languages = new LinkedHashMap<String,PGF.Language>(); languages = new LinkedHashMap<String,PGF.Language>();
parseableLanguages = new ArrayList<String>();
for (PGF.Language l : grammar.getLanguages().iterable()) { for (PGF.Language l : grammar.getLanguages().iterable()) {
String name = l.getName(); String name = l.getName();
languages.put(name, l); languages.put(name, l);
if (l.canParse()) {
parseableLanguages.add(name);
}
} }
categories = grammar.getCategories(); categories = grammar.getCategories();
@@ -238,7 +232,6 @@ public class PGFWrapper {
// //
private void clearCachedInfo () { private void clearCachedInfo () {
languages = null; languages = null;
parseableLanguages = null;
} }
public String getUserLanguage () { public String getUserLanguage () {
@@ -249,10 +242,6 @@ public class PGFWrapper {
PGF.Language l = languages.get(language); PGF.Language l = languages.get(language);
return l == null ? null : l.getLanguageCode(); return l == null ? null : l.getLanguageCode();
} }
public Collection<String> getParseableLanguages() {
return parseableLanguages;
}
public Collection<String> getAllLanguages() { public Collection<String> getAllLanguages() {
return languages.keySet(); return languages.keySet();
@@ -320,4 +309,4 @@ public class PGFWrapper {
} }
} }
} }

2
src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SettingsPanel.java
View File

@@ -78,7 +78,7 @@ public class SettingsPanel extends Composite {
if (fromLangBox != null) { if (fromLangBox != null) {
fromLangBox.clear(); fromLangBox.clear();
fromLangBox.addItem("Any language", ""); fromLangBox.addItem("Any language", "");
fromLangBox.addItems(pgf.getParseableLanguages()); fromLangBox.addItems(pgf.getAllLanguages());
String inputLanguage = pgf.getInputLanguage(); String inputLanguage = pgf.getInputLanguage();
if (inputLanguage != null) { if (inputLanguage != null) {
fromLangBox.setSelectedValue(inputLanguage); fromLangBox.setSelectedValue(inputLanguage);