summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java6
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java10
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java16
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java10
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/LegacyTextAreaState.java41
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/TextFieldConstants.java (renamed from compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/LegacyTextFieldConstants.java)2
6 files changed, 22 insertions, 63 deletions
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java
index 36d272644e..ffaec8ad20 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java
@@ -37,7 +37,7 @@ import com.vaadin.client.BrowserInfo;
import com.vaadin.client.WidgetUtil;
import com.vaadin.client.ui.Field;
import com.vaadin.shared.EventId;
-import com.vaadin.v7.shared.ui.textfield.LegacyTextFieldConstants;
+import com.vaadin.v7.shared.ui.textfield.TextFieldConstants;
/**
* This class represents a basic text input field with one row.
@@ -158,7 +158,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler,
} else {
// Default case - just send an immediate text change message
client.updateVariable(paintableId,
- LegacyTextFieldConstants.VAR_CUR_TEXT, text, true);
+ TextFieldConstants.VAR_CUR_TEXT, text, true);
// Shouldn't investigate valueBeforeEdit to avoid duplicate text
// change events as the states are not in sync any more
@@ -428,7 +428,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler,
int cursorPos = prompting ? 0 : getCursorPos();
if (lastCursorPos != cursorPos) {
client.updateVariable(paintableId,
- LegacyTextFieldConstants.VAR_CURSOR, cursorPos, false);
+ TextFieldConstants.VAR_CURSOR, cursorPos, false);
lastCursorPos = cursorPos;
return true;
}
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java
index 2bb9b37fc8..a7c11cb550 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java
@@ -27,7 +27,7 @@ import com.vaadin.shared.ui.Connect;
import com.vaadin.shared.ui.Connect.LoadStyle;
import com.vaadin.v7.client.ui.VTextField;
import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState;
-import com.vaadin.v7.shared.ui.textfield.LegacyTextFieldConstants;
+import com.vaadin.v7.shared.ui.textfield.TextFieldConstants;
import com.vaadin.v7.ui.TextField;
@Deprecated
@@ -59,13 +59,13 @@ public class TextFieldConnector extends AbstractFieldConnector
getWidget().listenTextChangeEvents = hasEventListener("ie");
if (getWidget().listenTextChangeEvents) {
getWidget().textChangeEventMode = uidl.getStringAttribute(
- LegacyTextFieldConstants.ATTR_TEXTCHANGE_EVENTMODE);
+ TextFieldConstants.ATTR_TEXTCHANGE_EVENTMODE);
if (getWidget().textChangeEventMode
- .equals(LegacyTextFieldConstants.TEXTCHANGE_MODE_EAGER)) {
+ .equals(TextFieldConstants.TEXTCHANGE_MODE_EAGER)) {
getWidget().textChangeEventTimeout = 1;
} else {
getWidget().textChangeEventTimeout = uidl.getIntAttribute(
- LegacyTextFieldConstants.ATTR_TEXTCHANGE_TIMEOUT);
+ TextFieldConstants.ATTR_TEXTCHANGE_TIMEOUT);
if (getWidget().textChangeEventTimeout < 1) {
// Sanitize and allow lazy/timeout with timeout set to 0 to
// work as eager
@@ -90,7 +90,7 @@ public class TextFieldConnector extends AbstractFieldConnector
*/
if (!(Util.getFocusedElement() == getWidget().getElement())
|| !uidl.getBooleanAttribute(
- LegacyTextFieldConstants.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS)
+ TextFieldConstants.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS)
|| getWidget().valueBeforeEdit == null
|| !text.equals(getWidget().valueBeforeEdit)) {
getWidget().updateFieldContent(text);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
index f72ee383e5..c9843de648 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
@@ -37,7 +37,7 @@ import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
import com.vaadin.v7.event.FieldEvents.TextChangeListener;
import com.vaadin.v7.event.FieldEvents.TextChangeNotifier;
import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState;
-import com.vaadin.v7.shared.ui.textfield.LegacyTextFieldConstants;
+import com.vaadin.v7.shared.ui.textfield.TextFieldConstants;
@Deprecated
public abstract class AbstractTextField extends AbstractField<String> implements
@@ -130,10 +130,10 @@ public abstract class AbstractTextField extends AbstractField<String> implements
if (hasListeners(TextChangeEvent.class)) {
target.addAttribute(
- LegacyTextFieldConstants.ATTR_TEXTCHANGE_EVENTMODE,
+ TextFieldConstants.ATTR_TEXTCHANGE_EVENTMODE,
getTextChangeEventMode().toString());
target.addAttribute(
- LegacyTextFieldConstants.ATTR_TEXTCHANGE_TIMEOUT,
+ TextFieldConstants.ATTR_TEXTCHANGE_TIMEOUT,
getTextChangeTimeout());
if (lastKnownTextContent != null) {
/*
@@ -144,7 +144,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
* the actual value, depending on its state.
*/
target.addAttribute(
- LegacyTextFieldConstants.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS,
+ TextFieldConstants.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS,
true);
}
}
@@ -169,13 +169,13 @@ public abstract class AbstractTextField extends AbstractField<String> implements
setWidth(newWidth);
}
- if (variables.containsKey(LegacyTextFieldConstants.VAR_CURSOR)) {
+ if (variables.containsKey(TextFieldConstants.VAR_CURSOR)) {
Integer object = (Integer) variables
- .get(LegacyTextFieldConstants.VAR_CURSOR);
+ .get(TextFieldConstants.VAR_CURSOR);
lastKnownCursorPosition = object.intValue();
}
- if (variables.containsKey(LegacyTextFieldConstants.VAR_CUR_TEXT)) {
+ if (variables.containsKey(TextFieldConstants.VAR_CUR_TEXT)) {
/*
* NOTE, we might want to develop this further so that on a
* value change event the whole text content don't need to be
@@ -478,7 +478,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
* Also on value change events we could use the mechanism.
*/
String object = (String) variables
- .get(LegacyTextFieldConstants.VAR_CUR_TEXT);
+ .get(TextFieldConstants.VAR_CUR_TEXT);
lastKnownTextContent = object;
textChangeEventPending = true;
}
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
index b1f50859d6..8375649716 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
@@ -21,7 +21,7 @@ import org.jsoup.nodes.Element;
import com.vaadin.ui.declarative.DesignContext;
import com.vaadin.ui.declarative.DesignFormatter;
import com.vaadin.v7.data.Property;
-import com.vaadin.v7.shared.ui.textarea.LegacyTextAreaState;
+import com.vaadin.v7.shared.ui.textarea.TextAreaState;
/**
* A text field that supports multi line editing.
@@ -85,13 +85,13 @@ public class TextArea extends AbstractTextField {
}
@Override
- protected LegacyTextAreaState getState() {
- return (LegacyTextAreaState) super.getState();
+ protected TextAreaState getState() {
+ return (TextAreaState) super.getState();
}
@Override
- protected LegacyTextAreaState getState(boolean markAsDirty) {
- return (LegacyTextAreaState) super.getState(markAsDirty);
+ protected TextAreaState getState(boolean markAsDirty) {
+ return (TextAreaState) super.getState(markAsDirty);
}
/**
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/LegacyTextAreaState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/LegacyTextAreaState.java
deleted file mode 100644
index bb851832c3..0000000000
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/LegacyTextAreaState.java
+++ /dev/null
@@ -1,41 +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.shared.ui.textarea;
-
-import com.vaadin.shared.annotations.DelegateToWidget;
-import com.vaadin.shared.annotations.NoLayout;
-import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState;
-
-@Deprecated
-public class LegacyTextAreaState extends AbstractTextFieldState {
- {
- primaryStyleName = "v-textarea";
- }
-
- /**
- * Number of visible rows in the text area. The default is 5.
- */
- @DelegateToWidget
- public int rows = 5;
-
- /**
- * Tells if word-wrapping should be used in the text area.
- */
- @DelegateToWidget
- @NoLayout
- public boolean wordwrap = true;
-
-}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/LegacyTextFieldConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/TextFieldConstants.java
index f2f91ea87b..c9d595c9ba 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/LegacyTextFieldConstants.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/TextFieldConstants.java
@@ -18,7 +18,7 @@ package com.vaadin.v7.shared.ui.textfield;
import java.io.Serializable;
@Deprecated
-public class LegacyTextFieldConstants implements Serializable {
+public class TextFieldConstants implements Serializable {
public static final String VAR_CUR_TEXT = "curText";
public static final String ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS = "nvc";
public static final String ATTR_TEXTCHANGE_TIMEOUT = "iet";
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 15:06:01 +0000