From: Artur Signell Date: Fri, 19 Aug 2011 13:34:45 +0000 (+0000) Subject: #7369 Removed ‌"final" from methods that do not need to be final X-Git-Tag: 6.7.0.beta1~40 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f692bfa89c08205f3ac403b4fa9e4268e3a2d567;p=vaadin-framework.git #7369 Removed ‌"final" from methods that do not need to be final svn changeset:20524/svn branch:6.7 --- diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java index 59e173b536..646d898a54 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/src/com/vaadin/ui/AbstractSelect.java @@ -1615,7 +1615,7 @@ public abstract class AbstractSelect extends AbstractField implements * @see #isSelected(Object) * @see #select(Object) */ - public final Object getNullSelectionItemId() { + public Object getNullSelectionItemId() { return nullSelectionItemId; } diff --git a/src/com/vaadin/ui/CustomComponent.java b/src/com/vaadin/ui/CustomComponent.java index a598b5b3bb..847338fa60 100644 --- a/src/com/vaadin/ui/CustomComponent.java +++ b/src/com/vaadin/ui/CustomComponent.java @@ -76,7 +76,7 @@ public class CustomComponent extends AbstractComponentContainer { * * @return the Component Composition root. */ - protected final Component getCompositionRoot() { + protected Component getCompositionRoot() { return root; } @@ -90,7 +90,7 @@ public class CustomComponent extends AbstractComponentContainer { * @param compositionRoot * the root of the composition component tree. */ - protected final void setCompositionRoot(Component compositionRoot) { + protected void setCompositionRoot(Component compositionRoot) { if (compositionRoot != root) { if (root != null) { // remove old component diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java index 40b0ca9a6c..83fd5f2a01 100644 --- a/src/com/vaadin/ui/GridLayout.java +++ b/src/com/vaadin/ui/GridLayout.java @@ -979,7 +979,7 @@ public class GridLayout extends AbstractLayout implements * * @return the number of columns in the grid. */ - public final int getColumns() { + public int getColumns() { return cols; } @@ -1023,7 +1023,7 @@ public class GridLayout extends AbstractLayout implements * * @return the number of rows in the grid. */ - public final int getRows() { + public int getRows() { return rows; }