diff options
60 files changed, 101 insertions, 120 deletions
diff --git a/client/src/com/vaadin/client/ui/label/LabelConnector.java b/client/src/com/vaadin/client/ui/label/LabelConnector.java index b52809c90e..9ec530ba2c 100644 --- a/client/src/com/vaadin/client/ui/label/LabelConnector.java +++ b/client/src/com/vaadin/client/ui/label/LabelConnector.java @@ -57,7 +57,6 @@ public class LabelConnector extends AbstractComponentConnector { getWidget().setText(getState().text); break; - case XHTML: case HTML: case RAW: sinkOnloads = true; diff --git a/server/src/com/vaadin/server/AbstractErrorMessage.java b/server/src/com/vaadin/server/AbstractErrorMessage.java index 3ab0e73c8a..98cdcd4f8c 100644 --- a/server/src/com/vaadin/server/AbstractErrorMessage.java +++ b/server/src/com/vaadin/server/AbstractErrorMessage.java @@ -49,14 +49,6 @@ public abstract class AbstractErrorMessage implements ErrorMessage { * */ HTML, - - /** - * Content mode, where the error contains XHTML. - * - * @deprecated Use {@link ContentMode.HTML} - */ - @Deprecated - XHTML; } /** @@ -125,7 +117,6 @@ public abstract class AbstractErrorMessage implements ErrorMessage { result = "<pre>" + VaadinServlet.safeEscapeForHtml(getMessage()) + "</pre>"; break; - case XHTML: case HTML: result = getMessage(); break; diff --git a/server/src/com/vaadin/server/UserError.java b/server/src/com/vaadin/server/UserError.java index c59eb382ee..d7837fb65d 100644 --- a/server/src/com/vaadin/server/UserError.java +++ b/server/src/com/vaadin/server/UserError.java @@ -42,7 +42,7 @@ public class UserError extends AbstractErrorMessage { * @deprecated from 7.0, use {@link ContentMode#HTML} instead */ @Deprecated - public static final ContentMode CONTENT_XHTML = ContentMode.XHTML; + public static final ContentMode CONTENT_XHTML = ContentMode.HTML; /** * Creates a textual error message of level ERROR. diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java index b3a6f43e64..b58de68af2 100644 --- a/server/src/com/vaadin/ui/Label.java +++ b/server/src/com/vaadin/ui/Label.java @@ -71,7 +71,7 @@ public class Label extends AbstractComponent implements Property<String>, * @deprecated From 7.0, use {@link ContentMode#XHTML} instead */ @Deprecated - public static final ContentMode CONTENT_XHTML = ContentMode.XHTML; + public static final ContentMode CONTENT_XHTML = ContentMode.HTML; /** * @deprecated From 7.0, use {@link ContentMode#XML} instead @@ -413,9 +413,8 @@ public class Label extends AbstractComponent implements Property<String>, stringValue = ""; } - if (getContentMode() == ContentMode.XHTML - || getContentMode() == ContentMode.XML - || getContentMode() == ContentMode.HTML) { + if (getContentMode() == ContentMode.HTML + || getContentMode() == ContentMode.XML) { return stripTags(stringValue); } else { return stringValue; diff --git a/shared/src/com/vaadin/shared/ui/label/ContentMode.java b/shared/src/com/vaadin/shared/ui/label/ContentMode.java index 3e6e5b8e45..efdb1acde0 100644 --- a/shared/src/com/vaadin/shared/ui/label/ContentMode.java +++ b/shared/src/com/vaadin/shared/ui/label/ContentMode.java @@ -39,14 +39,6 @@ public enum ContentMode { HTML, /** - * Content mode, where the label contains XHTML. - * - * @deprecated Use {@link ContentMode.HTML} - */ - @Deprecated - XHTML, - - /** * Content mode, where the label contains well-formed or well-balanced XML. * This is handled in the same way as {@link #XHTML}. * diff --git a/uitest/src/com/vaadin/tests/Components.java b/uitest/src/com/vaadin/tests/Components.java index 5d1cb6a5dc..b766ab27f3 100644 --- a/uitest/src/com/vaadin/tests/Components.java +++ b/uitest/src/com/vaadin/tests/Components.java @@ -96,7 +96,7 @@ public class Components extends Application { naviLayout .addComponent(new Label( "Click to open a test case.<br/>Right click to open test in a new window<br/><br/>", - ContentMode.XHTML)); + ContentMode.HTML)); naviLayout.addComponent(createMenu()); naviLayout.addComponent(createMissingTestsList()); @@ -107,7 +107,7 @@ public class Components extends Application { embeddingLayout .addComponent(new Label( "<b>Do not use the embedded version for creating automated tests. Open the test in a new window before recording.</b><br/>", - ContentMode.XHTML)); + ContentMode.HTML)); applicationEmbedder.setSizeFull(); embeddingLayout.addComponent(applicationEmbedder); embeddingLayout.setExpandRatio(applicationEmbedder, 1); @@ -130,7 +130,7 @@ public class Components extends Application { + component.getSimpleName() + "</font><br/>"; } return new Label("<b>Components without a test:</B><br/>" - + missingTests, ContentMode.XHTML); + + missingTests, ContentMode.HTML); } private Component createMenu() { diff --git a/uitest/src/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java index a0fcaf8236..8b44007949 100644 --- a/uitest/src/com/vaadin/tests/CustomLayoutDemo.java +++ b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java @@ -110,7 +110,7 @@ public class CustomLayoutDemo extends com.vaadin.Application implements // Add heading label and custom layout panel to main window mainWindow.addComponent(new Label("<h3>Custom layout demo</h3>", - ContentMode.XHTML)); + ContentMode.HTML)); mainWindow.addComponent(customLayoutPanel); } @@ -126,7 +126,7 @@ public class CustomLayoutDemo extends com.vaadin.Application implements username.setValue("Anonymous"); } mainLayout.replaceComponent(loginButton, new Label("Welcome user <em>" - + username.getValue() + "</em>", ContentMode.XHTML)); + + username.getValue() + "</em>", ContentMode.HTML)); } /** diff --git a/uitest/src/com/vaadin/tests/LayoutDemo.java b/uitest/src/com/vaadin/tests/LayoutDemo.java index 148e6105a6..b20e0b9bc8 100644 --- a/uitest/src/com/vaadin/tests/LayoutDemo.java +++ b/uitest/src/com/vaadin/tests/LayoutDemo.java @@ -98,23 +98,23 @@ public class LayoutDemo extends com.vaadin.Application { // mainWindow.addComponent(new Label( "<h3>Horizontal ordered layout</h3>Added four components.", - ContentMode.XHTML)); + ContentMode.HTML)); mainWindow.addComponent(layoutA); mainWindow.addComponent(new Label( "<br /><h3>Vertical ordered layout</h3>Added four components.", - ContentMode.XHTML)); + ContentMode.HTML)); mainWindow.addComponent(layoutB); mainWindow.addComponent(new Label( "<br /><h3>Grid Layout (4 x 4)</h3>Added 16 components.", - ContentMode.XHTML)); + ContentMode.HTML)); mainWindow.addComponent(layoutG); mainWindow.addComponent(new Label("<br /><h3>Grid Layout (4 x 4)</h3>" + "Added four panels and four embedded components " - + "diagonally with absolute coordinates.", ContentMode.XHTML)); + + "diagonally with absolute coordinates.", ContentMode.HTML)); mainWindow.addComponent(layoutG2); mainWindow.addComponent(new Label( "<br /><h3>TabSheet</h3>Added above layouts as tabs.", - ContentMode.XHTML)); + ContentMode.HTML)); mainWindow.addComponent(tabsheet); } @@ -135,7 +135,7 @@ public class LayoutDemo extends com.vaadin.Application { + "extremities and may have a caption to clarify the nature of the contained components' purpose." + " Panel contains an layout where the actual contained components are added, " + "this layout may be switched on the fly.", - ContentMode.XHTML)); + ContentMode.HTML)); panel.setWidth("222px"); return panel; } diff --git a/uitest/src/com/vaadin/tests/NativeWindowing.java b/uitest/src/com/vaadin/tests/NativeWindowing.java index b364d506ce..c6a68c840b 100644 --- a/uitest/src/com/vaadin/tests/NativeWindowing.java +++ b/uitest/src/com/vaadin/tests/NativeWindowing.java @@ -84,7 +84,7 @@ public class NativeWindowing extends Application { + "<p>Lorem ipsum dolor sit amet.</p>" + "<p>Lorem ipsum dolor sit amet.</p>" + "<p>Lorem ipsum dolor sit amet.</p>", - ContentMode.XHTML)); + ContentMode.HTML)); } })); diff --git a/uitest/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/uitest/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java index 0e76617cc5..1738efc215 100644 --- a/uitest/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java +++ b/uitest/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java @@ -115,7 +115,7 @@ public class PerformanceTestBasicComponentRendering extends CustomComponent { } private void addInfo() { - main.addComponent(new Label(DESCRIPTION, ContentMode.XHTML)); + main.addComponent(new Label(DESCRIPTION, ContentMode.HTML)); } } diff --git a/uitest/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/uitest/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java index 8002059227..77181b0257 100644 --- a/uitest/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java +++ b/uitest/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java @@ -88,7 +88,7 @@ public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent { } private void addInfo() { - main.addComponent(new Label(DESCRIPTION, ContentMode.XHTML)); + main.addComponent(new Label(DESCRIPTION, ContentMode.HTML)); } } diff --git a/uitest/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/uitest/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java index 485843d104..a325b62257 100644 --- a/uitest/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java +++ b/uitest/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java @@ -101,7 +101,7 @@ public class PerformanceTestSubTreeCaching extends CustomComponent { } private void addInfo() { - main.addComponent(new Label(DESCRIPTION, ContentMode.XHTML)); + main.addComponent(new Label(DESCRIPTION, ContentMode.HTML)); } } diff --git a/uitest/src/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/com/vaadin/tests/TestCaptionWrapper.java index b2e09a2a6f..bac83f9504 100644 --- a/uitest/src/com/vaadin/tests/TestCaptionWrapper.java +++ b/uitest/src/com/vaadin/tests/TestCaptionWrapper.java @@ -172,7 +172,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { // Custom components layout.addComponent(new Label("<B>Below are few custom components</B>", - ContentMode.XHTML)); + ContentMode.HTML)); final TestForUpload tfu = new TestForUpload(); layout.addComponent(tfu); diff --git a/uitest/src/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java index 6f131bdb8e..505b1801db 100644 --- a/uitest/src/com/vaadin/tests/TestForNativeWindowing.java +++ b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java @@ -84,7 +84,7 @@ public class TestForNativeWindowing extends Application { + "<p>Lorem ipsum dolor sit amet.</p>" + "<p>Lorem ipsum dolor sit amet.</p>" + "<p>Lorem ipsum dolor sit amet.</p>", - ContentMode.XHTML)); + ContentMode.HTML)); } })); diff --git a/uitest/src/com/vaadin/tests/TestForRichTextEditor.java b/uitest/src/com/vaadin/tests/TestForRichTextEditor.java index 9d4c679648..219bb7bf5e 100644 --- a/uitest/src/com/vaadin/tests/TestForRichTextEditor.java +++ b/uitest/src/com/vaadin/tests/TestForRichTextEditor.java @@ -58,7 +58,7 @@ public class TestForRichTextEditor extends CustomComponent implements main.addComponent(new Button("commit content to label below")); - l = new Label("", ContentMode.XHTML); + l = new Label("", ContentMode.HTML); main.addComponent(l); CheckBox b = new CheckBox("enabled"); diff --git a/uitest/src/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/com/vaadin/tests/TestForStyledUpload.java index 9ead78220e..f1ced4e1f0 100644 --- a/uitest/src/com/vaadin/tests/TestForStyledUpload.java +++ b/uitest/src/com/vaadin/tests/TestForStyledUpload.java @@ -182,11 +182,11 @@ public class TestForStyledUpload extends Application implements "Upload finished, but output buffer is null!!")); } else { status.addComponent(new Label( - "<b>Name:</b> " + event.getFilename(), ContentMode.XHTML)); + "<b>Name:</b> " + event.getFilename(), ContentMode.HTML)); status.addComponent(new Label("<b>Mimetype:</b> " - + event.getMIMEType(), ContentMode.XHTML)); + + event.getMIMEType(), ContentMode.HTML)); status.addComponent(new Label("<b>Size:</b> " + event.getLength() - + " bytes.", ContentMode.XHTML)); + + " bytes.", ContentMode.HTML)); status.addComponent(new Link("Download " + buffer.getFileName(), new StreamResource(buffer, buffer.getFileName()))); diff --git a/uitest/src/com/vaadin/tests/TestForUpload.java b/uitest/src/com/vaadin/tests/TestForUpload.java index 7c2359a404..7146b1a4ff 100644 --- a/uitest/src/com/vaadin/tests/TestForUpload.java +++ b/uitest/src/com/vaadin/tests/TestForUpload.java @@ -152,11 +152,11 @@ public class TestForUpload extends CustomComponent implements "Upload finished, but output buffer is null")); } else { status.addComponent(new Label("<b>Name:</b> " - + event.getFilename(), ContentMode.XHTML)); + + event.getFilename(), ContentMode.HTML)); status.addComponent(new Label("<b>Mimetype:</b> " - + event.getMIMEType(), ContentMode.XHTML)); + + event.getMIMEType(), ContentMode.HTML)); status.addComponent(new Label("<b>Size:</b> " - + event.getLength() + " bytes.", ContentMode.XHTML)); + + event.getLength() + " bytes.", ContentMode.HTML)); status.addComponent(new Link("Download " + buffer.getFileName(), new StreamResource(buffer, diff --git a/uitest/src/com/vaadin/tests/TestIFrames.java b/uitest/src/com/vaadin/tests/TestIFrames.java index e0de636f2c..12ddb5f2a1 100644 --- a/uitest/src/com/vaadin/tests/TestIFrames.java +++ b/uitest/src/com/vaadin/tests/TestIFrames.java @@ -44,7 +44,7 @@ public class TestIFrames extends CustomComponent { final int height = 250; final String iFrame = "<iframe height=\"" + height + "\" width=\"" + width + "\" src=\"" + URL + "\" />"; - return new Label(iFrame, ContentMode.XHTML); + return new Label(iFrame, ContentMode.HTML); } } diff --git a/uitest/src/com/vaadin/tests/TreeFilesystem.java b/uitest/src/com/vaadin/tests/TreeFilesystem.java index db740b4075..3489ee0953 100644 --- a/uitest/src/com/vaadin/tests/TreeFilesystem.java +++ b/uitest/src/com/vaadin/tests/TreeFilesystem.java @@ -51,7 +51,7 @@ public class TreeFilesystem extends com.vaadin.Application implements setMainWindow(main); // Main window contains heading and panel - main.addComponent(new Label("<h2>Tree demo</h2>", ContentMode.XHTML)); + main.addComponent(new Label("<h2>Tree demo</h2>", ContentMode.HTML)); // configure file structure panel main.addComponent(explorerPanel); diff --git a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java index e1482dabd4..54153448f1 100644 --- a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java +++ b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java @@ -32,7 +32,7 @@ public class UsingObjectsInSelect extends com.vaadin.Application implements private final Select select = new Select(); private final Label selectedTask = new Label("Selected task", - ContentMode.XHTML); + ContentMode.HTML); public LinkedList<?> exampleTasks = new LinkedList<Object>(); diff --git a/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java index 8cfed569dc..e4f8552af1 100644 --- a/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java +++ b/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java @@ -13,7 +13,7 @@ public class ApplicationCloseTest extends TestBase { @Override protected void setup() { Label applications = new Label("Applications in session: <br/>", - ContentMode.XHTML); + ContentMode.HTML); if (getContext() != null) { applications.setValue(applications.getValue() + "App: " + getContext() + "<br/>"); @@ -49,7 +49,7 @@ public class ApplicationCloseTest extends TestBase { / 1000 / 1000 + "MiB memory for this application.<br/>Total memory usage reported as " - + totalUsageString + "<br/>", ContentMode.XHTML); + + totalUsageString + "<br/>", ContentMode.HTML); addComponent(thisApp); addComponent(memoryUsage); diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java index 210cb2535e..6d84b85ff8 100644 --- a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java +++ b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java @@ -14,7 +14,7 @@ public abstract class AbstractTestUI extends UI { public void init(WrappedRequest request) { getPage().setTitle(getClass().getName()); - Label label = new Label(getTestDescription(), ContentMode.XHTML); + Label label = new Label(getTestDescription(), ContentMode.HTML); label.setWidth("100%"); layout = new VerticalLayout(); diff --git a/uitest/src/com/vaadin/tests/components/TestBase.java b/uitest/src/com/vaadin/tests/components/TestBase.java index 19c6826977..3260c52003 100644 --- a/uitest/src/com/vaadin/tests/components/TestBase.java +++ b/uitest/src/com/vaadin/tests/components/TestBase.java @@ -14,7 +14,7 @@ public abstract class TestBase extends AbstractTestCase { setMainWindow(window); window.getContent().setSizeFull(); - Label label = new Label(getDescription(), ContentMode.XHTML); + Label label = new Label(getDescription(), ContentMode.HTML); label.setWidth("100%"); window.getContent().addComponent(label); diff --git a/uitest/src/com/vaadin/tests/components/caption/IconsInCaption.java b/uitest/src/com/vaadin/tests/components/caption/IconsInCaption.java index 46539b42d7..daf472914b 100644 --- a/uitest/src/com/vaadin/tests/components/caption/IconsInCaption.java +++ b/uitest/src/com/vaadin/tests/components/caption/IconsInCaption.java @@ -106,7 +106,7 @@ public class IconsInCaption extends TestBase { ComponentContainer container = containerClass.newInstance(); for (String size : sizes) { Label title = new Label("<h3>" + size + "x" + size + "</h3>", - ContentMode.XHTML); + ContentMode.HTML); container.addComponent(title); for (String icon : icons) { ThemeResource res = new ThemeResource("../runo/icons/" + size diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java b/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java index b9c222247b..6393115c47 100644 --- a/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java @@ -58,7 +58,7 @@ public class ComboFocusBlurEvents extends TestBase { Label output = new Label(log); output.setCaption("Events:"); - output.setContentMode(ContentMode.XHTML); + output.setContentMode(ContentMode.HTML); addComponent(output); } diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/ClipContent.java b/uitest/src/com/vaadin/tests/components/customcomponent/ClipContent.java index 094a63c163..b5c6926308 100644 --- a/uitest/src/com/vaadin/tests/components/customcomponent/ClipContent.java +++ b/uitest/src/com/vaadin/tests/components/customcomponent/ClipContent.java @@ -15,7 +15,7 @@ public class ClipContent extends TestBase { Label text = new Label( "1_long_line_that_should_be_clipped<br/>2_long_line_that_should_be_clipped<br/>3_long_line_that_should_be_clipped<br/>4_long_line_that_should_be_clipped<br/>", - ContentMode.XHTML); + ContentMode.HTML); final CustomComponent cc = new CustomComponent(text); cc.setWidth("20px"); diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java index 8bc9887b82..542a844434 100644 --- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java +++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java @@ -37,7 +37,7 @@ public class DateFieldEmptyValid extends TestBase { @Override protected void setup() { - addComponent(new Label("<br/><br/>", ContentMode.XHTML)); + addComponent(new Label("<br/><br/>", ContentMode.HTML)); log = new Log(8); addComponent(log); df = new MyDateField(); diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/com/vaadin/tests/components/label/LabelModes.java index 207a9a8de7..e5bc539f36 100644 --- a/uitest/src/com/vaadin/tests/components/label/LabelModes.java +++ b/uitest/src/com/vaadin/tests/components/label/LabelModes.java @@ -29,7 +29,7 @@ public class LabelModes extends ComponentTestCase<Label> { addTestComponent(l); l = createLabel("This label contains\nnewlines and spaces\nand is in\nhtml mode"); - l.setContentMode(ContentMode.XHTML); + l.setContentMode(ContentMode.HTML); l.setWidth(null); addTestComponent(l); diff --git a/uitest/src/com/vaadin/tests/components/label/LabelTest.java b/uitest/src/com/vaadin/tests/components/label/LabelTest.java index 186b3deeb3..4b213b7a42 100644 --- a/uitest/src/com/vaadin/tests/components/label/LabelTest.java +++ b/uitest/src/com/vaadin/tests/components/label/LabelTest.java @@ -78,7 +78,7 @@ public class LabelTest extends AbstractComponentTest<Label> implements options.put("Raw", ContentMode.RAW); options.put("UIDL", ContentMode.XML); // Deprecated UIDL mode still used // to avoid breaking old tests - options.put("XHTML", ContentMode.XHTML); + options.put("XHTML", ContentMode.HTML); options.put("XML", ContentMode.XML); createSelectAction("Content mode", category, options, "Text", diff --git a/uitest/src/com/vaadin/tests/components/label/Labels.java b/uitest/src/com/vaadin/tests/components/label/Labels.java index 1da588576b..cd6976543a 100644 --- a/uitest/src/com/vaadin/tests/components/label/Labels.java +++ b/uitest/src/com/vaadin/tests/components/label/Labels.java @@ -38,13 +38,13 @@ public class Labels extends ComponentTestCase<Label> { l = createLabel( "<div style='border: 1px solid red'><h1>Hello\n\n\n</h1><p/><h2>I am a rich Label</h3></div>", "This is an XHTML label with rich content"); - l.setContentMode(ContentMode.XHTML); + l.setContentMode(ContentMode.HTML); addTestComponent(l); l = createLabel( "<div style='border: 1px solid blue'><h1>Hello</h1><p/><h2>I am a rich Label</h3></div>", "This is an XHTML label with fixed 200px width and rich content"); - l.setContentMode(ContentMode.XHTML); + l.setContentMode(ContentMode.HTML); l.setWidth("200px"); addTestComponent(l); diff --git a/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java index 060c937feb..12fbc36fbb 100644 --- a/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java +++ b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java @@ -16,23 +16,23 @@ public class MarginsInLabels extends AbstractTestUI { protected void setup(WrappedRequest request) { AbstractLayout layout = new VerticalLayout(); layout.addComponent(new Label("<h1>Vertical layout</h1>", - ContentMode.XHTML)); + ContentMode.HTML)); layout.addComponent(new Label("Next row")); addComponent(layout); layout = new GridLayout(1, 2); layout.setWidth("100%"); - layout.addComponent(new Label("<h1>Grid layout</h1>", ContentMode.XHTML)); + layout.addComponent(new Label("<h1>Grid layout</h1>", ContentMode.HTML)); layout.addComponent(new Label("Next row")); addComponent(layout); TabSheet tabSheet = new TabSheet(); - tabSheet.addTab(new Label("<h1>Tabsheet</h1>", ContentMode.XHTML), + tabSheet.addTab(new Label("<h1>Tabsheet</h1>", ContentMode.HTML), "Label"); addComponent(tabSheet); Accordion accordion = new Accordion(); - accordion.addTab(new Label("<h1>Accordion</h1>", ContentMode.XHTML), + accordion.addTab(new Label("<h1>Accordion</h1>", ContentMode.HTML), "Label"); addComponent(accordion); } diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java index 01d67ae377..3227676e11 100644 --- a/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java @@ -185,7 +185,7 @@ public class BoxLayoutTest extends AbstractTestUI { } }); layout.addComponent(width); - layout.addComponent(new Label("×", ContentMode.XHTML)); + layout.addComponent(new Label("×", ContentMode.HTML)); final NativeSelect height = new NativeSelect(null, sizes); height.setImmediate(true); height.addListener(new ValueChangeListener() { @@ -295,7 +295,7 @@ public class BoxLayoutTest extends AbstractTestUI { } }); component.addComponent(componentWidth); - component.addComponent(new Label("×", ContentMode.XHTML)); + component.addComponent(new Label("×", ContentMode.HTML)); componentHeight = new NativeSelect(null, sizes); componentHeight.setImmediate(true); diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java index de65e260b6..99c80fe4c1 100644 --- a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java @@ -33,7 +33,7 @@ public class LayoutResizeTest extends TestBase { left.setMargin(true); left.addComponent(new Label("<h2>Layout resize test</h2>", - ContentMode.XHTML)); + ContentMode.HTML)); Button resize = new Button("Resize to 700x400", new Button.ClickListener() { diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java b/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java index a4cba89732..9b0f8beefe 100644 --- a/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java +++ b/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java @@ -40,7 +40,7 @@ public class PanelShouldNotScroll extends TestBase { panel.addComponent(new Label( "fooooooooo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>" + "foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>foo<br/>", - ContentMode.XHTML)); + ContentMode.HTML)); return panel; } diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java index 01ed34a13f..03f4a072b7 100644 --- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java +++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java @@ -73,7 +73,7 @@ public class PopupViewOffScreen extends TestBase { Label l = new Label( "<div style='width: 100%; height: 100%; background: " + bg + "'>" + LoremIpsum.get(2000) + "</div>", - ContentMode.XHTML); + ContentMode.HTML); l.setSizeFull(); p.addComponent(l); PopupView pv = new PopupView("Click here to popup", p); diff --git a/uitest/src/com/vaadin/tests/components/table/EditableTableLeak.java b/uitest/src/com/vaadin/tests/components/table/EditableTableLeak.java index 26ac23d5be..b80da2a78c 100644 --- a/uitest/src/com/vaadin/tests/components/table/EditableTableLeak.java +++ b/uitest/src/com/vaadin/tests/components/table/EditableTableLeak.java @@ -26,7 +26,7 @@ public class EditableTableLeak extends TestBase { private final Table table = new Table("ISO-3166 Country Codes and flags"); private final CheckBox useFieldFactory = new CheckBox( "Use a caching TableFieldFactory"); - private final Label sizeLabel = new Label("", ContentMode.XHTML); + private final Label sizeLabel = new Label("", ContentMode.HTML); private long size = 0; diff --git a/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index 99ad913674..a90de777cd 100644 --- a/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -37,7 +37,7 @@ public class LabelEmbeddedClickThroughForTable extends TestBase { item.getItemProperty("Column 1").setValue("String A"); item.getItemProperty("Column 2").setValue(new Label("Label A")); item.getItemProperty("Column 3").setValue( - new Label("<b>Label A</b>", ContentMode.XHTML)); + new Label("<b>Label A</b>", ContentMode.HTML)); item.getItemProperty("Column 4").setValue( new Embedded("An embedded image", new ThemeResource( "../runo/icons/32/ok.png"))); @@ -49,7 +49,7 @@ public class LabelEmbeddedClickThroughForTable extends TestBase { .setValue( new Label( "<a style=\"color: blue\" href=\"javascript:false\">Label A</a>", - ContentMode.XHTML)); + ContentMode.HTML)); item.getItemProperty("Column 4").setValue( new Embedded("", new ThemeResource( "../runo/icons/32/cancel.png"))); diff --git a/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java index 1c6862cf07..63ff00034f 100644 --- a/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java +++ b/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java @@ -32,7 +32,7 @@ public class TableInTabsheet extends AbstractTestUI { VerticalLayout vP = new VerticalLayout(); vP.setStyleName(Reindeer.LAYOUT_BLACK); - Label tit = new Label("<h1> Tab/Table Test</h1>", ContentMode.XHTML); + Label tit = new Label("<h1> Tab/Table Test</h1>", ContentMode.HTML); vP.addComponent(tit); return vP; diff --git a/uitest/src/com/vaadin/tests/components/table/Tables.java b/uitest/src/com/vaadin/tests/components/table/Tables.java index a08533fdbd..2f06351a81 100644 --- a/uitest/src/com/vaadin/tests/components/table/Tables.java +++ b/uitest/src/com/vaadin/tests/components/table/Tables.java @@ -272,7 +272,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> l.setWidth(col.width); if (col.html) { l.setValue(value); - l.setContentMode(ContentMode.XHTML); + l.setContentMode(ContentMode.HTML); } else { l.setValue(value); } diff --git a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java index c8c6911c1a..cfcf0e1996 100644 --- a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java +++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java @@ -74,7 +74,7 @@ public class LazyInitUIs extends AbstractTestUIProvider { info += "<br />parameters: " + request.getParameterMap().keySet(); info += "<br />uri fragment: " + request.getBrowserDetails().getUriFragment(); - return new Label(info, ContentMode.XHTML); + return new Label(info, ContentMode.HTML); } @Override diff --git a/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java b/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java index bacc4c131c..481862cbea 100644 --- a/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java +++ b/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java @@ -103,7 +103,7 @@ public class LazyWindowResize extends AbstractTestCase { mainWindow.addComponent(resizeListenerCheckBox); mainWindow.addComponent(immediateCheckBox); mainWindow.addComponent(log); - mainWindow.addComponent(new Label("<br/><br/>", ContentMode.XHTML)); + mainWindow.addComponent(new Label("<br/><br/>", ContentMode.HTML)); mainWindow.addComponent(new Label(LoremIpsum.get(10000))); setLazy(false); diff --git a/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java index 82761afa68..a9e3b5fa44 100644 --- a/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java +++ b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java @@ -136,7 +136,7 @@ public class LiferayThemeDemo extends Application { l.setMargin(true); l.setCaption("Labels"); - l.addComponent(new Label("Normal Label", ContentMode.XHTML)); + l.addComponent(new Label("Normal Label", ContentMode.HTML)); l.addComponent(new Label( "Lorem ipsum dolor sit amet, consectetur adipiscing elit.")); return l; @@ -217,12 +217,12 @@ public class LiferayThemeDemo extends Application { l.setWidth("400px"); l.setColumnExpandRatio(0, 1); - l.addComponent(new Label("Normal TextField", ContentMode.XHTML)); + l.addComponent(new Label("Normal TextField", ContentMode.HTML)); TextField tf = new TextField(); tf.setInputPrompt("Enter text"); l.addComponent(tf); - l.addComponent(new Label("Normal TextArea", ContentMode.XHTML)); + l.addComponent(new Label("Normal TextArea", ContentMode.HTML)); TextArea ta = new TextArea(); ta.setHeight("5em"); @@ -344,7 +344,7 @@ public class LiferayThemeDemo extends Application { l.setColumnExpandRatio(0, 2); l.setColumnExpandRatio(1, 5); - l.addComponent(new Label("Normal Panel", ContentMode.XHTML)); + l.addComponent(new Label("Normal Panel", ContentMode.HTML)); Panel p = new Panel("Normal Panel"); p.setHeight("100px"); @@ -353,7 +353,7 @@ public class LiferayThemeDemo extends Application { l.addComponent(new Label( "Light Style (<code>LiferayTheme.PANEL_LIGHT</code>)", - ContentMode.XHTML)); + ContentMode.HTML)); Panel p2 = new Panel("Light Style Panel"); p2.setStyleName(LiferayTheme.PANEL_LIGHT); @@ -416,7 +416,7 @@ public class LiferayThemeDemo extends Application { w2.setPositionX(350); w2.setPositionY(160); w2.addComponent(new Label("<code>Window.setResizable(false)</code>", - ContentMode.XHTML)); + ContentMode.HTML)); tabs.addListener(new TabSheet.SelectedTabChangeListener() { @Override @@ -448,7 +448,7 @@ public class LiferayThemeDemo extends Application { l.addComponent(lockCheckBox, 1, 0); l.newLine(); - Label label = new Label("Normal SplitPanel", ContentMode.XHTML); + Label label = new Label("Normal SplitPanel", ContentMode.HTML); label.setWidth(null); l.addComponent(label); final HorizontalSplitPanel sp = new HorizontalSplitPanel(); @@ -461,7 +461,7 @@ public class LiferayThemeDemo extends Application { label = new Label( "Small Style<br />(<code>LiferayTheme.SPLITPANEL_SMALL</code>)", - ContentMode.XHTML); + ContentMode.HTML); label.setWidth(null); l.addComponent(label); @@ -522,7 +522,7 @@ public class LiferayThemeDemo extends Application { l.setWidth("400px"); l.setColumnExpandRatio(0, 1); - l.addComponent(new Label("Horizontal Slider", ContentMode.XHTML)); + l.addComponent(new Label("Horizontal Slider", ContentMode.HTML)); Slider s = new Slider(); s.setWidth("200px"); try { @@ -533,7 +533,7 @@ public class LiferayThemeDemo extends Application { } l.addComponent(s); - l.addComponent(new Label("Vertical Slider", ContentMode.XHTML)); + l.addComponent(new Label("Vertical Slider", ContentMode.HTML)); s = new Slider(); s.setOrientation(SliderOrientation.VERTICAL); s.setHeight("200px"); @@ -595,10 +595,10 @@ public class LiferayThemeDemo extends Application { message.setValue("Jumped over the lazy dog."); message.setWidth("15em"); - l.addComponent(new Label("<h3>Type</h3>", ContentMode.XHTML)); - l.addComponent(new Label("<h3>Preview</h3>", ContentMode.XHTML)); + l.addComponent(new Label("<h3>Type</h3>", ContentMode.HTML)); + l.addComponent(new Label("<h3>Preview</h3>", ContentMode.HTML)); - l.addComponent(new Label("Humanized", ContentMode.XHTML)); + l.addComponent(new Label("Humanized", ContentMode.HTML)); Button show = new Button("Humanized Notification", new Button.ClickListener() { @Override @@ -611,7 +611,7 @@ public class LiferayThemeDemo extends Application { }); l.addComponent(show); - l.addComponent(new Label("Warning", ContentMode.XHTML)); + l.addComponent(new Label("Warning", ContentMode.HTML)); show = new Button("Warning Notification", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -623,7 +623,7 @@ public class LiferayThemeDemo extends Application { }); l.addComponent(show); - l.addComponent(new Label("Error", ContentMode.XHTML)); + l.addComponent(new Label("Error", ContentMode.HTML)); show = new Button("Error Notification", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -635,7 +635,7 @@ public class LiferayThemeDemo extends Application { }); l.addComponent(show); - l.addComponent(new Label("Tray", ContentMode.XHTML)); + l.addComponent(new Label("Tray", ContentMode.HTML)); show = new Button("Tray Notification", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/uitest/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java index dc0c8958ea..2b7fc273ad 100644 --- a/uitest/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java +++ b/uitest/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java @@ -42,7 +42,7 @@ public class HiddenHorizontalLayout extends TestBase { + "3. Click \"toggle layout visibility\"<br>" + "4. Resize browser window to full <br/>" + "5. Click \"toggle layout visibility\"<br/>", - ContentMode.XHTML); + ContentMode.HTML); vl.addComponent(l); Button b = new Button("toggle layout visibility", new Button.ClickListener() { diff --git a/uitest/src/com/vaadin/tests/layouts/TestLayoutPerformance.java b/uitest/src/com/vaadin/tests/layouts/TestLayoutPerformance.java index 85ecf2897b..f80d91ae1b 100644 --- a/uitest/src/com/vaadin/tests/layouts/TestLayoutPerformance.java +++ b/uitest/src/com/vaadin/tests/layouts/TestLayoutPerformance.java @@ -34,12 +34,12 @@ public class TestLayoutPerformance extends TestBase { @Override protected void setup() { Label label = new Label("<h1>CssLayout performance test.</h1>", - ContentMode.XHTML); + ContentMode.HTML); getLayout().addComponent(label); label = new Label( "<em>Hint</em>. Use debug dialog to measure rendering times TODO: extend with size settings (to both layout and content).", - ContentMode.XHTML); + ContentMode.HTML); getLayout().addComponent(label); ns = new NativeSelect("Select component to test"); diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java index 0042f0ba11..2362653ce1 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java @@ -115,7 +115,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { final AbstractComponent c1 = new Button("BUTTON"); final AbstractComponent c2 = new Label("<b>LABEL</b>", - ContentMode.XHTML); + ContentMode.HTML); final AbstractComponent c3 = new Table("TABLE"); c3.setHeight("100px"); c3.setWidth("100%"); diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java index 3e668289fe..62dc85e8ad 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java @@ -47,7 +47,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { ((TextField) components[i]).setValue("FIELD " + i); vlo.addComponent(components[i]); vlo.setComponentAlignment(components[i], alignments[i]); - vlo.addComponent(new Label("<hr />", ContentMode.XHTML)); + vlo.addComponent(new Label("<hr />", ContentMode.HTML)); } baseLayout.addComponent(vlo); vlo = getTestLaytout(); @@ -56,7 +56,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { ((TextField) components[i]).setValue("FIELD " + i); vlo.addComponent(components[i]); vlo.setComponentAlignment(components[i], alignments[i]); - vlo.addComponent(new Label("<hr />", ContentMode.XHTML)); + vlo.addComponent(new Label("<hr />", ContentMode.HTML)); } baseLayout.addComponent(vlo); return baseLayout; @@ -116,7 +116,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { final AbstractComponent c1 = new Button("BUTTON"); final AbstractComponent c2 = new Label("<b>LABEL</b>", - ContentMode.XHTML); + ContentMode.HTML); final AbstractComponent c3 = new Table("TABLE"); c3.setHeight("100px"); c3.setWidth("100%"); @@ -278,7 +278,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { vlo2.addComponent(c1); vlo2.addComponent(new Label( "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>", - ContentMode.XHTML)); + ContentMode.HTML)); vlo2.addComponent(c2); vlo2.setExpandRatio(c1, 0.5f); vlo2.setExpandRatio(c2, 0.5f); @@ -475,7 +475,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { // Must add something around the hr to avoid the margins collapsing vlo2.addComponent(new Label( "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>", - ContentMode.XHTML)); + ContentMode.HTML)); vlo2.addComponent(c2); vlo2.setExpandRatio(c1, 0.5f); vlo2.setExpandRatio(c2, 0.5f); diff --git a/uitest/src/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/com/vaadin/tests/serialization/SerializerTest.java index cb9d9e997d..a614b99b20 100644 --- a/uitest/src/com/vaadin/tests/serialization/SerializerTest.java +++ b/uitest/src/com/vaadin/tests/serialization/SerializerTest.java @@ -125,7 +125,7 @@ public class SerializerTest extends AbstractTestUI { rpc.sendEnum(ContentMode.TEXT, new ContentMode[] { ContentMode.PREFORMATTED, ContentMode.XML }, - Arrays.asList(ContentMode.XHTML, ContentMode.RAW)); + Arrays.asList(ContentMode.HTML, ContentMode.RAW)); testExtension.registerRpc(new SerializerTestRpc() { @Override diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java index c09fd07837..28b2728021 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java @@ -46,7 +46,7 @@ public class Ticket1225 extends Application { Label red = new Label( "<div style='background:red;width:100%;height:100%;'>??</div>", - ContentMode.XHTML); + ContentMode.HTML); // red.setCaption("cap"); // red.setSizeFull(); @@ -59,7 +59,7 @@ public class Ticket1225 extends Application { ts.getTab(red).setCaption("REd tab"); Label l = new Label("<div style='background:blue;'>sdf</div>", - ContentMode.XHTML); + ContentMode.HTML); el.addComponent(l); el.setComponentAlignment(l, Alignment.MIDDLE_RIGHT); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket124.java b/uitest/src/com/vaadin/tests/tickets/Ticket124.java index fb2903b3f7..659ac40690 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket124.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket124.java @@ -49,7 +49,7 @@ public class Ticket124 extends Application { gl.addComponent(new Label("0,0-1,0"), 0, 0, 1, 0); gl.addComponent(new Label("2,0-3,0"), 2, 0, 3, 0); Label l = new Label("Large cell 0,1-2,2<br/>yadayada<br/>lorem ipsum"); - l.setContentMode(ContentMode.XHTML); + l.setContentMode(ContentMode.HTML); gl.addComponent(l, 0, 1, 2, 2); gl.addComponent(new Label("3-1"), 3, 1); gl.addComponent(new Label("3,2-3,3"), 3, 2, 3, 3); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java index 256b519371..4ca82deafb 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java @@ -21,7 +21,7 @@ public class Ticket1444 extends Application { Label red = new Label( "<div style='background:red;width:100%;height:100%;'>??</div>", - ContentMode.XHTML); + ContentMode.HTML); red.setSizeFull(); ol.addComponent(red); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java index 631e8e4309..a01d0ab56d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java @@ -109,7 +109,7 @@ public class Ticket1804 extends com.vaadin.Application { Window w = new Window("Status of the fields"); w.setModal(true); w.setHeight("80%"); - w.addComponent(new Label(msg.toString(), ContentMode.XHTML)); + w.addComponent(new Label(msg.toString(), ContentMode.HTML)); main.addWindow(w); } }); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java index 837f0d787b..ecc711a332 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java @@ -72,7 +72,7 @@ public class Ticket1811 extends com.vaadin.Application { } Window w = new Window("Status of the fields"); w.setModal(true); - w.addComponent(new Label(msg.toString(), ContentMode.XHTML)); + w.addComponent(new Label(msg.toString(), ContentMode.HTML)); main.addWindow(w); } }); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java index fd6e7ccd45..92f19d6113 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java @@ -58,7 +58,7 @@ public class Ticket1819 extends com.vaadin.Application { } Window w = new Window("Status of the fields"); w.setModal(true); - w.addComponent(new Label(msg.toString(), ContentMode.XHTML)); + w.addComponent(new Label(msg.toString(), ContentMode.HTML)); main.addWindow(w); } }); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java index 839e9e683c..0cd91f518d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java @@ -65,11 +65,11 @@ public class Ticket1970 extends Application { } })); w.addComponent(new Label("<a href='" + getURL().toExternalForm() + "'>" - + getURL().toExternalForm() + "</a>", ContentMode.XHTML)); + + getURL().toExternalForm() + "</a>", ContentMode.HTML)); w.addComponent(new Label( "<h2>How to reproduce</h2>Open the above link in another browser" + " window and then press the Show-button on this window.", - ContentMode.XHTML)); + ContentMode.HTML)); return w; } diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java index e4365c3edb..c218e71a43 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java @@ -56,7 +56,7 @@ public class Ticket2117 extends Application { + "'>" + getURL().toExternalForm() + "</a> which opens new windows to this uri. They should end up having a separate Window and URL.", - ContentMode.XHTML)); + ContentMode.HTML)); return w; } } diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java index 34e734a9c3..fa7f0973fd 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java @@ -37,7 +37,7 @@ public class Ticket2240 extends Application { layout.setStyleName("borders"); // layout.setSizeFull(); final Label l = new Label(txt); - l.setContentMode(ContentMode.XHTML); + l.setContentMode(ContentMode.HTML); // l.setWidth("100%"); TextField tf = new TextField("This is a textField"); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2287.java b/uitest/src/com/vaadin/tests/tickets/Ticket2287.java index 59fc174215..211811a460 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2287.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2287.java @@ -18,13 +18,13 @@ public class Ticket2287 extends Ticket2292 { "Icon is built by servlet with a slow method, so it will show the bug (components not firing requestLayout).")); Label l = new Label(); - l.setContentMode(ContentMode.XHTML); + l.setContentMode(ContentMode.HTML); l.setValue("This is a label with as slow image. <img src=\"" + url + "/icon.png\" />"); main.addComponent(l); l = new Label(); - l.setContentMode(ContentMode.XHTML); + l.setContentMode(ContentMode.HTML); l.setValue("This is a label with as slow image. <img src=\"" + url + "/icon.png\" />"); main.addComponent(l); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java index b48d8164c9..03d5c0d0ee 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java @@ -21,7 +21,7 @@ public class Ticket2426 extends Application { w.addComponent(new Label("CONTENT_RAW: " + content, ContentMode.RAW)); w.addComponent(new Label("CONTENT_TEXT: " + content, ContentMode.TEXT)); w.addComponent(new Label("CONTENT_XML: " + content, ContentMode.XML)); - w.addComponent(new Label("CONTENT_XHTML: " + content, ContentMode.XHTML)); + w.addComponent(new Label("CONTENT_XHTML: " + content, ContentMode.HTML)); } diff --git a/uitest/src/com/vaadin/tests/util/Log.java b/uitest/src/com/vaadin/tests/util/Log.java index 7a58a4c80c..54e266fa40 100644 --- a/uitest/src/com/vaadin/tests/util/Log.java +++ b/uitest/src/com/vaadin/tests/util/Log.java @@ -50,7 +50,7 @@ public class Log extends VerticalLayout { } private Label createEventLabel() { - Label l = new Label(" ", ContentMode.XHTML); + Label l = new Label(" ", ContentMode.HTML); l.setWidth(null); return l; } diff --git a/uitest/src/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/com/vaadin/tests/util/SampleDirectory.java index 609606b501..140f778551 100644 --- a/uitest/src/com/vaadin/tests/util/SampleDirectory.java +++ b/uitest/src/com/vaadin/tests/util/SampleDirectory.java @@ -82,7 +82,7 @@ public class SampleDirectory { errorPanel.setStyleName("strong"); errorPanel.setComponentError(new SystemError( "Cannot provide sample directory")); - errorPanel.addComponent(new Label(errorMessage, ContentMode.XHTML)); + errorPanel.addComponent(new Label(errorMessage, ContentMode.HTML)); // Remove all components from applications main window uI.getContent().removeAllComponents(); // Add error panel |