Fixed #933

svn changeset:2548/svn branch:trunk

6 files changed, 19 insertions, 19 deletions

diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java
index 58457aa571..8cddcdf206 100644
--- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java
+++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java
@@ -1,7 +1,7 @@
 package com.itmill.toolkit.demo.colorpicker.gwt.client;

 

 import com.google.gwt.user.client.ui.Widget;

-import com.itmill.toolkit.demo.colorpicker.gwt.client.ui.ItkColorPicker;

+import com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker;

 import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;

 import com.itmill.toolkit.terminal.gwt.client.UIDL;

 

@@ -9,9 +9,9 @@ public class WidgetSet extends DefaultWidgetSet {
 	/** Creates a widget according to its class name. */

     public Widget createWidget(UIDL uidl) {

     	String className = resolveWidgetTypeName(uidl);

-    	if ("com.itmill.toolkit.demo.colorpicker.gwt.client.ui.ItkColorPicker"

+    	if ("com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker"

     			.equals(className))

-    		return new ItkColorPicker();

+    		return new IColorPicker();

 

     	// Let the DefaultWidgetSet handle creation of default widgets

     	return super.createWidget(uidl);

@@ -21,7 +21,7 @@ public class WidgetSet extends DefaultWidgetSet {
     protected String resolveWidgetTypeName(UIDL uidl) {

     	String tag = uidl.getTag();

     	if ("colorpicker".equals(tag))

-    		return "com.itmill.toolkit.demo.colorpicker.gwt.client.ui.ItkColorPicker";

+    		return "com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker";

 

     	// Let the DefaultWidgetSet handle resolution of default widgets

     	return super.resolveWidgetTypeName(uidl);

diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/ItkColorPicker.java b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/IColorPicker.java
index 2b7f4a806b..e7738caead 100644
--- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/ItkColorPicker.java
+++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/IColorPicker.java
@@ -4,7 +4,7 @@ import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
 import com.itmill.toolkit.terminal.gwt.client.Paintable;
 import com.itmill.toolkit.terminal.gwt.client.UIDL;
 
-public class ItkColorPicker extends GwtColorPicker implements Paintable {
+public class IColorPicker extends GwtColorPicker implements Paintable {
 
 	/** Set the CSS class name to allow styling. */
 	public static final String CLASSNAME = "example-colorpicker";
@@ -19,7 +19,7 @@ public class ItkColorPicker extends GwtColorPicker implements Paintable {
 	 * The constructor should first call super() to initialize the component and
 	 * then handle any initialization relevant to IT Mill Toolkit.
 	 */
-	public ItkColorPicker() {
+	public IColorPicker() {
 		// The superclass has a lot of relevant initialization
 		super();
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index cea4565cef..f9b1dfcc99 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -59,7 +59,7 @@ public class ApplicationConnection implements FocusListener {
 		makeUidlRequest("repaintAll=1");
 
 		// TODO remove hardcoded id name
-		view = new IView("itmtk-ajax-window");
+		view = new IView("itmill-ajax-window");
 
 	}
 
@@ -76,7 +76,7 @@ public class ApplicationConnection implements FocusListener {
 
 	public native String getAppUri()
 	/*-{
-	 var u = $wnd.itmtk.appUri;
+	 var u = $wnd.itmill.appUri;
 	 if (u.indexOf("/") != 0 && u.indexOf("http") != 0) {
 	 var b = $wnd.location.href;
 	 var i = b.length-1;
@@ -89,7 +89,7 @@ public class ApplicationConnection implements FocusListener {
 
 	private native String getPathInfo()
 	/*-{
-	 return $wnd.itmtk.pathInfo;
+	 return $wnd.itmill.pathInfo;
 	 }-*/;
 
 	private void makeUidlRequest(String requestData) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUnknownComponent.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUnknownComponent.java
index cbe7698372..5785489a3a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUnknownComponent.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUnknownComponent.java
@@ -17,8 +17,8 @@ public class IUnknownComponent extends Composite implements Paintable {
 		panel.add(caption);
 		panel.add(uidlTree);
 		initWidget(panel);
-		setStyleName("itmtk-unknown");
-		caption.setStyleName("itmtk-unknown-caption");
+		setStyleName("itmill-unknown");
+		caption.setStyleName("itmill-unknown-caption");
 	}
 
 	public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css b/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css
index 6b71089bd7..57fad722a8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css
@@ -1,4 +1,4 @@
-#itmtk-ajax-window {
+#itmill-ajax-window {
 	background: #e9eced;
 	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
 	color: #464f52;
@@ -11,15 +11,15 @@
 	height: 100%;	
 }
 
-#itmtk-ajax-window input, 
-#itmtk-ajax-window select, 
-#itmtk-ajax-window textarea, 
-#itmtk-ajax-window button {
+#itmill-ajax-window input, 
+#itmill-ajax-window select, 
+#itmill-ajax-window textarea, 
+#itmill-ajax-window button {
 	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
 	color: #464f52;
 }
 
-#itmtk-ajax-window select {
+#itmill-ajax-window select {
 	padding: 0;
 	margin: 0;
 }
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 488b92e61a..7e20440be2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -440,7 +440,7 @@ public class ApplicationServlet extends HttpServlet {
 		page
 				.write("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n<title>IT Mill Toolkit 5</title>\n"
 						+ "<script type=\"text/javascript\">\n"
-						+ "	var itmtk = {\n" + "		appUri:'");
+						+ "	var itmill = {\n" + "		appUri:'");
 
 		String[] urlParts = getApplicationUrl(request).toString().split("\\/");
 		String appUrl = "";
@@ -481,7 +481,7 @@ public class ApplicationServlet extends HttpServlet {
 						+ "/styles.css\">"
 						+ "</head>\n<body>\n"
 						+ "	<iframe id=\"__gwt_historyFrame\" style=\"width:0;height:0;border:0\"></iframe>\n"
-						+ "	<div id=\"itmtk-ajax-window\"></div>"
+						+ "	<div id=\"itmill-ajax-window\"></div>"
 						+ "	</body>\n" + "</html>\n");
 
 		page.close();