summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ArchiveFormats.java10
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java4
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java5
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java5
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java5
-rw-r--r--org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java4
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateParser.java2
10 files changed, 19 insertions, 22 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 f065871969..65466a9949 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
@@ -70,11 +70,11 @@ public class ArchiveFormats {
* Not thread-safe.
*/
public static void registerAll() {
- register("tar", new TarFormat());
- register("tgz", new TgzFormat());
- register("tbz2", new Tbz2Format());
- register("txz", new TxzFormat());
- register("zip", new ZipFormat());
+ register("tar", new TarFormat()); //$NON-NLS-1$
+ register("tgz", new TgzFormat()); //$NON-NLS-1$
+ register("tbz2", new Tbz2Format()); //$NON-NLS-1$
+ register("txz", new TxzFormat()); //$NON-NLS-1$
+ register("zip", new ZipFormat()); //$NON-NLS-1$
}
/**
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 7e1c9cc907..c552fb1844 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
@@ -62,8 +62,8 @@ import org.eclipse.jgit.lib.ObjectLoader;
* Unix TAR format (ustar + some PAX extensions).
*/
public class TarFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
- private static final List<String> SUFFIXES =
- Collections.unmodifiableList(Arrays.asList(".tar"));
+ private static final List<String> SUFFIXES = Collections
+ .unmodifiableList(Arrays.asList(".tar")); //$NON-NLS-1$
public ArchiveOutputStream createArchiveOutputStream(OutputStream s) {
TarArchiveOutputStream out = new TarArchiveOutputStream(s, "UTF-8"); //$NON-NLS-1$
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 d3482d1813..61aa339b7c 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
@@ -58,9 +58,8 @@ import org.eclipse.jgit.lib.ObjectLoader;
* bzip2-compressed tarball (tar.bz2) format.
*/
public class Tbz2Format implements ArchiveCommand.Format<ArchiveOutputStream> {
- private static final List<String> SUFFIXES =
- Collections.unmodifiableList(Arrays.asList(
- ".tar.bz2", ".tbz", ".tbz2"));
+ private static final List<String> SUFFIXES = Collections
+ .unmodifiableList(Arrays.asList(".tar.bz2", ".tbz", ".tbz2")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
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 fe1350cbb0..534404fad1 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
@@ -58,9 +58,8 @@ import org.eclipse.jgit.lib.ObjectLoader;
* gzip-compressed tarball (tar.gz) format.
*/
public class TgzFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
- private static final List<String> SUFFIXES =
- Collections.unmodifiableList(Arrays.asList(
- ".tar.gz", ".tgz"));
+ private static final List<String> SUFFIXES = Collections
+ .unmodifiableList(Arrays.asList(".tar.gz", ".tgz")); //$NON-NLS-1$ //$NON-NLS-2$
private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
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 c09b0621a7..f0eed00fd9 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
@@ -58,9 +58,8 @@ import org.eclipse.jgit.lib.ObjectLoader;
* Xz-compressed tar (tar.xz) format.
*/
public class TxzFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
- private static final List<String> SUFFIXES =
- Collections.unmodifiableList(Arrays.asList(
- ".tar.xz", ".txz"));
+ private static final List<String> SUFFIXES = Collections
+ .unmodifiableList(Arrays.asList(".tar.xz", ".txz")); //$NON-NLS-1$ //$NON-NLS-2$
private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
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 1a3765ec19..a2bfbeeb16 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
@@ -61,8 +61,8 @@ import org.eclipse.jgit.lib.ObjectLoader;
* PKWARE's ZIP format.
*/
public class ZipFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
- private static final List<String> SUFFIXES =
- Collections.unmodifiableList(Arrays.asList(".zip"));
+ private static final List<String> SUFFIXES = Collections
+ .unmodifiableList(Arrays.asList(".zip")); //$NON-NLS-1$
public ArchiveOutputStream createArchiveOutputStream(OutputStream s) {
return new ZipArchiveOutputStream(s);
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
index c36cc2cb44..3f77aa6687 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
@@ -191,7 +191,7 @@ public class CmdLineParser extends org.kohsuke.args4j.CmdLineParser {
@Override
public String toString() {
if (metaVar() == null)
- return "ARG";
+ return "ARG"; //$NON-NLS-1$
try {
Field field = CLIText.class.getField(metaVar());
String ret = field.get(CLIText.get()).toString();
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 ed91ae22e8..1bafb5efc6 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
@@ -267,7 +267,7 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
}
private <T extends Closeable> OutputStream writeArchive(Format<T> fmt) {
- final String pfx = prefix == null ? "" : prefix;
+ final String pfx = prefix == null ? "" : prefix; //$NON-NLS-1$
final TreeWalk walk = new TreeWalk(repo);
try {
final T outa = fmt.createArchiveOutputStream(out);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java
index 384cbb0f54..d7ab5f882b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java
@@ -134,7 +134,7 @@ public class GitDateFormatter {
Locale.US);
break;
case LOCAL:
- dateTimeInstance = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy",
+ dateTimeInstance = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy", //$NON-NLS-1$
Locale.US);
break;
case RFC:
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateParser.java
index 32859c9c58..7bc3c88c5d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateParser.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateParser.java
@@ -123,7 +123,7 @@ public class GitDateParser {
SHORT_WITH_DOTS("yyyy.MM.dd"), // //$NON-NLS-1$
SHORT_WITH_SLASH("MM/dd/yyyy"), // //$NON-NLS-1$
DEFAULT("EEE MMM dd HH:mm:ss yyyy Z"), // //$NON-NLS-1$
- LOCAL("EEE MMM dd HH:mm:ss yyyy");
+ LOCAL("EEE MMM dd HH:mm:ss yyyy"); //$NON-NLS-1$
String formatStr;