summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2010-08-26 11:33:52 +0000
committerArtur Signell <artur.signell@itmill.com>2010-08-26 11:33:52 +0000
commit3b085ae6c8581d6662e6524e7e795f5a64a18c7c (patch)
treee39565d972296fe63e0d43f629b83568a018472e
parente8de3e61d1ee4c152580e286e2a094964c217626 (diff)
downloadvaadin-framework-3b085ae6c8581d6662e6524e7e795f5a64a18c7c.tar.gz
vaadin-framework-3b085ae6c8581d6662e6524e7e795f5a64a18c7c.zip
Added buttons to the right and below the layout to show where it ends
svn changeset:14623/svn branch:6.4
-rw-r--r--tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java b/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
index 788776777b..6e02666f62 100644
--- a/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
@@ -18,7 +18,9 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Layout;
+import com.vaadin.ui.NativeButton;
import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
@@ -36,6 +38,7 @@ public class CaptionsInLayouts extends TestBase {
private FormLayout formLayout;
private List<AbstractField> components = new ArrayList<AbstractField>();
private CssLayout cssLayout;
+ private HorizontalLayout layoutParent = new HorizontalLayout();
@Override
protected void setup() {
@@ -46,6 +49,9 @@ public class CaptionsInLayouts extends TestBase {
addComponent(toggleError());
addComponent(toggleIcon());
addComponent(addCaptionText());
+ layoutParent.addComponent(new NativeButton("Button right of layout"));
+ addComponent(layoutParent);
+ addComponent(new NativeButton("Button below layout"));
createComponents();
layoutSelect.setValue(layoutSelect.getItemIds().iterator().next());
}
@@ -151,9 +157,9 @@ public class CaptionsInLayouts extends TestBase {
private void setLayout(Layout newLayout) {
if (layout == null) {
- addComponent(newLayout);
+ layoutParent.addComponent(newLayout, 0);
} else {
- replaceComponent(layout, newLayout);
+ layoutParent.replaceComponent(layout, newLayout);
}
layout = newLayout;