diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java index 7559ada86..9379f022e 100644 --- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java +++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java @@ -88,15 +88,6 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s, return applyFormatOptions(out, o); } - /** {@inheritDoc} */ - @Deprecated - @Override - public void putEntry(ArchiveOutputStream out, - String path, FileMode mode, ObjectLoader loader) - throws IOException { - putEntry(out, null, path, mode,loader); - } - /** {@inheritDoc} */ @Override public void putEntry(ArchiveOutputStream out, diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java index 2f95f6d74..fa6a7b055 100644 --- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java +++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java @@ -82,15 +82,6 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s, return tarFormat.createArchiveOutputStream(out, o); } - /** {@inheritDoc} */ - @Deprecated - @Override - public void putEntry(ArchiveOutputStream out, - String path, FileMode mode, ObjectLoader loader) - throws IOException { - putEntry(out, null, path, mode,loader); - } - /** {@inheritDoc} */ @Override public void putEntry(ArchiveOutputStream out, diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java index b22a62d07..368b4f246 100644 --- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java +++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java @@ -82,15 +82,6 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s, return tarFormat.createArchiveOutputStream(out, o); } - /** {@inheritDoc} */ - @Deprecated - @Override - public void putEntry(ArchiveOutputStream out, - String path, FileMode mode, ObjectLoader loader) - throws IOException { - putEntry(out, null, path, mode,loader); - } - /** {@inheritDoc} */ @Override public void putEntry(ArchiveOutputStream out, diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java index d23d2b657..36616eda8 100644 --- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java +++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java @@ -82,15 +82,6 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s, return tarFormat.createArchiveOutputStream(out, o); } - /** {@inheritDoc} */ - @Deprecated - @Override - public void putEntry(ArchiveOutputStream out, - String path, FileMode mode, ObjectLoader loader) - throws IOException { - putEntry(out, null, path, mode,loader); - } - /** {@inheritDoc} */ @Override public void putEntry(ArchiveOutputStream out, diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java index dc8fb4457..8483801c9 100644 --- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java +++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java @@ -83,15 +83,6 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s, return applyFormatOptions(new ZipArchiveOutputStream(s), o); } - /** {@inheritDoc} */ - @Deprecated - @Override - public void putEntry(ArchiveOutputStream out, - String path, FileMode mode, ObjectLoader loader) - throws IOException { - putEntry(out, null, path, mode,loader); - } - /** {@inheritDoc} */ @Override public void putEntry(ArchiveOutputStream out, diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java index edab96b97..1300f98d8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java @@ -228,11 +228,6 @@ public MockOutputStream createArchiveOutputStream(OutputStream s, return new MockOutputStream(); } - @Override - public void putEntry(MockOutputStream out, String path, FileMode mode, ObjectLoader loader) { - putEntry(out, null, path, mode, loader); - } - @Override public void putEntry(MockOutputStream out, ObjectId tree, String path, FileMode mode, ObjectLoader loader) { String content = mode != FileMode.TREE ? new String(loader.getBytes()) : null; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java index 10397f8ac..27bb5a90b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java @@ -152,30 +152,6 @@ public static interface Format { T createArchiveOutputStream(OutputStream s, Map o) throws IOException; - /** - * Write an entry to an archive. - * - * @param out - * archive object from createArchiveOutputStream - * @param path - * full filename relative to the root of the archive (with - * trailing '/' for directories) - * @param mode - * mode (for example FileMode.REGULAR_FILE or - * FileMode.SYMLINK) - * @param loader - * blob object with data for this entry (null for - * directories) - * @throws IOException - * thrown by the underlying output stream for I/O errors - * @deprecated use - * {@link #putEntry(Closeable, ObjectId, String, FileMode, ObjectLoader)} - * instead - */ - @Deprecated - void putEntry(T out, String path, FileMode mode, - ObjectLoader loader) throws IOException; - /** * Write an entry to an archive. *