motiejus
/
jgit
1
Fork 0
Code Releases Activity

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

Change-Id: I7fa180db0c59e4a317a0c99ec48574cb0e5ac2f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2015-04-10 00:56:45 +02:00
parent 2390531888
commit 746cf09b33
10 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
View File

@ -69,7 +69,7 @@ public enum MergeStatus {
FAST_FORWARD {
@Override
public String toString() {
return "Fast-forward";
return "Fast-forward"; //$NON-NLS-1$
}
@Override
@ -83,7 +83,7 @@ public boolean isSuccessful() {
FAST_FORWARD_SQUASHED {
@Override
public String toString() {
return "Fast-forward-squashed";
return "Fast-forward-squashed"; //$NON-NLS-1$
}
@Override
@ -95,7 +95,7 @@ public boolean isSuccessful() {
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 boolean isSuccessful() {
FAILED {
@Override
public String toString() {
return "Failed";
return "Failed"; //$NON-NLS-1$
}
@Override
@ -119,7 +119,7 @@ public boolean isSuccessful() {
MERGED {
@Override
public String toString() {
return "Merged";
return "Merged"; //$NON-NLS-1$
}
@Override
@ -133,7 +133,7 @@ public boolean isSuccessful() {
MERGED_SQUASHED {
@Override
public String toString() {
return "Merged-squashed";
return "Merged-squashed"; //$NON-NLS-1$
}
@Override
@ -147,7 +147,7 @@ public boolean isSuccessful() {
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 boolean isSuccessful() {
CONFLICTING {
@Override
public String toString() {
return "Conflicting";
return "Conflicting"; //$NON-NLS-1$
}
@Override
@ -173,7 +173,7 @@ public boolean isSuccessful() {
ABORTED {
@Override
public String toString() {
return "Aborted";
return "Aborted"; //$NON-NLS-1$
}
@Override
@ -186,7 +186,7 @@ public boolean isSuccessful() {
**/
MERGED_NOT_COMMITTED {
public String toString() {
return "Merged-not-committed";
return "Merged-not-committed"; //$NON-NLS-1$
}
@Override
@ -198,7 +198,7 @@ public boolean isSuccessful() {
NOT_SUPPORTED {
@Override
public String toString() {
return "Not-yet-supported";
return "Not-yet-supported"; //$NON-NLS-1$
}
@Override
@ -213,7 +213,7 @@ public boolean isSuccessful() {
*/
CHECKOUT_CONFLICT {
public String toString() {
return "Checkout Conflict";
return "Checkout Conflict"; //$NON-NLS-1$
}
@Override

2
org.eclipse.jgit/src/org/eclipse/jgit/api/RemoveNoteCommand.java
View File

@ -93,7 +93,7 @@ public Note call() throws GitAPIException {
}
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);

4
org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java
View File

@ -271,7 +271,7 @@ public ResetCommand setMode(ResetType mode) {
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 ResetCommand setMode(ResetType mode) {
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;

8
org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java
View File

@ -191,8 +191,8 @@ public ObjectId call() throws GitAPIException,
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 ObjectId call() throws GitAPIException,
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) {

6
org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java
View File

@ -94,11 +94,11 @@
*/
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;

5
org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java
View File

@ -216,8 +216,9 @@ private void processOptions(RepositoryState state)
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);

6
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java
View File

@ -128,11 +128,11 @@ protected Result doUpdate(final Result status) throws IOException {
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;
}

14
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java
View File

@ -97,27 +97,27 @@ else if (ref.getName().equals(ref.getObjectId().getName()))
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();

8
org.eclipse.jgit/src/org/eclipse/jgit/merge/SquashMessageFormatter.java
View File

@ -76,9 +76,9 @@ public 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 String format(List<RevCommit> squashedCommits, Ref target) {
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$

2
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java
View File

@ -64,6 +64,6 @@ public ThreeWayMerger newMerger(Repository db, boolean inCore) {
@Override
public String getName() {
return "recursive";
return "recursive"; //$NON-NLS-1$
}
}