summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2011-03-07 12:29:59 -0800
committerShawn O. Pearce <spearce@spearce.org>2011-03-07 12:30:04 -0800
commit1f57061684c83623d7d08be9044fc9cfd7b9fb54 (patch)
treeaa9572376c93a08698e4273475951311c834d95a /org.eclipse.jgit
parent6c3badea7a6e475fabc1cd74f8fd947dea7a81c8 (diff)
downloadjgit-1f57061684c83623d7d08be9044fc9cfd7b9fb54.tar.gz
jgit-1f57061684c83623d7d08be9044fc9cfd7b9fb54.zip
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>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/FileTreeEntry.java9
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/ForceModified.java75
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/GitlinkTreeEntry.java11
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/SymlinkTreeEntry.java11
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java27
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java38
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeVisitor.java98
7 files changed, 0 insertions, 269 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileTreeEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileTreeEntry.java
index 7990956f6b..6811417ee0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileTreeEntry.java
+++ b/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()));
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ForceModified.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ForceModified.java
deleted file mode 100644
index 6e341d604b..0000000000
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ForceModified.java
+++ /dev/null
@@ -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.
- }
-}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitlinkTreeEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitlinkTreeEntry.java
index 82a6daa54c..5837ceb2b5 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitlinkTreeEntry.java
+++ b/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();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/SymlinkTreeEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SymlinkTreeEntry.java
index cbd5a8ca89..e8552a7716 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/SymlinkTreeEntry.java
+++ b/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()));
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 35db026da8..313b09cf2d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java
+++ b/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);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java
index 0f15699cd3..38c33f311a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java
+++ b/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;
@@ -265,29 +250,6 @@ public abstract class TreeEntry implements Comparable {
}
/**
- * 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)
*/
public abstract FileMode getMode();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeVisitor.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeVisitor.java
deleted file mode 100644
index 67a628131c..0000000000
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeVisitor.java
+++ /dev/null
@@ -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;
-}