diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-11-18 00:06:01 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-11-24 18:22:07 +0000 |
| commit | ef901e9aea21c51de1ec26ff8265faf657326857 (patch) | |
| tree | b22e391b53a929e3e8465c7428eee51422b9746c /org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java | |
| parent | aab75dba7e63c88ddce92a75b2afa24cc97aeb04 (diff) | |
| download | jgit-ef901e9aea21c51de1ec26ff8265faf657326857.tar.gz jgit-ef901e9aea21c51de1ec26ff8265faf657326857.zip | |
Adapt to type parameter added in commons-compress 1.25.0
In 1.25.0 commons-compress added a generic type parameter to
ArchiveOutputStream to avoid unchecked/unconfirmed type casts in
subclasses.
Change-Id: Ib4c208fc1fb65f73ea57c5bf723fde71b0d6d9f7
Diffstat (limited to 'org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java')
| -rw-r--r-- | org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java index 25cd36817a..4757998a29 100644 --- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java +++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java @@ -15,6 +15,7 @@ import java.io.IOException; import java.text.MessageFormat; import java.util.Map; +import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveOutputStream; import org.eclipse.jgit.archive.internal.ArchiveText; import org.eclipse.jgit.util.StringUtils; @@ -42,7 +43,8 @@ public class BaseFormat { * @throws IOException * if an IO error occurred */ - protected ArchiveOutputStream applyFormatOptions(ArchiveOutputStream s, + protected ArchiveOutputStream<? extends ArchiveEntry> applyFormatOptions( + ArchiveOutputStream<? extends ArchiveEntry> s, Map<String, Object> o) throws IOException { for (Map.Entry<String, Object> p : o.entrySet()) { try { |