Repository: incubator-juneau Updated Branches: refs/heads/master 8827e0b8b -> b72b97639
Fix whitespace. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/b72b9763 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/b72b9763 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/b72b9763 Branch: refs/heads/master Commit: b72b976394112e560c1825d526b0489648fe20d1 Parents: 8827e0b Author: JamesBognar <[email protected]> Authored: Fri Apr 7 13:00:40 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Fri Apr 7 13:00:40 2017 -0400 ---------------------------------------------------------------------- .../org/apache/juneau/internal/FilteredMap.java | 4 ++-- .../org/apache/juneau/internal/HashCode.java | 4 ++-- .../org/apache/juneau/internal/IOUtils.java | 8 ++++---- .../org/apache/juneau/internal/StringUtils.java | 20 ++++++++++---------- .../java/org/apache/juneau/internal/Utils.java | 14 +++++++------- 5 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b72b9763/juneau-core/src/main/java/org/apache/juneau/internal/FilteredMap.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/FilteredMap.java b/juneau-core/src/main/java/org/apache/juneau/internal/FilteredMap.java index 5783227..1321112 100644 --- a/juneau-core/src/main/java/org/apache/juneau/internal/FilteredMap.java +++ b/juneau-core/src/main/java/org/apache/juneau/internal/FilteredMap.java @@ -32,8 +32,8 @@ public final class FilteredMap<K,V> extends AbstractMap<K,V> implements Delegate /** * Constructor. - * - * @param classMeta The class type of the map being wrapped. + * + * @param classMeta The class type of the map being wrapped. * @param innerMap The map being wrapped. Must not be <jk>null</jk>. * @param keys The keys in the new map. Must not be <jk>null</jk>. */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b72b9763/juneau-core/src/main/java/org/apache/juneau/internal/HashCode.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/HashCode.java b/juneau-core/src/main/java/org/apache/juneau/internal/HashCode.java index 0cc048c..d0f46e1 100644 --- a/juneau-core/src/main/java/org/apache/juneau/internal/HashCode.java +++ b/juneau-core/src/main/java/org/apache/juneau/internal/HashCode.java @@ -54,7 +54,7 @@ public class HashCode { * @return This object (for method chaining). */ public HashCode add(int i) { - hashCode = 31*hashCode + i; + hashCode = 31*hashCode + i; return this; } @@ -64,7 +64,7 @@ public class HashCode { * @return The calculated hashcode. */ public int get() { - return hashCode; + return hashCode; } /** http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b72b9763/juneau-core/src/main/java/org/apache/juneau/internal/IOUtils.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/IOUtils.java b/juneau-core/src/main/java/org/apache/juneau/internal/IOUtils.java index 77caa63..1d0a5cc 100644 --- a/juneau-core/src/main/java/org/apache/juneau/internal/IOUtils.java +++ b/juneau-core/src/main/java/org/apache/juneau/internal/IOUtils.java @@ -145,7 +145,7 @@ public final class IOUtils { try { while ((nRead = in.read(b, 0, b.length)) != -1) - buff.write(b, 0, nRead); + buff.write(b, 0, nRead); buff.flush(); return buff.toByteArray(); @@ -210,11 +210,11 @@ public final class IOUtils { * @param out The writer to pipe to. * @throws IOException */ - public static void pipe(Reader in, Writer out) throws IOException { + public static void pipe(Reader in, Writer out) throws IOException { assertFieldNotNull(out, "out"); assertFieldNotNull(in, "in"); - IOPipe.create(in, out).run(); - } + IOPipe.create(in, out).run(); + } /** * Wraps the specified reader in a buffered reader. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b72b9763/juneau-core/src/main/java/org/apache/juneau/internal/StringUtils.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/StringUtils.java b/juneau-core/src/main/java/org/apache/juneau/internal/StringUtils.java index 8d8fe73..8f69eaf 100644 --- a/juneau-core/src/main/java/org/apache/juneau/internal/StringUtils.java +++ b/juneau-core/src/main/java/org/apache/juneau/internal/StringUtils.java @@ -190,9 +190,9 @@ public final class StringUtils { } } - private final static Pattern fpRegex = Pattern.compile( - "[+-]?(NaN|Infinity|((((\\p{Digit}+)(\\.)?((\\p{Digit}+)?)([eE][+-]?(\\p{Digit}+))?)|(\\.((\\p{Digit}+))([eE][+-]?(\\p{Digit}+))?)|(((0[xX](\\p{XDigit}+)(\\.)?)|(0[xX](\\p{XDigit}+)?(\\.)(\\p{XDigit}+)))[pP][+-]?(\\p{Digit}+)))[fFdD]?))[\\x00-\\x20]*" - ); + private final static Pattern fpRegex = Pattern.compile( + "[+-]?(NaN|Infinity|((((\\p{Digit}+)(\\.)?((\\p{Digit}+)?)([eE][+-]?(\\p{Digit}+))?)|(\\.((\\p{Digit}+))([eE][+-]?(\\p{Digit}+))?)|(((0[xX](\\p{XDigit}+)(\\.)?)|(0[xX](\\p{XDigit}+)?(\\.)(\\p{XDigit}+)))[pP][+-]?(\\p{Digit}+)))[fFdD]?))[\\x00-\\x20]*" + ); /** * Returns <jk>true</jk> if this string can be parsed by {@link #parseNumber(String, Class)}. @@ -1038,7 +1038,7 @@ public final class StringUtils { public static String fromHexToUTF8(String hex) { ByteBuffer buff = ByteBuffer.allocate(hex.length()/2); for (int i = 0; i < hex.length(); i+=2) - buff.put((byte)Integer.parseInt(hex.substring(i, i+2), 16)); + buff.put((byte)Integer.parseInt(hex.substring(i, i+2), 16)); buff.rewind(); Charset cs = Charset.forName("UTF-8"); return cs.decode(buff).toString(); @@ -1054,11 +1054,11 @@ public final class StringUtils { */ public static String toHex(byte[] bytes) { StringBuilder sb = new StringBuilder(bytes.length * 2); - for ( int j = 0; j < bytes.length; j++ ) { - int v = bytes[j] & 0xFF; - sb.append(HEX[v >>> 4]).append(HEX[v & 0x0F]); - } - return sb.toString(); + for ( int j = 0; j < bytes.length; j++ ) { + int v = bytes[j] & 0xFF; + sb.append(HEX[v >>> 4]).append(HEX[v & 0x0F]); + } + return sb.toString(); } /** @@ -1070,7 +1070,7 @@ public final class StringUtils { public static byte[] fromHex(String hex) { ByteBuffer buff = ByteBuffer.allocate(hex.length()/2); for (int i = 0; i < hex.length(); i+=2) - buff.put((byte)Integer.parseInt(hex.substring(i, i+2), 16)); + buff.put((byte)Integer.parseInt(hex.substring(i, i+2), 16)); buff.rewind(); return buff.array(); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b72b9763/juneau-core/src/main/java/org/apache/juneau/internal/Utils.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/Utils.java b/juneau-core/src/main/java/org/apache/juneau/internal/Utils.java index 7e15972..741b6d2 100644 --- a/juneau-core/src/main/java/org/apache/juneau/internal/Utils.java +++ b/juneau-core/src/main/java/org/apache/juneau/internal/Utils.java @@ -22,13 +22,13 @@ public class Utils { * * @param i1 Integer #1 * @param i2 Integer #2 - * @return the value <code>0</code> if Integer #1 is - * equal to Integer #2; a value less than - * <code>0</code> if Integer #1 numerically less - * than Integer #2; and a value greater - * than <code>0</code> if Integer #1 is numerically - * greater than Integer #2 (signed - * comparison). + * @return the value <code>0</code> if Integer #1 is + * equal to Integer #2; a value less than + * <code>0</code> if Integer #1 numerically less + * than Integer #2; and a value greater + * than <code>0</code> if Integer #1 is numerically + * greater than Integer #2 (signed + * comparison). */ public static final int compare(int i1, int i2) { return (i1<i2 ? -1 : (i1==i2 ? 0 : 1));
