Removed API deprecated in Vaadin 6 (#9071)

4 files changed, 11 insertions, 111 deletions

diff --git a/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 7e1c505fe9..58357ae3fc 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -396,32 +396,6 @@ public class ApplicationConnection {
     }-*/;
 
     /**
-     * Get the active Console for writing debug messages. May return an actual
-     * logging console, or the NullConsole if debugging is not turned on.
-     * 
-     * @deprecated Developers should use {@link VConsole} since 6.4.5
-     * 
-     * @return the active Console
-     */
-    @Deprecated
-    public static Console getConsole() {
-        return VConsole.getImplementation();
-    }
-
-    /**
-     * Checks if client side is in debug mode. Practically this is invoked by
-     * adding ?debug parameter to URI.
-     * 
-     * @deprecated use ApplicationConfiguration isDebugMode instead.
-     * 
-     * @return true if client side is currently been debugged
-     */
-    @Deprecated
-    public static boolean isDebugMode() {
-        return ApplicationConfiguration.isDebugMode();
-    }
-
-    /**
      * Gets the application base URI. Using this other than as the download
      * action URI can cause problems in Portlet 2.0 deployments.
      * 
@@ -2468,7 +2442,8 @@ public class ApplicationConnection {
      *            The identifier for the event
      * @return true if at least one listener has been registered on server side
      *         for the event identified by eventIdentifier.
-     * @deprecated Use {@link ComponentState#hasEventListener(String)} instead
+     * @deprecated as of Vaadin 7. Use
+     *             {@link ComponentState#hasEventListener(String)} instead
      */
     @Deprecated
     public boolean hasEventListeners(ComponentConnector paintable,
@@ -2521,11 +2496,13 @@ public class ApplicationConnection {
         return connectorMap;
     }
 
+    /**
+     * @deprecated No longer needed in Vaadin 7
+     */
     @Deprecated
     public void unregisterPaintable(ServerConnector p) {
-        System.out.println("unregisterPaintable (unnecessarily) called for "
+        VConsole.log("unregisterPaintable (unnecessarily) called for "
                 + Util.getConnectorString(p));
-        // connectorMap.unregisterConnector(p);
     }
 
     /**
@@ -2564,6 +2541,10 @@ public class ApplicationConnection {
         return false;
     }
 
+    /**
+     * @deprecated as of Vaadin 7. Use
+     *             {@link ComponentState#hasEventListener(String)} instead
+     */
     @Deprecated
     public boolean hasEventListeners(Widget widget, String eventIdentifier) {
         return hasEventListeners(getConnectorMap().getConnector(widget),
diff --git a/client/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java b/client/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java
deleted file mode 100644
index d8c7e67638..0000000000
--- a/client/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.terminal.gwt.client;
-
-import com.google.gwt.core.client.GWT;
-
-@Deprecated
-public class ClientExceptionHandler {
-
-    public static void displayError(Throwable e) {
-        displayError(e.getClass().getName() + ": " + e.getMessage());
-
-        GWT.log(e.getMessage(), e);
-    }
-
-    @Deprecated
-    public static void displayError(String msg) {
-        VConsole.error(msg);
-        GWT.log(msg);
-    }
-
-    @Deprecated
-    public static void displayError(String msg, Throwable e) {
-        displayError(msg);
-        displayError(e);
-
-    }
-
-}
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java
index b6012eded1..a4d00f59de 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java
+++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java
@@ -24,23 +24,6 @@ import com.vaadin.terminal.gwt.client.Util;
 
 public class DDUtil {
 
-    /**
-     * @deprecated use the version with the actual event instead of detected
-     *             clientY value
-     * 
-     * @param element
-     * @param clientY
-     * @param topBottomRatio
-     * @return
-     */
-    @Deprecated
-    public static VerticalDropLocation getVerticalDropLocation(Element element,
-            int clientY, double topBottomRatio) {
-        int offsetHeight = element.getOffsetHeight();
-        return getVerticalDropLocation(element, offsetHeight, clientY,
-                topBottomRatio);
-    }
-
     public static VerticalDropLocation getVerticalDropLocation(Element element,
             NativeEvent event, double topBottomRatio) {
         int offsetHeight = element.getOffsetHeight();
@@ -76,21 +59,7 @@ public class DDUtil {
 
     public static HorizontalDropLocation getHorizontalDropLocation(
             Element element, NativeEvent event, double leftRightRatio) {
-        int touchOrMouseClientX = Util.getTouchOrMouseClientX(event);
-        return getHorizontalDropLocation(element, touchOrMouseClientX,
-                leftRightRatio);
-    }
-
-    /**
-     * @deprecated use the version with the actual event
-     * @param element
-     * @param clientX
-     * @param leftRightRatio
-     * @return
-     */
-    @Deprecated
-    public static HorizontalDropLocation getHorizontalDropLocation(
-            Element element, int clientX, double leftRightRatio) {
+        int clientX = Util.getTouchOrMouseClientX(event);
 
         // Event coordinates are relative to the viewport, element absolute
         // position is relative to the document. Make element position relative
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent.java
index 32abc787da..34bdb28c91 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent.java
+++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent.java
@@ -53,14 +53,6 @@ public class VHtml5DragEvent extends NativeEvent {
         return null;
     }-*/;
 
-    /**
-     * @deprecated As of Vaadin 6.8, replaced by {@link #setDropEffect(String)}.
-     */
-    @Deprecated
-    public final void setDragEffect(String effect) {
-        setDropEffect(effect);
-    }
-
     public final native void setDropEffect(String effect)
     /*-{
         try {