From 746cf09b33cc36c943a006ac1cf546788c0d9f5f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 10 Apr 2015 00:56:45 +0200 Subject: [PATCH] Silence non-externalized string warnings in org.eclipse.jgit Change-Id: I7fa180db0c59e4a317a0c99ec48574cb0e5ac2f2 Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/api/MergeResult.java | 24 +++++++++---------- .../eclipse/jgit/api/RemoveNoteCommand.java | 2 +- .../org/eclipse/jgit/api/ResetCommand.java | 4 ++-- .../eclipse/jgit/api/StashApplyCommand.java | 8 +++---- .../eclipse/jgit/api/StashCreateCommand.java | 6 ++--- .../src/org/eclipse/jgit/api/TagCommand.java | 5 ++-- .../storage/file/RefDirectoryUpdate.java | 6 ++--- .../jgit/merge/MergeMessageFormatter.java | 14 +++++------ .../jgit/merge/SquashMessageFormatter.java | 8 +++---- .../eclipse/jgit/merge/StrategyRecursive.java | 2 +- 10 files changed, 40 insertions(+), 39 deletions(-) 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 9dc33b5ad5..6141e0c536 100644 --- 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 af09f65f17..a526c27531 100644 --- 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 { } 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 c2e42e2a1e..8f4bc4f26c 100644 --- 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 { if (!filepaths.isEmpty()) throw new JGitInternalException(MessageFormat.format( JGitText.get().illegalCombinationOfArguments, - "[--mixed | --soft | --hard]", "...")); //$NON-NLS-1$ + "[--mixed | --soft | --hard]", "...")); //$NON-NLS-1$ //$NON-NLS-2$ this.mode = mode; return this; } @@ -285,7 +285,7 @@ public class ResetCommand extends GitCommand { public ResetCommand addPath(String path) { if (mode != null) throw new JGitInternalException(MessageFormat.format( - JGitText.get().illegalCombinationOfArguments, "...", + JGitText.get().illegalCombinationOfArguments, "...", //$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 16bdc7b4fd..6de25a052a 100644 --- 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 { 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 { 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 5167221743..2cdaf24019 100644 --- 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 { - 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 07dce06d6e..ca98cedfd8 100644 --- 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 { 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 ? "" : name)); + throw new InvalidTagNameException( + MessageFormat.format(JGitText.get().tagNameInvalid, + name == 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 8ad7ad29c8..7858ee1405 100644 --- 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 d94e7280c1..191f3d8366 100644 --- 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 listings = new ArrayList(); 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 8931fd65ac..39138b9c73 100644 --- 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 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 58c1ed22d8..22e608ec9d 100644 --- 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$ } } -- 2.39.5