Removed usage of OL in FB

svn changeset:6314/svn branch:trunk

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/AccordionExample.java b/src/com/itmill/toolkit/demo/featurebrowser/AccordionExample.java
index 67334a74cf926d16e00b0e51796d04601e8a1fc7..8fca3362bebd6e19e53e1e546070feb840e49750 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/AccordionExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/AccordionExample.java
@@ -3,8 +3,8 @@ package com.itmill.toolkit.demo.featurebrowser;
 import com.itmill.toolkit.ui.Accordion;
 import com.itmill.toolkit.ui.CustomComponent;
 import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.TextField;
+import com.itmill.toolkit.ui.VerticalLayout;
 
 /**
  * Accordion is a derivative of TabSheet, a vertical tabbed layout that places
@@ -19,7 +19,7 @@ public class AccordionExample extends CustomComponent {
         // Add a few tabs to the accordion.
         for (int i = 0; i < 5; i++) {
             // Create a root component for a accordion tab
-            OrderedLayout layout = new OrderedLayout();
+            VerticalLayout layout = new VerticalLayout();
             accordion.addComponent(layout);
 
             // The accordion tab label is taken from the caption of the root

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ButtonExample.java b/src/com/itmill/toolkit/demo/featurebrowser/ButtonExample.java
index c92b584b5be88ac85a94e96d6062689045dcda1b..70f6ddfc9d461e6eb5c7b2341499596051d2ce85 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/ButtonExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/ButtonExample.java
@@ -9,10 +9,11 @@ import com.itmill.toolkit.terminal.ThemeResource;
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.CheckBox;\r
 import com.itmill.toolkit.ui.CustomComponent;\r
+import com.itmill.toolkit.ui.HorizontalLayout;\r
 import com.itmill.toolkit.ui.Label;\r
 import com.itmill.toolkit.ui.Link;\r
-import com.itmill.toolkit.ui.OrderedLayout;\r
 import com.itmill.toolkit.ui.Panel;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
 import com.itmill.toolkit.ui.Button.ClickEvent;\r
 \r
 /**\r
@@ -25,12 +26,11 @@ public class ButtonExample extends CustomComponent implements
 \r
     public ButtonExample() {\r
 \r
-        final OrderedLayout main = new OrderedLayout();\r
+        final VerticalLayout main = new VerticalLayout();\r
         main.setMargin(true);\r
         setCompositionRoot(main);\r
 \r
-        final OrderedLayout horiz = new OrderedLayout(\r
-                OrderedLayout.ORIENTATION_HORIZONTAL);\r
+        final HorizontalLayout horiz = new HorizontalLayout();\r
         horiz.setWidth("100%");\r
         main.addComponent(horiz);\r
         final Panel basic = new Panel("Basic buttons");\r

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ClientCachingExample.java b/src/com/itmill/toolkit/demo/featurebrowser/ClientCachingExample.java
index 7f6e6d38f5030d40f8e06186281b680bae5a0b2b..38a759eb55915b860a12bb6dbf0ab130d3f640f8 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/ClientCachingExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/ClientCachingExample.java
@@ -9,8 +9,8 @@ import com.itmill.toolkit.terminal.PaintTarget;
 import com.itmill.toolkit.ui.CustomComponent;\r
 import com.itmill.toolkit.ui.Label;\r
 import com.itmill.toolkit.ui.Layout;\r
-import com.itmill.toolkit.ui.OrderedLayout;\r
 import com.itmill.toolkit.ui.TabSheet;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
 \r
 /**\r
  * This example is a (simple) demonstration of client-side caching. The content\r
@@ -32,7 +32,7 @@ public class ClientCachingExample extends CustomComponent {
 \r
     public ClientCachingExample() {\r
 \r
-        final OrderedLayout main = new OrderedLayout();\r
+        final VerticalLayout main = new VerticalLayout();\r
         main.setMargin(true);\r
         setCompositionRoot(main);\r
 \r
@@ -41,7 +41,7 @@ public class ClientCachingExample extends CustomComponent {
         final TabSheet ts = new TabSheet();\r
         main.addComponent(ts);\r
 \r
-        Layout layout = new OrderedLayout();\r
+        Layout layout = new VerticalLayout();\r
         layout.setMargin(true);\r
         Label l = new Label("This is a normal label, quick to render.");\r
         l.setCaption("A normal label");\r
@@ -49,9 +49,10 @@ public class ClientCachingExample extends CustomComponent {
 \r
         ts.addTab(layout, "Normal", null);\r
 \r
-        layout = new OrderedLayout();\r
+        layout = new VerticalLayout();\r
         layout.setMargin(true);\r
         l = new Label("Slow label - until cached client side.") {\r
+            @Override\r
             public void paintContent(PaintTarget target) throws PaintException {\r
                 try {\r
                     Thread.sleep(3000);\r

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ComboBoxExample.java b/src/com/itmill/toolkit/demo/featurebrowser/ComboBoxExample.java
index 0bcaac2804c9001bad23c76f6c0fcf588479dd07..ee0817c8f8d3b1de9faee303c84f3da3ff41727f 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/ComboBoxExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/ComboBoxExample.java
@@ -8,7 +8,7 @@ import java.util.Random;
 
 import com.itmill.toolkit.ui.ComboBox;
 import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.VerticalLayout;
 import com.itmill.toolkit.ui.AbstractSelect.Filtering;
 
 /**
@@ -27,7 +27,7 @@ public class ComboBoxExample extends CustomComponent {
             "Fielding", "Einstein" };
 
     public ComboBoxExample() {
-        final OrderedLayout main = new OrderedLayout();
+        final VerticalLayout main = new VerticalLayout();
         main.setMargin(true);
         setCompositionRoot(main);
 

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java b/src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java
index 511d83ddfa2f613bd5fd3b7ee6b3771ed61c8991..58f79b17c22bee841e701b219da2ae53e9601261 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java
@@ -10,8 +10,8 @@ import java.net.URL;
 import com.itmill.toolkit.data.Property.ValueChangeEvent;
 import com.itmill.toolkit.terminal.ExternalResource;
 import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.Select;
+import com.itmill.toolkit.ui.VerticalLayout;
 import com.itmill.toolkit.ui.Window.Notification;
 
 /**
@@ -21,7 +21,7 @@ import com.itmill.toolkit.ui.Window.Notification;
  * @author IT Mill Ltd.
  * @see com.itmill.toolkit.ui.Window
  */
