Merge remote-tracking branch 'origin/7.0'

Change-Id: Iaaf7d36e0a3443d37c96e53a38af0df8be68f4f4

5 files changed, 14 insertions, 44 deletions

diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java
index 1705365f60..306f9cf23b 100644
--- a/server/src/com/vaadin/data/util/IndexedContainer.java
+++ b/server/src/com/vaadin/data/util/IndexedContainer.java
@@ -166,7 +166,8 @@ public class IndexedContainer extends
     public Property getContainerProperty(Object itemId, Object propertyId) {
         // map lookup more efficient than propertyIds if there are many
         // properties
-        if (!containsId(itemId) || !types.containsKey(propertyId)) {
+        if (!containsId(itemId) || propertyId == null
+                || !types.containsKey(propertyId)) {
             return null;
         }
 
diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/com/vaadin/server/VaadinPortletService.java
index e59ea7fd5e..8c1e7af0fa 100644
--- a/server/src/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/com/vaadin/server/VaadinPortletService.java
@@ -46,7 +46,12 @@ public class VaadinPortletService extends VaadinService {
         }
     }
 
-    protected VaadinPortlet getPortlet() {
+    /**
+     * Retrieves a reference to the portlet associated with this service.
+     * 
+     * @return A reference to the VaadinPortlet this service is using
+     */
+    public VaadinPortlet getPortlet() {
         return portlet;
     }
 
diff --git a/server/src/com/vaadin/server/VaadinServletService.java b/server/src/com/vaadin/server/VaadinServletService.java
index 71f47ea217..7120e3a5c5 100644
--- a/server/src/com/vaadin/server/VaadinServletService.java
+++ b/server/src/com/vaadin/server/VaadinServletService.java
@@ -44,7 +44,12 @@ public class VaadinServletService extends VaadinService {
         }
     }
 
-    protected VaadinServlet getServlet() {
+    /**
+     * Retrieves a reference to the servlet associated with this service.
+     * 
+     * @return A reference to the VaadinServlet this service is using
+     */
+    public VaadinServlet getServlet() {
         return servlet;
     }
 
diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java
index 422e0a1796..619d717d97 100644
--- a/server/src/com/vaadin/ui/AbstractField.java
+++ b/server/src/com/vaadin/ui/AbstractField.java
@@ -373,30 +373,6 @@ public abstract class AbstractField<T> extends AbstractComponent implements
     /* Property interface implementation */
 
     /**
-     * Returns the (field) value converted to a String using toString().
-     * 
-     * @see java.lang.Object#toString()
-     * @deprecated As of 7.0, use {@link #getValue()} to get the value of the
-     *             field, {@link #getConvertedValue()} to get the field value
-     *             converted to the data model type or
-     *             {@link #getPropertyDataSource()} .getValue() to get the value
-     *             of the data source.
-     */
-    @Deprecated
-    @Override
-    public String toString() {
-        logger.warning("You are using AbstractField.toString() to get the value for a "
-                + getClass().getSimpleName()
-                + ". This will not be supported starting from Vaadin 7.1 "
-                + "(your debugger might call toString() and cause this message to appear).");
-        final Object value = getFieldValue();
-        if (value == null) {
-            return null;
-        }
-        return value.toString();
-    }
-
-    /**
      * Gets the current value of the field.
      * 
      * <p>
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index f49a1403cf..f413ea47f2 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -203,23 +203,6 @@ public class Label extends AbstractComponent implements Property<String>,
     }
 
     /**
-     * Returns the value displayed by this label.
-     * 
-     * @see java.lang.Object#toString()
-     * @deprecated As of 7.0, use {@link #getValue()} to get the value of the
-     *             label or {@link #getPropertyDataSource()} .getValue() to get
-     *             the value of the data source.
-     */
-    @Deprecated
-    @Override
-    public String toString() {
-        logger.warning("You are using Label.toString() to get the value for a "
-                + getClass().getSimpleName()
-                + ".  This will not be supported starting from Vaadin 7.1 (your debugger might call toString() and cause this message to appear).");
-        return getValue();
-    }
-
-    /**
      * Gets the type of the Property.
      * 
      * @see com.vaadin.data.Property#getType()