From df3ecc9cb9eda61e0837ffb6909a5d7bacb6572f Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 23 Nov 2010 16:25:24 +0000 Subject: [PATCH] #6020 - Split SplitPanel into HorizontalSplitPanel and VerticalSplitPanel Updated demos and tests to use VerticalSplitPanel/HorizontalSplitPanel svn changeset:16114/svn branch:6.5 --- src/com/vaadin/ui/themes/Reindeer.java | 9 ++++++--- tests/src/com/vaadin/tests/ScrollbarStressTest.java | 3 +-- tests/src/com/vaadin/tests/TestBench.java | 3 +-- ...orApplicationLayoutThatUsesWholeBrosersSpace.java | 5 ++--- .../vaadin/tests/TestForBasicApplicationLayout.java | 12 ++++++------ tests/src/com/vaadin/tests/TestSplitPanel.java | 5 +---- .../accordion/AccordionInactiveTabSize.java | 3 +-- .../splitpanel/SplitPanelExtraScrollbars.java | 3 +-- .../splitpanel/SplitPanelInModalWindow.java | 3 +-- .../splitpanel/SplitPanelReversePosition.java | 7 ++++--- .../splitpanel/SplitPanelSplitterWidth.java | 5 ++--- .../splitpanel/SplitPanelWidthOnResize.java | 3 +-- .../splitpanel/SplitPanelWithRichTextArea.java | 3 +-- .../DisabledTableShouldNotSendPageLengthUpdates.java | 3 +-- .../table/SafariRenderingBugWhiteSpace.java | 10 +++++----- tests/src/com/vaadin/tests/dd/DDTest6.java | 3 +-- tests/src/com/vaadin/tests/tickets/Ticket1225.java | 3 +-- tests/src/com/vaadin/tests/tickets/Ticket1983.java | 7 +++---- tests/src/com/vaadin/tests/tickets/Ticket2061b.java | 6 +++--- tests/src/com/vaadin/tests/tickets/Ticket2062.java | 3 +-- tests/src/com/vaadin/tests/tickets/Ticket2204.java | 1 + tests/src/com/vaadin/tests/tickets/Ticket2245.java | 3 +-- tests/src/com/vaadin/tests/tickets/Ticket2319.java | 5 ++--- tests/src/com/vaadin/tests/tickets/Ticket2405.java | 3 +-- tests/src/com/vaadin/tests/tickets/Ticket2901.java | 3 +-- 25 files changed, 49 insertions(+), 65 deletions(-) diff --git a/src/com/vaadin/ui/themes/Reindeer.java b/src/com/vaadin/ui/themes/Reindeer.java index 198d7c1515..b2d588d9bd 100644 --- a/src/com/vaadin/ui/themes/Reindeer.java +++ b/src/com/vaadin/ui/themes/Reindeer.java @@ -7,8 +7,9 @@ import com.vaadin.ui.CssLayout; import com.vaadin.ui.FormLayout; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.SplitPanel; +import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.VerticalSplitPanel; public class Reindeer extends BaseTheme { @@ -163,7 +164,8 @@ public class Reindeer extends BaseTheme { /** * Changes the background of a layout to white. Applies to * {@link VerticalLayout}, {@link HorizontalLayout}, {@link GridLayout}, - * {@link FormLayout}, {@link CssLayout} and {@link SplitPanel}. + * {@link FormLayout}, {@link CssLayout}, {@link VerticalSplitPanel} and + * {@link HorizontalSplitPanel}. *

