Use Alignment.* constants instead of layout-specific *Layout.ALIGNMENT_* constants...

svn changeset:6494/svn branch:trunk

diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java
index 499aa60f15253ea8c1ff5bd7f4f122eee14c672d..5edbca6ea23f5bb50a0d796a8a14a1b19fb120ad 100644 (file)
--- 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 1f7825d661b960438d41a8b94af822787fcf0dd6..902eef0446f759eb57fef46be8d32b7ab02328ae 100644 (file)
--- 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;
 \r
 import com.itmill.toolkit.terminal.PaintException;\r
 import com.itmill.toolkit.terminal.PaintTarget;\r
+import com.itmill.toolkit.ui.Alignment;\r
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.CustomComponent;\r
 import com.itmill.toolkit.ui.Label;\r
@@ -54,8 +55,7 @@ public class JavaScriptAPIExample extends CustomComponent {
             }\r
         });\r
         main.addComponent(b);\r
-        main.setComponentAlignment(b, VerticalLayout.ALIGNMENT_RIGHT,\r
-                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);\r
+        main.setComponentAlignment(b, Alignment.MIDDLE_RIGHT);\r
 \r
         // \r
         Label l = new Label(\r

diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/NotificationExample.java b/src/com/itmill/toolkit/automatedtests/featurebrowser/NotificationExample.java
index 30a86e9ad0e224b67614a02645327d983f9c724f..101f3714c7c6270755380062d00ee28079d6db8d 100644 (file)
--- 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 1ea2fba00d14b38e27a9e91c1847575207564bde..e5c08f00fab0a68991711ff5b0e0634323663366 100644 (file)
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/RichTextExample.java
+++ b/src/com/itmill/toolkit/automatedtests/featurebrowser/RichTextExample.java
@@ -4,6 +4,7 @@
 \r
 package com.itmill.toolkit.automatedtests.featurebrowser;\r
 \r
+import com.itmill.toolkit.ui.Alignment;\r
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.CustomComponent;\r
 import com.itmill.toolkit.ui.Label;\r
@@ -56,8 +57,7 @@ public class RichTextExample extends CustomComponent {
             }\r
         });\r
         main.addComponent(b);\r
-        main.setComponentAlignment(b, VerticalLayout.ALIGNMENT_RIGHT,\r
-                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);\r
+        main.setComponentAlignment(b, Alignment.MIDDLE_RIGHT);\r
     }\r
 \r
 }\r

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
index c0dcadc09af9a4c1534fe47a3f33a6e8409a592a..b717cc17ca628afbeaa059803af15e13da28305a 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/demo/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;
@@ -258,8 +259,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();
@@ -272,8 +272,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/demo/featurebrowser/JavaScriptAPIExample.java b/src/com/itmill/toolkit/demo/featurebrowser/JavaScriptAPIExample.java
index 8ffcf04e9dd7ab8ac4ad5405774cdbaa1c40fd04..44dad1a19376ef6985a9bd1be3e22d48402eb882 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/JavaScriptAPIExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/JavaScriptAPIExample.java
@@ -8,6 +8,7 @@ import java.util.Date;
 \r
 import com.itmill.toolkit.terminal.PaintException;\r
 import com.itmill.toolkit.terminal.PaintTarget;\r
+import com.itmill.toolkit.ui.Alignment;\r
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.CustomComponent;\r
 import com.itmill.toolkit.ui.Label;\r
@@ -54,8 +55,7 @@ public class JavaScriptAPIExample extends CustomComponent {
             }\r
         });\r
         main.addComponent(b);\r
-        main.setComponentAlignment(b, VerticalLayout.ALIGNMENT_RIGHT,\r
-                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);\r
+        main.setComponentAlignment(b, Alignment.MIDDLE_RIGHT);\r
 \r
         // \r
         Label l = new Label(\r

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java b/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java
index c7c77b316482722780c83129b0dea817ce45604a..98480baaa46bdb556f7e7e2c246e140210d8bb6b 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java
@@ -6,6 +6,7 @@ package com.itmill.toolkit.demo.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/demo/featurebrowser/RichTextExample.java b/src/com/itmill/toolkit/demo/featurebrowser/RichTextExample.java
index e38ad6cb135057b5990d9fa6209a5632100cfbc6..2bced566a13ed58f96fd8f0853537f92c3f3a545 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/RichTextExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/RichTextExample.java
@@ -4,6 +4,7 @@
 \r
 package com.itmill.toolkit.demo.featurebrowser;\r
 \r
+import com.itmill.toolkit.ui.Alignment;\r
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.CustomComponent;\r
 import com.itmill.toolkit.ui.Label;\r
@@ -56,8 +57,7 @@ public class RichTextExample extends CustomComponent {
             }\r
         });\r
         main.addComponent(b);\r
