Silence non-externalized string warnings in org.eclipse.jgit

Change-Id: I7fa180db0c59e4a317a0c99ec48574cb0e5ac2f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
index 9dc33b5ad5c88b6ea0441bf01858c5cba4b57770..6141e0c5360f60f7d3e86b801d82b7db1142e77c 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
@@ -69,7 +69,7 @@ public class MergeResult {
                FAST_FORWARD {
                        @Override
                        public String toString() {
-                               return "Fast-forward";
+                               return "Fast-forward"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -83,7 +83,7 @@ public class MergeResult {
                FAST_FORWARD_SQUASHED {
                        @Override
                        public String toString() {
-                               return "Fast-forward-squashed";
+                               return "Fast-forward-squashed"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -95,7 +95,7 @@ public class MergeResult {
                ALREADY_UP_TO_DATE {
                        @Override
                        public String toString() {
-                               return "Already-up-to-date";
+                               return "Already-up-to-date"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -107,7 +107,7 @@ public class MergeResult {
                FAILED {
                        @Override
                        public String toString() {
-                               return "Failed";
+                               return "Failed"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -119,7 +119,7 @@ public class MergeResult {
                MERGED {
                        @Override
                        public String toString() {
-                               return "Merged";
+                               return "Merged"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -133,7 +133,7 @@ public class MergeResult {
                MERGED_SQUASHED {
                        @Override
                        public String toString() {
-                               return "Merged-squashed";
+                               return "Merged-squashed"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -147,7 +147,7 @@ public class MergeResult {
                MERGED_SQUASHED_NOT_COMMITTED {
                        @Override
                        public String toString() {
-                               return "Merged-squashed-not-committed";
+                               return "Merged-squashed-not-committed"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -159,7 +159,7 @@ public class MergeResult {
                CONFLICTING {
                        @Override
                        public String toString() {
-                               return "Conflicting";
+                               return "Conflicting"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -173,7 +173,7 @@ public class MergeResult {
                ABORTED {
                        @Override
                        public String toString() {
-                               return "Aborted";
+                               return "Aborted"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -186,7 +186,7 @@ public class MergeResult {
                 **/
                MERGED_NOT_COMMITTED {
                        public String toString() {
-                               return "Merged-not-committed";
+                               return "Merged-not-committed"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -198,7 +198,7 @@ public class MergeResult {
                NOT_SUPPORTED {
                        @Override
                        public String toString() {
-                               return "Not-yet-supported";
+                               return "Not-yet-supported"; //$NON-NLS-1$
                        }
 
                        @Override
@@ -213,7 +213,7 @@ public class MergeResult {
                 */
                CHECKOUT_CONFLICT {
                        public String toString() {
-                               return "Checkout Conflict";
+                               return "Checkout Conflict"; //$NON-NLS-1$
                        }
 
                        @Override

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoveNoteCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoveNoteCommand.java
index af09f65f170b1efd08239c3ea15888dba5f69c52..a526c275310d3ec6c7f8576f787930c4934150e2 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoveNoteCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoveNoteCommand.java
@@ -93,7 +93,7 @@ public class RemoveNoteCommand extends GitCommand<Note> {
                        }
                        map.set(id, null, inserter);
                        commitNoteMap(walk, map, notesCommit, inserter,
-                                       "Notes removed by 'git notes remove'");
+                                       "Notes removed by 'git notes remove'"); //$NON-NLS-1$
                        return map.getNote(id);
                } catch (IOException e) {
                        throw new JGitInternalException(e.getMessage(), e);

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java
index c2e42e2a1ef03685dc0b53155ccbd05a011b1f85..8f4bc4f26c35332e1c6e8ab5eb206a8404adf066 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java
@@ -271,7 +271,7 @@ public class ResetCommand extends GitCommand<Ref> {
                if (!filepaths.isEmpty())
                        throw new JGitInternalException(MessageFormat.format(
                                        JGitText.get().illegalCombinationOfArguments,
-                                       "[--mixed | --soft | --hard]", "<paths>...")); //$NON-NLS-1$
+                                       "[--mixed | --soft | --hard]", "<paths>...")); //$NON-NLS-1$ //$NON-NLS-2$
                this.mode = mode;
                return this;
        }
@@ -285,7 +285,7 @@ public class ResetCommand extends GitCommand<Ref> {
        public ResetCommand addPath(String path) {
                if (mode != null)
                        throw new JGitInternalException(MessageFormat.format(
-                                       JGitText.get().illegalCombinationOfArguments, "<paths>...",
+                                       JGitText.get().illegalCombinationOfArguments, "<paths>...", //$NON-NLS-1$
                                        "[--mixed | --soft | --hard]")); //$NON-NLS-1$
                filepaths.add(path);
                return this;

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java
index 16bdc7b4fd2d4f6d58b471cddeca149aaec34c20..6de25a052a22841462f23343e323aafacbefce7a 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java
@@ -191,8 +191,8 @@ public class StashApplyCommand extends GitCommand<ObjectId> {
                                untrackedCommit = revWalk.parseCommit(stashCommit.getParent(2));
 
                        ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo);
-                       merger.setCommitNames(new String[] { "stashed HEAD", "HEAD",
-                                       "stash" });
+                       merger.setCommitNames(new String[] { "stashed HEAD", "HEAD", //$NON-NLS-1$ //$NON-NLS-2$
+                                       "stash" }); //$NON-NLS-1$
                        merger.setBase(stashHeadCommit);
                        merger.setWorkingTreeIterator(new FileTreeIterator(repo));
                        if (merger.merge(headCommit, stashCommit)) {
@@ -204,8 +204,8 @@ public class StashApplyCommand extends GitCommand<ObjectId> {
                                if (applyIndex) {
                                        ResolveMerger ixMerger = (ResolveMerger) strategy
                                                        .newMerger(repo, true);
-                                       ixMerger.setCommitNames(new String[] { "stashed HEAD",
-                                                       "HEAD", "stashed index" });
+                                       ixMerger.setCommitNames(new String[] { "stashed HEAD", //$NON-NLS-1$
+                                                       "HEAD", "stashed index" }); //$NON-NLS-1$//$NON-NLS-2$
                                        ixMerger.setBase(stashHeadCommit);
                                        boolean ok = ixMerger.merge(headCommit, stashIndexCommit);
                                        if (ok) {

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java
index 5167221743ca137f9fe0db016001000b4bc85cb6..2cdaf240192444801412ef1f4ae1b6bd3ee6fee1 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java
@@ -94,11 +94,11 @@ import org.eclipse.jgit.util.FileUtils;
  */
 public class StashCreateCommand extends GitCommand<RevCommit> {
 
-       private static final String MSG_INDEX = "index on {0}: {1} {2}";
+       private static final String MSG_INDEX = "index on {0}: {1} {2}"; //$NON-NLS-1$
 
-       private static final String MSG_UNTRACKED = "untracked files on {0}: {1} {2}";
+       private static final String MSG_UNTRACKED = "untracked files on {0}: {1} {2}"; //$NON-NLS-1$
 
-       private static final String MSG_WORKING_DIR = "WIP on {0}: {1} {2}";
+       private static final String MSG_WORKING_DIR = "WIP on {0}: {1} {2}"; //$NON-NLS-1$
 
        private String indexMessage = MSG_INDEX;
 

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java
index 07dce06d6e095ae53829f0c6653117c5682609a3..ca98cedfd84f151ae3ac5465ca62d0e811bcfa29 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java
@@ -216,8 +216,9 @@ public class TagCommand extends GitCommand<Ref> {
                if (tagger == null && annotated)
                        tagger = new PersonIdent(repo);
                if (name == null || !Repository.isValidRefName(Constants.R_TAGS + name))
-                       throw new InvalidTagNameException(MessageFormat.format(JGitText
-                                       .get().tagNameInvalid, name == null ? "<null>" : name));
+                       throw new InvalidTagNameException(
+                                       MessageFormat.format(JGitText.get().tagNameInvalid,
+                                                       name == null ? "<null>" : name)); //$NON-NLS-1$
                if (signed)
                        throw new UnsupportedOperationException(
                                        JGitText.get().signingNotSupportedOnTag);

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java
index 8ad7ad29c8e846915374695f3bbcc16720f44a75..7858ee14051ec52fb017330490d3cb490e79d249 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java
@@ -128,11 +128,11 @@ class RefDirectoryUpdate extends RefUpdate {
        private String toResultString(final Result status) {
                switch (status) {
                case FORCED:
-                       return "forced-update";
+                       return "forced-update"; //$NON-NLS-1$
                case FAST_FORWARD:
-                       return "fast forward";
+                       return "fast forward"; //$NON-NLS-1$
                case NEW:
-                       return "created";
+                       return "created"; //$NON-NLS-1$
                default:
                        return null;
                }

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java
index d94e7280c151b6bd5b81f6320d57308af6ce3e59..191f3d8366299f2bbc09fdd7ddc085d8310df346 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java
@@ -97,27 +97,27 @@ public class MergeMessageFormatter {
                List<String> listings = new ArrayList<String>();
 
                if (!branches.isEmpty())
-                       listings.add(joinNames(branches, "branch", "branches"));
+                       listings.add(joinNames(branches, "branch", "branches")); //$NON-NLS-1$//$NON-NLS-2$
 
                if (!remoteBranches.isEmpty())
-                       listings.add(joinNames(remoteBranches, "remote-tracking branch",
-                                       "remote-tracking branches"));
+                       listings.add(joinNames(remoteBranches, "remote-tracking branch", //$NON-NLS-1$
+                                       "remote-tracking branches")); //$NON-NLS-1$
 
                if (!tags.isEmpty())
-                       listings.add(joinNames(tags, "tag", "tags"));
+                       listings.add(joinNames(tags, "tag", "tags")); //$NON-NLS-1$ //$NON-NLS-2$
 
                if (!commits.isEmpty())
-                       listings.add(joinNames(commits, "commit", "commits"));
+                       listings.add(joinNames(commits, "commit", "commits")); //$NON-NLS-1$ //$NON-NLS-2$
 
                if (!others.isEmpty())
-                       listings.add(StringUtils.join(others, ", ", " and ")); //$NON-NLS-1$
+                       listings.add(StringUtils.join(others, ", ", " and ")); //$NON-NLS-1$ //$NON-NLS-2$
 
                sb.append(StringUtils.join(listings, ", ")); //$NON-NLS-1$
 
                String targetName = target.getLeaf().getName();
                if (!targetName.equals(Constants.R_HEADS + Constants.MASTER)) {
                        String targetShortName = Repository.shortenRefName(targetName);
-                       sb.append(" into " + targetShortName);
+                       sb.append(" into " + targetShortName); //$NON-NLS-1$
                }
 
                return sb.toString();

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/SquashMessageFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/SquashMessageFormatter.java
index 8931fd65acd1976803355b267c085729c943973d..39138b9c7348737f27d73c163e9841e14ebe785f 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/SquashMessageFormatter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/SquashMessageFormatter.java
@@ -76,9 +76,9 @@ public class SquashMessageFormatter {
         */
        public String format(List<RevCommit> squashedCommits, Ref target) {
                StringBuilder sb = new StringBuilder();
-               sb.append("Squashed commit of the following:\n");
+               sb.append("Squashed commit of the following:\n"); //$NON-NLS-1$
                for (RevCommit c : squashedCommits) {
-                       sb.append("\ncommit ");
+                       sb.append("\ncommit "); //$NON-NLS-1$
                        sb.append(c.getName());
                        sb.append("\n"); //$NON-NLS-1$
                        sb.append(toString(c.getAuthorIdent()));
@@ -92,12 +92,12 @@ public class SquashMessageFormatter {
        private String toString(PersonIdent author) {
                final StringBuilder a = new StringBuilder();
 
-               a.append("Author: ");
+               a.append("Author: "); //$NON-NLS-1$
                a.append(author.getName());
                a.append(" <"); //$NON-NLS-1$
                a.append(author.getEmailAddress());
                a.append(">\n"); //$NON-NLS-1$
-               a.append("Date:   ");
+               a.append("Date:   "); //$NON-NLS-1$
                a.append(dateFormatter.formatDate(author));
                a.append("\n"); //$NON-NLS-1$
 

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java
index 58c1ed22d8bb4157a535d5d867b6c4b7370617ab..22e608ec9d1543acfd015ec7cb2b5e68b5d653bf 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java
@@ -64,6 +64,6 @@ public class StrategyRecursive extends StrategyResolve {
 
        @Override
        public String getName() {
-               return "recursive";
+               return "recursive"; //$NON-NLS-1$
        }
 }