Merge branch 'master' of ssh://git@dev.vaadin.com/vaadin.git

4 files changed, 44 insertions, 18 deletions

diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java
index 9a937d5750..13e87c16ad 100644
--- a/server/src/com/vaadin/navigator/Navigator.java
+++ b/server/src/com/vaadin/navigator/Navigator.java
@@ -1,7 +1,7 @@
 package com.vaadin.navigator;
 
 /*
-  * Copyright 2011 Vaadin Ltd.
+ * 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
@@ -564,7 +564,7 @@ public class Navigator implements Serializable {
         }
 
         removeView(viewName);
-        registerProvider(new StaticViewProvider(viewName, view));
+        addProvider(new StaticViewProvider(viewName, view));
     }
 
     /**
@@ -590,7 +590,7 @@ public class Navigator implements Serializable {
         }
 
         removeView(viewName);
-        registerProvider(new ClassBasedViewProvider(viewName, viewClass));
+        addProvider(new ClassBasedViewProvider(viewName, viewClass));
     }
 
     /**
@@ -629,7 +629,7 @@ public class Navigator implements Serializable {
      * @param provider
      *            provider to register
      */
-    public void registerProvider(ViewProvider provider) {
+    public void addProvider(ViewProvider provider) {
         providers.add(provider);
     }
 
@@ -639,7 +639,7 @@ public class Navigator implements Serializable {
      * @param provider
      *            provider to unregister
      */
-    public void unregisterProvider(ViewProvider provider) {
+    public void removeProvider(ViewProvider provider) {
         providers.remove(provider);
     }
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
index 6ebdace3e3..2349be1974 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
@@ -372,9 +372,9 @@ public class ComponentSizeValidator implements Serializable {
             err.append("\"");
         }
 
-        if (component.getDebugId() != null) {
-            err.append(" debugId: ");
-            err.append(component.getDebugId());
+        if (component.getId() != null) {
+            err.append(" id: ");
+            err.append(component.getId());
         }
 
         if (createLoc != null) {
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index a52a07f266..917b1a516d 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -111,14 +111,40 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /* Get/Set component properties */
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.ui.Component#setId(java.lang.String)
+     */
     @Override
-    public void setDebugId(String id) {
-        getState().setDebugId(id);
+    public void setId(String id) {
+        getState().setId(id);
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.ui.Component#getId()
+     */
     @Override
+    public String getId() {
+        return getState().getId();
+    }
+
+    /**
+     * @deprecated as of 7.0. Use {@link #setId(String)}
+     */
+    @Deprecated
+    public void setDebugId(String id) {
+        setId(id);
+    }
+
+    /**
+     * @deprecated as of 7.0. Use {@link #getId()}
+     */
+    @Deprecated
     public String getDebugId() {
-        return getState().getDebugId();
+        return getId();
     }
 
     /*
diff --git a/server/src/com/vaadin/ui/Component.java b/server/src/com/vaadin/ui/Component.java
index 400dd66cac..0559cc5e6a 100644
--- a/server/src/com/vaadin/ui/Component.java
+++ b/server/src/com/vaadin/ui/Component.java
@@ -510,8 +510,8 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * Gets the UI the component is attached to.
      * 
      * <p>
-     * If the component is not attached to a UI through a component
-     * containment hierarchy, <code>null</code> is returned.
+     * If the component is not attached to a UI through a component containment
+     * hierarchy, <code>null</code> is returned.
      * </p>
      * 
      * @return the UI of the component or <code>null</code> if it is not
@@ -574,8 +574,8 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * {@link #setParent(Component)}.
      * </p>
      * <p>
-     * This method must call {@link UI#componentAttached(Component)} to let
-     * the UI know that a new Component has been attached.
+     * This method must call {@link UI#componentAttached(Component)} to let the
+     * UI know that a new Component has been attached.
      * </p>
      * 
      * 
@@ -630,14 +630,14 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * @param id
      *            An alphanumeric id
      */
-    public void setDebugId(String id);
+    public void setId(String id);
 
     /**
      * Get's currently set debug identifier
      * 
-     * @return current debug id, null if not set
+     * @return current id, null if not set
      */
-    public String getDebugId();
+    public String getId();
 
     /* Component event framework */