From 4bb7ef2feb729af8a320e9c090e39aee12028375 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Tue, 13 Mar 2018 16:22:55 +0000 Subject: [PATCH] JAL-2913 use FIGURE_FIXEDIDWIDTH (not FIGURE_USERIDWIDTH) --- src/jalview/bin/Cache.java | 2 +- src/jalview/gui/AlignmentPanel.java | 2 +- src/jalview/gui/Preferences.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index fcc4f6d..dcd6546 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -178,7 +178,7 @@ import org.apache.log4j.SimpleLayout; *
  • FIGURE_AUTOIDWIDTH (false) Expand the left hand column of an exported * alignment figure to accommodate even the longest sequence ID or annotation * label.
    • - *
  • FIGURE_USERIDWIDTH Specifies the width to use for the left-hand column + *
  • FIGURE_FIXEDIDWIDTH Specifies the width to use for the left-hand column * when exporting an alignment as a figure (setting FIGURE_AUTOIDWIDTH to true * will override this).
    • *
  • STRUCT_FROM_PDB (false) derive secondary structure annotation from PDB diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 55fd185..f5634d2 100644 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -1274,7 +1274,7 @@ public class AlignmentPanel extends GAlignmentPanel implements } Integer idwidth = null; if (onscreen || (idwidth = Cache - .getIntegerProperty("FIGURE_USERIDWIDTH")) == null) + .getIntegerProperty("FIGURE_FIXEDIDWIDTH")) == null) { int w = getIdPanel().getWidth(); return (w > 0 ? w : calculateIdWidth().width + 4); diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index aa8369a..5aab26d 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -525,7 +525,7 @@ public class Preferences extends GPreferences autoIdWidth.setSelected(Cache.getDefault("FIGURE_AUTOIDWIDTH", false)); userIdWidth.setEnabled(!autoIdWidth.isSelected()); userIdWidthlabel.setEnabled(!autoIdWidth.isSelected()); - Integer wi = Cache.getIntegerProperty("FIGURE_USERIDWIDTH"); + Integer wi = Cache.getIntegerProperty("FIGURE_FIXEDIDWIDTH"); userIdWidth.setText(wi == null ? "" : wi.toString()); // TODO: refactor to use common enum via FormatAdapter and allow extension // for new flat file formats @@ -784,7 +784,7 @@ public class Preferences extends GPreferences Cache.applicationProperties.setProperty("FIGURE_AUTOIDWIDTH", Boolean.toString(autoIdWidth.isSelected())); userIdWidth_actionPerformed(); - Cache.applicationProperties.setProperty("FIGURE_USERIDWIDTH", + Cache.applicationProperties.setProperty("FIGURE_FIXEDIDWIDTH", userIdWidth.getText()); /* -- 1.7.10.2