From 4d91645e890527efbe04ffaee12b4aa3637733c4 Mon Sep 17 00:00:00 2001 From: Alex Blewitt Date: Mon, 19 Oct 2009 09:48:00 +0100 Subject: [PATCH] Remove trailing whitespace at end of line As discussed on the egit-dev mailing list, we prefer not to have trailing whitespace in our source code. Correct all currently offending lines by trimming them. Change-Id: I002b1d1980071084c0bc53242c8f5900970e6845 Signed-off-by: Shawn O. Pearce --- .../src/org/eclipse/jgit/pgm/Main.java | 2 +- .../jgit/dircache/DirCacheTreeTest.java | 2 +- .../org/eclipse/jgit/lib/IndexDiffTest.java | 6 +- .../eclipse/jgit/lib/IndexTreeWalkerTest.java | 32 ++-- .../eclipse/jgit/lib/PackIndexTestCase.java | 4 +- .../org/eclipse/jgit/lib/ReadTreeTest.java | 152 +++++++++--------- .../tst/org/eclipse/jgit/lib/T0003_Basic.java | 12 +- .../tst/org/eclipse/jgit/lib/T0007_Index.java | 2 +- .../jgit/lib/TreeIteratorLeafOnlyTest.java | 8 +- .../jgit/lib/TreeIteratorPostOrderTest.java | 8 +- .../jgit/lib/TreeIteratorPreOrderTest.java | 8 +- .../jgit/transport/BundleWriterTest.java | 2 +- .../eclipse/jgit/awtui/AWTPlotRenderer.java | 2 +- .../eclipse/jgit/awtui/AwtAuthenticator.java | 4 +- .../eclipse/jgit/awtui/CommitGraphPane.java | 2 +- .../src/org/eclipse/jgit/diff/RawText.java | 2 +- .../src/org/eclipse/jgit/diff/Sequence.java | 2 +- .../errors/CheckoutConflictException.java | 4 +- .../jgit/errors/CompoundException.java | 4 +- .../jgit/errors/NotSupportedException.java | 2 +- .../jgit/errors/PackProtocolException.java | 4 +- .../jgit/errors/RevisionSyntaxException.java | 4 +- .../jgit/errors/StopWalkException.java | 2 +- .../jgit/errors/TransportException.java | 4 +- .../src/org/eclipse/jgit/lib/AnyObjectId.java | 24 +-- .../src/org/eclipse/jgit/lib/ByteWindow.java | 8 +- .../src/org/eclipse/jgit/lib/Commit.java | 4 +- .../src/org/eclipse/jgit/lib/Constants.java | 18 +-- .../org/eclipse/jgit/lib/FileBasedConfig.java | 2 +- .../src/org/eclipse/jgit/lib/FileMode.java | 8 +- .../src/org/eclipse/jgit/lib/GitIndex.java | 22 +-- .../src/org/eclipse/jgit/lib/IndexDiff.java | 12 +- .../eclipse/jgit/lib/IndexTreeVisitor.java | 2 +- .../org/eclipse/jgit/lib/IndexTreeWalker.java | 26 +-- .../org/eclipse/jgit/lib/InflaterCache.java | 4 +- .../src/org/eclipse/jgit/lib/LockFile.java | 20 +-- .../org/eclipse/jgit/lib/MutableObjectId.java | 16 +- .../src/org/eclipse/jgit/lib/ObjectId.java | 18 +-- .../eclipse/jgit/lib/ObjectIdSubclassMap.java | 6 +- .../org/eclipse/jgit/lib/ObjectLoader.java | 4 +- .../src/org/eclipse/jgit/lib/PackFile.java | 12 +- .../src/org/eclipse/jgit/lib/PackIndex.java | 14 +- .../src/org/eclipse/jgit/lib/PersonIdent.java | 22 +-- .../org/eclipse/jgit/lib/ProgressMonitor.java | 8 +- .../src/org/eclipse/jgit/lib/Ref.java | 14 +- .../org/eclipse/jgit/lib/RefComparator.java | 4 +- .../src/org/eclipse/jgit/lib/RefDatabase.java | 6 +- .../org/eclipse/jgit/lib/RefLogWriter.java | 4 +- .../src/org/eclipse/jgit/lib/RefRename.java | 2 +- .../src/org/eclipse/jgit/lib/RefUpdate.java | 32 ++-- .../src/org/eclipse/jgit/lib/RefWriter.java | 10 +- .../src/org/eclipse/jgit/lib/Repository.java | 16 +- .../src/org/eclipse/jgit/lib/Tree.java | 2 +- .../src/org/eclipse/jgit/lib/WindowCache.java | 2 +- .../org/eclipse/jgit/lib/WindowCursor.java | 4 +- .../org/eclipse/jgit/lib/WorkDirCheckout.java | 64 ++++---- .../jgit/revplot/AbstractPlotRenderer.java | 14 +- .../org/eclipse/jgit/revplot/PlotCommit.java | 12 +- .../eclipse/jgit/revplot/PlotCommitList.java | 6 +- .../org/eclipse/jgit/revplot/PlotLane.java | 2 +- .../org/eclipse/jgit/revplot/PlotWalk.java | 2 +- .../jgit/revwalk/AbstractRevQueue.java | 8 +- .../eclipse/jgit/revwalk/BlockRevQueue.java | 2 +- .../eclipse/jgit/revwalk/DateRevQueue.java | 2 +- .../eclipse/jgit/revwalk/FIFORevQueue.java | 2 +- .../org/eclipse/jgit/revwalk/Generator.java | 8 +- .../org/eclipse/jgit/revwalk/ObjectWalk.java | 12 +- .../src/org/eclipse/jgit/revwalk/RevBlob.java | 2 +- .../org/eclipse/jgit/revwalk/RevCommit.java | 28 ++-- .../eclipse/jgit/revwalk/RevCommitList.java | 22 +-- .../src/org/eclipse/jgit/revwalk/RevFlag.java | 2 +- .../org/eclipse/jgit/revwalk/RevFlagSet.java | 6 +- .../org/eclipse/jgit/revwalk/RevObject.java | 18 +-- .../eclipse/jgit/revwalk/RevObjectList.java | 2 +- .../src/org/eclipse/jgit/revwalk/RevTag.java | 8 +- .../src/org/eclipse/jgit/revwalk/RevTree.java | 2 +- .../src/org/eclipse/jgit/revwalk/RevWalk.java | 60 +++---- .../jgit/revwalk/RewriteGenerator.java | 2 +- .../jgit/revwalk/RewriteTreeFilter.java | 2 +- .../jgit/revwalk/TopoSortGenerator.java | 2 +- .../revwalk/filter/CommitTimeRevFilter.java | 4 +- .../jgit/revwalk/filter/OrRevFilter.java | 6 +- .../jgit/revwalk/filter/RevFlagFilter.java | 10 +- .../revwalk/filter/SubStringRevFilter.java | 6 +- .../transport/BasePackFetchConnection.java | 2 +- .../eclipse/jgit/transport/Connection.java | 2 +- .../jgit/transport/FetchConnection.java | 6 +- .../eclipse/jgit/transport/FetchResult.java | 2 +- .../org/eclipse/jgit/transport/IndexPack.java | 12 +- .../jgit/transport/OperationResult.java | 2 +- .../eclipse/jgit/transport/PackTransport.java | 2 +- .../jgit/transport/PushConnection.java | 2 +- .../org/eclipse/jgit/transport/RefSpec.java | 24 +-- .../eclipse/jgit/transport/RemoteConfig.java | 32 ++-- .../jgit/transport/SideBandInputStream.java | 2 +- .../jgit/transport/SshSessionFactory.java | 8 +- .../org/eclipse/jgit/transport/TagOpt.java | 4 +- .../jgit/transport/TrackingRefUpdate.java | 10 +- .../org/eclipse/jgit/transport/Transport.java | 24 +-- .../eclipse/jgit/transport/TransportHttp.java | 2 +- .../eclipse/jgit/transport/TransportSftp.java | 2 +- .../org/eclipse/jgit/transport/URIish.java | 14 +- .../jgit/transport/WalkFetchConnection.java | 6 +- .../transport/WalkRemoteObjectDatabase.java | 16 +- .../eclipse/jgit/transport/WalkTransport.java | 2 +- .../jgit/treewalk/AbstractTreeIterator.java | 24 +-- .../jgit/treewalk/CanonicalTreeParser.java | 4 +- .../jgit/treewalk/FileTreeIterator.java | 4 +- .../org/eclipse/jgit/treewalk/TreeWalk.java | 42 ++--- .../jgit/treewalk/WorkingTreeIterator.java | 14 +- .../jgit/treewalk/filter/AndTreeFilter.java | 6 +- .../jgit/treewalk/filter/NotTreeFilter.java | 2 +- .../jgit/treewalk/filter/OrTreeFilter.java | 6 +- .../jgit/treewalk/filter/PathFilter.java | 2 +- .../jgit/treewalk/filter/PathFilterGroup.java | 4 +- .../jgit/treewalk/filter/TreeFilter.java | 14 +- .../src/org/eclipse/jgit/util/FS.java | 14 +- .../src/org/eclipse/jgit/util/FS_Win32.java | 2 +- .../src/org/eclipse/jgit/util/NB.java | 12 +- .../eclipse/jgit/util/RawCharSequence.java | 2 +- .../org/eclipse/jgit/util/RawParseUtils.java | 34 ++-- .../jgit/util/RawSubStringPattern.java | 6 +- 122 files changed, 652 insertions(+), 652 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java index 45d941e2d..281e2f389 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java @@ -79,7 +79,7 @@ public class Main { /** * Execute the command line. - * + * * @param argv * arguments. */ diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheTreeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheTreeTest.java index b84b240a7..f74a35cd3 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheTreeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheTreeTest.java @@ -162,7 +162,7 @@ public void testTwoLevelSubtree() throws Exception { * index larger than the default BufferedInputStream buffer size. This made * the DirCache unable to read the extensions when index size exceeded the * buffer size (in some cases at least). - * + * * @throws CorruptObjectException * @throws IOException */ diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java index f871cc052..ac7ce5bd4 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java @@ -94,11 +94,11 @@ public void testRemoved() throws IOException { public void testModified() throws IOException { GitIndex index = new GitIndex(db); - - + + index.add(trash, writeTrashFile("file2", "file2")); index.add(trash, writeTrashFile("dir/file3", "dir/file3")); - + writeTrashFile("dir/file3", "changed"); Tree tree = new Tree(db); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexTreeWalkerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexTreeWalkerTest.java index eb7b622d6..f93343aab 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexTreeWalkerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexTreeWalkerTest.java @@ -54,7 +54,7 @@ public class IndexTreeWalkerTest extends RepositoryTestCase { private ArrayList treeOnlyEntriesVisited = new ArrayList(); private ArrayList bothVisited = new ArrayList(); private ArrayList indexOnlyEntriesVisited = new ArrayList(); - + private class TestIndexTreeVisitor extends AbstractIndexTreeVisitor { public void visitEntry(TreeEntry treeEntry, Entry indexEntry, File file) { if (treeEntry == null) @@ -67,13 +67,13 @@ else if (indexEntry == null) /* * Need to think about what I really need to be able to do.... - * + * * 1) Visit all entries in index and tree * 2) Get all directories that exist in the index, but not in the tree * -- I'm pretty sure that I don't need to do the other way around - * because I already + * because I already */ - + public void testTreeOnlyOneLevel() throws IOException { GitIndex index = new GitIndex(db); Tree tree = new Tree(db); @@ -81,11 +81,11 @@ public void testTreeOnlyOneLevel() throws IOException { tree.addFile("bar"); new IndexTreeWalker(index, tree, trash, new TestIndexTreeVisitor()).walk(); - + assertTrue(treeOnlyEntriesVisited.get(0).equals("bar")); assertTrue(treeOnlyEntriesVisited.get(1).equals("foo")); } - + public void testIndexOnlyOneLevel() throws IOException { GitIndex index = new GitIndex(db); Tree tree = new Tree(db); @@ -93,11 +93,11 @@ public void testIndexOnlyOneLevel() throws IOException { index.add(trash, writeTrashFile("foo", "foo")); index.add(trash, writeTrashFile("bar", "bar")); new IndexTreeWalker(index, tree, trash, new TestIndexTreeVisitor()).walk(); - + assertTrue(indexOnlyEntriesVisited.get(0).equals("bar")); assertTrue(indexOnlyEntriesVisited.get(1).equals("foo")); } - + public void testBoth() throws IOException { GitIndex index = new GitIndex(db); Tree tree = new Tree(db); @@ -106,14 +106,14 @@ public void testBoth() throws IOException { tree.addFile("b/b"); index.add(trash, writeTrashFile("c", "c")); tree.addFile("c"); - + new IndexTreeWalker(index, tree, trash, new TestIndexTreeVisitor()).walk(); assertTrue(indexOnlyEntriesVisited.contains("a")); assertTrue(treeOnlyEntriesVisited.contains("b/b")); assertTrue(bothVisited.contains("c")); - + } - + public void testIndexOnlySubDirs() throws IOException { GitIndex index = new GitIndex(db); Tree tree = new Tree(db); @@ -121,23 +121,23 @@ public void testIndexOnlySubDirs() throws IOException { index.add(trash, writeTrashFile("foo/bar/baz", "foobar")); index.add(trash, writeTrashFile("asdf", "asdf")); new IndexTreeWalker(index, tree, trash, new TestIndexTreeVisitor()).walk(); - + assertEquals("asdf", indexOnlyEntriesVisited.get(0)); assertEquals("foo/bar/baz", indexOnlyEntriesVisited.get(1)); } - + public void testLeavingTree() throws IOException { GitIndex index = new GitIndex(db); index.add(trash, writeTrashFile("foo/bar", "foo/bar")); index.add(trash, writeTrashFile("foobar", "foobar")); - + new IndexTreeWalker(index, db.mapTree(index.writeTree()), trash, new AbstractIndexTreeVisitor() { @Override public void visitEntry(TreeEntry entry, Entry indexEntry, File f) { if (entry == null || indexEntry == null) fail(); } - + @Override public void finishVisitTree(Tree tree, int i, String curDir) throws IOException { @@ -146,7 +146,7 @@ public void finishVisitTree(Tree tree, int i, String curDir) if (i == 0) fail(); } - + }).walk(); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PackIndexTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PackIndexTestCase.java index 31de3d98a..d1c5c5ecc 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PackIndexTestCase.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PackIndexTestCase.java @@ -64,14 +64,14 @@ public void setUp() throws Exception { /** * Return file with appropriate index version for prepared pack. - * + * * @return file with index */ public abstract File getFileForPack34be9032(); /** * Return file with appropriate index version for prepared pack. - * + * * @return file with index */ public abstract File getFileForPackdf2982f28(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java index 5ac75d804..481691a44 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java @@ -54,7 +54,7 @@ import org.eclipse.jgit.errors.CheckoutConflictException; public class ReadTreeTest extends RepositoryTestCase { - + private Tree theHead; private Tree theMerge; private GitIndex theIndex; @@ -64,64 +64,64 @@ public class ReadTreeTest extends RepositoryTestCase { // Rule 0 is left out for obvious reasons :) public void testRules1thru3_NoIndexEntry() throws IOException { GitIndex index = new GitIndex(db); - + Tree head = new Tree(db); FileTreeEntry headFile = head.addFile("foo"); ObjectId objectId = ObjectId.fromString("ba78e065e2c261d4f7b8f42107588051e87e18e9"); headFile.setId(objectId); Tree merge = new Tree(db); - + WorkDirCheckout readTree = new WorkDirCheckout(db, trash, head, index, merge); readTree.prescanTwoTrees(); - + assertTrue(readTree.removed.contains("foo")); - + readTree = new WorkDirCheckout(db, trash, merge, index, head); readTree.prescanTwoTrees(); - + assertEquals(objectId, readTree.updated.get("foo")); - + ObjectId anotherId = ObjectId.fromString("ba78e065e2c261d4f7b8f42107588051e87e18ee"); merge.addFile("foo").setId(anotherId); - + readTree = new WorkDirCheckout(db, trash, head, index, merge); readTree.prescanTwoTrees(); - + assertEquals(anotherId, readTree.updated.get("foo")); } - void setupCase(HashMap headEntries, - HashMap mergeEntries, + void setupCase(HashMap headEntries, + HashMap mergeEntries, HashMap indexEntries) throws IOException { theHead = buildTree(headEntries); theMerge = buildTree(mergeEntries); theIndex = buildIndex(indexEntries); } - + private GitIndex buildIndex(HashMap indexEntries) throws IOException { GitIndex index = new GitIndex(db); - + if (indexEntries == null) return index; for (java.util.Map.Entry e : indexEntries.entrySet()) { index.add(trash, writeTrashFile(e.getKey(), e.getValue())).forceRecheck(); } - + return index; } private Tree buildTree(HashMap headEntries) throws IOException { Tree tree = new Tree(db); - - if (headEntries == null) + + if (headEntries == null) return tree; for (java.util.Map.Entry e : headEntries.entrySet()) { tree.addFile(e.getKey()).setId(genSha1(e.getValue())); } - + return tree; } - + ObjectId genSha1(String data) { InputStream is = new ByteArrayInputStream(data.getBytes()); ObjectWriter objectWriter = new ObjectWriter(db); @@ -133,7 +133,7 @@ ObjectId genSha1(String data) { } return null; } - + private WorkDirCheckout go() throws IOException { theReadTree = new WorkDirCheckout(db, trash, theHead, theIndex, theMerge); theReadTree.prescanTwoTrees(); @@ -151,11 +151,11 @@ public void testRules4thru13_IndexEntryNotInHead() throws IOException { idxMap.put("foo", "foo"); setupCase(null, null, idxMap); theReadTree = go(); - + assertTrue(theReadTree.updated.isEmpty()); assertTrue(theReadTree.removed.isEmpty()); assertTrue(theReadTree.conflicts.isEmpty()); - + // rules 6 and 7 idxMap = new HashMap(); idxMap.put("foo", "foo"); @@ -163,70 +163,70 @@ public void testRules4thru13_IndexEntryNotInHead() throws IOException { theReadTree = go(); assertAllEmpty(); - + // rules 8 and 9 HashMap mergeMap; mergeMap = new HashMap(); - + mergeMap.put("foo", "merge"); setupCase(null, mergeMap, idxMap); go(); - + assertTrue(theReadTree.updated.isEmpty()); assertTrue(theReadTree.removed.isEmpty()); assertTrue(theReadTree.conflicts.contains("foo")); - + // rule 10 - + HashMap headMap = new HashMap(); headMap.put("foo", "foo"); setupCase(headMap, null, idxMap); go(); - + assertTrue(theReadTree.removed.contains("foo")); assertTrue(theReadTree.updated.isEmpty()); assertTrue(theReadTree.conflicts.isEmpty()); - + // rule 11 setupCase(headMap, null, idxMap); new File(trash, "foo").delete(); writeTrashFile("foo", "bar"); theIndex.getMembers()[0].forceRecheck(); go(); - + assertTrue(theReadTree.removed.isEmpty()); assertTrue(theReadTree.updated.isEmpty()); assertTrue(theReadTree.conflicts.contains("foo")); - + // rule 12 & 13 headMap.put("foo", "head"); setupCase(headMap, null, idxMap); go(); - + assertTrue(theReadTree.removed.isEmpty()); assertTrue(theReadTree.updated.isEmpty()); assertTrue(theReadTree.conflicts.contains("foo")); - + // rules 14 & 15 setupCase(headMap, headMap, idxMap); go(); - + assertAllEmpty(); - + // rules 16 & 17 setupCase(headMap, mergeMap, idxMap); go(); assertTrue(theReadTree.conflicts.contains("foo")); - + // rules 18 & 19 setupCase(headMap, idxMap, idxMap); go(); assertAllEmpty(); - + // rule 20 setupCase(idxMap, mergeMap, idxMap); go(); assertTrue(theReadTree.updated.containsKey("foo")); - + // rules 21 - setupCase(idxMap, mergeMap, idxMap); + setupCase(idxMap, mergeMap, idxMap); new File(trash, "foo").delete(); writeTrashFile("foo", "bar"); theIndex.getMembers()[0].forceRecheck(); @@ -239,37 +239,37 @@ private void assertAllEmpty() { assertTrue(theReadTree.updated.isEmpty()); assertTrue(theReadTree.conflicts.isEmpty()); } - + public void testDirectoryFileSimple() throws IOException { theIndex = new GitIndex(db); theIndex.add(trash, writeTrashFile("DF", "DF")); Tree treeDF = db.mapTree(theIndex.writeTree()); - + recursiveDelete(new File(trash, "DF")); theIndex = new GitIndex(db); theIndex.add(trash, writeTrashFile("DF/DF", "DF/DF")); Tree treeDFDF = db.mapTree(theIndex.writeTree()); - + theIndex = new GitIndex(db); recursiveDelete(new File(trash, "DF")); - + theIndex.add(trash, writeTrashFile("DF", "DF")); theReadTree = new WorkDirCheckout(db, trash, treeDF, theIndex, treeDFDF); theReadTree.prescanTwoTrees(); - + assertTrue(theReadTree.removed.contains("DF")); assertTrue(theReadTree.updated.containsKey("DF/DF")); - + recursiveDelete(new File(trash, "DF")); theIndex = new GitIndex(db); theIndex.add(trash, writeTrashFile("DF/DF", "DF/DF")); - + theReadTree = new WorkDirCheckout(db, trash, treeDFDF, theIndex, treeDF); theReadTree.prescanTwoTrees(); assertTrue(theReadTree.removed.contains("DF/DF")); assertTrue(theReadTree.updated.containsKey("DF")); } - + /* * Directory/File Conflict cases: * It's entirely possible that in practice a number of these may be equivalent @@ -277,7 +277,7 @@ public void testDirectoryFileSimple() throws IOException { * that's all I care about. These are basically reverse-engineered from * what git currently does. If there are tests for these in git, it's kind of * hard to track them all down... - * + * * H I M Clean H==M H==I I==M Result * ------------------------------------------------------------------ *1 D D F Y N Y N Update @@ -290,7 +290,7 @@ public void testDirectoryFileSimple() throws IOException { *8 F D F N Y N N Conflict *9 F D F Y N N N Update *10 F D D N N Y Keep - *11 F D D N N N Conflict + *11 F D D N N N Conflict *12 F F D Y N Y N Update *13 F F D N N Y N Conflict *14 F F D N N N Conflict @@ -300,7 +300,7 @@ public void testDirectoryFileSimple() throws IOException { *18 F 0 D Update *19 D 0 F Update */ - + public void testDirectoryFileConflicts_1() throws Exception { // 1 doit(mk("DF/DF"), mk("DF"), mk("DF/DF")); @@ -315,7 +315,7 @@ public void testDirectoryFileConflicts_2() throws Exception { writeTrashFile("DF/DF", "different"); go(); assertConflict("DF/DF"); - + } public void testDirectoryFileConflicts_3() throws Exception { @@ -330,14 +330,14 @@ public void testDirectoryFileConflicts_4() throws Exception { doit(mk("DF/DF"), mkmap("DF/DF", "foo"), mk("DF")); assertUpdated("DF/DF"); assertRemoved("DF"); - + } public void testDirectoryFileConflicts_5() throws Exception { // 5 doit(mk("DF/DF"), mk("DF"), mk("DF")); assertRemoved("DF/DF"); - + } public void testDirectoryFileConflicts_6() throws Exception { @@ -359,7 +359,7 @@ public void testDirectoryFileConflicts_7() throws Exception { go(); assertRemoved("DF/DF/DF/DF/DF"); assertUpdated("DF/DF"); - + cleanUpDF(); setupCase(mk("DF/DF"), mk("DF/DF"), mk("DF/DF/DF/DF/DF")); writeTrashFile("DF/DF/DF/DF/DF", "diff"); @@ -383,7 +383,7 @@ public void testDirectoryFileConflicts_10() throws Exception { cleanUpDF(); doit(mk("DF"), mk("DF/DF"), mk("DF/DF")); assertNoConflicts(); - + } public void testDirectoryFileConflicts_11() throws Exception { @@ -471,19 +471,19 @@ private void cleanUpDF() throws Exception { setUp(); recursiveDelete(new File(trash, "DF")); } - + private void assertConflict(String s) { assertTrue(theReadTree.conflicts.contains(s)); } - + private void assertUpdated(String s) { assertTrue(theReadTree.updated.containsKey(s)); } - + private void assertRemoved(String s) { assertTrue(theReadTree.removed.contains(s)); } - + private void assertNoConflicts() { assertTrue(theReadTree.conflicts.isEmpty()); } @@ -493,30 +493,30 @@ private void doit(HashMap h, HashMapm, setupCase(h, m, i); go(); } - + private static HashMap mk(String a) { return mkmap(a, a); } - + private static HashMap mkmap(String... args) { - if ((args.length % 2) > 0) + if ((args.length % 2) > 0) throw new IllegalArgumentException("needs to be pairs"); - + HashMap map = new HashMap(); for (int i = 0; i < args.length; i += 2) { map.put(args[i], args[i+1]); } - + return map; } - - public void testUntrackedConflicts() throws IOException { + + public void testUntrackedConflicts() throws IOException { setupCase(null, mk("foo"), null); writeTrashFile("foo", "foo"); go(); - + assertConflict("foo"); - + recursiveDelete(new File(trash, "foo")); setupCase(null, mk("foo"), null); writeTrashFile("foo/bar/baz", ""); @@ -525,14 +525,14 @@ public void testUntrackedConflicts() throws IOException { assertConflict("foo/bar/baz"); assertConflict("foo/blahblah"); - + recursiveDelete(new File(trash, "foo")); - - setupCase(mkmap("foo/bar", "", "foo/baz", ""), + + setupCase(mkmap("foo/bar", "", "foo/baz", ""), mk("foo"), mkmap("foo/bar", "", "foo/baz", "")); assertTrue(new File(trash, "foo/bar").exists()); go(); - + assertNoConflicts(); } @@ -554,23 +554,23 @@ private void checkout() throws IOException { theReadTree = new WorkDirCheckout(db, trash, theHead, theIndex, theMerge); theReadTree.checkout(); } - + public void testCheckoutOutChanges() throws IOException { setupCase(mk("foo"), mk("foo/bar"), mk("foo")); checkout(); - + assertFalse(new File(trash, "foo").isFile()); assertTrue(new File(trash, "foo/bar").isFile()); recursiveDelete(new File(trash, "foo")); setupCase(mk("foo/bar"), mk("foo"), mk("foo/bar")); checkout(); - + assertFalse(new File(trash, "foo/bar").isFile()); assertTrue(new File(trash, "foo").isFile()); - + setupCase(mk("foo"), mkmap("foo", "qux"), mkmap("foo", "bar")); - + try { checkout(); fail("did not throw exception"); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0003_Basic.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0003_Basic.java index 2cf557fb0..74e98f1d8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0003_Basic.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0003_Basic.java @@ -276,10 +276,10 @@ public void test020b_createBlobPlainTag() throws IOException { t.setTag("test020b"); t.setObjId(ObjectId.fromString("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391")); t.tag(); - + Tag mapTag = db.mapTag("test020b"); assertEquals("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", mapTag.getObjId().name()); - + // We do not repeat the plain tag test for other object types } @@ -330,7 +330,7 @@ public void test022_createCommitTag() throws IOException { assertEquals(new PersonIdent(jauthor, 1154236443000L, -4 * 60), mapTag.getAuthor()); assertEquals("b5d3b45a96b340441f5abb9080411705c51cc86c", mapTag.getObjId().name()); } - + public void test023_createCommitNonAnullii() throws IOException { final ObjectId emptyId = new ObjectWriter(db).writeBlob(new byte[0]); final Tree almostEmptyTree = new Tree(db); @@ -363,7 +363,7 @@ public void test024_createCommitNonAscii() throws IOException { ObjectId cid = new ObjectWriter(db).writeCommit(commit); assertEquals("2979b39d385014b33287054b87f77bcb3ecb5ebf", cid.name()); } - + public void test025_packedRefs() throws IOException { test020_createBlobTag(); test021_createTreeTag(); @@ -502,9 +502,9 @@ public void test026_CreateCommitMultipleparents() throws IOException { assertEquals(c2.getCommitId(), rm4.getParentIds()[1]); assertEquals(c3.getCommitId(), rm4.getParentIds()[2]); } - + public void test027_UnpackedRefHigherPriorityThanPacked() throws IOException { - PrintWriter writer = new PrintWriter(new FileWriter(new File(db.getDirectory(), "refs/heads/a"))); + PrintWriter writer = new PrintWriter(new FileWriter(new File(db.getDirectory(), "refs/heads/a"))); String unpackedId = "7f822839a2fe9760f386cbbbcb3f92c5fe81def7"; writer.print(unpackedId); writer.print('\n'); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0007_Index.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0007_Index.java index 74e4bfbde..ca2400cfb 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0007_Index.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0007_Index.java @@ -179,7 +179,7 @@ public void testWriteTree() throws Exception { ObjectId id = index.writeTree(); assertEquals("c696abc3ab8e091c665f49d00eb8919690b3aec3", id.name()); - + writeTrashFile("a/b", "data:a/b"); index.add(trash, new File(trash, "a/b")); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java index 6b19cc1e8..0b7e60c5c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java @@ -57,7 +57,7 @@ public void testEmpty() { /** * one file - * + * * @throws IOException */ public void testSimpleF1() throws IOException { @@ -70,7 +70,7 @@ public void testSimpleF1() throws IOException { /** * two files - * + * * @throws IOException */ public void testSimpleF2() throws IOException { @@ -85,7 +85,7 @@ public void testSimpleF2() throws IOException { /** * Empty tree - * + * * @throws IOException */ public void testSimpleT() throws IOException { @@ -94,7 +94,7 @@ public void testSimpleT() throws IOException { TreeIterator i = makeIterator(tree); assertFalse(i.hasNext()); } - + public void testTricky() throws IOException { Tree tree = new Tree(db); tree.addFile("a.b"); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPostOrderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPostOrderTest.java index caf8bff2a..459570430 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPostOrderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPostOrderTest.java @@ -59,7 +59,7 @@ public void testEmpty() { /** * one file - * + * * @throws IOException */ public void testSimpleF1() throws IOException { @@ -75,7 +75,7 @@ public void testSimpleF1() throws IOException { /** * two files - * + * * @throws IOException */ public void testSimpleF2() throws IOException { @@ -93,7 +93,7 @@ public void testSimpleF2() throws IOException { /** * Empty tree - * + * * @throws IOException */ public void testSimpleT() throws IOException { @@ -106,7 +106,7 @@ public void testSimpleT() throws IOException { assertEquals("", i.next().getFullName()); assertFalse(i.hasNext()); } - + public void testTricky() throws IOException { Tree tree = new Tree(db); tree.addFile("a.b"); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPreOrderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPreOrderTest.java index c6f41446d..79d090d8a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPreOrderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPreOrderTest.java @@ -59,7 +59,7 @@ public void testEmpty() { /** * one file - * + * * @throws IOException */ public void testSimpleF1() throws IOException { @@ -75,7 +75,7 @@ public void testSimpleF1() throws IOException { /** * two files - * + * * @throws IOException */ public void testSimpleF2() throws IOException { @@ -93,7 +93,7 @@ public void testSimpleF2() throws IOException { /** * Empty tree - * + * * @throws IOException */ public void testSimpleT() throws IOException { @@ -106,7 +106,7 @@ public void testSimpleT() throws IOException { assertEquals("a", i.next().getFullName()); assertFalse(i.hasNext()); } - + public void testTricky() throws IOException { Tree tree = new Tree(db); tree.addFile("a.b"); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java index fb9b358b2..6a6b63cab 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java @@ -89,7 +89,7 @@ public void testWrite0() throws Exception { /** * Incremental bundle test - * + * * @throws Exception */ public void testWrite1() throws Exception { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java b/org.eclipse.jgit/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java index 647b103d2..007a0e8d4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java @@ -187,4 +187,4 @@ protected int drawLabel(int x, int y, Ref ref) { return arcHeight * 3 + textw; } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/awtui/AwtAuthenticator.java b/org.eclipse.jgit/src/org/eclipse/jgit/awtui/AwtAuthenticator.java index ccd47ddda..995fe9a93 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/awtui/AwtAuthenticator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/awtui/AwtAuthenticator.java @@ -69,7 +69,7 @@ public static void install() { /** * Add a cached authentication for future use. - * + * * @param ca * the information we should remember. */ @@ -172,7 +172,7 @@ public static class CachedAuthentication { /** * Create a new cached authentication. - * + * * @param aHost * system this is for. * @param aPort diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/awtui/CommitGraphPane.java b/org.eclipse.jgit/src/org/eclipse/jgit/awtui/CommitGraphPane.java index 8d78e47df..da68c8195 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/awtui/CommitGraphPane.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/awtui/CommitGraphPane.java @@ -102,7 +102,7 @@ private void configureRowHeight() { /** * Get the commit list this pane renders from. - * + * * @return the list the caller must populate. */ public PlotCommitList getCommitList() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java index 61a3ef41c..efc5c6d82 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java @@ -187,4 +187,4 @@ protected int hashLine(final byte[] raw, int ptr, final int end) { hash = (hash << 5) ^ (raw[ptr] & 0xff); return hash; } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/Sequence.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/Sequence.java index 3a3356411..34f3f443f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/Sequence.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/Sequence.java @@ -81,4 +81,4 @@ public interface Sequence { * @return true if the elements are equal; false if they are not equal. */ public boolean equals(int thisIdx, Sequence other, int otherIdx); -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java index 8cfc366ea..b602033dc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java @@ -61,7 +61,7 @@ public class CheckoutConflictException extends IOException { public CheckoutConflictException(String file) { super("Checkout conflict with file: " + file); } - + /** * Construct a CheckoutConflictException for the specified set of files * @@ -73,7 +73,7 @@ public CheckoutConflictException(String[] files) { private static String buildList(String[] files) { StringBuilder builder = new StringBuilder(); - for (String f : files) { + for (String f : files) { builder.append("\n"); builder.append(f); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CompoundException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CompoundException.java index 0fb14655f..edee6084b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CompoundException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CompoundException.java @@ -67,7 +67,7 @@ private static String format(final Collection causes) { /** * Constructs an exception detailing many potential reasons for failure. - * + * * @param why * Two or more exceptions that may have been the problem. */ @@ -78,7 +78,7 @@ public CompoundException(final Collection why) { /** * Get the complete list of reasons why this failure happened. - * + * * @return unmodifiable collection of all possible reasons. */ public List getAllCauses() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/NotSupportedException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/NotSupportedException.java index 87044cbf3..124680ecc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/NotSupportedException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/NotSupportedException.java @@ -64,7 +64,7 @@ public NotSupportedException(final String s) { /** * Construct a NotSupportedException for some issue JGit cannot yet handle. - * + * * @param s * message describing the issue * @param why diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackProtocolException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackProtocolException.java index f9a1bae93..56816a641 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackProtocolException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackProtocolException.java @@ -84,7 +84,7 @@ public PackProtocolException(final URIish uri, final String s, /** * Constructs an PackProtocolException with the specified detail message. - * + * * @param s * message */ @@ -94,7 +94,7 @@ public PackProtocolException(final String s) { /** * Constructs an PackProtocolException with the specified detail message. - * + * * @param s * message * @param cause diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevisionSyntaxException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevisionSyntaxException.java index 58ec1b023..6b7f12d4b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevisionSyntaxException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevisionSyntaxException.java @@ -59,13 +59,13 @@ public class RevisionSyntaxException extends IOException { /** * Construct a RevisionSyntaxException indicating a syntax problem with a * revision (or object) string. - * + * * @param revstr The problematic revision string */ public RevisionSyntaxException(String revstr) { this.revstr = revstr; } - + /** * Construct a RevisionSyntaxException indicating a syntax problem with a * revision (or object) string. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/StopWalkException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/StopWalkException.java index c9b51de36..bba30e2c2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/StopWalkException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/StopWalkException.java @@ -46,7 +46,7 @@ /** * Stops the driver loop of walker and finish with current results. - * + * * @see org.eclipse.jgit.revwalk.filter.RevFilter */ public class StopWalkException extends RuntimeException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/TransportException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/TransportException.java index 2856eb62c..dfa035d60 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/TransportException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/TransportException.java @@ -86,7 +86,7 @@ public TransportException(final URIish uri, final String s, /** * Constructs an TransportException with the specified detail message. - * + * * @param s * message */ @@ -96,7 +96,7 @@ public TransportException(final String s) { /** * Constructs an TransportException with the specified detail message. - * + * * @param s * message * @param cause diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java index 4ed440354..efea0ec22 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java @@ -71,7 +71,7 @@ public abstract class AnyObjectId implements Comparable { /** * Compare to object identifier byte sequences for equality. - * + * * @param firstObjectId * the first identifier to compare. Must not be null. * @param secondObjectId @@ -108,7 +108,7 @@ public static boolean equals(final AnyObjectId firstObjectId, /** * For ObjectIdMap - * + * * @return a discriminator usable for a fan-out style map */ public final int getFirstByte() { @@ -117,7 +117,7 @@ public final int getFirstByte() { /** * Compare this ObjectId to another and obtain a sort ordering. - * + * * @param other * the other id to compare to. Must not be null. * @return < 0 if this id comes before other; 0 if this id is equal to @@ -213,7 +213,7 @@ public int hashCode() { /** * Determine if this ObjectId has exactly the same value as another. - * + * * @param other * the other id to compare to. May be null. * @return true only if both ObjectIds have identical bits. @@ -231,7 +231,7 @@ public boolean equals(final Object o) { /** * Copy this ObjectId to an output writer in raw binary. - * + * * @param w * the buffer to copy to. Must be in big endian order. */ @@ -245,7 +245,7 @@ public void copyRawTo(final ByteBuffer w) { /** * Copy this ObjectId to a byte array. - * + * * @param b * the buffer to copy to. * @param o @@ -277,7 +277,7 @@ public void copyRawTo(final int[] b, final int o) { /** * Copy this ObjectId to an output writer in raw binary. - * + * * @param w * the stream to write to. * @throws IOException @@ -301,7 +301,7 @@ private static void writeRawInt(final OutputStream w, int v) /** * Copy this ObjectId to an output writer in hex format. - * + * * @param w * the stream to copy to. * @throws IOException @@ -336,7 +336,7 @@ private static void formatHexByte(final byte[] dst, final int p, int w) { /** * Copy this ObjectId to an output writer in hex format. - * + * * @param w * the stream to copy to. * @throws IOException @@ -348,7 +348,7 @@ public void copyTo(final Writer w) throws IOException { /** * Copy this ObjectId to an output writer in hex format. - * + * * @param tmp * temporary char array to buffer construct into before writing. * Must be at least large enough to hold 2 digits for each byte @@ -469,7 +469,7 @@ public AbbreviatedObjectId abbreviate(final Repository repo, final int len) { * This method is useful to shed any additional memory that may be tied to * the subclass, yet retain the unique identity of the object id for future * lookups within maps and repositories. - * + * * @return an immutable copy, using the smallest memory footprint possible. */ public final ObjectId copy() { @@ -484,7 +484,7 @@ public final ObjectId copy() { * See {@link #copy()} if this is a possibly subclassed (but * immutable) identity and the application needs a lightweight identity * only reference. - * + * * @return an immutable copy. May be this if this is already * an immutable instance. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ByteWindow.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ByteWindow.java index 89bbe7548..cbef4218a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ByteWindow.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ByteWindow.java @@ -79,7 +79,7 @@ final boolean contains(final PackFile neededFile, final long neededPos) { /** * Copy bytes from the window to a caller supplied buffer. - * + * * @param pos * offset within the file to start copying from. * @param dstbuf @@ -100,7 +100,7 @@ final int copy(long pos, byte[] dstbuf, int dstoff, int cnt) { /** * Copy bytes from the window to a caller supplied buffer. - * + * * @param pos * offset within the window to start copying from. * @param dstbuf @@ -119,7 +119,7 @@ final int copy(long pos, byte[] dstbuf, int dstoff, int cnt) { /** * Pump bytes into the supplied inflater as input. - * + * * @param pos * offset within the file to start supplying input from. * @param dstbuf @@ -148,7 +148,7 @@ final int inflate(long pos, byte[] dstbuf, int dstoff, Inflater inf) /** * Pump bytes into the supplied inflater as input. - * + * * @param pos * offset within the window to start supplying input from. * @param dstbuf diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Commit.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Commit.java index c43256312..65921e53c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Commit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Commit.java @@ -67,7 +67,7 @@ public class Commit implements Treeish { private ObjectId treeId; private ObjectId[] parentIds; - + private PersonIdent author; private PersonIdent committer; @@ -91,7 +91,7 @@ public Commit(final Repository db) { objdb = db; parentIds = EMPTY_OBJECTID_LIST; } - + /** * Create a commit associated with these parents and associate it with a * repository. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index ea439b946..42f3debc2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -123,7 +123,7 @@ public final class Constants { * Indicates the associated object is a commit. *

* This constant is fixed and is defined by the Git packfile format. - * + * * @see #TYPE_COMMIT */ public static final int OBJ_COMMIT = 1; @@ -134,7 +134,7 @@ public final class Constants { * Indicates the associated object is a tree. *

* This constant is fixed and is defined by the Git packfile format. - * + * * @see #TYPE_BLOB */ public static final int OBJ_TREE = 2; @@ -145,7 +145,7 @@ public final class Constants { * Indicates the associated object is a blob. *

* This constant is fixed and is defined by the Git packfile format. - * + * * @see #TYPE_BLOB */ public static final int OBJ_BLOB = 3; @@ -156,7 +156,7 @@ public final class Constants { * Indicates the associated object is an annotated tag. *

* This constant is fixed and is defined by the Git packfile format. - * + * * @see #TYPE_TAG */ public static final int OBJ_TAG = 4; @@ -203,7 +203,7 @@ public final class Constants { * This constant is fixed and is defined by the Git packfile format. */ public static final byte[] PACK_SIGNATURE = { 'P', 'A', 'C', 'K' }; - + /** Native character encoding for commit messages, file names... */ public static final String CHARACTER_ENCODING = "UTF-8"; @@ -260,7 +260,7 @@ public final class Constants { /** * Create a new digest function for objects. - * + * * @return a new digest object. * @throws RuntimeException * this Java virtual machine does not support the required hash @@ -323,7 +323,7 @@ public static byte[] encodedTypeString(final int typeCode) { /** * Parse an encoded type string into a type constant. - * + * * @param id * object id this type string came from; may be null if that is * not known at the time the parse is occurring. @@ -398,7 +398,7 @@ public static int decodeTypeString(final AnyObjectId id, /** * Convert an integer into its decimal representation. - * + * * @param s * the integer to convert. * @return a decimal representation of the input integer. The returned array @@ -410,7 +410,7 @@ public static byte[] encodeASCII(final long s) { /** * Convert a string to US-ASCII encoding. - * + * * @param s * the string to convert. Must not contain any characters over * 127 (outside of 7-bit ASCII). diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileBasedConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileBasedConfig.java index a1843d118..2b430adc4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileBasedConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileBasedConfig.java @@ -146,4 +146,4 @@ public void save() throws IOException { public String toString() { return getClass().getSimpleName() + "[" + getFile().getPath() + "]"; } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileMode.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileMode.java index 4c3fb6b59..d549b15f9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileMode.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileMode.java @@ -138,7 +138,7 @@ public boolean equals(final int modeBits) { /** * Convert a set of mode bits into a FileMode enumerated value. - * + * * @param bits * the mode bits the caller has somehow obtained. * @return the FileMode instance that represents the given bits. @@ -198,7 +198,7 @@ private FileMode(int mode, final int expType) { /** * Test a file mode for equality with this {@link FileMode} object. - * + * * @param modebits * @return true if the mode bits represent the same mode as this object */ @@ -212,7 +212,7 @@ private FileMode(int mode, final int expType) { * indicate octal notation. This method is suitable for generation of a mode * string within a GIT tree object. *

- * + * * @param os * stream to copy the mode to. * @throws IOException @@ -233,7 +233,7 @@ public int copyToLength() { * Get the object type that should appear for this type of mode. *

* See the object type constants in {@link Constants}. - * + * * @return one of the well known object type constants. */ public int getObjectType() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitIndex.java index d62c9df04..1714d7077 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitIndex.java @@ -210,7 +210,7 @@ public Entry add(File wd, File f, byte[] content) throws IOException { * @param f * the file whose path shall be removed. * @return true if such a path was found (and thus removed) - * @throws IOException + * @throws IOException */ public boolean remove(File wd, File f) throws IOException { byte[] key = makeKey(wd, f); @@ -530,13 +530,13 @@ void write(ByteBuffer buf) { } /** - * Check if an entry's content is different from the cache, - * + * Check if an entry's content is different from the cache, + * * File status information is used and status is same we * consider the file identical to the state in the working * directory. Native git uses more stat fields than we * have accessible in Java. - * + * * @param wd working directory to compare content with * @return true if content is most likely different. */ @@ -545,17 +545,17 @@ public boolean isModified(File wd) { } /** - * Check if an entry's content is different from the cache, - * + * Check if an entry's content is different from the cache, + * * File status information is used and status is same we * consider the file identical to the state in the working * directory. Native git uses more stat fields than we * have accessible in Java. - * + * * @param wd working directory to compare content with * @param forceContentCheck True if the actual file content * should be checked if modification time differs. - * + * * @return true if content is most likely different. */ public boolean isModified(File wd, boolean forceContentCheck) { @@ -806,7 +806,7 @@ void readTree(String prefix, Tree t) throws IOException { } } } - + /** * Add tree entry to index * @param te tree entry @@ -834,7 +834,7 @@ public void checkout(File wd) throws IOException { checkoutEntry(wd, e); } } - + /** * Check out content of the specified index entry * @@ -948,7 +948,7 @@ int longestCommonPath(String[] a, String[] b) { * Small beware: Unaccounted for are unmerged entries. You may want * to abort if members with stage != 0 are found if you are doing * any updating operations. All stages will be found after one another - * here later. Currently only one stage per name is returned. + * here later. Currently only one stage per name is returned. * * @return The index entries sorted */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java index bbcd328b6..d655a97eb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java @@ -56,7 +56,7 @@ public class IndexDiff { private GitIndex index; private Tree tree; - + /** * Construct an indexdiff for diffing the workdir against * the index. @@ -80,9 +80,9 @@ public IndexDiff(Tree tree, GitIndex index) { this.tree = tree; this.index = index; } - + boolean anyChanges = false; - + /** * Run the diff operation. Until this is called, all lists will be empty * @return if anything is different between index, tree, and workdir @@ -105,7 +105,7 @@ public void visitEntry(TreeEntry treeEntry, Entry indexEntry, File file) { anyChanges = true; } } - + if (indexEntry != null) { if (!file.exists()) { missing.add(indexEntry.getName()); @@ -119,7 +119,7 @@ public void visitEntry(TreeEntry treeEntry, Entry indexEntry, File file) { } } }).walk(); - + return anyChanges; } @@ -156,7 +156,7 @@ public HashSet getRemoved() { public HashSet getMissing() { return missing; } - + /** * @return list of files on modified on disk relative to the index */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeVisitor.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeVisitor.java index 0835b0e52..bddb36d8b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeVisitor.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeVisitor.java @@ -69,7 +69,7 @@ public interface IndexTreeVisitor { * @throws IOException */ public void visitEntry(TreeEntry treeEntry, Entry indexEntry, File file) throws IOException; - + /** * Visit a blob, and corresponding tree nodes and associated index entry. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeWalker.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeWalker.java index 22d958434..b1ee94eff 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeWalker.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeWalker.java @@ -75,12 +75,12 @@ public IndexTreeWalker(GitIndex index, Tree tree, File root, IndexTreeVisitor vi this.root = root; this.visitor = visitor; this.newTree = null; - + threeTrees = false; - + indexMembers = index.getMembers(); } - + /** * Construct a walker for the index and two trees. * @@ -95,15 +95,15 @@ public IndexTreeWalker(GitIndex index, Tree mainTree, Tree newTree, File root, I this.newTree = newTree; this.root = root; this.visitor = visitor; - + threeTrees = true; - + indexMembers = index.getMembers(); } Entry[] indexMembers; int indexCounter = 0; - + /** * Actually walk the index tree * @@ -124,7 +124,7 @@ private void walk(Tree tree, Tree auxTree) throws IOException { int cmpma = compare(m, a); int cmpmi = compare(m, i); int cmpai = compare(a, i); - + TreeEntry pm = cmpma <= 0 && cmpmi <= 0 ? m : null; TreeEntry pa = cmpma >= 0 && cmpai <= 0 ? a : null; Entry pi = cmpmi >= 0 && cmpai >= 0 ? i : null; @@ -201,7 +201,7 @@ else if (t1 != null || t2 != null) static boolean lt(TreeEntry h, Entry i) { return compare(h, i) < 0; } - + static boolean lt(Entry i, TreeEntry t) { return compare(t, i) > 0; } @@ -209,11 +209,11 @@ static boolean lt(Entry i, TreeEntry t) { static boolean lt(TreeEntry h, TreeEntry m) { return compare(h, m) < 0; } - + static boolean eq(TreeEntry t1, TreeEntry t2) { return compare(t1, t2) == 0; } - + static boolean eq(TreeEntry t1, Entry e) { return compare(t1, e) == 0; } @@ -225,9 +225,9 @@ static int compare(TreeEntry t, Entry i) { return 1; if (i == null) return -1; - return Tree.compareNames(t.getFullNameUTF8(), i.getNameUTF8(), TreeEntry.lastChar(t), TreeEntry.lastChar(i)); + return Tree.compareNames(t.getFullNameUTF8(), i.getNameUTF8(), TreeEntry.lastChar(t), TreeEntry.lastChar(i)); } - + static int compare(TreeEntry t1, TreeEntry t2) { if (t1 != null && t1.getParent() == null && t2 != null && t2.getParent() == null) return 0; @@ -244,5 +244,5 @@ static int compare(TreeEntry t1, TreeEntry t2) { return -1; return Tree.compareNames(t1.getFullNameUTF8(), t2.getFullNameUTF8(), TreeEntry.lastChar(t1), TreeEntry.lastChar(t2)); } - + } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/InflaterCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/InflaterCache.java index 970589884..f9517a0a2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/InflaterCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/InflaterCache.java @@ -63,7 +63,7 @@ public class InflaterCache { *

* Inflaters obtained through this cache should be returned (if possible) by * {@link #release(Inflater)} to avoid garbage collection and reallocation. - * + * * @return an available inflater. Never null. */ public static Inflater get() { @@ -82,7 +82,7 @@ private synchronized static Inflater getImpl() { /** * Release an inflater previously obtained from this cache. - * + * * @param i * the inflater to return. May be null, in which case this method * does nothing. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java index bf0036bee..9d2576127 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java @@ -81,7 +81,7 @@ public class LockFile { /** * Create a new lock for any file. - * + * * @param f * the file that will be locked. */ @@ -92,7 +92,7 @@ public LockFile(final File f) { /** * Try to establish the lock. - * + * * @return true if the lock is now held by the caller; false if it is held * by someone else. * @throws IOException @@ -132,7 +132,7 @@ public boolean lock() throws IOException { /** * Try to establish the lock for appending. - * + * * @return true if the lock is now held by the caller; false if it is held * by someone else. * @throws IOException @@ -155,7 +155,7 @@ public boolean lockForAppend() throws IOException { *

* This method does nothing if the current file does not exist, or exists * but is empty. - * + * * @throws IOException * the temporary file could not be written, or a read error * occurred while reading from the current file. The lock is @@ -195,7 +195,7 @@ public void copyCurrentContent() throws IOException { /** * Write an ObjectId and LF to the temporary file. - * + * * @param id * the id to store in the file. The id will be written in hex, * followed by a sole LF. @@ -231,7 +231,7 @@ public void write(final ObjectId id) throws IOException { /** * Write arbitrary data to the temporary file. - * + * * @param content * the bytes to store in the temporary file. No additional bytes * are added, so if the file must end with an LF it must appear @@ -269,7 +269,7 @@ public void write(final byte[] content) throws IOException { * The stream may only be accessed once, and only after {@link #lock()} has * been successfully invoked and returned true. Callers must close the * stream prior to calling {@link #commit()} to commit the change. - * + * * @return a stream to write to the new file. The stream is unbuffered. */ public OutputStream getOutputStream() { @@ -326,7 +326,7 @@ private void requireLock() { /** * Request that {@link #commit()} remember modification time. - * + * * @param on * true if the commit method must remember the modification time. */ @@ -338,7 +338,7 @@ public void setNeedStatInformation(final boolean on) { * Commit this change and release the lock. *

* If this method fails (returns false) the lock is still released. - * + * * @return true if the commit was successful and the file contains the new * data; false if the commit failed and the file remains with the * old data. @@ -368,7 +368,7 @@ private void saveStatInformation() { /** * Get the modification time of the output file when it was committed. - * + * * @return modification time of the lock file right before we committed it. */ public long getCommitLastModified() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java index 478f8ba61..c8df1e2ce 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java @@ -64,7 +64,7 @@ public MutableObjectId() { /** * Copying constructor. - * + * * @param src * original entry, to copy id from */ @@ -87,7 +87,7 @@ public void clear() { /** * Convert an ObjectId from raw binary representation. - * + * * @param bs * the raw byte buffer to read from. At least 20 bytes must be * available within this byte array. @@ -98,7 +98,7 @@ public void fromRaw(final byte[] bs) { /** * Convert an ObjectId from raw binary representation. - * + * * @param bs * the raw byte buffer to read from. At least 20 bytes after p * must be available within this byte array. @@ -115,7 +115,7 @@ public void fromRaw(final byte[] bs, final int p) { /** * Convert an ObjectId from binary representation expressed in integers. - * + * * @param ints * the raw int buffer to read from. At least 5 integers must be * available within this integers array. @@ -126,13 +126,13 @@ public void fromRaw(final int[] ints) { /** * Convert an ObjectId from binary representation expressed in integers. - * + * * @param ints * the raw int buffer to read from. At least 5 integers after p * must be available within this integers array. * @param p * position to read the first integer of data from. - * + * */ public void fromRaw(final int[] ints, final int p) { w1 = ints[p]; @@ -144,7 +144,7 @@ public void fromRaw(final int[] ints, final int p) { /** * Convert an ObjectId from hex characters (US-ASCII). - * + * * @param buf * the US-ASCII buffer to read from. At least 40 bytes after * offset must be available within this byte array. @@ -157,7 +157,7 @@ public void fromString(final byte[] buf, final int offset) { /** * Convert an ObjectId from hex characters. - * + * * @param str * the string to read from. Must be 40 characters long. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java index 2e3506619..3a4e3a891 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java @@ -63,7 +63,7 @@ public class ObjectId extends AnyObjectId { /** * Get the special all-null ObjectId. - * + * * @return the all-null ObjectId, often used to stand-in for no object. */ public static final ObjectId zeroId() { @@ -74,7 +74,7 @@ public static final ObjectId zeroId() { * Test a string of characters to verify it is a hex format. *

* If true the string can be parsed with {@link #fromString(String)}. - * + * * @param id * the string to test. * @return true if the string can converted into an ObjectId. @@ -94,7 +94,7 @@ public static final boolean isId(final String id) { /** * Convert an ObjectId into a hex string representation. - * + * * @param i * the id to convert. May be null. * @return the hex string conversion of this id's content. @@ -105,7 +105,7 @@ public static final String toString(final ObjectId i) { /** * Compare to object identifier byte sequences for equality. - * + * * @param firstBuffer * the first buffer to compare against. Must have at least 20 * bytes from position ai through the end of the buffer. @@ -144,7 +144,7 @@ public static boolean equals(final byte[] firstBuffer, final int fi, /** * Convert an ObjectId from raw binary representation. - * + * * @param bs * the raw byte buffer to read from. At least 20 bytes must be * available within this byte array. @@ -156,7 +156,7 @@ public static final ObjectId fromRaw(final byte[] bs) { /** * Convert an ObjectId from raw binary representation. - * + * * @param bs * the raw byte buffer to read from. At least 20 bytes after p * must be available within this byte array. @@ -201,7 +201,7 @@ public static final ObjectId fromRaw(final int[] is, final int p) { /** * Convert an ObjectId from hex characters (US-ASCII). - * + * * @param buf * the US-ASCII buffer to read from. At least 40 bytes after * offset must be available within this byte array. @@ -215,7 +215,7 @@ public static final ObjectId fromString(final byte[] buf, final int offset) { /** * Convert an ObjectId from hex characters. - * + * * @param str * the string to read from. Must be 40 characters long. * @return the converted object id. @@ -254,7 +254,7 @@ private static final ObjectId fromHexString(final byte[] bs, int p) { * This constructor is mostly useful for subclasses who want to extend an * ObjectId with more properties, but initialize from an existing ObjectId * instance acquired by other means. - * + * * @param src * another already parsed ObjectId to copy the value out of. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSubclassMap.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSubclassMap.java index bc4072f60..bd57c061b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSubclassMap.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSubclassMap.java @@ -57,7 +57,7 @@ * not reference equality and not .equals(Object) equality. This * allows subclasses to override equals to supply their own * extended semantics. - * + * * @param * type of subclass of ObjectId that will be stored in the map. */ @@ -79,7 +79,7 @@ public void clear() { /** * Lookup an existing mapping. - * + * * @param toFind * the object identifier to find. * @return the instance mapped to toFind, or null if no mapping exists. @@ -103,7 +103,7 @@ public V get(final AnyObjectId toFind) { * An existing mapping for must not be in this map. Callers must * first call {@link #get(AnyObjectId)} to verify there is no current * mapping prior to adding a new mapping. - * + * * @param newValue * the object to store. * @param diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectLoader.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectLoader.java index 97b3b769a..4839a1c28 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectLoader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectLoader.java @@ -68,7 +68,7 @@ public abstract class ObjectLoader { *

* Unlike {@link #getCachedBytes()} this method returns an array that might * be modified by the caller. - * + * * @return the bytes of this object. */ public final byte[] getBytes() { @@ -85,7 +85,7 @@ public final byte[] getBytes() { * saving on data copies between the internal cache and higher level code. * Callers who receive this reference must not modify its contents. * Changes (if made) will affect the cache but not the repository itself. - * + * * @return the cached bytes of this object. Do not modify it. */ public abstract byte[] getCachedBytes(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackFile.java index 9defcad91..a35a4f0e7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackFile.java @@ -105,7 +105,7 @@ public int compare(final PackFile a, final PackFile b) { /** * Construct a reader for an existing, pre-indexed packfile. - * + * * @param idxFile * path of the .idx file listing the contents. * @param packFile @@ -161,7 +161,7 @@ public File getPackFile() { * For performance reasons only the index file is searched; the main pack * content is ignored entirely. *

- * + * * @param id * the object to look for. Must not be null. * @return true if the object is in this pack; false otherwise. @@ -174,7 +174,7 @@ public boolean hasObject(final AnyObjectId id) throws IOException { /** * Get an object from this pack. - * + * * @param curs * temporary working space associated with the calling thread. * @param id @@ -209,9 +209,9 @@ public void close() { *

* Iterator returns objects in SHA-1 lexicographical order. *

- * + * * @return iterator over entries of associated pack index - * + * * @see PackIndex#iterator() */ public Iterator iterator() { @@ -225,7 +225,7 @@ public Iterator iterator() { /** * Obtain the total number of objects available in this pack. This method * relies on pack index, giving number of effectively available objects. - * + * * @return number of objects in index of this pack, likewise in this pack * @throws IOException * the index file cannot be loaded into memory. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java index 733834e5b..fc11ff2ce 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java @@ -70,7 +70,7 @@ public abstract class PackIndex implements Iterable { * implementation for that format will be constructed and returned to the * caller. The file may or may not be held open by the returned instance. *

- * + * * @param idxFile * existing pack .idx to read. * @return access implementation for the requested file. @@ -123,7 +123,7 @@ private static boolean isTOC(final byte[] h) { /** * Determine if an object is contained within the pack file. - * + * * @param id * the object to look for. Must not be null. * @return true if the object is listed in this index; false otherwise. @@ -140,14 +140,14 @@ public boolean hasObject(final AnyObjectId id) { *

* Iterator returns objects in SHA-1 lexicographical order. *

- * + * * @return iterator over pack index entries */ public abstract Iterator iterator(); /** * Obtain the total number of objects described by this index. - * + * * @return number of objects in this index, and likewise in the associated * pack that this index was generated from. */ @@ -212,7 +212,7 @@ final ObjectId getObjectId(final int nthPosition) { /** * Locate the file offset position for the requested object. - * + * * @param objId * name of the object to locate within the pack. * @return offset of the object's header and compressed content; -1 if the @@ -246,7 +246,7 @@ abstract long findCRC32(AnyObjectId objId) throws MissingObjectException, /** * Represent mutable entry of pack index consisting of object id and offset * in pack (both mutable). - * + * */ public static class MutableEntry { final MutableObjectId idBuffer = new MutableObjectId(); @@ -255,7 +255,7 @@ public static class MutableEntry { /** * Returns offset for this index object entry - * + * * @return offset of this object in a pack file */ public long getOffset() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java index a9f520e8f..1c174aa03 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java @@ -54,7 +54,7 @@ /** * A combination of a person identity and time in Git. - * + * * Git combines Name + email + time + time zone to specify who wrote or * committed something. */ @@ -71,7 +71,7 @@ public class PersonIdent { * Creates new PersonIdent from config info in repository, with current time. * This new PersonIdent gets the info from the default committer as available * from the configuration. - * + * * @param repo */ public PersonIdent(final Repository repo) { @@ -84,7 +84,7 @@ public PersonIdent(final Repository repo) { /** * Copy a {@link PersonIdent}. - * + * * @param pi * Original {@link PersonIdent} */ @@ -94,7 +94,7 @@ public PersonIdent(final PersonIdent pi) { /** * Construct a new {@link PersonIdent} with current time. - * + * * @param aName * @param aEmailAddress */ @@ -104,7 +104,7 @@ public PersonIdent(final String aName, final String aEmailAddress) { /** * Copy a PersonIdent, but alter the clone's time stamp - * + * * @param pi * original {@link PersonIdent} * @param when @@ -118,7 +118,7 @@ public PersonIdent(final PersonIdent pi, final Date when, final TimeZone tz) { /** * Copy a {@link PersonIdent}, but alter the clone's time stamp - * + * * @param pi * original {@link PersonIdent} * @param aWhen @@ -133,7 +133,7 @@ public PersonIdent(final PersonIdent pi, final Date aWhen) { /** * Construct a PersonIdent from simple data - * + * * @param aName * @param aEmailAddress * @param aWhen @@ -151,7 +151,7 @@ public PersonIdent(final String aName, final String aEmailAddress, /** * Construct a {@link PersonIdent} - * + * * @param aName * @param aEmailAddress * @param aWhen @@ -169,7 +169,7 @@ public PersonIdent(final String aName, final String aEmailAddress, /** * Copy a PersonIdent, but alter the clone's time stamp - * + * * @param pi * original {@link PersonIdent} * @param aWhen @@ -187,7 +187,7 @@ public PersonIdent(final PersonIdent pi, final long aWhen, final int aTZ) { /** * Construct a PersonIdent from a string with full name, email, time time * zone string. The input string must be valid. - * + * * @param in * a Git internal format author/committer string. */ @@ -278,7 +278,7 @@ && getEmailAddress().equals(p.getEmailAddress()) /** * Format for Git storage. - * + * * @return a string in the git author format */ public String toExternalString() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ProgressMonitor.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ProgressMonitor.java index cab1b0858..7748140e2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ProgressMonitor.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ProgressMonitor.java @@ -53,7 +53,7 @@ public interface ProgressMonitor { * Advise the monitor of the total number of subtasks. *

* This should be invoked at most once per progress monitor interface. - * + * * @param totalTasks * the total number of tasks the caller will need to complete * their processing. @@ -62,7 +62,7 @@ public interface ProgressMonitor { /** * Begin processing a single task. - * + * * @param title * title to describe the task. Callers should publish these as * stable string constants that implementations could match @@ -79,7 +79,7 @@ public interface ProgressMonitor { * This is an incremental update; if invoked once per work unit the correct * value for our argument is 1, to indicate a single unit of * work has been finished by the caller. - * + * * @param completed * the number of work units completed since the last call. */ @@ -90,7 +90,7 @@ public interface ProgressMonitor { /** * Check for user task cancellation. - * + * * @return true if the user asked the process to stop working. */ boolean isCancelled(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Ref.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Ref.java index b040e9bed..162e399d9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Ref.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Ref.java @@ -136,7 +136,7 @@ public boolean isPacked() { /** * Create a new ref pairing. - * + * * @param st * method used to store this ref. * @param origName @@ -153,7 +153,7 @@ public Ref(final Storage st, final String origName, final String refName, final /** * Create a new ref pairing. - * + * * @param st * method used to store this ref. * @param refName @@ -168,7 +168,7 @@ public Ref(final Storage st, final String refName, final ObjectId id) { /** * Create a new ref pairing. - * + * * @param st * method used to store this ref. * @param origName @@ -196,7 +196,7 @@ public Ref(final Storage st, final String origName, final String refName, final /** * Create a new ref pairing. - * + * * @param st * method used to store this ref. * @param refName @@ -217,7 +217,7 @@ public Ref(final Storage st, final String refName, final ObjectId id, /** * What this ref is called within the repository. - * + * * @return name of this ref. */ public String getName() { @@ -233,7 +233,7 @@ public String getOrigName() { /** * Cached value of this ref. - * + * * @return the value of this ref at the last time we read it. */ public ObjectId getObjectId() { @@ -242,7 +242,7 @@ public ObjectId getObjectId() { /** * Cached value of ref^{} (the ref peeled to commit). - * + * * @return if this ref is an annotated tag the id of the commit (or tree or * blob) that the annotated tag refers to; null if this ref does not * refer to an annotated tag. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefComparator.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefComparator.java index cbbc0a91c..fe6d210c1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefComparator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefComparator.java @@ -66,7 +66,7 @@ public int compare(final Ref o1, final Ref o2) { /** * Sorts the collection of refs, returning a new collection. - * + * * @param refs * collection to be sorted * @return sorted collection of refs @@ -76,4 +76,4 @@ public static Collection sort(final Collection refs) { Collections.sort(r, INSTANCE); return r; } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java index 2c68dbb6d..1eaa995c6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java @@ -126,7 +126,7 @@ ObjectId idOf(final String name) throws IOException { /** * Create a command to update, create or delete a ref in this repository. - * + * * @param name * name of the ref the caller wants to modify. * @return an update command. The caller must finish populating this command @@ -172,7 +172,7 @@ RefRename newRename(String fromRef, String toRef) throws IOException { /** * Writes a symref (e.g. HEAD) to disk - * + * * @param name * symref name * @param target @@ -382,7 +382,7 @@ private synchronized Ref readRefBasic(final String origName, return new Ref(Ref.Storage.LOOSE, origName, target, null); if (!origName.equals(r.getName())) r = new Ref(Ref.Storage.LOOSE_PACKED, origName, r.getName(), r.getObjectId(), r.getPeeledObjectId(), true); - return r; + return r; } setModified(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefLogWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefLogWriter.java index 63307a3bc..304968557 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefLogWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefLogWriter.java @@ -53,7 +53,7 @@ /** * Utility class to work with reflog files - * + * * @author Dave Watson */ public class RefLogWriter { @@ -137,7 +137,7 @@ private static void appendOneRecord(final ObjectId oldId, /** * Writes reflog entry for ref specified by refName - * + * * @param repo * repository to use * @param oldCommit diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefRename.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefRename.java index 7e76ac58a..ba7f208f3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefRename.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefRename.java @@ -172,4 +172,4 @@ PersonIdent getRefLogIdent() { String getToName() { return newToUpdate.getName(); } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java index 18dc582c8..856eb1519 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java @@ -189,7 +189,7 @@ public Repository getRepository() { /** * Get the name of the ref this update will operate on. - * + * * @return name of underlying ref. */ public String getName() { @@ -207,7 +207,7 @@ public String getOrigName() { /** * Get the new value the ref will be (or was) updated to. - * + * * @return new value. Null if the caller has not configured it. */ public ObjectId getNewObjectId() { @@ -216,7 +216,7 @@ public ObjectId getNewObjectId() { /** * Set the new value the ref will update to. - * + * * @param id * the new value. */ @@ -247,7 +247,7 @@ public void setExpectedOldObjectId(final AnyObjectId id) { /** * Check if this update wants to forcefully change the ref. - * + * * @return true if this update should ignore merge tests. */ public boolean isForceUpdate() { @@ -256,7 +256,7 @@ public boolean isForceUpdate() { /** * Set if this update wants to forcefully change the ref. - * + * * @param b * true if this update should ignore merge tests. */ @@ -287,7 +287,7 @@ public void setRefLogIdent(final PersonIdent pi) { /** * Get the message to include in the reflog. - * + * * @return message the caller wants to include in the reflog; null if the * update should not be logged. */ @@ -297,7 +297,7 @@ public String getRefLogMessage() { /** * Set the message to include in the reflog. - * + * * @param msg * the message to describe this change. It may be null * if appendStatus is null in order not to append to the reflog @@ -331,7 +331,7 @@ public void disableRefLog() { * populated with the value of the ref before the lock is taken, but the old * value may change if someone else modified the ref between the time we * last read it and when the ref was locked for update. - * + * * @return the value of the ref prior to the update being attempted; null if * the updated has not been attempted yet. */ @@ -343,7 +343,7 @@ public ObjectId getOldObjectId() { * Get the status of this update. *

* The same value that was previously returned from an update method. - * + * * @return the status of the update. */ public Result getResult() { @@ -360,7 +360,7 @@ private void requireCanDoUpdate() { *

* This is just a convenient helper for setting the force flag, and as such * the merge test is performed. - * + * * @return the result status of the update. * @throws IOException * an unexpected IO error occurred while writing changes. @@ -376,11 +376,11 @@ public Result forceUpdate() throws IOException { * Merge test will be performed according to {@link #isForceUpdate()}. *

* This is the same as: - * + * * 

 	 * return update(new RevWalk(repository));
 	 *
- * + * * @return the result status of the update. * @throws IOException * an unexpected IO error occurred while writing changes. @@ -393,7 +393,7 @@ public Result update() throws IOException { * Gracefully update the ref to the new value. *

* Merge test will be performed according to {@link #isForceUpdate()}. - * + * * @param walk * a RevWalk instance this update command can borrow to perform * the merge test. The walk will be reset to perform the test. @@ -415,11 +415,11 @@ public Result update(final RevWalk walk) throws IOException { * Delete the ref. *

* This is the same as: - * + * * 

 	 * return delete(new RevWalk(repository));
 	 *
- * + * * @return the result status of the delete. * @throws IOException */ @@ -429,7 +429,7 @@ public Result delete() throws IOException { /** * Delete the ref. - * + * * @param walk * a RevWalk instance this delete command can borrow to perform * the merge test. The walk will be reset to perform the test. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java index 34e73a3f7..447acac8a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java @@ -53,7 +53,7 @@ /** * Writes out refs to the {@link Constants#INFO_REFS} and * {@link Constants#PACKED_REFS} files. - * + * * This class is abstract as the writing of the files must be handled by the * caller. This is because it is used by transport classes as well. */ @@ -75,8 +75,8 @@ public RefWriter(Collection refs) { *

* This method rebuilds the contents of the {@link Constants#INFO_REFS} file * to match the passed list of references. - * - * + * + * * @throws IOException * writing is not supported, or attempting to write the file * failed, possibly due to permissions or remote disk full, etc. @@ -114,7 +114,7 @@ public void writeInfoRefs() throws IOException { * This method rebuilds the contents of the {@link Constants#PACKED_REFS} * file to match the passed list of references, including only those refs * that have a storage type of {@link Ref.Storage#PACKED}. - * + * * @throws IOException * writing is not supported, or attempting to write the file * failed, possibly due to permissions or remote disk full, etc. @@ -159,7 +159,7 @@ public void writePackedRefs() throws IOException { /** * Handles actual writing of ref files to the git repository, which may * differ slightly depending on the destination and transport. - * + * * @param file * path to ref file. * @param content diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index 52f9ff393..0ca4f79c2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -111,7 +111,7 @@ public class Repository { /** * Construct a representation of a Git repository. - * + * * @param d * GIT_DIR (the location of the repository metadata). * @throws IOException @@ -251,7 +251,7 @@ public boolean hasObject(final AnyObjectId objectId) { /** * @param id * SHA-1 of an object. - * + * * @return a {@link ObjectLoader} for accessing the data of the named * object, or null if the object does not exist. * @throws IOException @@ -271,7 +271,7 @@ public ObjectLoader openObject(final AnyObjectId id) * temporary working space associated with the calling thread. * @param id * SHA-1 of an object. - * + * * @return a {@link ObjectLoader} for accessing the data of the named * object, or null if the object does not exist. * @throws IOException @@ -488,7 +488,7 @@ public Tag mapTag(final String refName, final ObjectId id) throws IOException { /** * Create a command to update, create or delete a ref in this repository. - * + * * @param ref * name of the ref the caller wants to modify. * @return an update command. The caller must finish populating this command @@ -666,7 +666,7 @@ else if (item.equals("")) { refId = parents[0]; } else throw new IncorrectObjectTypeException(refId, Constants.TYPE_COMMIT); - + } } else { ref = mapObject(refId, null); @@ -771,7 +771,7 @@ public void close() { /** * Add a single existing pack to the list of available pack files. - * + * * @param pack * path of the pack file to open. * @param idx @@ -817,7 +817,7 @@ public String getFullBranch() throws IOException { ref = ref.substring(5); return ref; } - + /** * @return name of current branch. * @throws IOException @@ -884,7 +884,7 @@ public Map getTags() { *

* If the ref cannot be peeled (as it does not refer to an annotated tag) * the peeled id stays null, but {@link Ref#isPeeled()} will be true. - * + * * @param ref * The ref to peel * @return ref if ref.isPeeled() is true; else a diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java index 2b8a0e7cf..130d3ded9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java @@ -605,4 +605,4 @@ public String toString() { return r.toString(); } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCache.java index 9c2134263..9c8f99dbc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCache.java @@ -78,7 +78,7 @@ private static final int bits(int newSize) { * The new configuration is applied immediately. If the new limits are * smaller than what what is currently cached, older entries will be purged * as soon as possible to allow the cache to meet the new limit. - * + * * @param packedGitLimit * maximum number of bytes to hold within this instance. * @param packedGitWindowSize diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCursor.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCursor.java index fcf43adf6..93e2a0242 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCursor.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCursor.java @@ -59,7 +59,7 @@ public final class WindowCursor { /** * Copy bytes from the window to a caller supplied buffer. - * + * * @param pack * the file the desired window is stored within. * @param position @@ -95,7 +95,7 @@ int copy(final PackFile pack, long position, final byte[] dstbuf, /** * Pump bytes into the supplied inflater as input. - * + * * @param pack * the file the desired window is stored within. * @param position diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WorkDirCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WorkDirCheckout.java index 75cc3bdc5..76585add1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WorkDirCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WorkDirCheckout.java @@ -67,14 +67,14 @@ public class WorkDirCheckout { File root; GitIndex index; - + private boolean failOnConflict = true; Tree merge; - + /** - * If true, will scan first to see if it's possible to check out, + * If true, will scan first to see if it's possible to check out, * otherwise throw {@link CheckoutConflictException}. If false, * it will silently deal with the problem. * @param failOnConflict @@ -90,7 +90,7 @@ public void setFailOnConflict(boolean failOnConflict) { this.index = oldIndex; this.merge = repo.mapTree(newIndex.writeTree()); } - + /** * Create a checkout class for checking out one tree, merging with the index * @@ -99,7 +99,7 @@ public void setFailOnConflict(boolean failOnConflict) { * @param index current index * @param merge tree to check out */ - public WorkDirCheckout(Repository repo, File root, + public WorkDirCheckout(Repository repo, File root, GitIndex index, Tree merge) { this.repo = repo; this.root = root; @@ -120,7 +120,7 @@ public WorkDirCheckout(Repository repo, File root, Tree head, GitIndex index, Tr this(repo, root, index, merge); this.head = head; } - + /** * Execute this checkout * @@ -136,7 +136,7 @@ public void checkout() throws IOException { throw new CheckoutConflictException(entries); } } - + cleanUpConflicts(); if (head == null) checkoutOutIndexNoHead(); @@ -147,7 +147,7 @@ private void checkoutTwoTrees() throws FileNotFoundException, IOException { for (String path : removed) { index.remove(root, new File(root, path)); } - + for (java.util.Map.Entry entry : updated.entrySet()) { Entry newEntry = index.addEntry(merge.findBlobMember(entry.getKey())); index.checkoutEntry(root, newEntry); @@ -160,7 +160,7 @@ private void checkoutTwoTrees() throws FileNotFoundException, IOException { Tree head = null; HashMap updated = new HashMap(); - + private void checkoutOutIndexNoHead() throws IOException { new IndexTreeWalker(index, merge, root, new AbstractIndexTreeVisitor() { public void visitEntry(TreeEntry m, Entry i, File f) throws IOException { @@ -176,7 +176,7 @@ else if (i.getObjectId().equals(m.getId())) { if (i.isModified(root, true)) needsCheckout = true; } else needsCheckout = true; - + if (needsCheckout) { Entry newEntry = index.addEntry(m); index.checkoutEntry(root, newEntry); @@ -205,9 +205,9 @@ private void removeEmptyParents(File f) { if (parentFile.list().length == 0) parentFile.delete(); else break; - + parentFile = parentFile.getParentFile(); - } + } } void prescanOneTree() throws IOException { @@ -227,12 +227,12 @@ public void visitEntry(TreeEntry m, Entry i, File file) throws IOException { }).walk(); conflicts.removeAll(removed); } - + private ArrayList listFiles(File file) { ArrayList list = new ArrayList(); listFiles(file, list); return list; - } + } private void listFiles(File dir, ArrayList list) { for (File f : dir.listFiles()) { @@ -267,24 +267,24 @@ public void visitEntry(TreeEntry treeEntry, TreeEntry auxEntry, } processEntry(treeEntry, auxEntry, indexEntry); } - + @Override public void finishVisitTree(Tree tree, Tree auxTree, String curDir) throws IOException { if (curDir.length() == 0) return; - + if (auxTree != null) { if (index.getEntry(curDir) != null) removed.add(curDir); - } + } } - + }).walk(); - + // if there's a conflict, don't list it under // to-be-removed, since that messed up our next // section removed.removeAll(conflicts); - + for (String path : updated.keySet()) { if (index.getEntry(path) == null) { File file = new File(root, path); @@ -295,8 +295,8 @@ else if (file.isDirectory()) { } } } - - + + conflicts.removeAll(removed); } @@ -304,11 +304,11 @@ void processEntry(TreeEntry h, TreeEntry m, Entry i) throws IOException { ObjectId iId = (i == null ? null : i.getObjectId()); ObjectId mId = (m == null ? null : m.getId()); ObjectId hId = (h == null ? null : h.getId()); - - String name = (i != null ? i.getName() : + + String name = (i != null ? i.getName() : (h != null ? h.getFullName() : m.getFullName())); - + if (i == null) { /* I (index) H M Result @@ -317,7 +317,7 @@ void processEntry(TreeEntry h, TreeEntry m, Entry i) throws IOException { 1 nothing nothing exists use M 2 nothing exists nothing remove path from index 3 nothing exists exists use M */ - + if (h == null) { updated.put(name,mId); } else if (m == null) { @@ -331,12 +331,12 @@ void processEntry(TreeEntry h, TreeEntry m, Entry i) throws IOException { ----------------------------------------------------- 4 yes N/A N/A nothing nothing keep index 5 no N/A N/A nothing nothing keep index - + 6 yes N/A yes nothing exists keep index 7 no N/A yes nothing exists keep index 8 yes N/A no nothing exists fail 9 no N/A no nothing exists fail */ - + if (m == null || mId.equals(iId)) { if (hasParentBlob(merge, name)) { if (i.isModified(root, true)) { @@ -355,7 +355,7 @@ void processEntry(TreeEntry h, TreeEntry m, Entry i) throws IOException { 12 yes no N/A exists nothing fail 13 no no N/A exists nothing fail */ - + if (hId.equals(iId)) { if (i.isModified(root, true)) { conflicts.add(name); @@ -374,14 +374,14 @@ void processEntry(TreeEntry h, TreeEntry m, Entry i) throws IOException { conflicts.add(name); else updated.put(name, mId); } - } + } } private boolean hasParentBlob(Tree t, String name) throws IOException { if (name.indexOf("/") == -1) return false; - + String parent = name.substring(0, name.lastIndexOf("/")); - if (t.findBlobMember(parent) != null) + if (t.findBlobMember(parent) != null) return true; return hasParentBlob(t, parent); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java index f872ae0a4..10d37ea07 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java @@ -70,7 +70,7 @@ * starts at (upper left corner is) 0,0. If this is not true (like say in SWT) * the implementation must perform the cell offset computations within the * various draw methods. - * + * * @param * type of lane being used by the application. * @param @@ -85,7 +85,7 @@ public abstract class AbstractPlotRenderer { /** * Paint one commit using the underlying graphics library. - * + * * @param commit * the commit to render in this cell. Must not be null. * @param h @@ -185,7 +185,7 @@ private int computeDotSize(final int h) { * If a null lane is supplied the return value must still be acceptable to a * drawing method. Usually this means the implementation should return a * default color. - * + * * @param myLane * the current lane. May be null. * @return graphics specific color reference. Must be a valid color. @@ -194,7 +194,7 @@ private int computeDotSize(final int h) { /** * Draw a single line within this cell. - * + * * @param color * the color to use while drawing the line. * @param x1 @@ -216,7 +216,7 @@ protected abstract void drawLine(TColor color, int x1, int y1, int x2, *

* Usually the commit dot is a filled oval in blue, then a drawn oval in * black, using the same coordinates for both operations. - * + * * @param x * upper left of the oval's bounding box. * @param y @@ -232,7 +232,7 @@ protected abstract void drawLine(TColor color, int x1, int y1, int x2, * Draw a single boundary commit (aka uninteresting commit) dot. *

* Usually a boundary commit dot is a light gray oval with a white center. - * + * * @param x * upper left of the oval's bounding box. * @param y @@ -249,7 +249,7 @@ protected abstract void drawLine(TColor color, int x1, int y1, int x2, *

* The font and colors used to render the text are left up to the * implementation. - * + * * @param msg * the text to draw. Does not contain LFs. * @param x diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java index 54d7c013d..a068943fb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java @@ -49,7 +49,7 @@ /** * A commit reference to a commit in the DAG. - * + * * @param * type of lane being used by the plotter. * @see PlotCommitList @@ -69,7 +69,7 @@ public class PlotCommit extends RevCommit { /** * Create a new commit. - * + * * @param id * the identity of this commit. * @param tags @@ -112,7 +112,7 @@ else if (cnt == 1) /** * Get the number of child commits listed in this commit. - * + * * @return number of children; always a positive value but can be 0. */ public final int getChildCount() { @@ -121,7 +121,7 @@ public final int getChildCount() { /** * Get the nth child from this commit's child list. - * + * * @param nth * child index to obtain. Must be in the range 0 through * {@link #getChildCount()}-1. @@ -135,7 +135,7 @@ public final PlotCommit getChild(final int nth) { /** * Determine if the given commit is a child (descendant) of this commit. - * + * * @param c * the commit to test. * @return true if the given commit built on top of this commit. @@ -149,7 +149,7 @@ public final boolean isChild(final PlotCommit c) { /** * Obtain the lane this commit has been plotted into. - * + * * @return the assigned lane for this commit. */ public final L getLane() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java index 27077c13a..8f6d083a3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java @@ -58,7 +58,7 @@ *

* The source of the list must be a {@link PlotWalk} and {@link #fillTo(int)} * must be used to populate the list. - * + * * @param * type of lane used by the application. */ @@ -98,7 +98,7 @@ public void source(final RevWalk w) { *

* This method modifies the passed collection by adding the lanes in any * order. - * + * * @param currCommit * the commit the caller needs to get the lanes from. * @param result @@ -195,7 +195,7 @@ protected L createLane() { /** * Return colors and other reusable information to the plotter when a lane * is no longer needed. - * + * * @param lane */ protected void recycleLane(final L lane) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotLane.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotLane.java index 45dd9960d..9d08455ce 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotLane.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotLane.java @@ -55,7 +55,7 @@ public class PlotLane { /** * Logical location of this lane within the graphing plane. - * + * * @return location of this lane, 0 through the maximum number of lanes. */ public int getPosition() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java index bebe148eb..66756ae99 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java @@ -73,7 +73,7 @@ public void dispose() { /** * Create a new revision walker for a given repository. - * + * * @param repo * the repository the walker will obtain data from. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/AbstractRevQueue.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/AbstractRevQueue.java index 30d29a80b..843c2afa2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/AbstractRevQueue.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/AbstractRevQueue.java @@ -55,7 +55,7 @@ abstract class AbstractRevQueue extends Generator { * This method always adds the commit, even if it is already in the queue or * previously was in the queue but has already been removed. To control * queue admission use {@link #add(RevCommit, RevFlag)}. - * + * * @param c * commit to add. */ @@ -68,7 +68,7 @@ abstract class AbstractRevQueue extends Generator { * flag; if it does not already have the flag than the commit is added to * the queue and the flag is set. This later will prevent the commit from * being added twice. - * + * * @param c * commit to add. * @param queueControl @@ -88,7 +88,7 @@ public final void add(final RevCommit c, final RevFlag queueControl) { * flag; if it does not already have the flag than the commit is added to * the queue and the flag is set. This later will prevent the commit from * being added twice. - * + * * @param c * commit whose parents should be added. * @param queueControl @@ -104,7 +104,7 @@ public final void addParents(final RevCommit c, final RevFlag queueControl) { /** * Remove the first commit from the queue. - * + * * @return the first commit of this queue. */ public abstract RevCommit next(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BlockRevQueue.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BlockRevQueue.java index 5e7a7998e..30d140a74 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BlockRevQueue.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BlockRevQueue.java @@ -79,7 +79,7 @@ protected BlockRevQueue() { *

* Free lists are not thread-safe. Applications must ensure that all queues * sharing the same free list are doing so from only a single thread. - * + * * @param q * the other queue we will steal entries from. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DateRevQueue.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DateRevQueue.java index 6ce63fe16..35460a7c4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DateRevQueue.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DateRevQueue.java @@ -98,7 +98,7 @@ public RevCommit next() { /** * Peek at the next commit, without removing it. - * + * * @return the next available commit; null if there are no commits left. */ public RevCommit peek() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/FIFORevQueue.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/FIFORevQueue.java index 5690a5d86..b8f63aaa5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/FIFORevQueue.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/FIFORevQueue.java @@ -82,7 +82,7 @@ public void add(final RevCommit c) { /** * Insert the commit pointer at the front of the queue. - * + * * @param c * the commit to insert into the queue. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/Generator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/Generator.java index de9fabc19..a95303b64 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/Generator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/Generator.java @@ -55,7 +55,7 @@ * Conceptually a Generator is an iterator or a queue, it returns commits until * there are no more relevant. Generators may be piped/stacked together to * create a more complex set of operations. - * + * * @see PendingGenerator * @see StartGenerator */ @@ -77,7 +77,7 @@ abstract class Generator { /** * Connect the supplied queue to this generator's own free list (if any). - * + * * @param q * another FIFO queue that wants to share our queue's free list. */ @@ -87,7 +87,7 @@ void shareFreeList(final BlockRevQueue q) { /** * Obtain flags describing the output behavior of this generator. - * + * * @return one or more of the constants declared in this class, describing * how this generator produces its results. */ @@ -95,7 +95,7 @@ void shareFreeList(final BlockRevQueue q) { /** * Return the next commit to the application, or the next generator. - * + * * @return next available commit; null if no more are to be returned. * @throws MissingObjectException * @throws IncorrectObjectTypeException diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java index d8f88ea30..b1796b258 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java @@ -92,7 +92,7 @@ public class ObjectWalk extends RevWalk { /** * Create a new revision and object walker for a given repository. - * + * * @param repo * the repository the walker will obtain data from. */ @@ -118,7 +118,7 @@ public ObjectWalk(final Repository repo) { * This method will automatically call {@link RevWalk#markStart(RevCommit)} * if passed RevCommit instance, or a RevTag that directly (or indirectly) * references a RevCommit. - * + * * @param o * the object to start traversing from. The object passed must be * from this same revision walker. @@ -169,7 +169,7 @@ public void markStart(RevObject o) throws MissingObjectException, * This method will automatically call {@link RevWalk#markStart(RevCommit)} * if passed RevCommit instance, or a RevTag that directly (or indirectly) * references a RevCommit. - * + * * @param o * the object to start traversing from. The object passed must be * @throws MissingObjectException @@ -229,7 +229,7 @@ public RevCommit next() throws MissingObjectException, /** * Pop the next most recent object. - * + * * @return next most recent object; null if traversal is over. * @throws MissingObjectException * one or or more of the next objects are not available from the @@ -323,7 +323,7 @@ private final boolean shouldSkipObject(final RevObject o) { * This method returns successfully if everything is connected; it throws an * exception if there is a connectivity problem. The exception message * provides some detail about the connectivity failure. - * + * * @throws MissingObjectException * one or or more of the next objects are not available from the * object database, but were thought to be candidates for @@ -357,7 +357,7 @@ public void checkConnectivity() throws MissingObjectException, * and final output generation. Applications should try to avoid calling it, * and if invoked do so only once per interesting entry, where the name is * absolutely required for correct function. - * + * * @return complete path of the current entry, from the root of the * repository. If the current entry is in a subtree there will be at * least one '/' in the returned string. Null if the current entry diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevBlob.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevBlob.java index f4d46e7e6..5bf0ad146 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevBlob.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevBlob.java @@ -52,7 +52,7 @@ public class RevBlob extends RevObject { /** * Create a new blob reference. - * + * * @param id * object name for the blob. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java index 1d2a49d3a..2d96bbf67 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java @@ -75,7 +75,7 @@ public class RevCommit extends RevObject { /** * Create a new commit reference. - * + * * @param id * object name for the commit. */ @@ -149,7 +149,7 @@ else if (nParents == 1) { buffer = raw; flags |= PARSED; } - + @Override public final int getType() { return Constants.OBJ_COMMIT; @@ -187,7 +187,7 @@ static void carryFlags(RevCommit c, final int carry) { * an unparsed commit or a commit with no parents is discovered. This * permits applications to force a flag through the history chain when * necessary. - * + * * @param flag * the single flag value to carry back onto parents. */ @@ -199,7 +199,7 @@ public void carry(final RevFlag flag) { /** * Time from the "committer " line of the buffer. - * + * * @return time, expressed as seconds since the epoch. */ public final int getCommitTime() { @@ -208,7 +208,7 @@ public final int getCommitTime() { /** * Parse this commit buffer for display. - * + * * @param walk * revision walker owning this reference. * @return parsed commit. @@ -219,7 +219,7 @@ public final Commit asCommit(final RevWalk walk) { /** * Get a reference to this commit's tree. - * + * * @return tree of this commit. */ public final RevTree getTree() { @@ -228,7 +228,7 @@ public final RevTree getTree() { /** * Get the number of parent commits listed in this commit. - * + * * @return number of parents; always a positive value but can be 0. */ public final int getParentCount() { @@ -237,7 +237,7 @@ public final int getParentCount() { /** * Get the nth parent from this commit's parent list. - * + * * @param nth * parent index to obtain. Must be in the range 0 through * {@link #getParentCount()}-1. @@ -256,7 +256,7 @@ public final RevCommit getParent(final int nth) { * this commit's parent list. Applications relying on this list should be * very careful to ensure they do not modify its contents during their use * of it. - * + * * @return the array of parents. */ public final RevCommit[] getParents() { @@ -270,7 +270,7 @@ public final RevCommit[] getParents() { * this commit's message buffer within a RevFilter. Applications relying on * this buffer should be very careful to ensure they do not modify its * contents during their use of it. - * + * * @return the raw unparsed commit body. This is NOT A COPY. * Altering the contents of this buffer may alter the walker's * knowledge of this commit, and the results it produces. @@ -293,7 +293,7 @@ public final byte[] getRawBuffer() { * RevFilter implementations should try to use {@link RawParseUtils} to scan * the {@link #getRawBuffer()} instead, as this will allow faster evaluation * of commits. - * + * * @return identity of the author (name, email) and the time the commit was * made by the author; null if no author line was found. */ @@ -319,7 +319,7 @@ public final PersonIdent getAuthorIdent() { * RevFilter implementations should try to use {@link RawParseUtils} to scan * the {@link #getRawBuffer()} instead, as this will allow faster evaluation * of commits. - * + * * @return identity of the committer (name, email) and the time the commit * was made by the committer; null if no committer line was found. */ @@ -338,7 +338,7 @@ public final PersonIdent getCommitterIdent() { * after taking the commit's character set into account and decoding the * buffer using that character set. This method is a fairly expensive * operation and produces a new string on each invocation. - * + * * @return decoded commit message as a string. Never null. */ public final String getFullMessage() { @@ -360,7 +360,7 @@ public final String getFullMessage() { * after taking the commit's character set into account and decoding the * buffer using that character set. This method is a fairly expensive * operation and produces a new string on each invocation. - * + * * @return decoded commit message as a string. Never null. The returned * string does not contain any LFs, even if the first paragraph * spanned multiple lines. Embedded LFs are converted to spaces. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java index d6abccfba..906f27c53 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitList.java @@ -51,7 +51,7 @@ /** * An ordered list of {@link RevCommit} subclasses. - * + * * @param * type of subclass of RevCommit the list is storing. */ @@ -69,7 +69,7 @@ public void clear() { *

* Same as applyFlag(matching, flag, 0, size()), but without * the incremental behavior. - * + * * @param matching * the filter to test commits with. If the filter includes a * commit it will have the flag set; if the filter does not @@ -102,7 +102,7 @@ public void applyFlag(final RevFilter matching, final RevFlag flag) * This version allows incremental testing and application, such as from a * background thread that needs to periodically halt processing and send * updates to the UI. - * + * * @param matching * the filter to test commits with. If the filter includes a * commit it will have the flag set; if the filter does not @@ -159,7 +159,7 @@ public void applyFlag(final RevFilter matching, final RevFlag flag, *

* Same as clearFlag(flag, 0, size()), but without the * incremental behavior. - * + * * @param flag * the flag to remove. Applications are responsible for * allocating this flag from the source RevWalk. @@ -173,7 +173,7 @@ public void clearFlag(final RevFlag flag) { *

* This method is actually implemented in terms of: * applyFlag(RevFilter.NONE, flag, rangeBegin, rangeEnd). - * + * * @param flag * the flag to remove. Applications are responsible for * allocating this flag from the source RevWalk. @@ -197,7 +197,7 @@ public void clearFlag(final RevFlag flag, final int rangeBegin, /** * Find the next commit that has the given flag set. - * + * * @param flag * the flag to test commits against. * @param begin @@ -227,7 +227,7 @@ public int indexOf(final RevFlag flag, int begin) { /** * Find the next commit that has the given flag set. - * + * * @param flag * the flag to test commits against. * @param begin @@ -259,7 +259,7 @@ public int lastIndexOf(final RevFlag flag, int begin) { /** * Set the revision walker this list populates itself from. - * + * * @param w * the walker to populate from. * @see #fillTo(int) @@ -270,7 +270,7 @@ public void source(final RevWalk w) { /** * Is this list still pending more items? - * + * * @return true if {@link #fillTo(int)} might be able to extend the list * size when called. */ @@ -286,7 +286,7 @@ public boolean isPending() { * fewer total commits available from the walk then the method will return * early. Callers can test the final size of the list by {@link #size()} to * determine if the high water mark specified was met. - * + * * @param highMark * number of commits the caller wants this list to contain when * the fill operation is complete. @@ -347,7 +347,7 @@ public void fillTo(final int highMark) throws MissingObjectException, * Optional callback invoked when commits enter the list by fillTo. *

* This method is only called during {@link #fillTo(int)}. - * + * * @param index * the list position this object will appear at. * @param e diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java index a8d644c33..83f57d266 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java @@ -76,7 +76,7 @@ public class RevFlag { /** * Get the revision walk instance this flag was created from. - * + * * @return the walker this flag was allocated out of, and belongs to. */ public RevWalk getRevWalk() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlagSet.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlagSet.java index fb9b4525a..ca30fd98d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlagSet.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlagSet.java @@ -51,7 +51,7 @@ /** * Multiple application level mark bits for {@link RevObject}s. - * + * * @see RevFlag */ public class RevFlagSet extends AbstractSet { @@ -66,7 +66,7 @@ public RevFlagSet() { /** * Create a set of flags, copied from an existing set. - * + * * @param s * the set to copy flags from. */ @@ -77,7 +77,7 @@ public RevFlagSet(final RevFlagSet s) { /** * Create a set of flags, copied from an existing collection. - * + * * @param s * the collection to copy flags from. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java index e5e3abcad..5dde43b27 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java @@ -89,14 +89,14 @@ final byte[] loadCanonical(final RevWalk walk) throws IOException, /** * Get Git object type. See {@link Constants}. - * + * * @return object type */ public abstract int getType(); /** * Get the name of this object. - * + * * @return unique hash of this object. */ public final ObjectId getId() { @@ -115,7 +115,7 @@ public final boolean equals(final Object o) { /** * Test to see if the flag has been set on this object. - * + * * @param flag * the flag to test. * @return true if the flag has been added to this object; false if not. @@ -126,7 +126,7 @@ public final boolean has(final RevFlag flag) { /** * Test to see if any flag in the set has been set on this object. - * + * * @param set * the flags to test. * @return true if any flag in the set has been added to this object; false @@ -138,7 +138,7 @@ public final boolean hasAny(final RevFlagSet set) { /** * Test to see if all flags in the set have been set on this object. - * + * * @param set * the flags to test. * @return true if all flags of the set have been added to this object; @@ -152,7 +152,7 @@ public final boolean hasAll(final RevFlagSet set) { * Add a flag to this object. *

* If the flag is already set on this object then the method has no effect. - * + * * @param flag * the flag to mark on this object, for later testing. */ @@ -162,7 +162,7 @@ public final void add(final RevFlag flag) { /** * Add a set of flags to this object. - * + * * @param set * the set of flags to mark on this object, for later testing. */ @@ -174,7 +174,7 @@ public final void add(final RevFlagSet set) { * Remove a flag from this object. *

* If the flag is not set on this object then the method has no effect. - * + * * @param flag * the flag to remove from this object. */ @@ -184,7 +184,7 @@ public final void remove(final RevFlag flag) { /** * Remove a set of flags from this object. - * + * * @param set * the flag to remove from this object. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java index 616a40aa8..0454b6ea7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java @@ -49,7 +49,7 @@ /** * An ordered list of {@link RevObject} subclasses. - * + * * @param * type of subclass of RevObject the list is storing. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java index a77757dc2..d2a665e07 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java @@ -68,7 +68,7 @@ public class RevTag extends RevObject { /** * Create a new tag reference. - * + * * @param id * object name for the tag. */ @@ -188,7 +188,7 @@ public final String getShortMessage() { /** * Parse this tag buffer for display. - * + * * @param walk * revision walker owning this reference. * @return parsed tag. @@ -199,7 +199,7 @@ public Tag asTag(final RevWalk walk) { /** * Get a reference to the object this tag was placed on. - * + * * @return object this tag refers to. */ public final RevObject getObject() { @@ -208,7 +208,7 @@ public final RevObject getObject() { /** * Get the name of this tag, from the tag header. - * + * * @return name of the tag, according to the tag header. */ public final String getTagName() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTree.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTree.java index 4fa153a65..76ec28362 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTree.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTree.java @@ -52,7 +52,7 @@ public class RevTree extends RevObject { /** * Create a new tree reference. - * + * * @param id * object name for the tree. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java index ac2643422..4c43aa14e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -128,7 +128,7 @@ public class RevWalk implements Iterable { * mark the commit REWRITE. Later we can rewrite the parents of a REWRITE * child to remove chains of REWRITE commits before we produce the child to * the application. - * + * * @see RewriteGenerator */ static final int REWRITE = 1 << 3; @@ -185,7 +185,7 @@ public class RevWalk implements Iterable { /** * Create a new revision walker for a given repository. - * + * * @param repo * the repository the walker will obtain data from. */ @@ -205,7 +205,7 @@ public RevWalk(final Repository repo) { /** * Get the repository this walker loads objects from. - * + * * @return the repository this walker was created to read. */ public Repository getRepository() { @@ -224,7 +224,7 @@ public Repository getRepository() { * handling may be more difficult for the application to explain why a * RevCommit is not actually a commit. The object pool of this walker would * also be 'poisoned' by the non-commit RevCommit. - * + * * @param c * the commit to start traversing from. The commit passed must be * from this same revision walker. @@ -254,7 +254,7 @@ public void markStart(final RevCommit c) throws MissingObjectException, /** * Mark commits to start graph traversal from. - * + * * @param list * commits to start traversing from. The commits passed must be * from this same revision walker. @@ -294,7 +294,7 @@ public void markStart(final Collection list) * handling may be more difficult for the application to explain why a * RevCommit is not actually a commit. The object pool of this walker would * also be 'poisoned' by the non-commit RevCommit. - * + * * @param c * the commit to start traversing from. The commit passed must be * from this same revision walker. @@ -330,7 +330,7 @@ public void markUninteresting(final RevCommit c) * commits, and then executes a walk until an answer can be obtained. * Currently allocated RevFlags that have been added to RevCommit instances * will be retained through the reset. - * + * * @param base * commit the caller thinks is reachable from tip. * @param tip @@ -370,7 +370,7 @@ public boolean isMergedInto(final RevCommit base, final RevCommit tip) /** * Pop the next most recent commit. - * + * * @return next most recent commit; null if traversal is over. * @throws MissingObjectException * one or or more of the next commit's parents are not available @@ -389,7 +389,7 @@ public RevCommit next() throws MissingObjectException, /** * Obtain the sort types applied to the commits returned. - * + * * @return the sorting strategies employed. At least one strategy is always * used, but that strategy may be {@link RevSort#NONE}. */ @@ -413,7 +413,7 @@ public boolean hasRevSort(RevSort sort) { *

* Disables all sorting strategies, then enables only the single strategy * supplied by the caller. - * + * * @param s * a sorting strategy to enable. */ @@ -430,7 +430,7 @@ public void sort(final RevSort s) { * may take precedence over others. As an example, {@link RevSort#TOPO} must * take precedence over {@link RevSort#COMMIT_TIME_DESC}, otherwise it * cannot enforce its ordering. - * + * * @param s * a sorting strategy to enable or disable. * @param use @@ -452,7 +452,7 @@ else if (sorting.size() == 0) /** * Get the currently configured commit filter. - * + * * @return the current filter. Never null as a filter is always needed. */ public RevFilter getRevFilter() { @@ -472,7 +472,7 @@ public RevFilter getRevFilter() { * unless the filter implementation specifically states it is (and always * will be) thread-safe. Callers may use {@link RevFilter#clone()} to create * a unique filter tree for this RevWalk instance. - * + * * @param newFilter * the new filter. If null the special {@link RevFilter#ALL} * filter will be used instead, as it matches every commit. @@ -486,7 +486,7 @@ public void setRevFilter(final RevFilter newFilter) { /** * Get the tree filter used to simplify commits by modified paths. - * + * * @return the current filter. Never null as a filter is always needed. If * no filter is being applied {@link TreeFilter#ALL} is returned. */ @@ -507,7 +507,7 @@ public TreeFilter getTreeFilter() { * Usually callers should be inserting a filter graph including * {@link TreeFilter#ANY_DIFF} along with one or more * {@link org.eclipse.jgit.treewalk.filter.PathFilter} instances. - * + * * @param newFilter * new filter. If null the special {@link TreeFilter#ALL} filter * will be used instead, as it matches everything. @@ -568,7 +568,7 @@ public RevBlob lookupBlob(final AnyObjectId id) { *

* The tree may or may not exist in the repository. It is impossible to tell * from this method's return value. - * + * * @param id * name of the tree object. * @return reference to the tree object. Never null. @@ -587,7 +587,7 @@ public RevTree lookupTree(final AnyObjectId id) { *

* The commit may or may not exist in the repository. It is impossible to * tell from this method's return value. - * + * * @param id * name of the commit object. * @return reference to the commit object. Never null. @@ -606,7 +606,7 @@ public RevCommit lookupCommit(final AnyObjectId id) { *

* The object may or may not exist in the repository. It is impossible to * tell from this method's return value. - * + * * @param id * name of the object. * @param type @@ -643,7 +643,7 @@ public RevObject lookupAny(final AnyObjectId id, final int type) { * Unlike {@link #lookupCommit(AnyObjectId)} this method only returns * successfully if the commit object exists, is verified to be a commit, and * was parsed without error. - * + * * @param id * name of the commit object. * @return reference to the commit object. Never null. @@ -713,7 +713,7 @@ else if (!(c instanceof RevTree)) * without error. Parsing an object can be expensive as the type must be * determined. For blobs this may mean the blob content was unpacked * unnecessarily, and thrown away. - * + * * @param id * name of the object. * @return reference to the object. Never null. @@ -768,7 +768,7 @@ public RevObject parseAny(final AnyObjectId id) *

* This method only returns successfully if the object exists and was parsed * without error. - * + * * @param obj * the object the caller needs to be parsed. * @throws MissingObjectException @@ -806,7 +806,7 @@ public void parseBody(final RevObject obj) * Applications are only assured to be able to create 24 unique flags on any * given revision walker instance. Any flags beyond 24 are offered only if * the implementation has extra free space within its internal storage. - * + * * @param name * description of the flag, primarily useful for debugging. * @return newly constructed flag instance. @@ -832,7 +832,7 @@ int allocFlag() { *

* A carried flag is copied from the child commit onto its parents when the * child commit is popped from the lowest level of walk's internal graph. - * + * * @param flag * the flag to carry onto parents, if set on a descendant. */ @@ -849,7 +849,7 @@ public void carry(final RevFlag flag) { *

* A carried flag is copied from the child commit onto its parents when the * child commit is popped from the lowest level of walk's internal graph. - * + * * @param set * the flags to carry onto parents, if set on a descendant. */ @@ -867,7 +867,7 @@ public void carry(final Collection set) { * If the flag was previously being carried, the carrying request is * removed. Disposing of a carried flag while a traversal is in progress has * an undefined behavior. - * + * * @param flag * the to recycle. */ @@ -909,7 +909,7 @@ public final void reset() { * Unlike {@link #dispose()} previously acquired RevObject (and RevCommit) * instances are not invalidated. RevFlag instances are not invalidated, but * are removed from all RevObjects. - * + * * @param retainFlags * application flags that should not be cleared from * existing commit objects. @@ -924,7 +924,7 @@ public final void resetRetain(final RevFlagSet retainFlags) { * Unlike {@link #dispose()} previously acquired RevObject (and RevCommit) * instances are not invalidated. RevFlag instances are not invalidated, but * are removed from all RevObjects. - * + * * @param retainFlags * application flags that should not be cleared from * existing commit objects. @@ -942,7 +942,7 @@ public final void resetRetain(final RevFlag... retainFlags) { * Unlike {@link #dispose()} previously acquired RevObject (and RevCommit) * instances are not invalidated. RevFlag instances are not invalidated, but * are removed from all RevObjects. - * + * * @param retainFlags * application flags that should not be cleared from * existing commit objects. @@ -1012,7 +1012,7 @@ public void dispose() { *

* If a checked exception is thrown during the walk (see {@link #next()}) * it is rethrown from the Iterator as a {@link RevWalkException}. - * + * * @return an iterator over this walker's commits. * @see RevWalkException */ @@ -1068,7 +1068,7 @@ private boolean isNotStarted() { /** * Construct a new unparsed commit for the given object. - * + * * @param id * the object this walker requires a commit reference for. * @return a new unparsed reference for the object. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java index 04d8def43..87a56a9e8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java @@ -65,7 +65,7 @@ * that makes the DAG dense. Not fully buffering the commits first would cause * this loop to abort early, due to commits not being parsed and colored * correctly. - * + * * @see RewriteTreeFilter */ class RewriteGenerator extends Generator { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteTreeFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteTreeFilter.java index 4cec8a7f0..d7e5c8028 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteTreeFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteTreeFilter.java @@ -64,7 +64,7 @@ * the commit is colored with {@link RevWalk#REWRITE}, allowing a later pass * implemented by {@link RewriteGenerator} to remove those colored commits from * the DAG. - * + * * @see RewriteGenerator */ class RewriteTreeFilter extends RevFilter { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortGenerator.java index 78c0d8f16..7b11d0490 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortGenerator.java @@ -62,7 +62,7 @@ class TopoSortGenerator extends Generator { * When the constructor completes the supplied generator will have no * commits remaining, as all of the commits will be held inside of this * generator's internal buffer. - * + * * @param s * generator to pull all commits out of, and into this buffer. * @throws MissingObjectException diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java index a70ff9fd6..0e6c478cc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java @@ -57,7 +57,7 @@ public abstract class CommitTimeRevFilter extends RevFilter { /** * Create a new filter to select commits before a given date/time. - * + * * @param ts * the point in time to cut on. * @return a new filter to select commits on or before ts. @@ -68,7 +68,7 @@ public static final RevFilter before(final Date ts) { /** * Create a new filter to select commits after a given date/time. - * + * * @param ts * the point in time to cut on. * @return a new filter to select commits on or after ts. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/OrRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/OrRevFilter.java index a2782763b..540e7cba6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/OrRevFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/OrRevFilter.java @@ -63,7 +63,7 @@ public abstract class OrRevFilter extends RevFilter { /** * Create a filter with two filters, one of which must match. - * + * * @param a * first filter to test. * @param b @@ -78,7 +78,7 @@ public static RevFilter create(final RevFilter a, final RevFilter b) { /** * Create a filter around many filters, one of which must match. - * + * * @param list * list of filters to match against. Must contain at least 2 * filters. @@ -96,7 +96,7 @@ public static RevFilter create(final RevFilter[] list) { /** * Create a filter around many filters, one of which must match. - * + * * @param list * list of filters to match against. Must contain at least 2 * filters. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java index 8339fc7c0..2faf90ca8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java @@ -56,7 +56,7 @@ public abstract class RevFlagFilter extends RevFilter { /** * Create a new filter that tests for a single flag. - * + * * @param a * the flag to test. * @return filter that selects only commits with flag a. @@ -69,7 +69,7 @@ public static RevFilter has(final RevFlag a) { /** * Create a new filter that tests all flags in a set. - * + * * @param a * set of flags to test. * @return filter that selects only commits with all flags in a. @@ -83,7 +83,7 @@ public static RevFilter hasAll(final RevFlag... a) { /** * Create a new filter that tests all flags in a set. - * + * * @param a * set of flags to test. * @return filter that selects only commits with all flags in a. @@ -94,7 +94,7 @@ public static RevFilter hasAll(final RevFlagSet a) { /** * Create a new filter that tests for any flag in a set. - * + * * @param a * set of flags to test. * @return filter that selects only commits with any flag in a. @@ -108,7 +108,7 @@ public static RevFilter hasAny(final RevFlag... a) { /** * Create a new filter that tests for any flag in a set. - * + * * @param a * set of flags to test. * @return filter that selects only commits with any flag in a. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java index c6f421784..f8e34a923 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java @@ -56,7 +56,7 @@ public abstract class SubStringRevFilter extends RevFilter { /** * Can this string be safely handled by a substring filter? - * + * * @param pattern * the pattern text proposed by the user. * @return true if a substring filter can perform this pattern match; false @@ -87,7 +87,7 @@ public static boolean safe(final String pattern) { /** * Construct a new matching filter. - * + * * @param patternText * text to locate. This should be a safe string as described by * the {@link #safe(String)} as regular expression meta @@ -106,7 +106,7 @@ public boolean include(final RevWalk walker, final RevCommit cmit) /** * Obtain the raw text to match against. - * + * * @param cmit * current commit being evaluated. * @return sequence for the commit's content that we need to match on. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java index 3f478680a..5faf957b5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java @@ -535,4 +535,4 @@ private void receivePack(final ProgressMonitor monitor) throws IOException { private static class CancelledException extends Exception { private static final long serialVersionUID = 1L; } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Connection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Connection.java index fbed0693c..3f0c3d8e5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Connection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Connection.java @@ -107,4 +107,4 @@ public interface Connection { */ public void close(); -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchConnection.java index dea0f2dc1..50c0866f2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchConnection.java @@ -69,7 +69,7 @@ *

* FetchConnection instances are not thread safe and may be accessed by only one * thread at a time. - * + * * @see Transport */ public interface FetchConnection extends Connection { @@ -88,7 +88,7 @@ public interface FetchConnection extends Connection { * should always be preferred over remotely available objects and packs. * {@link Transport#isFetchThin()} should be honored if applicable. *

- * + * * @param monitor * progress monitor to inform the end-user about the amount of * work completed, or to indicate cancellation. Implementations @@ -124,7 +124,7 @@ public void fetch(final ProgressMonitor monitor, * By returning only true/false (and not the actual list of tags obtained) * the transport itself does not need to be aware of whether or not tags * were included in the transfer. - * + * * @return true if the last fetch call implicitly included tag objects; * false if tags were not implicitly obtained. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchResult.java index df3a1937a..3d95eddc9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchResult.java @@ -52,7 +52,7 @@ /** * Final status after a successful fetch from a remote repository. - * + * * @see Transport#fetch(org.eclipse.jgit.lib.ProgressMonitor, Collection) */ public class FetchResult extends OperationResult { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java index f36864847..6e0f22807 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java @@ -104,7 +104,7 @@ public class IndexPack { * files within the repository's objects directory. To use the * data contained within them call {@link #renameAndOpenPack()} once the * indexing is complete. - * + * * @param db * the repository that will receive the new pack. * @param is @@ -187,7 +187,7 @@ public static IndexPack create(final Repository db, final InputStream is) /** * Create a new pack indexer utility. - * + * * @param db * @param src * stream to read the pack data from. If the stream is buffered @@ -239,7 +239,7 @@ public void setIndexVersion(final int version) { * Thin packs are sometimes used during network transfers to allow a delta * to be sent without a base object. Such packs are not permitted on disk. * They can be fixed by copying the base object onto the end of the pack. - * + * * @param fix * true to enable fixing a thin pack. */ @@ -296,10 +296,10 @@ public void setObjectChecking(final boolean on) { /** * Consume data from the input stream until the packfile is indexed. - * + * * @param progress * progress feedback - * + * * @throws IOException */ public void index(final ProgressMonitor progress) throws IOException { @@ -997,7 +997,7 @@ private static class UnresolvedDelta { * If the call completes successfully the repository this IndexPack instance * was created with will have the objects in the pack available for reading * and use, without needing to scan for packs. - * + * * @throws IOException * The pack could not be inserted into the repository's objects * directory. The pack no longer exists on disk, as it was diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/OperationResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/OperationResult.java index c7371d60f..e93f7f760 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/OperationResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/OperationResult.java @@ -136,4 +136,4 @@ void setAdvertisedRefs(final URIish u, final Map ar) { void add(final TrackingRefUpdate u) { updates.put(u.getLocalName(), u); } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackTransport.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackTransport.java index 736d32965..930cbb718 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackTransport.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackTransport.java @@ -52,7 +52,7 @@ * Implementations of PackTransport setup connections and move objects back and * forth by creating pack files on the source side and indexing them on the * receiving side. - * + * * @see BasePackFetchConnection * @see BasePackPushConnection */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushConnection.java index 14e6a1e80..489ac7887 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushConnection.java @@ -65,7 +65,7 @@ *

* PushConnection instances are not thread safe and may be accessed by only one * thread at a time. - * + * * @see Transport */ public interface PushConnection extends Connection { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefSpec.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefSpec.java index 1949ef087..154ae3fed 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefSpec.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefSpec.java @@ -108,7 +108,7 @@ public RefSpec() { *

  • +refs/head/*:refs/remotes/origin/*
    • *
  • :refs/head/master
    • * - * + * * @param spec * string describing the specification. * @throws IllegalArgumentException @@ -150,7 +150,7 @@ private RefSpec(final RefSpec p) { /** * Check if this specification wants to forcefully update the destination. - * + * * @return true if this specification asks for updates without merge tests. */ public boolean isForceUpdate() { @@ -159,7 +159,7 @@ public boolean isForceUpdate() { /** * Create a new RefSpec with a different force update setting. - * + * * @param forceUpdate * new value for force update in the returned instance. * @return a new RefSpec with force update as specified. @@ -176,7 +176,7 @@ public RefSpec setForceUpdate(final boolean forceUpdate) { * If this is a wildcard pattern then the source and destination names * returned by {@link #getSource()} and {@link #getDestination()} will not * be actual ref names, but instead will be patterns. - * + * * @return true if this specification could match more than one ref. */ public boolean isWildcard() { @@ -189,7 +189,7 @@ public boolean isWildcard() { * During a fetch this is the name of the ref on the remote repository we * are fetching from. During a push this is the name of the ref on the local * repository we are pushing out from. - * + * * @return name (or wildcard pattern) to match the source ref. */ public String getSource() { @@ -198,7 +198,7 @@ public String getSource() { /** * Create a new RefSpec with a different source name setting. - * + * * @param source * new value for source in the returned instance. * @return a new RefSpec with source as specified. @@ -228,7 +228,7 @@ public RefSpec setSource(final String source) { * ObjectId should be stored transiently in order to prepare a merge. *

    * If null during a push, use {@link #getSource()} instead. - * + * * @return name (or wildcard) pattern to match the destination ref. */ public String getDestination() { @@ -237,7 +237,7 @@ public String getDestination() { /** * Create a new RefSpec with a different destination name setting. - * + * * @param destination * new value for destination in the returned instance. * @return a new RefSpec with destination as specified. @@ -258,7 +258,7 @@ public RefSpec setDestination(final String destination) { /** * Create a new RefSpec with a different source/destination name setting. - * + * * @param source * new value for source in the returned instance. * @param destination @@ -292,7 +292,7 @@ public boolean matchSource(final String r) { /** * Does this specification's source description match the ref? - * + * * @param r * ref whose name should be tested. * @return true if the names match; false otherwise. @@ -314,7 +314,7 @@ public boolean matchDestination(final String r) { /** * Does this specification's destination description match the ref? - * + * * @param r * ref whose name should be tested. * @return true if the names match; false otherwise. @@ -354,7 +354,7 @@ private RefSpec expandFromSourceImp(final String name) { *

    * Callers must first verify the passed ref matches this specification, * otherwise expansion results may be unpredictable. - * + * * @param r * a ref that matched our source specification. Could be a * wildcard also. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteConfig.java index f05b8c6a3..28e1cd967 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteConfig.java @@ -141,7 +141,7 @@ public static List getAllRemoteConfigs(final Config rc) * This constructor succeeds even if the requested remote is not defined * within the supplied configuration file. If that occurs then there will be * no URIs and no ref specifications known to the new instance. - * + * * @param rc * the existing configuration to get the remote settings from. * The configuration must already be loaded into memory. @@ -195,7 +195,7 @@ public RemoteConfig(final Config rc, final String remoteName) /** * Update this remote's definition within the configuration. - * + * * @param rc * the configuration file to store ourselves into. */ @@ -259,7 +259,7 @@ private void unset(final Config rc, final String key) { /** * Get the local name this remote configuration is recognized as. - * + * * @return name assigned by the user to this configuration block. */ public String getName() { @@ -268,7 +268,7 @@ public String getName() { /** * Get all configured URIs under this remote. - * + * * @return the set of URIs known to this remote. */ public List getURIs() { @@ -277,7 +277,7 @@ public List getURIs() { /** * Add a new URI to the end of the list of URIs. - * + * * @param toAdd * the new URI to add to this remote. * @return true if the URI was added; false if it already exists. @@ -290,7 +290,7 @@ public boolean addURI(final URIish toAdd) { /** * Remove a URI from the list of URIs. - * + * * @param toRemove * the URI to remove from this remote. * @return true if the URI was added; false if it already exists. @@ -334,7 +334,7 @@ public boolean removePushURI(final URIish toRemove) { /** * Remembered specifications for fetching from a repository. - * + * * @return set of specs used by default when fetching. */ public List getFetchRefSpecs() { @@ -343,7 +343,7 @@ public List getFetchRefSpecs() { /** * Add a new fetch RefSpec to this remote. - * + * * @param s * the new specification to add. * @return true if the specification was added; false if it already exists. @@ -380,7 +380,7 @@ public void setPushRefSpecs(final List specs) { /** * Remove a fetch RefSpec from this remote. - * + * * @param s * the specification to remove. * @return true if the specification existed and was removed. @@ -391,7 +391,7 @@ public boolean removeFetchRefSpec(final RefSpec s) { /** * Remembered specifications for pushing to a repository. - * + * * @return set of specs used by default when pushing. */ public List getPushRefSpecs() { @@ -400,7 +400,7 @@ public List getPushRefSpecs() { /** * Add a new push RefSpec to this remote. - * + * * @param s * the new specification to add. * @return true if the specification was added; false if it already exists. @@ -413,7 +413,7 @@ public boolean addPushRefSpec(final RefSpec s) { /** * Remove a push RefSpec from this remote. - * + * * @param s * the specification to remove. * @return true if the specification existed and was removed. @@ -428,7 +428,7 @@ public boolean removePushRefSpec(final RefSpec s) { * This value is only useful for an SSH style connection, where Git is * asking the remote system to execute a program that provides the necessary * network protocol. - * + * * @return location of 'git-upload-pack' on the remote system. If no * location has been configured the default of 'git-upload-pack' is * returned instead. @@ -443,7 +443,7 @@ public String getUploadPack() { * This value is only useful for an SSH style connection, where Git is * asking the remote system to execute a program that provides the necessary * network protocol. - * + * * @return location of 'git-receive-pack' on the remote system. If no * location has been configured the default of 'git-receive-pack' is * returned instead. @@ -454,7 +454,7 @@ public String getReceivePack() { /** * Get the description of how annotated tags should be treated during fetch. - * + * * @return option indicating the behavior of annotated tags in fetch. */ public TagOpt getTagOpt() { @@ -463,7 +463,7 @@ public TagOpt getTagOpt() { /** * Set the description of how annotated tags should be treated on fetch. - * + * * @param option * method to use when handling annotated tags. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandInputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandInputStream.java index 7a0765030..7d7b0191f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandInputStream.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandInputStream.java @@ -68,7 +68,7 @@ *

    * Channel 3 results in an exception being thrown, as the remote side has issued * an unrecoverable error. - * + * * @see PacketLineIn#sideband(ProgressMonitor) */ class SideBandInputStream extends InputStream { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java index 76bf6c1dc..810b04ce4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java @@ -66,7 +66,7 @@ public abstract class SshSessionFactory { *

    * A factory is always available. By default the factory will read from the * user's $HOME/.ssh and assume OpenSSH compatibility. - * + * * @return factory the current factory for this JVM. */ public static SshSessionFactory getInstance() { @@ -75,7 +75,7 @@ public static SshSessionFactory getInstance() { /** * Change the JVM-wide factory to a different implementation. - * + * * @param newFactory * factory for future sessions to be created through. If null the * default factory will be restored.s @@ -95,7 +95,7 @@ public static void setInstance(final SshSessionFactory newFactory) { *

    * The caller must connect the session by invoking connect() * if it has not already been connected. - * + * * @param user * username to authenticate as. If null a reasonable default must * be selected by the implementation. This may be @@ -118,7 +118,7 @@ public abstract Session getSession(String user, String pass, String host, /** * Close (or recycle) a session to a host. - * + * * @param session * a session previously obtained from this factory's * {@link #getSession(String,String, String, int)} method.s diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TagOpt.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TagOpt.java index 09cd56a72..66f36a0d2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TagOpt.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TagOpt.java @@ -84,7 +84,7 @@ private TagOpt(final String o) { /** * Get the command line/configuration file text for this value. - * + * * @return text that appears in the configuration file to activate this. */ public String option() { @@ -93,7 +93,7 @@ public String option() { /** * Convert a command line/configuration file text into a value instance. - * + * * @param o * the configuration file text value. * @return the option that matches the passed parameter. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TrackingRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TrackingRefUpdate.java index 2655f39f0..03ecd81e0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TrackingRefUpdate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TrackingRefUpdate.java @@ -80,7 +80,7 @@ public class TrackingRefUpdate { * Get the name of the remote ref. *

    * Usually this is of the form "refs/heads/master". - * + * * @return the name used within the remote repository. */ public String getRemoteName() { @@ -91,7 +91,7 @@ public String getRemoteName() { * Get the name of the local tracking ref. *

    * Usually this is of the form "refs/remotes/origin/master". - * + * * @return the name used within this local repository. */ public String getLocalName() { @@ -100,7 +100,7 @@ public String getLocalName() { /** * Get the new value the ref will be (or was) updated to. - * + * * @return new value. Null if the caller has not configured it. */ public ObjectId getNewObjectId() { @@ -114,7 +114,7 @@ public ObjectId getNewObjectId() { * populated with the value of the ref before the lock is taken, but the old * value may change if someone else modified the ref between the time we * last read it and when the ref was locked for update. - * + * * @return the value of the ref prior to the update being attempted; null if * the updated has not been attempted yet. */ @@ -124,7 +124,7 @@ public ObjectId getOldObjectId() { /** * Get the status of this update. - * + * * @return the status of the update. */ public Result getResult() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java index e63afaf08..d6400963a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java @@ -91,7 +91,7 @@ public enum Operation { * Open a new transport instance to connect two repositories. *

    * This method assumes {@link Operation#FETCH}. - * + * * @param local * existing local repository. * @param remote @@ -197,7 +197,7 @@ public static List openAll(final Repository local, * Open a new transport instance to connect two repositories. *

    * This method assumes {@link Operation#FETCH}. - * + * * @param local * existing local repository. * @param cfg @@ -319,7 +319,7 @@ private static boolean doesNotExist(final RemoteConfig cfg) { /** * Open a new transport instance to connect two repositories. - * + * * @param local * existing local repository. * @param remote @@ -520,7 +520,7 @@ private static String findTrackingRefName(final String remoteName, /** * Create a new transport instance. - * + * * @param local * the repository this instance will fetch into, or push out of. * This must be the repository passed to @@ -540,7 +540,7 @@ protected Transport(final Repository local, final URIish uri) { * Get the URI this transport connects to. *

    * Each transport instance connects to at most one URI at any point in time. - * + * * @return the URI describing the location of the remote repository. */ public URIish getURI() { @@ -549,7 +549,7 @@ public URIish getURI() { /** * Get the name of the remote executable providing upload-pack service. - * + * * @return typically "git-upload-pack". */ public String getOptionUploadPack() { @@ -558,7 +558,7 @@ public String getOptionUploadPack() { /** * Set the name of the remote executable providing upload-pack services. - * + * * @param where * name of the executable. */ @@ -571,7 +571,7 @@ public void setOptionUploadPack(final String where) { /** * Get the description of how annotated tags should be treated during fetch. - * + * * @return option indicating the behavior of annotated tags in fetch. */ public TagOpt getTagOpt() { @@ -580,7 +580,7 @@ public TagOpt getTagOpt() { /** * Set the description of how annotated tags should be treated on fetch. - * + * * @param option * method to use when handling annotated tags. */ @@ -762,7 +762,7 @@ public void setTimeout(final int seconds) { * tracking refs associated with the remote repository are automatically * updated if this transport was created from a {@link RemoteConfig} with * fetch RefSpecs defined. - * + * * @param monitor * progress monitor to inform the user about our processing * activity. Must not be null. Use {@link NullProgressMonitor} if @@ -898,7 +898,7 @@ public Collection findRemoteRefUpdatesFor( /** * Begins a new connection for fetching from the remote repository. - * + * * @return a fresh connection to fetch from the remote repository. * @throws NotSupportedException * the implementation does not support fetching. @@ -910,7 +910,7 @@ public abstract FetchConnection openFetch() throws NotSupportedException, /** * Begins a new connection for pushing into the remote repository. - * + * * @return a fresh connection to push into the remote repository. * @throws NotSupportedException * the implementation does not support pushing. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java index 65686b9d4..6665ba42f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java @@ -72,7 +72,7 @@ * (server side) repository. Object files are retrieved directly through * standard HTTP GET requests, making it easy to serve a Git repository through * a standard web host provider that does not offer specific support for Git. - * + * * @see WalkFetchConnection */ public class TransportHttp extends HttpTransport implements WalkTransport { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java index 8243ddabb..617cca890 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java @@ -87,7 +87,7 @@ *

    * Concurrent pushing over this transport is not supported. Multiple concurrent * push operations may cause confusion in the repository state. - * + * * @see WalkFetchConnection */ public class TransportSftp extends SshTransport implements WalkTransport { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java index cfdf47c0c..e1df85248 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java @@ -76,7 +76,7 @@ public class URIish { /** * Parse and construct an {@link URIish} from a string - * + * * @param s * @throws URISyntaxException */ @@ -159,7 +159,7 @@ public String getHost() { /** * Return a new URI matching this one, but with a different host. - * + * * @param n * the new value for host. * @return a new URI with the updated value. @@ -179,7 +179,7 @@ public String getScheme() { /** * Return a new URI matching this one, but with a different scheme. - * + * * @param n * the new value for scheme. * @return a new URI with the updated value. @@ -199,7 +199,7 @@ public String getPath() { /** * Return a new URI matching this one, but with a different path. - * + * * @param n * the new value for path. * @return a new URI with the updated value. @@ -219,7 +219,7 @@ public String getUser() { /** * Return a new URI matching this one, but with a different user. - * + * * @param n * the new value for user. * @return a new URI with the updated value. @@ -239,7 +239,7 @@ public String getPass() { /** * Return a new URI matching this one, but with a different password. - * + * * @param n * the new value for password. * @return a new URI with the updated value. @@ -259,7 +259,7 @@ public int getPort() { /** * Return a new URI matching this one, but with a different port. - * + * * @param n * the new value for port. * @return a new URI with the updated value. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java index 8660a195d..ba4486144 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java @@ -102,7 +102,7 @@ * Instead it delegates the transfer to a {@link WalkRemoteObjectDatabase}, * which knows how to read individual files from the remote repository and * supply the data as a standard Java InputStream. - * + * * @see WalkRemoteObjectDatabase */ class WalkFetchConnection extends BaseFetchConnection { @@ -285,7 +285,7 @@ private void process(final ObjectId id) throws TransportException { switch (obj.getType()) { case Constants.OBJ_BLOB: - processBlob(obj); + processBlob(obj); break; case Constants.OBJ_TREE: processTree(obj); @@ -703,7 +703,7 @@ private void markLocalObjComplete(RevObject obj) throws IOException { case Constants.OBJ_BLOB: obj.add(COMPLETE); break; - case Constants.OBJ_COMMIT: + case Constants.OBJ_COMMIT: pushLocalCommit((RevCommit) obj); break; case Constants.OBJ_TREE: diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java index 6a557dfd3..bfe540c56 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java @@ -90,7 +90,7 @@ abstract class WalkRemoteObjectDatabase { * Pack names should be the file name in the packs directory, that is * pack-035760ab452d6eebd123add421f253ce7682355a.pack. Index * names should not be included in the returned collection. - * + * * @return list of pack names; null or empty list if none are available. * @throws IOException * The connection is unable to read the remote repository's list @@ -108,7 +108,7 @@ abstract class WalkRemoteObjectDatabase { *

    * Alternates may reuse the same network connection handle, however the * fetch connection will {@link #close()} each created alternate. - * + * * @return list of additional object databases the caller could fetch from; * null or empty list if none are configured. * @throws IOException @@ -129,7 +129,7 @@ abstract Collection getAlternates() * Callers such as {@link WalkFetchConnection} are prepared to handle this * by validating the content received, and assuming content that fails to * match its hash is an incorrectly phrased FileNotFoundException. - * + * * @param path * location of the file to read, relative to this objects * directory (e.g. @@ -153,7 +153,7 @@ abstract FileStream open(String path) throws FileNotFoundException, * This method is typically called by {@link #readAlternates(String)} when * subclasses us the generic alternate parsing logic for their * implementation of {@link #getAlternates()}. - * + * * @param location * the location of the new alternate, relative to the current * object database. @@ -344,7 +344,7 @@ void writeInfoPacks(final Collection packNames) throws IOException { *

    * This is shorthand for calling {@link #open(String)} and then wrapping it * in a reader suitable for line oriented files like the alternates list. - * + * * @return a stream to read from the file. Never null. * @param path * location of the file to read, relative to this objects @@ -371,7 +371,7 @@ BufferedReader openReader(final String path) throws IOException { *

    * Alternates appear one per line, with paths expressed relative to this * object database. - * + * * @param listPath * location of the alternate file to read, relative to this * object database (e.g. info/alternates). @@ -466,7 +466,7 @@ static final class FileStream { /** * Create a new stream of unknown length. - * + * * @param i * stream containing the file data. This stream will be * closed by the caller when reading is complete. @@ -478,7 +478,7 @@ static final class FileStream { /** * Create a new stream of known length. - * + * * @param i * stream containing the file data. This stream will be * closed by the caller when reading is complete. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkTransport.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkTransport.java index 8b440041a..f1c435711 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkTransport.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkTransport.java @@ -55,7 +55,7 @@ *

    * WalkTransports are not as efficient as {@link PackTransport} instances, but * can be useful in situations where a pack transport is not acceptable. - * + * * @see WalkFetchConnection */ public interface WalkTransport { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java index 102974f44..90cea0f1b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java @@ -76,7 +76,7 @@ * In the second item, A is the name of a subtree and * c is a file within that subtree. The other two items are files * in the root level tree. - * + * * @see CanonicalTreeParser */ public abstract class AbstractTreeIterator { @@ -104,7 +104,7 @@ public abstract class AbstractTreeIterator { *

    * A numerical value from FileMode is usually faster for an iterator to * obtain from its data source so this is the preferred representation. - * + * * @see org.eclipse.jgit.lib.FileMode */ protected int mode; @@ -212,7 +212,7 @@ protected AbstractTreeIterator(final byte[] prefix) { /** * Create an iterator for a subtree of an existing iterator. - * + * * @param p * parent tree iterator. */ @@ -253,7 +253,7 @@ protected AbstractTreeIterator(final AbstractTreeIterator p, /** * Grow the path buffer larger. - * + * * @param len * number of live bytes in the path buffer. This many bytes will * be moved into the larger buffer. @@ -299,7 +299,7 @@ private void setPathCapacity(int capacity, int len) { /** * Compare the path of this current entry to another iterator's entry. - * + * * @param p * the other iterator to compare the path against. * @return -1 if this entry sorts first; 0 if the entries are equal; 1 if @@ -359,7 +359,7 @@ private static int lastPathChar(final int mode) { * This method is faster than {@link #getEntryObjectId()} as it does not * require copying the bytes out of the buffers. A direct {@link #idBuffer} * compare operation is performed. - * + * * @param otherIterator * the other iterator to test against. * @return true if both iterators have the same object id; false otherwise. @@ -371,7 +371,7 @@ public boolean idEqual(final AbstractTreeIterator otherIterator) { /** * Get the object id of the current entry. - * + * * @return an object id for the current entry. */ public ObjectId getEntryObjectId() { @@ -411,7 +411,7 @@ public String getEntryPathString() { * all entries, or it can be a unique buffer per-entry. Implementations are * encouraged to expose their private buffer whenever possible to reduce * garbage generation and copying costs. - * + * * @return byte array the implementation stores object IDs within. * @see #getEntryObjectId() */ @@ -419,7 +419,7 @@ public String getEntryPathString() { /** * Get the position within {@link #idBuffer()} of this entry's ObjectId. - * + * * @return offset into the array returned by {@link #idBuffer()} where the * ObjectId must be copied out of. */ @@ -431,7 +431,7 @@ public String getEntryPathString() { * The parent reference of the iterator must be this, * otherwise the caller would not be able to exit out of the subtree * iterator correctly and return to continue walking this. - * + * * @param repo * repository to load the tree data from. * @return a new parser that walks over the current subtree. @@ -496,7 +496,7 @@ public AbstractTreeIterator createSubtreeIterator(final Repository repo, * Is this tree iterator at its EOF point (no more entries)? *

    * An iterator is at EOF if there is no current entry. - * + * * @return true if we have walked all entries and have none left. */ public abstract boolean eof(); @@ -540,7 +540,7 @@ public AbstractTreeIterator createSubtreeIterator(final Repository repo, * as well as any implementation dependent information necessary to * accurately return data from {@link #idBuffer()} and {@link #idOffset()} * when demanded. - * + * * @param delta * number of entries to move the iterator by. Must be a positive, * non-zero integer. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/CanonicalTreeParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/CanonicalTreeParser.java index 6705ad992..8a202035a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/CanonicalTreeParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/CanonicalTreeParser.java @@ -114,7 +114,7 @@ private CanonicalTreeParser(final CanonicalTreeParser p) { /** * Reset this parser to walk through the given tree data. - * + * * @param treeData * the raw tree content. */ @@ -128,7 +128,7 @@ public void reset(final byte[] treeData) { /** * Reset this parser to walk through the given tree. - * + * * @param repo * repository to load the tree data from. * @param id diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java index 3ef050e7c..10bb539a2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java @@ -67,7 +67,7 @@ public class FileTreeIterator extends WorkingTreeIterator { /** * Create a new iterator to traverse the given directory and its children. - * + * * @param root * the starting directory. This directory should correspond to * the root of the repository. @@ -79,7 +79,7 @@ public FileTreeIterator(final File root) { /** * Create a new iterator to traverse a subdirectory. - * + * * @param p * the parent iterator we were created from. * @param root diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java index 245bea8dc..25ab78ef0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java @@ -90,7 +90,7 @@ public class TreeWalk { * The returned tree walk is already positioned on the requested path, so * the caller should not need to invoke {@link #next()} unless they are * looking for a possible directory/file name conflict. - * + * * @param db * repository to read tree object data from. * @param path @@ -126,7 +126,7 @@ public static TreeWalk forPath(final Repository db, final String path, * The returned tree walk is already positioned on the requested path, so * the caller should not need to invoke {@link #next()} unless they are * looking for a possible directory/file name conflict. - * + * * @param db * repository to read tree object data from. * @param path @@ -175,7 +175,7 @@ public static TreeWalk forPath(final Repository db, final String path, /** * Create a new tree walker for a given repository. - * + * * @param repo * the repository the walker will obtain data from. */ @@ -187,7 +187,7 @@ public TreeWalk(final Repository repo) { /** * Get the repository this tree walker is reading from. - * + * * @return the repository configured when the walker was created. */ public Repository getRepository() { @@ -196,7 +196,7 @@ public Repository getRepository() { /** * Get the currently configured filter. - * + * * @return the current filter. Never null as a filter is always needed. */ public TreeFilter getFilter() { @@ -216,7 +216,7 @@ public TreeFilter getFilter() { * filter, unless the filter implementation specifically states it is (and * always will be) thread-safe. Callers may use {@link TreeFilter#clone()} * to create a unique filter tree for this TreeWalk instance. - * + * * @param newFilter * the new filter. If null the special {@link TreeFilter#ALL} * filter will be used instead, as it matches every entry. @@ -232,7 +232,7 @@ public void setFilter(final TreeFilter newFilter) { *

    * If the walker is recursive then the caller will not see a subtree node * and instead will only receive file nodes in all relevant subtrees. - * + * * @return true if automatically entering subtrees is enabled. */ public boolean isRecursive() { @@ -247,7 +247,7 @@ public boolean isRecursive() { * (directory) is deleted then all of the file level nodes will appear to be * deleted, recursively, through as many levels as necessary to account for * all entries. - * + * * @param b * true to skip subtree nodes and only obtain files nodes. */ @@ -334,7 +334,7 @@ public void reset(final AnyObjectId id) throws MissingObjectException, /** * Reset this walker to run over a set of existing trees. - * + * * @param ids * the trees we need to parse. The walker will execute over this * many parallel trees if the reset is successful. @@ -388,7 +388,7 @@ public void reset(final AnyObjectId[] ids) throws MissingObjectException, * has lost track of the order they added the trees into the walker. *

    * The tree must have the same root as existing trees in the walk. - * + * * @param id * identity of the tree object the caller wants walked. * @return position of this tree within the walker. @@ -417,7 +417,7 @@ public int addTree(final ObjectId id) throws MissingObjectException, *

    * The tree which the iterator operates on must have the same root as * existing trees in the walk. - * + * * @param p * an iterator to walk over. The iterator should be new, with no * parent, and should still be positioned before the first entry. @@ -445,7 +445,7 @@ public int addTree(final AbstractTreeIterator p) /** * Get the number of trees known to this walker. - * + * * @return the total number of trees this walker is iterating over. */ public int getTreeCount() { @@ -454,7 +454,7 @@ public int getTreeCount() { /** * Advance this walker to the next relevant entry. - * + * * @return true if there is an entry available; false if all entries have * been walked and the walk of this set of tree iterators is over. * @throws MissingObjectException @@ -547,7 +547,7 @@ public T getTree(final int nth, * Every added tree supplies mode bits, even if the tree does not contain * the current entry. In the latter case {@link FileMode#MISSING}'s mode * bits (0) are returned. - * + * * @param nth * tree to obtain the mode bits from. * @return mode bits for the current entry of the nth tree. @@ -563,7 +563,7 @@ public int getRawMode(final int nth) { *

    * Every added tree supplies a mode, even if the tree does not contain the * current entry. In the latter case {@link FileMode#MISSING} is returned. - * + * * @param nth * tree to obtain the mode from. * @return mode for the current entry of the nth tree. @@ -582,7 +582,7 @@ public FileMode getFileMode(final int nth) { *

    * Every tree supplies an object id, even if the tree does not contain the * current entry. In the latter case {@link ObjectId#zeroId()} is returned. - * + * * @param nth * tree to obtain the object identifier from. * @return object identifier for the current tree entry. @@ -620,7 +620,7 @@ public void getObjectId(final MutableObjectId out, final int nth) { /** * Compare two tree's current ObjectId values for equality. - * + * * @param nthA * first tree to compare the object id from. * @param nthB @@ -670,7 +670,7 @@ public String getNameString() { * and final output generation. Applications should try to avoid calling it, * and if invoked do so only once per interesting entry, where the name is * absolutely required for correct function. - * + * * @return complete path of the current entry, from the root of the * repository. If the current entry is in a subtree there will be at * least one '/' in the returned string. @@ -702,7 +702,7 @@ public byte[] getRawPath() { * method then to use {@link #getPathString()} to first create a String * object, then test startsWith or some other type of string * match function. - * + * * @param p * path buffer to test. Callers should ensure the path does not * end with '/' prior to invocation. @@ -791,7 +791,7 @@ public int getDepth() { * This method is faster then testing the raw mode bits of all trees to see * if any of them are a subtree. If at least one is a subtree then this * method will return true. - * + * * @return true if {@link #enterSubtree()} will work on the current node. */ public boolean isSubtree() { @@ -814,7 +814,7 @@ public boolean isPostChildren() { *

    * If the current entry is a subtree this method arranges for its children * to be returned before the next sibling following the subtree is returned. - * + * * @throws MissingObjectException * a subtree was found, but the subtree object does not exist in * this repository. The repository may be missing objects. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java index 18ceef8d9..0c6786bcd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -65,7 +65,7 @@ * java.io package. Plugins for a Java based IDE may however wish * to create their own implementations of this class to allow traversal of the * IDE's project space, as well as benefit from any caching the IDE may have. - * + * * @see FileTreeIterator */ public abstract class WorkingTreeIterator extends AbstractTreeIterator { @@ -127,7 +127,7 @@ protected WorkingTreeIterator(final String prefix) { /** * Create an iterator for a subtree of an existing iterator. - * + * * @param p * parent tree iterator. */ @@ -354,7 +354,7 @@ protected void init(final Entry[] list) { /** * Obtain the current entry from this iterator. - * + * * @return the currently selected entry. */ protected Entry current() { @@ -395,7 +395,7 @@ public String toString() { * The implementation of this method must be efficient. If a subclass * needs to compute the value they should cache the reference within an * instance member instead. - * + * * @return a file mode constant from {@link FileMode}. */ public abstract FileMode getMode(); @@ -408,7 +408,7 @@ public String toString() { * The implementation of this method must be efficient. If a subclass * needs to compute the value they should cache the reference within an * instance member instead. - * + * * @return size of this file, in bytes. */ public abstract long getLength(); @@ -431,7 +431,7 @@ public String toString() { *

    * Efficient implementations are not required. The caller will obtain * the name only once and cache it once obtained. - * + * * @return name of the entry. */ public abstract String getName(); @@ -447,7 +447,7 @@ public String toString() { * block IO operations. *

    * The caller will close the stream once complete. - * + * * @return a stream to read from the file. * @throws IOException * the file could not be opened for reading. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/AndTreeFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/AndTreeFilter.java index 2c3983b01..7ba6af5fc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/AndTreeFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/AndTreeFilter.java @@ -62,7 +62,7 @@ public abstract class AndTreeFilter extends TreeFilter { /** * Create a filter with two filters, both of which must match. - * + * * @param a * first filter to test. * @param b @@ -79,7 +79,7 @@ public static TreeFilter create(final TreeFilter a, final TreeFilter b) { /** * Create a filter around many filters, all of which must match. - * + * * @param list * list of filters to match against. Must contain at least 2 * filters. @@ -97,7 +97,7 @@ public static TreeFilter create(final TreeFilter[] list) { /** * Create a filter around many filters, all of which must match. - * + * * @param list * list of filters to match against. Must contain at least 2 * filters. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/NotTreeFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/NotTreeFilter.java index 33e4415a9..717e8e1d0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/NotTreeFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/NotTreeFilter.java @@ -54,7 +54,7 @@ public class NotTreeFilter extends TreeFilter { /** * Create a filter that negates the result of another filter. - * + * * @param a * filter to negate. * @return a filter that does the reverse of a. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/OrTreeFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/OrTreeFilter.java index 55005446e..455031fc1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/OrTreeFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/OrTreeFilter.java @@ -62,7 +62,7 @@ public abstract class OrTreeFilter extends TreeFilter { /** * Create a filter with two filters, one of which must match. - * + * * @param a * first filter to test. * @param b @@ -77,7 +77,7 @@ public static TreeFilter create(final TreeFilter a, final TreeFilter b) { /** * Create a filter around many filters, one of which must match. - * + * * @param list * list of filters to match against. Must contain at least 2 * filters. @@ -95,7 +95,7 @@ public static TreeFilter create(final TreeFilter[] list) { /** * Create a filter around many filters, one of which must match. - * + * * @param list * list of filters to match against. Must contain at least 2 * filters. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java index 5883d655e..65451da8e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java @@ -63,7 +63,7 @@ public class PathFilter extends TreeFilter { * caller must prepend the subdirectory's path prior to creating the filter. *

    * Path strings use '/' to delimit directories on all platforms. - * + * * @param path * the path to filter on. Must not be the empty string. All * trailing '/' characters will be trimmed before string's length diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilterGroup.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilterGroup.java index cd11f8123..ced799b74 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilterGroup.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilterGroup.java @@ -75,7 +75,7 @@ public class PathFilterGroup { * Paths may appear in any order within the collection. Sorting may be done * internally when the group is constructed if doing so will improve path * matching performance. - * + * * @param paths * the paths to test against. Must have at least one entry. * @return a new filter for the list of paths supplied. @@ -96,7 +96,7 @@ public static TreeFilter createFromStrings(final Collection paths) { * Paths may appear in any order within the collection. Sorting may be done * internally when the group is constructed if doing so will improve path * matching performance. - * + * * @param paths * the paths to test against. Must have at least one entry. * @return a new filter for the list of paths supplied. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/TreeFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/TreeFilter.java index 5d0fb12f5..50421fe7a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/TreeFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/TreeFilter.java @@ -61,19 +61,19 @@ * their instances during {@link #include(TreeWalk)} if it is beneficial to * their implementation. Deep clones created by {@link #clone()} may be used to * construct a thread-safe copy of an existing filter. - * + * *

    * Path filters: *

      *
    • Matching pathname: {@link PathFilter}
      • *
    - * + * *

    * Difference filters: *

      *
    • Only select differences: {@link #ANY_DIFF}.
      • *
    - * + * *

    * Boolean modifiers: *

      @@ -153,7 +153,7 @@ public String toString() { /** * Create a new filter that does the opposite of this filter. - * + * * @return a new filter that includes tree entries this filter rejects. */ public TreeFilter negate() { @@ -167,7 +167,7 @@ public TreeFilter negate() { * {@link TreeWalk#isRecursive()} is enabled. The consultation allows the * filter to bypass subtree recursion on a case-by-case basis, even when * recursion is enabled at the application level. - * + * * @param walker * the walker the filter needs to examine. * @return true if the current entry should be seen by the application; @@ -196,7 +196,7 @@ public abstract boolean include(TreeWalk walker) * is looking for a '/' then the filter would require a recursive TreeWalk * to accurately make its decisions. The walker is not required to enable * recursive behavior for any particular filter, this is only a hint. - * + * * @return true if the filter would like to have the walker recurse into * subtrees to make sure it matches everything correctly; false if * the filter does not require entering subtrees. @@ -208,7 +208,7 @@ public abstract boolean include(TreeWalk walker) *

      * This is a deep clone. If this filter embeds objects or other filters it * must also clone those, to ensure the instances do not share mutable data. - * + * * @return another copy of this filter, suitable for another thread. */ public abstract TreeFilter clone(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index a52a6530e..c4f4242f9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -66,7 +66,7 @@ public abstract class FS { /** * Does this operating system and JRE support the execute flag on files? - * + * * @return true if this implementation can provide reasonably accurate * executable bit information; false otherwise. */ @@ -77,7 +77,7 @@ public abstract class FS { *

      * Not all platforms and JREs support executable flags on files. If the * feature is unsupported this method will always return false. - * + * * @param f * abstract path to test. * @return true if the file is believed to be executable by the user. @@ -90,7 +90,7 @@ public abstract class FS { * Not all platforms and JREs support executable flags on files. If the * feature is unsupported this method will always return false and no * changes will be made to the file specified. - * + * * @param f * path to modify the executable status of. * @param canExec @@ -109,7 +109,7 @@ public abstract class FS { *

      * Not all platforms and JREs require path name translation. Currently only * Cygwin on Win32 require translation for Cygwin based paths. - * + * * @param dir * directory relative to which the path name is. * @param name @@ -131,7 +131,7 @@ public static File resolve(final File dir, final String name) { *

      * Not all platforms and JREs require path name translation. Currently only * Cygwin on Win32 require translation for Cygwin based paths. - * + * * @param dir * directory relative to which the path name is. * @param name @@ -154,7 +154,7 @@ protected File resolveImpl(final File dir, final String name) { *

      * Not all platforms and JREs require path name translation. Currently only * Cygwin on Win32 requires translation of the Cygwin HOME directory. - * + * * @return the user's home directory; null if the user does not have one. */ public static File userHome() { @@ -167,7 +167,7 @@ private static class USER_HOME { /** * Determine the user's home directory (location where preferences are). - * + * * @return the user's home directory; null if the user does not have one. */ protected File userHomeImpl() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java index 79bf1e82e..c86f3e1e4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java @@ -71,4 +71,4 @@ public boolean canExecute(final File f) { public boolean setExecute(final File f, final boolean canExec) { return false; } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/NB.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/NB.java index a42871dbc..030e127f7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/NB.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/NB.java @@ -106,7 +106,7 @@ public static final byte[] readFully(final File path, final int max) /** * Read the entire byte array into memory, or throw an exception. - * + * * @param fd * input stream to read the data from. * @param dst @@ -194,7 +194,7 @@ public static void skipFully(final InputStream fd, long toSkip) * This function performs an unsigned compare operation, even though Java * does not natively support unsigned integer values. Negative numbers are * treated as larger than positive ones. - * + * * @param a * the first value to compare. * @param b @@ -226,7 +226,7 @@ public static int decodeUInt16(final byte[] intbuf, final int offset) { /** * Convert sequence of 4 bytes (network byte order) into signed value. - * + * * @param intbuf * buffer to acquire the 4 bytes of data from. * @param offset @@ -247,7 +247,7 @@ public static int decodeInt32(final byte[] intbuf, final int offset) { /** * Convert sequence of 4 bytes (network byte order) into unsigned value. - * + * * @param intbuf * buffer to acquire the 4 bytes of data from. * @param offset @@ -267,7 +267,7 @@ public static long decodeUInt32(final byte[] intbuf, final int offset) { /** * Convert sequence of 8 bytes (network byte order) into unsigned value. - * + * * @param intbuf * buffer to acquire the 8 bytes of data from. * @param offset @@ -302,7 +302,7 @@ public static void encodeInt16(final byte[] intbuf, final int offset, int v) { /** * Write a 32 bit integer as a sequence of 4 bytes (network byte order). - * + * * @param intbuf * buffer to write the 4 bytes of data into. * @param offset diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawCharSequence.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawCharSequence.java index c89705cb6..4eeecdbf2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawCharSequence.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawCharSequence.java @@ -94,4 +94,4 @@ public String toString() { b.append(charAt(i)); return b.toString(); } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java index 9254eb3d7..ca6188692 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java @@ -126,7 +126,7 @@ public static final int match(final byte[] b, int ptr, final byte[] src) { * The argument and return values from this method make it easy to chain * writing, for example: *

      - * + * * 
       	 * final byte[] tmp = new byte[64];
 	 * int ptr = tmp.length;
@@ -137,7 +137,7 @@ public static final int match(final byte[] b, int ptr, final byte[] src) {
 	 * tmp[--ptr] = 0;
 	 * final String str = new String(tmp, ptr, tmp.length - ptr);
 	 *
      - * + * * @param b * buffer to write into. * @param o @@ -171,7 +171,7 @@ public static int formatBase10(final byte[] b, int o, int value) { * sequence, and may start with a '+' or a '-' to indicate sign position. * Any other characters will cause the method to stop and return the current * result to the caller. - * + * * @param b * buffer to scan. * @param ptr @@ -225,7 +225,7 @@ public static final int parseBase10(final byte[] b, int ptr, * sequence, and may start with a '+' or a '-' to indicate sign position. * Any other characters will cause the method to stop and return the current * result to the caller. - * + * * @param b * buffer to scan. * @param ptr @@ -364,7 +364,7 @@ public static final int parseHexInt4(final byte digit) { *

      * The sequence "-0315" will be parsed as the numeric value -195, as the * lower two positions count minutes, not 100ths of an hour. - * + * * @param b * buffer to scan. * @param ptr @@ -380,7 +380,7 @@ public static final int parseTimeZoneOffset(final byte[] b, int ptr) { /** * Locate the first position after a given character. - * + * * @param b * buffer to scan. * @param ptr @@ -417,7 +417,7 @@ public static final int nextLF(final byte[] b, int ptr) { * Locate the first position after either the given character or LF. *

      * This method stops on the first match it finds from either chrA or '\n'. - * + * * @param b * buffer to scan. * @param ptr @@ -534,7 +534,7 @@ public static final IntList lineMap(final byte[] buf, int ptr, int end) { /** * Locate the "author " header line data. - * + * * @param b * buffer to scan. * @param ptr @@ -556,7 +556,7 @@ public static final int author(final byte[] b, int ptr) { /** * Locate the "committer " header line data. - * + * * @param b * buffer to scan. * @param ptr @@ -608,7 +608,7 @@ public static final int tagger(final byte[] b, int ptr) { /** * Locate the "encoding " header line. - * + * * @param b * buffer to scan. * @param ptr @@ -639,7 +639,7 @@ public static final int encoding(final byte[] b, int ptr) { * to apply to this buffer to evaluate its contents as character data. *

      * If no encoding header is present, {@link Constants#CHARSET} is assumed. - * + * * @param b * buffer to scan. * @return the Java character set representation. Never null. @@ -659,7 +659,7 @@ public static Charset parseEncoding(final byte[] b) { * return value of {@link #author(byte[], int)} or * {@link #committer(byte[], int)}, as these methods provide the proper * position within the buffer. - * + * * @param raw * the buffer to parse character data from. * @param nameB @@ -768,7 +768,7 @@ public static int endOfFooterLineKey(final byte[] raw, int ptr) { * * If the byte stream cannot be decoded that way, the platform default is tried * and if that too fails, the fail-safe ISO-8859-1 encoding is tried. - * + * * @param buffer * buffer to pull raw bytes from. * @return a string representation of the range [start,end), @@ -804,7 +804,7 @@ public static String decode(final byte[] buffer, final int start, * * If the byte stream cannot be decoded that way, the platform default is tried * and if that too fails, the fail-safe ISO-8859-1 encoding is tried. - * + * * @param cs * character set to use when decoding the buffer. * @param buffer @@ -821,7 +821,7 @@ public static String decode(final Charset cs, final byte[] buffer) { * * If the byte stream cannot be decoded that way, the platform default is tried * and if that too fails, the fail-safe ISO-8859-1 encoding is tried. - * + * * @param cs * character set to use when decoding the buffer. * @param buffer @@ -942,7 +942,7 @@ private static String decode(final ByteBuffer b, final Charset charset) /** * Locate the position of the commit message body. - * + * * @param b * buffer to scan. * @param ptr @@ -990,7 +990,7 @@ public static final int tagMessage(final byte[] b, int ptr) { * Locate the end of a paragraph. *

      * A paragraph is ended by two consecutive LF bytes. - * + * * @param b * buffer to scan. * @param start diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawSubStringPattern.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawSubStringPattern.java index ae135afab..67d67b90c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawSubStringPattern.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawSubStringPattern.java @@ -59,7 +59,7 @@ public class RawSubStringPattern { /** * Construct a new substring pattern. - * + * * @param patternText * text to locate. This should be a literal string, as no * meta-characters are supported by this implementation. The @@ -78,7 +78,7 @@ public RawSubStringPattern(final String patternText) { /** * Match a character sequence against this pattern. - * + * * @param rcs * the sequence to match. Must not be null but the length of the * sequence is permitted to be 0. @@ -123,7 +123,7 @@ private static final byte lc(final byte q) { /** * Get the literal pattern string this instance searches for. - * + * * @return the pattern string given to our constructor. */ public String pattern() {