diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-11-14 10:17:06 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-11-14 10:17:06 +0200 |
| commit | 89fcc06ccbe44f6f6be813cd45d0944f5be57a76 (patch) | |
| tree | 2f0a4a45a76837e5c8a31f60a2adfd7f9ef83337 /client | |
| parent | aa9a76317b4110fa326904ab407d70623b87ea48 (diff) | |
| download | vaadin-framework-89fcc06ccbe44f6f6be813cd45d0944f5be57a76.tar.gz vaadin-framework-89fcc06ccbe44f6f6be813cd45d0944f5be57a76.zip | |
Move widget classes from c.v.c.ui.<widget> to c.v.c.ui (#9392) - fixes
- move VRichTextToolbar back to sub-package where its resources are (not
a top level widget)
- update some package names in browser specific overrides
- update a test
Change-Id: Id7ff5307b881ef1912e805b280604fbe09c35e0b
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml | 8 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/VRichTextArea.java | 1 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java (renamed from client/src/com/vaadin/client/ui/VRichTextToolbar.java) | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml b/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml index 09b901ec38..ba6c171a7d 100644 --- a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml +++ b/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml @@ -21,12 +21,12 @@ </replace-with> <!-- Fall through to this rule for everything but IE --> - <replace-with class="com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper"> - <when-type-is class="com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper" /> + <replace-with class="com.vaadin.client.ui.VDragAndDropWrapper"> + <when-type-is class="com.vaadin.client.ui.VDragAndDropWrapper" /> </replace-with> - <replace-with class="com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapperIE"> - <when-type-is class="com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper" /> + <replace-with class="com.vaadin.client.ui.VDragAndDropWrapperIE"> + <when-type-is class="com.vaadin.client.ui.VDragAndDropWrapper" /> <any> <when-property-is name="user.agent" value="ie8" /> </any> diff --git a/client/src/com/vaadin/client/ui/VRichTextArea.java b/client/src/com/vaadin/client/ui/VRichTextArea.java index 2576d02566..0a53e4505e 100644 --- a/client/src/com/vaadin/client/ui/VRichTextArea.java +++ b/client/src/com/vaadin/client/ui/VRichTextArea.java @@ -41,6 +41,7 @@ import com.vaadin.client.BrowserInfo; import com.vaadin.client.ConnectorMap; import com.vaadin.client.Util; import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; +import com.vaadin.client.ui.richtextarea.VRichTextToolbar; /** * This class implements a basic client side rich text editor component. diff --git a/client/src/com/vaadin/client/ui/VRichTextToolbar.java b/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java index 4d002e923c..840fb3b309 100644 --- a/client/src/com/vaadin/client/ui/VRichTextToolbar.java +++ b/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java @@ -28,7 +28,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui; +package com.vaadin.client.ui.richtextarea; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ChangeEvent; |