Browse Source

Remove invalid constructors and fix setCaption exception (#9947)

Change-Id: I2d2a73ab4e421b873e401a1d05b81d968fd907a2
tags/7.0.0.beta6
Leif Åstrand 11 years ago
parent
commit
f5166895cb
1 changed files with 5 additions and 35 deletions
  1. 5
    35
      server/src/com/vaadin/ui/UI.java

+ 5
- 35
server/src/com/vaadin/ui/UI.java View File

@@ -114,7 +114,8 @@ public abstract class UI extends AbstractComponentContainer implements
* the caption of the window
*/
public LegacyWindow(String caption) {
super(caption);
super();
setCaption(caption);
}

/**
@@ -124,7 +125,8 @@ public abstract class UI extends AbstractComponentContainer implements
* @param content
*/
public LegacyWindow(String caption, ComponentContainer content) {
super(caption, content);
super(content);
setCaption(caption);
}

@Override
@@ -530,38 +532,6 @@ public abstract class UI extends AbstractComponentContainer implements
setContent(content);
}

/**
* Creates a new empty UI with the given caption. This UI will have a
* {@link VerticalLayout} with margins enabled as its content.
*
* @param caption
* the caption of the UI, used as the page title if there's
* nothing but the application on the web page
*
* @see #setCaption(String)
*/
public UI(String caption) {
this((ComponentContainer) null);
setCaption(caption);
}

/**
* Creates a new UI with the given caption and content.
*
* @param caption
* the caption of the UI, used as the page title if there's
* nothing but the application on the web page
* @param content
* the content container to use as this UIs content.
*
* @see #setContent(ComponentContainer)
* @see #setCaption(String)
*/
public UI(String caption, ComponentContainer content) {
this(content);
setCaption(caption);
}

@Override
protected UIState getState() {
return (UIState) super.getState();
@@ -1219,7 +1189,7 @@ public abstract class UI extends AbstractComponentContainer implements
@Override
@Deprecated
public void setCaption(String caption) {
throw new IllegalStateException(
throw new UnsupportedOperationException(
"You can not set the title of a UI. To set the title of the HTML page, use Page.setTitle");
}


Loading…
Cancel
Save