summaryrefslogtreecommitdiffstats
path: root/compatibility-server
diff options
context:
space:
mode:
authorAhmed Ashour <asashour@yahoo.com>2017-10-31 17:41:14 +0100
committerPekka Maanpää <pekkamaa@vaadin.com>2017-10-31 18:41:14 +0200
commitd44a5e217d1fc2852adb84cc6ce1c0146ac603f2 (patch)
tree8a497e1b77f4f2f29bc218dc802f11bd3e370d69 /compatibility-server
parent3564d4b4ba7c9ff718879d7544aa2e309489c531 (diff)
downloadvaadin-framework-d44a5e217d1fc2852adb84cc6ce1c0146ac603f2.tar.gz
vaadin-framework-d44a5e217d1fc2852adb84cc6ce1c0146ac603f2.zip
Fix end of line comments, which were made by automatic formatter (#10234)
Diffstat (limited to 'compatibility-server')
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java5
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java4
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java4
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java4
-rw-r--r--compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridEditorMissingPropertyTest.java6
5 files changed, 13 insertions, 10 deletions
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 a1ee67229d..bf8da1889a 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
@@ -787,8 +787,9 @@ public abstract class AbstractTextField extends AbstractField<String> implements
protected Collection<String> getCustomAttributes() {
Collection<String> customAttributes = super.getCustomAttributes();
customAttributes.add("maxlength");
- customAttributes.add("max-length"); // to prevent this appearing in
- // output
+
+ // prevent this from appearing in output
+ customAttributes.add("max-length");
customAttributes.add("cursor-position");
return customAttributes;
}
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
index 05b6f950ca..103e998753 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
@@ -621,8 +621,8 @@ public class DateField extends AbstractField<Date> implements
}
} else if (newDate != oldDate
&& (newDate == null || !newDate.equals(oldDate))) {
- setValue(newDate, true); // Don't require a repaint, client
- // updates itself
+ // Don't require a repaint, client updates itself
+ setValue(newDate, true);
} else if (!uiHasValidDateString) { // oldDate ==
// newDate == null
// Empty value set, previously contained unparsable date string,
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
index 766c90197b..484e96d3f7 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
@@ -2811,8 +2811,8 @@ public class Table extends AbstractSelect implements Action.Container,
final int length) {
LinkedHashSet<Object> ids = new LinkedHashSet<Object>();
for (int i = 0; i < length; i++) {
- assert itemId != null; // should not be null unless client-server
- // are out of sync
+ // should not be null unless client-server are out of sync
+ assert itemId != null;
ids.add(itemId);
itemId = nextItemId(itemId);
}
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java
index 7a00fcc26c..6c347d8656 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java
@@ -115,8 +115,8 @@ public class NumberRenderer extends AbstractRenderer<Number> {
*/
public NumberRenderer(String formatString, Locale locale)
throws IllegalArgumentException {
- this(formatString, locale, ""); // This will call #toString() during
- // formatting
+ // This will call #toString() during formatting
+ this(formatString, locale, "");
}
/**
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridEditorMissingPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridEditorMissingPropertyTest.java
index e35e807fe6..4bcda79e94 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridEditorMissingPropertyTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridEditorMissingPropertyTest.java
@@ -79,8 +79,10 @@ public class GridEditorMissingPropertyTest {
// Item with incomplete property set
fieldGroup.setItemDataSource(
grid.getContainerDataSource().getItem(folder));
- grid.getColumn(PROPERTY_NAME).getEditorField(); // called in
- // grid.doEditItem
+
+ // called in grid.doEditItem
+ grid.getColumn(PROPERTY_NAME).getEditorField();
+
assertTrue("Properties in item should be bound",
fieldGroup.getBoundPropertyIds().contains(PROPERTY_NAME));
assertFalse("Properties not present in item should not be bound",