diff options
15 files changed, 73 insertions, 64 deletions
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/AccordionExample.java b/src/com/itmill/toolkit/demo/featurebrowser/AccordionExample.java index 67334a74cf..8fca3362be 100644 --- 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 c92b584b5b..70f6ddfc9d 100644 --- 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;
import com.itmill.toolkit.ui.CheckBox;
import com.itmill.toolkit.ui.CustomComponent;
+import com.itmill.toolkit.ui.HorizontalLayout;
import com.itmill.toolkit.ui.Label;
import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.OrderedLayout;
import com.itmill.toolkit.ui.Panel;
+import com.itmill.toolkit.ui.VerticalLayout;
import com.itmill.toolkit.ui.Button.ClickEvent;
/**
@@ -25,12 +26,11 @@ public class ButtonExample extends CustomComponent implements public ButtonExample() {
- final OrderedLayout main = new OrderedLayout();
+ final VerticalLayout main = new VerticalLayout();
main.setMargin(true);
setCompositionRoot(main);
- final OrderedLayout horiz = new OrderedLayout(
- OrderedLayout.ORIENTATION_HORIZONTAL);
+ final HorizontalLayout horiz = new HorizontalLayout();
horiz.setWidth("100%");
main.addComponent(horiz);
final Panel basic = new Panel("Basic buttons");
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ClientCachingExample.java b/src/com/itmill/toolkit/demo/featurebrowser/ClientCachingExample.java index 7f6e6d38f5..38a759eb55 100644 --- 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;
import com.itmill.toolkit.ui.Label;
import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
import com.itmill.toolkit.ui.TabSheet;
+import com.itmill.toolkit.ui.VerticalLayout;
/**
* This example is a (simple) demonstration of client-side caching. The content
@@ -32,7 +32,7 @@ public class ClientCachingExample extends CustomComponent { public ClientCachingExample() {
- final OrderedLayout main = new OrderedLayout();
+ final VerticalLayout main = new VerticalLayout();
main.setMargin(true);
setCompositionRoot(main);
@@ -41,7 +41,7 @@ public class ClientCachingExample extends CustomComponent { final TabSheet ts = new TabSheet();
main.addComponent(ts);
- Layout layout = new OrderedLayout();
+ Layout layout = new VerticalLayout();
layout.setMargin(true);
Label l = new Label("This is a normal label, quick to render.");
l.setCaption("A normal label");
@@ -49,9 +49,10 @@ public class ClientCachingExample extends CustomComponent { ts.addTab(layout, "Normal", null);
- layout = new OrderedLayout();
+ layout = new VerticalLayout();
layout.setMargin(true);
l = new Label("Slow label - until cached client side.") {
+ @Override
public void paintContent(PaintTarget target) throws PaintException {
try {
Thread.sleep(3000);
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ComboBoxExample.java b/src/com/itmill/toolkit/demo/featurebrowser/ComboBoxExample.java index 0bcaac2804..ee0817c8f8 100644 --- 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 511d83ddfa..58f79b17c2 100644 --- 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 73ce81f04f..c0dcadc09a 100644 --- 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 a599f579ec..0028f6a2b5 100644 --- 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 57c6ad3caf..d76e3b2330 100644 --- 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 42615d112a..8ffcf04e9d 100644 --- 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;
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;
import com.itmill.toolkit.ui.Button.ClickEvent;
/**
@@ -23,13 +23,13 @@ public class JavaScriptAPIExample extends CustomComponent { 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>";
- private final OrderedLayout main;
+ private final VerticalLayout main;
private final Label l;
private final TextField editor = new TextField();
public JavaScriptAPIExample() {
// main layout
- main = new OrderedLayout();
+ main = new VerticalLayout();
main.setMargin(true);
setCompositionRoot(main);
editor.setRows(7);
@@ -54,8 +54,8 @@ public class JavaScriptAPIExample 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);
//
Label l = new Label(
@@ -63,6 +63,7 @@ public class JavaScriptAPIExample extends CustomComponent { + "The client will be synchronized on reload, when you click a button, "
+ "or when itmill.forceSync() is called.") {
+ @Override
public void paintContent(PaintTarget target) throws PaintException {
super.paintContent(target);
@@ -82,6 +83,7 @@ public class JavaScriptAPIExample extends CustomComponent { label = l;
}
+ @Override
public void run() {
try {
Thread.sleep(500);
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java b/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java index a48d3f7bac..337a647ca5 100644 --- 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; import com.itmill.toolkit.ui.CustomComponent;
import com.itmill.toolkit.ui.GridLayout;
+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.TabSheet;
+import com.itmill.toolkit.ui.VerticalLayout;
/**
* A few examples of layout possibilities.
@@ -20,7 +21,7 @@ public class LayoutExample extends CustomComponent { public LayoutExample() {
- final OrderedLayout main = new OrderedLayout();
+ final VerticalLayout main = new VerticalLayout();
main.setMargin(true);
setCompositionRoot(main);
@@ -43,19 +44,19 @@ public class LayoutExample extends CustomComponent { TabSheet ts = new TabSheet();
g.addComponent(ts, 0, 1, 1, 1);
- OrderedLayout ol = new OrderedLayout();
+ VerticalLayout ol = new VerticalLayout();
ol.setMargin(true);
ol.addComponent(new Label("Component 1"));
ol.addComponent(new Label("Component 2"));
ol.addComponent(new Label("Component 3"));
ts.addTab(ol, "Vertical OrderedLayout", null);
- ol = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL);
- ol.setMargin(true);
- ol.addComponent(new Label("Component 1"));
- ol.addComponent(new Label("Component 2"));
- ol.addComponent(new Label("Component 3"));
- ts.addTab(ol, "Horizontal OrderedLayout", null);
+ HorizontalLayout hl = new HorizontalLayout();
+ hl.setMargin(true);
+ hl.addComponent(new Label("Component 1"));
+ hl.addComponent(new Label("Component 2"));
+ hl.addComponent(new Label("Component 3"));
+ ts.addTab(hl, "Horizontal OrderedLayout", null);
final GridLayout gl = new GridLayout(3, 3);
gl.setMargin(true);
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java b/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java index 695a0310b6..c7c77b3164 100644 --- 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 ce3aa79b8c..7646879e3f 100644 --- 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;
import com.itmill.toolkit.ui.CheckBox;
import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.HorizontalLayout;
import com.itmill.toolkit.ui.TabSheet;
import com.itmill.toolkit.ui.Table;
+import com.itmill.toolkit.ui.VerticalLayout;
import com.itmill.toolkit.ui.Button.ClickEvent;
/**
@@ -51,7 +52,7 @@ public class TableExample extends CustomComponent implements Action.Handler, Button deselect;
public TableExample() {
- OrderedLayout margin = new OrderedLayout();
+ VerticalLayout margin = new VerticalLayout();
margin.setMargin(true);
TabSheet root = new TabSheet();
@@ -59,7 +60,7 @@ public class TableExample extends CustomComponent implements Action.Handler, margin.addComponent(root);
// main layout
- final OrderedLayout main = new OrderedLayout();
+ final VerticalLayout main = new VerticalLayout();
root.addComponent(main);
main.setCaption("Basic Table");
main.setMargin(true);
@@ -67,7 +68,7 @@ public class TableExample extends CustomComponent implements Action.Handler, // "source" table with bells & whistlesenabled
source = new Table("All creatures");
source.setPageLength(7);
- source.setWidth(550);
+ source.setWidth("550px");
source.setColumnCollapsingAllowed(true);
source.setColumnReorderingAllowed(true);
source.setSelectable(true);
@@ -78,8 +79,8 @@ public class TableExample extends CustomComponent implements Action.Handler, main.addComponent(source);
// x-selected button row
- final OrderedLayout horiz = new OrderedLayout(
- OrderedLayout.ORIENTATION_HORIZONTAL);
+ final HorizontalLayout horiz = new HorizontalLayout();
+
horiz.setMargin(false, false, true, false);
main.addComponent(horiz);
saveSelected = new Button("Save selected");
@@ -111,7 +112,7 @@ public class TableExample extends CustomComponent implements Action.Handler, // "saved" table, minimalistic
saved = new Table("Saved creatures");
saved.setPageLength(5);
- saved.setWidth(550);
+ saved.setWidth("550px");
saved.setSelectable(false);
saved.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN);
saved.setRowHeaderMode(Table.ROW_HEADER_MODE_ID);
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java b/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java index e7611353e4..c86e7bd94e 100644 --- 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 646fea2428..eb6b880fbb 100644 --- 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;
import com.itmill.toolkit.ui.DateField;
import com.itmill.toolkit.ui.Field;
+import com.itmill.toolkit.ui.HorizontalLayout;
import com.itmill.toolkit.ui.InlineDateField;
-import com.itmill.toolkit.ui.OrderedLayout;
import com.itmill.toolkit.ui.Panel;
import com.itmill.toolkit.ui.Slider;
import com.itmill.toolkit.ui.TextField;
+import com.itmill.toolkit.ui.VerticalLayout;
import com.itmill.toolkit.ui.Window.Notification;
/**
@@ -23,7 +24,7 @@ import com.itmill.toolkit.ui.Window.Notification; public class ValueInputExample extends CustomComponent {
public ValueInputExample() {
- final OrderedLayout main = new OrderedLayout();
+ final VerticalLayout main = new VerticalLayout();
main.setMargin(true);
setCompositionRoot(main);
@@ -37,8 +38,7 @@ public class ValueInputExample extends CustomComponent { };
// TextField
- OrderedLayout horiz = new OrderedLayout(
- OrderedLayout.ORIENTATION_HORIZONTAL);
+ HorizontalLayout horiz = new HorizontalLayout();
horiz.setWidth("100%");
main.addComponent(horiz);
Panel left = new Panel("TextField");
@@ -62,7 +62,7 @@ public class ValueInputExample extends CustomComponent { right.addComponent(tf);
// DateFields
- horiz = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL);
+ horiz = new HorizontalLayout();
horiz.setWidth("100%");
main.addComponent(horiz);
left = new Panel("DateField");
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/WindowingExample.java b/src/com/itmill/toolkit/demo/featurebrowser/WindowingExample.java index 99be884f4f..76c711d73b 100644 --- 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;
import com.itmill.toolkit.ui.CustomComponent;
import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.VerticalLayout;
import com.itmill.toolkit.ui.Window;
import com.itmill.toolkit.ui.Button.ClickEvent;
@@ -38,7 +38,7 @@ public class WindowingExample extends CustomComponent { private URL windowUrl = null;
public WindowingExample() {
- final OrderedLayout main = new OrderedLayout();
+ final VerticalLayout main = new VerticalLayout();
main.setMargin(true);
setCompositionRoot(main);
|