From: Jouni Koivuviita Date: Thu, 13 Dec 2007 11:46:06 +0000 (+0000) Subject: Cleaned up setStyle -> setStyleName and removed all references to Sizeable. X-Git-Tag: 6.7.0.beta1~5240 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=89497d8012c8b31080c2a47cde5a6a313b339f6a;p=vaadin-framework.git Cleaned up setStyle -> setStyleName and removed all references to Sizeable. svn changeset:3229/svn branch:trunk --- diff --git a/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java b/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java index 2831804443..972af336b9 100644 --- a/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java +++ b/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java @@ -9,7 +9,7 @@ import java.io.File; import com.itmill.toolkit.data.util.FilesystemContainer; import com.itmill.toolkit.data.util.FilesystemContainer.FileItem; import com.itmill.toolkit.demo.util.SampleDirectory; -import com.itmill.toolkit.terminal.Sizeable; +import com.itmill.toolkit.terminal.Size; import com.itmill.toolkit.ui.ExpandLayout; import com.itmill.toolkit.ui.Field; import com.itmill.toolkit.ui.Label; @@ -54,7 +54,7 @@ public class TreeFilesystemContainer extends com.itmill.toolkit.Application propertyPanel.getSize().setHeight(120); main.addComponent(propertyPanel); explorerPanel.getSize().setHeight(100); - explorerPanel.getSize().setHeightUnits(Sizeable.UNITS_PERCENTAGE); + explorerPanel.getSize().setHeightUnits(Size.UNITS_PERCENTAGE); main.addComponent(explorerPanel); main.expand(explorerPanel); diff --git a/src/com/itmill/toolkit/demo/UpgradingSample.java b/src/com/itmill/toolkit/demo/UpgradingSample.java index a2a2c31f66..2a8f1d3c61 100644 --- a/src/com/itmill/toolkit/demo/UpgradingSample.java +++ b/src/com/itmill/toolkit/demo/UpgradingSample.java @@ -65,7 +65,7 @@ public class UpgradingSample extends Application implements l.addComponent(new LoginBox()); // Setup menu - menu.setStyle("menu"); + menu.setStyleName("menu"); menu.addListener(this); menu.setImmediate(true); addToMenu(new String[] { "Welcome", "Products", "Contact" }); @@ -98,7 +98,7 @@ public class UpgradingSample extends Application implements if (pages[i][0].equals(title)) { final Panel p = new Panel(pages[i][0]); p.addComponent(new Label(pages[i][1])); - p.setStyle("strong"); + p.setStyleName("strong"); layout.addComponent(p, 1, 0); } } @@ -128,7 +128,7 @@ public class UpgradingSample extends Application implements // Initialize the component loginPanel.addComponent(loginName); loginPanel.addComponent(loginButton); - loginPanel.setStyle("strong"); + loginPanel.setStyleName("strong"); loginName.setColumns(8); statusPanel.addComponent(statusLabel); statusPanel.addComponent(logoutButton); diff --git a/src/com/itmill/toolkit/ui/AbstractLayout.java b/src/com/itmill/toolkit/ui/AbstractLayout.java index 43349e929a..0842cbea4f 100644 --- a/src/com/itmill/toolkit/ui/AbstractLayout.java +++ b/src/com/itmill/toolkit/ui/AbstractLayout.java @@ -6,7 +6,6 @@ package com.itmill.toolkit.ui; import com.itmill.toolkit.terminal.PaintException; import com.itmill.toolkit.terminal.PaintTarget; -import com.itmill.toolkit.terminal.Sizeable; import com.itmill.toolkit.terminal.gwt.client.ui.MarginInfo; /**