From a11ccb9cd80c04cf2ee8c7331b72ca5a7de7c62a Mon Sep 17 00:00:00 2001
From: bjorn <bjorn@bringert.net>
Date: Mon, 20 Oct 2008 08:45:00 +0000
Subject: gf-server: New URL format: /grammar.pgf/command

---
 .../gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GF.java   | 6 ++++--
 .../src/se/chalmers/cs/gf/gwt_translate/client/Translate.java       | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/server/gwt-client')

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 9fd23f59c..74f38219c 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
@@ -18,9 +18,11 @@ import java.util.ArrayList;
 public class GF {
 
     private String baseURL;
+    private String pgfName;
 
-    public GF (String baseURL) {
+    public GF (String baseURL, String pgfName) {
 	this.baseURL = baseURL;
+	this.pgfName = pgfName;
     }
 
     public static interface GFCallback<T extends JavaScriptObject> {
@@ -155,7 +157,7 @@ public class GF {
     /* Utilities */
 
     private <T extends JavaScriptObject> GFRequest sendRequest (String resource, List<Arg> vars, final GFCallback<T> callback) {
-	String url = baseURL + "/" + resource + "?" + buildQueryString(vars);
+	String url = baseURL + "/" + pgfName + "/" + resource + "?" + buildQueryString(vars);
 	RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, url);
 	builder.setTimeoutMillis(30000);
 	builder.setHeader("Accept","text/plain, text/html;q=0.5, */*;q=0.1");
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 d5fd78db6..a27b7ba75 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
@@ -31,6 +31,7 @@ import java.util.Set;
 public class Translate implements EntryPoint {
 
     private static final String gfBaseURL = "/pgf";
+    private static final String pgfName = "grammar.pgf";
 
     private GF gf;
 
@@ -195,7 +196,7 @@ public class Translate implements EntryPoint {
 	statusPopup.add(statusLabel);
 	statusPopup.center();
 
-	gf = new GF(gfBaseURL);
+	gf = new GF(gfBaseURL, pgfName);
 
 	createTranslationUI();
 
-- 
cgit v1.2.3