MERGED AJAX ADAPTER TO WEB ADAPTER

- Merged all functionality of AJAX adapter inside the web adapter (MAJOR step for making the product more understandable)
- Removed "Adapter" alltogether from API level (MAJOR step for making the product more understandable)
- Built groundwork for automatic terminal detection based selection of technologies
- Built groundwork for integration of theme packaging mechanism by allowing Ajax apps to use theme resourses!
- Deployment is now easier - it is enough to deploy only one instance of the application
- Now AJAX apps also use WebApplicationContext (and get all the features from them!) (should fix bug #93)
- Now AJAX apps also can use WebBrowser class that implements Terminal (fixes bug #74)
- Now AJAX and Web-apps use the same session -> you can jump from web to ajax and preserve state! (fixes bug #60)
- Built groundwork for easier integration of license control (making solving #89 easier) 


svn changeset:130/svn branch:toolkit

1 files changed, 5 insertions, 5 deletions

diff --git a/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java b/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
index 51472578c3..cca9191a34 100644
--- a/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
+++ b/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
@@ -68,7 +68,7 @@ public class ThemeFunctionLibrary {
 		Window window,
 		WebBrowser webBrowser,
 		HttpSession session,
-		WebAdapterServlet webAdapterServlet,
+		ApplicationServlet webAdapterServlet,
 		String theme) {
 		state.set(
 			new Object[] {
@@ -144,7 +144,7 @@ public class ThemeFunctionLibrary {
 	static public String resource(String resource, String theme) {
 		try {
 			return (
-				(WebAdapterServlet)
+				(ApplicationServlet)
 					(
 						(Object[]) state
 							.get())[WEBADAPTERSERVLET])
@@ -161,7 +161,7 @@ public class ThemeFunctionLibrary {
 	static public String resource(String resource) {
 		try {
 			return (
-				(WebAdapterServlet)
+				(ApplicationServlet)
 					(
 						(Object[]) state
 							.get())[WEBADAPTERSERVLET])
@@ -198,14 +198,14 @@ public class ThemeFunctionLibrary {
 		return generateWindowScript(
 			window(),
 			application(),
-			(WebAdapterServlet) ((Object[]) state.get())[WEBADAPTERSERVLET],
+			(ApplicationServlet) ((Object[]) state.get())[WEBADAPTERSERVLET],
 			browser());
 	}
 
 	static protected String generateWindowScript(
 		Window window,
 		Application app,
-		WebAdapterServlet wa,
+		ApplicationServlet wa,
 		WebBrowser browser) {
 
 		StringBuffer script = new StringBuffer();