From a4ea59821f1d72c3d4f91743d7b208d2559359ce Mon Sep 17 00:00:00 2001 From: gmungoc Date: Wed, 13 Mar 2019 15:54:42 +0000 Subject: [PATCH] JAL-3210 merge conflict tidying --- src/jalview/gui/AnnotationPanel.java | 4 +--- src/jalview/io/JalviewFileChooser.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index d8d27d0..4ead210 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -150,9 +150,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, */ public AnnotationPanel(AlignmentPanel ap) { -// setBackground(Color.white); // BH 2019 - - ToolTipManager.sharedInstance().registerComponent(this); + ToolTipManager.sharedInstance().registerComponent(this); ToolTipManager.sharedInstance().setInitialDelay(0); ToolTipManager.sharedInstance().setDismissDelay(10000); this.ap = ap; diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java index 95f4c94..ba66889 100755 --- a/src/jalview/io/JalviewFileChooser.java +++ b/src/jalview/io/JalviewFileChooser.java @@ -541,7 +541,7 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI, list = new JList<>(recent); DefaultListCellRenderer dlcr = new DefaultListCellRenderer(); -// dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT); + dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT); list.setCellRenderer(dlcr); list.addMouseListener(new MouseAdapter() -- 1.7.10.2