diff options
author | Artur Signell <artur@vaadin.com> | 2016-08-18 09:27:03 +0300 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2016-08-18 09:27:03 +0300 |
commit | 6d54d78944f6c3278eed3bb5e7ee19687ee5714e (patch) | |
tree | 8142f622e644e98bb3f8d19a7021fd125f9fed40 /shared | |
parent | 7b899665d07be33f86015f71695868c70bc5a589 (diff) | |
download | vaadin-framework-6d54d78944f6c3278eed3bb5e7ee19687ee5714e.tar.gz vaadin-framework-6d54d78944f6c3278eed3bb5e7ee19687ee5714e.zip |
Format using Eclipse Neon
Change-Id: I33f1cc33969ff74a95b1b8cc0f2add589be5aae0
Diffstat (limited to 'shared')
21 files changed, 97 insertions, 91 deletions
diff --git a/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java b/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java index 5050ffec10..bb323939db 100644 --- a/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java +++ b/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java @@ -23,8 +23,8 @@ import java.util.Set; import com.vaadin.shared.communication.SharedState; -public class JavaScriptExtensionState extends SharedState implements - JavaScriptConnectorState { +public class JavaScriptExtensionState extends SharedState + implements JavaScriptConnectorState { private Set<String> callbackNames = new HashSet<String>(); private Map<String, Set<String>> rpcInterfaces = new HashMap<String, Set<String>>(); diff --git a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java index 32299a22d1..3545398382 100644 --- a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java +++ b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java @@ -123,8 +123,8 @@ public class VBrowserDetails implements Serializable { } else if (isIE) { int tridentPos = userAgent.indexOf("trident/"); if (tridentPos >= 0) { - String tmp = userAgent.substring(tridentPos - + "Trident/".length()); + String tmp = userAgent + .substring(tridentPos + "Trident/".length()); tmp = tmp.replaceFirst("([0-9]+\\.[0-9]+).*", "$1"); browserEngineVersion = Float.parseFloat(tmp); } @@ -133,8 +133,8 @@ public class VBrowserDetails implements Serializable { } } catch (Exception e) { // Browser engine version parsing failed - System.err.println("Browser engine version parsing failed for: " - + userAgent); + System.err.println( + "Browser engine version parsing failed for: " + userAgent); } // Browser version @@ -149,8 +149,8 @@ public class VBrowserDetails implements Serializable { parseVersionString(tmp); } } else { - String ieVersionString = userAgent.substring(userAgent - .indexOf("msie ") + 5); + String ieVersionString = userAgent + .substring(userAgent.indexOf("msie ") + 5); ieVersionString = safeSubstring(ieVersionString, 0, ieVersionString.indexOf(";")); parseVersionString(ieVersionString); @@ -183,8 +183,8 @@ public class VBrowserDetails implements Serializable { } } catch (Exception e) { // Browser version parsing failed - System.err.println("Browser version parsing failed for: " - + userAgent); + System.err.println( + "Browser version parsing failed for: " + userAgent); } // Operating system @@ -255,8 +255,8 @@ public class VBrowserDetails implements Serializable { // Some Androids report version numbers as "2.1-update1" if (osMinorVersion == -1 && parts[1].contains("-")) { try { - osMinorVersion = Integer.parseInt(parts[1].substring(0, - parts[1].indexOf('-'))); + osMinorVersion = Integer.parseInt( + parts[1].substring(0, parts[1].indexOf('-'))); } catch (Exception ee) { } } @@ -269,16 +269,17 @@ public class VBrowserDetails implements Serializable { if (idx < 0) { idx = versionString.length(); } - browserMajorVersion = Integer.parseInt(safeSubstring(versionString, 0, - idx)); + browserMajorVersion = Integer + .parseInt(safeSubstring(versionString, 0, idx)); int idx2 = versionString.indexOf('.', idx + 1); if (idx2 < 0) { idx2 = versionString.length(); } try { - browserMinorVersion = Integer.parseInt(safeSubstring(versionString, - idx + 1, idx2).replaceAll("[^0-9].*", "")); + browserMinorVersion = Integer + .parseInt(safeSubstring(versionString, idx + 1, idx2) + .replaceAll("[^0-9].*", "")); } catch (NumberFormatException e) { // leave the minor version unmodified (-1 = unknown) } diff --git a/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java index ee8d13f10f..4fc156838b 100644 --- a/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java +++ b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java @@ -70,15 +70,14 @@ public abstract class VaadinUriResolver implements Serializable { // without published://) vaadinUri = ApplicationConstants.APP_PROTOCOL_PREFIX + ApplicationConstants.PUBLISHED_FILE_PATH - + vaadinUri - .substring(ApplicationConstants.PUBLISHED_PROTOCOL_PREFIX + + vaadinUri.substring( + ApplicationConstants.PUBLISHED_PROTOCOL_PREFIX .length()); // Let translation of app:// urls take care of the rest } if (vaadinUri.startsWith(ApplicationConstants.APP_PROTOCOL_PREFIX)) { - String relativeUrl = vaadinUri - .substring(ApplicationConstants.APP_PROTOCOL_PREFIX - .length()); + String relativeUrl = vaadinUri.substring( + ApplicationConstants.APP_PROTOCOL_PREFIX.length()); String serviceUrl = getServiceUrl(); String serviceUrlParameterName = getServiceUrlParameterName(); if (serviceUrlParameterName != null) { @@ -107,9 +106,8 @@ public abstract class VaadinUriResolver implements Serializable { } if (vaadinUri.startsWith(ApplicationConstants.VAADIN_PROTOCOL_PREFIX)) { final String vaadinDirUri = getVaadinDirUrl(); - String relativeUrl = vaadinUri - .substring(ApplicationConstants.VAADIN_PROTOCOL_PREFIX - .length()); + String relativeUrl = vaadinUri.substring( + ApplicationConstants.VAADIN_PROTOCOL_PREFIX.length()); vaadinUri = vaadinDirUri + relativeUrl; } diff --git a/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java b/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java index f7e24de006..c6f42700aa 100644 --- a/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java +++ b/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java @@ -26,8 +26,8 @@ import com.vaadin.shared.communication.ServerRpc; * Invoking a method in a {@link ServerRpc} interface marked with this * annotation will only add the invocation to a queue of outgoing RPC * invocations, but it will not cause the queue to be purged and sent to the - * server. The queue will instead be sent when any RPC method not marked as @Delayed - * has been invoked. + * server. The queue will instead be sent when any RPC method not marked + * as @Delayed has been invoked. * * @author Vaadin Ltd * @version @VERSION@ diff --git a/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java b/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java index 28ae8d39b6..296a387c25 100644 --- a/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java +++ b/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java @@ -26,8 +26,8 @@ public class FieldRpc implements Serializable { public void blur(); } - public interface FocusAndBlurServerRpc extends FocusServerRpc, - BlurServerRpc { + public interface FocusAndBlurServerRpc + extends FocusServerRpc, BlurServerRpc { } } diff --git a/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java b/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java index 4d21b5af7a..c3cbecd922 100644 --- a/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java +++ b/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java @@ -26,15 +26,14 @@ public class LegacyChangeVariablesInvocation extends MethodInvocation { public LegacyChangeVariablesInvocation(String connectorId, String variableName, Object value) { super(connectorId, ApplicationConstants.UPDATE_VARIABLE_INTERFACE, - ApplicationConstants.UPDATE_VARIABLE_METHOD, new Object[] { - variableName, new UidlValue(value) }); + ApplicationConstants.UPDATE_VARIABLE_METHOD, + new Object[] { variableName, new UidlValue(value) }); setVariableChange(variableName, value); } public static boolean isLegacyVariableChange(String interfaceName, String methodName) { - return ApplicationConstants.UPDATE_VARIABLE_METHOD - .equals(interfaceName) + return ApplicationConstants.UPDATE_VARIABLE_METHOD.equals(interfaceName) && ApplicationConstants.UPDATE_VARIABLE_METHOD .equals(methodName); } diff --git a/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java b/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java index 5b23cd7f6e..4310425928 100644 --- a/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java +++ b/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java @@ -39,7 +39,8 @@ public class PushConstants implements Serializable { * exceed {@link PushConstants#WEBSOCKET_BUFFER_SIZE} given a UTF-8 encoded * message. */ - public static final int WEBSOCKET_FRAGMENT_SIZE = WEBSOCKET_BUFFER_SIZE / 4 - 1; + public static final int WEBSOCKET_FRAGMENT_SIZE = WEBSOCKET_BUFFER_SIZE / 4 + - 1; /** * The character used to mark message boundaries when messages may be split diff --git a/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java b/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java index 120552a43d..2a494591cd 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java +++ b/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java @@ -75,11 +75,13 @@ public final class AlignmentInfo implements Serializable { } public boolean isVerticalCenter() { - return (bitMask & Bits.ALIGNMENT_VERTICAL_CENTER) == Bits.ALIGNMENT_VERTICAL_CENTER; + return (bitMask + & Bits.ALIGNMENT_VERTICAL_CENTER) == Bits.ALIGNMENT_VERTICAL_CENTER; } public boolean isHorizontalCenter() { - return (bitMask & Bits.ALIGNMENT_HORIZONTAL_CENTER) == Bits.ALIGNMENT_HORIZONTAL_CENTER; + return (bitMask + & Bits.ALIGNMENT_HORIZONTAL_CENTER) == Bits.ALIGNMENT_HORIZONTAL_CENTER; } public String getVerticalAlignment() { diff --git a/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java b/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java index 894a1bbcbb..f06db945e6 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java +++ b/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java @@ -31,7 +31,8 @@ public final class ComponentStateUtil implements Serializable { return state.width == null || "".equals(state.width); } - public static final boolean isUndefinedHeight(AbstractComponentState state) { + public static final boolean isUndefinedHeight( + AbstractComponentState state) { return state.height == null || "".equals(state.height); } diff --git a/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java b/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java index 3208934146..fe4e948af5 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java @@ -24,8 +24,8 @@ import java.util.Set; import com.vaadin.shared.AbstractComponentState; import com.vaadin.shared.JavaScriptConnectorState; -public class JavaScriptComponentState extends AbstractComponentState implements - JavaScriptConnectorState { +public class JavaScriptComponentState extends AbstractComponentState + implements JavaScriptConnectorState { private Set<String> callbackNames = new HashSet<String>(); private Map<String, Set<String>> rpcInterfaces = new HashMap<String, Set<String>>(); diff --git a/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java b/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java index 0af3b7351f..4f9e604ecd 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java +++ b/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java @@ -69,12 +69,14 @@ public class MarginInfo implements Serializable { * @param left * enable or disable left margin */ - public MarginInfo(boolean top, boolean right, boolean bottom, boolean left) { + public MarginInfo(boolean top, boolean right, boolean bottom, + boolean left) { doSetMargins(top, right, bottom, left); } /** - * Creates a MarginInfo object by having horizontal and vertical margins specified (analogous to CSS). + * Creates a MarginInfo object by having horizontal and vertical margins + * specified (analogous to CSS). * * @since 7.6.5 * @@ -210,8 +212,8 @@ public class MarginInfo implements Serializable { @Override public String toString() { - return "MarginInfo(" + hasTop() + ", " + hasRight() + ", " - + hasBottom() + ", " + hasLeft() + ")"; + return "MarginInfo(" + hasTop() + ", " + hasRight() + ", " + hasBottom() + + ", " + hasLeft() + ")"; } diff --git a/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java index f4124100e0..513ffb8b84 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java +++ b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java @@ -21,5 +21,6 @@ import com.vaadin.shared.communication.ServerRpc; public interface CheckBoxServerRpc extends ServerRpc { @Delayed - public void setChecked(boolean checked, MouseEventDetails mouseEventDetails); + public void setChecked(boolean checked, + MouseEventDetails mouseEventDetails); } diff --git a/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java index 8624327993..e7141757d1 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java +++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java @@ -125,11 +125,7 @@ public class Color implements Serializable { || !withinRange(alpha)) { String errorMessage = "All values must fall within range [0-255]. (red: " - + red - + ", green: " - + green - + ", blue: " - + blue + + red + ", green: " + green + ", blue: " + blue + ", alpha: " + alpha + ")"; throw new IllegalArgumentException(errorMessage); } @@ -421,9 +417,10 @@ public class Color implements Serializable { if (saturationRatio == 0) { red = green = blue = (int) (lightnessRatio * 255.0f + 0.5f); } else { - float p = lightnessRatio < 0.5f ? lightnessRatio - * (1f + saturationRatio) : lightnessRatio + saturationRatio - - lightnessRatio * saturationRatio; + float p = lightnessRatio < 0.5f + ? lightnessRatio * (1f + saturationRatio) + : lightnessRatio + saturationRatio + - lightnessRatio * saturationRatio; float q = 2 * lightnessRatio - p; red = hslComponentToRgbComponent(p, q, hueRatio + (1f / 3f)); @@ -433,7 +430,8 @@ public class Color implements Serializable { return 0xff000000 | (red << 16) | (green << 8) | (blue << 0); } - private static int hslComponentToRgbComponent(float p, float q, float ratio) { + private static int hslComponentToRgbComponent(float p, float q, + float ratio) { if (ratio < 0) { ratio += 1; } else if (ratio > 1) { @@ -445,7 +443,8 @@ public class Color implements Serializable { } else if (2f * ratio < 1f) { return (int) (p * 255f + 0.5f); } else if (3f * ratio < 2f) { - return (int) ((q + (p - q) * ((2f / 3f) - ratio) * 6f) * 255f + 0.5f); + return (int) ((q + (p - q) * ((2f / 3f) - ratio) * 6f) * 255f + + 0.5f); } return (int) (q * 255f + 0.5f); diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java b/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java index 8b64d22423..d668a8fe6d 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java @@ -84,12 +84,11 @@ public class DetailsConnectorChange implements Serializable { boolean connectorAndNewIndexIsNullThenOldIndexIsSet = connector == null && newIndex == null && oldIndex != null; - assert (connectorAndNewIndexIsNotNull || connectorAndNewIndexIsNullThenOldIndexIsSet) : "connector: " - + nullityString(connector) - + ", oldIndex: " - + nullityString(oldIndex) - + ", newIndex: " - + nullityString(newIndex); + assert (connectorAndNewIndexIsNotNull + || connectorAndNewIndexIsNullThenOldIndexIsSet) : "connector: " + + nullityString(connector) + ", oldIndex: " + + nullityString(oldIndex) + ", newIndex: " + + nullityString(newIndex); return true; } diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java index 54ccc78daa..b526767cb1 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java @@ -127,7 +127,7 @@ public class GridState extends TabIndexState { * @see com.vaadin.ui.Grid#setDetailsVisible(Object, boolean) * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, * elemental.json.JsonArray) - * */ + */ public static final String JSONKEY_DETAILS_VISIBLE = "dv"; /** diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java b/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java index 21e70d3dbf..60a845fe58 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java @@ -374,8 +374,8 @@ public final class Range implements Serializable { */ public Range combineWith(Range other) throws IllegalArgumentException { if (getStart() > other.getEnd() || other.getStart() > getEnd()) { - throw new IllegalArgumentException("There is a gap between " + this - + " and " + other); + throw new IllegalArgumentException( + "There is a gap between " + this + " and " + other); } return Range.between(Math.min(getStart(), other.getStart()), diff --git a/shared/src/main/java/com/vaadin/shared/ui/loginform/LoginFormConstants.java b/shared/src/main/java/com/vaadin/shared/ui/loginform/LoginFormConstants.java index 9f0c256881..23c92475fe 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/loginform/LoginFormConstants.java +++ b/shared/src/main/java/com/vaadin/shared/ui/loginform/LoginFormConstants.java @@ -28,4 +28,3 @@ public class LoginFormConstants implements Serializable { public static final String LOGIN_RESOURCE_NAME = "loginForm"; } - diff --git a/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java index 76e5267bb8..1fee2aede9 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java +++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java @@ -18,7 +18,7 @@ package com.vaadin.shared.ui.orderedlayout; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.ui.LayoutClickRpc; -public interface AbstractOrderedLayoutServerRpc extends LayoutClickRpc, - ServerRpc { +public interface AbstractOrderedLayoutServerRpc + extends LayoutClickRpc, ServerRpc { } diff --git a/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java index 48ff9cdaaf..94c9ae2171 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java @@ -79,8 +79,8 @@ public class UIState extends TabIndexState { tabIndex = 1; } - public static class LoadingIndicatorConfigurationState implements - Serializable { + public static class LoadingIndicatorConfigurationState + implements Serializable { public int firstDelay = 300; public int secondDelay = 1500; public int thirdDelay = 5000; @@ -119,15 +119,15 @@ public class UIState extends TabIndexState { public String pushUrl = null; public Map<String, String> parameters = new HashMap<String, String>(); { - parameters - .put(TRANSPORT_PARAM, Transport.WEBSOCKET.getIdentifier()); + parameters.put(TRANSPORT_PARAM, + Transport.WEBSOCKET.getIdentifier()); parameters.put(FALLBACK_TRANSPORT_PARAM, Transport.LONG_POLLING.getIdentifier()); } } - public static class ReconnectDialogConfigurationState implements - Serializable { + public static class ReconnectDialogConfigurationState + implements Serializable { public String dialogText = "Server connection lost, trying to reconnect..."; public String dialogTextGaveUp = "Server connection lost."; public int reconnectAttempts = 10000; diff --git a/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java b/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java index 28c1ea3734..a20cd83fd4 100644 --- a/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java +++ b/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java @@ -74,7 +74,8 @@ public class SharedUtil implements Serializable { StringBuilder sb = new StringBuilder(); for (int i = 0; i < camelCaseString.length(); i++) { char c = camelCaseString.charAt(i); - if (Character.isUpperCase(c) && isWordComplete(camelCaseString, i)) { + if (Character.isUpperCase(c) + && isWordComplete(camelCaseString, i)) { sb.append(' '); } sb.append(c); diff --git a/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java b/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java index e3cae858ee..bed5732b0d 100644 --- a/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java +++ b/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java @@ -35,7 +35,8 @@ public class RangeTest { @Test public void constructorEquivalenceTest() { - assertEquals("10 == [10,11[", Range.withOnly(10), Range.between(10, 11)); + assertEquals("10 == [10,11[", Range.withOnly(10), + Range.between(10, 11)); assertEquals("[10,20[ == 10, length 10", Range.between(10, 20), Range.withLength(10, 10)); assertEquals("10 == 10, length 1", Range.withOnly(10), @@ -87,17 +88,18 @@ public class RangeTest { assertTrue("end-1 should be contained", range.contains(end - 1)); assertTrue("[0..10[ contains 5", Range.between(0, 10).contains(5)); - assertTrue("empty range does not contain 5", !Range.between(5, 5) - .contains(5)); + assertTrue("empty range does not contain 5", + !Range.between(5, 5).contains(5)); } @Test public void emptyTest() { assertTrue("[0..0[ should be empty", Range.between(0, 0).isEmpty()); - assertTrue("Range of length 0 should be empty", Range.withLength(0, 0) - .isEmpty()); + assertTrue("Range of length 0 should be empty", + Range.withLength(0, 0).isEmpty()); - assertTrue("[0..1[ should not be empty", !Range.between(0, 1).isEmpty()); + assertTrue("[0..1[ should not be empty", + !Range.between(0, 1).isEmpty()); assertTrue("Range of length 1 should not be empty", !Range.withLength(0, 1).isEmpty()); } @@ -151,18 +153,18 @@ public class RangeTest { @Test public void intersectsTest() { - assertTrue("[0..10[ intersects [5..15[", Range.between(0, 10) - .intersects(Range.between(5, 15))); - assertTrue("[0..10[ does not intersect [10..20[", !Range.between(0, 10) - .intersects(Range.between(10, 20))); + assertTrue("[0..10[ intersects [5..15[", + Range.between(0, 10).intersects(Range.between(5, 15))); + assertTrue("[0..10[ does not intersect [10..20[", + !Range.between(0, 10).intersects(Range.between(10, 20))); } @Test public void intersects_emptyInside() { - assertTrue("[5..5[ does intersect with [0..10[", Range.between(5, 5) - .intersects(Range.between(0, 10))); - assertTrue("[0..10[ does intersect with [5..5[", Range.between(0, 10) - .intersects(Range.between(5, 5))); + assertTrue("[5..5[ does intersect with [0..10[", + Range.between(5, 5).intersects(Range.between(0, 10))); + assertTrue("[0..10[ does intersect with [5..5[", + Range.between(0, 10).intersects(Range.between(5, 5))); } @Test @@ -175,14 +177,14 @@ public class RangeTest { @Test public void subsetTest() { - assertTrue("[5..10[ is subset of [0..20[", Range.between(5, 10) - .isSubsetOf(Range.between(0, 20))); + assertTrue("[5..10[ is subset of [0..20[", + Range.between(5, 10).isSubsetOf(Range.between(0, 20))); final Range range = Range.between(0, 10); assertTrue("range is subset of self", range.isSubsetOf(range)); - assertTrue("[0..10[ is not subset of [5..15[", !Range.between(0, 10) - .isSubsetOf(Range.between(5, 15))); + assertTrue("[0..10[ is not subset of [5..15[", + !Range.between(0, 10).isSubsetOf(Range.between(5, 15))); } @Test @@ -220,7 +222,8 @@ public class RangeTest { public void rangeEndsBeforeTest() { final Range former = Range.between(0, 5); final Range latter = Range.between(5, 10); - assertTrue("latter should end before former", former.endsBefore(latter)); + assertTrue("latter should end before former", + former.endsBefore(latter)); assertTrue("former shouldn't end before latter", !latter.endsBefore(former)); |