Removed remaining methods from Terminal (#4355, #8027)

2 files changed, 10 insertions, 56 deletions

diff --git a/server/src/com/vaadin/terminal/Terminal.java b/server/src/com/vaadin/terminal/Terminal.java
index 29cb649d54..a02bcb50bb 100644
--- a/server/src/com/vaadin/terminal/Terminal.java
+++ b/server/src/com/vaadin/terminal/Terminal.java
@@ -25,44 +25,12 @@ import java.io.Serializable;
  * 
  * @author Vaadin Ltd.
  * @since 3.0
+ * @deprecated Currently only a container for ErrorEvent and ErrorListener
  */
+@Deprecated
 public interface Terminal extends Serializable {
 
     /**
-     * Gets the name of the default theme for this terminal.
-     * 
-     * @return the name of the theme that is used by default by this terminal.
-     */
-    public String getDefaultTheme();
-
-    /**
-     * Gets the width of the terminal screen in pixels. This is the width of the
-     * screen and not the width available for the application.
-     * <p>
-     * Note that the screen width is typically not available in the
-     * {@link com.vaadin.Application#init()} method as this is called before the
-     * browser has a chance to report the screen size to the server.
-     * </p>
-     * 
-     * @return the width of the terminal screen.
-     */
-    public int getScreenWidth();
-
-    /**
-     * Gets the height of the terminal screen in pixels. This is the height of
-     * the screen and not the height available for the application.
-     * 
-     * <p>
-     * Note that the screen height is typically not available in the
-     * {@link com.vaadin.Application#init()} method as this is called before the
-     * browser has a chance to report the screen size to the server.
-     * </p>
-     * 
-     * @return the height of the terminal screen.
-     */
-    public int getScreenHeight();
-
-    /**
      * An error event implementation for Terminal.
      */
     public interface ErrorEvent extends Serializable {
diff --git a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java
index 90aef4283d..37bc81cfcf 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java
+++ b/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java
@@ -20,7 +20,6 @@ import java.util.Date;
 import java.util.Locale;
 
 import com.vaadin.shared.VBrowserDetails;
-import com.vaadin.terminal.Terminal;
 import com.vaadin.terminal.WrappedRequest;
 
 /**
@@ -30,7 +29,7 @@ import com.vaadin.terminal.WrappedRequest;
  * 
  * @author Vaadin Ltd.
  */
-public class WebBrowser implements Terminal {
+public class WebBrowser {
 
     private int screenHeight = 0;
     private int screenWidth = 0;
@@ -48,34 +47,21 @@ public class WebBrowser implements Terminal {
     private long clientServerTimeDelta;
 
     /**
-     * There is no default-theme for this terminal type.
+     * Gets the height of the screen in pixels. This is the full screen
+     * resolution and not the height available for the application.
      * 
-     * @return Always returns null.
+     * @return the height of the screen in pixels.
      */
-
-    @Override
-    public String getDefaultTheme() {
-        return null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.terminal.Terminal#getScreenHeight()
-     */
-
-    @Override
     public int getScreenHeight() {
         return screenHeight;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
+     * Gets the width of the screen in pixels. This is the full screen
+     * resolution and not the width available for the application.
      * 
-     * @see com.vaadin.terminal.Terminal#getScreenWidth()
+     * @return the width of the screen in pixels.
      */
-
-    @Override
     public int getScreenWidth() {
         return screenWidth;
     }