diff options
author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-05-06 21:47:11 +0200 |
---|---|---|
committer | Chris Aniszczyk <caniszczyk@gmail.com> | 2013-07-21 22:06:34 -0500 |
commit | a2b33a8ac33c63eea82f300b802a26af54a3d61d (patch) | |
tree | f4669ce66b29cea7e9197d3f676d80c77c3b1ac2 /org.eclipse.jgit/src | |
parent | 60e01cff2f763a85ed24a706d26eb9f159ffa832 (diff) | |
download | jgit-a2b33a8ac33c63eea82f300b802a26af54a3d61d.tar.gz jgit-a2b33a8ac33c63eea82f300b802a26af54a3d61d.zip |
Add NON-NLS comments for some obviously untranslatable strings
Change-Id: I2d1076b46695dac84961b8ae663bfc5cb123b3a3
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/src')
9 files changed, 10 insertions, 10 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java index 162105b787..399d78e095 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java @@ -230,8 +230,8 @@ public class CommitCommand extends GitCommand<RevCommit> { ru.setRefLogMessage(reflogComment, false); } else { String prefix = amend ? "commit (amend): " //$NON-NLS-1$ - : parents.size() == 0 ? "commit (initial): " - : "commit: "; + : parents.size() == 0 ? "commit (initial): " //$NON-NLS-1$ + : "commit: "; //$NON-NLS-1$ ru.setRefLogMessage( prefix + revCommit.getShortMessage(), false); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 592a012870..5a006792e1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -383,7 +383,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> { if (headName.startsWith(Constants.R_REFS)) { RefUpdate rup = repo.updateRef(headName); rup.setNewObjectId(newHead); - rup.setRefLogMessage("rebase finished: " + headName + " onto " //$NON-NLS-1$ + rup.setRefLogMessage("rebase finished: " + headName + " onto " //$NON-NLS-1$ //$NON-NLS-2$ + onto.getName(), false); Result res = rup.forceUpdate(); switch (res) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java index c3922099d0..2bc9d22449 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java @@ -169,7 +169,7 @@ public class RevertCommand extends GitCommand<RevCommit> { String shortMessage = "Revert \"" + srcCommit.getShortMessage() //$NON-NLS-1$ + "\""; //$NON-NLS-1$ - String newMessage = shortMessage + "\n\n" + String newMessage = shortMessage + "\n\n" //$NON-NLS-1$ + "This reverts commit " + srcCommit.getId().getName() //$NON-NLS-1$ + ".\n"; //$NON-NLS-1$ if (merger.merge(headCommit, srcParent)) { 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 b1fde1dc4c..020a6dc5f2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java @@ -163,7 +163,7 @@ public class StashApplyCommand extends GitCommand<ObjectId> { JGitText.get().stashCommitMissingTwoParents, stashId.name())); - ObjectId headTree = repo.resolve(Constants.HEAD + "^{tree}"); + ObjectId headTree = repo.resolve(Constants.HEAD + "^{tree}"); //$NON-NLS-1$ ObjectId stashIndexCommit = revWalk.parseCommit(stashCommit .getParent(1)); ObjectId stashHeadCommit = stashCommit.getParent(0); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java index 8068ba6e1e..0998a3a221 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java @@ -76,7 +76,7 @@ public class RevFlag { * * @since 3.0 */ - public static final RevFlag SEEN = new StaticRevFlag("SEEN", RevWalk.SEEN); + public static final RevFlag SEEN = new StaticRevFlag("SEEN", RevWalk.SEEN); //$NON-NLS-1$ final RevWalk walker; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java index e99ba1c4ad..70e458a196 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java @@ -235,7 +235,7 @@ public class TransportSftp extends SshTransport implements WalkTransport { files.put(ent.getFilename(), ent); for (final ChannelSftp.LsEntry ent : list) { final String n = ent.getFilename(); - if (!n.startsWith("pack-") || !n.endsWith(".pack")) //$NON-NLS-1$ + if (!n.startsWith("pack-") || !n.endsWith(".pack")) //$NON-NLS-1$ //$NON-NLS-2$ continue; final String in = n.substring(0, n.length() - 5) + ".idx"; //$NON-NLS-1$ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java index deebe669a6..bd65182796 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java @@ -88,7 +88,7 @@ public class URIish implements Serializable { * Part of a pattern which matches the host part of URIs. Defines one * capturing group containing the host name. */ - private static final String HOST_P = "((?:[^\\\\/:]+)|(?:\\[[0-9a-f:]+\\]))"; + private static final String HOST_P = "((?:[^\\\\/:]+)|(?:\\[[0-9a-f:]+\\]))"; //$NON-NLS-1$ /** * Part of a pattern which matches the optional port part of URIs. Defines diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java index 7487f0d2b9..676ca9b8dc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java @@ -131,7 +131,7 @@ public class ChangeIdUtil { private static final Pattern includeInFooterPattern = Pattern .compile("^[ \\[].*$"); //$NON-NLS-1$ - private static final Pattern trailingWhitespace = Pattern.compile("\\s+$"); + private static final Pattern trailingWhitespace = Pattern.compile("\\s+$"); //$NON-NLS-1$ /** * Find the right place to insert a Change-Id and return it. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RelativeDateFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RelativeDateFormatter.java index 8f31eae48b..3cb3749cff 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RelativeDateFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RelativeDateFormatter.java @@ -119,7 +119,7 @@ public class RelativeDateFormatter { JGitText.get().year; long months = round(ageMillis % YEAR_IN_MILLIS, MONTH_IN_MILLIS); String monthLabel = (months > 1) ? JGitText.get().months : // - (months == 1 ? JGitText.get().month : ""); + (months == 1 ? JGitText.get().month : ""); //$NON-NLS-1$ return MessageFormat.format( months == 0 ? JGitText.get().years0MonthsAgo : JGitText .get().yearsMonthsAgo, |