#3016 Minor Sampler string changes and fixed a broken link

svn changeset:8010/svn branch:6.0

3 files changed, 7 insertions, 7 deletions

diff --git a/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponentExample.java b/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponentExample.java
index 0c1346b01e..fd18f27d65 100644
--- 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 {
 

             Button naturalButton = new Button("Natural");

             naturalButton

-                    .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>");

+                    .setDescription("This button does not have an explicit size - instead, its size depends on it's content - a.k.a <i>natural size.</i>");

             layout.addComponent(naturalButton);

 

             Button expandedButton = new Button("Expanded");

             expandedButton.setWidth("100%");

             expandedButton

-                    .setDescription("This button is set to 100% and expanded, and will thus occupy the space left over by the other components.");

+                    .setDescription("The width of this button is set to 100% and expanded, and will thus occupy the space left over by the other components.");

             layout.addComponent(expandedButton);

             layout.setExpandRatio(expandedButton, 1.0f);

 

@@ -43,20 +43,20 @@ public class ExpandingComponentExample extends VerticalLayout {
 

             Button naturalButton = new Button("Natural");

             naturalButton

-                    .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>");

+                    .setDescription("This button does not have an explicit size - instead, its size depends on it's content - a.k.a <i>natural size.</i>");

             layout.addComponent(naturalButton);

 

             Button expandedButton1 = new Button("Ratio 1.0");

             expandedButton1.setWidth("100%");

             expandedButton1

-                    .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.");

+                    .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.");

             layout.addComponent(expandedButton1);

             layout.setExpandRatio(expandedButton1, 1.0f);

 

             Button expandedButton2 = new Button("Ratio 2.0");

             expandedButton2.setWidth("100%");

             expandedButton2

-                    .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.");

+                    .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.");

             layout.addComponent(expandedButton2);

             layout.setExpandRatio(expandedButton2, 2.0f);

         }

diff --git a/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java
index 7efe32bef2..f956ab46fd 100644
--- 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 06a01e2127..ec8c61db8b 100644
--- 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() {

         return new NamedExternalResource[] { new NamedExternalResource(

                 "Open Source Design Pattern Library; List Builder",

-                "http://www.uidesignpatterns.org/content/list-builder") };

+                "http://www.uidesignpatterns.org/designPatterns/List-Builder") };

     }

 

 }