summaryrefslogtreecommitdiffstats
path: root/server/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-06-24 11:29:50 +0300
committerVaadin Code Review <review@vaadin.com>2015-06-26 07:54:06 +0000
commit7355f1a26277d7644cfc974f4c4d8b7bc898c366 (patch)
tree281633f608a704bbaaa8b564d3b55c422b2811be /server/src
parentafefa100a75760a05519038e19e6b64669411549 (diff)
downloadvaadin-framework-7355f1a26277d7644cfc974f4c4d8b7bc898c366.tar.gz
vaadin-framework-7355f1a26277d7644cfc974f4c4d8b7bc898c366.zip
Reformat with Luna SR2
Change-Id: I8a666061496022ef16ed44812b5728e1360b9c4d
Diffstat (limited to 'server/src')
-rw-r--r--server/src/com/vaadin/ui/Slider.java2
-rw-r--r--server/src/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java3
-rw-r--r--server/src/com/vaadin/ui/renderers/ButtonRenderer.java3
-rw-r--r--server/src/com/vaadin/ui/renderers/ClickableRenderer.java3
-rw-r--r--server/src/com/vaadin/ui/renderers/DateRenderer.java17
-rw-r--r--server/src/com/vaadin/ui/renderers/HtmlRenderer.java3
-rw-r--r--server/src/com/vaadin/ui/renderers/NumberRenderer.java15
-rw-r--r--server/src/com/vaadin/ui/renderers/TextRenderer.java1
8 files changed, 30 insertions, 17 deletions
diff --git a/server/src/com/vaadin/ui/Slider.java b/server/src/com/vaadin/ui/Slider.java
index 2e00628eb0..15c94b6d3c 100644
--- a/server/src/com/vaadin/ui/Slider.java
+++ b/server/src/com/vaadin/ui/Slider.java
@@ -285,7 +285,7 @@ public class Slider extends AbstractField<Double> {
final int resolution = getResolution();
double ratio = Math.pow(10, resolution);
- if(v >= 0) {
+ if (v >= 0) {
return Math.floor(v * ratio) / ratio;
} else {
return Math.ceil(v * ratio) / ratio;
diff --git a/server/src/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/server/src/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
index 104e07f02f..57e8130b29 100644
--- a/server/src/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
+++ b/server/src/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
@@ -105,7 +105,8 @@ public abstract class AbstractJavaScriptRenderer<T> extends AbstractRenderer<T>
private JavaScriptCallbackHelper callbackHelper = new JavaScriptCallbackHelper(
this);
- protected AbstractJavaScriptRenderer(Class<T> presentationType, String nullRepresentation) {
+ protected AbstractJavaScriptRenderer(Class<T> presentationType,
+ String nullRepresentation) {
super(presentationType, nullRepresentation);
}
diff --git a/server/src/com/vaadin/ui/renderers/ButtonRenderer.java b/server/src/com/vaadin/ui/renderers/ButtonRenderer.java
index a747e45713..e7e723ebd6 100644
--- a/server/src/com/vaadin/ui/renderers/ButtonRenderer.java
+++ b/server/src/com/vaadin/ui/renderers/ButtonRenderer.java
@@ -45,7 +45,8 @@ public class ButtonRenderer extends ClickableRenderer<String> {
* @param nullRepresentation
* the textual representation of {@code null} value
*/
- public ButtonRenderer(RendererClickListener listener, String nullRepresentation) {
+ public ButtonRenderer(RendererClickListener listener,
+ String nullRepresentation) {
this(nullRepresentation);
addClickListener(listener);
}
diff --git a/server/src/com/vaadin/ui/renderers/ClickableRenderer.java b/server/src/com/vaadin/ui/renderers/ClickableRenderer.java
index 01e939bb67..7210eb7840 100644
--- a/server/src/com/vaadin/ui/renderers/ClickableRenderer.java
+++ b/server/src/com/vaadin/ui/renderers/ClickableRenderer.java
@@ -106,7 +106,8 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
this(presentationType, null);
}
- protected ClickableRenderer(Class<T> presentationType, String nullRepresentation) {
+ protected ClickableRenderer(Class<T> presentationType,
+ String nullRepresentation) {
super(presentationType, nullRepresentation);
registerRpc(new RendererClickRpc() {
@Override
diff --git a/server/src/com/vaadin/ui/renderers/DateRenderer.java b/server/src/com/vaadin/ui/renderers/DateRenderer.java
index 092b3f405e..dddeb6cd77 100644
--- a/server/src/com/vaadin/ui/renderers/DateRenderer.java
+++ b/server/src/com/vaadin/ui/renderers/DateRenderer.java
@@ -72,7 +72,8 @@ public class DateRenderer extends AbstractRenderer<Date> {
* @throws IllegalArgumentException
* if {@code locale} is {@code null}
*/
- public DateRenderer(Locale locale, String nullRepresentation) throws IllegalArgumentException {
+ public DateRenderer(Locale locale, String nullRepresentation)
+ throws IllegalArgumentException {
this("%s", locale, nullRepresentation);
}
@@ -110,7 +111,8 @@ public class DateRenderer extends AbstractRenderer<Date> {
* href="http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format
* String Syntax</a>
*/
- public DateRenderer(String formatString, String nullRepresentation) throws IllegalArgumentException {
+ public DateRenderer(String formatString, String nullRepresentation)
+ throws IllegalArgumentException {
this(formatString, Locale.getDefault(), nullRepresentation);
}
@@ -132,8 +134,9 @@ public class DateRenderer extends AbstractRenderer<Date> {
*/
public DateRenderer(String formatString, Locale locale)
throws IllegalArgumentException {
- this(formatString,locale, "");
+ this(formatString, locale, "");
}
+
/**
* Creates a new date renderer.
* <p>
@@ -152,8 +155,8 @@ public class DateRenderer extends AbstractRenderer<Date> {
* href="http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format
* String Syntax</a>
*/
- public DateRenderer(String formatString, Locale locale, String nullRepresentation)
- throws IllegalArgumentException {
+ public DateRenderer(String formatString, Locale locale,
+ String nullRepresentation) throws IllegalArgumentException {
super(Date.class, nullRepresentation);
if (formatString == null) {
@@ -182,6 +185,7 @@ public class DateRenderer extends AbstractRenderer<Date> {
public DateRenderer(DateFormat dateFormat) throws IllegalArgumentException {
this(dateFormat, "");
}
+
/**
* Creates a new date renderer.
* <p>
@@ -192,7 +196,8 @@ public class DateRenderer extends AbstractRenderer<Date> {
* @throws IllegalArgumentException
* if {@code dateFormat} is {@code null}
*/
- public DateRenderer(DateFormat dateFormat, String nullRepresentation) throws IllegalArgumentException {
+ public DateRenderer(DateFormat dateFormat, String nullRepresentation)
+ throws IllegalArgumentException {
super(Date.class, nullRepresentation);
if (dateFormat == null) {
throw new IllegalArgumentException("date format may not be null");
diff --git a/server/src/com/vaadin/ui/renderers/HtmlRenderer.java b/server/src/com/vaadin/ui/renderers/HtmlRenderer.java
index df89c60ad2..2ec43800c0 100644
--- a/server/src/com/vaadin/ui/renderers/HtmlRenderer.java
+++ b/server/src/com/vaadin/ui/renderers/HtmlRenderer.java
@@ -28,7 +28,8 @@ public class HtmlRenderer extends AbstractRenderer<String> {
/**
* Creates a new HTML renderer.
*
- * @param nullRepresentation the html representation of {@code null} value
+ * @param nullRepresentation
+ * the html representation of {@code null} value
*/
public HtmlRenderer(String nullRepresentation) {
super(String.class, nullRepresentation);
diff --git a/server/src/com/vaadin/ui/renderers/NumberRenderer.java b/server/src/com/vaadin/ui/renderers/NumberRenderer.java
index 1d4d7e0ec9..b1ba309c9a 100644
--- a/server/src/com/vaadin/ui/renderers/NumberRenderer.java
+++ b/server/src/com/vaadin/ui/renderers/NumberRenderer.java
@@ -69,7 +69,7 @@ public class NumberRenderer extends AbstractRenderer<Number> {
* @param nullRepresentation
* the textual representation of {@code null} value
* @throws IllegalArgumentException
- * if {@code numberFormat} is {@code null}
+ * if {@code numberFormat} is {@code null}
*/
public NumberRenderer(NumberFormat numberFormat, String nullRepresentation)
throws IllegalArgumentException {
@@ -112,8 +112,10 @@ public class NumberRenderer extends AbstractRenderer<Number> {
* @throws IllegalArgumentException
* if {@code locale} is {@code null}
*/
- public NumberRenderer(String formatString, Locale locale) throws IllegalArgumentException {
- this(formatString, locale, ""); //This will call #toString() during formatting
+ public NumberRenderer(String formatString, Locale locale)
+ throws IllegalArgumentException {
+ this(formatString, locale, ""); // This will call #toString() during
+ // formatting
}
/**
@@ -122,8 +124,8 @@ public class NumberRenderer extends AbstractRenderer<Number> {
* The renderer is configured to render with the given format string in the
* default locale.
*
- * @param
- * formatString the format string with which to format the number
+ * @param formatString
+ * the format string with which to format the number
* @throws IllegalArgumentException
* if {@code formatString} is {@code null}
* @see <a
@@ -150,7 +152,8 @@ public class NumberRenderer extends AbstractRenderer<Number> {
* href="http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format
* String Syntax</a>
*/
- public NumberRenderer(String formatString, Locale locale, String nullRepresentation) {
+ public NumberRenderer(String formatString, Locale locale,
+ String nullRepresentation) {
super(Number.class, nullRepresentation);
if (formatString == null) {
diff --git a/server/src/com/vaadin/ui/renderers/TextRenderer.java b/server/src/com/vaadin/ui/renderers/TextRenderer.java
index 0045024b2f..ce8a73d057 100644
--- a/server/src/com/vaadin/ui/renderers/TextRenderer.java
+++ b/server/src/com/vaadin/ui/renderers/TextRenderer.java
@@ -35,6 +35,7 @@ public class TextRenderer extends AbstractRenderer<String> {
/**
* Creates a new text renderer
+ *
* @param nullRepresentation
* the textual representation of {@code null} value
*/