From: Artur Signell Date: Thu, 25 Aug 2016 10:08:17 +0000 (+0300) Subject: Move old PasswordField to compatibility package X-Git-Tag: 8.0.0.alpha1~82 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=24a888a2d1dc198d1d88c9e0dbdde1cfe8b0a7f1;p=vaadin-framework.git Move old PasswordField to compatibility package Change-Id: I8db672100e06cbe2eb53de2b0ec2a98b8febe70b --- diff --git a/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java b/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java deleted file mode 100644 index d2fda689f1..0000000000 --- a/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2000-2016 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.v7.ui.passwordfield; - -import com.vaadin.client.v7.ui.VLegacyPasswordField; -import com.vaadin.client.v7.ui.textfield.LegacyTextFieldConnector; -import com.vaadin.shared.ui.Connect; -import com.vaadin.v7.ui.PasswordField; - -@Deprecated -@Connect(PasswordField.class) -public class LegacyPasswordFieldConnector extends LegacyTextFieldConnector { - - @Override - public VLegacyPasswordField getWidget() { - return (VLegacyPasswordField) super.getWidget(); - } -} diff --git a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/passwordfield/PasswordFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/passwordfield/PasswordFieldConnector.java new file mode 100644 index 0000000000..42a233011b --- /dev/null +++ b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/passwordfield/PasswordFieldConnector.java @@ -0,0 +1,32 @@ +/* + * Copyright 2000-2016 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.v7.ui.passwordfield; + +import com.vaadin.client.v7.ui.VLegacyPasswordField; +import com.vaadin.client.v7.ui.textfield.LegacyTextFieldConnector; +import com.vaadin.shared.ui.Connect; +import com.vaadin.v7.ui.PasswordField; + +@Deprecated +@Connect(PasswordField.class) +public class PasswordFieldConnector extends LegacyTextFieldConnector { + + @Override + public VLegacyPasswordField getWidget() { + return (VLegacyPasswordField) super.getWidget(); + } +} diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/PasswordField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/PasswordField.java new file mode 100644 index 0000000000..787e024cc6 --- /dev/null +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/PasswordField.java @@ -0,0 +1,123 @@ +/* + * Copyright 2000-2016 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.v7.ui; + +import org.jsoup.nodes.Attributes; +import org.jsoup.nodes.Element; + +import com.vaadin.ui.declarative.DesignAttributeHandler; +import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Property; + +/** + * A field that is used to enter secret text information like passwords. The + * entered text is not displayed on the screen. + */ +@Deprecated +public class PasswordField extends AbstractTextField { + + /** + * Constructs an empty PasswordField. + */ + public PasswordField() { + setValue(""); + } + + /** + * Constructs a PasswordField with given property data source. + * + * @param dataSource + * the property data source for the field + */ + public PasswordField(Property dataSource) { + setPropertyDataSource(dataSource); + } + + /** + * Constructs a PasswordField with given caption and property data source. + * + * @param caption + * the caption for the field + * @param dataSource + * the property data source for the field + */ + public PasswordField(String caption, Property dataSource) { + this(dataSource); + setCaption(caption); + } + + /** + * Constructs a PasswordField with given value and caption. + * + * @param caption + * the caption for the field + * @param value + * the value for the field + */ + public PasswordField(String caption, String value) { + setValue(value); + setCaption(caption); + } + + /** + * Constructs a PasswordField with given caption. + * + * @param caption + * the caption for the field + */ + public PasswordField(String caption) { + this(); + setCaption(caption); + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.ui.AbstractField#readDesign(org.jsoup.nodes.Element , + * com.vaadin.ui.declarative.DesignContext) + */ + @Override + public void readDesign(Element design, DesignContext designContext) { + super.readDesign(design, designContext); + Attributes attr = design.attributes(); + if (attr.hasKey("value")) { + setValue(DesignAttributeHandler.readAttribute("value", attr, + String.class), false, true); + } + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.ui.AbstractTextField#writeDesign(org.jsoup.nodes.Element + * , com.vaadin.ui.declarative.DesignContext) + */ + @Override + public void writeDesign(Element design, DesignContext designContext) { + super.writeDesign(design, designContext); + AbstractTextField def = (AbstractTextField) designContext + .getDefaultInstance(this); + Attributes attr = design.attributes(); + DesignAttributeHandler.writeAttribute("value", attr, getValue(), + def.getValue(), String.class); + } + + @Override + public void clear() { + setValue(""); + } + +} diff --git a/server/src/main/java/com/vaadin/v7/ui/PasswordField.java b/server/src/main/java/com/vaadin/v7/ui/PasswordField.java deleted file mode 100644 index 787e024cc6..0000000000 --- a/server/src/main/java/com/vaadin/v7/ui/PasswordField.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright 2000-2016 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.v7.ui; - -import org.jsoup.nodes.Attributes; -import org.jsoup.nodes.Element; - -import com.vaadin.ui.declarative.DesignAttributeHandler; -import com.vaadin.ui.declarative.DesignContext; -import com.vaadin.v7.data.Property; - -/** - * A field that is used to enter secret text information like passwords. The - * entered text is not displayed on the screen. - */ -@Deprecated -public class PasswordField extends AbstractTextField { - - /** - * Constructs an empty PasswordField. - */ - public PasswordField() { - setValue(""); - } - - /** - * Constructs a PasswordField with given property data source. - * - * @param dataSource - * the property data source for the field - */ - public PasswordField(Property dataSource) { - setPropertyDataSource(dataSource); - } - - /** - * Constructs a PasswordField with given caption and property data source. - * - * @param caption - * the caption for the field - * @param dataSource - * the property data source for the field - */ - public PasswordField(String caption, Property dataSource) { - this(dataSource); - setCaption(caption); - } - - /** - * Constructs a PasswordField with given value and caption. - * - * @param caption - * the caption for the field - * @param value - * the value for the field - */ - public PasswordField(String caption, String value) { - setValue(value); - setCaption(caption); - } - - /** - * Constructs a PasswordField with given caption. - * - * @param caption - * the caption for the field - */ - public PasswordField(String caption) { - this(); - setCaption(caption); - } - - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.AbstractField#readDesign(org.jsoup.nodes.Element , - * com.vaadin.ui.declarative.DesignContext) - */ - @Override - public void readDesign(Element design, DesignContext designContext) { - super.readDesign(design, designContext); - Attributes attr = design.attributes(); - if (attr.hasKey("value")) { - setValue(DesignAttributeHandler.readAttribute("value", attr, - String.class), false, true); - } - } - - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.AbstractTextField#writeDesign(org.jsoup.nodes.Element - * , com.vaadin.ui.declarative.DesignContext) - */ - @Override - public void writeDesign(Element design, DesignContext designContext) { - super.writeDesign(design, designContext); - AbstractTextField def = (AbstractTextField) designContext - .getDefaultInstance(this); - Attributes attr = design.attributes(); - DesignAttributeHandler.writeAttribute("value", attr, getValue(), - def.getValue(), String.class); - } - - @Override - public void clear() { - setValue(""); - } - -}