From fe397ad90fe0490d3534e0f02a0173ddb0e634f6 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Fri, 4 Apr 2014 07:30:15 +0200 Subject: [PATCH] Don't use package private classes when overriding a public interface Change-Id: If8522d4e02254766e3310a70e42badafa5ab9768 Signed-off-by: Robin Rosenberg --- .../eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java | 7 ++++--- .../eclipse/jgit/internal/storage/dfs/DfsRefRename.java | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java index 6784b493a..593aaac15 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java @@ -56,6 +56,7 @@ import org.eclipse.jgit.lib.ObjectIdRef; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.RefRename; +import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.SymbolicRef; import org.eclipse.jgit.revwalk.RevObject; import org.eclipse.jgit.revwalk.RevTag; @@ -211,7 +212,7 @@ public abstract class DfsRefDatabase extends RefDatabase { } @Override - public DfsRefUpdate newUpdate(String refName, boolean detach) + public RefUpdate newUpdate(String refName, boolean detach) throws IOException { boolean detachingSymbolicRef = false; Ref ref = getOneRef(refName); @@ -233,8 +234,8 @@ public abstract class DfsRefDatabase extends RefDatabase { @Override public RefRename newRename(String fromName, String toName) throws IOException { - DfsRefUpdate src = newUpdate(fromName, true); - DfsRefUpdate dst = newUpdate(toName, true); + RefUpdate src = newUpdate(fromName, true); + RefUpdate dst = newUpdate(toName, true); return new DfsRefRename(src, dst); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefRename.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefRename.java index a4cb79155..d9c2bc746 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefRename.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefRename.java @@ -47,10 +47,11 @@ import java.io.IOException; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.RefRename; +import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.RefUpdate.Result; final class DfsRefRename extends RefRename { - DfsRefRename(DfsRefUpdate src, DfsRefUpdate dst) { + DfsRefRename(RefUpdate src, RefUpdate dst) { super(src, dst); }