From a2c44e582a0bf53108872fd1cdf2068a294d4cc4 Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Fri, 28 Jan 2011 12:36:23 +0100 Subject: [PATCH] Use generated Util class to get the RPC Async interface. * .settings/com.google.gwt.eclipse.core.prefs: Update generated Eclipse config file. * src/main/java/org/glom/web/client/LayoutListDataProvider.java: Use generated getInstance() method to get a reference to the RPC Async interface. * src/main/java/org/glom/web/client/OnlineGlom.java: Use generated getInstance() method to get a reference to the RPC Async interface, remove the now unused getLibGlomServiceProxy() method. --- .settings/com.google.gwt.eclipse.core.prefs | 3 ++- ChangeLog | 14 +++++++++++++- .../java/org/glom/web/client/LayoutListDataProvider.java | 2 +- src/main/java/org/glom/web/client/OnlineGlom.java | 14 ++------------ 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.settings/com.google.gwt.eclipse.core.prefs b/.settings/com.google.gwt.eclipse.core.prefs index 26c0e1a..5aad99a 100644 --- a/.settings/com.google.gwt.eclipse.core.prefs +++ b/.settings/com.google.gwt.eclipse.core.prefs @@ -1,4 +1,5 @@ -#Tue Jan 25 15:26:51 CET 2011 +#Thu Jan 27 10:28:30 CET 2011 eclipse.preferences.version=1 entryPointModules= filesCopiedToWebInfLib=gwt-servlet.jar +gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+REVUQUlMRUQ8L291dHB1dC1zdHlsZT48ZXh0cmEtYXJncz48IVtDREFUQVtdXT48L2V4dHJhLWFyZ3M+PHZtLWFyZ3M+PCFbQ0RBVEFbLVhteDUxMm1dXT48L3ZtLWFyZ3M+PC9nd3QtY29tcGlsZS1zZXR0aW5ncz4\= diff --git a/ChangeLog b/ChangeLog index 97a7a75..e925b44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,20 @@ +2011-01-28 Ben Konrath + + Use generated Util class to get the RPC Async interface. + + * .settings/com.google.gwt.eclipse.core.prefs: Update generated Eclipse config + file. + * src/main/java/org/glom/web/client/LayoutListDataProvider.java: Use generated + getInstance() method to get a reference to the RPC Async interface. + * src/main/java/org/glom/web/client/OnlineGlom.java: Use generated + getInstance() method to get a reference to the RPC Async interface, remove + the now unused getLibGlomServiceProxy() method. + 2011-01-27 Ben Konrath Cleanup ChangeLog entry from previous commit. - * ChangeLog: Add group logical changes together and add comments. + * ChangeLog: Group logical changes together and add comments. 2011-01-25 Ben Konrath diff --git a/src/main/java/org/glom/web/client/LayoutListDataProvider.java b/src/main/java/org/glom/web/client/LayoutListDataProvider.java index 4a8afd7..cd27392 100644 --- a/src/main/java/org/glom/web/client/LayoutListDataProvider.java +++ b/src/main/java/org/glom/web/client/LayoutListDataProvider.java @@ -27,7 +27,7 @@ public class LayoutListDataProvider extends AsyncDataProvider { } }; - OnlineGlom.getLibGlomServiceProxy().getTableData(start, length, OnlineGlom.getCurrentTableName(), callback); + LibGlomServiceAsync.Util.getInstance().getTableData(start, length, OnlineGlom.getCurrentTableName(), callback); } diff --git a/src/main/java/org/glom/web/client/OnlineGlom.java b/src/main/java/org/glom/web/client/OnlineGlom.java index 9cb2bd9..cba28f1 100644 --- a/src/main/java/org/glom/web/client/OnlineGlom.java +++ b/src/main/java/org/glom/web/client/OnlineGlom.java @@ -1,7 +1,6 @@ package org.glom.web.client; import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.user.client.Window; @@ -17,9 +16,6 @@ import com.google.gwt.user.client.ui.VerticalPanel; */ public class OnlineGlom implements EntryPoint { - // TODO move to a singleton class - private static LibGlomServiceAsync libGlomSvc = null; - private VerticalPanel mainVPanel = new VerticalPanel(); private HorizontalPanel hPanel = new HorizontalPanel(); private static ListBox dropBox = new ListBox(); @@ -60,7 +56,7 @@ public class OnlineGlom implements EntryPoint { }; // make the call to get the filled in GlomDocument - getLibGlomServiceProxy().getGlomDocument(callback); + LibGlomServiceAsync.Util.getInstance().getGlomDocument(callback); } private void updateTable() { @@ -82,14 +78,8 @@ public class OnlineGlom implements EntryPoint { }; String selectedTable = dropBox.getValue(dropBox.getSelectedIndex()); - getLibGlomServiceProxy().getLayoutListHeaders(selectedTable, callback); - - } + LibGlomServiceAsync.Util.getInstance().getLayoutListHeaders(selectedTable, callback); - public static LibGlomServiceAsync getLibGlomServiceProxy() { - if (libGlomSvc == null) - libGlomSvc = GWT.create(LibGlomService.class); - return libGlomSvc; } // FIXME find a better way to do this -- 2.1.4