diff options
author | Johannes Dahlström <johannesd@vaadin.com> | 2012-09-11 10:52:56 +0300 |
---|---|---|
committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-09-11 10:52:56 +0300 |
commit | c0b98ed77842f505f3a2f424c5d049a3c0c970cb (patch) | |
tree | 437ea7120571b63da92745a72efeb8e3562a5750 /client | |
parent | 52331e0db4d3898c09369c2a797c38c8de544c11 (diff) | |
download | vaadin-framework-c0b98ed77842f505f3a2f424c5d049a3c0c970cb.tar.gz vaadin-framework-c0b98ed77842f505f3a2f424c5d049a3c0c970cb.zip |
Improvements to #9087:
* Rename EmbeddedBrowser to BrowserFrame
* Add constructors to Flash and BrowserFrame
* Change getState() methods to protected
* JavaDoc improvements
* Make ImageClicks test deterministic
Diffstat (limited to 'client')
-rw-r--r-- | client/src/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java (renamed from client/src/com/vaadin/client/ui/embeddedbrowser/EmbeddedBrowserConnector.java) | 16 | ||||
-rw-r--r-- | client/src/com/vaadin/client/ui/browserframe/VBrowserFrame.java (renamed from client/src/com/vaadin/client/ui/embeddedbrowser/VEmbeddedBrowser.java) | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/client/src/com/vaadin/client/ui/embeddedbrowser/EmbeddedBrowserConnector.java b/client/src/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java index 10445dbff5..c22d92235b 100644 --- a/client/src/com/vaadin/client/ui/embeddedbrowser/EmbeddedBrowserConnector.java +++ b/client/src/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java @@ -1,13 +1,13 @@ -package com.vaadin.client.ui.embeddedbrowser; +package com.vaadin.client.ui.browserframe; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.shared.ui.AbstractEmbeddedState; import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.embeddedbrowser.EmbeddedBrowserState; +import com.vaadin.shared.ui.browserframe.BrowserFrameState; -@Connect(com.vaadin.ui.EmbeddedBrowser.class) -public class EmbeddedBrowserConnector extends AbstractComponentConnector { +@Connect(com.vaadin.ui.BrowserFrame.class) +public class BrowserFrameConnector extends AbstractComponentConnector { @Override protected void init() { @@ -15,13 +15,13 @@ public class EmbeddedBrowserConnector extends AbstractComponentConnector { } @Override - public VEmbeddedBrowser getWidget() { - return (VEmbeddedBrowser) super.getWidget(); + public VBrowserFrame getWidget() { + return (VBrowserFrame) super.getWidget(); } @Override - public EmbeddedBrowserState getState() { - return (EmbeddedBrowserState) super.getState(); + public BrowserFrameState getState() { + return (BrowserFrameState) super.getState(); } @Override diff --git a/client/src/com/vaadin/client/ui/embeddedbrowser/VEmbeddedBrowser.java b/client/src/com/vaadin/client/ui/browserframe/VBrowserFrame.java index 3fe1c44bc3..da2c981a8d 100644 --- a/client/src/com/vaadin/client/ui/embeddedbrowser/VEmbeddedBrowser.java +++ b/client/src/com/vaadin/client/ui/browserframe/VBrowserFrame.java @@ -1,21 +1,21 @@ -package com.vaadin.client.ui.embeddedbrowser; +package com.vaadin.client.ui.browserframe; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.IFrameElement; import com.google.gwt.user.client.ui.Widget; -public class VEmbeddedBrowser extends Widget { +public class VBrowserFrame extends Widget { protected IFrameElement iframe; protected Element altElement; protected String altText; - public VEmbeddedBrowser() { + public VBrowserFrame() { Element root = Document.get().createDivElement(); setElement(root); - setStylePrimaryName("v-embeddedbrowser"); + setStylePrimaryName("v-browserframe"); createAltTextElement(); } |