-        main.setComponentAlignment(b, VerticalLayout.ALIGNMENT_RIGHT,\r
-                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);\r
+        main.setComponentAlignment(b, Alignment.MIDDLE_RIGHT);\r
     }\r
 \r
 }\r

diff --git a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
index 6c7ce5b9a0e41f3323133c6402395a94d0890b52..0cd7dfde032ecddd85d9f488b131bbc2b8ccfe31 100644 (file)
--- a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
+++ b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
@@ -16,6 +16,7 @@ import com.itmill.toolkit.data.Container;
 import com.itmill.toolkit.data.Item;\r
 import com.itmill.toolkit.data.Property.ValueChangeEvent;\r
 import com.itmill.toolkit.data.Property.ValueChangeListener;\r
+import com.itmill.toolkit.ui.Alignment;\r
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.Label;\r
 import com.itmill.toolkit.ui.OrderedLayout;\r
@@ -106,9 +107,7 @@ public class ReservationApplication extends Application {
         reservationButton = new Button("Make reservation", this,\r
                 "makeReservation");\r
         infoLayout.addComponent(reservationButton);\r
-        infoLayout.setComponentAlignment(reservationButton,\r
-                OrderedLayout.ALIGNMENT_HORIZONTAL_CENTER,\r
-                OrderedLayout.ALIGNMENT_VERTICAL_CENTER);\r
+        infoLayout.setComponentAlignment(reservationButton, Alignment.MIDDLE_CENTER);\r
 \r
         map = new GoogleMap();\r
         map.setWidth("250px");\r

diff --git a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
index 13d09bd6d14f67e6397ec2f66b302f7a462a1cb3..10dd8ebabed043ea1f59c21bc729187bb93e6ea6 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
+++ b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
@@ -17,6 +17,7 @@ import com.itmill.toolkit.terminal.ClassResource;
 import com.itmill.toolkit.terminal.ExternalResource;
 import com.itmill.toolkit.terminal.Resource;
 import com.itmill.toolkit.terminal.ThemeResource;
+import com.itmill.toolkit.ui.Alignment;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.ComboBox;
 import com.itmill.toolkit.ui.Component;
@@ -175,15 +176,12 @@ public class SamplerApplication extends Application {
             // Upper left logo
             Component logo = createLogo();
             nav.addComponent(logo);
-            nav.setComponentAlignment(logo, HorizontalLayout.ALIGNMENT_LEFT,
-                    HorizontalLayout.ALIGNMENT_VERTICAL_CENTER);
+            nav.setComponentAlignment(logo, Alignment.MIDDLE_LEFT);
 
             // Breadcrumbs
             nav.addComponent(breadcrumbs);
             nav.setExpandRatio(breadcrumbs, 1);
-            nav.setComponentAlignment(breadcrumbs,
-                    HorizontalLayout.ALIGNMENT_LEFT,
-                    HorizontalLayout.ALIGNMENT_VERTICAL_CENTER);
+            nav.setComponentAlignment(breadcrumbs, Alignment.MIDDLE_LEFT);
 
             // invisible analytics -component
             nav.addComponent(webAnalytics);
@@ -200,20 +198,17 @@ public class SamplerApplication extends Application {
             // Previous sample
             Button b = createPrevButton();
             nav.addComponent(b);
-            nav.setComponentAlignment(b, HorizontalLayout.ALIGNMENT_LEFT,
-                    HorizontalLayout.ALIGNMENT_VERTICAL_CENTER);
+            nav.setComponentAlignment(b, Alignment.MIDDLE_LEFT);
             // Next sample
             b = createNextButton();
             nav.addComponent(b);
-            nav.setComponentAlignment(b, HorizontalLayout.ALIGNMENT_LEFT,
-                    HorizontalLayout.ALIGNMENT_VERTICAL_CENTER);
+            nav.setComponentAlignment(b, Alignment.MIDDLE_LEFT);
 
             // "Search" combobox
             // TODO add input prompt
             Component search = createSearch();
             nav.addComponent(search);
-            nav.setComponentAlignment(search, HorizontalLayout.ALIGNMENT_LEFT,
-                    HorizontalLayout.ALIGNMENT_VERTICAL_CENTER);
+            nav.setComponentAlignment(search, Alignment.MIDDLE_LEFT);
 
             // togglebar
             mainExpand.addComponent(toggleBar);
@@ -240,16 +235,12 @@ public class SamplerApplication extends Application {
             Component treeSwitch = createTreeSwitch();
             toggleBar.addComponent(treeSwitch);
             toggleBar.setExpandRatio(treeSwitch, 1);
-            toggleBar.setComponentAlignment(treeSwitch,
-                    HorizontalLayout.ALIGNMENT_RIGHT,
-                    HorizontalLayout.ALIGNMENT_VERTICAL_CENTER);
+            toggleBar.setComponentAlignment(treeSwitch, Alignment.MIDDLE_RIGHT);
 
             // List/grid/coverflow
             Component mode = createModeSwitch();
             toggleBar.addComponent(mode);
-            toggleBar.setComponentAlignment(mode,
-                    HorizontalLayout.ALIGNMENT_RIGHT,
-                    HorizontalLayout.ALIGNMENT_VERTICAL_CENTER);
+            toggleBar.setComponentAlignment(mode, Alignment.MIDDLE_RIGHT);
 
         }
 
@@ -648,15 +639,11 @@ public class SamplerApplication extends Application {
                         grid.setRows(grid.getCursorY() + 1);
                         grid.addComponent(title, 0, grid.getCursorY(), grid
                                 .getColumns() - 1, grid.getCursorY());
-                        grid.setComponentAlignment(title,
-                                GridLayout.ALIGNMENT_LEFT,
-                                GridLayout.ALIGNMENT_VERTICAL_CENTER);
+                        grid.setComponentAlignment(title, Alignment.MIDDLE_LEFT);
                     } else {
                         title.setStyleName("subsection");
                         grid.addComponent(title);
-                        grid.setComponentAlignment(title,
-                                GridLayout.ALIGNMENT_LEFT,
-                                GridLayout.ALIGNMENT_TOP);
+                        grid.setComponentAlignment(title, Alignment.MIDDLE_LEFT);
                     }
 
                 } else {

diff --git a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java
index 8d4a01e31615c7f61e8256addcbd1877f9727e4d..0d590e3a29e176686d21f536f89cf1712cf34a82 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java
@@ -1,5 +1,6 @@
 package com.itmill.toolkit.demo.sampler.features.blueprints;
 
+import com.itmill.toolkit.ui.Alignment;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.Button.ClickEvent;
@@ -33,8 +34,7 @@ public class ProminentPrimaryActionExample extends OrderedLayout implements
             Button secondary = new Button("or Sign in", this);
             secondary.setStyleName(Button.STYLE_LINK);
             horiz.addComponent(secondary);
-            horiz.setComponentAlignment(secondary, ALIGNMENT_LEFT,
-                    ALIGNMENT_VERTICAL_CENTER);
+            horiz.setComponentAlignment(secondary, Alignment.MIDDLE_LEFT);
         }
 
         { // Login / Forgot password?
@@ -45,14 +45,11 @@ public class ProminentPrimaryActionExample extends OrderedLayout implements
             addComponent(vert);
             Button primary = new Button("Login", this);
             vert.addComponent(primary);
-            vert.setComponentAlignment(primary, OrderedLayout.ALIGNMENT_RIGHT,
-                    OrderedLayout.ALIGNMENT_BOTTOM);
+            vert.setComponentAlignment(primary, Alignment.BOTTOM_RIGHT);
             Button secondary = new Button("Forgot your password?", this);
             secondary.setStyleName(Button.STYLE_LINK);
             vert.addComponent(secondary);
-            vert.setComponentAlignment(secondary,
-                    OrderedLayout.ALIGNMENT_RIGHT,
-                    OrderedLayout.ALIGNMENT_BOTTOM);
+            vert.setComponentAlignment(secondary, Alignment.BOTTOM_RIGHT);
         }
 
     }

diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustomExample.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustomExample.java
index 486315610649a4ece79d7d59b3a61f2dacdd3943..c56cfdab9666ddc33423f4c717a93fc94a48286d 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustomExample.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustomExample.java
@@ -2,6 +2,7 @@ package com.itmill.toolkit.demo.sampler.features.notifications;
 
 import com.itmill.toolkit.data.Item;
 import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.ui.Alignment;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.NativeSelect;
 import com.itmill.toolkit.ui.OrderedLayout;
@@ -73,7 +74,7 @@ public class NotificationCustomExample extends OrderedLayout {
                     }
                 });
         addComponent(show);
