summaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/tests/util
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-11-13 18:08:29 +0200
committerArtur Signell <artur@vaadin.com>2012-11-13 18:18:40 +0200
commit391884746fda1781c55b13bc200dd75373f69141 (patch)
tree0d5a8dcd9d13c5c39813d81252506e12d72741af /uitest/src/com/vaadin/tests/util
parent4628bcc3062ef19ed9d561f79fe3bfb3696d6e04 (diff)
downloadvaadin-framework-391884746fda1781c55b13bc200dd75373f69141.tar.gz
vaadin-framework-391884746fda1781c55b13bc200dd75373f69141.zip
UI based on AbstractBasicComponentContainer (#2924)
Change-Id: I1614a3464b8e7a0e9ecdd8c3a76335cdb85bdf87
Diffstat (limited to 'uitest/src/com/vaadin/tests/util')
-rw-r--r--uitest/src/com/vaadin/tests/util/SampleDirectory.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/uitest/src/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/com/vaadin/tests/util/SampleDirectory.java
index 504a4e5dfd..2f21026118 100644
--- a/uitest/src/com/vaadin/tests/util/SampleDirectory.java
+++ b/uitest/src/com/vaadin/tests/util/SampleDirectory.java
@@ -23,8 +23,8 @@ import com.vaadin.server.VaadinService;
import com.vaadin.server.VaadinServiceSession;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.UI;
/**
* Provides sample directory based on application directory. If this fails then
@@ -42,7 +42,8 @@ public class SampleDirectory {
* @param application
* @return file pointing to sample directory
*/
- public static File getDirectory(VaadinServiceSession application, UI uI) {
+ public static File getDirectory(VaadinServiceSession application,
+ LegacyWindow uI) {
String errorMessage = "Access to application "
+ "context base directory failed, "
+ "possible security constraint with Application "
@@ -82,9 +83,9 @@ public class SampleDirectory {
"Cannot provide sample directory"));
errorPanel.addComponent(new Label(errorMessage, ContentMode.HTML));
// Remove all components from applications main window
- uI.getContent().removeAllComponents();
+ uI.removeAllComponents();
// Add error panel
- uI.getContent().addComponent(errorPanel);
+ uI.addComponent(errorPanel);
return null;
}
}