Index: gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/GS3MapLibrary.gwt.xml
===================================================================
--- gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/GS3MapLibrary.gwt.xml (revision 23931)
+++ gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/GS3MapLibrary.gwt.xml (revision 23934)
@@ -10,4 +10,4 @@
-
+
Index: gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/FindPlaceService.java
===================================================================
--- gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/FindPlaceService.java (revision 23931)
+++ gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/FindPlaceService.java (revision 23934)
@@ -1,3 +1,3 @@
-package org.greenstone.client;
+package org.greenstone.atlas.client;
import java.util.ArrayList;
Index: gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/FindPlaceServiceAsync.java
===================================================================
--- gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/FindPlaceServiceAsync.java (revision 23931)
+++ gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/FindPlaceServiceAsync.java (revision 23934)
@@ -1,3 +1,3 @@
-package org.greenstone.client;
+package org.greenstone.atlas.client;
import java.util.ArrayList;
Index: gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/GS3MapLibrary.java
===================================================================
--- gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/GS3MapLibrary.java (revision 23931)
+++ gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/client/GS3MapLibrary.java (revision 23934)
@@ -1,3 +1,3 @@
-package org.greenstone.client;
+package org.greenstone.atlas.client;
import com.google.gwt.core.client.EntryPoint;
@@ -158,5 +158,5 @@
protected String _currentCollection = "";
protected String _currentURL = "";
- protected final String _GREENSTONEURL = "http://taniwha.resnet.scms.waikato.ac.nz:8080/greenstone3";
+ protected final String _GREENSTONEURL = "http://localhost:8486/greenstone3";
//protected final String _GREENSTONEURL = "http://www.nzdl.org/atlasgreenstone3";
protected final String _GREENSTONEDEVURL = _GREENSTONEURL + "/dev";
@@ -176,5 +176,5 @@
_geocoder = new Geocoder();
- ((ServiceDefTarget) _findPlaceService).setServiceEntryPoint("http://taniwha.resnet.scms.waikato.ac.nz:8080/ATLAS/findPlace");
+ ((ServiceDefTarget) _findPlaceService).setServiceEntryPoint("http://localhost:8486/ATLAS/findPlace");
//((ServiceDefTarget) _findPlaceService).setServiceEntryPoint("http://www.nzdl.org/ATLAS/findPlace");
@@ -191,5 +191,5 @@
//Load the Greenstone home page
- loadPageFromUrl("http://taniwha.resnet.scms.waikato.ac.nz:8080/greenstone3/dev?a=p&sa=home");
+ loadPageFromUrl(_GREENSTONEDEVURL + "?a=p&sa=home");
}
@@ -250,5 +250,21 @@
_statusBar.addUpdate("Loading new page", "LoadPage");
- getNewPage(url);
+ getNewPage(url.contains("?") ? (url + "&excerpttag=body") : (url + "?excerpttag=body"),
+ new ResponseFunction(){
+ public void function(String response){
+ HTML newPage = new HTML(response);
+ newPage.getElement().setId("newpage");
+ Element oldNewPage = (Element) Document.get().getElementById("newpage");
+ if(oldNewPage != null)
+ {
+ oldNewPage.removeFromParent();
+ }
+ getElementsByTagName("body").get(0).appendChild(newPage.getElement());
+ newPage.setVisible(false);
+
+ showLoadedPage();
+ }
+ }
+ );
}
@@ -271,7 +287,7 @@
}
- public void getNewPage(String url)
- {
- RequestBuilder newPageRequest = new RequestBuilder(RequestBuilder.GET, url.contains("?") ? (url + "&excerpttag=body") : (url + "?excerpttag=body"));
+ public void getNewPage(String url, final ResponseFunction responseFunc)
+ {
+ RequestBuilder newPageRequest = new RequestBuilder(RequestBuilder.GET, url);
try{
newPageRequest.sendRequest(null, new RequestCallback()
@@ -281,15 +297,5 @@
if(response.getStatusCode() == Response.SC_OK)
{
- HTML newPage = new HTML(response.getText());
- newPage.getElement().setId("newpage");
- Element oldNewPage = (Element) Document.get().getElementById("newpage");
- if(oldNewPage != null)
- {
- oldNewPage.removeFromParent();
- }
- getElementsByTagName("body").get(0).appendChild(newPage.getElement());
- newPage.setVisible(false);
-
- showLoadedPage();
+ responseFunc.function(response.getText());
}
}
@@ -383,10 +389,24 @@
//Add and