GWT: update to use new /grammar resource. Select from language based on Accept-Language header.

2 files changed, 44 insertions, 33 deletions

diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GF.java b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GF.java
index 4a0003aed..297c99894 100644
--- a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GF.java
+++ b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GF.java
@@ -26,21 +26,27 @@ public class GF {
 	public void onError (Throwable e) ;
     }
 
-    /* Languages */
+    /* Grammar */
 
-    public GFRequest languages (final LanguagesCallback callback) {
-	return sendRequest("languages", null, callback);
+    public GFRequest grammar (final GrammarCallback callback) {
+	return sendRequest("grammar", null, callback);
     }
 
-    public interface LanguagesCallback extends GFCallback<Languages> { }
+    public interface GrammarCallback extends GFCallback<Grammar> { }
 
-    public static class Languages extends JsArray<Language> {
-	protected Languages() { }
+    public static class Grammar extends JavaScriptObject {
+	protected Grammar() { }
+
+	public final native String getName() /*-{ return this.name; }-*/;
+
+	public final native String getUserLanguage() /*-{ return this.userLanguage; }-*/;
+
+	public final native JsArray<Language> getLanguages() /*-{ return this.languages; }-*/;
 
 	public final Language getLanguage(String name) {
-	    int c = length();
+	    int c = getLanguages().length();
 	    for (int i = 0; i < c; i++) {
-		Language l = get(i);
+		Language l = getLanguages().get(i);
 		if (l.getName().equals(name))
 		    return l;
 	    }
diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/Translate.java b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/Translate.java
index 1cb2740ee..10c291cb8 100644
--- a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/Translate.java
+++ b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/Translate.java
@@ -36,16 +36,16 @@ public class Translate implements EntryPoint {
 
     private CompletionOracle oracle;
     private SuggestBox suggest;
-    private GF.Languages availableLangs;
-    private List<String> fromLangs;
-    private List<String> toLangs;
+    private GF.Grammar grammar;
+    private ListBox fromLangBox;
+    private ListBox toLangBox;
     private VerticalPanel outputPanel;
     private Label statusLabel;
 
     private void addTranslation(String text, String toLang) {
 	Label l = new Label(text);
 	l.addStyleName("my-translation");
-	GF.Language lang = availableLangs.getLanguage(toLang);
+	GF.Language lang = grammar.getLanguage(toLang);
 	if (lang != null) {
 	    l.getElement().setLang(lang.getLanguageCode());
 	}
@@ -53,13 +53,16 @@ public class Translate implements EntryPoint {
     }
 
     private void translate() {
-	gf.translate(suggest.getText(), fromLangs, null, toLangs, new GF.TranslateCallback() {
+	outputPanel.clear();
+	setStatus("Translating...");
+	gf.translate(suggest.getText(), listBoxSelection(fromLangBox), null, 
+		     listBoxSelection(toLangBox), new GF.TranslateCallback() {
 		public void onResult (GF.Translations translations) {
-		    outputPanel.clear();
 		    for (int i = 0; i < translations.length(); i++) {
 			GF.Translation t = translations.get(i);
 			addTranslation(t.getText(), t.getTo());
 		    }
+		    setStatus("Translation done.");
 		}
 		public void onError (Throwable e) {
 		    showError("Translation failed", e);
@@ -67,6 +70,10 @@ public class Translate implements EntryPoint {
 	    });
     }
 
+    private void updateLangs() {
+	oracle.setInputLangs(listBoxSelection(fromLangBox));
+    }
+
     private List<String> listBoxSelection(ListBox box) {
 	int c = box.getItemCount();
 	List<String> l = new ArrayList<String>();
@@ -108,21 +115,20 @@ public class Translate implements EntryPoint {
 		}
 	    });
 
-	final ListBox fromLangBox = new ListBox();
+	fromLangBox = new ListBox();
 	fromLangBox.addItem("Any language", "");
 	fromLangBox.addChangeListener(new ChangeListener() {
 		public void onChange(Widget sender) {
-		    fromLangs = listBoxSelection(fromLangBox);
-		    oracle.setInputLangs(fromLangs);
+		    updateLangs();
 		    translate();
 		}
 	    });
 
-	final ListBox toLangBox = new ListBox();
+	toLangBox = new ListBox();
 	toLangBox.addItem("All languages", "");
 	toLangBox.addChangeListener(new ChangeListener() {
 		public void onChange(Widget sender) {
-		    toLangs = listBoxSelection(toLangBox);
+		    updateLangs();
 		    translate();
 		}
 	    });
@@ -160,19 +166,21 @@ public class Translate implements EntryPoint {
 	RootPanel.get().add(vPanel);
 	RootPanel.get().add(statusLabel, (Window.getClientWidth() - statusLabel.getOffsetWidth())/2, (Window.getClientHeight() - statusLabel.getOffsetHeight()));
 
-	gf.languages(new GF.LanguagesCallback() {
-		public void onResult(GF.Languages languages) {
-		    availableLangs = languages;
-		    for (int i = 0; i < languages.length(); i++) {
-			GF.Language l = languages.get(i);
+	gf.grammar(new GF.GrammarCallback() {
+		public void onResult(GF.Grammar grammar) {
+		    Translate.this.grammar = grammar;
+		    for (int i = 0; i < grammar.getLanguages().length(); i++) {
+			GF.Language l = grammar.getLanguages().get(i);
+			String name = l.getName();
 			if (l.canParse()) {
-			    fromLangBox.addItem(l.getName());
+			    fromLangBox.addItem(name);
+			    if (name.equals(grammar.getUserLanguage())) {
+				fromLangBox.setSelectedIndex(fromLangBox.getItemCount()-1);
+			    }
 			}
-			toLangBox.addItem(l.getName());
+			toLangBox.addItem(name);
 		    }
-		    gf.mylanguage(new GF.MyLanguageCallback() {
-
-			}
+		    updateLangs();
 
 		    setStatus("Loaded languages.");		    
 		}
@@ -180,9 +188,6 @@ public class Translate implements EntryPoint {
 		public void onError (Throwable e) {
 		    showError("Error getting language information", e);
 		}
-	    });
-
-	GWT.log("Current locale: " + LocaleInfo.getCurrentLocale().getLocaleName(), null);
-	
+	    });	
     }
 }