From 6c5b40354955ec7fc5608a954bbc950b998deef8 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Sat, 20 Dec 2014 18:21:26 +0300 Subject: [PATCH] [vcs-log] minor: remove some duplications --- .../vcs/log/ui/frame/DetailsPanel.java | 5 +++-- .../vcs/log/ui/frame/HtmlTableBuilder.java | 22 ++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java index 4bbcf7418b68..975dbeb4ba3f 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java @@ -232,6 +232,7 @@ class DetailsPanel extends JPanel implements ListSelectionListener { private static class DataPanel extends JEditorPane { public static final int BRANCHES_LIMIT = 6; public static final int BRANCHES_TABLE_COLUMN_COUNT = 3; + @NotNull public static final String LEFT_ALIGN = "left"; @NotNull private static String SHOW_OR_HIDE_BRANCHES = "Show or Hide Branches"; @NotNull private final Project myProject; @@ -328,9 +329,9 @@ class DetailsPanel extends JPanel implements ListSelectionListener { if (index >= myBranches.size()) { builder.append(""); } else if (index != myBranches.size() - 1) { - builder.append(myBranches.get(index) + "," + StringUtil.repeat(" ", 20), "left"); + builder.append(myBranches.get(index) + "," + StringUtil.repeat(" ", 20), LEFT_ALIGN); } else { - builder.append(myBranches.get(index), "left"); + builder.append(myBranches.get(index), LEFT_ALIGN); } } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/HtmlTableBuilder.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/HtmlTableBuilder.java index 07e628539185..69c18a13352e 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/HtmlTableBuilder.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/HtmlTableBuilder.java @@ -15,8 +15,11 @@ */ package com.intellij.vcs.log.ui.frame; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + public class HtmlTableBuilder { - private final StringBuilder myStringBuilder = new StringBuilder(); + @NotNull private final StringBuilder myStringBuilder = new StringBuilder(); public HtmlTableBuilder() { myStringBuilder.append(""); @@ -32,17 +35,16 @@ public class HtmlTableBuilder { return this; } - public HtmlTableBuilder append(String value) { - myStringBuilder.append(""); - return this; + public HtmlTableBuilder append(@NotNull String value) { + return append(value, null); } - public HtmlTableBuilder append(String value, String align) { - myStringBuilder.append(""); + public HtmlTableBuilder append(@NotNull String value, @Nullable String align) { + myStringBuilder.append("").append(value).append(""); return this; }
"); - myStringBuilder.append(value); - myStringBuilder.append(""); - myStringBuilder.append(value); - myStringBuilder.append("