aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java
diff options
context:
space:
mode:
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.java5
1 files changed, 4 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 0ebac77228..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;
@@ -40,8 +41,10 @@ public class BaseFormat {
* options map
* @return stream with option applied
* @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 {