@@ -6,7 +6,7 @@ | |||
<portlet> | |||
<portlet-name>JSR286TestPortlet</portlet-name> | |||
<display-name>Vaadin Portlet 2.0 Test</display-name> | |||
<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class> | |||
<portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class> | |||
<init-param> | |||
<name>application</name> | |||
<value>com.vaadin.tests.integration.JSR286PortletApplication</value> | |||
@@ -44,7 +44,7 @@ | |||
<portlet-name>Vaadin Liferay Theme Portlet</portlet-name> | |||
<display-name>Vaadin Liferay Theme</display-name> | |||
<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class> | |||
<portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class> | |||
<init-param> | |||
<name>application</name> | |||
<value>com.vaadin.tests.integration.LiferayThemeDemo</value> |
@@ -28,7 +28,7 @@ | |||
<!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet --> | |||
<servlet> | |||
<servlet-name>IntegrationTest</servlet-name> | |||
<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> | |||
<servlet-class>com.vaadin.server.ApplicationServlet</servlet-class> | |||
<init-param> | |||
<param-name>application</param-name> | |||
<param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value> |
@@ -38,10 +38,10 @@ import com.google.gwt.user.rebind.SourceWriter; | |||
import com.vaadin.client.ServerConnector; | |||
import com.vaadin.client.ui.UnknownComponentConnector; | |||
import com.vaadin.client.ui.UI.UIConnector; | |||
import com.vaadin.server.ClientConnector; | |||
import com.vaadin.shared.Connector; | |||
import com.vaadin.shared.ui.Connect; | |||
import com.vaadin.shared.ui.Connect.LoadStyle; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
/** | |||
* WidgetMapGenerator's are GWT generator to build WidgetMapImpl dynamically |
@@ -146,7 +146,7 @@ public class ApplicationConfiguration implements EntryPoint { | |||
* | |||
* @return a string with the version | |||
* | |||
* @see com.vaadin.terminal.gwt.server.AbstractApplicationServlet#VERSION | |||
* @see com.vaadin.server.AbstractApplicationServlet#VERSION | |||
*/ | |||
private native String getVaadinVersion() | |||
/*-{ |
@@ -86,7 +86,7 @@ import com.vaadin.shared.ui.ui.UIConstants; | |||
/** | |||
* This is the client side communication "engine", managing client-server | |||
* communication with its server side counterpart | |||
* com.vaadin.terminal.gwt.server.AbstractCommunicationManager. | |||
* com.vaadin.server.AbstractCommunicationManager. | |||
* | |||
* Client-side connectors receive updates from the corresponding server-side | |||
* connector (typically component) as state updates or RPC calls. The connector |
@@ -41,7 +41,7 @@ public interface JSONSerializer<T> { | |||
* Creates and deserializes an object received from the server. Must be | |||
* compatible with {@link #serialize(Object, ConnectorMap)} and also with | |||
* the server side JsonCodec.encode(Object, | |||
* com.vaadin.terminal.gwt.server.PaintableIdMapper) . | |||
* com.vaadin.server.PaintableIdMapper) . | |||
* | |||
* @param jsonValue | |||
* JSON map from property name to property value | |||
@@ -54,7 +54,7 @@ public interface JSONSerializer<T> { | |||
* Serialize the given object into JSON. Must be compatible with | |||
* {@link #deserialize(JSONObject, ConnectorMap)} and also with the server | |||
* side JsonCodec.decode(com.vaadin.external.json.JSONArray, | |||
* com.vaadin.terminal.gwt.server.PaintableIdMapper) | |||
* com.vaadin.server.PaintableIdMapper) | |||
* | |||
* @param value | |||
* The object to serialize |
@@ -36,8 +36,8 @@ public class ComboBoxConnector extends AbstractFieldConnector implements | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.terminal | |||
* .gwt.client.UIDL, com.vaadin.client.ApplicationConnection) | |||
* @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.client.UIDL, | |||
* com.vaadin.client.ApplicationConnection) | |||
*/ | |||
@Override | |||
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { |
@@ -53,9 +53,8 @@ public class TableConnector extends AbstractComponentContainerConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see | |||
* com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.terminal | |||
* .gwt.client.UIDL, com.vaadin.client.ApplicationConnection) | |||
* @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.client.UIDL, | |||
* com.vaadin.client.ApplicationConnection) | |||
*/ | |||
@Override | |||
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { |
@@ -51,27 +51,27 @@ import com.vaadin.data.util.converter.Converter; | |||
import com.vaadin.data.util.converter.ConverterFactory; | |||
import com.vaadin.data.util.converter.DefaultConverterFactory; | |||
import com.vaadin.event.EventRouter; | |||
import com.vaadin.server.AbstractApplicationServlet; | |||
import com.vaadin.server.AbstractErrorMessage; | |||
import com.vaadin.server.ApplicationResource; | |||
import com.vaadin.server.BootstrapFragmentResponse; | |||
import com.vaadin.server.BootstrapListener; | |||
import com.vaadin.server.BootstrapPageResponse; | |||
import com.vaadin.server.BootstrapResponse; | |||
import com.vaadin.server.ChangeVariablesErrorEvent; | |||
import com.vaadin.server.ClientConnector; | |||
import com.vaadin.server.CombinedRequest; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.RequestHandler; | |||
import com.vaadin.server.Terminal; | |||
import com.vaadin.server.UIProvider; | |||
import com.vaadin.server.VariableOwner; | |||
import com.vaadin.server.WebApplicationContext; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedResponse; | |||
import com.vaadin.server.WrappedRequest.BrowserDetails; | |||
import com.vaadin.service.ApplicationContext; | |||
import com.vaadin.shared.ui.ui.UIConstants; | |||
import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; | |||
import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse; | |||
import com.vaadin.terminal.gwt.server.BootstrapListener; | |||
import com.vaadin.terminal.gwt.server.BootstrapPageResponse; | |||
import com.vaadin.terminal.gwt.server.BootstrapResponse; | |||
import com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
import com.vaadin.terminal.gwt.server.WebApplicationContext; | |||
import com.vaadin.tools.ReflectTools; | |||
import com.vaadin.ui.AbstractComponent; | |||
import com.vaadin.ui.AbstractField; |
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention; | |||
import java.lang.annotation.RetentionPolicy; | |||
import java.lang.annotation.Target; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
import com.vaadin.server.ClientConnector; | |||
/** | |||
* If this annotation is present on a {@link ClientConnector} class, the |
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention; | |||
import java.lang.annotation.RetentionPolicy; | |||
import java.lang.annotation.Target; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
import com.vaadin.server.ClientConnector; | |||
/** | |||
* If this annotation is present on a {@link ClientConnector} class, the |
@@ -18,7 +18,7 @@ package com.vaadin.data; | |||
import java.io.Serializable; | |||
import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; | |||
import com.vaadin.server.AbstractApplicationServlet; | |||
/** | |||
* Interface that implements a method for validating if an {@link Object} is |
@@ -5,22 +5,20 @@ | |||
<body bgcolor="white"> | |||
<p>The Vaadin base package. Contains the Application class, the | |||
starting point of any application that uses Vaadin.</p> | |||
<p>The Vaadin base package. Contains the Application class, the | |||
starting point of any application that uses Vaadin.</p> | |||
<p>Contains all Vaadin core classes. A Vaadin application is based | |||
on the {@link com.vaadin.Application} class and deployed as a servlet | |||
using {@link com.vaadin.terminal.gwt.server.ApplicationServlet} or | |||
{@link com.vaadin.terminal.gwt.server.GAEApplicationServlet} (for Google | |||
App Engine).</p> | |||
<p>Contains all Vaadin core classes. A Vaadin application is based | |||
on the {@link com.vaadin.Application} class and deployed as a servlet | |||
using {@link com.vaadin.server.ApplicationServlet} or {@link | |||
com.vaadin.server.GAEApplicationServlet} (for Google App Engine).</p> | |||
<p>Vaadin applications can also be deployed as portlets using {@link | |||
com.vaadin.terminal.gwt.server.ApplicationPortlet} (JSR-168) or {@link | |||
com.vaadin.terminal.gwt.server.ApplicationPortlet2} (JSR-286).</p> | |||
<p>Vaadin applications can also be deployed as portlets using | |||
{@link com.vaadin.server.ApplicationPortlet2} (JSR-286).</p> | |||
<p>All classes in Vaadin are serializable unless otherwise noted. | |||
This allows Vaadin applications to run in cluster and cloud | |||
environments.</p> | |||
<p>All classes in Vaadin are serializable unless otherwise noted. | |||
This allows Vaadin applications to run in cluster and cloud | |||
environments.</p> | |||
</body> |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.BufferedWriter; | |||
import java.io.IOException; | |||
@@ -57,11 +57,7 @@ import com.vaadin.Application; | |||
import com.vaadin.Application.ApplicationStartEvent; | |||
import com.vaadin.Application.SystemMessages; | |||
import com.vaadin.UIRequiresMoreInformationException; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.Terminal; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedResponse; | |||
import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback; | |||
import com.vaadin.server.AbstractCommunicationManager.Callback; | |||
import com.vaadin.ui.UI; | |||
/** |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.BufferedWriter; | |||
import java.io.IOException; | |||
@@ -49,13 +49,8 @@ import javax.servlet.http.HttpSession; | |||
import com.vaadin.Application; | |||
import com.vaadin.Application.ApplicationStartEvent; | |||
import com.vaadin.Application.SystemMessages; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.Terminal; | |||
import com.vaadin.server.ThemeResource; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedResponse; | |||
import com.vaadin.server.AbstractCommunicationManager.Callback; | |||
import com.vaadin.shared.ApplicationConstants; | |||
import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback; | |||
import com.vaadin.ui.UI; | |||
/** |
@@ -36,12 +36,6 @@ import com.vaadin.external.json.JSONObject; | |||
import com.vaadin.shared.communication.ClientRpc; | |||
import com.vaadin.shared.communication.ServerRpc; | |||
import com.vaadin.shared.communication.SharedState; | |||
import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
import com.vaadin.terminal.gwt.server.ClientMethodInvocation; | |||
import com.vaadin.terminal.gwt.server.RpcManager; | |||
import com.vaadin.terminal.gwt.server.RpcTarget; | |||
import com.vaadin.terminal.gwt.server.ServerRpcManager; | |||
import com.vaadin.ui.HasComponents; | |||
import com.vaadin.ui.UI; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.BufferedWriter; | |||
import java.io.ByteArrayOutputStream; | |||
@@ -66,17 +66,9 @@ import com.vaadin.annotations.StyleSheet; | |||
import com.vaadin.external.json.JSONArray; | |||
import com.vaadin.external.json.JSONException; | |||
import com.vaadin.external.json.JSONObject; | |||
import com.vaadin.server.AbstractClientConnector; | |||
import com.vaadin.server.CombinedRequest; | |||
import com.vaadin.server.LegacyPaint; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
import com.vaadin.server.RequestHandler; | |||
import com.vaadin.server.StreamVariable; | |||
import com.vaadin.server.Vaadin6Component; | |||
import com.vaadin.server.VariableOwner; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedResponse; | |||
import com.vaadin.server.BootstrapHandler.BootstrapContext; | |||
import com.vaadin.server.ComponentSizeValidator.InvalidLayout; | |||
import com.vaadin.server.RpcManager.RpcInvocationException; | |||
import com.vaadin.server.StreamVariable.StreamingEndEvent; | |||
import com.vaadin.server.StreamVariable.StreamingErrorEvent; | |||
import com.vaadin.server.Terminal.ErrorEvent; | |||
@@ -90,9 +82,6 @@ import com.vaadin.shared.communication.MethodInvocation; | |||
import com.vaadin.shared.communication.SharedState; | |||
import com.vaadin.shared.communication.UidlValue; | |||
import com.vaadin.shared.ui.ui.UIConstants; | |||
import com.vaadin.terminal.gwt.server.BootstrapHandler.BootstrapContext; | |||
import com.vaadin.terminal.gwt.server.ComponentSizeValidator.InvalidLayout; | |||
import com.vaadin.terminal.gwt.server.RpcManager.RpcInvocationException; | |||
import com.vaadin.ui.AbstractComponent; | |||
import com.vaadin.ui.AbstractField; | |||
import com.vaadin.ui.Component; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.lang.reflect.Constructor; | |||
import java.util.Iterator; | |||
@@ -22,7 +22,6 @@ import java.util.Properties; | |||
import java.util.ServiceLoader; | |||
import java.util.logging.Logger; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
public abstract class AbstractDeploymentConfiguration implements | |||
DeploymentConfiguration { |
@@ -23,7 +23,6 @@ import java.util.List; | |||
import com.vaadin.data.Buffered; | |||
import com.vaadin.data.Validator; | |||
import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; | |||
/** | |||
* Base class for component error messages. |
@@ -16,7 +16,6 @@ | |||
package com.vaadin.server; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
/** | |||
* An extension is an entity that is attached to a Component or another |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import com.vaadin.server.StreamVariable.StreamingEvent; | |||
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.PrintWriter; | |||
import java.io.Serializable; | |||
@@ -34,7 +34,6 @@ import javax.servlet.http.HttpSessionBindingEvent; | |||
import javax.servlet.http.HttpSessionBindingListener; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.ApplicationResource; | |||
import com.vaadin.service.ApplicationContext; | |||
import com.vaadin.shared.ApplicationConstants; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.lang.reflect.Method; | |||
import java.util.ArrayList; | |||
@@ -24,7 +24,6 @@ import java.util.ServiceLoader; | |||
import com.vaadin.Application; | |||
import com.vaadin.event.EventRouter; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.tools.ReflectTools; | |||
/** | |||
@@ -35,10 +34,10 @@ import com.vaadin.tools.ReflectTools; | |||
* <p> | |||
* By default, AddonContextListeners are loaded using {@link ServiceLoader}, | |||
* which means that the file | |||
* META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener will be | |||
* checked for lines containing fully qualified names of classes to use. This | |||
* behavior can however be overridden for custom deployment situations (e.g. to | |||
* use CDI or OSGi) by overriding | |||
* META-INF/services/com.vaadin.server.AddonContextListener will be checked for | |||
* lines containing fully qualified names of classes to use. This behavior can | |||
* however be overridden for custom deployment situations (e.g. to use CDI or | |||
* OSGi) by overriding | |||
* {@link DeploymentConfiguration#getAddonContextListeners()}. | |||
* | |||
* @author Vaadin Ltd |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.EventObject; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.EventListener; | |||
@@ -22,8 +22,7 @@ import java.util.EventListener; | |||
* Listener that gets notified then the {@link AddonContext} is initialized, | |||
* allowing an add-on to add listeners to various parts of the framework. In a | |||
* default configuration, add-ons can register their listeners by including a | |||
* file named | |||
* META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener | |||
* file named META-INF/services/com.vaadin.server.AddonContextListener | |||
* containing the fully qualified class names of classes implementing this | |||
* interface. | |||
* |
@@ -14,13 +14,13 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import javax.portlet.PortletConfig; | |||
import javax.portlet.PortletException; | |||
import com.vaadin.Application; | |||
import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException; | |||
import com.vaadin.server.ServletPortletHelper.ApplicationClassException; | |||
/** | |||
* TODO Write documentation, fix JavaDoc tags. |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.util.regex.Matcher; | |||
@@ -23,11 +23,6 @@ import java.util.regex.Pattern; | |||
import javax.servlet.http.HttpServletResponse; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.ApplicationResource; | |||
import com.vaadin.server.DownloadStream; | |||
import com.vaadin.server.RequestHandler; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedResponse; | |||
public class ApplicationResourceHandler implements RequestHandler { | |||
private static final Pattern APP_RESOURCE_PATTERN = Pattern |
@@ -14,14 +14,13 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import javax.servlet.ServletException; | |||
import javax.servlet.http.HttpServletRequest; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.DefaultUIProvider; | |||
import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException; | |||
import com.vaadin.server.ServletPortletHelper.ApplicationClassException; | |||
/** | |||
* This servlet connects a Vaadin Application to Web. |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.EventObject; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.EventListener; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
public class BootstrapDom { | |||
@@ -14,14 +14,13 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.List; | |||
import org.jsoup.nodes.Node; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.WrappedRequest; | |||
/** | |||
* A representation of a bootstrap fragment being generated. The bootstrap |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.BufferedWriter; | |||
import java.io.IOException; | |||
@@ -40,11 +40,6 @@ import com.vaadin.Application; | |||
import com.vaadin.UIRequiresMoreInformationException; | |||
import com.vaadin.external.json.JSONException; | |||
import com.vaadin.external.json.JSONObject; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.RequestHandler; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedResponse; | |||
import com.vaadin.shared.ApplicationConstants; | |||
import com.vaadin.shared.Version; | |||
import com.vaadin.shared.ui.ui.UIConstants; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.EventListener; | |||
@@ -14,15 +14,13 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.Map; | |||
import org.jsoup.nodes.Document; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedResponse; | |||
/** | |||
* A representation of a bootstrap page being generated. The bootstrap page |
@@ -14,13 +14,12 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.EventObject; | |||
import com.vaadin.Application; | |||
import com.vaadin.UIRequiresMoreInformationException; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.ui.UI; | |||
/** |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.Map; | |||
@@ -13,15 +13,13 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.Collection; | |||
import java.util.List; | |||
import com.vaadin.external.json.JSONException; | |||
import com.vaadin.external.json.JSONObject; | |||
import com.vaadin.server.AbstractClientConnector; | |||
import com.vaadin.server.Extension; | |||
import com.vaadin.shared.Connector; | |||
import com.vaadin.shared.communication.SharedState; | |||
import com.vaadin.ui.Component; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import java.lang.reflect.Method; |
@@ -28,8 +28,6 @@ import com.vaadin.Application; | |||
import com.vaadin.external.json.JSONArray; | |||
import com.vaadin.external.json.JSONException; | |||
import com.vaadin.external.json.JSONObject; | |||
import com.vaadin.terminal.gwt.server.WebApplicationContext; | |||
import com.vaadin.terminal.gwt.server.WebBrowser; | |||
/** | |||
* A {@link WrappedRequest} with path and parameters from one request and |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.InputStream; | |||
import java.net.URL; | |||
@@ -23,8 +23,6 @@ import javax.servlet.ServletContext; | |||
import com.vaadin.Application; | |||
import com.vaadin.external.json.JSONException; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.ui.UI; | |||
/** |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.PrintStream; | |||
import java.io.PrintWriter; |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
/** | |||
* TODO Document me! |
@@ -24,8 +24,6 @@ import javax.portlet.PortletContext; | |||
import javax.servlet.ServletContext; | |||
import com.vaadin.service.ApplicationContext; | |||
import com.vaadin.terminal.gwt.server.AddonContext; | |||
import com.vaadin.terminal.gwt.server.AddonContextListener; | |||
/** | |||
* Provide deployment specific settings that are required outside terminal |
@@ -26,7 +26,6 @@ import java.util.Map; | |||
import javax.servlet.http.HttpServletResponse; | |||
import com.vaadin.terminal.gwt.server.Constants; | |||
/** | |||
* Downloadable stream. |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.PrintWriter; | |||
import java.util.Collection; | |||
@@ -33,9 +33,6 @@ import com.vaadin.event.dd.TargetDetailsImpl; | |||
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; | |||
import com.vaadin.external.json.JSONException; | |||
import com.vaadin.external.json.JSONObject; | |||
import com.vaadin.server.Extension; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.VariableOwner; | |||
import com.vaadin.shared.ApplicationConstants; | |||
import com.vaadin.shared.communication.SharedState; | |||
import com.vaadin.shared.ui.dd.DragEventType; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
public class EncodeResult { | |||
private final Object encodedValue; |
@@ -16,7 +16,6 @@ | |||
package com.vaadin.server; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
/** | |||
* An extension is an entity that is attached to a Component or another |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.ByteArrayInputStream; | |||
import java.io.ByteArrayOutputStream; | |||
@@ -56,7 +56,7 @@ import com.vaadin.service.ApplicationContext; | |||
* <pre> | |||
* <servlet> | |||
* <servlet-name>HelloWorld</servlet-name> | |||
* <servlet-class>com.vaadin.terminal.gwt.server.GAEApplicationServlet</servlet-class> | |||
* <servlet-class>com.vaadin.server.GAEApplicationServlet</servlet-class> | |||
* <init-param> | |||
* <param-name>application</param-name> | |||
* <param-value>com.vaadin.demo.HelloWorld</param-value> |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest; | |||
import javax.servlet.http.HttpServletResponse; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.Terminal; | |||
import com.vaadin.service.ApplicationContext.TransactionListener; | |||
/** |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.beans.IntrospectionException; | |||
import java.beans.Introspector; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.PrintWriter; | |||
import java.io.Serializable; | |||
@@ -27,11 +27,6 @@ import java.util.Stack; | |||
import java.util.Vector; | |||
import java.util.logging.Logger; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.StreamVariable; | |||
import com.vaadin.server.VariableOwner; | |||
import com.vaadin.ui.Alignment; | |||
import com.vaadin.ui.Component; | |||
import com.vaadin.ui.CustomLayout; |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
@SuppressWarnings("serial") | |||
public class NoInputStreamException extends Exception { |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
@SuppressWarnings("serial") | |||
public class NoOutputStreamException extends Exception { |
@@ -28,8 +28,6 @@ import com.vaadin.server.WrappedRequest.BrowserDetails; | |||
import com.vaadin.shared.ui.BorderStyle; | |||
import com.vaadin.shared.ui.ui.PageClientRpc; | |||
import com.vaadin.shared.ui.ui.UIConstants; | |||
import com.vaadin.terminal.gwt.server.WebApplicationContext; | |||
import com.vaadin.terminal.gwt.server.WebBrowser; | |||
import com.vaadin.tools.ReflectTools; | |||
import com.vaadin.ui.JavaScript; | |||
import com.vaadin.ui.Notification; |
@@ -20,7 +20,6 @@ import java.io.Serializable; | |||
import java.util.Map; | |||
import com.vaadin.server.StreamVariable.StreamingStartEvent; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
import com.vaadin.ui.Component; | |||
/** |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.File; | |||
import java.io.Serializable; | |||
@@ -45,7 +45,6 @@ import javax.servlet.http.HttpSessionBindingListener; | |||
import javax.xml.namespace.QName; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.ExternalResource; | |||
import com.vaadin.ui.UI; | |||
/** |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.InputStream; | |||
@@ -29,10 +29,6 @@ import javax.portlet.ResourceURL; | |||
import com.vaadin.Application; | |||
import com.vaadin.external.json.JSONException; | |||
import com.vaadin.external.json.JSONObject; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedResponse; | |||
import com.vaadin.shared.ApplicationConstants; | |||
import com.vaadin.ui.UI; | |||
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -22,7 +22,6 @@ import javax.portlet.PortletResponse; | |||
import javax.servlet.Filter; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.Terminal; | |||
import com.vaadin.service.ApplicationContext.TransactionListener; | |||
/** |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -13,13 +13,9 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.ApplicationResource; | |||
import com.vaadin.server.ExternalResource; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.ThemeResource; | |||
import com.vaadin.shared.communication.URLReference; | |||
public class ResourceReference extends URLReference { |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.OutputStream; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -14,11 +14,10 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import com.vaadin.server.VariableOwner; | |||
/** | |||
* Marker interface for server side classes that can receive RPC calls. |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.lang.reflect.Field; | |||
import java.lang.reflect.InvocationTargetException; |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.lang.reflect.Method; | |||
import java.util.Map; |
@@ -1,10 +1,8 @@ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.shared.ApplicationConstants; | |||
import com.vaadin.ui.UI; | |||
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
@SuppressWarnings("serial") | |||
public class SessionExpiredException extends Exception { |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import com.vaadin.server.StreamVariable.StreamingEndEvent; | |||
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import com.vaadin.server.StreamVariable.StreamingErrorEvent; | |||
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import com.vaadin.server.StreamVariable.StreamingProgressEvent; | |||
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import com.vaadin.server.StreamVariable.StreamingStartEvent; | |||
@@ -16,7 +16,6 @@ | |||
package com.vaadin.server; | |||
import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; | |||
/** | |||
* <code>SystemError</code> is an error message for a problem caused by error in |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
@SuppressWarnings("serial") | |||
public class SystemMessageException extends RuntimeException { |
@@ -13,15 +13,12 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.Writer; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.RequestHandler; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedResponse; | |||
/** | |||
* A {@link RequestHandler} that presents an informative page if the browser in |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
@SuppressWarnings("serial") | |||
public class UploadException extends Exception { |
@@ -59,7 +59,7 @@ public interface Vaadin6Component extends VariableOwner, Component, | |||
* {@link #paintContent(PaintTarget)} to be called before sending changes to | |||
* the client. | |||
* | |||
* @see com.vaadin.terminal.gwt.server.ClientConnector#markAsDirty() | |||
* @see com.vaadin.server.ClientConnector#markAsDirty() | |||
*/ | |||
@Override | |||
public void markAsDirty(); |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.File; | |||
import java.util.Enumeration; |
@@ -14,12 +14,11 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.util.Date; | |||
import java.util.Locale; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.shared.VBrowserDetails; | |||
/** |
@@ -14,15 +14,12 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import javax.servlet.http.HttpServletRequest; | |||
import javax.servlet.http.HttpServletRequestWrapper; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.CombinedRequest; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.WrappedRequest; | |||
/** | |||
* Wrapper for {@link HttpServletRequest}. |
@@ -14,13 +14,11 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import javax.servlet.http.HttpServletResponse; | |||
import javax.servlet.http.HttpServletResponseWrapper; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.WrappedResponse; | |||
/** | |||
* Wrapper for {@link HttpServletResponse}. |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.InputStream; | |||
@@ -26,9 +26,6 @@ import javax.portlet.PortletRequest; | |||
import javax.portlet.ResourceRequest; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.CombinedRequest; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.shared.ApplicationConstants; | |||
/** |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.OutputStream; | |||
@@ -29,8 +29,6 @@ import javax.portlet.MimeResponse; | |||
import javax.portlet.PortletResponse; | |||
import javax.portlet.ResourceResponse; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.WrappedResponse; | |||
/** | |||
* Wrapper for {@link PortletResponse} and its subclasses. |
@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest; | |||
import com.vaadin.Application; | |||
import com.vaadin.UIRequiresMoreInformationException; | |||
import com.vaadin.annotations.EagerInit; | |||
import com.vaadin.terminal.gwt.server.WebBrowser; | |||
import com.vaadin.ui.UI; | |||
/** |
@@ -22,8 +22,8 @@ import java.net.URL; | |||
import java.util.Collection; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.AbstractCommunicationManager; | |||
import com.vaadin.server.ApplicationResource; | |||
import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; | |||
/** | |||
* <code>ApplicationContext</code> provides information about the running |
@@ -33,13 +33,13 @@ import com.vaadin.event.EventRouter; | |||
import com.vaadin.event.MethodEventSource; | |||
import com.vaadin.event.ShortcutListener; | |||
import com.vaadin.server.AbstractClientConnector; | |||
import com.vaadin.server.ClientConnector; | |||
import com.vaadin.server.ComponentSizeValidator; | |||
import com.vaadin.server.ErrorMessage; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.ResourceReference; | |||
import com.vaadin.server.Terminal; | |||
import com.vaadin.shared.ComponentState; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
import com.vaadin.terminal.gwt.server.ComponentSizeValidator; | |||
import com.vaadin.terminal.gwt.server.ResourceReference; | |||
import com.vaadin.tools.ReflectTools; | |||
/** |
@@ -22,7 +22,7 @@ import java.util.HashSet; | |||
import java.util.Iterator; | |||
import java.util.LinkedList; | |||
import com.vaadin.terminal.gwt.server.ComponentSizeValidator; | |||
import com.vaadin.server.ComponentSizeValidator; | |||
/** | |||
* Extension to {@link AbstractComponent} that defines the default |
@@ -5,8 +5,8 @@ | |||
package com.vaadin.ui; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.ResourceReference; | |||
import com.vaadin.shared.ui.AbstractEmbeddedState; | |||
import com.vaadin.terminal.gwt.server.ResourceReference; | |||
/** | |||
* Abstract base for embedding components. |
@@ -20,10 +20,10 @@ import java.util.ArrayList; | |||
import java.util.List; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.ResourceReference; | |||
import com.vaadin.shared.communication.URLReference; | |||
import com.vaadin.shared.ui.AbstractMediaState; | |||
import com.vaadin.shared.ui.MediaControl; | |||
import com.vaadin.terminal.gwt.server.ResourceReference; | |||
/** | |||
* Abstract base class for the HTML5 media components. |
@@ -23,11 +23,11 @@ import java.util.Locale; | |||
import com.vaadin.Application; | |||
import com.vaadin.event.FieldEvents; | |||
import com.vaadin.server.ClientConnector; | |||
import com.vaadin.server.ErrorMessage; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.Sizeable; | |||
import com.vaadin.server.VariableOwner; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
/** | |||
* {@code Component} is the top-level interface that is and must be implemented |
@@ -26,8 +26,8 @@ import java.util.logging.Level; | |||
import java.util.logging.Logger; | |||
import com.vaadin.server.AbstractClientConnector; | |||
import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
import com.vaadin.server.AbstractCommunicationManager; | |||
import com.vaadin.server.ClientConnector; | |||
/** | |||
* A class which takes care of book keeping of {@link ClientConnector}s for a |
@@ -24,11 +24,11 @@ import java.util.Iterator; | |||
import java.util.Map; | |||
import java.util.Set; | |||
import com.vaadin.server.JsonPaintTarget; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
import com.vaadin.server.Vaadin6Component; | |||
import com.vaadin.shared.ui.customlayout.CustomLayoutState; | |||
import com.vaadin.terminal.gwt.server.JsonPaintTarget; | |||
/** | |||
* <p> |
@@ -34,6 +34,7 @@ import com.vaadin.event.Action.Handler; | |||
import com.vaadin.event.ActionManager; | |||
import com.vaadin.event.MouseEvents.ClickEvent; | |||
import com.vaadin.event.MouseEvents.ClickListener; | |||
import com.vaadin.server.AbstractApplicationServlet; | |||
import com.vaadin.server.Page; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
@@ -49,7 +50,6 @@ import com.vaadin.shared.ui.BorderStyle; | |||
import com.vaadin.shared.ui.ui.UIConstants; | |||
import com.vaadin.shared.ui.ui.UIServerRpc; | |||
import com.vaadin.shared.ui.ui.UIState; | |||
import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; | |||
import com.vaadin.tools.ReflectTools; | |||
/** |
@@ -24,12 +24,12 @@ import java.util.Iterator; | |||
import java.util.LinkedHashSet; | |||
import java.util.Map; | |||
import com.vaadin.server.NoInputStreamException; | |||
import com.vaadin.server.NoOutputStreamException; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
import com.vaadin.server.Vaadin6Component; | |||
import com.vaadin.server.StreamVariable.StreamingProgressEvent; | |||
import com.vaadin.terminal.gwt.server.NoInputStreamException; | |||
import com.vaadin.terminal.gwt.server.NoOutputStreamException; | |||
/** | |||
* Component for uploading files from client to server. |
@@ -17,8 +17,8 @@ | |||
package com.vaadin.ui; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.ResourceReference; | |||
import com.vaadin.shared.ui.video.VideoState; | |||
import com.vaadin.terminal.gwt.server.ResourceReference; | |||
/** | |||
* The Video component translates into an HTML5 <video> element and as |
@@ -31,7 +31,7 @@ import java.io.Serializable; | |||
* wanting to communicate with server side should implement | |||
* {@link com.vaadin.client.ServerConnector} and server side | |||
* classes should implement | |||
* {@link com.vaadin.terminal.gwt.server.ClientConnector}. | |||
* {@link com.vaadin.server.ClientConnector}. | |||
* </p> | |||
* | |||
* @author Vaadin Ltd |
@@ -21,7 +21,7 @@ import java.io.Serializable; | |||
* Class that parses the user agent string from the browser and provides | |||
* information about the browser. Used internally by | |||
* {@link com.vaadin.client.BrowserInfo} and | |||
* {@link com.vaadin.terminal.gwt.server.WebBrowser}. Should not be used | |||
* {@link com.vaadin.server.WebBrowser}. Should not be used | |||
* directly. | |||
* | |||
* @author Vaadin Ltd. |
@@ -25,7 +25,7 @@ import com.vaadin.shared.Connector; | |||
/** | |||
* Annotation defining the server side connector that this ClientSideConnector | |||
* should connect to. The value must always by a class extending | |||
* {@link com.vaadin.terminal.gwt.server.ClientConnector}. | |||
* {@link com.vaadin.server.ClientConnector}. | |||
* <p> | |||
* With this annotation client side Vaadin connector is marked to have a server | |||
* side counterpart. The value of the annotation is the class of server side |
@@ -1,4 +1,4 @@ | |||
package com.vaadin.terminal.gwt.server; | |||
package com.vaadin.server; | |||
/* | |||
* Copyright 2011 Vaadin Ltd. | |||
@@ -24,8 +24,9 @@ import junit.framework.TestCase; | |||
import com.vaadin.client.communication.JsonDecoder; | |||
import com.vaadin.client.communication.JsonEncoder; | |||
import com.vaadin.server.JsonCodec; | |||
import com.vaadin.server.JsonCodec.BeanProperty; | |||
import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState; | |||
import com.vaadin.terminal.gwt.server.JsonCodec.BeanProperty; | |||
/** | |||
* Tests for {@link JsonCodec}, {@link JsonEncoder}, {@link JsonDecoder} |