From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 5 Jun 2007 12:35:18 +0000 (+0000)
Subject: removed legacy client things
X-Git-Tag: 6.7.0.beta1~6345
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d0770f06baec08cb953f0de6d501753e05ddc096;p=vaadin-framework.git

removed legacy client things

svn changeset:1592/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Client.java b/src/com/itmill/toolkit/terminal/gwt/client/Client.java
index bd3eeefb42..4eaa545a00 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/Client.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/Client.java
@@ -38,8 +38,6 @@ public class Client implements EntryPoint {
 	
 	private int requestCount = 0;
 
-	private LegacyClientWrapper lClient;
-
 	/**
 	 * This is the entry point method.
 	 */
@@ -170,10 +168,5 @@ public class Client implements EntryPoint {
 		return (Component) components.get(""+pid);
 	}
 	
-	public LegacyClientWrapper getLegacyClient() {
-		if(lClient == null)
-			lClient = new LegacyClientWrapper();
-		return lClient;
-	}
 }
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/LegacyClientWrapper.java b/src/com/itmill/toolkit/terminal/gwt/client/LegacyClientWrapper.java
deleted file mode 100755
index f5f8d04e27..0000000000
--- a/src/com/itmill/toolkit/terminal/gwt/client/LegacyClientWrapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.itmill.toolkit.terminal.gwt.client;
-
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.user.client.Element;
-import com.google.gwt.xml.client.Node;
-
-public class LegacyClientWrapper {
-	
-	JavaScriptObject lClient;
-	
-	LegacyClientWrapper() {
-		instantiateLegacyClient();
-	}
-
-	private native void instantiateLegacyClient()/*-{
-		var client = new $wnd.itmill.Client();
-		client.start();
-		this.@com.itmill.gwtclient.client.LegacyClientWrapper::lClient = client;
-		debugger;
-		
-	}-*/;
-
-	public native void renderUidl(Element e, Node n)/*-{
-//	var uidlNode = n.hE; //sneeked obf. reference to DOM-node, changes on almost every change
-	// should fork GWT and make method for getting jsObject
-//	var uidlNode = cQ.gE;
-	eval('var uidlNode = cQ.gE;');
-	
-	//ok so in eval compiler don't look
-	var client = this.@com.itmill.gwtclient.client.LegacyClientWrapper::lClient;
-	
-	debugger;
-
-	client.renderUIDL(uidlNode,e);
-
-	
-}-*/;
-
-}
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/Component.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/Component.java
index bc7bf289a2..6b03baf2c3 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/Component.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/Component.java
@@ -41,8 +41,6 @@ public abstract class Component {
 			c = new TkButton(uidl, cli);
 		} else if(nodeName.equals("textfield")) {
 			c = new TkTextField(uidl, cli);
-		} else if(nodeName.equals("select")) {
-			c = new TkLegacyComponent(uidl, cli);
 		} else {
 			c = new TkUnknown(uidl, cli);
 		}
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkLegacyComponent.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkLegacyComponent.java
deleted file mode 100755
index 66dcf57a5c..0000000000
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkLegacyComponent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
-
-import com.google.gwt.user.client.Element;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.xml.client.Node;
-import com.itmill.toolkit.terminal.gwt.client.Client;
-import com.itmill.toolkit.terminal.gwt.client.LegacyClientWrapper;
-
-public class TkLegacyComponent extends Component {
-
-	private Label l;
-
-	public TkLegacyComponent(Node uidl, Client cli) {
-		super(getIdFromUidl(uidl), cli);
-		
-		// TODO Check if client has legacy client instantiated
-		
-		l = new Label();
-//		updateFromUidl(uidl);	
-	}
-
-	public void updateFromUidl(Node n) {
-		LegacyClientWrapper lc = client.getLegacyClient();
-		
-		Element e = l.getElement();
-		
-		lc.renderUidl(e,n);
-	}
-	
-	public Widget getWidget() {
-		return l;
-	}
-
-}