From: Jani Laakso <jani.laakso@itmill.com>
Date: Mon, 23 Apr 2007 12:49:51 +0000 (+0000)
Subject: Removed selectdemo because it had unresolved issues with FF2.
X-Git-Tag: 6.7.0.beta1~6423
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f36b1d968d54209049ad2f37ce62e1a150d4ade8;p=vaadin-framework.git

Removed selectdemo because it had unresolved issues with FF2.

svn changeset:1304/svn branch:trunk
---

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 5a11c3cd99..a7d76dadd1 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -41,19 +41,6 @@
         <url-pattern>/LayoutDemo/*</url-pattern>
     </servlet-mapping>
     
-	<servlet>
-        <servlet-name>SelectDemo</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.SelectDemo</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>SelectDemo</servlet-name>
-        <url-pattern>/SelectDemo/*</url-pattern>
-    </servlet-mapping>
-    
     <servlet>
         <servlet-name>FilterSelect</servlet-name>
         <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
diff --git a/WebContent/index.html b/WebContent/index.html
index 3287dd84c7..3e3c038125 100644
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -179,19 +179,6 @@
 	<span class="link"><a href="src/com/itmill/toolkit/demo/TreeFilesystem.java.html">TreeFilesystem.java</a></span>
   </div>
   
-  <div class="feature-browser">
-	<h3><a href="SelectDemo?renderingMode=ajax">Select demo</a></h3>
-	<div class="option">
-	<p>
-	 This example shows select component with default and lazy loading functionality enabled (a.k.a Google Suggest).
-	 Click to first select component and type few letters using your keyboard to see it in action.
-	 Second select component has default functionality.
-	</p>
-	</div>
-	Source code:
-	<span class="link"><a href="src/com/itmill/toolkit/demo/SelectDemo.java.html">SelectDemo.java</a></span>
-  </div>
-  
   <div class="feature-browser">
 	<h3><a href="FilterSelect?renderingMode=ajax">FilterSelect demo</a></h3>
 	<div class="option">
diff --git a/src/com/itmill/toolkit/demo/SelectDemo.java b/src/com/itmill/toolkit/demo/SelectDemo.java
deleted file mode 100644
index e8a76d1686..0000000000
--- a/src/com/itmill/toolkit/demo/SelectDemo.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.itmill.toolkit.demo;
-
-import java.sql.SQLException;
-import com.itmill.toolkit.data.util.QueryContainer;
-import com.itmill.toolkit.demo.util.SampleDatabase;
-import com.itmill.toolkit.ui.*;
-
-/**
- * This example demonstrates what is lazy loading feature on Select component.
- * Demo Uses similar concepts to QueryContainerDemo.
- * 
- * @author IT Mill Ltd.
- * @since 4.0.0
- * 
- */
-public class SelectDemo extends com.itmill.toolkit.Application {
-
-	// Select component where SQL rows are attached (using QueryContainer)
-	private Select select = new Select();
-
-	private Select lazySelect = new Select();
-
-	// Database provided with sample data
-	private SampleDatabase sampleDatabase;
-
-	/**
-	 * Initialize Application. Demo components are added to main window.
-	 */
-	public void init() {
-		Window main = new Window("Select demo");
-		setMainWindow(main);
-
-		// set the application to use Corporate -theme
-		setTheme("corporate");
-
-		// Main window contains heading, table, select and tree
-		Panel panel = new Panel("Select demo (a.k.a Google Suggests)");
-		panel.addComponent(lazySelect);
-		panel.addComponent(new Label("<hr />", Label.CONTENT_XHTML));
-		panel.addComponent(select);
-		main.addComponent(panel);
-
-		// create demo database
-		sampleDatabase = new SampleDatabase();
-
-		initSelects();
-	}
-
-	private void initSelects() {
-		// init select
-		select.setCaption("All employees default functionality.");
-		select.setItemCaptionPropertyId("WORKER");
-		// populate Toolkit select component with test SQL table rows
-		try {
-			QueryContainer qc = new QueryContainer(
-					"SELECT ID, UNIT||', '||LASTNAME||' '||FIRSTNAME"
-							+ " AS WORKER FROM employee ORDER BY WORKER",
-					sampleDatabase.getConnection());
-			select.setContainerDataSource(qc);
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-		// init lazySelect
-		lazySelect.setCaption("All employees with lazy loading "
-				+ "(a.k.a Google Suggests) activated.");
-		lazySelect.setItemCaptionPropertyId("WORKER");
-		// use lazy loading (a.k.a Google Suggest)
-		lazySelect.setLazyLoading(true);
-		// use same datasource as select object uses
-		lazySelect.setContainerDataSource(select.getContainerDataSource());
-	}
-
-}