summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2017-12-17 00:01:03 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2017-12-17 20:05:55 +0100
commit32022e9764123c6a8191a6496403cffc5c1fcc48 (patch)
tree17f9d795051574d629b7a2fa96d2a1e41831bcec
parentc7093f5cbe92fbce7242f0be05aa942d9e15be9d (diff)
downloadjgit-32022e9764123c6a8191a6496403cffc5c1fcc48.tar.gz
jgit-32022e9764123c6a8191a6496403cffc5c1fcc48.zip
Fix javadoc in org.eclipse.jgit.archive
Change-Id: Ibef80b15f17e884f3085e324283cefc738236a4d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ArchiveFormats.java8
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/FormatActivator.java10
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java13
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java13
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java13
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java13
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java13
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java2
8 files changed, 45 insertions, 40 deletions
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ArchiveFormats.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ArchiveFormats.java
index 9d3decd933..bf0d88ee5d 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ArchiveFormats.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ArchiveFormats.java
@@ -48,11 +48,11 @@ import java.util.List;
import org.eclipse.jgit.api.ArchiveCommand;
/**
- * Registers all format types from the org.eclipse.jgit.archive
- * package for use via the ArchiveCommand API.
+ * Registers all format types from the org.eclipse.jgit.archive package for use
+ * via the ArchiveCommand API.
*
- * See {@link FormatActivator} for an OSGi bundle activator
- * that performs the same registration automatically.
+ * See {@link org.eclipse.jgit.archive.FormatActivator} for an OSGi bundle
+ * activator that performs the same registration automatically.
*/
public class ArchiveFormats {
private static final List<String> myFormats = new ArrayList<>();
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/FormatActivator.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/FormatActivator.java
index aa4e4f5006..0bb595a224 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/FormatActivator.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/FormatActivator.java
@@ -57,12 +57,11 @@ import org.osgi.framework.BundleContext;
*/
public class FormatActivator implements BundleActivator {
/**
+ * {@inheritDoc}
+ *
* Registers all included archive formats by calling
* {@link ArchiveFormats#registerAll()}. This method is called by the OSGi
* framework when the bundle is started.
- *
- * @param context
- * unused
*/
@Override
public void start(BundleContext context) {
@@ -70,11 +69,10 @@ public class FormatActivator implements BundleActivator {
}
/**
+ * {@inheritDoc}
+ *
* Cleans up after {@link #start(BundleContext)} by calling
* {@link ArchiveFormats#unregisterAll}.
- *
- * @param context
- * unused
*/
@Override
public void stop(BundleContext context) {
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 7b7fbcd83e..7559ada864 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
@@ -70,6 +70,7 @@ public final class TarFormat extends BaseFormat implements
private static final List<String> SUFFIXES = Collections
.unmodifiableList(Arrays.asList(".tar")); //$NON-NLS-1$
+ /** {@inheritDoc} */
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
throws IOException {
@@ -77,9 +78,7 @@ public final class TarFormat extends BaseFormat implements
Collections.<String, Object> emptyMap());
}
- /**
- * @since 4.0
- */
+ /** {@inheritDoc} */
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s,
Map<String, Object> o) throws IOException {
@@ -89,6 +88,7 @@ public final class TarFormat extends BaseFormat implements
return applyFormatOptions(out, o);
}
+ /** {@inheritDoc} */
@Deprecated
@Override
public void putEntry(ArchiveOutputStream out,
@@ -97,9 +97,7 @@ public final class TarFormat extends BaseFormat implements
putEntry(out, null, path, mode,loader);
}
- /**
- * @since 4.7
- */
+ /** {@inheritDoc} */
@Override
public void putEntry(ArchiveOutputStream out,
ObjectId tree, String path, FileMode mode, ObjectLoader loader)
@@ -150,16 +148,19 @@ public final class TarFormat extends BaseFormat implements
out.closeArchiveEntry();
}
+ /** {@inheritDoc} */
@Override
public Iterable<String> suffixes() {
return SUFFIXES;
}
+ /** {@inheritDoc} */
@Override
public boolean equals(Object other) {
return (other instanceof TarFormat);
}
+ /** {@inheritDoc} */
@Override
public int hashCode() {
return getClass().hashCode();
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 5f194ecdfc..2f95f6d74f 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
@@ -66,6 +66,7 @@ public final class Tbz2Format extends BaseFormat implements
private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
+ /** {@inheritDoc} */
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
throws IOException {
@@ -73,9 +74,7 @@ public final class Tbz2Format extends BaseFormat implements
Collections.<String, Object> emptyMap());
}
- /**
- * @since 4.0
- */
+ /** {@inheritDoc} */
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s,
Map<String, Object> o) throws IOException {
@@ -83,6 +82,7 @@ public final class Tbz2Format extends BaseFormat implements
return tarFormat.createArchiveOutputStream(out, o);
}
+ /** {@inheritDoc} */
@Deprecated
@Override
public void putEntry(ArchiveOutputStream out,
@@ -91,9 +91,7 @@ public final class Tbz2Format extends BaseFormat implements
putEntry(out, null, path, mode,loader);
}
- /**
- * @since 4.7
- */
+ /** {@inheritDoc} */
@Override
public void putEntry(ArchiveOutputStream out,
ObjectId tree, String path, FileMode mode, ObjectLoader loader)
@@ -101,16 +99,19 @@ public final class Tbz2Format extends BaseFormat implements
tarFormat.putEntry(out, tree, path, mode, loader);
}
+ /** {@inheritDoc} */
@Override
public Iterable<String> suffixes() {
return SUFFIXES;
}
+ /** {@inheritDoc} */
@Override
public boolean equals(Object other) {
return (other instanceof Tbz2Format);
}
+ /** {@inheritDoc} */
@Override
public int hashCode() {
return getClass().hashCode();
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 a6d053e281..b22a62d07e 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
@@ -66,6 +66,7 @@ public final class TgzFormat extends BaseFormat implements
private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
+ /** {@inheritDoc} */
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
throws IOException {
@@ -73,9 +74,7 @@ public final class TgzFormat extends BaseFormat implements
Collections.<String, Object> emptyMap());
}
- /**
- * @since 4.0
- */
+ /** {@inheritDoc} */
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s,
Map<String, Object> o) throws IOException {
@@ -83,6 +82,7 @@ public final class TgzFormat extends BaseFormat implements
return tarFormat.createArchiveOutputStream(out, o);
}
+ /** {@inheritDoc} */
@Deprecated
@Override
public void putEntry(ArchiveOutputStream out,
@@ -91,9 +91,7 @@ public final class TgzFormat extends BaseFormat implements
putEntry(out, null, path, mode,loader);
}
- /**
- * @since 4.7
- */
+ /** {@inheritDoc} */
@Override
public void putEntry(ArchiveOutputStream out,
ObjectId tree, String path, FileMode mode, ObjectLoader loader)
@@ -101,16 +99,19 @@ public final class TgzFormat extends BaseFormat implements
tarFormat.putEntry(out, tree, path, mode, loader);
}
+ /** {@inheritDoc} */
@Override
public Iterable<String> suffixes() {
return SUFFIXES;
}
+ /** {@inheritDoc} */
@Override
public boolean equals(Object other) {
return (other instanceof TgzFormat);
}
+ /** {@inheritDoc} */
@Override
public int hashCode() {
return getClass().hashCode();
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 b6742acb98..d23d2b657e 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
@@ -66,6 +66,7 @@ public final class TxzFormat extends BaseFormat implements
private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
+ /** {@inheritDoc} */
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
throws IOException {
@@ -73,9 +74,7 @@ public final class TxzFormat extends BaseFormat implements
Collections.<String, Object> emptyMap());
}
- /**
- * @since 4.0
- */
+ /** {@inheritDoc} */
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s,
Map<String, Object> o) throws IOException {
@@ -83,6 +82,7 @@ public final class TxzFormat extends BaseFormat implements
return tarFormat.createArchiveOutputStream(out, o);
}
+ /** {@inheritDoc} */
@Deprecated
@Override
public void putEntry(ArchiveOutputStream out,
@@ -91,9 +91,7 @@ public final class TxzFormat extends BaseFormat implements
putEntry(out, null, path, mode,loader);
}
- /**
- * @since 4.7
- */
+ /** {@inheritDoc} */
@Override
public void putEntry(ArchiveOutputStream out,
ObjectId tree, String path, FileMode mode, ObjectLoader loader)
@@ -101,16 +99,19 @@ public final class TxzFormat extends BaseFormat implements
tarFormat.putEntry(out, tree, path, mode, loader);
}
+ /** {@inheritDoc} */
@Override
public Iterable<String> suffixes() {
return SUFFIXES;
}
+ /** {@inheritDoc} */
@Override
public boolean equals(Object other) {
return (other instanceof TxzFormat);
}
+ /** {@inheritDoc} */
@Override
public int hashCode() {
return getClass().hashCode();
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 46d918ed70..dc8fb44572 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
@@ -68,6 +68,7 @@ public final class ZipFormat extends BaseFormat implements
private static final List<String> SUFFIXES = Collections
.unmodifiableList(Arrays.asList(".zip")); //$NON-NLS-1$
+ /** {@inheritDoc} */
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
throws IOException {
@@ -75,15 +76,14 @@ public final class ZipFormat extends BaseFormat implements
Collections.<String, Object> emptyMap());
}
- /**
- * @since 4.0
- */
+ /** {@inheritDoc} */
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s,
Map<String, Object> o) throws IOException {
return applyFormatOptions(new ZipArchiveOutputStream(s), o);
}
+ /** {@inheritDoc} */
@Deprecated
@Override
public void putEntry(ArchiveOutputStream out,
@@ -92,9 +92,7 @@ public final class ZipFormat extends BaseFormat implements
putEntry(out, null, path, mode,loader);
}
- /**
- * @since 4.7
- */
+ /** {@inheritDoc} */
@Override
public void putEntry(ArchiveOutputStream out,
ObjectId tree, String path, FileMode mode, ObjectLoader loader)
@@ -136,16 +134,19 @@ public final class ZipFormat extends BaseFormat implements
out.closeArchiveEntry();
}
+ /** {@inheritDoc} */
@Override
public Iterable<String> suffixes() {
return SUFFIXES;
}
+ /** {@inheritDoc} */
@Override
public boolean equals(Object other) {
return (other instanceof ZipFormat);
}
+ /** {@inheritDoc} */
@Override
public int hashCode() {
return getClass().hashCode();
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java
index f631cf8ecf..cac491a0f1 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java
@@ -51,6 +51,8 @@ import org.eclipse.jgit.nls.TranslationBundle;
*/
public class ArchiveText extends TranslationBundle {
/**
+ * Get an instance of this translation bundle.
+ *
* @return an instance of this translation bundle
*/
public static ArchiveText get() {