#3016 Minor Sampler string changes and fixed a broken link

svn changeset:8010/svn branch:6.0

diff --git a/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponentExample.java b/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponentExample.java
index 0c1346b01ea457839459785ea9efd5d8cb0be999..fd18f27d657567abd5fd3f620322dcba020b2e6c 100644 (file)
--- a/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponentExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponentExample.java
@@ -18,13 +18,13 @@ public class ExpandingComponentExample extends VerticalLayout {
 \r
             Button naturalButton = new Button("Natural");\r
             naturalButton\r
-                    .setDescription("This button does not have an explicit size - instead, it's size depends on it's content - a.k.a <i>natural size.</i>");\r
+                    .setDescription("This button does not have an explicit size - instead, its size depends on it's content - a.k.a <i>natural size.</i>");\r
             layout.addComponent(naturalButton);\r
 \r
             Button expandedButton = new Button("Expanded");\r
             expandedButton.setWidth("100%");\r
             expandedButton\r
-                    .setDescription("This button is set to 100% and expanded, and will thus occupy the space left over by the other components.");\r
+                    .setDescription("The width of this button is set to 100% and expanded, and will thus occupy the space left over by the other components.");\r
             layout.addComponent(expandedButton);\r
             layout.setExpandRatio(expandedButton, 1.0f);\r
 \r
@@ -43,20 +43,20 @@ public class ExpandingComponentExample extends VerticalLayout {
 \r
             Button naturalButton = new Button("Natural");\r
             naturalButton\r
-                    .setDescription("This button does not have an explicit size - instead, it's size depends on it's content - a.k.a <i>natural size.</i>");\r
+                    .setDescription("This button does not have an explicit size - instead, its size depends on it's content - a.k.a <i>natural size.</i>");\r
             layout.addComponent(naturalButton);\r
 \r
             Button expandedButton1 = new Button("Ratio 1.0");\r
             expandedButton1.setWidth("100%");\r
             expandedButton1\r
-                    .setDescription("This button is set to 100% and expanded with a ratio of 1.0, and will in this example occupy 1:2 of the leftover space.");\r
+                    .setDescription("The width of this button is set to 100% and expanded with a ratio of 1.0, and will in this example occupy 1:3 of the leftover space.");\r
             layout.addComponent(expandedButton1);\r
             layout.setExpandRatio(expandedButton1, 1.0f);\r
 \r
             Button expandedButton2 = new Button("Ratio 2.0");\r
             expandedButton2.setWidth("100%");\r
             expandedButton2\r
-                    .setDescription("This button is set to 100% and expanded with a ratio of 2.0, and will in this example occupy 2:1 of the leftover space.");\r
+                    .setDescription("The width of this button is set to 100% and expanded with a ratio of 2.0, and will in this example occupy 2:3 of the leftover space.");\r
             layout.addComponent(expandedButton2);\r
             layout.setExpandRatio(expandedButton2, 2.0f);\r
         }\r

diff --git a/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java
index 7efe32bef29d22e01f509e41379b9a149fee650c..f956ab46fdbdc190e8fe94605e733729f169278c 100644 (file)
--- a/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java
@@ -22,7 +22,7 @@ public class LayoutMargin extends Feature {
                 + " customized using CSS - in this example, the right margin"
                 + " size is increased.<br/>Note that <i>margin</i>"
                 + " is the space around the layout as a whole, and"
-                + " <i>spacing</i> is the space between the component within"
+                + " <i>spacing</i> is the space between the components within"
                 + " the layout.";
     }
 

diff --git a/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelect.java b/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelect.java
index 06a01e2127877a1d8b8ef2ca1c37387db5194571..ec8c61db8b318e7ce19d0ebc28a18ab77a3c4862 100644 (file)
--- a/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelect.java
+++ b/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelect.java
@@ -39,7 +39,7 @@ public class TwinColumnSelect extends Feature {
     public NamedExternalResource[] getRelatedResources() {\r
         return new NamedExternalResource[] { new NamedExternalResource(\r
                 "Open Source Design Pattern Library; List Builder",\r
-                "http://www.uidesignpatterns.org/content/list-builder") };\r
+                "http://www.uidesignpatterns.org/designPatterns/List-Builder") };\r
     }\r
 \r
 }\r