* changes: Added further support for whitespace ignoring during diff Added support for whitespace ignoringtags/v0.9.1
import org.eclipse.jgit.diff.DiffFormatter; | import org.eclipse.jgit.diff.DiffFormatter; | ||||
import org.eclipse.jgit.diff.MyersDiff; | import org.eclipse.jgit.diff.MyersDiff; | ||||
import org.eclipse.jgit.diff.RawText; | import org.eclipse.jgit.diff.RawText; | ||||
import org.eclipse.jgit.diff.RawTextIgnoreAllWhitespace; | |||||
import org.eclipse.jgit.diff.RawTextIgnoreLeadingWhitespace; | |||||
import org.eclipse.jgit.diff.RawTextIgnoreTrailingWhitespace; | |||||
import org.eclipse.jgit.diff.RawTextIgnoreWhitespaceChange; | |||||
import org.eclipse.jgit.lib.FileMode; | import org.eclipse.jgit.lib.FileMode; | ||||
import org.eclipse.jgit.lib.ObjectId; | import org.eclipse.jgit.lib.ObjectId; | ||||
import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; | import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; | ||||
@Option(name = "--", metaVar = "metaVar_port", multiValued = true, handler = PathTreeFilterHandler.class) | @Option(name = "--", metaVar = "metaVar_port", multiValued = true, handler = PathTreeFilterHandler.class) | ||||
private TreeFilter pathFilter = TreeFilter.ALL; | private TreeFilter pathFilter = TreeFilter.ALL; | ||||
@Option(name = "--ignore-space-at-eol") | |||||
private boolean ignoreWsTrailing; | |||||
@Option(name = "--ignore-leading-space") | |||||
private boolean ignoreWsLeading; | |||||
@Option(name = "-b", aliases = { "--ignore-space-change" }) | |||||
private boolean ignoreWsChange; | |||||
@Option(name = "-w", aliases = { "--ignore-all-space" }) | |||||
private boolean ignoreWsAll; | |||||
private DiffFormatter fmt = new DiffFormatter(); | private DiffFormatter fmt = new DiffFormatter(); | ||||
@Override | @Override | ||||
private RawText getRawText(ObjectId id) throws IOException { | private RawText getRawText(ObjectId id) throws IOException { | ||||
if (id.equals(ObjectId.zeroId())) | if (id.equals(ObjectId.zeroId())) | ||||
return new RawText(new byte[] { }); | |||||
return new RawText(db.openBlob(id).getCachedBytes()); | |||||
return new RawText(new byte[] {}); | |||||
byte[] raw = db.openBlob(id).getCachedBytes(); | |||||
if (ignoreWsAll) | |||||
return new RawTextIgnoreAllWhitespace(raw); | |||||
else if (ignoreWsTrailing) | |||||
return new RawTextIgnoreTrailingWhitespace(raw); | |||||
else if (ignoreWsChange) | |||||
return new RawTextIgnoreWhitespaceChange(raw); | |||||
else if (ignoreWsLeading) | |||||
return new RawTextIgnoreLeadingWhitespace(raw); | |||||
else | |||||
return new RawText(raw); | |||||
} | } | ||||
} | } | ||||
/* | |||||
* Copyright (C) 2009-2010, Google Inc. | |||||
* Copyright (C) 2009, Johannes E. Schindelin <johannes.schindelin@gmx.de> | |||||
* and other copyright owners as documented in the project's IP log. | |||||
* | |||||
* This program and the accompanying materials are made available | |||||
* under the terms of the Eclipse Distribution License v1.0 which | |||||
* accompanies this distribution, is reproduced below, and is | |||||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||||
* | |||||
* All rights reserved. | |||||
* | |||||
* Redistribution and use in source and binary forms, with or | |||||
* without modification, are permitted provided that the following | |||||
* conditions are met: | |||||
* | |||||
* - Redistributions of source code must retain the above copyright | |||||
* notice, this list of conditions and the following disclaimer. | |||||
* | |||||
* - Redistributions in binary form must reproduce the above | |||||
* copyright notice, this list of conditions and the following | |||||
* disclaimer in the documentation and/or other materials provided | |||||
* with the distribution. | |||||
* | |||||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||||
* names of its contributors may be used to endorse or promote | |||||
* products derived from this software without specific prior | |||||
* written permission. | |||||
* | |||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
*/ | |||||
package org.eclipse.jgit.diff; | |||||
import org.eclipse.jgit.lib.Constants; | |||||
import junit.framework.TestCase; | |||||
public class RawTextIgnoreAllWhitespaceTest extends TestCase { | |||||
public void testEqualsWithoutWhitespace() { | |||||
final RawText a = new RawTextIgnoreAllWhitespace(Constants | |||||
.encodeASCII("foo-a\nfoo-b\nfoo\n")); | |||||
final RawText b = new RawTextIgnoreAllWhitespace(Constants | |||||
.encodeASCII("foo-b\nfoo-c\nf\n")); | |||||
assertEquals(3, a.size()); | |||||
assertEquals(3, b.size()); | |||||
// foo-a != foo-b | |||||
assertFalse(a.equals(0, b, 0)); | |||||
assertFalse(b.equals(0, a, 0)); | |||||
// foo-b == foo-b | |||||
assertTrue(a.equals(1, b, 0)); | |||||
assertTrue(b.equals(0, a, 1)); | |||||
// foo != f | |||||
assertFalse(a.equals(2, b, 2)); | |||||
assertFalse(b.equals(2, a, 2)); | |||||
} | |||||
public void testEqualsWithWhitespace() { | |||||
final RawText a = new RawTextIgnoreAllWhitespace(Constants | |||||
.encodeASCII("foo-a\n \n a b c\na \n")); | |||||
final RawText b = new RawTextIgnoreAllWhitespace(Constants | |||||
.encodeASCII("foo-a b\n\nab c\na\n")); | |||||
// "foo-a" != "foo-a b" | |||||
assertFalse(a.equals(0, b, 0)); | |||||
assertFalse(b.equals(0, a, 0)); | |||||
// " " == "" | |||||
assertTrue(a.equals(1, b, 1)); | |||||
assertTrue(b.equals(1, a, 1)); | |||||
// " a b c" == "ab c" | |||||
assertTrue(a.equals(2, b, 2)); | |||||
assertTrue(b.equals(2, a, 2)); | |||||
// "a " == "a" | |||||
assertTrue(a.equals(3, b, 3)); | |||||
assertTrue(b.equals(3, a, 3)); | |||||
} | |||||
} |
/* | |||||
* Copyright (C) 2009-2010, Google Inc. | |||||
* Copyright (C) 2009, Johannes E. Schindelin <johannes.schindelin@gmx.de> | |||||
* and other copyright owners as documented in the project's IP log. | |||||
* | |||||
* This program and the accompanying materials are made available | |||||
* under the terms of the Eclipse Distribution License v1.0 which | |||||
* accompanies this distribution, is reproduced below, and is | |||||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||||
* | |||||
* All rights reserved. | |||||
* | |||||
* Redistribution and use in source and binary forms, with or | |||||
* without modification, are permitted provided that the following | |||||
* conditions are met: | |||||
* | |||||
* - Redistributions of source code must retain the above copyright | |||||
* notice, this list of conditions and the following disclaimer. | |||||
* | |||||
* - Redistributions in binary form must reproduce the above | |||||
* copyright notice, this list of conditions and the following | |||||
* disclaimer in the documentation and/or other materials provided | |||||
* with the distribution. | |||||
* | |||||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||||
* names of its contributors may be used to endorse or promote | |||||
* products derived from this software without specific prior | |||||
* written permission. | |||||
* | |||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
*/ | |||||
package org.eclipse.jgit.diff; | |||||
import org.eclipse.jgit.lib.Constants; | |||||
import junit.framework.TestCase; | |||||
public class RawTextIgnoreLeadingWhitespaceTest extends TestCase { | |||||
public void testEqualsWithoutWhitespace() { | |||||
final RawText a = new RawTextIgnoreLeadingWhitespace(Constants | |||||
.encodeASCII("foo-a\nfoo-b\nfoo\n")); | |||||
final RawText b = new RawTextIgnoreLeadingWhitespace(Constants | |||||
.encodeASCII("foo-b\nfoo-c\nf\n")); | |||||
assertEquals(3, a.size()); | |||||
assertEquals(3, b.size()); | |||||
// foo-a != foo-b | |||||
assertFalse(a.equals(0, b, 0)); | |||||
assertFalse(b.equals(0, a, 0)); | |||||
// foo-b == foo-b | |||||
assertTrue(a.equals(1, b, 0)); | |||||
assertTrue(b.equals(0, a, 1)); | |||||
// foo != f | |||||
assertFalse(a.equals(2, b, 2)); | |||||
assertFalse(b.equals(2, a, 2)); | |||||
} | |||||
public void testEqualsWithWhitespace() { | |||||
final RawText a = new RawTextIgnoreLeadingWhitespace(Constants | |||||
.encodeASCII("foo-a\n \n a b c\n a\nb \n")); | |||||
final RawText b = new RawTextIgnoreLeadingWhitespace(Constants | |||||
.encodeASCII("foo-a b\n\nab c\na\nb\n")); | |||||
// "foo-a" != "foo-a b" | |||||
assertFalse(a.equals(0, b, 0)); | |||||
assertFalse(b.equals(0, a, 0)); | |||||
// " " == "" | |||||
assertTrue(a.equals(1, b, 1)); | |||||
assertTrue(b.equals(1, a, 1)); | |||||
// " a b c" != "ab c" | |||||
assertFalse(a.equals(2, b, 2)); | |||||
assertFalse(b.equals(2, a, 2)); | |||||
// " a" == "a" | |||||
assertTrue(a.equals(3, b, 3)); | |||||
assertTrue(b.equals(3, a, 3)); | |||||
// "b " != "b" | |||||
assertFalse(a.equals(4, b, 4)); | |||||
assertFalse(b.equals(4, a, 4)); | |||||
} | |||||
} |
/* | |||||
* Copyright (C) 2009-2010, Google Inc. | |||||
* Copyright (C) 2009, Johannes E. Schindelin <johannes.schindelin@gmx.de> | |||||
* and other copyright owners as documented in the project's IP log. | |||||
* | |||||
* This program and the accompanying materials are made available | |||||
* under the terms of the Eclipse Distribution License v1.0 which | |||||
* accompanies this distribution, is reproduced below, and is | |||||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||||
* | |||||
* All rights reserved. | |||||
* | |||||
* Redistribution and use in source and binary forms, with or | |||||
* without modification, are permitted provided that the following | |||||
* conditions are met: | |||||
* | |||||
* - Redistributions of source code must retain the above copyright | |||||
* notice, this list of conditions and the following disclaimer. | |||||
* | |||||
* - Redistributions in binary form must reproduce the above | |||||
* copyright notice, this list of conditions and the following | |||||
* disclaimer in the documentation and/or other materials provided | |||||
* with the distribution. | |||||
* | |||||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||||
* names of its contributors may be used to endorse or promote | |||||
* products derived from this software without specific prior | |||||
* written permission. | |||||
* | |||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
*/ | |||||
package org.eclipse.jgit.diff; | |||||
import org.eclipse.jgit.lib.Constants; | |||||
import junit.framework.TestCase; | |||||
public class RawTextIgnoreTrailingWhitespaceTest extends TestCase { | |||||
public void testEqualsWithoutWhitespace() { | |||||
final RawText a = new RawTextIgnoreTrailingWhitespace(Constants | |||||
.encodeASCII("foo-a\nfoo-b\nfoo\n")); | |||||
final RawText b = new RawTextIgnoreTrailingWhitespace(Constants | |||||
.encodeASCII("foo-b\nfoo-c\nf\n")); | |||||
assertEquals(3, a.size()); | |||||
assertEquals(3, b.size()); | |||||
// foo-a != foo-b | |||||
assertFalse(a.equals(0, b, 0)); | |||||
assertFalse(b.equals(0, a, 0)); | |||||
// foo-b == foo-b | |||||
assertTrue(a.equals(1, b, 0)); | |||||
assertTrue(b.equals(0, a, 1)); | |||||
// foo != f | |||||
assertFalse(a.equals(2, b, 2)); | |||||
assertFalse(b.equals(2, a, 2)); | |||||
} | |||||
public void testEqualsWithWhitespace() { | |||||
final RawText a = new RawTextIgnoreTrailingWhitespace(Constants | |||||
.encodeASCII("foo-a\n \n a b c\na \n b\n")); | |||||
final RawText b = new RawTextIgnoreTrailingWhitespace(Constants | |||||
.encodeASCII("foo-a b\n\nab c\na\nb\n")); | |||||
// "foo-a" != "foo-a b" | |||||
assertFalse(a.equals(0, b, 0)); | |||||
assertFalse(b.equals(0, a, 0)); | |||||
// " " == "" | |||||
assertTrue(a.equals(1, b, 1)); | |||||
assertTrue(b.equals(1, a, 1)); | |||||
// " a b c" != "ab c" | |||||
assertFalse(a.equals(2, b, 2)); | |||||
assertFalse(b.equals(2, a, 2)); | |||||
// "a " == "a" | |||||
assertTrue(a.equals(3, b, 3)); | |||||
assertTrue(b.equals(3, a, 3)); | |||||
// " b" != "b" | |||||
assertFalse(a.equals(4, b, 4)); | |||||
assertFalse(b.equals(4, a, 4)); | |||||
} | |||||
} |
/* | |||||
* Copyright (C) 2009-2010, Google Inc. | |||||
* Copyright (C) 2009, Johannes E. Schindelin <johannes.schindelin@gmx.de> | |||||
* and other copyright owners as documented in the project's IP log. | |||||
* | |||||
* This program and the accompanying materials are made available | |||||
* under the terms of the Eclipse Distribution License v1.0 which | |||||
* accompanies this distribution, is reproduced below, and is | |||||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||||
* | |||||
* All rights reserved. | |||||
* | |||||
* Redistribution and use in source and binary forms, with or | |||||
* without modification, are permitted provided that the following | |||||
* conditions are met: | |||||
* | |||||
* - Redistributions of source code must retain the above copyright | |||||
* notice, this list of conditions and the following disclaimer. | |||||
* | |||||
* - Redistributions in binary form must reproduce the above | |||||
* copyright notice, this list of conditions and the following | |||||
* disclaimer in the documentation and/or other materials provided | |||||
* with the distribution. | |||||
* | |||||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||||
* names of its contributors may be used to endorse or promote | |||||
* products derived from this software without specific prior | |||||
* written permission. | |||||
* | |||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
*/ | |||||
package org.eclipse.jgit.diff; | |||||
import org.eclipse.jgit.lib.Constants; | |||||
import junit.framework.TestCase; | |||||
public class RawTextIgnoreWhitespaceChangeTest extends TestCase { | |||||
public void testEqualsWithoutWhitespace() { | |||||
final RawText a = new RawTextIgnoreWhitespaceChange(Constants | |||||
.encodeASCII("foo-a\nfoo-b\nfoo\n")); | |||||
final RawText b = new RawTextIgnoreWhitespaceChange(Constants | |||||
.encodeASCII("foo-b\nfoo-c\nf\n")); | |||||
assertEquals(3, a.size()); | |||||
assertEquals(3, b.size()); | |||||
// foo-a != foo-b | |||||
assertFalse(a.equals(0, b, 0)); | |||||
assertFalse(b.equals(0, a, 0)); | |||||
// foo-b == foo-b | |||||
assertTrue(a.equals(1, b, 0)); | |||||
assertTrue(b.equals(0, a, 1)); | |||||
// foo != f | |||||
assertFalse(a.equals(2, b, 2)); | |||||
assertFalse(b.equals(2, a, 2)); | |||||
} | |||||
public void testEqualsWithWhitespace() { | |||||
final RawText a = new RawTextIgnoreWhitespaceChange( | |||||
Constants | |||||
.encodeASCII("foo-a\n \n a b c\na \n foo\na b c\n")); | |||||
final RawText b = new RawTextIgnoreWhitespaceChange(Constants | |||||
.encodeASCII("foo-a b\n\nab c\na\nfoo\na b c \n")); | |||||
// "foo-a" != "foo-a b" | |||||
assertFalse(a.equals(0, b, 0)); | |||||
assertFalse(b.equals(0, a, 0)); | |||||
// " " == "" | |||||
assertTrue(a.equals(1, b, 1)); | |||||
assertTrue(b.equals(1, a, 1)); | |||||
// " a b c" != "ab c" | |||||
assertFalse(a.equals(2, b, 2)); | |||||
assertFalse(b.equals(2, a, 2)); | |||||
// "a " == "a" | |||||
assertTrue(a.equals(3, b, 3)); | |||||
assertTrue(b.equals(3, a, 3)); | |||||
// " foo" != "foo" | |||||
assertFalse(a.equals(4, b, 4)); | |||||
assertFalse(b.equals(4, a, 4)); | |||||
// "a b c" == "a b c " | |||||
assertTrue(a.equals(5, b, 5)); | |||||
assertTrue(b.equals(5, a, 5)); | |||||
} | |||||
} |
/* | |||||
* Copyright (C) 2010, Google Inc. | |||||
* and other copyright owners as documented in the project's IP log. | |||||
* | |||||
* This program and the accompanying materials are made available | |||||
* under the terms of the Eclipse Distribution License v1.0 which | |||||
* accompanies this distribution, is reproduced below, and is | |||||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||||
* | |||||
* All rights reserved. | |||||
* | |||||
* Redistribution and use in source and binary forms, with or | |||||
* without modification, are permitted provided that the following | |||||
* conditions are met: | |||||
* | |||||
* - Redistributions of source code must retain the above copyright | |||||
* notice, this list of conditions and the following disclaimer. | |||||
* | |||||
* - Redistributions in binary form must reproduce the above | |||||
* copyright notice, this list of conditions and the following | |||||
* disclaimer in the documentation and/or other materials provided | |||||
* with the distribution. | |||||
* | |||||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||||
* names of its contributors may be used to endorse or promote | |||||
* products derived from this software without specific prior | |||||
* written permission. | |||||
* | |||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
*/ | |||||
package org.eclipse.jgit.util; | |||||
import java.io.UnsupportedEncodingException; | |||||
import junit.framework.TestCase; | |||||
import static org.eclipse.jgit.util.RawCharUtil.isWhitespace; | |||||
import static org.eclipse.jgit.util.RawCharUtil.trimTrailingWhitespace; | |||||
import static org.eclipse.jgit.util.RawCharUtil.trimLeadingWhitespace; | |||||
public class RawCharUtilTest extends TestCase { | |||||
/** | |||||
* Test method for {@link RawCharUtil#isWhitespace(byte)}. | |||||
*/ | |||||
public void testIsWhitespace() { | |||||
for (byte c = -128; c < 127; c++) { | |||||
switch (c) { | |||||
case (byte) '\r': | |||||
case (byte) '\n': | |||||
case (byte) '\t': | |||||
case (byte) ' ': | |||||
assertTrue(isWhitespace(c)); | |||||
break; | |||||
default: | |||||
assertFalse(isWhitespace(c)); | |||||
} | |||||
} | |||||
} | |||||
/** | |||||
* Test method for | |||||
* {@link RawCharUtil#trimTrailingWhitespace(byte[], int, int)}. | |||||
* | |||||
* @throws UnsupportedEncodingException | |||||
*/ | |||||
public void testTrimTrailingWhitespace() | |||||
throws UnsupportedEncodingException { | |||||
assertEquals(0, trimTrailingWhitespace("".getBytes("US-ASCII"), 0, 0)); | |||||
assertEquals(0, trimTrailingWhitespace(" ".getBytes("US-ASCII"), 0, 1)); | |||||
assertEquals(1, trimTrailingWhitespace("a ".getBytes("US-ASCII"), 0, 2)); | |||||
assertEquals(2, | |||||
trimTrailingWhitespace(" a ".getBytes("US-ASCII"), 0, 3)); | |||||
assertEquals(3, | |||||
trimTrailingWhitespace(" a".getBytes("US-ASCII"), 0, 3)); | |||||
assertEquals(6, trimTrailingWhitespace( | |||||
" test ".getBytes("US-ASCII"), 2, 9)); | |||||
} | |||||
/** | |||||
* Test method for | |||||
* {@link RawCharUtil#trimLeadingWhitespace(byte[], int, int)}. | |||||
* | |||||
* @throws UnsupportedEncodingException | |||||
*/ | |||||
public void testTrimLeadingWhitespace() throws UnsupportedEncodingException { | |||||
assertEquals(0, trimLeadingWhitespace("".getBytes("US-ASCII"), 0, 0)); | |||||
assertEquals(1, trimLeadingWhitespace(" ".getBytes("US-ASCII"), 0, 1)); | |||||
assertEquals(0, trimLeadingWhitespace("a ".getBytes("US-ASCII"), 0, 2)); | |||||
assertEquals(1, trimLeadingWhitespace(" a ".getBytes("US-ASCII"), 0, 3)); | |||||
assertEquals(2, trimLeadingWhitespace(" a".getBytes("US-ASCII"), 0, 3)); | |||||
assertEquals(2, trimLeadingWhitespace(" test ".getBytes("US-ASCII"), | |||||
2, 9)); | |||||
} | |||||
} |
/* | |||||
* Copyright (C) 2009-2010, Google Inc. | |||||
* Copyright (C) 2008-2009, Johannes E. Schindelin <johannes.schindelin@gmx.de> | |||||
* and other copyright owners as documented in the project's IP log. | |||||
* | |||||
* This program and the accompanying materials are made available | |||||
* under the terms of the Eclipse Distribution License v1.0 which | |||||
* accompanies this distribution, is reproduced below, and is | |||||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||||
* | |||||
* All rights reserved. | |||||
* | |||||
* Redistribution and use in source and binary forms, with or | |||||
* without modification, are permitted provided that the following | |||||
* conditions are met: | |||||
* | |||||
* - Redistributions of source code must retain the above copyright | |||||
* notice, this list of conditions and the following disclaimer. | |||||
* | |||||
* - Redistributions in binary form must reproduce the above | |||||
* copyright notice, this list of conditions and the following | |||||
* disclaimer in the documentation and/or other materials provided | |||||
* with the distribution. | |||||
* | |||||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||||
* names of its contributors may be used to endorse or promote | |||||
* products derived from this software without specific prior | |||||
* written permission. | |||||
* | |||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
*/ | |||||
package org.eclipse.jgit.diff; | |||||
import static org.eclipse.jgit.util.RawCharUtil.isWhitespace; | |||||
import static org.eclipse.jgit.util.RawCharUtil.trimTrailingWhitespace; | |||||
/** | |||||
* A version of {@link RawText} that ignores all whitespace. | |||||
*/ | |||||
public class RawTextIgnoreAllWhitespace extends RawText { | |||||
/** | |||||
* Create a new sequence from an existing content byte array. | |||||
* <p> | |||||
* The entire array (indexes 0 through length-1) is used as the content. | |||||
* | |||||
* @param input | |||||
* the content array. The array is never modified, so passing | |||||
* through cached arrays is safe. | |||||
*/ | |||||
public RawTextIgnoreAllWhitespace(byte[] input) { | |||||
super(input); | |||||
} | |||||
@Override | |||||
public boolean equals(final int i, final Sequence other, final int j) { | |||||
return equals(this, i + 1, (RawText) other, j + 1); | |||||
} | |||||
private static boolean equals(final RawText a, final int ai, | |||||
final RawText b, final int bi) { | |||||
if (a.hashes.get(ai) != b.hashes.get(bi)) | |||||
return false; | |||||
int as = a.lines.get(ai); | |||||
int bs = b.lines.get(bi); | |||||
int ae = a.lines.get(ai + 1); | |||||
int be = b.lines.get(bi + 1); | |||||
ae = trimTrailingWhitespace(a.content, as, ae); | |||||
be = trimTrailingWhitespace(b.content, bs, be); | |||||
while (as < ae && bs < be) { | |||||
byte ac = a.content[as]; | |||||
byte bc = b.content[bs]; | |||||
while (as < ae - 1 && isWhitespace(ac)) { | |||||
as++; | |||||
ac = a.content[as]; | |||||
} | |||||
while (bs < be - 1 && isWhitespace(bc)) { | |||||
bs++; | |||||
bc = b.content[bs]; | |||||
} | |||||
if (ac != bc) | |||||
return false; | |||||
as++; | |||||
bs++; | |||||
} | |||||
return as == ae && bs == be; | |||||
} | |||||
@Override | |||||
protected int hashLine(final byte[] raw, int ptr, final int end) { | |||||
int hash = 5381; | |||||
for (; ptr < end; ptr++) { | |||||
byte c = raw[ptr]; | |||||
if (!isWhitespace(c)) | |||||
hash = (hash << 5) ^ (c & 0xff); | |||||
} | |||||
return hash; | |||||
} | |||||
} |
/* | |||||
* Copyright (C) 2009-2010, Google Inc. | |||||
* Copyright (C) 2008-2009, Johannes E. Schindelin <johannes.schindelin@gmx.de> | |||||
* and other copyright owners as documented in the project's IP log. | |||||
* | |||||
* This program and the accompanying materials are made available | |||||
* under the terms of the Eclipse Distribution License v1.0 which | |||||
* accompanies this distribution, is reproduced below, and is | |||||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||||
* | |||||
* All rights reserved. | |||||
* | |||||
* Redistribution and use in source and binary forms, with or | |||||
* without modification, are permitted provided that the following | |||||
* conditions are met: | |||||
* | |||||
* - Redistributions of source code must retain the above copyright | |||||
* notice, this list of conditions and the following disclaimer. | |||||
* | |||||
* - Redistributions in binary form must reproduce the above | |||||
* copyright notice, this list of conditions and the following | |||||
* disclaimer in the documentation and/or other materials provided | |||||
* with the distribution. | |||||
* | |||||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||||
* names of its contributors may be used to endorse or promote | |||||
* products derived from this software without specific prior | |||||
* written permission. | |||||
* | |||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
*/ | |||||
package org.eclipse.jgit.diff; | |||||
import static org.eclipse.jgit.util.RawCharUtil.trimLeadingWhitespace; | |||||
/** | |||||
* A version of {@link RawText} that ignores leading whitespace. | |||||
*/ | |||||
public class RawTextIgnoreLeadingWhitespace extends RawText { | |||||
/** | |||||
* Create a new sequence from an existing content byte array. | |||||
* <p> | |||||
* The entire array (indexes 0 through length-1) is used as the content. | |||||
* | |||||
* @param input | |||||
* the content array. The array is never modified, so passing | |||||
* through cached arrays is safe. | |||||
*/ | |||||
public RawTextIgnoreLeadingWhitespace(byte[] input) { | |||||
super(input); | |||||
} | |||||
@Override | |||||
public boolean equals(final int i, final Sequence other, final int j) { | |||||
return equals(this, i + 1, (RawText) other, j + 1); | |||||
} | |||||
private static boolean equals(final RawText a, final int ai, | |||||
final RawText b, final int bi) { | |||||
if (a.hashes.get(ai) != b.hashes.get(bi)) | |||||
return false; | |||||
int as = a.lines.get(ai); | |||||
int bs = b.lines.get(bi); | |||||
int ae = a.lines.get(ai + 1); | |||||
int be = b.lines.get(bi + 1); | |||||
as = trimLeadingWhitespace(a.content, as, ae); | |||||
bs = trimLeadingWhitespace(b.content, bs, be); | |||||
if (ae - as != be - bs) | |||||
return false; | |||||
while (as < ae) { | |||||
if (a.content[as++] != b.content[bs++]) | |||||
return false; | |||||
} | |||||
return true; | |||||
} | |||||
@Override | |||||
protected int hashLine(final byte[] raw, int ptr, int end) { | |||||
int hash = 5381; | |||||
ptr = trimLeadingWhitespace(raw, ptr, end); | |||||
for (; ptr < end; ptr++) { | |||||
hash = (hash << 5) ^ (raw[ptr] & 0xff); | |||||
} | |||||
return hash; | |||||
} | |||||
} |
/* | |||||
* Copyright (C) 2009-2010, Google Inc. | |||||
* Copyright (C) 2008-2009, Johannes E. Schindelin <johannes.schindelin@gmx.de> | |||||
* and other copyright owners as documented in the project's IP log. | |||||
* | |||||
* This program and the accompanying materials are made available | |||||
* under the terms of the Eclipse Distribution License v1.0 which | |||||
* accompanies this distribution, is reproduced below, and is | |||||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||||
* | |||||
* All rights reserved. | |||||
* | |||||
* Redistribution and use in source and binary forms, with or | |||||
* without modification, are permitted provided that the following | |||||
* conditions are met: | |||||
* | |||||
* - Redistributions of source code must retain the above copyright | |||||
* notice, this list of conditions and the following disclaimer. | |||||
* | |||||
* - Redistributions in binary form must reproduce the above | |||||
* copyright notice, this list of conditions and the following | |||||
* disclaimer in the documentation and/or other materials provided | |||||
* with the distribution. | |||||
* | |||||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||||
* names of its contributors may be used to endorse or promote | |||||
* products derived from this software without specific prior | |||||
* written permission. | |||||
* | |||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
*/ | |||||
package org.eclipse.jgit.diff; | |||||
import static org.eclipse.jgit.util.RawCharUtil.trimTrailingWhitespace; | |||||
/** | |||||
* A version of {@link RawText} that ignores trailing whitespace. | |||||
*/ | |||||
public class RawTextIgnoreTrailingWhitespace extends RawText { | |||||
/** | |||||
* Create a new sequence from an existing content byte array. | |||||
* <p> | |||||
* The entire array (indexes 0 through length-1) is used as the content. | |||||
* | |||||
* @param input | |||||
* the content array. The array is never modified, so passing | |||||
* through cached arrays is safe. | |||||
*/ | |||||
public RawTextIgnoreTrailingWhitespace(byte[] input) { | |||||
super(input); | |||||
} | |||||
@Override | |||||
public boolean equals(final int i, final Sequence other, final int j) { | |||||
return equals(this, i + 1, (RawText) other, j + 1); | |||||
} | |||||
private static boolean equals(final RawText a, final int ai, | |||||
final RawText b, final int bi) { | |||||
if (a.hashes.get(ai) != b.hashes.get(bi)) | |||||
return false; | |||||
int as = a.lines.get(ai); | |||||
int bs = b.lines.get(bi); | |||||
int ae = a.lines.get(ai + 1); | |||||
int be = b.lines.get(bi + 1); | |||||
ae = trimTrailingWhitespace(a.content, as, ae); | |||||
be = trimTrailingWhitespace(b.content, bs, be); | |||||
if (ae - as != be - bs) | |||||
return false; | |||||
while (as < ae) { | |||||
if (a.content[as++] != b.content[bs++]) | |||||
return false; | |||||
} | |||||
return true; | |||||
} | |||||
@Override | |||||
protected int hashLine(final byte[] raw, int ptr, int end) { | |||||
int hash = 5381; | |||||
end = trimTrailingWhitespace(raw, ptr, end); | |||||
for (; ptr < end; ptr++) { | |||||
hash = (hash << 5) ^ (raw[ptr] & 0xff); | |||||
} | |||||
return hash; | |||||
} | |||||
} |
/* | |||||
* Copyright (C) 2009-2010, Google Inc. | |||||
* Copyright (C) 2008-2009, Johannes E. Schindelin <johannes.schindelin@gmx.de> | |||||
* and other copyright owners as documented in the project's IP log. | |||||
* | |||||
* This program and the accompanying materials are made available | |||||
* under the terms of the Eclipse Distribution License v1.0 which | |||||
* accompanies this distribution, is reproduced below, and is | |||||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||||
* | |||||
* All rights reserved. | |||||
* | |||||
* Redistribution and use in source and binary forms, with or | |||||
* without modification, are permitted provided that the following | |||||
* conditions are met: | |||||
* | |||||
* - Redistributions of source code must retain the above copyright | |||||
* notice, this list of conditions and the following disclaimer. | |||||
* | |||||
* - Redistributions in binary form must reproduce the above | |||||
* copyright notice, this list of conditions and the following | |||||
* disclaimer in the documentation and/or other materials provided | |||||
* with the distribution. | |||||
* | |||||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||||
* names of its contributors may be used to endorse or promote | |||||
* products derived from this software without specific prior | |||||
* written permission. | |||||
* | |||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
*/ | |||||
package org.eclipse.jgit.diff; | |||||
import static org.eclipse.jgit.util.RawCharUtil.isWhitespace; | |||||
import static org.eclipse.jgit.util.RawCharUtil.trimTrailingWhitespace; | |||||
import static org.eclipse.jgit.util.RawCharUtil.trimLeadingWhitespace; | |||||
/** | |||||
* A version of {@link RawText} that ignores changes in the amount of | |||||
* whitespace, as well as trailing whitespace. | |||||
*/ | |||||
public class RawTextIgnoreWhitespaceChange extends RawText { | |||||
/** | |||||
* Create a new sequence from an existing content byte array. | |||||
* <p> | |||||
* The entire array (indexes 0 through length-1) is used as the content. | |||||
* | |||||
* @param input | |||||
* the content array. The array is never modified, so passing | |||||
* through cached arrays is safe. | |||||
*/ | |||||
public RawTextIgnoreWhitespaceChange(byte[] input) { | |||||
super(input); | |||||
} | |||||
@Override | |||||
public boolean equals(final int i, final Sequence other, final int j) { | |||||
return equals(this, i + 1, (RawText) other, j + 1); | |||||
} | |||||
private static boolean equals(final RawText a, final int ai, | |||||
final RawText b, final int bi) { | |||||
if (a.hashes.get(ai) != b.hashes.get(bi)) | |||||
return false; | |||||
int as = a.lines.get(ai); | |||||
int bs = b.lines.get(bi); | |||||
int ae = a.lines.get(ai + 1); | |||||
int be = b.lines.get(bi + 1); | |||||
ae = trimTrailingWhitespace(a.content, as, ae); | |||||
be = trimTrailingWhitespace(b.content, bs, be); | |||||
while (as < ae && bs < be) { | |||||
byte ac = a.content[as]; | |||||
byte bc = b.content[bs]; | |||||
if (ac != bc) | |||||
return false; | |||||
if (isWhitespace(ac)) | |||||
as = trimLeadingWhitespace(a.content, as, ae); | |||||
else | |||||
as++; | |||||
if (isWhitespace(bc)) | |||||
bs = trimLeadingWhitespace(b.content, bs, be); | |||||
else | |||||
bs++; | |||||
} | |||||
return as == ae && bs == be; | |||||
} | |||||
@Override | |||||
protected int hashLine(final byte[] raw, int ptr, int end) { | |||||
int hash = 5381; | |||||
end = trimTrailingWhitespace(raw, ptr, end); | |||||
while (ptr < end) { | |||||
byte c = raw[ptr]; | |||||
hash = (hash << 5) ^ (c & 0xff); | |||||
if (isWhitespace(c)) | |||||
ptr = trimLeadingWhitespace(raw, ptr, end); | |||||
else | |||||
ptr++; | |||||
} | |||||
return hash; | |||||
} | |||||
} |
/* | |||||
* Copyright (C) 2010, Google Inc. | |||||
* and other copyright owners as documented in the project's IP log. | |||||
* | |||||
* This program and the accompanying materials are made available | |||||
* under the terms of the Eclipse Distribution License v1.0 which | |||||
* accompanies this distribution, is reproduced below, and is | |||||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||||
* | |||||
* All rights reserved. | |||||
* | |||||
* Redistribution and use in source and binary forms, with or | |||||
* without modification, are permitted provided that the following | |||||
* conditions are met: | |||||
* | |||||
* - Redistributions of source code must retain the above copyright | |||||
* notice, this list of conditions and the following disclaimer. | |||||
* | |||||
* - Redistributions in binary form must reproduce the above | |||||
* copyright notice, this list of conditions and the following | |||||
* disclaimer in the documentation and/or other materials provided | |||||
* with the distribution. | |||||
* | |||||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||||
* names of its contributors may be used to endorse or promote | |||||
* products derived from this software without specific prior | |||||
* written permission. | |||||
* | |||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
*/ | |||||
package org.eclipse.jgit.util; | |||||
/** | |||||
* Utility class for character functions on raw bytes | |||||
* <p> | |||||
* Characters are assumed to be 8-bit US-ASCII. | |||||
*/ | |||||
public class RawCharUtil { | |||||
private static final boolean[] WHITESPACE = new boolean[256]; | |||||
static { | |||||
WHITESPACE['\r'] = true; | |||||
WHITESPACE['\n'] = true; | |||||
WHITESPACE['\t'] = true; | |||||
WHITESPACE[' '] = true; | |||||
} | |||||
/** | |||||
* Determine if an 8-bit US-ASCII encoded character is represents whitespace | |||||
* | |||||
* @param c | |||||
* the 8-bit US-ASCII encoded character | |||||
* @return true if c represents a whitespace character in 8-bit US-ASCII | |||||
*/ | |||||
public static boolean isWhitespace(byte c) { | |||||
return WHITESPACE[c & 0xff]; | |||||
} | |||||
/** | |||||
* Returns the new end point for the byte array passed in after trimming any | |||||
* trailing whitespace characters, as determined by the isWhitespace() | |||||
* function. start and end are assumed to be within the bounds of raw. | |||||
* | |||||
* @param raw | |||||
* the byte array containing the portion to trim whitespace for | |||||
* @param start | |||||
* the start of the section of bytes | |||||
* @param end | |||||
* the end of the section of bytes | |||||
* @return the new end point | |||||
*/ | |||||
public static int trimTrailingWhitespace(byte[] raw, int start, int end) { | |||||
int ptr = end - 1; | |||||
while (start <= ptr && isWhitespace(raw[ptr])) | |||||
ptr--; | |||||
return ptr + 1; | |||||
} | |||||
/** | |||||
* Returns the new start point for the byte array passed in after trimming | |||||
* any leading whitespace characters, as determined by the isWhitespace() | |||||
* function. start and end are assumed to be within the bounds of raw. | |||||
* | |||||
* @param raw | |||||
* the byte array containing the portion to trim whitespace for | |||||
* @param start | |||||
* the start of the section of bytes | |||||
* @param end | |||||
* the end of the section of bytes | |||||
* @return the new start point | |||||
*/ | |||||
public static int trimLeadingWhitespace(byte[] raw, int start, int end) { | |||||
while (start < end && isWhitespace(raw[start])) | |||||
start++; | |||||
return start; | |||||
} | |||||
private RawCharUtil() { | |||||
// This will never be called | |||||
} | |||||
} |