From: John Ahlroos <john@vaadin.com>
Date: Wed, 5 Sep 2012 06:00:30 +0000 (+0300)
Subject: Merge branch 'master' into layoutgraph
X-Git-Tag: 7.0.0.beta1~195
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=025d8eae13bc3473b676ff1a534b28b5e812017d;p=vaadin-framework.git

Merge branch 'master' into layoutgraph
---

025d8eae13bc3473b676ff1a534b28b5e812017d
diff --cc client/src/com/vaadin/client/ComponentLocator.java
index 4b47a96dca,89e022c179..017383e695
--- a/client/src/com/vaadin/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@@ -23,14 -23,12 +23,14 @@@ import com.google.gwt.user.client.DOM
  import com.google.gwt.user.client.Element;
  import com.google.gwt.user.client.ui.HasWidgets;
  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;