Browse Source

changed tests and demos to uses vertical/horizontal split panel

svn changeset:15863/svn branch:6.5
tags/6.7.0.beta1
Matti Tahvonen 13 years ago
parent
commit
8f65f667f2
22 changed files with 52 additions and 32 deletions
  1. 2
    1
      tests/src/com/vaadin/tests/ScrollbarStressTest.java
  2. 2
    1
      tests/src/com/vaadin/tests/TestBench.java
  3. 4
    3
      tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
  4. 3
    2
      tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java
  5. 2
    1
      tests/src/com/vaadin/tests/TestSplitPanel.java
  6. 2
    1
      tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
  7. 2
    1
      tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
  8. 2
    2
      tests/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
  9. 4
    3
      tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
  10. 2
    2
      tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
  11. 2
    1
      tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
  12. 2
    1
      tests/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
  13. 2
    1
      tests/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
  14. 2
    1
      tests/src/com/vaadin/tests/dd/DDTest6.java
  15. 2
    1
      tests/src/com/vaadin/tests/tickets/Ticket1225.java
  16. 3
    3
      tests/src/com/vaadin/tests/tickets/Ticket1983.java
  17. 2
    1
      tests/src/com/vaadin/tests/tickets/Ticket2061b.java
  18. 2
    1
      tests/src/com/vaadin/tests/tickets/Ticket2062.java
  19. 2
    1
      tests/src/com/vaadin/tests/tickets/Ticket2245.java
  20. 4
    2
      tests/src/com/vaadin/tests/tickets/Ticket2319.java
  21. 2
    1
      tests/src/com/vaadin/tests/tickets/Ticket2405.java
  22. 2
    1
      tests/src/com/vaadin/tests/tickets/Ticket2901.java

+ 2
- 1
tests/src/com/vaadin/tests/ScrollbarStressTest.java View File

@@ -14,6 +14,7 @@ import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.Window;

