summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2009-05-15 09:40:25 +0000
committerArtur Signell <artur.signell@itmill.com>2009-05-15 09:40:25 +0000
commit9b6e853c595ac303a60cdd40a5dcb566e9b6ce5d (patch)
tree0e7737367bff219bc4c1afb0392cfc28d0987490 /src/com/vaadin
parent172d7a935c1829c5e0b95a6b8be6ae43d99c10c0 (diff)
downloadvaadin-framework-9b6e853c595ac303a60cdd40a5dcb566e9b6ce5d.tar.gz
vaadin-framework-9b6e853c595ac303a60cdd40a5dcb566e9b6ce5d.zip
Fix for #2953 - Rename old default theme to itmill5
svn changeset:7826/svn branch:6.0
Diffstat (limited to 'src/com/vaadin')
-rw-r--r--src/com/vaadin/tests/components/table/ClippedComponentsInTable.java40
-rw-r--r--src/com/vaadin/tests/components/table/TableLastRowMissing.java35
-rw-r--r--src/com/vaadin/tests/featurebrowser/FeatureWindow.java2
-rw-r--r--src/com/vaadin/tests/tickets/Ticket1397.java2
-rw-r--r--src/com/vaadin/tests/tickets/Ticket1598.java4
5 files changed, 79 insertions, 4 deletions
diff --git a/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java b/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java
new file mode 100644
index 0000000000..8b6775cc74
--- /dev/null
+++ b/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java
@@ -0,0 +1,40 @@
+package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Item;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+
+public class ClippedComponentsInTable extends TestBase {
+
+ @Override
+ protected String getDescription() {
+ return "The table below should display 3 rows. Each with a textfield containing the row number.";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return null;
+ }
+
+ @Override
+ protected void setup() {
+ Table t = new Table();
+ addComponent(t);
+
+ t.addContainerProperty("Name", TextField.class, null);
+ t.addContainerProperty("Button", Button.class, null);
+
+ for (int i = 0; i < 3; i++) {
+ Item item = t.addItem(i);
+ TextField tf = new TextField("", String.valueOf(i + 1));
+ tf.setColumns(10);
+ item.getItemProperty("Name").setValue(tf);
+
+ Button b = new Button("OK");
+ item.getItemProperty("Button").setValue(b);
+ }
+
+ }
+}
diff --git a/src/com/vaadin/tests/components/table/TableLastRowMissing.java b/src/com/vaadin/tests/components/table/TableLastRowMissing.java
new file mode 100644
index 0000000000..4e4a223e23
--- /dev/null
+++ b/src/com/vaadin/tests/components/table/TableLastRowMissing.java
@@ -0,0 +1,35 @@
+package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Item;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+
+public class TableLastRowMissing extends TestBase {
+
+ @Override
+ protected String getDescription() {
+ return "The table below should display 3 rows. Each with a textfield containing the row number.";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 2933;
+ }
+
+ @Override
+ protected void setup() {
+ Table t = new Table();
+ addComponent(t);
+
+ t.addContainerProperty("Name", TextField.class, null);
+
+ for (int i = 0; i < 3; i++) {
+ Item item = t.addItem(i);
+ TextField tf = new TextField("", String.valueOf(i + 1));
+ tf.setColumns(10);
+ item.getItemProperty("Name").setValue(tf);
+ }
+
+ }
+}
diff --git a/src/com/vaadin/tests/featurebrowser/FeatureWindow.java b/src/com/vaadin/tests/featurebrowser/FeatureWindow.java
index 443a32eb88..e241f09899 100644
--- a/src/com/vaadin/tests/featurebrowser/FeatureWindow.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureWindow.java
@@ -38,7 +38,7 @@ public class FeatureWindow extends Feature implements Window.CloseListener {
demoWindow.addListener(this);
demoWindow.setWidth("400px");
demoWindow.setHeight("200px");
- demoWindow.setTheme("default");
+ demoWindow.setTheme("itmill5");
layoutUpper.addComponent(addButton);
layoutUpper.addComponent(removeButton);
diff --git a/src/com/vaadin/tests/tickets/Ticket1397.java b/src/com/vaadin/tests/tickets/Ticket1397.java
index 84e0c6ef0a..09c82ed856 100644
--- a/src/com/vaadin/tests/tickets/Ticket1397.java
+++ b/src/com/vaadin/tests/tickets/Ticket1397.java
@@ -20,7 +20,7 @@ public class Ticket1397 extends Application {
@Override
public void init() {
- setTheme("default");
+ setTheme("itmill5");
main = new Window("PopupView test");
setMainWindow(main);
Panel panel = new Panel("PopupTest");
diff --git a/src/com/vaadin/tests/tickets/Ticket1598.java b/src/com/vaadin/tests/tickets/Ticket1598.java
index ca2da6d010..3161ff3fc6 100644
--- a/src/com/vaadin/tests/tickets/Ticket1598.java
+++ b/src/com/vaadin/tests/tickets/Ticket1598.java
@@ -19,7 +19,7 @@ public class Ticket1598 extends Application {
@Override
public void init() {
setMainWindow(main);
- setTheme("default");
+ setTheme("itmill5");
List<MenuItem> itemList = new ArrayList<MenuItem>();
// Populate the menu bar
@@ -80,7 +80,7 @@ public class Ticket1598 extends Application {
third.setIcon(new ThemeResource("icons/16/document.png"));
for (int i = 2; i <= 3; i++) {
- ((MenuItem) menuBar.getItems().get(i)).setCommand(new Command() {
+ (menuBar.getItems().get(i)).setCommand(new Command() {
public void menuSelected(MenuItem selectedItem) {
main.showNotification("Action " + selectedItem.getText());