aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/main
diff options
context:
space:
mode:
authorIlia Motornyi <elmot@vaadin.com>2018-05-02 13:34:10 +0300
committerTeemu Suo-Anttila <tsuoanttila@users.noreply.github.com>2018-05-02 13:34:10 +0300
commitc4d621c7772347f1b90c94d566c894b7434cb7f1 (patch)
tree896e04c4002ccec28d60995fb9534acbd91d211d /server/src/main
parent494dac9ec2f509777a1a31579c3aaaf84b158709 (diff)
downloadvaadin-framework-c4d621c7772347f1b90c94d566c894b7434cb7f1.tar.gz
vaadin-framework-c4d621c7772347f1b90c94d566c894b7434cb7f1.zip
Enable formatting in testbench-api module (#10852)
Diffstat (limited to 'server/src/main')
-rw-r--r--server/src/main/java/com/vaadin/ui/ComponentRootSetter.java9
-rw-r--r--server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java2
2 files changed, 6 insertions, 5 deletions
diff --git a/server/src/main/java/com/vaadin/ui/ComponentRootSetter.java b/server/src/main/java/com/vaadin/ui/ComponentRootSetter.java
index fe0a8e6a88..92116e49df 100644
--- a/server/src/main/java/com/vaadin/ui/ComponentRootSetter.java
+++ b/server/src/main/java/com/vaadin/ui/ComponentRootSetter.java
@@ -52,7 +52,8 @@ public class ComponentRootSetter implements Serializable {
}
/**
- * Checks if the given custom component or composite may accept a root component.
+ * Checks if the given custom component or composite may accept a root
+ * component.
* <p>
* For internal use only.
*
@@ -63,11 +64,11 @@ public class ComponentRootSetter implements Serializable {
*
*/
public static boolean canSetRoot(Component customComponent) {
- if(customComponent instanceof CustomComponent) {
+ if (customComponent instanceof CustomComponent) {
return true;
}
- if(customComponent instanceof Composite) {
- return ((Composite)customComponent).getCompositionRoot() == null;
+ if (customComponent instanceof Composite) {
+ return ((Composite) customComponent).getCompositionRoot() == null;
}
return false;
}
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
index 8c7af4273a..ea593041ab 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
@@ -209,4 +209,4 @@ public class ColorPickerPreview extends CssLayout implements HasValue<Color> {
.concat("' is not in any recognized format");
}
-} \ No newline at end of file
+}