Browse Source

Code format (#11548)

* Code format

* Merge branch 'master' into code-format
tags/8.8.0
Sun Zhe 5 years ago
parent
commit
aa5fc83371

+ 17
- 14
server/src/main/java/com/vaadin/data/converter/StringToUuidConverter.java View File

@@ -29,8 +29,8 @@ import com.vaadin.data.ValueContext;
* Leading and trailing white spaces are ignored when converting from a String.
* </p>
* <p>
* The String representation uses the canonical format of 32-characters with a hyphen
* to separate each of five groups of hexadecimal digits as defined in:
* The String representation uses the canonical format of 32-characters with a
* hyphen to separate each of five groups of hexadecimal digits as defined in:
* RFC 4122: A Universally Unique IDentifier (UUID) URN Namespace
* http://www.ietf.org/rfc/rfc4122.txt
* </p>
@@ -38,33 +38,35 @@ import com.vaadin.data.ValueContext;
* @author Vaadin Ltd
* @since 8.8
*/
public class StringToUuidConverter implements Converter <String, UUID> {
public class StringToUuidConverter implements Converter<String, UUID> {

private ErrorMessageProvider errorMessageProvider;

/**
* Constructs a converter for String to UUID and back.
*
* @param errorMessage the error message to use if conversion fails
* @param errorMessage
* the error message to use if conversion fails
*/
public StringToUuidConverter(String errorMessage) {
this(ctx -> errorMessage);
}

/**
* Constructs a new converter instance with the given error message provider.
* Empty strings are converted to <code>null</code>.
* Constructs a new converter instance with the given error message
* provider. Empty strings are converted to <code>null</code>.
*
* @param errorMessageProvider the error message provider to use if conversion fails
* @param errorMessageProvider
* the error message provider to use if conversion fails
*/
public StringToUuidConverter(ErrorMessageProvider errorMessageProvider) {
this.errorMessageProvider = errorMessageProvider;
}

@Override
public Result <UUID> convertToModel(String value, ValueContext context) {
public Result<UUID> convertToModel(String value, ValueContext context) {
if (value == null) {
return Result.ok( null );
return Result.ok(null);
}

// Remove leading and trailing white space
@@ -79,21 +81,22 @@ public class StringToUuidConverter implements Converter <String, UUID> {
}

if (null != uuid) {
return Result.ok(uuid); // Return the UUID object, converted from String.
return Result.ok(uuid); // Return the UUID object, converted from
// String.
} else {
return Result.error( this.errorMessageProvider.apply(context) );
return Result.error(this.errorMessageProvider.apply(context));
}
}

@Override
public String convertToPresentation (UUID value, ValueContext context) {
if ( value == null ) {
public String convertToPresentation(UUID value, ValueContext context) {
if (value == null) {
return null;
}
// `java.util.UUID::toString` generates a textual representation of a
// UUID’s 128-bits as a lowercase hexadecimal `String` in canonical
// 32-character format with four hyphens separating groups of digits.
// https://docs.oracle.com/javase/10/docs/api/java/util/UUID.html#toString()
return value.toString();
return value.toString();
}
}

+ 7
- 7
server/src/main/java/com/vaadin/server/BrowserWindowOpener.java View File

@@ -71,11 +71,11 @@ public class BrowserWindowOpener extends AbstractExtension {
* Creates a window opener that will open windows containing the provided UI
* class.
* <p>
* Note: The new UI instance will not work with dependency injection (CDI and
* Spring). Use {@link BrowserWindowOpener(String)} instead.
* {@code VaadinServlet.getCurrent().getServletContext().getContextPath()} gives
* the current context path.
*
* Note: The new UI instance will not work with dependency injection (CDI
* and Spring). Use {@link BrowserWindowOpener(String)} instead.
* {@code VaadinServlet.getCurrent().getServletContext().getContextPath()}
* gives the current context path.
*
* @param uiClass
* the UI class that should be opened when the extended component
* is clicked
@@ -90,8 +90,8 @@ public class BrowserWindowOpener extends AbstractExtension {
* <p>
* Note: The new UI instance will not work with dependency injection (CDI
* and Spring). Use {@link BrowserWindowOpener(String)} instead.
* {@code VaadinServlet.getCurrent().getServletContext().getContextPath()} gives
* the current context path.
* {@code VaadinServlet.getCurrent().getServletContext().getContextPath()}
* gives the current context path.
*
* @param uiClass
* the UI class that should be opened when the extended component

+ 3
- 3
server/src/main/java/com/vaadin/ui/ComboBox.java View File

@@ -465,15 +465,15 @@ public class ComboBox<T> extends AbstractSingleSelect<T>
.test(getItemCaptionOfItem(item), filterText));
}

// Helper method for the above to make lambda more readable
// Helper method for the above to make lambda more readable
private String getItemCaptionOfItem(T item) {
String caption = getItemCaptionGenerator().apply(item);
if (caption == null) {
caption = "";
}
}
return caption;
}
/**
* Sets the data items of this listing and a simple string filter with which
* the item string and the text the user has input are compared.

+ 2
- 2
server/src/main/java/com/vaadin/ui/Grid.java View File

@@ -1599,7 +1599,7 @@ public class Grid<T> extends AbstractListing<T> implements HasComponents,
}

/**
* Returns the width (in pixels). By default a column width is
* Returns the width (in pixels). By default a column width is
* {@value com.vaadin.shared.ui.grid.GridConstants#DEFAULT_COLUMN_WIDTH_PX}
* (undefined).
*
@@ -2804,7 +2804,7 @@ public class Grid<T> extends AbstractListing<T> implements HasComponents,
* @param nestedNullBehavior
* the behavior when
* @return the newly added column, not <code>null</code>
*
*
* @since 8.8
*/
public Column<T, ?> addColumn(String propertyName,

+ 3
- 3
server/src/main/java/com/vaadin/ui/Slider.java View File

@@ -259,9 +259,9 @@ public class Slider extends AbstractField<Double> {
}

/**
* Sets the slider to update its value when the user clicks on it.
* By default, the slider value is updated by dragging the slider's handle
* or clicking arrows.
* Sets the slider to update its value when the user clicks on it. By
* default, the slider value is updated by dragging the slider's handle or
* clicking arrows.
*
* @param updateValueOnClick
* {@code true} to update the value of the slider on click,

+ 1
- 1
server/src/test/java/com/vaadin/server/CustomJSONSerializerTest.java View File

@@ -12,7 +12,7 @@ import com.vaadin.ui.ConnectorTracker;
import elemental.json.JsonValue;

public class CustomJSONSerializerTest {
public static class Foo {

}

+ 1
- 1
uitest/src/main/java/com/vaadin/tests/components/panel/PanelHTMLCaption.java View File

@@ -28,4 +28,4 @@ public class PanelHTMLCaption extends AbstractTestUI {
changeCaptionFormat.setId("buttonId");
addComponent(changeCaptionFormat);
}
}
}

+ 2
- 1
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java View File

@@ -139,7 +139,8 @@ public class ComboBoxSelectingNewItemValueChangeTest extends MultiBrowserTest {
SelectionType selectionType) {
// clear() would cause an additional value change in chrome 70+
// since it always makes blur after clear()
comboBoxElement.sendKeys(Keys.BACK_SPACE, Keys.BACK_SPACE, Keys.BACK_SPACE);
comboBoxElement.sendKeys(Keys.BACK_SPACE, Keys.BACK_SPACE,
Keys.BACK_SPACE);
sendKeysToInput(input);
switch (selectionType) {
case ENTER:

+ 0
- 1
uitest/src/test/java/com/vaadin/tests/components/panel/PanelHTMLCaptionTest.java View File

@@ -4,7 +4,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
import org.junit.Test;
import org.openqa.selenium.By;


public class PanelHTMLCaptionTest extends MultiBrowserTest {
@Test
public void testCaptionDisplayedAsText() {

+ 1
- 1
uitest/src/test/java/com/vaadin/tests/components/slider/SliderHandleBaseClickTest.java View File

@@ -52,7 +52,7 @@ public class SliderHandleBaseClickTest extends MultiBrowserTest {
sleep(100);
assertEquals(String.format(
"Slider value should not have changed. Expected 3.0 , but was %f",
getSliderValue()), 3.0,getSliderValue(), 0.0);
getSliderValue()), 3.0, getSliderValue(), 0.0);
// Enable click event handling
findElement(By.id("toggleHandling")).click();
}

+ 1
- 2
uitest/src/test/java/com/vaadin/tests/components/window/WindowHeaderButtonKeyboardActionsTest.java View File

@@ -167,8 +167,7 @@ public class WindowHeaderButtonKeyboardActionsTest extends MultiBrowserTest {
closeButton.equals(driver.switchTo().activeElement()));

pressKeyAndWait(Keys.ENTER);
assertTrue(
"Window is not closed when focus is shifted back-and-forth",
assertTrue("Window is not closed when focus is shifted back-and-forth",
findElements(By.className("v-window")).size() == 0);
}


+ 2
- 2
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridIndexedContainerInsertSelectTest.java View File

@@ -20,8 +20,8 @@ public class GridIndexedContainerInsertSelectTest extends SingleBrowserTest {
}

/**
* Test asserting that issue https://github.com/vaadin/framework/issues/11477
* is fixed.
* Test asserting that issue
* https://github.com/vaadin/framework/issues/11477 is fixed.
*/
@Test
public void test_insertRowAfterSelected_newRowIsSelected() {

Loading…
Cancel
Save