summaryrefslogtreecommitdiffstats
path: root/uitest/src/com
diff options
context:
space:
mode:
authorDenis Anisimov <denis@vaadin.com>2014-11-15 16:49:09 +0200
committerelmot <elmot@vaadin.com>2016-04-14 13:31:30 +0300
commit97bffdc266a3403942645e208feb1143130952e9 (patch)
treea32a91cb484dd37558a491cf81c542113e5df66d /uitest/src/com
parentbcc632b09ec8535df4b88c70b56eee45b4db550c (diff)
downloadvaadin-framework-97bffdc266a3403942645e208feb1143130952e9.tar.gz
vaadin-framework-97bffdc266a3403942645e208feb1143130952e9.zip
MarginInfo CTOR with two booleans: vertical, horizontal (#14113).
Change-Id: Iad15b95abeb24e7dd1e06b1d9f70844cb061cb49
Diffstat (limited to 'uitest/src/com')
-rw-r--r--uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java4
-rw-r--r--uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java2
-rw-r--r--uitest/src/com/vaadin/tests/themes/valo/Forms.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java b/uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java
index c04be3d724..56c04180b8 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java
@@ -63,8 +63,8 @@ public abstract class AbstractLayoutTest<T extends AbstractLayout> extends
options.put("right", new MarginInfo(false, true, false, false));
options.put("top", new MarginInfo(true, false, false, false));
options.put("bottom", new MarginInfo(false, false, true, false));
- options.put("left-right", new MarginInfo(false, true, false, true));
- options.put("top-bottom", new MarginInfo(true, false, true, false));
+ options.put("left-right", new MarginInfo(false, true));
+ options.put("top-bottom", new MarginInfo(true, false));
createSelectAction("Margins", category, options, "off", marginCommand);
}
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
index 15f964f110..6fd7bf362b 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
@@ -55,7 +55,7 @@ public class VaadinTunesLayout extends AbstractTestUI {
// modes and search
HorizontalLayout top = new HorizontalLayout();
top.setWidth("100%");
- top.setMargin(new MarginInfo(false, true, false, true)); // Enable
+ top.setMargin(new MarginInfo(false, true)); // Enable
// horizontal
// margins
top.setSpacing(true);
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Forms.java b/uitest/src/com/vaadin/tests/themes/valo/Forms.java
index 91fe473d60..32aef68520 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Forms.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/Forms.java
@@ -171,7 +171,7 @@ public class Forms extends VerticalLayout implements View {
});
HorizontalLayout footer = new HorizontalLayout();
- footer.setMargin(new MarginInfo(true, false, true, false));
+ footer.setMargin(new MarginInfo(true, false));
footer.setSpacing(true);
footer.setDefaultComponentAlignment(Alignment.MIDDLE_LEFT);
form.addComponent(footer);