From 9f97638b0f75b882b76eeb5d2b95f87bb5263a73 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Fri, 23 Nov 2012 11:46:14 +0200 Subject: Refactor BrowserPopupOpener API (#10241) * Rename BrowserPopupOpener to BrowserWindowOpener * Rename setPopupName -> setWindowName * Rename BrowserPopupUIProvider -> BrowserWindowUIProvider * Make BrowserWindowUIProvider a private static inner class Change-Id: Id839b274762424bb50fe3590d7cd1187e92baa6c --- .../extensions/BrowserPopupOpenerConnector.java | 58 ---------------------- .../extensions/BrowserWindowOpenerConnector.java | 58 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 client/src/com/vaadin/client/extensions/BrowserPopupOpenerConnector.java create mode 100644 client/src/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java (limited to 'client/src') diff --git a/client/src/com/vaadin/client/extensions/BrowserPopupOpenerConnector.java b/client/src/com/vaadin/client/extensions/BrowserPopupOpenerConnector.java deleted file mode 100644 index 2615444832..0000000000 --- a/client/src/com/vaadin/client/extensions/BrowserPopupOpenerConnector.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2012 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.client.extensions; - -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.Widget; -import com.vaadin.client.ComponentConnector; -import com.vaadin.client.ServerConnector; -import com.vaadin.server.BrowserPopupOpener; -import com.vaadin.shared.ui.BrowserPopupExtensionState; -import com.vaadin.shared.ui.Connect; - -/** - * Client-side code for {@link BrowserPopupOpener} - * - * @author Vaadin Ltd - * @since 7.0.0 - */ -@Connect(BrowserPopupOpener.class) -public class BrowserPopupOpenerConnector extends AbstractExtensionConnector - implements ClickHandler { - - @Override - protected void extend(ServerConnector target) { - final Widget targetWidget = ((ComponentConnector) target).getWidget(); - - targetWidget.addDomHandler(this, ClickEvent.getType()); - } - - @Override - public BrowserPopupExtensionState getState() { - return (BrowserPopupExtensionState) super.getState(); - } - - @Override - public void onClick(ClickEvent event) { - String url = getResourceUrl("popup"); - if (url != null) { - Window.open(url, getState().target, getState().features); - } - } -} diff --git a/client/src/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java b/client/src/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java new file mode 100644 index 0000000000..63915af1bd --- /dev/null +++ b/client/src/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java @@ -0,0 +1,58 @@ +/* + * Copyright 2012 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package com.vaadin.client.extensions; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Widget; +import com.vaadin.client.ComponentConnector; +import com.vaadin.client.ServerConnector; +import com.vaadin.server.BrowserWindowOpener; +import com.vaadin.shared.ui.BrowserWindowOpenerState; +import com.vaadin.shared.ui.Connect; + +/** + * Client-side code for {@link BrowserWindowOpener} + * + * @author Vaadin Ltd + * @since 7.0.0 + */ +@Connect(BrowserWindowOpener.class) +public class BrowserWindowOpenerConnector extends AbstractExtensionConnector + implements ClickHandler { + + @Override + protected void extend(ServerConnector target) { + final Widget targetWidget = ((ComponentConnector) target).getWidget(); + + targetWidget.addDomHandler(this, ClickEvent.getType()); + } + + @Override + public BrowserWindowOpenerState getState() { + return (BrowserWindowOpenerState) super.getState(); + } + + @Override + public void onClick(ClickEvent event) { + String url = getResourceUrl(BrowserWindowOpenerState.locationResource); + if (url != null) { + Window.open(url, getState().target, getState().features); + } + } +} -- cgit v1.2.3