Browse Source

Remove deprecated TreeVisitor

This type and its associated methods has been deprecated for a while
now.  Time to remove it.  Applications can use a TreeWalk instead to
access the elements of any tree-like object.

Change-Id: I047e552ac77b77e2de086f63cb4fb318da57c208
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
stable-0.12
Shawn O. Pearce 14 years ago
parent
commit
1f57061684
  1. 9
      org.eclipse.jgit/src/org/eclipse/jgit/lib/FileTreeEntry.java
  2. 75
      org.eclipse.jgit/src/org/eclipse/jgit/lib/ForceModified.java
  3. 11
      org.eclipse.jgit/src/org/eclipse/jgit/lib/GitlinkTreeEntry.java
  4. 11
      org.eclipse.jgit/src/org/eclipse/jgit/lib/SymlinkTreeEntry.java
  5. 27
      org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java
  6. 38
      org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java
  7. 98
      org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeVisitor.java

9
org.eclipse.jgit/src/org/eclipse/jgit/lib/FileTreeEntry.java

@ -103,15 +103,6 @@ public class FileTreeEntry extends TreeEntry {
return getRepository().open(getId(), Constants.OBJ_BLOB);
}
public void accept(final TreeVisitor tv, final int flags)
throws IOException {
if ((MODIFIED_ONLY & flags) == MODIFIED_ONLY && !isModified()) {
return;
}
tv.visitFile(this);
}
public String toString() {
final StringBuilder r = new StringBuilder();
r.append(ObjectId.toString(getId()));

75
org.eclipse.jgit/src/org/eclipse/jgit/lib/ForceModified.java

@ -1,75 +0,0 @@
/*
* Copyright (C) 2009, Jonas Fonseca <fonseca@diku.dk>
* Copyright (C) 2007, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2006-2007, Shawn O. Pearce <spearce@spearce.org>
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
* under the terms of the Eclipse Distribution License v1.0 which
* accompanies this distribution, is reproduced below, and is
* available at http://www.eclipse.org/org/documents/edl-v10.php
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* - Neither the name of the Eclipse Foundation, Inc. nor the
* names of its contributors may be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.eclipse.jgit.lib;
import java.io.IOException;
/**
* Visitor for marking all nodes of a tree as modified.
*/
public class ForceModified implements TreeVisitor {
public void startVisitTree(final Tree t) throws IOException {
t.setModified();
}
public void endVisitTree(final Tree t) throws IOException {
// Nothing to do.
}
public void visitFile(final FileTreeEntry f) throws IOException {
f.setModified();
}
public void visitSymlink(final SymlinkTreeEntry s) throws IOException {
// TODO: handle symlinks. Only problem is that JGit is independent of
// Eclipse
// and Pure Java does not know what to do about symbolic links.
}
public void visitGitlink(GitlinkTreeEntry s) throws IOException {
// TODO: handle gitlinks.
}
}

11
org.eclipse.jgit/src/org/eclipse/jgit/lib/GitlinkTreeEntry.java

@ -45,8 +45,6 @@
package org.eclipse.jgit.lib;
import java.io.IOException;
/**
* A tree entry representing a gitlink entry used for submodules.
*
@ -79,15 +77,6 @@ public class GitlinkTreeEntry extends TreeEntry {
return FileMode.GITLINK;
}
public void accept(final TreeVisitor tv, final int flags)
throws IOException {
if ((MODIFIED_ONLY & flags) == MODIFIED_ONLY && !isModified()) {
return;
}
tv.visitGitlink(this);
}
@Override
public String toString() {
final StringBuilder r = new StringBuilder();

11
org.eclipse.jgit/src/org/eclipse/jgit/lib/SymlinkTreeEntry.java

@ -44,8 +44,6 @@
package org.eclipse.jgit.lib;
import java.io.IOException;
/**
* A tree entry representing a symbolic link.
*
@ -78,15 +76,6 @@ public class SymlinkTreeEntry extends TreeEntry {
return FileMode.SYMLINK;
}
public void accept(final TreeVisitor tv, final int flags)
throws IOException {
if ((MODIFIED_ONLY & flags) == MODIFIED_ONLY && !isModified()) {
return;
}
tv.visitSymlink(this);
}
public String toString() {
final StringBuilder r = new StringBuilder();
r.append(ObjectId.toString(getId()));

27
org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java

@ -501,33 +501,6 @@ public class Tree extends TreeEntry {
return findMember(s,(byte)'/');
}
public void accept(final TreeVisitor tv, final int flags)
throws IOException {
final TreeEntry[] c;
if ((MODIFIED_ONLY & flags) == MODIFIED_ONLY && !isModified())
return;
if ((LOADED_ONLY & flags) == LOADED_ONLY && !isLoaded()) {
tv.startVisitTree(this);
tv.endVisitTree(this);
return;
}
ensureLoaded();
tv.startVisitTree(this);
if ((CONCURRENT_MODIFICATION & flags) == CONCURRENT_MODIFICATION)
c = members();
else
c = contents;
for (int k = 0; k < c.length; k++)
c[k].accept(tv, flags);
tv.endVisitTree(this);
}
private void ensureLoaded() throws IOException, MissingObjectException {
if (!isLoaded()) {
ObjectLoader ldr = db.open(getId(), Constants.OBJ_TREE);

38
org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java

@ -60,21 +60,6 @@ import org.eclipse.jgit.util.RawParseUtils;
*/
@Deprecated
public abstract class TreeEntry implements Comparable {
/**
* a flag for {@link TreeEntry#accept(TreeVisitor, int)} to visit only modified entries
*/
public static final int MODIFIED_ONLY = 1 << 0;
/**
* a flag for {@link TreeEntry#accept(TreeVisitor, int)} to visit only loaded entries
*/
public static final int LOADED_ONLY = 1 << 1;
/**
* a flag for {@link TreeEntry#accept(TreeVisitor, int)} obsolete?
*/
public static final int CONCURRENT_MODIFICATION = 1 << 2;
private byte[] nameUTF8;
private Tree parent;
@ -264,29 +249,6 @@ public abstract class TreeEntry implements Comparable {
return FileMode.TREE.equals(i.getModeBits()) ? '/' : '\0';
}
/**
* See @{link {@link #accept(TreeVisitor, int)}.
*
* @param tv
* @throws IOException
*/
public void accept(final TreeVisitor tv) throws IOException {
accept(tv, 0);
}
/**
* Visit the members of this TreeEntry.
*
* @param tv
* A visitor object doing the work
* @param flags
* Specification for what members to visit. See
* {@link #MODIFIED_ONLY}, {@link #LOADED_ONLY},
* {@link #CONCURRENT_MODIFICATION}.
* @throws IOException
*/
public abstract void accept(TreeVisitor tv, int flags) throws IOException;
/**
* @return mode (type of object)
*/

98
org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeVisitor.java

@ -1,98 +0,0 @@
/*
* Copyright (C) 2009, Jonas Fonseca <fonseca@diku.dk>
* Copyright (C) 2007, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2006-2007, Shawn O. Pearce <spearce@spearce.org>
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
* under the terms of the Eclipse Distribution License v1.0 which
* accompanies this distribution, is reproduced below, and is
* available at http://www.eclipse.org/org/documents/edl-v10.php
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* - Neither the name of the Eclipse Foundation, Inc. nor the
* names of its contributors may be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.eclipse.jgit.lib;
import java.io.IOException;
/**
* A TreeVisitor is invoked depth first for every node in a tree and is expected
* to perform different actions.
*
* @deprecated Use {@link org.eclipse.jgit.treewalk.TreeWalk} instead.
*/
@Deprecated
public interface TreeVisitor {
/**
* Visit to a tree node before child nodes are visited.
*
* @param t
* Tree
* @throws IOException
*/
public void startVisitTree(final Tree t) throws IOException;
/**
* Visit to a tree node. after child nodes have been visited.
*
* @param t Tree
* @throws IOException
*/
public void endVisitTree(final Tree t) throws IOException;
/**
* Visit to a blob.
*
* @param f Blob
* @throws IOException
*/
public void visitFile(final FileTreeEntry f) throws IOException;
/**
* Visit to a symlink.
*
* @param s Symlink entry
* @throws IOException
*/
public void visitSymlink(final SymlinkTreeEntry s) throws IOException;
/**
* Visit to a gitlink.
*
* @param s Gitlink entry
* @throws IOException
*/
public void visitGitlink(final GitlinkTreeEntry s) throws IOException;
}
Loading…
Cancel
Save