Remove theme variants classes.

Since both layouts do not extend the generated classes and already have an api that covers all the variants, it makes no sense to have variants classes here.
vaadin · Jul 18, 2018 · d622718 · d622718
1 parent bdcec25
commit d622718
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 108 deletions.
diff --git a/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayoutVariant.java b/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayoutVariant.java
diff --git a/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayoutVariant.java b/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayoutVariant.java
diff --git a/src/test/java/com/vaadin/flow/component/orderedlayout/demo/OrderedLayoutView.java b/src/test/java/com/vaadin/flow/component/orderedlayout/demo/OrderedLayoutView.java
@@ -59,7 +59,6 @@ protected void initView() {
     private void createDefaultHorizontalLayout() {
         // begin-source-example
         // source-example-heading: Default horizontal layout
-        // by default, spacing is on
         HorizontalLayout layout = new HorizontalLayout();
         layout.getStyle().set("border", "1px solid #9E9E9E");
 
@@ -68,6 +67,12 @@ private void createDefaultHorizontalLayout() {
         Component component3 = createComponent(3, "#37474F");
 
         layout.add(component1, component2, component3);
+
+        // shorthand methods for changing the component theme variants
+        layout.setPadding(false);
+        layout.setMargin(true);
+        // just a demonstration of the API, by default the spacing is on
+        layout.setSpacing(true);
         // end-source-example
 
         layout.setId("default-layout");
@@ -289,6 +294,12 @@ private void createDefaultVerticalLayout() {
         Component component3 = createComponent(3, "#37474F");
 
         layout.add(component1, component2, component3);
+
+        // shorthand methods for changing the component theme variants
+        layout.setPadding(false);
+        layout.setMargin(true);
+        // just a demonstration of the API, by default the spacing is on
+        layout.setSpacing(true);
         // end-source-example
 
         layout.setId("default-layout");

diff --git a/src/test/java/com/vaadin/flow/component/orderedlayout/tests/HorizontalLayoutViewIT.java b/src/test/java/com/vaadin/flow/component/orderedlayout/tests/HorizontalLayoutViewIT.java
@@ -39,11 +39,15 @@ public void defaultLayout() {
         Assert.assertTrue(
                 "By default layout should contain spacing theme in 'theme' attribute",
                 hLayout.getAttribute("theme").contains("spacing"));
+        Assert.assertTrue(
+                "By default layout should contain margin theme in 'theme' attribute",
+                hLayout.getAttribute("theme").contains("margin"));
 
         checkThemeChanges(hLayout, "spacing", false);
+        checkThemeChanges(hLayout, "margin", false);
 
         Assert.assertNull(
-                "After turning off spacing, layout should not contain 'theme' attribute",
+                "After turning off spacing and margin, layout should not contain 'theme' attribute",
                 hLayout.getAttribute("theme"));
 
         checkThemeChanges(hLayout, "padding", true);

diff --git a/src/test/java/com/vaadin/flow/component/orderedlayout/tests/VerticalLayoutViewIT.java b/src/test/java/com/vaadin/flow/component/orderedlayout/tests/VerticalLayoutViewIT.java
@@ -38,12 +38,14 @@ public void defaultLayout() {
         assertBasicFlexPropertiesAreSet(vLayout);
 
         Assert.assertTrue(
-                "By default layout should contain both spacing and padding themes in 'theme' attribute",
-                vLayout.getAttribute("theme").contains("spacing")
-                        && vLayout.getAttribute("theme").contains("padding"));
+                "By default layout should contain spacing theme in 'theme' attribute",
+                vLayout.getAttribute("theme").contains("spacing"));
+        Assert.assertTrue(
+                "By default layout should contain margin theme in 'theme' attribute",
+                vLayout.getAttribute("theme").contains("margin"));
 
-        checkThemeChanges(vLayout, "padding", false);
         checkThemeChanges(vLayout, "spacing", false);
+        checkThemeChanges(vLayout, "margin", false);
 
         Assert.assertNull(
                 "After turning off spacing and padding, layout should not contain 'theme' attribute",