From 06bb4d8e5e383a23ecf91456ad653a090bdab9b4 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Wed, 24 Aug 2016 14:15:05 +0100 Subject: [PATCH] JAL-1424 recode calls to MessageManager to allow code inspection --- src/jalview/controller/AlignViewController.java | 12 ++++++------ src/jalview/gui/FontChooser.java | 15 +++++++++++---- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/jalview/controller/AlignViewController.java b/src/jalview/controller/AlignViewController.java index 82c8d38..f508bc3 100644 --- a/src/jalview/controller/AlignViewController.java +++ b/src/jalview/controller/AlignViewController.java @@ -194,13 +194,13 @@ public class AlignViewController implements AlignViewControllerI avcg.setStatus(MessageManager.formatMessage( "label.view_controller_toggled_marked", new String[] { - MessageManager.getString(toggle ? "label.toggled" - : "label.marked"), + toggle ? MessageManager.getString("label.toggled") + : MessageManager.getString("label.marked"), String.valueOf(columnCount), - MessageManager - .getString(invert ? "label.not_containing" - : "label.containing"), featureType, - Integer.valueOf(nseq).toString() })); + invert ? MessageManager + .getString("label.not_containing") + : MessageManager.getString("label.containing"), + featureType, Integer.valueOf(nseq).toString() })); return true; } } diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java index 535196e..1f6c068 100755 --- a/src/jalview/gui/FontChooser.java +++ b/src/jalview/gui/FontChooser.java @@ -157,6 +157,7 @@ public class FontChooser extends GFontChooser init = false; } + @Override public void smoothFont_actionPerformed(ActionEvent e) { ap.av.antiAlias = smoothFont.isSelected(); @@ -170,6 +171,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void ok_actionPerformed(ActionEvent e) { try @@ -194,6 +196,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void cancel_actionPerformed(ActionEvent e) { if (ap != null) @@ -247,10 +250,10 @@ public class FontChooser extends GFontChooser double iw = iBounds.getWidth(); if (mw < 1 || iw < 1) { - final String messageKey = iBounds.getHeight() < 1 ? "label.font_doesnt_have_letters_defined" - : "label.font_too_small"; - JOptionPane.showInternalMessageDialog(this, - MessageManager.getString(messageKey), + String message = iBounds.getHeight() < 1 ? MessageManager + .getString("label.font_doesnt_have_letters_defined") + : MessageManager.getString("label.font_too_small"); + JOptionPane.showInternalMessageDialog(this, message, MessageManager.getString("label.invalid_font"), JOptionPane.WARNING_MESSAGE); /* @@ -301,6 +304,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void fontName_actionPerformed(ActionEvent e) { if (init) @@ -317,6 +321,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void fontSize_actionPerformed(ActionEvent e) { if (init) @@ -333,6 +338,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void fontStyle_actionPerformed(ActionEvent e) { if (init) @@ -349,6 +355,7 @@ public class FontChooser extends GFontChooser * * @param e */ + @Override public void defaultButton_actionPerformed(ActionEvent e) { Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString()); -- 1.7.10.2