JAL-3141 Remove no longer used exampleLabel

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 0747100..6ea4eff 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1376,7 +1376,6 @@ label.suffix_template = Suffix template (use %n to represent the backup/version
 label.suffix_template_tooltip = %n in the template will be replaced by the index number. The suffix will appear before the filename extension.
 label.index_digits = Number of digits to use for the index
 label.example_filenames = Example filenames
-label.suffix_example_filenames = Some example filenames using these settings:
 label.increment_index = Increment suffix indexes (like version files) - newest file has largest index.
 label.reverse_roll = Reverse and "roll" suffix indexes (like log files) - newest file is always index 1.
 label.keep_files = Keep Files

diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties
index 087105f..f570905 100644 (file)
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@ -1378,7 +1378,6 @@ label.suffix_template = Plantilla de sufijo (usa %n para representar el 
 label.suffix_template_tooltip = Esto será reemplazado por el número de índice. El sufijo aparecerá antes de la extensión.
 label.index_digits = Número de dígitos a utilizar para el índice.
 label.example_filenames = Ejemplos de nombres de archivos
-label.suffix_example_filenames = Algunos nombres de archivos de ejemplo usando estas configuraciones:
 label.increment_index = El archivo más nuevo tiene el índice más grande
 label.reverse_roll = El archivo más nuevo tiene índice 1
 label.keep_files = Manten los archivos

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 4477620..e26b991 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -309,8 +309,6 @@ public class GPreferences extends JPanel
 
   protected JalviewBooleanRadioButtons backupfilesConfirmDelete = new JalviewBooleanRadioButtons();
 
-  protected JLabel exampleLabel = new JLabel();
-
   protected JTextArea backupfilesExampleLabel = new JTextArea();
 
   /**
@@ -1989,20 +1987,14 @@ public class GPreferences extends JPanel
             MessageManager.getString("label.example_filenames")));
     exampleFilesPanel.setLayout(new GridBagLayout());
 
-    /*
-    exampleLabel.setText(
-            MessageManager.getString("label.suffix_example_filenames"));
-    exampleLabel.setFont(LABEL_FONT);
-    exampleLabel.setHorizontalAlignment(SwingConstants.LEFT);
-    */
-
     backupfilesExampleLabel.setEditable(false);
     backupfilesExampleLabel.setPreferredSize(new Dimension(400, 85));
     backupfilesExampleLabel.setAlignmentX(LEFT_ALIGNMENT);
     backupfilesExampleLabel.setAlignmentY(TOP_ALIGNMENT);
     
     backupfilesExampleLabel.setFont(LABEL_FONT_ITALIC);
-    backupfilesExampleLabel.setBackground(exampleLabel.getBackground());
+    backupfilesExampleLabel
+            .setBackground(exampleFilesPanel.getBackground());
 
     updateBackupFilesExampleLabel();
 
@@ -2011,10 +2003,6 @@ public class GPreferences extends JPanel
     gbc.fill = GridBagConstraints.NONE;
 
     gbc.gridy = 0;
-    /*
-    exampleFilesPanel.add(exampleLabel, gbc);
-    gbc.gridy = 1;
-    */
     exampleFilesPanel.add(backupfilesExampleLabel, gbc);
     return exampleFilesPanel;
   }
@@ -2236,7 +2224,6 @@ public class GPreferences extends JPanel
     backupfilesRollMaxSpinner.setEnabled(enabled);
     oldBackupFilesLabel.setEnabled(enabled);
     backupfilesConfirmDelete.setEnabled(enabled);
-    exampleLabel.setEnabled(enabled);
     backupfilesExampleLabel.setEnabled(enabled);
 
     keepRollMaxOptionsEnabled(enabled && !backupfilesKeepAll.isSelected());