public class ScrollbarStressTest extends Application {
@@ -21,7 +22,7 @@ public class ScrollbarStressTest extends Application {
final Window main = new Window("Scrollbar Stress Test");

final Panel panel = new Panel("Panel");
final SplitPanel splitPanel = new SplitPanel();
final SplitPanel splitPanel = new VerticalSplitPanel();
final Accordion accordion = new Accordion();
final TabSheet tabsheet = new TabSheet();
final Window subwindow = new Window("Subwindow");

+ 2
- 1
tests/src/com/vaadin/tests/TestBench.java View File

@@ -18,6 +18,7 @@ import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.terminal.ExternalResource;
import com.vaadin.ui.Component;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.Link;
@@ -52,7 +53,7 @@ public class TestBench extends com.vaadin.Application implements
Window mainWindow = new Window("TestBench window");

// Main layout consists of tree menu and body layout
SplitPanel mainLayout = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
SplitPanel mainLayout = new HorizontalSplitPanel();

Tree menu;


+ 4
- 3
tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java View File

@@ -5,10 +5,12 @@
package com.vaadin.tests;

import com.vaadin.Application;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.Window;

public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends
@@ -29,10 +31,9 @@ public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends

rootLayout.addComponent(new Label("header"));

firstLevelSplit = new SplitPanel();
firstLevelSplit = new VerticalSplitPanel();

final SplitPanel secondSplitPanel = new SplitPanel(
SplitPanel.ORIENTATION_HORIZONTAL);
final SplitPanel secondSplitPanel = new HorizontalSplitPanel();
secondSplitPanel.setFirstComponent(new Label("left"));

final VerticalLayout topRight = new VerticalLayout();

+ 3
- 2
tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java View File

@@ -11,6 +11,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.DateField;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.SplitPanel;
@@ -43,10 +44,10 @@ public class TestForBasicApplicationLayout extends CustomComponent {
});
final SplitPanel sp = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
final SplitPanel sp = new HorizontalSplitPanel();
sp.setSplitPosition(290, SplitPanel.UNITS_PIXELS);
final SplitPanel sp2 = new SplitPanel(SplitPanel.ORIENTATION_VERTICAL);
final SplitPanel sp2 = new HorizontalSplitPanel();
sp2.setSplitPosition(255, SplitPanel.UNITS_PIXELS);
final Panel p = new Panel("Accordion Panel");

+ 2
- 1
tests/src/com/vaadin/tests/TestSplitPanel.java View File

@@ -6,13 +6,14 @@ package com.vaadin.tests;

import com.vaadin.ui.Label;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.Window;

public class TestSplitPanel extends com.vaadin.Application {

// SplitPanel verticalSplit = new
// SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
SplitPanel verticalSplit = new SplitPanel(SplitPanel.ORIENTATION_VERTICAL);
SplitPanel verticalSplit = new VerticalSplitPanel();

@Override
public void init() {

+ 2
- 1
tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java View File

@@ -2,6 +2,7 @@ package com.vaadin.tests.components.accordion;

import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Accordion;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.TabSheet.Tab;
import com.vaadin.ui.TextField;
@@ -20,7 +21,7 @@ public class AccordionInactiveTabSize extends TestBase {

@Override
protected void setup() {
SplitPanel sp = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
SplitPanel sp = new HorizontalSplitPanel();
sp.setSizeFull();

Accordion acc = new Accordion();

+ 2
- 1
tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java View File

@@ -6,6 +6,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.Window;
@@ -19,7 +20,7 @@ public class SplitPanelExtraScrollbars extends AbstractTestCase implements
@Override
public void init() {
sp = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
sp = new HorizontalSplitPanel();
sp.setSizeFull();
sp.setSplitPosition(0, Sizeable.UNITS_PIXELS);

+ 2
- 2
tests/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java View File

@@ -2,6 +2,7 @@ package com.vaadin.tests.components.splitpanel;

import com.vaadin.terminal.Sizeable;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
@@ -18,8 +19,7 @@ public class SplitPanelInModalWindow extends TestBase {
modalWindow.setModal(true); // This line causes the problem
getMainWindow().addWindow(modalWindow);

SplitPanel splitPanel = new SplitPanel(
SplitPanel.ORIENTATION_HORIZONTAL);
SplitPanel splitPanel = new HorizontalSplitPanel();
splitPanel.setSplitPosition(20);
vl.addComponent(splitPanel);
}

+ 4
- 3
tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java View File

@@ -3,8 +3,10 @@ package com.vaadin.tests.components.splitpanel;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Panel;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.Window.Notification;

public class SplitPanelSplitterWidth extends TestBase {
@@ -21,8 +23,7 @@ public class SplitPanelSplitterWidth extends TestBase {

@Override
protected void setup() {
final SplitPanel split = new SplitPanel(
SplitPanel.ORIENTATION_HORIZONTAL);
final SplitPanel split = new HorizontalSplitPanel();
split.setWidth("200px");
split.setHeight("200px");
split.setLocked(true);
@@ -33,7 +34,7 @@ public class SplitPanelSplitterWidth extends TestBase {
p.setSizeFull();
split.addComponent(p);

final SplitPanel split2 = new SplitPanel();
final SplitPanel split2 = new VerticalSplitPanel();
split2.setWidth("200px");
split2.setHeight("200px");
split2.setLocked(true);

+ 2
- 2
tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java View File

@@ -3,6 +3,7 @@ package com.vaadin.tests.components.splitpanel;
import com.vaadin.terminal.Sizeable;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Button;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.TextField;
@@ -17,8 +18,7 @@ public class SplitPanelWidthOnResize extends AbstractTestCase {
layout.setSizeFull();
Window w = new Window("", layout);
setMainWindow(w);
SplitPanel splitPanel = new SplitPanel(
SplitPanel.ORIENTATION_HORIZONTAL);
SplitPanel splitPanel = new HorizontalSplitPanel();
Button button = new NativeButton("A huge button");
button.setSizeFull();
TextField textField = new TextField("A small textfield");

+ 2
- 1
tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java View File

@@ -4,12 +4,13 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.VerticalSplitPanel;

public class SplitPanelWithRichTextArea extends TestBase {

@Override
protected void setup() {
SplitPanel sp = new SplitPanel();
SplitPanel sp = new VerticalSplitPanel();
sp.setSizeFull();
RichTextArea rta = new RichTextArea();
rta.setSizeFull();

+ 2
- 1
tests/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java View File

@@ -3,6 +3,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.Table;

@@ -13,7 +14,7 @@ public class DisabledTableShouldNotSendPageLengthUpdates extends TestBase {

@Override
protected void setup() {
SplitPanel split = new SplitPanel(SplitPanel.ORIENTATION_VERTICAL);
SplitPanel split = new HorizontalSplitPanel();
table.addContainerProperty("name", Integer.class, 0);
Button button = new Button("Add items", new Button.ClickListener() {
public void buttonClick(ClickEvent event) {

+ 2
- 1
tests/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java View File

@@ -3,6 +3,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Panel;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.Table;
@@ -12,7 +13,7 @@ public class SafariRenderingBugWhiteSpace extends TestBase {
@Override
protected void setup() {

final SplitPanel split = new SplitPanel(SplitPanel.ORIENTATION_VERTICAL);
final SplitPanel split = new HorizontalSplitPanel();

final Table table = new Table();
table.addContainerProperty("name", String.class, "");

+ 2
- 1
tests/src/com/vaadin/tests/dd/DDTest6.java View File

@@ -40,6 +40,7 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.DragAndDropWrapper;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Html5File;
import com.vaadin.ui.Label;
import com.vaadin.ui.SplitPanel;
@@ -71,7 +72,7 @@ public class DDTest6 extends TestBase {
// get()
// not converted to thread local

sp = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
sp = new HorizontalSplitPanel();
sp.setSplitPosition(20);
CssLayout l = new CssLayout();
sp.setFirstComponent(l);

+ 2
- 1
tests/src/com/vaadin/tests/tickets/Ticket1225.java View File

@@ -8,6 +8,7 @@ import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.Window;

/**
@@ -24,7 +25,7 @@ public class Ticket1225 extends Application {
"Test app to break layout fuction in IE7");
setMainWindow(mainWin);

SplitPanel sp = new SplitPanel();
SplitPanel sp = new VerticalSplitPanel();

sp.setFirstComponent(new Label("First"));


+ 3
- 3
tests/src/com/vaadin/tests/tickets/Ticket1983.java View File

@@ -5,6 +5,7 @@ import com.vaadin.data.util.IndexedContainer;
import com.vaadin.terminal.Sizeable;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Layout;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.Table;
@@ -23,14 +24,13 @@ public class Ticket1983 extends Application {
setMainWindow(main);
}

private static class TestLayout extends SplitPanel {
private static class TestLayout extends HorizontalSplitPanel {
boolean isLong = true;
final Table table = new MyTable();
final String propId = "col";
final String propId2 = "col2";

public TestLayout() {
super(ORIENTATION_HORIZONTAL);

setSplitPosition(200, Sizeable.UNITS_PIXELS);
setMargin(false);
@@ -45,7 +45,7 @@ public class Ticket1983 extends Application {
}

private SplitPanel initLeftSide() {
final SplitPanel leftSide = new SplitPanel(ORIENTATION_VERTICAL);
final SplitPanel leftSide = new HorizontalSplitPanel();
leftSide.setHeight("100%");

final IndexedContainer dataSource = new IndexedContainer();

+ 2
- 1
tests/src/com/vaadin/tests/tickets/Ticket2061b.java View File

@@ -13,6 +13,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
import com.vaadin.ui.Table;
@@ -36,7 +37,7 @@ public class Ticket2061b extends Application implements
mainLayout.setMargin(false);
setMainWindow(mainWindow);

SplitPanel sp = new SplitPanel();
SplitPanel sp = new VerticalSplitPanel();
sp.setSizeFull();
sp.setSplitPosition(20, SplitPanel.UNITS_PIXELS);


+ 2
- 1
tests/src/com/vaadin/tests/tickets/Ticket2062.java View File

@@ -1,6 +1,7 @@
package com.vaadin.tests.tickets;
import com.vaadin.Application;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Table;
@@ -15,7 +16,7 @@ public class Ticket2062 extends Application {
setMainWindow(new Window("Ticket2062"));
getMainWindow().setSizeFull();
SplitPanel p = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
SplitPanel p = new HorizontalSplitPanel();
p.setSizeFull();
getMainWindow().setContent(p);

+ 2
- 1
tests/src/com/vaadin/tests/tickets/Ticket2245.java View File

@@ -1,6 +1,7 @@
package com.vaadin.tests.tickets;

import com.vaadin.Application;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.Window;

@@ -11,7 +12,7 @@ public class Ticket2245 extends Application {
Window main = new Window("The Main Window");
main.getContent().setSizeFull();
setMainWindow(main);
SplitPanel sp = new SplitPanel(SplitPanel.ORIENTATION_VERTICAL);
SplitPanel sp = new HorizontalSplitPanel();
main.addComponent(sp);
}
}

+ 4
- 2
tests/src/com/vaadin/tests/tickets/Ticket2319.java View File

@@ -3,10 +3,12 @@ package com.vaadin.tests.tickets;
import com.vaadin.Application;
import com.vaadin.ui.Button;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.Window;

public class Ticket2319 extends Application {
@@ -39,7 +41,7 @@ public class Ticket2319 extends Application {
hl.addComponent(panel2);
mainw.addComponent(hl);

SplitPanel sp = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
SplitPanel sp = new HorizontalSplitPanel();

VerticalLayout first = new VerticalLayout();
first.addComponent(new Label("first"));
@@ -49,7 +51,7 @@ public class Ticket2319 extends Application {
sp.setFirstComponent(first);
sp.setSecondComponent(second);

SplitPanel sp2 = new SplitPanel();
SplitPanel sp2 = new VerticalSplitPanel();
Label label = new Label("first");
label.setSizeFull();
sp2.setFirstComponent(label);

+ 2
- 1
tests/src/com/vaadin/tests/tickets/Ticket2405.java View File

@@ -6,6 +6,7 @@ import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.SplitPanel;
@@ -49,7 +50,7 @@ public class Ticket2405 extends Application {
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent porttitor porta lacus. Nulla tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Proin mollis turpis in mauris faucibus posuere. Nullam rutrum, nisi a fermentum tempus, lacus metus rutrum massa, a condimentum mauris justo a tortor. Mauris aliquet, ante quis ultricies posuere, sapien libero laoreet sem, a accumsan diam metus sed elit. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur vehicula metus nec turpis dignissim cursus. Suspendisse potenti. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nullam feugiat orci eget risus. Vestibulum at sem. ");
label.setWidth("100%");
top.addComponent(label);
split = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
split = new HorizontalSplitPanel();
split.setHeight("100%");
Embedded image = new Embedded("An image", new ExternalResource(
"http://dev.itmill.com/chrome/site/toolkit-logo.png"));

+ 2
- 1
tests/src/com/vaadin/tests/tickets/Ticket2901.java View File

@@ -4,6 +4,7 @@ import com.vaadin.Application;
import com.vaadin.ui.Label;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.Window;

/**
@@ -19,7 +20,7 @@ public class Ticket2901 extends Application {
final Window mainWin = new Window("Test app to break layout in IE6");
setMainWindow(mainWin);

SplitPanel sp = new SplitPanel();
SplitPanel sp = new VerticalSplitPanel();

VerticalLayout l = new VerticalLayout();
for (int i = 0; i < 100; i++) {

Loading…
Cancel
Save