diff options
author | David Pursehouse <david.pursehouse@gmail.com> | 2018-11-05 18:24:08 -0500 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2018-11-05 18:24:08 -0500 |
commit | 1cee6c7d51b72c756f597cb8cfb59b1a91116b99 (patch) | |
tree | 5bd4e7e203b75104264d257903b3961cef55b43a | |
parent | 797a5b7a8fa6e0ce551e572c0ce1d145ed64a2c4 (diff) | |
parent | f8d2738ff4a7da5252946fd1e117eede394f4441 (diff) | |
download | jgit-1cee6c7d51b72c756f597cb8cfb59b1a91116b99.tar.gz jgit-1cee6c7d51b72c756f597cb8cfb59b1a91116b99.zip |
Merge changes I91883560,I1b12a976
* changes:
Fix package exports in org.eclipse.jgit MANIFEST.MF
TransportSftp: remove final modifiers from parameters
-rw-r--r-- | org.eclipse.jgit/META-INF/MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 2b9ed0845b..1a10ce78ab 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -62,6 +62,7 @@ Export-Package: org.eclipse.jgit.annotations;version="5.2.0", org.eclipse.jgit.internal;version="5.2.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", org.eclipse.jgit.internal.fsck;version="5.2.0";x-friends:="org.eclipse.jgit.test", org.eclipse.jgit.internal.ketch;version="5.2.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.revwalk;version="5.2.0";x-internal:=true, org.eclipse.jgit.internal.storage.dfs;version="5.2.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, @@ -80,7 +81,8 @@ Export-Package: org.eclipse.jgit.annotations;version="5.2.0", org.eclipse.jgit.internal.storage.reftable;version="5.2.0"; x-friends:="org.eclipse.jgit.http.test,org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", org.eclipse.jgit.internal.storage.reftree;version="5.2.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.transport.parser;version="5.2.0", + org.eclipse.jgit.internal.submodule;version="5.2.0";x-internal:=true, + org.eclipse.jgit.internal.transport.parser;version="5.2.0";x-friends:="org.eclipse.jgit.test", org.eclipse.jgit.lib;version="5.2.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, 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 f129ba34da..e040e0c1cc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java @@ -323,9 +323,8 @@ public class TransportSftp extends SshTransport implements WalkTransport { } @Override - OutputStream writeFile(final String path, - final ProgressMonitor monitor, final String monitorTask) - throws IOException { + OutputStream writeFile(String path, ProgressMonitor monitor, + String monitorTask) throws IOException { try { return ftp.put(path); } catch (SftpException je) { @@ -401,9 +400,8 @@ public class TransportSftp extends SshTransport implements WalkTransport { } @SuppressWarnings("unchecked") - private void readLooseRefs(final TreeMap<String, Ref> avail, - final String dir, final String prefix) - throws TransportException { + private void readLooseRefs(TreeMap<String, Ref> avail, String dir, + String prefix) throws TransportException { final Collection<ChannelSftp.LsEntry> list; try { list = ftp.ls(dir); @@ -426,8 +424,8 @@ public class TransportSftp extends SshTransport implements WalkTransport { } } - private Ref readRef(final TreeMap<String, Ref> avail, - final String path, final String name) throws TransportException { + private Ref readRef(TreeMap<String, Ref> avail, String path, + String name) throws TransportException { final String line; try (BufferedReader br = openReader(path)) { line = br.readLine(); |