Merge branch 'master' into layoutgraph

7 files changed, 6 insertions, 11 deletions

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 6a1474fa45..a4de5dd4ad 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -70,10 +70,10 @@ import com.vaadin.client.metadata.TypeData;
 import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.client.ui.AbstractConnector;
 import com.vaadin.client.ui.VContextMenu;
-import com.vaadin.client.ui.UI.UIConnector;
 import com.vaadin.client.ui.dd.VDragAndDropManager;
 import com.vaadin.client.ui.notification.VNotification;
 import com.vaadin.client.ui.notification.VNotification.HideEvent;
+import com.vaadin.client.ui.ui.UIConnector;
 import com.vaadin.client.ui.window.WindowConnector;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.ComponentState;
diff --git a/client/src/com/vaadin/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java
index 4b47a96dca..017383e695 100644
--- a/client/src/com/vaadin/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@ -26,11 +26,11 @@ import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ui.SubPartAware;
-import com.vaadin.client.ui.UI.VUI;
 import com.vaadin.client.ui.gridlayout.VGridLayout;
 import com.vaadin.client.ui.orderedlayout.VBoxLayout;
 import com.vaadin.client.ui.orderedlayout.VMeasuringOrderedLayout;
 import com.vaadin.client.ui.tabsheet.VTabsheetPanel;
+import com.vaadin.client.ui.ui.VUI;
 import com.vaadin.client.ui.window.VWindow;
 import com.vaadin.client.ui.window.WindowConnector;
 import com.vaadin.shared.ComponentState;
diff --git a/client/src/com/vaadin/client/VDebugConsole.java b/client/src/com/vaadin/client/VDebugConsole.java
index 2db5e028cf..51504ae4e1 100644
--- a/client/src/com/vaadin/client/VDebugConsole.java
+++ b/client/src/com/vaadin/client/VDebugConsole.java
@@ -69,8 +69,8 @@ import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ui.VLazyExecutor;
 import com.vaadin.client.ui.VOverlay;
-import com.vaadin.client.ui.UI.UIConnector;
 import com.vaadin.client.ui.notification.VNotification;
+import com.vaadin.client.ui.ui.UIConnector;
 import com.vaadin.client.ui.window.WindowConnector;
 import com.vaadin.shared.Version;
 
diff --git a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
index f461b775db..3a9dcec347 100644
--- a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
@@ -37,8 +37,8 @@ import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.metadata.NoDataException;
 import com.vaadin.client.metadata.Type;
 import com.vaadin.client.metadata.TypeData;
-import com.vaadin.client.ui.UI.UIConnector;
 import com.vaadin.client.ui.datefield.PopupDateFieldConnector;
+import com.vaadin.client.ui.ui.UIConnector;
 import com.vaadin.shared.ComponentConstants;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.Connector;
diff --git a/client/src/com/vaadin/client/ui/button/VButton.java b/client/src/com/vaadin/client/ui/button/VButton.java
index 8e611144e4..d4cd40e2e9 100644
--- a/client/src/com/vaadin/client/ui/button/VButton.java
+++ b/client/src/com/vaadin/client/ui/button/VButton.java
@@ -91,11 +91,6 @@ public class VButton extends FocusWidget implements ClickHandler {
     private HandlerRegistration focusHandlerRegistration;
     private HandlerRegistration blurHandlerRegistration;
 
-    /**
-     * If caption should be rendered in HTML
-     */
-    protected boolean htmlCaption = false;
-
     public VButton() {
         super(DOM.createDiv());
         setTabIndex(0);
diff --git a/client/src/com/vaadin/client/ui/UI/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java
index cb8b0ece9e..3b4e4e1c7c 100644
--- a/client/src/com/vaadin/client/ui/UI/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.client.ui.UI;
+package com.vaadin.client.ui.ui;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/client/src/com/vaadin/client/ui/UI/VUI.java b/client/src/com/vaadin/client/ui/ui/VUI.java
index c99dfebdee..9aa3331577 100644
--- a/client/src/com/vaadin/client/ui/UI/VUI.java
+++ b/client/src/com/vaadin/client/ui/ui/VUI.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.client.ui.UI;
+package com.vaadin.client.ui.ui;
 
 import java.util.ArrayList;