]> source.dussan.org Git - vaadin-framework.git/commitdiff
Sampler content modifications.
authorMarc Englund <marc.englund@itmill.com>
Wed, 4 Feb 2009 10:34:14 +0000 (10:34 +0000)
committerMarc Englund <marc.englund@itmill.com>
Wed, 4 Feb 2009 10:34:14 +0000 (10:34 +0000)
svn changeset:6723/svn branch:trunk

12 files changed:
src/com/itmill/toolkit/demo/sampler/FeatureView.java
src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java
src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabledExample.java
src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionIcons.java
src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionIconsExample.java
src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java
src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasicExample.java
src/com/itmill/toolkit/demo/sampler/features/panels/PanelLight.java
src/com/itmill/toolkit/demo/sampler/features/panels/PanelLightExample.java
src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItemsExample.java
src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabledExample.java
src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrollingExample.java

index 9b7d7486c08dde947f3f4b4ac8a1216ea40f75e0..2c37b398945bc03957a77197f3a316a5dae10408 100644 (file)
@@ -34,7 +34,7 @@ public class FeatureView extends HorizontalLayout {
     private Feature currentFeature;
 
     public FeatureView() {
-
+        setSizeFull();
         setWidth("100%");
         setMargin(true);
         setSpacing(true);
@@ -53,6 +53,7 @@ public class FeatureView extends HorizontalLayout {
         right.setStyleName(Panel.STYLE_LIGHT);
         right.addStyleName("feature-info");
         right.setWidth("369px");
+        right.setHeight("100%");
         addComponent(right);
 
         controls = new VerticalLayout();
index 66e9d88ec70a0b166fe514cfd998072c3655da19..06701652042abe654edba734acc2975740583321 100644 (file)
@@ -2,6 +2,7 @@ package com.itmill.toolkit.demo.sampler.features.accordions;
 \r
 import com.itmill.toolkit.demo.sampler.APIResource;\r
 import com.itmill.toolkit.demo.sampler.Feature;\r
+import com.itmill.toolkit.demo.sampler.FeatureSet;\r
 import com.itmill.toolkit.demo.sampler.NamedExternalResource;\r
 import com.itmill.toolkit.ui.Accordion;\r
 \r
@@ -13,8 +14,10 @@ public class AccordionDisabled extends Feature {
 \r
     @Override\r
     public String getDescription() {\r
-        return "With an accordion component you can disable, enable,"\r
-                + " hide and show tabs, similary to a tabsheet.";\r
+        return "An accordion component is a specialized case of a"\r
+                + " tabsheet, with vertically organized tabs."\r
+                + " With an accordion component you can also disable, enable,"\r
+                + " hide and show tabs, similar to a tabsheet.";\r
     }\r
 \r
     @Override\r
@@ -24,7 +27,7 @@ public class AccordionDisabled extends Feature {
 \r
     @Override\r
     public Class[] getRelatedFeatures() {\r
-        return new Class[] { AccordionIcons.class };\r
+        return new Class[] { AccordionIcons.class, FeatureSet.Tabsheets.class };\r
     }\r
 \r
     @Override\r
index cafb2ffcc5fad36a8dd7b5718da072041a22aa41..705a857fd755f37d9a197682323e639e7731c15b 100644 (file)
@@ -19,6 +19,13 @@ public class AccordionDisabledExample extends VerticalLayout implements
     private Label l2;\r
     private Label l3;\r
 \r
+    private static final ThemeResource icon1 = new ThemeResource(\r
+            "icons/action_save.gif");\r
+    private static final ThemeResource icon2 = new ThemeResource(\r
+            "icons/comment_yellow.gif");\r
+    private static final ThemeResource icon3 = new ThemeResource(\r
+            "icons/icon_info.gif");\r
+\r
     public AccordionDisabledExample() {\r
         setSpacing(true);\r
 \r
@@ -26,16 +33,12 @@ public class AccordionDisabledExample extends VerticalLayout implements
         l2 = new Label("There are no saved notes.");\r
         l3 = new Label("There are currently no issues.");\r
 \r
-        ThemeResource i1 = new ThemeResource("icons/action_save.gif");\r
-        ThemeResource i2 = new ThemeResource("icons/comment_yellow.gif");\r
-        ThemeResource i3 = new ThemeResource("icons/icon_info.gif");\r
-\r
         a = new Accordion();\r
-        a.setHeight(400, UNITS_PIXELS);\r
-        a.setWidth(400, UNITS_PIXELS);\r
-        a.addTab(l1, "Saved actions", i1);\r
-        a.addTab(l2, "Notes", i2);\r
-        a.addTab(l3, "Issues", i3);\r
+        a.setHeight("300px");\r
+        a.setWidth("400px");\r
+        a.addTab(l1, "Saved actions", icon1);\r
+        a.addTab(l2, "Notes", icon2);\r
+        a.addTab(l3, "Issues", icon3);\r
         a.addListener(this);\r
 \r
         b1 = new Button("Disable 'Notes' tab");\r
index 06bcd27e09fe59503f518ce6bfccb8bc30e81a00..b63f0cc56d6fca545eee2fa5951afe22754cddf3 100644 (file)
@@ -2,6 +2,7 @@ package com.itmill.toolkit.demo.sampler.features.accordions;
 \r
 import com.itmill.toolkit.demo.sampler.APIResource;\r
 import com.itmill.toolkit.demo.sampler.Feature;\r
+import com.itmill.toolkit.demo.sampler.FeatureSet;\r
 import com.itmill.toolkit.demo.sampler.NamedExternalResource;\r
 import com.itmill.toolkit.ui.Accordion;\r
 \r
@@ -26,7 +27,8 @@ public class AccordionIcons extends Feature {
 \r
     @Override\r
     public Class[] getRelatedFeatures() {\r
-        return new Class[] { AccordionDisabled.class };\r
+        return new Class[] { AccordionDisabled.class,\r
+                FeatureSet.Tabsheets.class };\r
     }\r
 \r
     @Override\r
index d76892ea86e0b3c06493cb8bc9890f429ce2b4c7..6ef5894d0ecdf74493cf36f75803dea72e181506 100644 (file)
@@ -9,6 +9,13 @@ import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
 public class AccordionIconsExample extends HorizontalLayout implements\r
         Accordion.SelectedTabChangeListener {\r
 \r
+    private static final ThemeResource icon1 = new ThemeResource(\r
+            "icons/action_save.gif");\r
+    private static final ThemeResource icon2 = new ThemeResource(\r
+            "icons/comment_yellow.gif");\r
+    private static final ThemeResource icon3 = new ThemeResource(\r
+            "icons/icon_info.gif");\r
+\r
     private Accordion a;\r
 \r
     public AccordionIconsExample() {\r
@@ -18,16 +25,12 @@ public class AccordionIconsExample extends HorizontalLayout implements
         Label l2 = new Label("There are no saved notes.");\r
         Label l3 = new Label("There are currently no issues.");\r
 \r
-        ThemeResource i1 = new ThemeResource("icons/action_save.gif");\r
-        ThemeResource i2 = new ThemeResource("icons/comment_yellow.gif");\r
-        ThemeResource i3 = new ThemeResource("icons/icon_info.gif");\r
-\r
         a = new Accordion();\r
-        a.setHeight(400, UNITS_PIXELS);\r
-        a.setWidth(400, UNITS_PIXELS);\r
-        a.addTab(l1, "Saved actions", i1);\r
-        a.addTab(l2, "Notes", i2);\r
-        a.addTab(l3, "Issues", i3);\r
+        a.setHeight("300px");\r
+        a.setWidth("400px");\r
+        a.addTab(l1, "Saved actions", icon1);\r
+        a.addTab(l2, "Notes", icon2);\r
+        a.addTab(l3, "Issues", icon3);\r
         a.addListener(this);\r
 \r
         addComponent(a);\r
index 67988bcf3f0375bf8d824151d3e86499d929e350..ab834ca2ff337e5935dd7a2da4d44010552a7ec4 100644 (file)
@@ -2,7 +2,9 @@ package com.itmill.toolkit.demo.sampler.features.panels;
 \r
 import com.itmill.toolkit.demo.sampler.APIResource;\r
 import com.itmill.toolkit.demo.sampler.Feature;\r
+import com.itmill.toolkit.demo.sampler.FeatureSet;\r
 import com.itmill.toolkit.demo.sampler.NamedExternalResource;\r
+import com.itmill.toolkit.ui.Layout;\r
 import com.itmill.toolkit.ui.Panel;\r
 \r
 public class PanelBasic extends Feature {\r
@@ -13,21 +15,23 @@ public class PanelBasic extends Feature {
 \r
     @Override\r
     public String getDescription() {\r
-        return "Panel is a simple container for one component."\r
-                + " A caption can optionally be added."\r
-                + "<br>A panel typically contains a layout component"\r
-                + " where the other components can be added.";\r
+        return "Panel is a simple container that supports scrolling.<br/>"\r
+                + " It's internal layout (by default VerticalLayout) can be"\r
+                + " configured or exchanged to get desired results. Components"\r
+                + " that are added to the Panel will in effect be added to the"\r
+                + " layout.";\r
 \r
     }\r
 \r
     @Override\r
     public APIResource[] getRelatedAPI() {\r
-        return new APIResource[] { new APIResource(Panel.class) };\r
+        return new APIResource[] { new APIResource(Panel.class),\r
+                new APIResource(Layout.class) };\r
     }\r
 \r
     @Override\r
     public Class[] getRelatedFeatures() {\r
-        return new Class[] { PanelLight.class };\r
+        return new Class[] { PanelLight.class, FeatureSet.Layouts.class };\r
     }\r
 \r
     @Override\r
index 35d6faf17f0443adaa9d8058eebe8176031752e2..d77d21c6f82a27704e9e78cfdc1ca73af9e18fb1 100644 (file)
@@ -9,36 +9,39 @@ import com.itmill.toolkit.ui.Button.ClickListener;
 \r
 public class PanelBasicExample extends VerticalLayout implements ClickListener {\r
 \r
-    private Panel p1;\r
-    private Panel p2;\r
+    private Panel panel;\r
 \r
     public PanelBasicExample() {\r
         setSpacing(true);\r
 \r
-        // First panel uses layout in which the components are added\r
-        VerticalLayout vl = new VerticalLayout();\r
-        Label l = new Label("Push the button to toggle caption.");\r
+        // Panel 1 - with caption\r
+        panel = new Panel("This is a standard Panel");\r
+        panel.setHeight("200px"); // we want scrollbars\r
+\r
+        // let's adjust the panels default layout (a VerticalLayout)\r
+        VerticalLayout layout = (VerticalLayout) panel.getLayout();\r
+        layout.setMargin(true); // we want a margin\r
+        layout.setSpacing(true); // and spacing between components\r
+        addComponent(panel);\r
+\r
+        // Let's add a few rows to provoke scrollbars:\r
+        for (int i = 0; i < 20; i++) {\r
+            panel.addComponent(new Label(\r
+                    "The quick brown fox jumps over the lazy dog."));\r
+        }\r
+\r
+        // Caption toggle:\r
         Button b = new Button("Toggle caption");\r
         b.addListener(this);\r
-        vl.setSpacing(true);\r
-        vl.addComponent(l);\r
-        vl.addComponent(b);\r
-        p1 = new Panel("This is a standard Panel");\r
-        p1.setLayout(vl);\r
-\r
-        // We add the Label component directly to the second panel\r
-        p2 = new Panel();\r
-        p2.addComponent(new Label("This is a standard panel without caption."));\r
-\r
-        addComponent(p1);\r
-        addComponent(p2);\r
+        addComponent(b);\r
+\r
     }\r
 \r
     public void buttonClick(ClickEvent event) {\r
-        if (p1.getCaption().equals("")) {\r
-            p1.setCaption("This is a standard Panel");\r
+        if (panel.getCaption().equals("")) {\r
+            panel.setCaption("This is a standard Panel");\r
         } else {\r
-            p1.setCaption("");\r
+            panel.setCaption("");\r
         }\r
     }\r
 }\r
index 6ce8d4e968f429befa543f52b96c261a9c12d19c..e3b268cc408305679c57fef5b844c43e19b34eb0 100644 (file)
@@ -2,30 +2,37 @@ package com.itmill.toolkit.demo.sampler.features.panels;
 \r
 import com.itmill.toolkit.demo.sampler.APIResource;\r
 import com.itmill.toolkit.demo.sampler.Feature;\r
+import com.itmill.toolkit.demo.sampler.FeatureSet;\r
 import com.itmill.toolkit.demo.sampler.NamedExternalResource;\r
+import com.itmill.toolkit.ui.Layout;\r
 import com.itmill.toolkit.ui.Panel;\r
 \r
 public class PanelLight extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Panel - Light style";\r
+        return "Panel, light style";\r
     }\r
 \r
     @Override\r
     public String getDescription() {\r
-        return "A lighter style for the Panel component is"\r
-                + " also available.";\r
+        return "Panel is a simple container that supports scrolling.<br/>"\r
+                + " It's internal layout (by default VerticalLayout) can be"\r
+                + " configured or exchanged to get desired results. Components"\r
+                + " that are added to the Panel will in effect be added to the"\r
+                + " layout.<br/>"\r
+                + "The 'light' version has less decorations than the regular one.";\r
 \r
     }\r
 \r
     @Override\r
     public APIResource[] getRelatedAPI() {\r
-        return new APIResource[] { new APIResource(Panel.class) };\r
+        return new APIResource[] { new APIResource(Panel.class),\r
+                new APIResource(Layout.class) };\r
     }\r
 \r
     @Override\r
     public Class[] getRelatedFeatures() {\r
-        return new Class[] { PanelBasic.class };\r
+        return new Class[] { PanelBasic.class, FeatureSet.Layouts.class };\r
     }\r
 \r
     @Override\r
index 508c8397b25297442266a4637657b5939651ae94..be49cdacad0f83159e23124681c353ff4234c8ec 100644 (file)
@@ -9,33 +9,41 @@ import com.itmill.toolkit.ui.Button.ClickListener;
 \r
 public class PanelLightExample extends VerticalLayout implements ClickListener {\r
 \r
-    private Panel p;\r
+    private Panel panel;\r
 \r
     public PanelLightExample() {\r
         setSpacing(true);\r
 \r
-        // First panel uses layout in which the components are added\r
-        VerticalLayout vl = new VerticalLayout();\r
-        Label l = new Label("Push the button to toggle style.");\r
-        Button b = new Button("Toggle style");\r
+        setSpacing(true);\r
+\r
+        // Panel 1 - with caption\r
+        panel = new Panel("This is a light Panel");\r
+        panel.setStyleName(Panel.STYLE_LIGHT);\r
+        panel.setHeight("200px"); // we want scrollbars\r
+\r
+        // let's adjust the panels default layout (a VerticalLayout)\r
+        VerticalLayout layout = (VerticalLayout) panel.getLayout();\r
+        layout.setMargin(true); // we want a margin\r
+        layout.setSpacing(true); // and spacing between components\r
+        addComponent(panel);\r
+\r
+        // Let's add a few rows to provoke scrollbars:\r
+        for (int i = 0; i < 20; i++) {\r
+            panel.addComponent(new Label(\r
+                    "The quick brown fox jumps over the lazy dog."));\r
+        }\r
+\r
+        // Caption toggle:\r
+        Button b = new Button("Toggle caption");\r
         b.addListener(this);\r
-        vl.setSpacing(true);\r
-        vl.addComponent(l);\r
-        vl.addComponent(b);\r
-        p = new Panel("This is a light Panel");\r
-        p.setStyleName("light");\r
-        p.setLayout(vl);\r
-\r
-        addComponent(p);\r
+        addComponent(b);\r
     }\r
 \r
     public void buttonClick(ClickEvent event) {\r
-        if (p.getStyleName().contains("light")) {\r
-            p.removeStyleName("light");\r
-            p.setCaption("This is a standard Panel");\r
+        if (panel.getCaption().equals("")) {\r
+            panel.setCaption("This is a standard Panel");\r
         } else {\r
-            p.setStyleName("light");\r
-            p.setCaption("This is a light Panel");\r
+            panel.setCaption("");\r
         }\r
     }\r
 }\r
index 339babd2a0d49be93ede96cda509f83a19bd1ea0..f986cb088a1ed751cd38305f2d6ab3709390a226 100644 (file)
@@ -5,7 +5,6 @@ import com.itmill.toolkit.data.Property.ValueChangeEvent;
 import com.itmill.toolkit.ui.AbstractSelect;\r
 import com.itmill.toolkit.ui.ComboBox;\r
 import com.itmill.toolkit.ui.VerticalLayout;\r
-import com.itmill.toolkit.ui.AbstractSelect.Filtering;\r
 \r
 public class ComboBoxNewItemsExample extends VerticalLayout implements\r
         Property.ValueChangeListener, AbstractSelect.NewItemHandler {\r
@@ -22,7 +21,6 @@ public class ComboBoxNewItemsExample extends VerticalLayout implements
             l.addItem(cities[i]);\r
         }\r
 \r
-        l.setFilteringMode(Filtering.FILTERINGMODE_OFF);\r
         l.setNewItemsAllowed(true);\r
         l.setNewItemHandler(this);\r
         l.setImmediate(true);\r
index cd66f3394261ca16e5327cd2b94e4a9e4db4f958..12ad969e7193b025e79a1fa4addfad39f25399cb 100644 (file)
@@ -11,42 +11,54 @@ import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
 \r
 public class TabSheetDisabledExample extends VerticalLayout implements\r
         TabSheet.SelectedTabChangeListener, Button.ClickListener {\r
+    private static final ThemeResource icon1 = new ThemeResource(\r
+            "icons/action_save.gif");\r
+    private static final ThemeResource icon2 = new ThemeResource(\r
+            "icons/comment_yellow.gif");\r
+    private static final ThemeResource icon3 = new ThemeResource(\r
+            "icons/icon_info.gif");\r
 \r
     private TabSheet t;\r
-    private Button b1;\r
-    private Button b2;\r
-    private Label l1;\r
-    private Label l2;\r
-    private Label l3;\r
+    private Button toggleEnabled;\r
+    private Button toggleVisible;\r
+    private VerticalLayout l1;\r
+    private VerticalLayout l2;\r
+    private VerticalLayout l3;\r
 \r
     public TabSheetDisabledExample() {\r
         setSpacing(true);\r
 \r
-        l1 = new Label("There are no previously saved actions.");\r
-        l2 = new Label("There are no saved notes.");\r
-        l3 = new Label("There are currently no issues.");\r
-\r
-        ThemeResource i1 = new ThemeResource("icons/action_save.gif");\r
-        ThemeResource i2 = new ThemeResource("icons/comment_yellow.gif");\r
-        ThemeResource i3 = new ThemeResource("icons/icon_info.gif");\r
+        // Tab 1 content\r
+        l1 = new VerticalLayout();\r
+        l1.setMargin(true);\r
+        l1.addComponent(new Label("There are no previously saved actions."));\r
+        // Tab 2 content\r
+        l2 = new VerticalLayout();\r
+        l2.setMargin(true);\r
+        l2.addComponent(new Label("There are no saved notes."));\r
+        // Tab 3 content\r
+        l3 = new VerticalLayout();\r
+        l3.setMargin(true);\r
+        l3.addComponent(new Label("There are currently no issues."));\r
 \r
         t = new TabSheet();\r
-        t.setHeight(400, UNITS_PIXELS);\r
-        t.setWidth(400, UNITS_PIXELS);\r
-        t.addTab(l1, "Saved actions", i1);\r
-        t.addTab(l2, "Notes", i2);\r
-        t.addTab(l3, "Issues", i3);\r
+        t.setHeight("200px");\r
+        t.setWidth("400px");\r
+        t.addTab(l1, "Saved actions", icon1);\r
+        t.addTab(l2, "Notes", icon2);\r
+        t.addTab(l3, "Issues", icon3);\r
         t.addListener(this);\r
 \r
-        b1 = new Button("Disable 'Notes' tab");\r
-        b2 = new Button("Hide 'Issues' tab");\r
-        b1.addListener(this);\r
-        b2.addListener(this);\r
+        toggleEnabled = new Button("Disable 'Notes' tab");\r
+        toggleEnabled.addListener(this);\r
+\r
+        toggleVisible = new Button("Hide 'Issues' tab");\r
+        toggleVisible.addListener(this);\r
 \r
         HorizontalLayout hl = new HorizontalLayout();\r
         hl.setSpacing(true);\r
-        hl.addComponent(b1);\r
-        hl.addComponent(b2);\r
+        hl.addComponent(toggleEnabled);\r
+        hl.addComponent(toggleVisible);\r
 \r
         addComponent(t);\r
         addComponent(hl);\r
@@ -58,22 +70,18 @@ public class TabSheetDisabledExample extends VerticalLayout implements
     }\r
 \r
     public void buttonClick(ClickEvent event) {\r
-        if (b1.equals(event.getButton())) { // b1 clicked\r
-            if (l2.isEnabled()) {\r
-                l2.setEnabled(false);\r
-                b1.setCaption("Enable 'Notes' tab");\r
-            } else {\r
-                l2.setEnabled(true);\r
-                b1.setCaption("Disable 'Notes' tab");\r
-            }\r
-        } else { // b2 clicked\r
-            if (l3.isVisible()) {\r
-                l3.setVisible(false);\r
-                b2.setCaption("Show 'Issues' tab");\r
-            } else {\r
-                l3.setVisible(true);\r
-                b2.setCaption("Hide 'Issues' tab");\r
-            }\r
+        if (toggleEnabled.equals(event.getButton())) {\r
+            // toggleEnabled clicked\r
+            l2.setEnabled(!l2.isEnabled());\r
+            toggleEnabled.setCaption((l2.isEnabled() ? "Disable" : "Enable")\r
+                    + " 'Notes' tab");\r
+\r
+        } else {\r
+            // toggleVisible clicked\r
+            l3.setVisible(!l3.isVisible());\r
+            toggleVisible.setCaption((l3.isVisible() ? "Hide" : "Show")\r
+                    + " 'Issues' tab");\r
+\r
         }\r
         t.requestRepaint();\r
     }\r
index 102a0879e26a1433e4d8672de22da767c1dfa443..15c4d0ce8e5f6e9e348503f75cb7534dbdc65d4f 100644 (file)
@@ -9,27 +9,45 @@ import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
 public class TabSheetScrollingExample extends VerticalLayout implements\r
         TabSheet.SelectedTabChangeListener {\r
 \r
+    private static final ThemeResource icon1 = new ThemeResource(\r
+            "icons/action_save.gif");\r
+    private static final ThemeResource icon2 = new ThemeResource(\r
+            "icons/comment_yellow.gif");\r
+    private static final ThemeResource icon3 = new ThemeResource(\r
+            "icons/icon_info.gif");\r
+\r
     private TabSheet t;\r
 \r
     public TabSheetScrollingExample() {\r
-        Label l1 = new Label("There are no previously saved actions.");\r
-        Label l2 = new Label("There are no saved notes.");\r
-        Label l3 = new Label("There are currently no issues.");\r
-        Label l4 = new Label("There are no comments.");\r
-        Label l5 = new Label("There is no new feedback.");\r
-\r
-        ThemeResource i1 = new ThemeResource("icons/action_save.gif");\r
-        ThemeResource i2 = new ThemeResource("icons/comment_yellow.gif");\r
-        ThemeResource i3 = new ThemeResource("icons/icon_info.gif");\r
+        // Tab 1 content\r
+        VerticalLayout l1 = new VerticalLayout();\r
+        l1.setMargin(true);\r
+        l1.addComponent(new Label("There are no previously saved actions."));\r
+        // Tab 2 content\r
+        VerticalLayout l2 = new VerticalLayout();\r
+        l2.setMargin(true);\r
+        l2.addComponent(new Label("There are no saved notes."));\r
+        // Tab 3 content\r
+        VerticalLayout l3 = new VerticalLayout();\r
+        l3.setMargin(true);\r
+        l3.addComponent(new Label("There are currently no issues."));\r
+        // Tab 4 content\r
+        VerticalLayout l4 = new VerticalLayout();\r
+        l4.setMargin(true);\r
+        l4.addComponent(new Label("There are no comments."));\r
+        // Tab 5 content\r
+        VerticalLayout l5 = new VerticalLayout();\r
+        l5.setMargin(true);\r
+        l5.addComponent(new Label("There is no new feedback."));\r
 \r
         t = new TabSheet();\r
-        t.setHeight(400, UNITS_PIXELS);\r
-        t.setWidth(400, UNITS_PIXELS);\r
-        t.addTab(l1, "Saved actions", i1);\r
-        t.addTab(l2, "Notes", i2);\r
-        t.addTab(l3, "Issues", i3);\r
-        t.addTab(l4, "Comments", i2);\r
-        t.addTab(l5, "Feedback", i2);\r
+        t.setHeight("200px");\r
+        t.setWidth("400px");\r
+        t.addTab(l1, "Saved actions", icon1);\r
+        t.addTab(l2, "Notes", icon2);\r
+        t.addTab(l3, "Issues", icon3);\r
+        t.addTab(l4, "Comments", icon2);\r
+        t.addTab(l5, "Feedback", icon2);\r
         t.addListener(this);\r
 \r
         addComponent(t);\r