vcs: fix i18n warnings - mark StringBuilders as Nls

[idea/community.git] / platform / vcs-impl / src / git4idea / annotate / AnnotationTooltipBuilder.java

diff --git a/platform/vcs-impl/src/git4idea/annotate/AnnotationTooltipBuilder.java b/platform/vcs-impl/src/git4idea/annotate/AnnotationTooltipBuilder.java
index bb8e95dff051e3ab9144d1959b861191c310784f..52874791c8ea6539edee641b286c0977104c4e18 100644 (file)
--- a/platform/vcs-impl/src/git4idea/annotate/AnnotationTooltipBuilder.java
+++ b/platform/vcs-impl/src/git4idea/annotate/AnnotationTooltipBuilder.java
@@ -2,12 +2,14 @@
 package git4idea.annotate;
 
 import com.intellij.openapi.project.Project;
 package git4idea.annotate;
 
 import com.intellij.openapi.project.Project;

+import com.intellij.openapi.util.NlsSafe;

 import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkHtmlRenderer;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.util.containers.Convertor;
 import com.intellij.vcsUtil.VcsUtil;
 import com.intellij.xml.util.XmlStringUtil;
 import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkHtmlRenderer;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.util.containers.Convertor;
 import com.intellij.vcsUtil.VcsUtil;
 import com.intellij.xml.util.XmlStringUtil;

+import org.jetbrains.annotations.Nls;

 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 


@@ -15,18 +17,18 @@ public class AnnotationTooltipBuilder {
   @NotNull private final Project myProject;
   private final boolean myAsHtml;
 
   @NotNull private final Project myProject;
   private final boolean myAsHtml;
 

-  private final StringBuilder sb = new StringBuilder();
+  private final @Nls StringBuilder sb = new StringBuilder();

 
   public AnnotationTooltipBuilder(@NotNull Project project, boolean asHtml) {
     myProject = project;
     myAsHtml = asHtml;
   }
 
 
   public AnnotationTooltipBuilder(@NotNull Project project, boolean asHtml) {
     myProject = project;
     myAsHtml = asHtml;
   }
 

-  private void append(@NotNull String text) {
+  private void append(@NotNull @Nls String text) {

     sb.append(myAsHtml ? XmlStringUtil.escapeString(text) : text);
   }
 
     sb.append(myAsHtml ? XmlStringUtil.escapeString(text) : text);
   }
 

-  private void appendRaw(@NotNull String text) {
+  private void appendRaw(@NotNull @Nls String text) {

     sb.append(text);
   }
 
     sb.append(text);
   }
 


@@ -47,17 +49,17 @@ public class AnnotationTooltipBuilder {
     appendRaw(VcsBundle.message("commit.description.tooltip.commit", revision));
   }
 
     appendRaw(VcsBundle.message("commit.description.tooltip.commit", revision));
   }
 

-  public void appendLine(@NotNull String content) {
+  public void appendLine(@NotNull @Nls String content) {

     appendNewline();
     append(content);
   }
 
     appendNewline();
     append(content);
   }
 

-  public void appendCommitMessageBlock(@NotNull String message) {
+  public void appendCommitMessageBlock(@NotNull @Nls String message) {

     append("\n\n");
     appendTextWithLinks(message);
   }
 
     append("\n\n");
     appendTextWithLinks(message);
   }
 

-  public void appendTextWithLinks(@NotNull String message) {
+  public void appendTextWithLinks(@NotNull @Nls String message) {

     if (myAsHtml) {
       appendRaw(IssueLinkHtmlRenderer.formatTextWithLinks(myProject, message));
     }
     if (myAsHtml) {
       appendRaw(IssueLinkHtmlRenderer.formatTextWithLinks(myProject, message));
     }


@@ -70,6 +72,7 @@ public class AnnotationTooltipBuilder {
     if (sb.length() != 0) append("\n");
   }
 
     if (sb.length() != 0) append("\n");
   }
 

+  @Nls

   @Override
   public String toString() {
     return sb.toString();
   @Override
   public String toString() {
     return sb.toString();


@@ -78,9 +81,9 @@ public class AnnotationTooltipBuilder {
   @NotNull
   public static String buildSimpleTooltip(@NotNull Project project,
                                           boolean asHtml,
   @NotNull
   public static String buildSimpleTooltip(@NotNull Project project,
                                           boolean asHtml,

-                                          @NotNull String prefix,
-                                          @NotNull String revision,
-                                          @Nullable String commitMessage) {
+                                          @NotNull @Nls String prefix,
+                                          @NotNull @NlsSafe String revision,
+                                          @Nullable @Nls String commitMessage) {

     AnnotationTooltipBuilder builder = new AnnotationTooltipBuilder(project, asHtml);
     builder.append(prefix);
     builder.append(" ");
     AnnotationTooltipBuilder builder = new AnnotationTooltipBuilder(project, asHtml);
     builder.append(prefix);
     builder.append(" ");