Merged com.vaadin.terminal.gwt.server into com.vaadin.server (#9431)

5 files changed, 8 insertions, 9 deletions

diff --git a/client/src/com/vaadin/client/ApplicationConfiguration.java b/client/src/com/vaadin/client/ApplicationConfiguration.java
index 4db9a5d9f9..e364facb43 100644
--- a/client/src/com/vaadin/client/ApplicationConfiguration.java
+++ b/client/src/com/vaadin/client/ApplicationConfiguration.java
@@ -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()
         /*-{
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 1f12cbb3a1..88510e7bf6 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -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
diff --git a/client/src/com/vaadin/client/communication/JSONSerializer.java b/client/src/com/vaadin/client/communication/JSONSerializer.java
index a8fcfbb6af..dd3594acac 100644
--- a/client/src/com/vaadin/client/communication/JSONSerializer.java
+++ b/client/src/com/vaadin/client/communication/JSONSerializer.java
@@ -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
diff --git a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
index 6c0d8fa725..e942f803e9 100644
--- a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
+++ b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
@@ -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) {
diff --git a/client/src/com/vaadin/client/ui/table/TableConnector.java b/client/src/com/vaadin/client/ui/table/TableConnector.java
index e92584e211..891d4880b3 100644
--- a/client/src/com/vaadin/client/ui/table/TableConnector.java
+++ b/client/src/com/vaadin/client/ui/table/TableConnector.java
@@ -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) {