From 98ffd58e5eba218d200041374dbf143e9ec2910c Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Wed, 13 May 2015 19:55:22 +0400 Subject: [PATCH] style: comment code deleted; help note in tooltip changed; font and border improved --- platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java | 3 +-- .../src/com/intellij/dvcs/push/ui/VcsCommitInfoBalloon.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java index 139d50421a47..96d34f996e31 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java @@ -102,7 +102,7 @@ public class PushLog extends JPanel implements DataProvider { if (node instanceof TooltipNode) { return KeymapUtil.createTooltipText( ((TooltipNode)node).getTooltip() + - "

QuickDoc available", quickDocAction) + "

"; + "

Show commit details", quickDocAction) + "

"; } return ""; } @@ -209,7 +209,6 @@ public class PushLog extends JPanel implements DataProvider { myTree.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0), START_EDITING); //override default tree behaviour. myTree.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), ""); - //String name="push.show.commit.details"; MyShowCommitInfoAction showCommitInfoAction = new MyShowCommitInfoAction(); showCommitInfoAction.registerCustomShortcutSet(quickDocAction.getShortcutSet(), myTree); diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsCommitInfoBalloon.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsCommitInfoBalloon.java index 794d49bbe5a2..54c9a26f905e 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsCommitInfoBalloon.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsCommitInfoBalloon.java @@ -28,7 +28,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import javax.swing.border.EmptyBorder; import javax.swing.event.HyperlinkEvent; import javax.swing.tree.TreePath; import java.awt.*; @@ -46,7 +45,8 @@ public class VcsCommitInfoBalloon { myEditorPane = new JEditorPane(UIUtil.HTML_MIME, ""); myEditorPane.setEditable(false); myEditorPane.setBackground(HintUtil.INFORMATION_COLOR); - myEditorPane.setBorder(new EmptyBorder(2, 4, 2, 4)); + myEditorPane.setFont(UIUtil.getToolTipFont()); + myEditorPane.setBorder(HintUtil.createHintBorder()); myEditorPane.addHyperlinkListener(new HyperlinkAdapter() { @Override protected void hyperlinkActivated(HyperlinkEvent e) {