@@ -18,9 +18,9 @@ package com.vaadin.client; | |||
import com.vaadin.client.communication.HasJavaScriptConnectorHelper; | |||
import com.vaadin.client.extensions.AbstractExtensionConnector; | |||
import com.vaadin.server.AbstractJavaScriptExtension; | |||
import com.vaadin.shared.JavaScriptExtensionState; | |||
import com.vaadin.shared.ui.Connect; | |||
import com.vaadin.terminal.AbstractJavaScriptExtension; | |||
@Connect(AbstractJavaScriptExtension.class) | |||
public final class JavaScriptExtension extends AbstractExtensionConnector |
@@ -22,7 +22,7 @@ import java.util.Set; | |||
import com.google.gwt.core.client.JavaScriptObject; | |||
import com.google.gwt.core.client.JsArrayString; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.server.PaintTarget; | |||
import com.vaadin.ui.AbstractComponent; | |||
import com.vaadin.ui.Component; | |||
@@ -36,8 +36,7 @@ public class ComboBoxConnector extends AbstractFieldConnector implements | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see | |||
* com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.terminal | |||
* @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.terminal | |||
* .gwt.client.UIDL, com.vaadin.client.ApplicationConnection) | |||
*/ | |||
@Override |
@@ -51,19 +51,19 @@ 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.AbstractErrorMessage; | |||
import com.vaadin.server.ApplicationResource; | |||
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.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.AbstractErrorMessage; | |||
import com.vaadin.terminal.ApplicationResource; | |||
import com.vaadin.terminal.CombinedRequest; | |||
import com.vaadin.terminal.DeploymentConfiguration; | |||
import com.vaadin.terminal.RequestHandler; | |||
import com.vaadin.terminal.Terminal; | |||
import com.vaadin.terminal.UIProvider; | |||
import com.vaadin.terminal.VariableOwner; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.terminal.WrappedRequest.BrowserDetails; | |||
import com.vaadin.terminal.WrappedResponse; | |||
import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; | |||
import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse; | |||
import com.vaadin.terminal.gwt.server.BootstrapListener; | |||
@@ -123,7 +123,7 @@ import com.vaadin.ui.Window; | |||
* found out, the window itself is queried for a preferred theme. If the window | |||
* does not prefer a specific theme, the application containing the window is | |||
* queried. If neither the application prefers a theme, the default theme for | |||
* the {@link com.vaadin.terminal.Terminal terminal} is used. The terminal | |||
* the {@link com.vaadin.server.Terminal terminal} is used. The terminal | |||
* always defines a default theme. | |||
* </p> | |||
* | |||
@@ -1075,7 +1075,7 @@ public class Application implements Terminal.ErrorListener, Serializable { | |||
* | |||
* @param event | |||
* the change event. | |||
* @see com.vaadin.terminal.Terminal.ErrorListener#terminalError(com.vaadin.terminal.Terminal.ErrorEvent) | |||
* @see com.vaadin.server.Terminal.ErrorListener#terminalError(com.vaadin.server.Terminal.ErrorEvent) | |||
*/ | |||
@Override |
@@ -16,8 +16,8 @@ | |||
package com.vaadin; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.terminal.WrappedRequest.BrowserDetails; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedRequest.BrowserDetails; | |||
/** | |||
* Exception that is thrown to indicate that creating or initializing the UI |
@@ -20,7 +20,7 @@ import java.lang.annotation.Retention; | |||
import java.lang.annotation.RetentionPolicy; | |||
import java.lang.annotation.Target; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.ui.UI; | |||
/** | |||
@@ -29,7 +29,7 @@ import com.vaadin.ui.UI; | |||
* This will make the UI appear more quickly, as ensuring the availability of | |||
* this information typically requires an additional round trip to the client. | |||
* | |||
* @see UI#init(com.vaadin.terminal.WrappedRequest) | |||
* @see UI#init(com.vaadin.server.WrappedRequest) | |||
* @see WrappedRequest#getBrowserDetails() | |||
* | |||
* @since 7.0 |
@@ -33,8 +33,8 @@ import java.util.List; | |||
import com.vaadin.data.Container; | |||
import com.vaadin.data.Item; | |||
import com.vaadin.data.Property; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.service.FileTypeResolver; | |||
import com.vaadin.terminal.Resource; | |||
/** | |||
* A hierarchical container wrapper for a filesystem. |
@@ -18,7 +18,7 @@ package com.vaadin.event; | |||
import java.io.Serializable; | |||
import com.vaadin.terminal.Resource; | |||
import com.vaadin.server.Resource; | |||
/** | |||
* Implements the action framework. This class contains subinterfaces for action |
@@ -20,10 +20,10 @@ import java.util.Map; | |||
import com.vaadin.event.Action.Container; | |||
import com.vaadin.event.Action.Handler; | |||
import com.vaadin.terminal.KeyMapper; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.terminal.VariableOwner; | |||
import com.vaadin.server.KeyMapper; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
import com.vaadin.server.VariableOwner; | |||
import com.vaadin.ui.Component; | |||
/** |
@@ -20,7 +20,7 @@ import java.io.Serializable; | |||
import java.util.regex.Matcher; | |||
import java.util.regex.Pattern; | |||
import com.vaadin.terminal.Resource; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.ui.ComponentContainer; | |||
import com.vaadin.ui.Panel; | |||
import com.vaadin.ui.Window; |
@@ -16,7 +16,7 @@ | |||
package com.vaadin.event; | |||
import com.vaadin.event.Action.Listener; | |||
import com.vaadin.terminal.Resource; | |||
import com.vaadin.server.Resource; | |||
public abstract class ShortcutListener extends ShortcutAction implements | |||
Listener { |
@@ -23,8 +23,8 @@ import java.io.Serializable; | |||
import com.vaadin.event.Transferable; | |||
import com.vaadin.event.dd.DragAndDropEvent; | |||
import com.vaadin.event.dd.DropHandler; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
/** | |||
* Criterion that can be used create policy to accept/discard dragged content |
@@ -19,8 +19,8 @@ | |||
package com.vaadin.event.dd.acceptcriteria; | |||
import com.vaadin.event.dd.DragAndDropEvent; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
/** | |||
* A compound criterion that accepts the drag if all of its criteria accepts the |
@@ -17,8 +17,8 @@ package com.vaadin.event.dd.acceptcriteria; | |||
import java.io.Serializable; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
/** | |||
* Parent class for criteria that can be completely validated on client side. |
@@ -20,8 +20,8 @@ package com.vaadin.event.dd.acceptcriteria; | |||
import com.vaadin.event.Transferable; | |||
import com.vaadin.event.dd.DragAndDropEvent; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
/** | |||
* A Criterion that checks whether {@link Transferable} contains given data |
@@ -19,8 +19,8 @@ | |||
package com.vaadin.event.dd.acceptcriteria; | |||
import com.vaadin.event.dd.DragAndDropEvent; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
/** | |||
* Criterion that wraps another criterion and inverts its return value. |
@@ -19,8 +19,8 @@ | |||
package com.vaadin.event.dd.acceptcriteria; | |||
import com.vaadin.event.dd.DragAndDropEvent; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
/** | |||
* A compound criterion that accepts the drag if any of its criterion accepts |
@@ -18,8 +18,8 @@ package com.vaadin.event.dd.acceptcriteria; | |||
import java.io.Serializable; | |||
import com.vaadin.event.Transferable; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
/** | |||
* Parent class for criteria which are verified on the server side during a drag |
@@ -23,8 +23,8 @@ import java.util.logging.Logger; | |||
import com.vaadin.event.TransferableImpl; | |||
import com.vaadin.event.dd.DragAndDropEvent; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
import com.vaadin.ui.Component; | |||
/** |
@@ -20,8 +20,8 @@ package com.vaadin.event.dd.acceptcriteria; | |||
import com.vaadin.event.dd.DragAndDropEvent; | |||
import com.vaadin.event.dd.TargetDetails; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
/** | |||
* Criterion for checking if drop target details contains the specific property |
@@ -22,9 +22,9 @@ import java.util.LinkedList; | |||
import java.util.List; | |||
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; | |||
import com.vaadin.terminal.Page; | |||
import com.vaadin.terminal.Page.FragmentChangedEvent; | |||
import com.vaadin.terminal.Page.FragmentChangedListener; | |||
import com.vaadin.server.Page; | |||
import com.vaadin.server.Page.FragmentChangedEvent; | |||
import com.vaadin.server.Page.FragmentChangedListener; | |||
import com.vaadin.ui.Component; | |||
import com.vaadin.ui.ComponentContainer; | |||
import com.vaadin.ui.CssLayout; |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import java.lang.reflect.Constructor; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.PrintWriter; | |||
import java.io.StringWriter; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import com.vaadin.shared.JavaScriptExtensionState; | |||
import com.vaadin.ui.JavaScriptFunction; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import com.vaadin.Application; | |||
import com.vaadin.ui.UI; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -97,7 +97,7 @@ public class ClassResource implements ApplicationResource, Serializable { | |||
/** | |||
* Gets the MIME type of this resource. | |||
* | |||
* @see com.vaadin.terminal.Resource#getMIMEType() | |||
* @see com.vaadin.server.Resource#getMIMEType() | |||
*/ | |||
@Override | |||
public String getMIMEType() { | |||
@@ -107,7 +107,7 @@ public class ClassResource implements ApplicationResource, Serializable { | |||
/** | |||
* Gets the application of this resource. | |||
* | |||
* @see com.vaadin.terminal.ApplicationResource#getApplication() | |||
* @see com.vaadin.server.ApplicationResource#getApplication() | |||
*/ | |||
@Override | |||
public Application getApplication() { | |||
@@ -118,7 +118,7 @@ public class ClassResource implements ApplicationResource, Serializable { | |||
* Gets the virtual filename for this resource. | |||
* | |||
* @return the file name associated to this resource. | |||
* @see com.vaadin.terminal.ApplicationResource#getFilename() | |||
* @see com.vaadin.server.ApplicationResource#getFilename() | |||
*/ | |||
@Override | |||
public String getFilename() { | |||
@@ -134,7 +134,7 @@ public class ClassResource implements ApplicationResource, Serializable { | |||
/** | |||
* Gets resource as stream. | |||
* | |||
* @see com.vaadin.terminal.ApplicationResource#getStream() | |||
* @see com.vaadin.server.ApplicationResource#getStream() | |||
*/ | |||
@Override | |||
public DownloadStream getStream() { |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.InputStream; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.util.Collection; | |||
import java.util.Iterator; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import com.vaadin.Application; | |||
import com.vaadin.UIRequiresMoreInformationException; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import java.util.Iterator; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.InputStream; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import java.net.URL; | |||
@@ -108,7 +108,7 @@ public class ExternalResource implements Resource, Serializable { | |||
/** | |||
* Gets the MIME type of the resource. | |||
* | |||
* @see com.vaadin.terminal.Resource#getMIMEType() | |||
* @see com.vaadin.server.Resource#getMIMEType() | |||
*/ | |||
@Override | |||
public String getMIMEType() { |
@@ -14,15 +14,15 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.File; | |||
import java.io.FileInputStream; | |||
import java.io.FileNotFoundException; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.Terminal.ErrorEvent; | |||
import com.vaadin.service.FileTypeResolver; | |||
import com.vaadin.terminal.Terminal.ErrorEvent; | |||
/** | |||
* <code>FileResources</code> are files or directories on local filesystem. The | |||
@@ -69,7 +69,7 @@ public class FileResource implements ApplicationResource { | |||
/** | |||
* Gets the resource as stream. | |||
* | |||
* @see com.vaadin.terminal.ApplicationResource#getStream() | |||
* @see com.vaadin.server.ApplicationResource#getStream() | |||
*/ | |||
@Override | |||
public DownloadStream getStream() { | |||
@@ -116,7 +116,7 @@ public class FileResource implements ApplicationResource { | |||
} | |||
/** | |||
* @see com.vaadin.terminal.ApplicationResource#getApplication() | |||
* @see com.vaadin.server.ApplicationResource#getApplication() | |||
*/ | |||
@Override | |||
public Application getApplication() { | |||
@@ -124,7 +124,7 @@ public class FileResource implements ApplicationResource { | |||
} | |||
/** | |||
* @see com.vaadin.terminal.ApplicationResource#getFilename() | |||
* @see com.vaadin.server.ApplicationResource#getFilename() | |||
*/ | |||
@Override | |||
public String getFilename() { | |||
@@ -132,7 +132,7 @@ public class FileResource implements ApplicationResource { | |||
} | |||
/** | |||
* @see com.vaadin.terminal.Resource#getMIMEType() | |||
* @see com.vaadin.server.Resource#getMIMEType() | |||
*/ | |||
@Override | |||
public String getMIMEType() { |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import java.lang.reflect.Method; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import java.util.HashMap; |
@@ -13,11 +13,11 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import com.vaadin.terminal.PaintTarget.PaintStatus; | |||
import com.vaadin.server.PaintTarget.PaintStatus; | |||
import com.vaadin.ui.Component; | |||
import com.vaadin.ui.HasComponents; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import java.lang.reflect.Method; | |||
@@ -24,10 +24,10 @@ import java.util.LinkedList; | |||
import java.util.List; | |||
import com.vaadin.event.EventRouter; | |||
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.WrappedRequest.BrowserDetails; | |||
import com.vaadin.terminal.gwt.server.WebApplicationContext; | |||
import com.vaadin.terminal.gwt.server.WebBrowser; | |||
import com.vaadin.tools.ReflectTools; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.Serializable; |
@@ -14,12 +14,12 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import java.util.Map; | |||
import com.vaadin.terminal.StreamVariable.StreamingStartEvent; | |||
import com.vaadin.server.StreamVariable.StreamingStartEvent; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
import com.vaadin.ui.Component; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.Serializable; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.InputStream; | |||
import java.io.Serializable; | |||
@@ -87,7 +87,7 @@ public class StreamResource implements ApplicationResource { | |||
} | |||
/** | |||
* @see com.vaadin.terminal.Resource#getMIMEType() | |||
* @see com.vaadin.server.Resource#getMIMEType() | |||
*/ | |||
@Override | |||
public String getMIMEType() { | |||
@@ -150,7 +150,7 @@ public class StreamResource implements ApplicationResource { | |||
} | |||
/** | |||
* @see com.vaadin.terminal.ApplicationResource#getApplication() | |||
* @see com.vaadin.server.ApplicationResource#getApplication() | |||
*/ | |||
@Override | |||
public Application getApplication() { | |||
@@ -158,7 +158,7 @@ public class StreamResource implements ApplicationResource { | |||
} | |||
/** | |||
* @see com.vaadin.terminal.ApplicationResource#getStream() | |||
* @see com.vaadin.server.ApplicationResource#getStream() | |||
*/ | |||
@Override | |||
public DownloadStream getStream() { |
@@ -13,15 +13,15 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.OutputStream; | |||
import java.io.Serializable; | |||
import com.vaadin.Application; | |||
import com.vaadin.terminal.StreamVariable.StreamingEndEvent; | |||
import com.vaadin.terminal.StreamVariable.StreamingErrorEvent; | |||
import com.vaadin.terminal.StreamVariable.StreamingStartEvent; | |||
import com.vaadin.server.StreamVariable.StreamingEndEvent; | |||
import com.vaadin.server.StreamVariable.StreamingErrorEvent; | |||
import com.vaadin.server.StreamVariable.StreamingStartEvent; | |||
/** | |||
* StreamVariable is a special kind of variable whose value is streamed to an | |||
@@ -152,7 +152,7 @@ public interface StreamVariable extends Serializable { | |||
* the streaming ended before the end of the input. The streaming may fail | |||
* due an interruption by {@link } or due an other unknown exception in | |||
* communication. In the latter case the exception is also passed to | |||
* {@link Application#terminalError(com.vaadin.terminal.Terminal.ErrorEvent)} | |||
* {@link Application#terminalError(com.vaadin.server.Terminal.ErrorEvent)} | |||
* . | |||
*/ | |||
public interface StreamingErrorEvent extends StreamingEvent { |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import com.vaadin.service.FileTypeResolver; | |||
@@ -97,7 +97,7 @@ public class ThemeResource implements Resource { | |||
} | |||
/** | |||
* @see com.vaadin.terminal.Resource#getMIMEType() | |||
* @see com.vaadin.server.Resource#getMIMEType() | |||
*/ | |||
@Override | |||
public String getMIMEType() { |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import com.vaadin.Application; | |||
import com.vaadin.UIRequiresMoreInformationException; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
/** | |||
* <code>UserError</code> is a controlled error occurred in application. User |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.util.EventListener; | |||
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.Serializable; | |||
import java.util.Map; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.InputStream; |
@@ -14,7 +14,7 @@ | |||
* the License. | |||
*/ | |||
package com.vaadin.terminal; | |||
package com.vaadin.server; | |||
import java.io.IOException; | |||
import java.io.OutputStream; |
@@ -22,7 +22,7 @@ import java.net.URL; | |||
import java.util.Collection; | |||
import com.vaadin.Application; | |||
import com.vaadin.terminal.ApplicationResource; | |||
import com.vaadin.server.ApplicationResource; | |||
import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; | |||
/** |
@@ -23,8 +23,8 @@ import java.util.Hashtable; | |||
import java.util.Map; | |||
import java.util.StringTokenizer; | |||
import com.vaadin.terminal.Resource; | |||
import com.vaadin.terminal.ThemeResource; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.ThemeResource; | |||
/** | |||
* Utility class that can figure out mime-types and icons related to files. |
@@ -57,10 +57,10 @@ import com.vaadin.Application; | |||
import com.vaadin.Application.ApplicationStartEvent; | |||
import com.vaadin.Application.SystemMessages; | |||
import com.vaadin.UIRequiresMoreInformationException; | |||
import com.vaadin.terminal.DeploymentConfiguration; | |||
import com.vaadin.terminal.Terminal; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.terminal.WrappedResponse; | |||
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.ui.UI; | |||
@@ -49,12 +49,12 @@ 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.shared.ApplicationConstants; | |||
import com.vaadin.terminal.DeploymentConfiguration; | |||
import com.vaadin.terminal.Terminal; | |||
import com.vaadin.terminal.ThemeResource; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.terminal.WrappedResponse; | |||
import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback; | |||
import com.vaadin.ui.UI; | |||
@@ -66,6 +66,21 @@ 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.StreamVariable.StreamingEndEvent; | |||
import com.vaadin.server.StreamVariable.StreamingErrorEvent; | |||
import com.vaadin.server.Terminal.ErrorEvent; | |||
import com.vaadin.server.Terminal.ErrorListener; | |||
import com.vaadin.shared.ApplicationConstants; | |||
import com.vaadin.shared.Connector; | |||
import com.vaadin.shared.JavaScriptConnectorState; | |||
@@ -75,21 +90,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.AbstractClientConnector; | |||
import com.vaadin.terminal.CombinedRequest; | |||
import com.vaadin.terminal.LegacyPaint; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.terminal.RequestHandler; | |||
import com.vaadin.terminal.StreamVariable; | |||
import com.vaadin.terminal.StreamVariable.StreamingEndEvent; | |||
import com.vaadin.terminal.StreamVariable.StreamingErrorEvent; | |||
import com.vaadin.terminal.Terminal.ErrorEvent; | |||
import com.vaadin.terminal.Terminal.ErrorListener; | |||
import com.vaadin.terminal.Vaadin6Component; | |||
import com.vaadin.terminal.VariableOwner; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.terminal.WrappedResponse; | |||
import com.vaadin.terminal.gwt.server.BootstrapHandler.BootstrapContext; | |||
import com.vaadin.terminal.gwt.server.ComponentSizeValidator.InvalidLayout; | |||
import com.vaadin.terminal.gwt.server.RpcManager.RpcInvocationException; |
@@ -22,7 +22,7 @@ import java.util.Properties; | |||
import java.util.ServiceLoader; | |||
import java.util.logging.Logger; | |||
import com.vaadin.terminal.DeploymentConfiguration; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
public abstract class AbstractDeploymentConfiguration implements | |||
DeploymentConfiguration { |
@@ -15,7 +15,7 @@ | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
import com.vaadin.terminal.StreamVariable.StreamingEvent; | |||
import com.vaadin.server.StreamVariable.StreamingEvent; | |||
/** | |||
* Abstract base class for StreamingEvent implementations. |
@@ -34,9 +34,9 @@ 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; | |||
import com.vaadin.terminal.ApplicationResource; | |||
/** | |||
* Base class for web application contexts (including portlet contexts) that |
@@ -24,7 +24,7 @@ import java.util.ServiceLoader; | |||
import com.vaadin.Application; | |||
import com.vaadin.event.EventRouter; | |||
import com.vaadin.terminal.DeploymentConfiguration; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.tools.ReflectTools; | |||
/** |
@@ -23,11 +23,11 @@ import java.util.regex.Pattern; | |||
import javax.servlet.http.HttpServletResponse; | |||
import com.vaadin.Application; | |||
import com.vaadin.terminal.ApplicationResource; | |||
import com.vaadin.terminal.DownloadStream; | |||
import com.vaadin.terminal.RequestHandler; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.terminal.WrappedResponse; | |||
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 |
@@ -20,7 +20,7 @@ import javax.servlet.ServletException; | |||
import javax.servlet.http.HttpServletRequest; | |||
import com.vaadin.Application; | |||
import com.vaadin.terminal.DefaultUIProvider; | |||
import com.vaadin.server.DefaultUIProvider; | |||
import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException; | |||
/** |
@@ -21,7 +21,7 @@ import java.util.List; | |||
import org.jsoup.nodes.Node; | |||
import com.vaadin.Application; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.server.WrappedRequest; | |||
/** | |||
* A representation of a bootstrap fragment being generated. The bootstrap |
@@ -40,14 +40,14 @@ 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; | |||
import com.vaadin.terminal.DeploymentConfiguration; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.RequestHandler; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.terminal.WrappedResponse; | |||
import com.vaadin.ui.UI; | |||
public abstract class BootstrapHandler implements RequestHandler { |
@@ -21,8 +21,8 @@ import java.util.Map; | |||
import org.jsoup.nodes.Document; | |||
import com.vaadin.Application; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.terminal.WrappedResponse; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.server.WrappedResponse; | |||
/** | |||
* A representation of a bootstrap page being generated. The bootstrap page |
@@ -20,7 +20,7 @@ import java.util.EventObject; | |||
import com.vaadin.Application; | |||
import com.vaadin.UIRequiresMoreInformationException; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.ui.UI; | |||
/** |
@@ -20,10 +20,10 @@ 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.terminal.AbstractClientConnector; | |||
import com.vaadin.terminal.Extension; | |||
import com.vaadin.ui.Component; | |||
import com.vaadin.ui.ComponentContainer; | |||
import com.vaadin.ui.UI; |
@@ -23,8 +23,8 @@ import javax.servlet.ServletContext; | |||
import com.vaadin.Application; | |||
import com.vaadin.external.json.JSONException; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.ui.UI; | |||
/** |
@@ -28,7 +28,7 @@ import java.util.Vector; | |||
import java.util.logging.Level; | |||
import java.util.logging.Logger; | |||
import com.vaadin.terminal.Sizeable.Unit; | |||
import com.vaadin.server.Sizeable.Unit; | |||
import com.vaadin.ui.AbstractOrderedLayout; | |||
import com.vaadin.ui.AbstractSplitPanel; | |||
import com.vaadin.ui.Component; |
@@ -33,12 +33,12 @@ 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; | |||
import com.vaadin.terminal.Extension; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.VariableOwner; | |||
import com.vaadin.ui.Component; | |||
import com.vaadin.ui.UI; | |||
@@ -23,8 +23,8 @@ 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; | |||
import com.vaadin.terminal.Terminal; | |||
/** | |||
* {@link Application} that implements this interface gets notified of request |
@@ -27,11 +27,11 @@ import java.util.Stack; | |||
import java.util.Vector; | |||
import java.util.logging.Logger; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.PaintTarget; | |||
import com.vaadin.terminal.Resource; | |||
import com.vaadin.terminal.StreamVariable; | |||
import com.vaadin.terminal.VariableOwner; | |||
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; | |||
@@ -589,7 +589,7 @@ public class JsonPaintTarget implements PaintTarget { | |||
* @throws PaintException | |||
* if the paint operation failed. | |||
* | |||
* @see com.vaadin.terminal.PaintTarget#addXMLSection(String, String, | |||
* @see com.vaadin.server.PaintTarget#addXMLSection(String, String, | |||
* String) | |||
*/ | |||
@@ -45,7 +45,7 @@ import javax.servlet.http.HttpSessionBindingListener; | |||
import javax.xml.namespace.QName; | |||
import com.vaadin.Application; | |||
import com.vaadin.terminal.ExternalResource; | |||
import com.vaadin.server.ExternalResource; | |||
import com.vaadin.ui.UI; | |||
/** |
@@ -29,11 +29,11 @@ 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.terminal.DeploymentConfiguration; | |||
import com.vaadin.terminal.PaintException; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.terminal.WrappedResponse; | |||
import com.vaadin.ui.UI; | |||
/** |
@@ -22,8 +22,8 @@ import javax.portlet.PortletResponse; | |||
import javax.servlet.Filter; | |||
import com.vaadin.Application; | |||
import com.vaadin.server.Terminal; | |||
import com.vaadin.service.ApplicationContext.TransactionListener; | |||
import com.vaadin.terminal.Terminal; | |||
/** | |||
* An {@link Application} that implements this interface gets notified of |
@@ -16,11 +16,11 @@ | |||
package com.vaadin.terminal.gwt.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; | |||
import com.vaadin.terminal.ApplicationResource; | |||
import com.vaadin.terminal.ExternalResource; | |||
import com.vaadin.terminal.Resource; | |||
import com.vaadin.terminal.ThemeResource; | |||
public class ResourceReference extends URLReference { | |||
@@ -18,7 +18,7 @@ package com.vaadin.terminal.gwt.server; | |||
import java.io.Serializable; | |||
import com.vaadin.terminal.VariableOwner; | |||
import com.vaadin.server.VariableOwner; | |||
/** | |||
* Marker interface for server side classes that can receive RPC calls. |
@@ -3,9 +3,9 @@ package com.vaadin.terminal.gwt.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.terminal.DeploymentConfiguration; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.ui.UI; | |||
/* |
@@ -15,7 +15,7 @@ | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
import com.vaadin.terminal.StreamVariable.StreamingEndEvent; | |||
import com.vaadin.server.StreamVariable.StreamingEndEvent; | |||
@SuppressWarnings("serial") | |||
final class StreamingEndEventImpl extends AbstractStreamingEvent implements |
@@ -15,7 +15,7 @@ | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
import com.vaadin.terminal.StreamVariable.StreamingErrorEvent; | |||
import com.vaadin.server.StreamVariable.StreamingErrorEvent; | |||
@SuppressWarnings("serial") | |||
final class StreamingErrorEventImpl extends AbstractStreamingEvent implements |
@@ -15,7 +15,7 @@ | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
import com.vaadin.terminal.StreamVariable.StreamingProgressEvent; | |||
import com.vaadin.server.StreamVariable.StreamingProgressEvent; | |||
@SuppressWarnings("serial") | |||
final class StreamingProgressEventImpl extends AbstractStreamingEvent implements |
@@ -15,7 +15,7 @@ | |||
*/ | |||
package com.vaadin.terminal.gwt.server; | |||
import com.vaadin.terminal.StreamVariable.StreamingStartEvent; | |||
import com.vaadin.server.StreamVariable.StreamingStartEvent; | |||
@SuppressWarnings("serial") | |||
final class StreamingStartEventImpl extends AbstractStreamingEvent implements |
@@ -19,9 +19,9 @@ import java.io.IOException; | |||
import java.io.Writer; | |||
import com.vaadin.Application; | |||
import com.vaadin.terminal.RequestHandler; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.terminal.WrappedResponse; | |||
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 |
@@ -19,8 +19,8 @@ package com.vaadin.terminal.gwt.server; | |||
import java.util.Date; | |||
import java.util.Locale; | |||
import com.vaadin.server.WrappedRequest; | |||
import com.vaadin.shared.VBrowserDetails; | |||
import com.vaadin.terminal.WrappedRequest; | |||
/** | |||
* Class that provides information about the web browser the user is using. |
@@ -20,9 +20,9 @@ import javax.servlet.http.HttpServletRequest; | |||
import javax.servlet.http.HttpServletRequestWrapper; | |||
import com.vaadin.Application; | |||
import com.vaadin.terminal.CombinedRequest; | |||
import com.vaadin.terminal.DeploymentConfiguration; | |||
import com.vaadin.terminal.WrappedRequest; | |||
import com.vaadin.server.CombinedRequest; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.WrappedRequest; | |||
/** | |||
* Wrapper for {@link HttpServletRequest}. |
@@ -19,8 +19,8 @@ package com.vaadin.terminal.gwt.server; | |||
import javax.servlet.http.HttpServletResponse; | |||
import javax.servlet.http.HttpServletResponseWrapper; | |||
import com.vaadin.terminal.DeploymentConfiguration; | |||
import com.vaadin.terminal.WrappedResponse; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.WrappedResponse; | |||
/** | |||
* Wrapper for {@link HttpServletResponse}. |
@@ -26,10 +26,10 @@ 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; | |||
import com.vaadin.terminal.CombinedRequest; | |||
import com.vaadin.terminal.DeploymentConfiguration; | |||
import com.vaadin.terminal.WrappedRequest; | |||
/** | |||
* Wrapper for {@link PortletRequest} and its subclasses. |
@@ -29,8 +29,8 @@ import javax.portlet.MimeResponse; | |||
import javax.portlet.PortletResponse; | |||
import javax.portlet.ResourceResponse; | |||
import com.vaadin.terminal.DeploymentConfiguration; | |||
import com.vaadin.terminal.WrappedResponse; | |||
import com.vaadin.server.DeploymentConfiguration; | |||
import com.vaadin.server.WrappedResponse; | |||
/** | |||
* Wrapper for {@link PortletResponse} and its subclasses. |
@@ -24,12 +24,12 @@ import java.util.Map; | |||
import com.vaadin.event.LayoutEvents.LayoutClickEvent; | |||
import com.vaadin.event.LayoutEvents.LayoutClickListener; | |||
import com.vaadin.event.LayoutEvents.LayoutClickNotifier; | |||
import com.vaadin.server.Sizeable; | |||
import com.vaadin.shared.Connector; | |||
import com.vaadin.shared.EventId; | |||
import com.vaadin.shared.MouseEventDetails; | |||
import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutServerRpc; | |||
import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutState; | |||
import com.vaadin.terminal.Sizeable; | |||
/** | |||
* AbsoluteLayout is a layout implementation that mimics html absolute |
@@ -32,11 +32,11 @@ import com.vaadin.event.ActionManager; | |||
import com.vaadin.event.EventRouter; | |||
import com.vaadin.event.MethodEventSource; | |||
import com.vaadin.event.ShortcutListener; | |||
import com.vaadin.server.AbstractClientConnector; | |||
import com.vaadin.server.ErrorMessage; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.Terminal; | |||
import com.vaadin.shared.ComponentState; | |||
import com.vaadin.terminal.AbstractClientConnector; | |||
import com.vaadin.terminal.ErrorMessage; | |||
import com.vaadin.terminal.Resource; | |||
import com.vaadin.terminal.Terminal; | |||
import com.vaadin.terminal.gwt.server.ClientConnector; | |||
import com.vaadin.terminal.gwt.server.ComponentSizeValidator; | |||
import com.vaadin.terminal.gwt.server.ResourceReference; | |||
@@ -1072,7 +1072,7 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.terminal.Sizeable#getHeight() | |||
* @see com.vaadin.Sizeable#getHeight() | |||
*/ | |||
@Override | |||
public float getHeight() { | |||
@@ -1082,7 +1082,7 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.terminal.Sizeable#getHeightUnits() | |||
* @see com.vaadin.server.Sizeable#getHeightUnits() | |||
*/ | |||
@Override | |||
public Unit getHeightUnits() { | |||
@@ -1092,7 +1092,7 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.terminal.Sizeable#getWidth() | |||
* @see com.vaadin.server.Sizeable#getWidth() | |||
*/ | |||
@Override | |||
public float getWidth() { | |||
@@ -1102,7 +1102,7 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.terminal.Sizeable#getWidthUnits() | |||
* @see com.vaadin.server.Sizeable#getWidthUnits() | |||
*/ | |||
@Override | |||
public Unit getWidthUnits() { | |||
@@ -1112,7 +1112,7 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.terminal.Sizeable#setHeight(float, Unit) | |||
* @see com.vaadin.server.Sizeable#setHeight(float, Unit) | |||
*/ | |||
@Override | |||
public void setHeight(float height, Unit unit) { | |||
@@ -1128,7 +1128,7 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.terminal.Sizeable#setSizeFull() | |||
* @see com.vaadin.server.Sizeable#setSizeFull() | |||
*/ | |||
@Override | |||
public void setSizeFull() { | |||
@@ -1139,7 +1139,7 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.terminal.Sizeable#setSizeUndefined() | |||
* @see com.vaadin.server.Sizeable#setSizeUndefined() | |||
*/ | |||
@Override | |||
public void setSizeUndefined() { | |||
@@ -1150,7 +1150,7 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.terminal.Sizeable#setWidth(float, Unit) | |||
* @see com.vaadin.server.Sizeable#setWidth(float, Unit) | |||
*/ | |||
@Override | |||
public void setWidth(float width, Unit unit) { | |||
@@ -1166,7 +1166,7 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.terminal.Sizeable#setWidth(java.lang.String) | |||
* @see com.vaadin.server.Sizeable#setWidth(java.lang.String) | |||
*/ | |||
@Override | |||
public void setWidth(String width) { | |||
@@ -1181,7 +1181,7 @@ public abstract class AbstractComponent extends AbstractClientConnector | |||
/* | |||
* (non-Javadoc) | |||
* | |||
* @see com.vaadin.terminal.Sizeable#setHeight(java.lang.String) | |||
* @see com.vaadin.server.Sizeable#setHeight(java.lang.String) | |||
*/ | |||
@Override | |||
public void setHeight(String height) { |
@@ -4,8 +4,8 @@ | |||
package com.vaadin.ui; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.shared.ui.AbstractEmbeddedState; | |||
import com.vaadin.terminal.Resource; | |||
import com.vaadin.terminal.gwt.server.ResourceReference; | |||
/** |