"removed" (finalized + deprecated) getTag from AbstractComponent

svn changeset:9095/svn branch:2009-09-widget-packaging_3332

43 files changed, 37 insertions, 326 deletions

diff --git a/src/com/vaadin/demo/colorpicker/ColorPicker.java b/src/com/vaadin/demo/colorpicker/ColorPicker.java
index 55de19b73c..f423815060 100644
--- a/src/com/vaadin/demo/colorpicker/ColorPicker.java
+++ b/src/com/vaadin/demo/colorpicker/ColorPicker.java
@@ -27,12 +27,6 @@ public class ColorPicker extends AbstractField {
         return String.class;
     }
 
-    /** Tag is the UIDL element name for client-server communications. */
-    @Override
-    public String getTag() {
-        return "colorpicker";
-    }
-
     /** Set the currently selected color. */
     public void setColor(String newcolor) {
         // Sets the color name as the property of the component.
diff --git a/src/com/vaadin/demo/coverflow/Coverflow.java b/src/com/vaadin/demo/coverflow/Coverflow.java
index bd56261a38..6d274ca054 100644
--- a/src/com/vaadin/demo/coverflow/Coverflow.java
+++ b/src/com/vaadin/demo/coverflow/Coverflow.java
@@ -18,11 +18,6 @@ public class Coverflow extends AbstractSelect {
     private String backgroundGradientEnd = "EEEEEE";
     private boolean scrollbarVisibility = true;
 
-    @Override
-    public String getTag() {
-        return "cover";
-    }
-
     /**
      * Paints the uidl
      * 
diff --git a/src/com/vaadin/demo/reservation/CalendarField.java b/src/com/vaadin/demo/reservation/CalendarField.java
index 349c6b59a8..9676cd79ee 100644
--- a/src/com/vaadin/demo/reservation/CalendarField.java
+++ b/src/com/vaadin/demo/reservation/CalendarField.java
@@ -63,15 +63,6 @@ public class CalendarField extends DateField implements Container.Viewer {
         init();

     }

 

-    /*

-     * Gets the components UIDL tag string. Don't add a JavaDoc comment here, we

-     * use the default documentation from implemented interface.

-     */

-    @Override

-    public String getTag() {

-        return TAGNAME;

-    }

-

     public void init() {

         super.setResolution(RESOLUTION_HOUR);

 

diff --git a/src/com/vaadin/demo/reservation/GoogleMap.java b/src/com/vaadin/demo/reservation/GoogleMap.java
index 19dee3aacf..746982db9b 100644
--- a/src/com/vaadin/demo/reservation/GoogleMap.java
+++ b/src/com/vaadin/demo/reservation/GoogleMap.java
@@ -34,11 +34,6 @@ public class GoogleMap extends AbstractComponent implements Sizeable,
     private Object itemMarkerYPropertyId = new Object();

 

     @Override

-    public String getTag() {

-        return "googlemap";

-    }

-

-    @Override

     public void paintContent(PaintTarget target) throws PaintException {

         super.paintContent(target);

         // Add size info as variables

diff --git a/src/com/vaadin/demo/sampler/ActiveLink.java b/src/com/vaadin/demo/sampler/ActiveLink.java
index 53c2c1b2b9..b92e8371a7 100644
--- a/src/com/vaadin/demo/sampler/ActiveLink.java
+++ b/src/com/vaadin/demo/sampler/ActiveLink.java
@@ -37,11 +37,6 @@ public class ActiveLink extends Link {
         super(caption, resource);
     }
 
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
     static {
         try {
             LINK_FOLLOWED_METHOD = LinkActivatedListener.class
diff --git a/src/com/vaadin/demo/sampler/CodeLabel.java b/src/com/vaadin/demo/sampler/CodeLabel.java
index 3e4f985a65..a135c230c0 100644
--- a/src/com/vaadin/demo/sampler/CodeLabel.java
+++ b/src/com/vaadin/demo/sampler/CodeLabel.java
@@ -19,11 +19,6 @@ public class CodeLabel extends Label {
     }
 
     @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
     public void setContentMode(int contentMode) {
         if (contentMode != CONTENT_PREFORMATTED) {
             throw new UnsupportedOperationException(
diff --git a/src/com/vaadin/demo/sampler/GoogleAnalytics.java b/src/com/vaadin/demo/sampler/GoogleAnalytics.java
index 9c654bff59..9e4e56ba5e 100644
--- a/src/com/vaadin/demo/sampler/GoogleAnalytics.java
+++ b/src/com/vaadin/demo/sampler/GoogleAnalytics.java
@@ -25,11 +25,6 @@ public class GoogleAnalytics extends AbstractComponent {
         this.domainName = domainName;
     }
 
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
     public String getTrackerId() {
         return trackerId;
     }
diff --git a/src/com/vaadin/tests/book/BookTestApplication.java b/src/com/vaadin/tests/book/BookTestApplication.java
index a55a0769c1..6d3b653baf 100644
--- a/src/com/vaadin/tests/book/BookTestApplication.java
+++ b/src/com/vaadin/tests/book/BookTestApplication.java
@@ -612,12 +612,8 @@ public class BookTestApplication extends com.vaadin.Application {
 		}
 		main.addComponent(new SSNField());
 	}
-
+    // TODO add ClientWidget annotation if test is in use
 	class PagingTable extends Table {
-		@Override
-		public String getTag() {
-			return "pagingtable";
-		}
 	}
 
 	void example_Table(Window main, String param) {
diff --git a/src/com/vaadin/ui/AbsoluteLayout.java b/src/com/vaadin/ui/AbsoluteLayout.java
index 678919ca0b..8e382622ca 100644
--- a/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/src/com/vaadin/ui/AbsoluteLayout.java
@@ -30,11 +30,6 @@ public class AbsoluteLayout extends AbstractLayout {
         setSizeFull();
     }
 
-    @Override
-    public String getTag() {
-        return VAbsoluteLayout.TAGNAME;
-    }
-
     public Iterator<Component> getComponentIterator() {
         return components.iterator();
     }
diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index 54dfccd60c..76fcd0ded3 100644
--- a/src/com/vaadin/ui/AbstractComponent.java
+++ b/src/com/vaadin/ui/AbstractComponent.java
@@ -145,6 +145,16 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /**
      * Gets the UIDL tag corresponding to the component.
      * 
+     * <p>
+     * Note! In version 6.2 the method for mapping server side components to
+     * their client side counterparts was enhanced. This method was made final
+     * to intentionally "break" code where it is needed. If your code does not
+     * compile due overriding this method, it is very likely that you need to:
+     * <ul>
+     * <li>remove the implementation of getTag
+     * <li>add {@link ClientWidget} annotation to your component
+     * </ul>
+     * 
      * @return the component's UIDL tag as <code>String</code>
      * @deprecated tags are no more required for components. Instead of tags we
      *             are now using {@link ClientWidget} annotations to map server
@@ -153,7 +163,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
      * @see ClientWidget
      */
     @Deprecated
-    public String getTag() {
+    public final String getTag() {
         return "";
     }
 
diff --git a/src/com/vaadin/ui/AbstractLayout.java b/src/com/vaadin/ui/AbstractLayout.java
index 3604e5ea1d..ce4b3e40c7 100644
--- a/src/com/vaadin/ui/AbstractLayout.java
+++ b/src/com/vaadin/ui/AbstractLayout.java
@@ -26,14 +26,6 @@ public abstract class AbstractLayout extends AbstractComponentContainer
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.ui.AbstractComponent#getTag()
-     */
-    @Override
-    public abstract String getTag();
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see com.vaadin.ui.Layout#setMargin(boolean)
      */
     public void setMargin(boolean enabled) {
@@ -63,8 +55,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.ui.Layout#setMargin(boolean, boolean, boolean,
-     * boolean)
+     * @see com.vaadin.ui.Layout#setMargin(boolean, boolean, boolean, boolean)
      */
     public void setMargin(boolean topEnabled, boolean rightEnabled,
             boolean bottomEnabled, boolean leftEnabled) {
@@ -77,8 +68,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.ui.AbstractComponent#paintContent(com.vaadin
+     * @see com.vaadin.ui.AbstractComponent#paintContent(com.vaadin
      * .terminal.PaintTarget)
      */
     @Override
diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java
index 762a447456..b43d155714 100644
--- a/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -39,16 +39,6 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     private boolean spacing = false;
 
     /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "orderedlayout";
-    }
-
-    /**
      * Add a component into this container. The component is added to the right
      * or under the previous component.
      * 
diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index b2e52254f6..7df90c8ca6 100644
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -512,16 +512,6 @@ public abstract class AbstractSelect extends AbstractField implements
     }
 
     /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "select";
-    }
-
-    /**
      * Gets the visible item ids. In Select, this returns list of all item ids,
      * but can be overriden in subclasses if they paint only part of the items
      * to the terminal or null if no items is visible.
diff --git a/src/com/vaadin/ui/Accordion.java b/src/com/vaadin/ui/Accordion.java
index a5db02dd8a..dd481e7825 100644
--- a/src/com/vaadin/ui/Accordion.java
+++ b/src/com/vaadin/ui/Accordion.java
@@ -6,9 +6,4 @@ import com.vaadin.terminal.gwt.client.ui.VAccordion;
 @ClientWidget(VAccordion.class)
 public class Accordion extends TabSheet {
 
-    @Override
-    public String getTag() {
-        return "accordion";
-    }
-
 }
diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 94337eded6..6801bfa176 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -114,16 +114,6 @@ public class Button extends AbstractField {
     }
 
     /**
-     * Gets component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "button";
-    }
-
-    /**
      * Paints the content of this component.
      * 
      * @param event
diff --git a/src/com/vaadin/ui/ClientWidget.java b/src/com/vaadin/ui/ClientWidget.java
index 2865c0d837..af58e20da9 100644
--- a/src/com/vaadin/ui/ClientWidget.java
+++ b/src/com/vaadin/ui/ClientWidget.java
@@ -12,10 +12,24 @@ import com.vaadin.terminal.gwt.client.Paintable;
 
 /**
  * Annotation defining the default client side counterpart in GWT terminal for
- * {@link Component}
+ * {@link Component}.
+ * <p>
+ * With this annotation server side Vaadin component is marked to have a client
+ * side counterpart. The value of the annotation is the class of client side
+ * implementation.
+ * 
+ * <p>
+ * Note, even though client side implementation is needed during development,
+ * one may safely remove them from classpath of the production server.
+ * 
+ * 
+ * @since 6.2
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface ClientWidget {
+    /**
+     * @return the client side counterpart for the annotated component
+     */
     Class<? extends Paintable> value();
 }
diff --git a/src/com/vaadin/ui/CssLayout.java b/src/com/vaadin/ui/CssLayout.java
index 05d067d795..0b98ac7975 100644
--- a/src/com/vaadin/ui/CssLayout.java
+++ b/src/com/vaadin/ui/CssLayout.java
@@ -55,11 +55,6 @@ public class CssLayout extends AbstractLayout {
 
     private static final long serialVersionUID = -6408703812053460073L;
 
-    @Override
-    public String getTag() {
-        return VCssLayout.TAGNAME;
-    }
-
     /**
      * Custom layout slots containing the components.
      */
diff --git a/src/com/vaadin/ui/CustomComponent.java b/src/com/vaadin/ui/CustomComponent.java
index e9ea19bf8a..5d086ddaf9 100644
--- a/src/com/vaadin/ui/CustomComponent.java
+++ b/src/com/vaadin/ui/CustomComponent.java
@@ -145,11 +145,6 @@ public class CustomComponent extends AbstractComponentContainer {
         this.componentType = componentType;
     }
 
-    @Override
-    public String getTag() {
-        return "customcomponent";
-    }
-
     private class ComponentIterator implements Iterator, Serializable {
         boolean first = getCompositionRoot() != null;
 
diff --git a/src/com/vaadin/ui/CustomLayout.java b/src/com/vaadin/ui/CustomLayout.java
index 1dbd723759..f0ad7514ea 100644
--- a/src/com/vaadin/ui/CustomLayout.java
+++ b/src/com/vaadin/ui/CustomLayout.java
@@ -98,16 +98,6 @@ public class CustomLayout extends AbstractLayout {
     }
 
     /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "customlayout";
-    }
-
-    /**
      * Adds the component into this container to given location. If the location
      * is already populated, the old component is removed.
      * 
diff --git a/src/com/vaadin/ui/DateField.java b/src/com/vaadin/ui/DateField.java
index a0366258b9..69d6108152 100644
--- a/src/com/vaadin/ui/DateField.java
+++ b/src/com/vaadin/ui/DateField.java
@@ -244,15 +244,6 @@ public class DateField extends AbstractField {
     }
 
     /*
-     * Gets the components UIDL tag string. Don't add a JavaDoc comment here, we
-     * use the default documentation from implemented interface.
-     */
-    @Override
-    public String getTag() {
-        return "datefield";
-    }
-
-    /*
      * Invoked when a variable of the component changes. Don't add a JavaDoc
      * comment here, we use the default documentation from implemented
      * interface.
diff --git a/src/com/vaadin/ui/Embedded.java b/src/com/vaadin/ui/Embedded.java
index c6d393922e..3b20641c5f 100644
--- a/src/com/vaadin/ui/Embedded.java
+++ b/src/com/vaadin/ui/Embedded.java
@@ -102,16 +102,6 @@ public class Embedded extends AbstractComponent {
     }
 
     /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "embedded";
-    }
-
-    /**
      * Invoked when the component state should be painted.
      */
     @Override
diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java
index 5078c25fcc..c6c9a5a738 100644
--- a/src/com/vaadin/ui/Form.java
+++ b/src/com/vaadin/ui/Form.java
@@ -177,12 +177,6 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
 
     /* Documented in interface */
     @Override
-    public String getTag() {
-        return "form";
-    }
-
-    /* Documented in interface */
-    @Override
     public void paintContent(PaintTarget target) throws PaintException {
         super.paintContent(target);
         layout.paint(target);
diff --git a/src/com/vaadin/ui/FormLayout.java b/src/com/vaadin/ui/FormLayout.java
index fc6a8a21b9..4b42f0d8fb 100644
--- a/src/com/vaadin/ui/FormLayout.java
+++ b/src/com/vaadin/ui/FormLayout.java
@@ -31,9 +31,4 @@ public class FormLayout extends OrderedLayout {
         setMargin(true, false, true, false);
     }
 
-    @Override
-    public String getTag() {
-        return "formlayout";
-    }
-
 }
diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java
index 1207944f12..d07e232b1a 100644
--- a/src/com/vaadin/ui/GridLayout.java
+++ b/src/com/vaadin/ui/GridLayout.java
@@ -639,17 +639,6 @@ public class GridLayout extends AbstractLayout implements
     }
 
     /**
-     * Gets the components UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     * @see com.vaadin.ui.AbstractComponent#getTag()
-     */
-    @Override
-    public String getTag() {
-        return "gridlayout";
-    }
-
-    /**
      * This class defines an area on a grid. An Area is defined by the cells of
      * its upper left corner (column1,row1) and lower right corner
      * (column2,row2).
diff --git a/src/com/vaadin/ui/HorizontalLayout.java b/src/com/vaadin/ui/HorizontalLayout.java
index 16d677f6dc..31941f1024 100644
--- a/src/com/vaadin/ui/HorizontalLayout.java
+++ b/src/com/vaadin/ui/HorizontalLayout.java
@@ -21,9 +21,4 @@ public class HorizontalLayout extends AbstractOrderedLayout {
 
     }
 
-    @Override
-    public String getTag() {
-        return "horizontallayout";
-    }
-
 }
diff --git a/src/com/vaadin/ui/Label.java b/src/com/vaadin/ui/Label.java
index 7c6727a1ba..22aa0514e1 100644
--- a/src/com/vaadin/ui/Label.java
+++ b/src/com/vaadin/ui/Label.java
@@ -152,16 +152,6 @@ public class Label extends AbstractComponent implements Property,
     }
 
     /**
-     * Get the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "label";
-    }
-
-    /**
      * Set the component to read-only. Readonly is not used in label.
      * 
      * @param readOnly
diff --git a/src/com/vaadin/ui/Link.java b/src/com/vaadin/ui/Link.java
index 3f83685930..551e6c19ea 100644
--- a/src/com/vaadin/ui/Link.java
+++ b/src/com/vaadin/ui/Link.java
@@ -87,16 +87,6 @@ public class Link extends AbstractComponent {
     }
 
     /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "link";
-    }
-
-    /**
      * Paints the content of this component.
      * 
      * @param target
diff --git a/src/com/vaadin/ui/MenuBar.java b/src/com/vaadin/ui/MenuBar.java
index a77d57821a..30049431d3 100644
--- a/src/com/vaadin/ui/MenuBar.java
+++ b/src/com/vaadin/ui/MenuBar.java
@@ -33,12 +33,6 @@ public class MenuBar extends AbstractComponent {
     private Resource submenuIcon;
     private MenuItem moreItem;
 
-    /** Tag is the UIDL element name for client-server communications. */
-    @Override
-    public java.lang.String getTag() {
-        return "menubar";
-    }
-
     /** Paint (serialise) the component for the client. */
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
diff --git a/src/com/vaadin/ui/NativeButton.java b/src/com/vaadin/ui/NativeButton.java
index 4df771d054..5a24db40ba 100644
--- a/src/com/vaadin/ui/NativeButton.java
+++ b/src/com/vaadin/ui/NativeButton.java
@@ -43,9 +43,4 @@ public class NativeButton extends Button {
         super(caption, dataSource);
     }
 
-    @Override
-    public String getTag() {
-        return "nativebutton";
-    }
-
 }
\ No newline at end of file
diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index 29d708a328..03f1857386 100644
--- a/src/com/vaadin/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -277,16 +277,6 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     }
 
     /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "panel";
-    }
-
-    /**
      * Adds the component into this container.
      * 
      * @param c
diff --git a/src/com/vaadin/ui/PopupView.java b/src/com/vaadin/ui/PopupView.java
index 8184d60b65..9d8144f78e 100644
--- a/src/com/vaadin/ui/PopupView.java
+++ b/src/com/vaadin/ui/PopupView.java
@@ -277,14 +277,6 @@ public class PopupView extends AbstractComponentContainer {
      */
 
     /**
-     * @see com.vaadin.ui.AbstractComponent#getTag()
-     */
-    @Override
-    public java.lang.String getTag() {
-        return "popupview";
-    }
-
-    /**
      * Paint (serialize) the component for the client.
      * 
      * @see com.vaadin.ui.AbstractComponent#paintContent(com.vaadin.terminal.PaintTarget)
diff --git a/src/com/vaadin/ui/ProgressIndicator.java b/src/com/vaadin/ui/ProgressIndicator.java
index bb346c26d5..b896634cd9 100644
--- a/src/com/vaadin/ui/ProgressIndicator.java
+++ b/src/com/vaadin/ui/ProgressIndicator.java
@@ -73,16 +73,6 @@ public class ProgressIndicator extends AbstractField implements Property,
     }
 
     /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "progressindicator";
-    }
-
-    /**
      * Sets the component to read-only. Readonly is not used in
      * ProgressIndicator.
      * 
diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java
index 899a936765..2c1b6a9c69 100644
--- a/src/com/vaadin/ui/Select.java
+++ b/src/com/vaadin/ui/Select.java
@@ -425,16 +425,6 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering {
         super.requestRepaint();
     }
 
-    /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "select";
-    }
-
     public void setFilteringMode(int filteringMode) {
         this.filteringMode = filteringMode;
     }
diff --git a/src/com/vaadin/ui/Slider.java b/src/com/vaadin/ui/Slider.java
index 24dd520ddd..7d06b8075a 100644
--- a/src/com/vaadin/ui/Slider.java
+++ b/src/com/vaadin/ui/Slider.java
@@ -396,11 +396,6 @@ public class Slider extends AbstractField {
     }
 
     @Override
-    public String getTag() {
-        return "slider";
-    }
-
-    @Override
     public void paintContent(PaintTarget target) throws PaintException {
         super.paintContent(target);
 
diff --git a/src/com/vaadin/ui/SplitPanel.java b/src/com/vaadin/ui/SplitPanel.java
index 956eefc62b..7d510239e9 100644
--- a/src/com/vaadin/ui/SplitPanel.java
+++ b/src/com/vaadin/ui/SplitPanel.java
@@ -76,16 +76,6 @@ public class SplitPanel extends AbstractLayout {
     }
 
     /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "splitpanel";
-    }
-
-    /**
      * Add a component into this container. The component is added to the right
      * or under the previous component.
      * 
diff --git a/src/com/vaadin/ui/TabSheet.java b/src/com/vaadin/ui/TabSheet.java
index 71a4ca8cf2..ed81fdb655 100644
--- a/src/com/vaadin/ui/TabSheet.java
+++ b/src/com/vaadin/ui/TabSheet.java
@@ -160,16 +160,6 @@ public class TabSheet extends AbstractComponentContainer implements
     }
 
     /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "tabsheet";
-    }
-
-    /**
      * Moves all components from another container to this container. The
      * components are removed from the other container.
      * 
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 1a106becc1..d77de554cb 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -2366,16 +2366,6 @@ public class Table extends AbstractSelect implements Action.Container,
         target.endTag("visiblecolumns");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.ui.AbstractSelect#getTag()
-     */
-    @Override
-    public String getTag() {
-        return "table";
-    }
-
     /**
      * Gets the cached visible table contents.
      * 
diff --git a/src/com/vaadin/ui/TextField.java b/src/com/vaadin/ui/TextField.java
index a43b2b1be8..a773617265 100644
--- a/src/com/vaadin/ui/TextField.java
+++ b/src/com/vaadin/ui/TextField.java
@@ -231,18 +231,10 @@ public class TextField extends AbstractField {
     }
 
     /*
-     * Gets the components UIDL tag string. Don't add a JavaDoc comment here, we
-     * use the default documentation from implemented interface.
-     */
-    @Override
-    public String getTag() {
-        return "textfield";
-    }
-
-    /*
-     * Invoked when a variable of the component changes. Don't add a JavaDoc
-     * comment here, we use the default documentation from implemented
-     * interface.
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.ui.AbstractField#changeVariables(java.lang.Object,
+     * java.util.Map)
      */
     @Override
     public void changeVariables(Object source, Map variables) {
diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java
index 67a036580b..082b9f4624 100644
--- a/src/com/vaadin/ui/Tree.java
+++ b/src/com/vaadin/ui/Tree.java
@@ -319,22 +319,11 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /* Component API */
 
-    /**
-     * Gets the UIDL tag corresponding to the component.
-     * 
-     * @see com.vaadin.ui.AbstractComponent#getTag()
-     */
-    @Override
-    public String getTag() {
-        return "tree";
-    }
-
-    /**
-     * Called when one or more variables handled by the implementing class are
-     * changed.
+    /*
+     * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.VariableOwner#changeVariables(Object source, Map
-     *      variables)
+     * @see com.vaadin.ui.AbstractSelect#changeVariables(java.lang.Object,
+     * java.util.Map)
      */
     @Override
     public void changeVariables(Object source, Map variables) {
diff --git a/src/com/vaadin/ui/Upload.java b/src/com/vaadin/ui/Upload.java
index 2ea347fc56..4789641193 100644
--- a/src/com/vaadin/ui/Upload.java
+++ b/src/com/vaadin/ui/Upload.java
@@ -115,16 +115,6 @@ public class Upload extends AbstractComponent implements Component.Focusable {
     }
 
     /**
-     * Gets the component type.
-     * 
-     * @return Component type as string.
-     */
-    @Override
-    public String getTag() {
-        return "upload";
-    }
-
-    /**
      * This method is called by terminal when upload is received.
      * 
      * Note, this method is called outside synchronized (Application) block, so
diff --git a/src/com/vaadin/ui/UriFragmentUtility.java b/src/com/vaadin/ui/UriFragmentUtility.java
index d6c0dc9f51..703e581733 100644
--- a/src/com/vaadin/ui/UriFragmentUtility.java
+++ b/src/com/vaadin/ui/UriFragmentUtility.java
@@ -86,11 +86,6 @@ public class UriFragmentUtility extends AbstractComponent {
     }
 
     @Override
-    public String getTag() {
-        return "urifragment";
-    }
-
-    @Override
     public void paintContent(PaintTarget target) throws PaintException {
         super.paintContent(target);
         target.addVariable(this, "fragment", fragment);
diff --git a/src/com/vaadin/ui/VerticalLayout.java b/src/com/vaadin/ui/VerticalLayout.java
index 13f1422b6a..d67f33e3e6 100644
--- a/src/com/vaadin/ui/VerticalLayout.java
+++ b/src/com/vaadin/ui/VerticalLayout.java
@@ -22,9 +22,4 @@ public class VerticalLayout extends AbstractOrderedLayout {
         setWidth("100%");
     }
 
-    @Override
-    public String getTag() {
-        return "verticallayout";
-    }
-
 }
diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index 1912a434ef..e80f588b87 100644
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -257,16 +257,6 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
         super.setParent(parent);
     }
 
-    /**
-     * Gets the component UIDL tag.
-     * 
-     * @return the Component UIDL tag as string.
-     */
-    @Override
-    public String getTag() {
-        return "window";
-    }
-
     /* ********************************************************************* */
 
     /**