From 5490af4c900952e4be1dc071af6860488f27b4c4 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 30 Sep 2010 14:48:45 +0000
Subject: Removed fragment from javadoc

svn changeset:15283/svn branch:6.4
---
 src/com/vaadin/data/util/ItemSorter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com/vaadin/data/util/ItemSorter.java b/src/com/vaadin/data/util/ItemSorter.java
index 2613056542..e84c17dcaa 100644
--- a/src/com/vaadin/data/util/ItemSorter.java
+++ b/src/com/vaadin/data/util/ItemSorter.java
@@ -12,7 +12,7 @@ import com.vaadin.data.Container.Sortable;
 /**
  * An item comparator which is compatible with the {@link Sortable} interface.
  * The <code>ItemSorter</code> interface can be used in <code>Sortable</code>
- * implementations to provide a custom sorting method. The interface
+ * implementations to provide a custom sorting method.
  */
 public interface ItemSorter extends Comparator<Object>, Cloneable, Serializable {
 
-- 
cgit v1.2.3


From 577c86186a245a7671561739baea0c1893f98d8b Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Sat, 2 Oct 2010 11:38:13 +0000
Subject: replaced hard coded style with a css rule

svn changeset:15308/svn branch:6.4
---
 WebContent/VAADIN/themes/base/button/button.css      |  4 ++++
 src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java | 14 --------------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css
index 29dfab0de7..5051360bb3 100644
--- a/WebContent/VAADIN/themes/base/button/button.css
+++ b/WebContent/VAADIN/themes/base/button/button.css
@@ -130,6 +130,10 @@
 /*
  * Checkbox styles
  * -------------------------------------- */
+ 
+ .v-checkbox {
+ 	display: block;
+ }
 
 .v-checkbox,
 .v-checkbox label,
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
index 08111452f7..469fbf20ae 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
@@ -42,8 +42,6 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements
 
     private Icon icon;
 
-    private boolean isBlockMode = false;
-
     private HandlerRegistration focusHandlerRegistration;
     private HandlerRegistration blurHandlerRegistration;
 
@@ -170,26 +168,14 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements
 
     @Override
     public void setWidth(String width) {
-        setBlockMode();
         super.setWidth(width);
     }
 
     @Override
     public void setHeight(String height) {
-        setBlockMode();
         super.setHeight(height);
     }
 
-    /**
-     * makes container element (span) to be block element to enable sizing.
-     */
-    private void setBlockMode() {
-        if (!isBlockMode) {
-            DOM.setStyleAttribute(getElement(), "display", "block");
-            isBlockMode = true;
-        }
-    }
-
     public void onFocus(FocusEvent arg0) {
         client.updateVariable(id, EventId.FOCUS, "", true);
     }
-- 
cgit v1.2.3