From 7ba94c550e5533a1889d04acfb6fd05ba6df5886 Mon Sep 17 00:00:00 2001 From: Jani Laakso Date: Tue, 16 Oct 2007 12:09:58 +0000 Subject: [PATCH] Corporate theme removed from all applications. It does not exists any more. svn changeset:2522/svn branch:trunk --- src/com/itmill/toolkit/demo/BufferedComponents.java | 1 - src/com/itmill/toolkit/demo/Calc.java | 3 --- src/com/itmill/toolkit/demo/CalendarDemo.java | 3 --- src/com/itmill/toolkit/demo/FilterSelect.java | 2 -- src/com/itmill/toolkit/demo/KeyboardShortcut.java | 1 - src/com/itmill/toolkit/demo/LayoutDemo.java | 3 --- src/com/itmill/toolkit/demo/ModalWindow.java | 5 +---- src/com/itmill/toolkit/demo/Parameters.java | 3 --- src/com/itmill/toolkit/demo/QueryContainerDemo.java | 3 --- src/com/itmill/toolkit/demo/SelectDemo.java | 3 --- src/com/itmill/toolkit/demo/TableDemo.java | 3 --- src/com/itmill/toolkit/demo/TreeFilesystem.java | 3 --- src/com/itmill/toolkit/demo/TreeFilesystemContainer.java | 3 --- src/com/itmill/toolkit/demo/UpgradingSample.java | 3 --- src/com/itmill/toolkit/demo/features/FeatureBrowser.java | 3 +-- src/com/itmill/toolkit/tests/BasicRandomTest.java | 1 - src/com/itmill/toolkit/tests/RandomLayoutStress.java | 3 --- 17 files changed, 2 insertions(+), 44 deletions(-) diff --git a/src/com/itmill/toolkit/demo/BufferedComponents.java b/src/com/itmill/toolkit/demo/BufferedComponents.java index 6740fdfe08..6a560e39c6 100644 --- a/src/com/itmill/toolkit/demo/BufferedComponents.java +++ b/src/com/itmill/toolkit/demo/BufferedComponents.java @@ -19,7 +19,6 @@ public class BufferedComponents extends Application { Window w = new Window("Buffered UI components demo"); addWindow(w); - setTheme("corporate"); // Create property Float floatValue = new Float(1.0f); diff --git a/src/com/itmill/toolkit/demo/Calc.java b/src/com/itmill/toolkit/demo/Calc.java index da4c32844c..7d57debc99 100644 --- a/src/com/itmill/toolkit/demo/Calc.java +++ b/src/com/itmill/toolkit/demo/Calc.java @@ -72,9 +72,6 @@ public class Calc extends com.itmill.toolkit.Application implements // Create the main window with a caption and add it to the application. addWindow(new Window("Calculator", layout)); - // Set the application to use Corporate -theme - setTheme("corporate"); - } /** diff --git a/src/com/itmill/toolkit/demo/CalendarDemo.java b/src/com/itmill/toolkit/demo/CalendarDemo.java index 6b0667d06d..fae7d80fd2 100644 --- a/src/com/itmill/toolkit/demo/CalendarDemo.java +++ b/src/com/itmill/toolkit/demo/CalendarDemo.java @@ -39,9 +39,6 @@ public class CalendarDemo extends com.itmill.toolkit.Application { main.setLayout(new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL)); - // set the application to use Corporate -theme - setTheme("corporate"); - // create the calendar component and add to layout from = new CalendarField(); main.addComponent(from); diff --git a/src/com/itmill/toolkit/demo/FilterSelect.java b/src/com/itmill/toolkit/demo/FilterSelect.java index 88539f1d36..81e702dfeb 100644 --- a/src/com/itmill/toolkit/demo/FilterSelect.java +++ b/src/com/itmill/toolkit/demo/FilterSelect.java @@ -48,8 +48,6 @@ public class FilterSelect extends com.itmill.toolkit.Application { Window main = new Window("Filter select demo"); setMainWindow(main); - setTheme("corporate"); - // default filter Select s1 = new Select(); for (int i = 0; i < 105; i++) diff --git a/src/com/itmill/toolkit/demo/KeyboardShortcut.java b/src/com/itmill/toolkit/demo/KeyboardShortcut.java index 4e8d1020aa..e5170b7758 100644 --- a/src/com/itmill/toolkit/demo/KeyboardShortcut.java +++ b/src/com/itmill/toolkit/demo/KeyboardShortcut.java @@ -41,7 +41,6 @@ public class KeyboardShortcut extends com.itmill.toolkit.Application implements main = new Window("Keyboard shortcuts demo"); setMainWindow(main); - setTheme("corporate"); main .addComponent(new Label( diff --git a/src/com/itmill/toolkit/demo/LayoutDemo.java b/src/com/itmill/toolkit/demo/LayoutDemo.java index cedebf84a7..bb73a25250 100644 --- a/src/com/itmill/toolkit/demo/LayoutDemo.java +++ b/src/com/itmill/toolkit/demo/LayoutDemo.java @@ -20,9 +20,6 @@ public class LayoutDemo extends com.itmill.toolkit.Application { Window mainWindow = new Window("Layout demo"); setMainWindow(mainWindow); - // set the application to use Corporate -theme - setTheme("corporate"); - // // Create horizontal ordered layout // diff --git a/src/com/itmill/toolkit/demo/ModalWindow.java b/src/com/itmill/toolkit/demo/ModalWindow.java index 0906dd2f6b..8b27faa011 100644 --- a/src/com/itmill/toolkit/demo/ModalWindow.java +++ b/src/com/itmill/toolkit/demo/ModalWindow.java @@ -21,10 +21,7 @@ public class ModalWindow extends com.itmill.toolkit.Application implements private Window test; public void init() { - - // set the application to use Corporate -theme - setTheme("corporate"); - + // Create main window Window main = new Window("ModalWindow demo"); setMainWindow(main); diff --git a/src/com/itmill/toolkit/demo/Parameters.java b/src/com/itmill/toolkit/demo/Parameters.java index 72b9d03bf6..882e92f131 100644 --- a/src/com/itmill/toolkit/demo/Parameters.java +++ b/src/com/itmill/toolkit/demo/Parameters.java @@ -30,9 +30,6 @@ public class Parameters extends com.itmill.toolkit.Application implements Window main = new Window("Parameters demo"); setMainWindow(main); - // set the application to use Corporate -theme - setTheme("corporate"); - // This class acts both as URI handler and parameter handler main.addURIHandler(this); main.addParameterHandler(this); diff --git a/src/com/itmill/toolkit/demo/QueryContainerDemo.java b/src/com/itmill/toolkit/demo/QueryContainerDemo.java index c277c96878..66ef37c699 100644 --- a/src/com/itmill/toolkit/demo/QueryContainerDemo.java +++ b/src/com/itmill/toolkit/demo/QueryContainerDemo.java @@ -67,9 +67,6 @@ public class QueryContainerDemo extends com.itmill.toolkit.Application Window main = new Window("QueryContainer demo"); setMainWindow(main); - // set the application to use Corporate -theme - setTheme("corporate"); - // Main window contains heading, table, select and tree main .addComponent(new Label( diff --git a/src/com/itmill/toolkit/demo/SelectDemo.java b/src/com/itmill/toolkit/demo/SelectDemo.java index e8a76d1686..7170d7aacd 100644 --- a/src/com/itmill/toolkit/demo/SelectDemo.java +++ b/src/com/itmill/toolkit/demo/SelectDemo.java @@ -30,9 +30,6 @@ public class SelectDemo extends com.itmill.toolkit.Application { 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); diff --git a/src/com/itmill/toolkit/demo/TableDemo.java b/src/com/itmill/toolkit/demo/TableDemo.java index 15d395c26b..1b7e935cd8 100644 --- a/src/com/itmill/toolkit/demo/TableDemo.java +++ b/src/com/itmill/toolkit/demo/TableDemo.java @@ -73,9 +73,6 @@ public class TableDemo extends com.itmill.toolkit.Application implements Window main = new Window("Table demo"); setMainWindow(main); - // set the application to use Corporate -theme - setTheme("corporate"); - // Add link back to index.html main.addComponent(menuLink); diff --git a/src/com/itmill/toolkit/demo/TreeFilesystem.java b/src/com/itmill/toolkit/demo/TreeFilesystem.java index d13fe49f76..b0c4d7dca9 100644 --- a/src/com/itmill/toolkit/demo/TreeFilesystem.java +++ b/src/com/itmill/toolkit/demo/TreeFilesystem.java @@ -28,9 +28,6 @@ public class TreeFilesystem extends com.itmill.toolkit.Application implements Window main = new Window("Tree filesystem demo"); setMainWindow(main); - // set the application to use Corporate -theme - setTheme("corporate"); - // Main window contains heading and panel main.addComponent(new Label("

Tree demo

", Label.CONTENT_XHTML)); diff --git a/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java b/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java index a5e1087340..6311766829 100644 --- a/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java +++ b/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java @@ -37,9 +37,6 @@ public class TreeFilesystemContainer extends com.itmill.toolkit.Application Window main = new Window("Tree FilesystemContainer demo"); setMainWindow(main); - // set the application to use Corporate -theme - setTheme("corporate"); - // Main window contains heading and two panels main.addComponent(new Label("

TreeFilesystemContainer demo

", Label.CONTENT_XHTML)); diff --git a/src/com/itmill/toolkit/demo/UpgradingSample.java b/src/com/itmill/toolkit/demo/UpgradingSample.java index 9f63a9187f..bfbbaf2a96 100644 --- a/src/com/itmill/toolkit/demo/UpgradingSample.java +++ b/src/com/itmill/toolkit/demo/UpgradingSample.java @@ -41,9 +41,6 @@ public class UpgradingSample extends Application implements /* Initialize the application */ public void init() { - // set the application to use Corporate -theme - setTheme("corporate"); - // Create the main window of the application Window main = new Window("Login example", layout); setMainWindow(main); diff --git a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java index ad5d2ff175..9b8efc08dc 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java +++ b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java @@ -74,8 +74,7 @@ public class FeatureBrowser extends CustomComponent implements // Theme selector mainlayout.addComponent(themeSelector, "themes"); themeSelector.addItem("demo"); - themeSelector.addItem("corporate"); - themeSelector.addItem("base"); + themeSelector.addListener(this); themeSelector.select("demo"); themeSelector.setImmediate(true); diff --git a/src/com/itmill/toolkit/tests/BasicRandomTest.java b/src/com/itmill/toolkit/tests/BasicRandomTest.java index 2a6d892627..0b9c1bb180 100644 --- a/src/com/itmill/toolkit/tests/BasicRandomTest.java +++ b/src/com/itmill/toolkit/tests/BasicRandomTest.java @@ -79,7 +79,6 @@ public class BasicRandomTest extends com.itmill.toolkit.Application implements Window mainWindow = new Window("Testing", create()); setMainWindow(mainWindow); - setTheme("corporate"); setUser(new Long(System.currentTimeMillis()).toString()); } diff --git a/src/com/itmill/toolkit/tests/RandomLayoutStress.java b/src/com/itmill/toolkit/tests/RandomLayoutStress.java index 965c6a0615..d72309174a 100644 --- a/src/com/itmill/toolkit/tests/RandomLayoutStress.java +++ b/src/com/itmill/toolkit/tests/RandomLayoutStress.java @@ -32,9 +32,6 @@ public class RandomLayoutStress extends com.itmill.toolkit.Application { Window mainWindow = new Window("Layout demo"); setMainWindow(mainWindow); - // set the application to use Corporate -theme - setTheme("corporate"); - // Create horizontal ordered layout Panel panelA = new Panel("Panel containing horizontal ordered layout"); OrderedLayout layoutA = new OrderedLayout( -- 2.39.5