summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-08-24 08:52:20 +0300
committerArtur Signell <artur@vaadin.com>2012-08-24 13:23:17 +0300
commit066491f708fd303c604b2bee7cbd46a8342f71bf (patch)
tree7551fc1dbc8675d0ceee844871efc27879afaffb /tests
parentda176c32c4d92676424021712a7f6d7ee8cedf76 (diff)
downloadvaadin-framework-066491f708fd303c604b2bee7cbd46a8342f71bf.tar.gz
vaadin-framework-066491f708fd303c604b2bee7cbd46a8342f71bf.zip
Rename Root related classes and package to UI (#8908)
Automatic renames in Eclipse of: - package com.vaadin.terminal.gwt.client.ui.root to .UI - RootConnector to UIConnector - RootServerRpc to UIServerRpc - RootState to UIState - VRoot to VUI - RootRequiresMoreInformationException to UIRequiresMoreInformationException
Diffstat (limited to 'tests')
-rw-r--r--tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java4
-rw-r--r--tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java4
-rw-r--r--tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java4
-rw-r--r--tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java4
-rw-r--r--tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java6
-rw-r--r--tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java4
-rw-r--r--tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java6
7 files changed, 16 insertions, 16 deletions
diff --git a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java b/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
index 9fe486f85e..27d66ca0d0 100644
--- a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
+++ b/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
@@ -10,7 +10,7 @@ import org.easymock.EasyMock;
import com.vaadin.Application;
import com.vaadin.Application.ApplicationStartEvent;
-import com.vaadin.RootRequiresMoreInformationException;
+import com.vaadin.UIRequiresMoreInformationException;
import com.vaadin.terminal.DefaultRootProvider;
import com.vaadin.terminal.DeploymentConfiguration;
import com.vaadin.terminal.WrappedRequest;
@@ -127,7 +127,7 @@ public class CustomRootClassLoader extends TestCase {
@Override
public UI getRootForRequest(WrappedRequest request)
- throws RootRequiresMoreInformationException {
+ throws UIRequiresMoreInformationException {
// Always create a new root for testing (can't directly use
// getRoot as it's protected)
return getRoot(request);
diff --git a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java
index 2ac447cee3..43d4ad699e 100644
--- a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.vaadin.Application;
-import com.vaadin.RootRequiresMoreInformationException;
+import com.vaadin.UIRequiresMoreInformationException;
import com.vaadin.terminal.AbstractRootProvider;
import com.vaadin.terminal.WrappedRequest;
import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
@@ -117,7 +117,7 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
@Override
public Class<? extends UI> getRootClass(
Application application, WrappedRequest request)
- throws RootRequiresMoreInformationException {
+ throws UIRequiresMoreInformationException {
return (Class<? extends UI>) classToRun;
}
});
diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
index 023a93438d..deff2bc486 100644
--- a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
+++ b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.application;
import com.vaadin.Application;
-import com.vaadin.RootRequiresMoreInformationException;
+import com.vaadin.UIRequiresMoreInformationException;
import com.vaadin.terminal.AbstractRootProvider;
import com.vaadin.terminal.WrappedRequest;
import com.vaadin.tests.components.AbstractTestApplication;
@@ -27,7 +27,7 @@ public class RefreshStatePreserve extends AbstractTestApplication {
@Override
public Class<? extends UI> getRootClass(Application application,
WrappedRequest request)
- throws RootRequiresMoreInformationException {
+ throws UIRequiresMoreInformationException {
return RefreshStateRoot.class;
}
});
diff --git a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java
index 3323e3bb28..96380b2185 100644
--- a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java
+++ b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.application;
import com.vaadin.Application;
-import com.vaadin.RootRequiresMoreInformationException;
+import com.vaadin.UIRequiresMoreInformationException;
import com.vaadin.terminal.ApplicationResource;
import com.vaadin.terminal.DownloadStream;
import com.vaadin.terminal.PaintException;
@@ -78,7 +78,7 @@ public class ThreadLocalInstances extends AbstractTestApplication {
@Override
protected UI getRoot(WrappedRequest request)
- throws RootRequiresMoreInformationException {
+ throws UIRequiresMoreInformationException {
return mainWindow;
}
diff --git a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java
index aca7211aec..3c7862d298 100644
--- a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java
+++ b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java
@@ -1,6 +1,6 @@
package com.vaadin.tests.components.root;
-import com.vaadin.RootRequiresMoreInformationException;
+import com.vaadin.UIRequiresMoreInformationException;
import com.vaadin.annotations.EagerInit;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.terminal.ExternalResource;
@@ -23,13 +23,13 @@ public class LazyInitRoots extends AbstractTestApplication {
@Override
public UI getRoot(WrappedRequest request)
- throws RootRequiresMoreInformationException {
+ throws UIRequiresMoreInformationException {
if (request.getParameter("lazyCreate") != null) {
// UI created on second request
BrowserDetails browserDetails = request.getBrowserDetails();
if (browserDetails == null
|| browserDetails.getUriFragment() == null) {
- throw new RootRequiresMoreInformationException();
+ throw new UIRequiresMoreInformationException();
} else {
UI uI = new UI() {
@Override
diff --git a/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java b/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java
index 4309b6e942..13bef59fe9 100644
--- a/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java
+++ b/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.root;
import com.vaadin.Application;
-import com.vaadin.RootRequiresMoreInformationException;
+import com.vaadin.UIRequiresMoreInformationException;
import com.vaadin.terminal.AbstractRootProvider;
import com.vaadin.terminal.WrappedRequest;
import com.vaadin.tests.components.AbstractTestApplication;
@@ -27,7 +27,7 @@ public class RootsInMultipleTabs extends AbstractTestApplication {
@Override
public Class<? extends UI> getRootClass(Application application,
WrappedRequest request)
- throws RootRequiresMoreInformationException {
+ throws UIRequiresMoreInformationException {
return TabRoot.class;
}
});
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
index a601ff2eb4..6b25f4674d 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
@@ -17,7 +17,7 @@
package com.vaadin.tests.minitutorials.v7a1;
import com.vaadin.Application;
-import com.vaadin.RootRequiresMoreInformationException;
+import com.vaadin.UIRequiresMoreInformationException;
import com.vaadin.terminal.WrappedRequest;
import com.vaadin.terminal.WrappedRequest.BrowserDetails;
import com.vaadin.terminal.gwt.server.WebBrowser;
@@ -36,12 +36,12 @@ public class DifferentFeaturesForDifferentClients extends Application {
@Override
protected UI getRoot(WrappedRequest request)
- throws RootRequiresMoreInformationException {
+ throws UIRequiresMoreInformationException {
BrowserDetails browserDetails = request.getBrowserDetails();
// This is a limitation of 7.0.0.alpha1 that there is no better way to
// check if WebBrowser has been fully initialized
if (browserDetails.getUriFragment() == null) {
- throw new RootRequiresMoreInformationException();
+ throw new UIRequiresMoreInformationException();
}
// could also use screen size, browser version etc.