-        setComponentAlignment(show, ALIGNMENT_RIGHT, ALIGNMENT_VERTICAL_CENTER);
+        setComponentAlignment(show, Alignment.MIDDLE_RIGHT);
 
     }
 

diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationErrorExample.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationErrorExample.java
index e8442e654e6e0d1a50f6d1e689dbc82e982eb78c..066a52d7273c78541469973492ac26a1f3885923 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationErrorExample.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationErrorExample.java
@@ -1,5 +1,6 @@
 package com.itmill.toolkit.demo.sampler.features.notifications;
 
+import com.itmill.toolkit.ui.Alignment;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.TextField;
@@ -34,7 +35,7 @@ public class NotificationErrorExample extends OrderedLayout {
                     }
                 });
         addComponent(show);
-        setComponentAlignment(show, ALIGNMENT_RIGHT, ALIGNMENT_VERTICAL_CENTER);
+        setComponentAlignment(show, Alignment.MIDDLE_RIGHT);
 
     }
 }

diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanizedExample.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanizedExample.java
index 11e904391c686ba35f15b8918e443a02c39113c1..3a65f04f65dc268579af123c64a4c4a4c4973f96 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanizedExample.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanizedExample.java
@@ -1,5 +1,6 @@
 package com.itmill.toolkit.demo.sampler.features.notifications;
 
