Use Alignment.* constants instead of layout-specific *Layout.ALIGNMENT_* constants in setComponentAlignment() in demos. Fixes #2432 for the demos.

svn changeset:6494/svn branch:trunk

4 files changed, 9 insertions, 10 deletions

diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java
index 499aa60f15..5edbca6ea2 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java
@@ -15,6 +15,7 @@ import com.itmill.toolkit.data.util.IndexedContainer;
 import com.itmill.toolkit.terminal.ExternalResource;
 import com.itmill.toolkit.terminal.ThemeResource;
 import com.itmill.toolkit.ui.AbstractSelect;
+import com.itmill.toolkit.ui.Alignment;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Embedded;
@@ -259,8 +260,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
         wbLayout.addComponent(b);
 
         exp.addComponent(wbLayout);
-        exp.setComponentAlignment(wbLayout, VerticalLayout.ALIGNMENT_RIGHT,
-                VerticalLayout.ALIGNMENT_TOP);
+        exp.setComponentAlignment(wbLayout, Alignment.TOP_RIGHT);
 
         ts = new TabSheet();
         ts.setSizeFull();
@@ -273,8 +273,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
                         + " | <a href=\"http://www.itmill.com/documentation/\">Documentation</a>");
         status.setContentMode(Label.CONTENT_XHTML);
         exp.addComponent(status);
-        exp.setComponentAlignment(status, VerticalLayout.ALIGNMENT_RIGHT,
-                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);
+        exp.setComponentAlignment(status, Alignment.MIDDLE_RIGHT);
 
         // select initial section ("All")
         tree.setValue(rootId);
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/JavaScriptAPIExample.java b/src/com/itmill/toolkit/automatedtests/featurebrowser/JavaScriptAPIExample.java
index 1f7825d661..902eef0446 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/JavaScriptAPIExample.java
+++ b/src/com/itmill/toolkit/automatedtests/featurebrowser/JavaScriptAPIExample.java
@@ -8,6 +8,7 @@ import java.util.Date;
 

 import com.itmill.toolkit.terminal.PaintException;

 import com.itmill.toolkit.terminal.PaintTarget;

+import com.itmill.toolkit.ui.Alignment;

 import com.itmill.toolkit.ui.Button;

 import com.itmill.toolkit.ui.CustomComponent;

 import com.itmill.toolkit.ui.Label;

@@ -54,8 +55,7 @@ public class JavaScriptAPIExample extends CustomComponent {
             }

         });

         main.addComponent(b);

-        main.setComponentAlignment(b, VerticalLayout.ALIGNMENT_RIGHT,

-                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);

+        main.setComponentAlignment(b, Alignment.MIDDLE_RIGHT);

 

         // 

         Label l = new Label(

diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/NotificationExample.java b/src/com/itmill/toolkit/automatedtests/featurebrowser/NotificationExample.java
index 30a86e9ad0..101f3714c7 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/NotificationExample.java
+++ b/src/com/itmill/toolkit/automatedtests/featurebrowser/NotificationExample.java
@@ -6,6 +6,7 @@ package com.itmill.toolkit.automatedtests.featurebrowser;
 
 import com.itmill.toolkit.data.Item;
 import com.itmill.toolkit.ui.AbstractSelect;
+import com.itmill.toolkit.ui.Alignment;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.CustomComponent;
 import com.itmill.toolkit.ui.NativeSelect;
@@ -89,7 +90,6 @@ public class NotificationExample extends CustomComponent {
             }
         });
         main.addComponent(b);
-        main.setComponentAlignment(b, VerticalLayout.ALIGNMENT_RIGHT,
-                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);
+        main.setComponentAlignment(b, Alignment.MIDDLE_RIGHT);
     }
 }
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/RichTextExample.java b/src/com/itmill/toolkit/automatedtests/featurebrowser/RichTextExample.java
index 1ea2fba00d..e5c08f00fa 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/RichTextExample.java
+++ b/src/com/itmill/toolkit/automatedtests/featurebrowser/RichTextExample.java
@@ -4,6 +4,7 @@
 

 package com.itmill.toolkit.automatedtests.featurebrowser;

 

+import com.itmill.toolkit.ui.Alignment;

 import com.itmill.toolkit.ui.Button;

 import com.itmill.toolkit.ui.CustomComponent;

 import com.itmill.toolkit.ui.Label;

@@ -56,8 +57,7 @@ public class RichTextExample extends CustomComponent {
             }

         });

         main.addComponent(b);

-        main.setComponentAlignment(b, VerticalLayout.ALIGNMENT_RIGHT,

-                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);

+        main.setComponentAlignment(b, Alignment.MIDDLE_RIGHT);

     }

 

 }