diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-09-22 01:30:04 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-09-25 22:06:13 +0200 |
| commit | d56ae55c836968e09d1ad887d4180ff6bccc5be7 (patch) | |
| tree | 1a52e1e59f0b10cc5311485a56e56158abe07db5 /org.eclipse.jgit/src/org/eclipse | |
| parent | a7edc7889c6f0a6441bdd5e030125dd795abfd2c (diff) | |
| download | jgit-d56ae55c836968e09d1ad887d4180ff6bccc5be7.tar.gz jgit-d56ae55c836968e09d1ad887d4180ff6bccc5be7.zip | |
[errorprone] Fix BadImport
See https://errorprone.info/bugpattern/BadImport
Change-Id: Iea98b15862ed0bc4bcad759a7240133769680808
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java | 5 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java index 0da58e4a42..f6ab15f9fb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java @@ -26,14 +26,13 @@ import java.util.Set; import java.util.TreeMap; import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.internal.diffmergetool.FileElement.Type; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.lib.internal.BooleanTriState; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.util.FS; -import org.eclipse.jgit.util.StringUtils; import org.eclipse.jgit.util.FS.ExecutionResult; +import org.eclipse.jgit.util.StringUtils; /** * Manages merge tools. @@ -242,7 +241,7 @@ public class MergeTools { FileElement backup = null; Path path = Paths.get(from.getPath()); if (Files.exists(path)) { - backup = new FileElement(from.getPath(), Type.BACKUP); + backup = new FileElement(from.getPath(), FileElement.Type.BACKUP); Files.copy(path, backup.createTempFile(toParentDir).toPath(), StandardCopyOption.REPLACE_EXISTING); } 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 c08b7fa243..3162b89908 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java @@ -95,7 +95,6 @@ import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.lib.SymbolicRef; -import org.eclipse.jgit.transport.HttpAuthMethod.Type; import org.eclipse.jgit.transport.HttpConfig.HttpRedirectMode; import org.eclipse.jgit.transport.http.HttpConnection; import org.eclipse.jgit.transport.http.HttpConnectionFactory; @@ -647,7 +646,7 @@ public class TransportHttp extends HttpTransport implements WalkTransport, } int authAttempts = 1; int redirects = 0; - Collection<Type> ignoreTypes = null; + Collection<HttpAuthMethod.Type> ignoreTypes = null; for (;;) { try { final HttpConnection conn = httpOpen(METHOD_GET, u, AcceptEncoding.GZIP); @@ -1666,7 +1665,8 @@ public class TransportHttp extends HttpTransport implements WalkTransport, } HttpAuthMethod authenticator = null; - Collection<Type> ignoreTypes = EnumSet.noneOf(Type.class); + Collection<HttpAuthMethod.Type> ignoreTypes = EnumSet + .noneOf(HttpAuthMethod.Type.class); // Counts number of repeated authentication attempts using the same // authentication scheme int authAttempts = 1; |