+import com.itmill.toolkit.ui.Alignment;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.TextField;
@@ -29,7 +30,7 @@ public class NotificationHumanizedExample extends OrderedLayout {
                     }
                 });
         addComponent(show);
-        setComponentAlignment(show, ALIGNMENT_RIGHT, ALIGNMENT_VERTICAL_CENTER);
+        setComponentAlignment(show, Alignment.MIDDLE_RIGHT);
 
     }
 }

diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTrayExample.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTrayExample.java
index a22feb5cc5bc204f2bb57559af601291a9c1120e..414bb7bc599cc9d64bc8005d7145943fff272959 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTrayExample.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTrayExample.java
@@ -1,5 +1,6 @@
 package com.itmill.toolkit.demo.sampler.features.notifications;
 
+import com.itmill.toolkit.ui.Alignment;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.TextField;
@@ -31,7 +32,7 @@ public class NotificationTrayExample extends OrderedLayout {
                     }
                 });
         addComponent(show);
-        setComponentAlignment(show, ALIGNMENT_RIGHT, ALIGNMENT_VERTICAL_CENTER);
+        setComponentAlignment(show, Alignment.MIDDLE_RIGHT);
 
     }
 }

diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarningExample.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarningExample.java
index e5fd3f43d51267b508785c4898901a67d8409e05..462b2acd83ec9975689bac76ac19b01098237eaf 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarningExample.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarningExample.java
@@ -1,5 +1,6 @@
 package com.itmill.toolkit.demo.sampler.features.notifications;
 
+import com.itmill.toolkit.ui.Alignment;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.TextField;
@@ -31,7 +32,7 @@ public class NotificationWarningExample extends OrderedLayout {
                     }
                 });
         addComponent(show);
-        setComponentAlignment(show, ALIGNMENT_RIGHT, ALIGNMENT_VERTICAL_CENTER);
+        setComponentAlignment(show, Alignment.MIDDLE_RIGHT);
 
     }
 }