diff options
Diffstat (limited to 'src')
3 files changed, 10 insertions, 14 deletions
diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java index b593bc460..b4a719131 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java @@ -22,7 +22,7 @@ public class FridgeApp implements EntryPoint { protected static final String pgfBaseURL = "/pgf"; protected PGFWrapper pgf; - + protected JSONRequest translateRequest = null; private FridgeBagPanel bagPanel; @@ -132,7 +132,7 @@ public class FridgeApp implements EntryPoint { } } }); - */ + */ ClickListener magnetClickListener = new ClickListener () { public void onClick(Widget widget) { @@ -269,13 +269,12 @@ public class FridgeApp implements EntryPoint { public void onModuleLoad() { statusPopup = new StatusPopup(); - pgf = new PGFWrapper(new PGF(pgfBaseURL), new MySettingsListener()); - + pgf = new PGFWrapper(new PGF(pgfBaseURL)); RootPanel.get().add(createUI()); - + pgf.addSettingsListener(new MySettingsListener()); History.addHistoryListener(new MyHistoryListener()); - updateSettingsFromHistoryToken(); + pgf.updateAvailableGrammars(); } } diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGFWrapper.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGFWrapper.java index 4ba8f69f8..9f63c21f3 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGFWrapper.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGFWrapper.java @@ -36,13 +36,11 @@ public class PGFWrapper { private List<SettingsListener> listeners = new LinkedList<SettingsListener>(); - public PGFWrapper(PGF pgf, SettingsListener listener) { + public PGFWrapper(PGF pgf) { this.pgf = pgf; - addSettingsListener(listener); - updateAvailableGrammars(); } - protected void updateAvailableGrammars() { + public void updateAvailableGrammars() { pgf.listGrammars(new PGF.GrammarNamesCallback() { public void onResult(PGF.GrammarNames grammarNames) { grammars = new ArrayList<String>(); diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java index 21f9b4bdf..8052f727b 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java @@ -197,13 +197,12 @@ public class TranslateApp implements EntryPoint { public void onModuleLoad() { statusPopup = new StatusPopup(); - pgf = new PGFWrapper(new PGF(pgfBaseURL), new MySettingsListener()); - + pgf = new PGFWrapper(new PGF(pgfBaseURL)); RootPanel.get().add(createUI()); - + pgf.addSettingsListener(new MySettingsListener()); History.addHistoryListener(new MyHistoryListener()); - updateSettingsFromHistoryToken(); + pgf.updateAvailableGrammars(); } } |