From a0438ba9920413aedda0ac133abf20aede31884c Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Fri, 8 May 2009 14:45:45 +0000 Subject: [PATCH] Fixed #2860: Rename getter/setter of spacing http://dev.itmill.com/ticket/2860 svn changeset:7693/svn branch:6.0 --- src/com/itmill/toolkit/ui/AbstractOrderedLayout.java | 12 +++++++++++- src/com/itmill/toolkit/ui/GridLayout.java | 12 +++++++++++- src/com/itmill/toolkit/ui/Layout.java | 9 +++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java b/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java index 94a3bf3778..c544378714 100644 --- a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java +++ b/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java @@ -292,12 +292,22 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements /* * (non-Javadoc) * - * @see com.itmill.toolkit.ui.Layout.SpacingHandler#isSpacingEnabled() + * @see com.itmill.toolkit.ui.Layout.SpacingHandler#isSpacing() */ + @Deprecated public boolean isSpacingEnabled() { return spacing; } + /* + * (non-Javadoc) + * + * @see com.itmill.toolkit.ui.Layout.SpacingHandler#isSpacing() + */ + public boolean isSpacing() { + return spacing; + } + /** *

* This method is used to control how excess space in layout is distributed diff --git a/src/com/itmill/toolkit/ui/GridLayout.java b/src/com/itmill/toolkit/ui/GridLayout.java index 608871bcf5..888b5f840b 100644 --- a/src/com/itmill/toolkit/ui/GridLayout.java +++ b/src/com/itmill/toolkit/ui/GridLayout.java @@ -1107,12 +1107,22 @@ public class GridLayout extends AbstractLayout implements /* * (non-Javadoc) * - * @see com.itmill.toolkit.ui.Layout.SpacingHandler#isSpacingEnabled() + * @see com.itmill.toolkit.ui.Layout.SpacingHandler#isSpacing() */ + @Deprecated public boolean isSpacingEnabled() { return spacing; } + /* + * (non-Javadoc) + * + * @see com.itmill.toolkit.ui.Layout.SpacingHandler#isSpacing() + */ + public boolean isSpacing() { + return spacing; + } + /** * Inserts an empty row at the chosen position in the grid. * diff --git a/src/com/itmill/toolkit/ui/Layout.java b/src/com/itmill/toolkit/ui/Layout.java index d18cd93ea1..f35bbf7ff9 100644 --- a/src/com/itmill/toolkit/ui/Layout.java +++ b/src/com/itmill/toolkit/ui/Layout.java @@ -178,8 +178,17 @@ public interface Layout extends ComponentContainer, Serializable { * * @return true if spacing between child components within this layout * is enabled, false otherwise + * @deprecated Use {@link #isSpacing()} instead. */ + @Deprecated public boolean isSpacingEnabled(); + + /** + * + * @return true if spacing between child components within this layout + * is enabled, false otherwise + */ + public boolean isSpacing(); } /** -- 2.39.5