* Does not revert any contained components back to normal if some * parent layout has style {@link #LAYOUT_BLACK} applied. @@ -173,7 +175,8 @@ public class Reindeer extends BaseTheme { /** * Changes the background of a layout to a shade of blue. Applies to * {@link VerticalLayout}, {@link HorizontalLayout}, {@link GridLayout}, - * {@link FormLayout}, {@link CssLayout} and {@link SplitPanel}. + * {@link FormLayout}, {@link CssLayout}, {@link VerticalSplitPanel} and + * {@link HorizontalSplitPanel}. *

* Does not revert any contained components back to normal if some * parent layout has style {@link #LAYOUT_BLACK} applied. diff --git a/tests/src/com/vaadin/tests/ScrollbarStressTest.java b/tests/src/com/vaadin/tests/ScrollbarStressTest.java index b2ea3dbf3d..a66274a635 100644 --- a/tests/src/com/vaadin/tests/ScrollbarStressTest.java +++ b/tests/src/com/vaadin/tests/ScrollbarStressTest.java @@ -10,7 +10,6 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.Panel; -import com.vaadin.ui.SplitPanel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -22,7 +21,7 @@ public class ScrollbarStressTest extends Application { final Window main = new Window("Scrollbar Stress Test"); final Panel panel = new Panel("Panel"); - final SplitPanel splitPanel = new VerticalSplitPanel(); + final VerticalSplitPanel splitPanel = new VerticalSplitPanel(); final Accordion accordion = new Accordion(); final TabSheet tabsheet = new TabSheet(); final Window subwindow = new Window("Subwindow"); diff --git a/tests/src/com/vaadin/tests/TestBench.java b/tests/src/com/vaadin/tests/TestBench.java index 510d03624d..3a92864df2 100644 --- a/tests/src/com/vaadin/tests/TestBench.java +++ b/tests/src/com/vaadin/tests/TestBench.java @@ -23,7 +23,6 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; -import com.vaadin.ui.SplitPanel; import com.vaadin.ui.Tree; import com.vaadin.ui.UriFragmentUtility; import com.vaadin.ui.UriFragmentUtility.FragmentChangedEvent; @@ -53,7 +52,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 HorizontalSplitPanel(); + HorizontalSplitPanel mainLayout = new HorizontalSplitPanel(); Tree menu; diff --git a/tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java index fc7d631ddd..b15949518a 100644 --- a/tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java +++ b/tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java @@ -7,7 +7,6 @@ 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; @@ -20,7 +19,7 @@ public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends VerticalLayout rootLayout; - SplitPanel firstLevelSplit; + VerticalSplitPanel firstLevelSplit; @Override public void init() { @@ -33,7 +32,7 @@ public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends firstLevelSplit = new VerticalSplitPanel(); - final SplitPanel secondSplitPanel = new HorizontalSplitPanel(); + final HorizontalSplitPanel secondSplitPanel = new HorizontalSplitPanel(); secondSplitPanel.setFirstComponent(new Label("left")); final VerticalLayout topRight = new VerticalLayout(); diff --git a/tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java b/tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java index 989655acea..e4b7592398 100644 --- a/tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java +++ b/tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java @@ -6,6 +6,7 @@ package com.vaadin.tests; import java.util.Locale; +import com.vaadin.terminal.Sizeable; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -14,7 +15,6 @@ 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; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -44,11 +44,11 @@ public class TestForBasicApplicationLayout extends CustomComponent { }); - final SplitPanel sp = new HorizontalSplitPanel(); - sp.setSplitPosition(290, SplitPanel.UNITS_PIXELS); + final HorizontalSplitPanel sp = new HorizontalSplitPanel(); + sp.setSplitPosition(290, Sizeable.UNITS_PIXELS); - final SplitPanel sp2 = new HorizontalSplitPanel(); - sp2.setSplitPosition(255, SplitPanel.UNITS_PIXELS); + final HorizontalSplitPanel sp2 = new HorizontalSplitPanel(); + sp2.setSplitPosition(255, Sizeable.UNITS_PIXELS); final Panel p = new Panel("Accordion Panel"); p.setSizeFull(); @@ -70,7 +70,7 @@ public class TestForBasicApplicationLayout extends CustomComponent { report.addComponent(cal); ((VerticalLayout) report.getContent()).setExpandRatio(controls, 1); report.addStyleName(Reindeer.PANEL_LIGHT); - report.setHeight(100, SplitPanel.UNITS_PERCENTAGE); + report.setHeight(100, Sizeable.UNITS_PERCENTAGE); sp2.setFirstComponent(report); diff --git a/tests/src/com/vaadin/tests/TestSplitPanel.java b/tests/src/com/vaadin/tests/TestSplitPanel.java index b7d6f6dba6..d2665cc971 100644 --- a/tests/src/com/vaadin/tests/TestSplitPanel.java +++ b/tests/src/com/vaadin/tests/TestSplitPanel.java @@ -5,15 +5,12 @@ 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 VerticalSplitPanel(); + VerticalSplitPanel verticalSplit = new VerticalSplitPanel(); @Override public void init() { diff --git a/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java b/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java index 959d5eaf97..48212b2fdc 100644 --- a/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java +++ b/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java @@ -3,7 +3,6 @@ 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; @@ -21,7 +20,7 @@ public class AccordionInactiveTabSize extends TestBase { @Override protected void setup() { - SplitPanel sp = new HorizontalSplitPanel(); + HorizontalSplitPanel sp = new HorizontalSplitPanel(); sp.setSizeFull(); Accordion acc = new Accordion(); diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java index cc30d2bbc0..872828c97e 100644 --- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java +++ b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java @@ -8,13 +8,12 @@ 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; public class SplitPanelExtraScrollbars extends AbstractTestCase implements ClickListener { - private SplitPanel sp; + private HorizontalSplitPanel sp; private HorizontalLayout hl; private Button b; diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java index 3d944f7af2..c06ca5b0b9 100644 --- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java +++ b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java @@ -3,7 +3,6 @@ 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; @@ -19,7 +18,7 @@ public class SplitPanelInModalWindow extends TestBase { modalWindow.setModal(true); // This line causes the problem getMainWindow().addWindow(modalWindow); - SplitPanel splitPanel = new HorizontalSplitPanel(); + HorizontalSplitPanel splitPanel = new HorizontalSplitPanel(); splitPanel.setSplitPosition(20); vl.addComponent(splitPanel); } diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java index 1d96ecf371..107635e989 100644 --- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java +++ b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java @@ -2,11 +2,12 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.terminal.Sizeable; import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent; +import com.vaadin.ui.AbstractSplitPanel.SplitterClickListener; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; -import com.vaadin.ui.SplitPanel.SplitterClickEvent; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalSplitPanel; @@ -38,7 +39,7 @@ public class SplitPanelReversePosition extends TestBase { vsplit.setSizeFull(); vsplit.setImmediate(true); vsplit.setSplitPosition(10, Sizeable.UNITS_PERCENTAGE, vsplitReversed); - vsplit.addListener(new VerticalSplitPanel.SplitterClickListener() { + vsplit.addListener(new SplitterClickListener() { public void splitterClick(SplitterClickEvent event) { getMainWindow().showNotification("Vertical Splitter Clicked"); } @@ -78,7 +79,7 @@ public class SplitPanelReversePosition extends TestBase { })); addComponent(buttons); - + } @Override diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java index 1c0a497cf0..49a5915999 100644 --- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java +++ b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java @@ -5,7 +5,6 @@ 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; @@ -23,7 +22,7 @@ public class SplitPanelSplitterWidth extends TestBase { @Override protected void setup() { - final SplitPanel split = new HorizontalSplitPanel(); + final HorizontalSplitPanel split = new HorizontalSplitPanel(); split.setWidth("200px"); split.setHeight("200px"); split.setLocked(true); @@ -34,7 +33,7 @@ public class SplitPanelSplitterWidth extends TestBase { p.setSizeFull(); split.addComponent(p); - final SplitPanel split2 = new VerticalSplitPanel(); + final VerticalSplitPanel split2 = new VerticalSplitPanel(); split2.setWidth("200px"); split2.setHeight("200px"); split2.setLocked(true); diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java index dfbdac05f9..8d5256ece7 100644 --- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java +++ b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java @@ -5,7 +5,6 @@ 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; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -18,7 +17,7 @@ public class SplitPanelWidthOnResize extends AbstractTestCase { layout.setSizeFull(); Window w = new Window("", layout); setMainWindow(w); - SplitPanel splitPanel = new HorizontalSplitPanel(); + HorizontalSplitPanel splitPanel = new HorizontalSplitPanel(); Button button = new NativeButton("A huge button"); button.setSizeFull(); TextField textField = new TextField("A small textfield"); diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java index 303b2b2324..6b17319509 100644 --- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java +++ b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java @@ -3,14 +3,13 @@ package com.vaadin.tests.components.splitpanel; 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 VerticalSplitPanel(); + VerticalSplitPanel sp = new VerticalSplitPanel(); sp.setSizeFull(); RichTextArea rta = new RichTextArea(); rta.setSizeFull(); diff --git a/tests/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java b/tests/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java index d4fc313927..86646f522f 100644 --- a/tests/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java +++ b/tests/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java @@ -4,7 +4,6 @@ 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; @SuppressWarnings("serial") @@ -14,7 +13,7 @@ public class DisabledTableShouldNotSendPageLengthUpdates extends TestBase { @Override protected void setup() { - SplitPanel split = new HorizontalSplitPanel(); + HorizontalSplitPanel split = new HorizontalSplitPanel(); table.addContainerProperty("name", Integer.class, 0); Button button = new Button("Add items", new Button.ClickListener() { public void buttonClick(ClickEvent event) { diff --git a/tests/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java b/tests/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java index 38510f1c6c..133a5e83a5 100644 --- a/tests/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java +++ b/tests/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java @@ -2,10 +2,10 @@ package com.vaadin.tests.components.table; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.terminal.Sizeable; 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; public class SafariRenderingBugWhiteSpace extends TestBase { @@ -13,7 +13,7 @@ public class SafariRenderingBugWhiteSpace extends TestBase { @Override protected void setup() { - final SplitPanel split = new HorizontalSplitPanel(); + final HorizontalSplitPanel split = new HorizontalSplitPanel(); final Table table = new Table(); table.addContainerProperty("name", String.class, ""); @@ -35,15 +35,15 @@ public class SafariRenderingBugWhiteSpace extends TestBase { public void valueChange(ValueChangeEvent event) { if (table.getValue() == null) { - split.setSplitPosition(100, SplitPanel.UNITS_PERCENTAGE); + split.setSplitPosition(100, Sizeable.UNITS_PERCENTAGE); } else { - split.setSplitPosition(20, SplitPanel.UNITS_PERCENTAGE); + split.setSplitPosition(20, Sizeable.UNITS_PERCENTAGE); } } }); split.setFirstComponent(table); - split.setSplitPosition(100, SplitPanel.UNITS_PERCENTAGE); + split.setSplitPosition(100, Sizeable.UNITS_PERCENTAGE); Panel editor = new Panel("Editor"); editor.setSizeFull(); split.setSecondComponent(editor); diff --git a/tests/src/com/vaadin/tests/dd/DDTest6.java b/tests/src/com/vaadin/tests/dd/DDTest6.java index ecd7f91192..d25335a580 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest6.java +++ b/tests/src/com/vaadin/tests/dd/DDTest6.java @@ -42,7 +42,6 @@ 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; import com.vaadin.ui.Table; import com.vaadin.ui.Tree; import com.vaadin.ui.Tree.TreeDragMode; @@ -59,7 +58,7 @@ public class DDTest6 extends TestBase { private static Tree tree1; - private SplitPanel sp; + private HorizontalSplitPanel sp; private BeanItemContainer fs1; diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1225.java b/tests/src/com/vaadin/tests/tickets/Ticket1225.java index 998b81ac77..0596fd4d49 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1225.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1225.java @@ -4,7 +4,6 @@ import com.vaadin.Application; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Alignment; import com.vaadin.ui.Label; -import com.vaadin.ui.SplitPanel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -25,7 +24,7 @@ public class Ticket1225 extends Application { "Test app to break layout fuction in IE7"); setMainWindow(mainWin); - SplitPanel sp = new VerticalSplitPanel(); + VerticalSplitPanel sp = new VerticalSplitPanel(); sp.setFirstComponent(new Label("First")); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1983.java b/tests/src/com/vaadin/tests/tickets/Ticket1983.java index 12198ab247..fbab5c5244 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1983.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1983.java @@ -8,7 +8,6 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Layout; -import com.vaadin.ui.SplitPanel; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -37,7 +36,7 @@ public class Ticket1983 extends Application { setMargin(false); setLocked(true); - final SplitPanel leftSide = initLeftSide(); + final HorizontalSplitPanel leftSide = initLeftSide(); setFirstComponent(leftSide); final Layout rightSide = new VerticalLayout(); @@ -45,8 +44,8 @@ public class Ticket1983 extends Application { setSecondComponent(rightSide); } - private SplitPanel initLeftSide() { - final SplitPanel leftSide = new HorizontalSplitPanel(); + private HorizontalSplitPanel initLeftSide() { + final HorizontalSplitPanel leftSide = new HorizontalSplitPanel(); leftSide.setHeight("100%"); final IndexedContainer dataSource = new IndexedContainer(); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2061b.java b/tests/src/com/vaadin/tests/tickets/Ticket2061b.java index 32a08d0564..5dc6dde768 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2061b.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2061b.java @@ -5,13 +5,13 @@ import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.HierarchicalContainer; +import com.vaadin.terminal.Sizeable; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Accordion; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.SplitPanel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; @@ -37,9 +37,9 @@ public class Ticket2061b extends Application implements mainLayout.setMargin(false); setMainWindow(mainWindow); - SplitPanel sp = new VerticalSplitPanel(); + VerticalSplitPanel sp = new VerticalSplitPanel(); sp.setSizeFull(); - sp.setSplitPosition(20, SplitPanel.UNITS_PIXELS); + sp.setSplitPosition(20, Sizeable.UNITS_PIXELS); p = new Panel("This is a panel"); p.setSizeFull(); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2062.java b/tests/src/com/vaadin/tests/tickets/Ticket2062.java index 68c44a38c9..2dabffe5f4 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2062.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2062.java @@ -2,7 +2,6 @@ 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; import com.vaadin.ui.TextField; @@ -16,7 +15,7 @@ public class Ticket2062 extends Application { setMainWindow(new Window("Ticket2062")); getMainWindow().setSizeFull(); - SplitPanel p = new HorizontalSplitPanel(); + HorizontalSplitPanel p = new HorizontalSplitPanel(); p.setSizeFull(); getMainWindow().setContent(p); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2204.java b/tests/src/com/vaadin/tests/tickets/Ticket2204.java index 3fdf61ac47..57309077e3 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2204.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2204.java @@ -27,6 +27,7 @@ import com.vaadin.ui.SplitPanel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Window; +@SuppressWarnings("deprecation") public class Ticket2204 extends Application { private final List textAreas = new ArrayList(); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2245.java b/tests/src/com/vaadin/tests/tickets/Ticket2245.java index be119cde83..bac85c95cd 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2245.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2245.java @@ -2,7 +2,6 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.HorizontalSplitPanel; -import com.vaadin.ui.SplitPanel; import com.vaadin.ui.Window; public class Ticket2245 extends Application { @@ -12,7 +11,7 @@ public class Ticket2245 extends Application { Window main = new Window("The Main Window"); main.getContent().setSizeFull(); setMainWindow(main); - SplitPanel sp = new HorizontalSplitPanel(); + HorizontalSplitPanel sp = new HorizontalSplitPanel(); main.addComponent(sp); } } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2319.java b/tests/src/com/vaadin/tests/tickets/Ticket2319.java index a345bddbb0..b8a2ba8db8 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2319.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2319.java @@ -6,7 +6,6 @@ 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; @@ -41,7 +40,7 @@ public class Ticket2319 extends Application { hl.addComponent(panel2); mainw.addComponent(hl); - SplitPanel sp = new HorizontalSplitPanel(); + HorizontalSplitPanel sp = new HorizontalSplitPanel(); VerticalLayout first = new VerticalLayout(); first.addComponent(new Label("first")); @@ -51,7 +50,7 @@ public class Ticket2319 extends Application { sp.setFirstComponent(first); sp.setSecondComponent(second); - SplitPanel sp2 = new VerticalSplitPanel(); + VerticalSplitPanel sp2 = new VerticalSplitPanel(); Label label = new Label("first"); label.setSizeFull(); sp2.setFirstComponent(label); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2405.java b/tests/src/com/vaadin/tests/tickets/Ticket2405.java index 83ed55f9fc..9ab0d851ad 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2405.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2405.java @@ -9,7 +9,6 @@ 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; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -17,7 +16,7 @@ import com.vaadin.ui.Window; public class Ticket2405 extends Application { private Label label; - private SplitPanel split; + private HorizontalSplitPanel split; @Override public void init() { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2901.java b/tests/src/com/vaadin/tests/tickets/Ticket2901.java index b85d409a24..9e28908c22 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2901.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2901.java @@ -2,7 +2,6 @@ package com.vaadin.tests.tickets; 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; @@ -20,7 +19,7 @@ public class Ticket2901 extends Application { final Window mainWin = new Window("Test app to break layout in IE6"); setMainWindow(mainWin); - SplitPanel sp = new VerticalSplitPanel(); + VerticalSplitPanel sp = new VerticalSplitPanel(); VerticalLayout l = new VerticalLayout(); for (int i = 0; i < 100; i++) { -- 2.39.5