-public class EmbeddedBrowserExample extends OrderedLayout implements
+public class EmbeddedBrowserExample extends VerticalLayout implements
         Select.ValueChangeListener {
 
     // Default URL to open.
@@ -74,6 +74,7 @@ public class EmbeddedBrowserExample extends OrderedLayout implements
         if (url != null) {
             try {
                 // the selected url has changed, let's go there
+                @SuppressWarnings("unused")
                 URL u = new URL(url);
                 emb.setSource(new ExternalResource(url));
 

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
index 73ce81f04fc7d7d8fb86856c6d9afd218999f3d5..c0dcadc09af9a4c1534fe47a3f33a6e8409a592a 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
@@ -18,14 +18,15 @@ import com.itmill.toolkit.ui.AbstractSelect;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Embedded;
+import com.itmill.toolkit.ui.HorizontalLayout;
 import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.Select;
 import com.itmill.toolkit.ui.SplitPanel;
 import com.itmill.toolkit.ui.TabSheet;
 import com.itmill.toolkit.ui.Table;
 import com.itmill.toolkit.ui.Tree;
+import com.itmill.toolkit.ui.VerticalLayout;
 import com.itmill.toolkit.ui.Window;
 import com.itmill.toolkit.ui.Button.ClickEvent;
 
@@ -111,6 +112,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
     // END
     };
 
+    @Override
     public void init() {
 
         // Need to set a theme for ThemeResources to work
@@ -196,13 +198,12 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
         table.setImmediate(true);
         split2.addComponent(table);
 
-        final OrderedLayout exp = new OrderedLayout();
+        final VerticalLayout exp = new VerticalLayout();
         exp.setSizeFull();
         exp.setMargin(true);
         split2.addComponent(exp);
 
-        final OrderedLayout wbLayout = new OrderedLayout(
-                OrderedLayout.ORIENTATION_HORIZONTAL);
+        final HorizontalLayout wbLayout = new HorizontalLayout();
         Button b = new Button("Open in sub-window", new Button.ClickListener() {
             public void buttonClick(ClickEvent event) {
                 Component component = (Component) ts.getComponentIterator()
@@ -257,8 +258,8 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
         wbLayout.addComponent(b);
 
         exp.addComponent(wbLayout);
-        exp.setComponentAlignment(wbLayout, OrderedLayout.ALIGNMENT_RIGHT,
-                OrderedLayout.ALIGNMENT_TOP);
+        exp.setComponentAlignment(wbLayout, VerticalLayout.ALIGNMENT_RIGHT,
+                VerticalLayout.ALIGNMENT_TOP);
 
         ts = new TabSheet();
         ts.setSizeFull();
@@ -271,8 +272,8 @@ 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, OrderedLayout.ALIGNMENT_RIGHT,
-                OrderedLayout.ALIGNMENT_VERTICAL_CENTER);
+        exp.setComponentAlignment(status, VerticalLayout.ALIGNMENT_RIGHT,
+                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);
 
         // select initial section ("All")
         tree.setValue(rootId);

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java b/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java
index a599f579ec7617c8eeded1354081186a32068e0c..0028f6a2b50d659e6183717ae283c56713160ef2 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java
@@ -9,8 +9,9 @@ import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.CustomComponent;
 import com.itmill.toolkit.ui.Field;
 import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.HorizontalLayout;
 import com.itmill.toolkit.ui.TextField;
+import com.itmill.toolkit.ui.VerticalLayout;
 import com.itmill.toolkit.ui.Button.ClickEvent;
 
 /**
@@ -51,7 +52,7 @@ public class FormExample extends CustomComponent {
                         + "(Address is required but failing to give it a value does not display an error.)");
 
         // Layout the example
-        OrderedLayout root = new OrderedLayout();
+        VerticalLayout root = new VerticalLayout();
         root.setMargin(true);
         root.setSpacing(true);
         root.addComponent(form);
@@ -71,8 +72,7 @@ public class FormExample extends CustomComponent {
             // Add Commit and Discard controls to the form.
             Button commit = new Button("Save", this, "commit");
             Button discard = new Button("Reset", this, "discard");
-            OrderedLayout footer = new OrderedLayout(
-                    OrderedLayout.ORIENTATION_HORIZONTAL);
+            HorizontalLayout footer = new HorizontalLayout();
             footer.addComponent(commit);
             footer.addComponent(discard);
             setFooter(footer);
@@ -116,6 +116,7 @@ public class FormExample extends CustomComponent {
      */
     static class MyFieldFactory extends BaseFieldFactory {
 
+        @Override
         public Field createField(Item item, Object propertyId,
                 Component uiContext) {
 

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/GeneratedColumnExample.java b/src/com/itmill/toolkit/demo/featurebrowser/GeneratedColumnExample.java
index 57c6ad3caf1f1fec500e7959af542479894a7dd0..d76e3b23304eef73315f7a74b048cd2c9964b6f4 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/GeneratedColumnExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/GeneratedColumnExample.java
@@ -19,10 +19,10 @@ import com.itmill.toolkit.ui.BaseFieldFactory;
 import com.itmill.toolkit.ui.CheckBox;
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.ExpandLayout;
 import com.itmill.toolkit.ui.Field;
 import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.Table;
+import com.itmill.toolkit.ui.VerticalLayout;
 import com.itmill.toolkit.ui.Button.ClickEvent;
 import com.itmill.toolkit.ui.Button.ClickListener;
 
@@ -408,6 +408,7 @@ public class GeneratedColumnExample extends CustomComponent {
 
     /** Table column generator for calculating daily cost column. */
     class DailyCostColumnGenerator extends ConsumptionColumnGenerator {
+        @Override
         public Component generateCell(FillUp fillup, FillUp prev) {
             double dailycost = fillup.dailyCost(prev);
 
@@ -426,6 +427,7 @@ public class GeneratedColumnExample extends CustomComponent {
      * Custom field factory that sets the fields as immediate.
      */
     public class ImmediateFieldFactory extends BaseFieldFactory {
+        @Override
         public Field createField(Class type, Component uiContext) {
             // Let the BaseFieldFactory create the fields
             Field field = super.createField(type, uiContext);
@@ -536,7 +538,7 @@ public class GeneratedColumnExample extends CustomComponent {
 
         table.setHeight("300px");
 
-        ExpandLayout layout = new ExpandLayout();
+        VerticalLayout layout = new VerticalLayout();
         layout.setMargin(true);
         layout
                 .addComponent(new Label(
@@ -546,7 +548,7 @@ public class GeneratedColumnExample extends CustomComponent {
         layout.addComponent(new Label(
                 "Columns displayed in blue are calculated from Quantity and Total. "
                         + "Others are simply formatted."));
-        layout.expand(table);
+        layout.setExpandRatio(table, 1);
         layout.setSizeUndefined();
         setCompositionRoot(layout);
         // setSizeFull();

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/JavaScriptAPIExample.java b/src/com/itmill/toolkit/demo/featurebrowser/JavaScriptAPIExample.java
index 42615d112a32cf37575c691191faf986716099f0..8ffcf04e9dd7ab8ac4ad5405774cdbaa1c40fd04 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/JavaScriptAPIExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/JavaScriptAPIExample.java
@@ -11,8 +11,8 @@ import com.itmill.toolkit.terminal.PaintTarget;
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.CustomComponent;\r
 import com.itmill.toolkit.ui.Label;\r
-import com.itmill.toolkit.ui.OrderedLayout;\r
 import com.itmill.toolkit.ui.TextField;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
 import com.itmill.toolkit.ui.Button.ClickEvent;\r
 \r
 /**\r
@@ -23,13 +23,13 @@ public class JavaScriptAPIExample extends CustomComponent {
 \r
     public static final String txt = "<p>For advanced client side programmers Toolkit offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:itmill.forceSync();\">javascript:itmill.forceSync();</A>";\r
 \r
-    private final OrderedLayout main;\r
+    private final VerticalLayout main;\r
     private final Label l;\r
     private final TextField editor = new TextField();\r
 \r
     public JavaScriptAPIExample() {\r
         // main layout\r
-        main = new OrderedLayout();\r
+        main = new VerticalLayout();\r
         main.setMargin(true);\r
         setCompositionRoot(main);\r
         editor.setRows(7);\r
@@ -54,8 +54,8 @@ public class JavaScriptAPIExample extends CustomComponent {
             }\r
         });\r
         main.addComponent(b);\r
-        main.setComponentAlignment(b, OrderedLayout.ALIGNMENT_RIGHT,\r
-                OrderedLayout.ALIGNMENT_VERTICAL_CENTER);\r
+        main.setComponentAlignment(b, VerticalLayout.ALIGNMENT_RIGHT,\r
+                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);\r
 \r
         // \r
         Label l = new Label(\r
@@ -63,6 +63,7 @@ public class JavaScriptAPIExample extends CustomComponent {
                         + "The client will be synchronized on reload, when you click a button, "\r
                         + "or when itmill.forceSync() is called.") {\r
 \r
+            @Override\r
             public void paintContent(PaintTarget target) throws PaintException {\r
 \r
                 super.paintContent(target);\r
@@ -82,6 +83,7 @@ public class JavaScriptAPIExample extends CustomComponent {
             label = l;\r
         }\r
 \r
+        @Override\r
         public void run() {\r
             try {\r
                 Thread.sleep(500);\r

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java b/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java
index a48d3f7bac4047bab9d024e8a38242f4a06bc0e9..337a647ca50308447a238d49ea2ab7c98fd084e4 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java
@@ -6,10 +6,11 @@ package com.itmill.toolkit.demo.featurebrowser;
 \r
 import com.itmill.toolkit.ui.CustomComponent;\r
 import com.itmill.toolkit.ui.GridLayout;\r
+import com.itmill.toolkit.ui.HorizontalLayout;\r
 import com.itmill.toolkit.ui.Label;\r
-import com.itmill.toolkit.ui.OrderedLayout;\r
 import com.itmill.toolkit.ui.Panel;\r
 import com.itmill.toolkit.ui.TabSheet;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
 \r
 /**\r
  * A few examples of layout possibilities.\r
@@ -20,7 +21,7 @@ public class LayoutExample extends CustomComponent {
 \r
     public LayoutExample() {\r
 \r
-        final OrderedLayout main = new OrderedLayout();\r
+        final VerticalLayout main = new VerticalLayout();\r
         main.setMargin(true);\r
         setCompositionRoot(main);\r
 \r
@@ -43,19 +44,19 @@ public class LayoutExample extends CustomComponent {
         TabSheet ts = new TabSheet();\r
         g.addComponent(ts, 0, 1, 1, 1);\r
 \r
-        OrderedLayout ol = new OrderedLayout();\r
+        VerticalLayout ol = new VerticalLayout();\r
         ol.setMargin(true);\r
         ol.addComponent(new Label("Component 1"));\r
         ol.addComponent(new Label("Component 2"));\r
         ol.addComponent(new Label("Component 3"));\r
         ts.addTab(ol, "Vertical OrderedLayout", null);\r
 \r
-        ol = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL);\r
-        ol.setMargin(true);\r
-        ol.addComponent(new Label("Component 1"));\r
-        ol.addComponent(new Label("Component 2"));\r
-        ol.addComponent(new Label("Component 3"));\r
-        ts.addTab(ol, "Horizontal OrderedLayout", null);\r
+        HorizontalLayout hl = new HorizontalLayout();\r
+        hl.setMargin(true);\r
+        hl.addComponent(new Label("Component 1"));\r
+        hl.addComponent(new Label("Component 2"));\r
+        hl.addComponent(new Label("Component 3"));\r
+        ts.addTab(hl, "Horizontal OrderedLayout", null);\r
 \r
         final GridLayout gl = new GridLayout(3, 3);\r
         gl.setMargin(true);\r

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java b/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java
index 695a0310b6cd53d1d913331434ffcfbebb53c54b..c7c77b316482722780c83129b0dea817ce45604a 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java
@@ -9,9 +9,9 @@ import com.itmill.toolkit.ui.AbstractSelect;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.CustomComponent;
 import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.RichTextArea;
 import com.itmill.toolkit.ui.TextField;
+import com.itmill.toolkit.ui.VerticalLayout;
 import com.itmill.toolkit.ui.Window;
 import com.itmill.toolkit.ui.Button.ClickEvent;
 import com.itmill.toolkit.ui.Button.ClickListener;
@@ -37,7 +37,7 @@ public class NotificationExample extends CustomComponent {
      */
     public NotificationExample() {
         // Main layout
-        final OrderedLayout main = new OrderedLayout();
+        final VerticalLayout main = new VerticalLayout();
         main.setSizeUndefined();
         main.setSpacing(true);
         main.setMargin(true); // use theme-specific margin
@@ -89,7 +89,7 @@ public class NotificationExample extends CustomComponent {
             }
         });
         main.addComponent(b);
-        main.setComponentAlignment(b, OrderedLayout.ALIGNMENT_RIGHT,
-                OrderedLayout.ALIGNMENT_VERTICAL_CENTER);
+        main.setComponentAlignment(b, VerticalLayout.ALIGNMENT_RIGHT,
+                VerticalLayout.ALIGNMENT_VERTICAL_CENTER);
     }
 }

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/TableExample.java b/src/com/itmill/toolkit/demo/featurebrowser/TableExample.java
index ce3aa79b8c8da14c91da21a1088feddbad6c6221..7646879e3fb675e3497a5359b28a008a589f343d 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/TableExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/TableExample.java
@@ -14,9 +14,10 @@ import com.itmill.toolkit.event.Action;
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.CheckBox;\r
 import com.itmill.toolkit.ui.CustomComponent;\r
-import com.itmill.toolkit.ui.OrderedLayout;\r
+import com.itmill.toolkit.ui.HorizontalLayout;\r
 import com.itmill.toolkit.ui.TabSheet;\r
 import com.itmill.toolkit.ui.Table;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
 import com.itmill.toolkit.ui.Button.ClickEvent;\r
 \r
 /**\r
@@ -51,7 +52,7 @@ public class TableExample extends CustomComponent implements Action.Handler,
     Button deselect;\r
 \r
     public TableExample() {\r
-        OrderedLayout margin = new OrderedLayout();\r
+        VerticalLayout margin = new VerticalLayout();\r
         margin.setMargin(true);\r
 \r
         TabSheet root = new TabSheet();\r
@@ -59,7 +60,7 @@ public class TableExample extends CustomComponent implements Action.Handler,
         margin.addComponent(root);\r
 \r
         // main layout\r
-        final OrderedLayout main = new OrderedLayout();\r
+        final VerticalLayout main = new VerticalLayout();\r
         root.addComponent(main);\r
         main.setCaption("Basic Table");\r
         main.setMargin(true);\r
@@ -67,7 +68,7 @@ public class TableExample extends CustomComponent implements Action.Handler,
         // "source" table with bells & whistlesenabled\r
         source = new Table("All creatures");\r
         source.setPageLength(7);\r
-        source.setWidth(550);\r
+        source.setWidth("550px");\r
         source.setColumnCollapsingAllowed(true);\r
         source.setColumnReorderingAllowed(true);\r
         source.setSelectable(true);\r
@@ -78,8 +79,8 @@ public class TableExample extends CustomComponent implements Action.Handler,
         main.addComponent(source);\r
 \r
         // x-selected button row\r
-        final OrderedLayout horiz = new OrderedLayout(\r
-                OrderedLayout.ORIENTATION_HORIZONTAL);\r
+        final HorizontalLayout horiz = new HorizontalLayout();\r
+\r
         horiz.setMargin(false, false, true, false);\r
         main.addComponent(horiz);\r
         saveSelected = new Button("Save selected");\r
@@ -111,7 +112,7 @@ public class TableExample extends CustomComponent implements Action.Handler,
         // "saved" table, minimalistic\r
         saved = new Table("Saved creatures");\r
         saved.setPageLength(5);\r
-        saved.setWidth(550);\r
+        saved.setWidth("550px");\r
         saved.setSelectable(false);\r
         saved.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN);\r
         saved.setRowHeaderMode(Table.ROW_HEADER_MODE_ID);\r

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java b/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java
index e7611353e4cbb91f1e5bb9cb7e9a82669e7cb999..c86e7bd94e5da2102a69279d7af3609b0f77f284 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java
@@ -10,8 +10,8 @@ import com.itmill.toolkit.data.Property.ValueChangeEvent;
 import com.itmill.toolkit.event.Action;
 import com.itmill.toolkit.ui.AbstractSelect;
 import com.itmill.toolkit.ui.CustomComponent;
+import com.itmill.toolkit.ui.HorizontalLayout;
 import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.Panel;
 import com.itmill.toolkit.ui.TextField;
 import com.itmill.toolkit.ui.Tree;
@@ -37,8 +37,7 @@ public class TreeExample extends CustomComponent implements Action.Handler,
     TextField editor;
 
     public TreeExample() {
-        final OrderedLayout main = new OrderedLayout(
-                OrderedLayout.ORIENTATION_HORIZONTAL);
+        final HorizontalLayout main = new HorizontalLayout();
         main.setWidth("100%");
         main.setMargin(true);
         setCompositionRoot(main);

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java b/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java
index 646fea2428207e76578ec1fb39d7f26b636d0940..eb6b880fbb638d4b89ecc4e0b48ab732dfb36618 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java
@@ -8,11 +8,12 @@ import com.itmill.toolkit.data.Property.ValueChangeEvent;
 import com.itmill.toolkit.ui.CustomComponent;\r
 import com.itmill.toolkit.ui.DateField;\r
 import com.itmill.toolkit.ui.Field;\r
+import com.itmill.toolkit.ui.HorizontalLayout;\r
 import com.itmill.toolkit.ui.InlineDateField;\r
-import com.itmill.toolkit.ui.OrderedLayout;\r
 import com.itmill.toolkit.ui.Panel;\r
 import com.itmill.toolkit.ui.Slider;\r
 import com.itmill.toolkit.ui.TextField;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
 import com.itmill.toolkit.ui.Window.Notification;\r
 \r
 /**\r
@@ -23,7 +24,7 @@ import com.itmill.toolkit.ui.Window.Notification;
 public class ValueInputExample extends CustomComponent {\r
 \r
     public ValueInputExample() {\r
-        final OrderedLayout main = new OrderedLayout();\r
+        final VerticalLayout main = new VerticalLayout();\r
         main.setMargin(true);\r
         setCompositionRoot(main);\r
 \r
@@ -37,8 +38,7 @@ public class ValueInputExample extends CustomComponent {
         };\r
 \r
         // TextField\r
-        OrderedLayout horiz = new OrderedLayout(\r
-                OrderedLayout.ORIENTATION_HORIZONTAL);\r
+        HorizontalLayout horiz = new HorizontalLayout();\r
         horiz.setWidth("100%");\r
         main.addComponent(horiz);\r
         Panel left = new Panel("TextField");\r
@@ -62,7 +62,7 @@ public class ValueInputExample extends CustomComponent {
         right.addComponent(tf);\r
 \r
         // DateFields\r
-        horiz = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL);\r
+        horiz = new HorizontalLayout();\r
         horiz.setWidth("100%");\r
         main.addComponent(horiz);\r
         left = new Panel("DateField");\r

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/WindowingExample.java b/src/com/itmill/toolkit/demo/featurebrowser/WindowingExample.java
index 99be884f4fc1a02dc5317a86d38fd5b9b098bf09..76c711d73b2a2b4cc08018ee221af840012d6832 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/WindowingExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/WindowingExample.java
@@ -10,7 +10,7 @@ import com.itmill.toolkit.terminal.ExternalResource;
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.CustomComponent;\r
 import com.itmill.toolkit.ui.Label;\r
-import com.itmill.toolkit.ui.OrderedLayout;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
 import com.itmill.toolkit.ui.Window;\r
 import com.itmill.toolkit.ui.Button.ClickEvent;\r
 \r
@@ -38,7 +38,7 @@ public class WindowingExample extends CustomComponent {
     private URL windowUrl = null;\r
 \r
     public WindowingExample() {\r
-        final OrderedLayout main = new OrderedLayout();\r
+        final VerticalLayout main = new VerticalLayout();\r
         main.setMargin(true);\r
         setCompositionRoot(main);\r
 \r