From ba74c240931531706fd2f95bde111033e513e71e Mon Sep 17 00:00:00 2001 From: gmungoc Date: Wed, 24 Aug 2016 14:39:05 +0100 Subject: [PATCH] JAL-1355 correct 'thereshold' to 'threshold' in message keys --- resources/lang/Messages.properties | 24 ++++++++++---------- resources/lang/Messages_es.properties | 24 ++++++++++---------- src/jalview/appletgui/AlignFrame.java | 4 ++-- src/jalview/appletgui/AnnotationColourChooser.java | 8 +++---- src/jalview/appletgui/AnnotationRowFilter.java | 6 ++--- src/jalview/appletgui/FeatureColourChooser.java | 6 ++--- src/jalview/appletgui/SliderPanel.java | 2 +- src/jalview/gui/AnnotationColourChooser.java | 2 +- src/jalview/gui/AnnotationRowFilter.java | 6 ++--- src/jalview/gui/FeatureColourChooser.java | 8 +++---- src/jalview/gui/RedundancyPanel.java | 2 +- src/jalview/gui/SliderPanel.java | 2 +- src/jalview/gui/TextColourChooser.java | 4 ++-- src/jalview/jbgui/GAlignFrame.java | 4 ++-- src/jalview/ws/SequenceFetcher.java | 4 +--- 15 files changed, 52 insertions(+), 54 deletions(-) diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties index 1e91f35..80ac9ca 100644 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@ -221,8 +221,8 @@ label.proteins = Proteins label.to_new_alignment = To New Alignment label.to_this_alignment = Add To This Alignment label.apply_colour_to_all_groups = Apply Colour To All Groups -label.modify_identity_thereshold = Modify Identity Threshold... -label.modify_conservation_thereshold = Modify Conservation Threshold... +label.modify_identity_threshold = Modify Identity Threshold... +label.modify_conservation_threshold = Modify Conservation Threshold... label.input_from_textbox = Input from textbox label.centre_column_labels = Centre column labels label.automatic_scrolling = Automatic Scrolling @@ -515,10 +515,10 @@ label.reset_min_max_colours_to_defaults = Reset min and max colours to defaults label.align_structures_using_linked_alignment_views = Align structures using {0} linked alignment views label.connect_to_session = Connect to session {0} label.threshold_feature_display_by_score = Threshold the feature display by score. -label.threshold_feature_no_thereshold = No Threshold -label.threshold_feature_above_thereshold = Above Threshold -label.threshold_feature_below_thereshold = Below Threshold -label.adjust_thereshold = Adjust threshold +label.threshold_feature_no_threshold = No Threshold +label.threshold_feature_above_threshold = Above Threshold +label.threshold_feature_below_threshold = Below Threshold +label.adjust_threshold = Adjust threshold label.toggle_absolute_relative_display_threshold = Toggle between absolute and relative display threshold. label.display_features_same_type_different_label_using_different_colour = Display features of the same type with a different label using a different colour. (e.g. domain features) label.select_colour_minimum_value = Select Colour for Minimum Value @@ -859,7 +859,7 @@ label.service_url = Service URL label.copied_sequences = Copied sequences label.cut_sequences = Cut Sequences label.conservation_colour_increment = Conservation Colour Increment ({0}) -label.percentage_identity_thereshold = Percentage Identity Threshold ({0}) +label.percentage_identity_threshold = Percentage Identity Threshold ({0}) label.error_unsupported_owwner_user_colour_scheme = Unsupported owner for User Colour scheme dialog label.save_alignment_to_file = Save Alignment to file label.save_features_to_file = Save Features to File @@ -902,7 +902,7 @@ error.null_from_clone1 = Null from clone1! error.implementation_error_sortbyfeature = Implementation Error - sortByFeature method must be one of FEATURE_SCORE, FEATURE_LABEL or FEATURE_DENSITY. error.not_yet_implemented = Not yet implemented error.unknown_type_dna_or_pep = Unknown Type {0} - dna or pep are the only allowed values. -error.implementation_error_dont_know_thereshold_annotationcolourgradient = Implementation error: don't know about threshold setting for current AnnotationColourGradient. +error.implementation_error_dont_know_threshold_annotationcolourgradient = Implementation error: don't know about threshold setting for current AnnotationColourGradient. error.invalid_separator_parameter = Invalid separator parameter - must be non-zero length error.alignment_cigararray_not_implemented = Alignment(CigarArray) not yet implemented error.empty_view_cannot_be_updated = empty view cannot be updated. @@ -933,7 +933,7 @@ error.not_implemented_clone = Clone: Not implemented error.call_setprogressbar_before_registering_handler = call setProgressBar before registering the progress bar's handler. label.cancelled_params = Cancelled {0} error.implementation_error_cannot_show_view_alignment_frame = Implementation error: cannot show a view from another alignment in an AlignFrame. -error.implementation_error_dont_know_about_thereshold_setting = Implementation error: don't know about threshold setting for current AnnotationColourGradient. +error.implementation_error_dont_know_about_threshold_setting = Implementation error: don't know about threshold setting for current AnnotationColourGradient. error.eps_generation_not_implemented = EPS Generation not yet implemented error.png_generation_not_implemented = PNG Generation not yet implemented error.try_join_vamsas_session_another = Trying to join a vamsas session when another is already connected @@ -1007,7 +1007,7 @@ label.pca_recalculating = Recalculating PCA label.pca_calculating = Calculating PCA label.select_foreground_colour = Choose foreground colour label.select_colour_for_text = Select Colour for Text -label.adjunst_foreground_text_colour_thereshold = Adjust Foreground Text Colour Threshold +label.adjunst_foreground_text_colour_threshold = Adjust Foreground Text Colour Threshold label.select_subtree_colour = Select Sub-Tree Colour label.create_new_sequence_features = Create New Sequence Feature(s) label.amend_delete_features = Amend/Delete Features for {0} @@ -1159,8 +1159,8 @@ label.edit_jabaws_url = Edit JABAWS URL label.add_jabaws_url = Add new JABAWS URL label.news_from_jalview = News from http://www.jalview.org label.cut_paste_alignmen_file = Cut & Paste Alignment File -label.enter_redundancy_thereshold = Enter the redundancy threshold -label.select_dark_light_set_thereshold = Select a dark and light text colour, then set the threshold to
switch between colours, based on background colour +label.enter_redundancy_threshold = Enter the redundancy threshold +label.select_dark_light_set_threshold = Select a dark and light text colour, then set the threshold to
switch between colours, based on background colour label.select_feature_colour = Select Feature Colour label.delete_all = Delete all sequences warn.delete_all = Deleting all sequences will close the alignment window.
Confirm deletion or Cancel. diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties index 4738440..d8b2a61 100644 --- a/resources/lang/Messages_es.properties +++ b/resources/lang/Messages_es.properties @@ -207,8 +207,8 @@ label.nucleotide = Nucle label.to_new_alignment = A nuevo alineamiento label.to_this_alignment = Añadir a este alineamiento label.apply_colour_to_all_groups = Aplicar color a todos los grupos -label.modify_identity_thereshold = Modificar el umbral de identidad... -label.modify_conservation_thereshold = Modificar el umbral de conservación... +label.modify_identity_threshold = Modificar el umbral de identidad... +label.modify_conservation_threshold = Modificar el umbral de conservación... label.input_from_textbox = Introducir desde el cuadro de texto label.centre_column_labels = Centrar las etiquetas de las columnas label.automatic_scrolling = Desplazamiento automático @@ -477,10 +477,10 @@ label.reset_min_max_colours_to_defaults = Reiniciar los colores min y max colour label.align_structures_using_linked_alignment_views = Alinear las estructuras utlizando las {0} vistas de alineamiento enlazadas label.connect_to_session = Conectar a la sesión {0} label.threshold_feature_display_by_score = Filtrar la característica mostrada por puntuación. -label.threshold_feature_no_thereshold = Sin umbral -label.threshold_feature_above_thereshold = Por encima del umbral -label.threshold_feature_below_thereshold = Por debajo del umbral -label.adjust_thereshold = Ajustar umbral +label.threshold_feature_no_threshold = Sin umbral +label.threshold_feature_above_threshold = Por encima del umbral +label.threshold_feature_below_threshold = Por debajo del umbral +label.adjust_threshold = Ajustar umbral label.toggle_absolute_relative_display_threshold = Cambiar entre mostrar el umbral absoluto y el relativo. label.display_features_same_type_different_label_using_different_colour = Mostrar las características del mismo tipo con una etiqueta diferente y empleando un color distinto (p.e. características del dominio) label.select_colour_minimum_value = Seleccionar el color para el valor mínimo @@ -792,7 +792,7 @@ label.service_url = URL del servicio label.copied_sequences = Secuencias copiadas label.cut_sequences = Cortar secuencias label.conservation_colour_increment = Incremento de Conservación del Color ({0}) -label.percentage_identity_thereshold = Umbral del Porcentaje de Identidad ({0}) +label.percentage_identity_threshold = Umbral del Porcentaje de Identidad ({0}) label.error_unsupported_owwner_user_colour_scheme = Propietario no soportado para el diálogo del Esquema Cromático del Usuario label.save_alignment_to_file = Guardar Alineamiento en fichero label.save_features_to_file = Guardar Características en un fichero @@ -835,7 +835,7 @@ error.null_from_clone1 = Nulo de clone1! error.implementation_error_sortbyfeature = Error de implementación - sortByFeature debe ser uno de FEATURE_SCORE, FEATURE_LABEL o FEATURE_DENSITY. error.not_yet_implemented = No se ha implementado todavía error.unknown_type_dna_or_pep = Tipo desconocido {0} - dna o pep son los únicos valores permitidos -error.implementation_error_dont_know_thereshold_annotationcolourgradient = Error de implementación: no se conoce el valor umbral para el AnnotationColourGradient actual. +error.implementation_error_dont_know_threshold_annotationcolourgradient = Error de implementación: no se conoce el valor umbral para el AnnotationColourGradient actual. error.invalid_separator_parameter = Separador de parámetros no válido - debe tener longitud mayor que cero error.alignment_cigararray_not_implemented = Alignment(CigarArray) no se ha implementado todavía error.empty_view_cannot_be_updated = una vista vacía no se puede actualizar. @@ -866,7 +866,7 @@ error.not_implemented_clone = Clonar: no implementado error.call_setprogressbar_before_registering_handler = llamada a setProgressBar antes de registrar el manejador de la barra de estado label.cancelled_params = {0} cancelado error.implementation_error_cannot_show_view_alignment_frame = Error de implementación: no es posible mostrar una vista de otro alineamiento en un AlignFrame. -error.implementation_error_dont_know_about_thereshold_setting = Error de implementación: no se conoce la configuración del umbral para el AnnotationColourGradient actual. +error.implementation_error_dont_know_about_threshold_setting = Error de implementación: no se conoce la configuración del umbral para el AnnotationColourGradient actual. error.eps_generation_not_implemented = La generación de EPS no se ha implementado todavía error.png_generation_not_implemented = La generación de PNG no se ha implementado todavía error.try_join_vamsas_session_another = Tratando de establecer una sesión VAMSAS cuando ya había otra conectada @@ -940,7 +940,7 @@ label.pca_recalculating = Recalculando PCA label.pca_calculating = Calculando PCA label.select_foreground_colour = Escoger color del primer plano label.select_colour_for_text = Seleccione el color del texto -label.adjunst_foreground_text_colour_thereshold = Ajustar el umbral del color del texto en primer plano +label.adjunst_foreground_text_colour_threshold = Ajustar el umbral del color del texto en primer plano label.select_subtree_colour = Seleccioanr el color del sub-árbol label.create_new_sequence_features = Crear nueva(s) característica(s) de secuencia label.amend_delete_features = Arrelgar/Borrar características de {0} @@ -1083,8 +1083,8 @@ label.edit_jabaws_url = Editar JABAWS URL label.add_jabaws_url = Añadir nueva JABAWS URL label.news_from_jalview = Noticias de http://www.jalview.org label.cut_paste_alignmen_file = Cortar & Pegar fichero de alineamiento -label.enter_redundancy_thereshold = Introducir el umbral de redundancia -label.select_dark_light_set_thereshold = Seleccionar un color oscuro y un color claro para el texto y establecer el umbral en que
cambiar entre colores, basándose en el color de fondo +label.enter_redundancy_threshold = Introducir el umbral de redundancia +label.select_dark_light_set_threshold = Seleccionar un color oscuro y un color claro para el texto y establecer el umbral en que
cambiar entre colores, basándose en el color de fondo label.select_feature_colour = Seleccionar color de las características label.ignore_gaps_consensus = Ignorar huecos en el consenso label.show_group_histogram = Mostrar histograma de grupo diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 849c05c..0312015 100644 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -3517,10 +3517,10 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, nucleotideColour.setLabel(MessageManager.getString("label.nucleotide")); nucleotideColour.addActionListener(this); modifyPID.setLabel(MessageManager - .getString("label.modify_identity_thereshold")); + .getString("label.modify_identity_threshold")); modifyPID.addActionListener(this); modifyConservation.setLabel(MessageManager - .getString("label.modify_conservation_thereshold")); + .getString("label.modify_conservation_threshold")); modifyConservation.addActionListener(this); annotationColour.setLabel(MessageManager .getString("action.by_annotation")); diff --git a/src/jalview/appletgui/AnnotationColourChooser.java b/src/jalview/appletgui/AnnotationColourChooser.java index 57b182c..5a9cd55 100644 --- a/src/jalview/appletgui/AnnotationColourChooser.java +++ b/src/jalview/appletgui/AnnotationColourChooser.java @@ -138,11 +138,11 @@ public class AnnotationColourChooser extends Panel implements } threshold.addItem(MessageManager - .getString("label.threshold_feature_no_thereshold")); + .getString("label.threshold_feature_no_threshold")); threshold.addItem(MessageManager - .getString("label.threshold_feature_above_thereshold")); + .getString("label.threshold_feature_above_threshold")); threshold.addItem(MessageManager - .getString("label.threshold_feature_below_thereshold")); + .getString("label.threshold_feature_below_threshold")); if (oldcs instanceof AnnotationColourGradient) { @@ -162,7 +162,7 @@ public class AnnotationColourChooser extends Panel implements default: throw new Error( MessageManager - .getString("error.implementation_error_dont_know_thereshold_annotationcolourgradient")); + .getString("error.implementation_error_dont_know_threshold_annotationcolourgradient")); } thresholdIsMin.setState(acg.thresholdIsMinMax); thresholdValue.setText("" + acg.getAnnotationThreshold()); diff --git a/src/jalview/appletgui/AnnotationRowFilter.java b/src/jalview/appletgui/AnnotationRowFilter.java index 4cb5ede..fc49de5 100644 --- a/src/jalview/appletgui/AnnotationRowFilter.java +++ b/src/jalview/appletgui/AnnotationRowFilter.java @@ -186,11 +186,11 @@ public abstract class AnnotationRowFilter extends Panel protected void populateThresholdComboBox(Choice threshold) { threshold.addItem(MessageManager - .getString("label.threshold_feature_no_thereshold")); + .getString("label.threshold_feature_no_threshold")); threshold.addItem(MessageManager - .getString("label.threshold_feature_above_thereshold")); + .getString("label.threshold_feature_above_threshold")); threshold.addItem(MessageManager - .getString("label.threshold_feature_below_thereshold")); + .getString("label.threshold_feature_below_threshold")); } public jalview.datamodel.AlignmentAnnotation getCurrentAnnotation() diff --git a/src/jalview/appletgui/FeatureColourChooser.java b/src/jalview/appletgui/FeatureColourChooser.java index 3c04ccd..0e85017 100644 --- a/src/jalview/appletgui/FeatureColourChooser.java +++ b/src/jalview/appletgui/FeatureColourChooser.java @@ -191,11 +191,11 @@ public class FeatureColourChooser extends Panel implements ActionListener, jPanel4.setBackground(Color.white); threshold.addItemListener(this); threshold.addItem(MessageManager - .getString("label.threshold_feature_no_thereshold")); + .getString("label.threshold_feature_no_threshold")); threshold.addItem(MessageManager - .getString("label.threshold_feature_above_thereshold")); + .getString("label.threshold_feature_above_threshold")); threshold.addItem(MessageManager - .getString("label.threshold_feature_below_thereshold")); + .getString("label.threshold_feature_below_threshold")); thresholdValue.addActionListener(this); slider.setBackground(Color.white); slider.setEnabled(false); diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java index 2fc15d0..2c53c08 100644 --- a/src/jalview/appletgui/SliderPanel.java +++ b/src/jalview/appletgui/SliderPanel.java @@ -132,7 +132,7 @@ public class SliderPanel extends Panel implements ActionListener, pid.cs = cs; } PIDSlider.setTitle(MessageManager - .formatMessage("label.percentage_identity_thereshold", + .formatMessage("label.percentage_identity_threshold", new String[] { source })); if (ap.av.getAlignment().getGroups() != null) diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java index 19eed27..93c9a6b 100644 --- a/src/jalview/gui/AnnotationColourChooser.java +++ b/src/jalview/gui/AnnotationColourChooser.java @@ -141,7 +141,7 @@ public class AnnotationColourChooser extends AnnotationRowFilter default: throw new Error( MessageManager - .getString("error.implementation_error_dont_know_about_thereshold_setting")); + .getString("error.implementation_error_dont_know_about_threshold_setting")); } thresholdIsMin.setSelected(acg.thresholdIsMinMax); thresholdValue.setText("" + acg.getAnnotationThreshold()); diff --git a/src/jalview/gui/AnnotationRowFilter.java b/src/jalview/gui/AnnotationRowFilter.java index 17298ba..f0bea60 100644 --- a/src/jalview/gui/AnnotationRowFilter.java +++ b/src/jalview/gui/AnnotationRowFilter.java @@ -257,11 +257,11 @@ public abstract class AnnotationRowFilter extends JPanel protected void populateThresholdComboBox(JComboBox threshold) { threshold.addItem(MessageManager - .getString("label.threshold_feature_no_thereshold")); + .getString("label.threshold_feature_no_threshold")); threshold.addItem(MessageManager - .getString("label.threshold_feature_above_thereshold")); + .getString("label.threshold_feature_above_threshold")); threshold.addItem(MessageManager - .getString("label.threshold_feature_below_thereshold")); + .getString("label.threshold_feature_below_threshold")); } protected void seqAssociated_actionPerformed(ActionEvent arg0, diff --git a/src/jalview/gui/FeatureColourChooser.java b/src/jalview/gui/FeatureColourChooser.java index 79217ea..5594e1a 100644 --- a/src/jalview/gui/FeatureColourChooser.java +++ b/src/jalview/gui/FeatureColourChooser.java @@ -242,11 +242,11 @@ public class FeatureColourChooser extends JalviewDialog threshold.setToolTipText(MessageManager .getString("label.threshold_feature_display_by_score")); threshold.addItem(MessageManager - .getString("label.threshold_feature_no_thereshold")); // index 0 + .getString("label.threshold_feature_no_threshold")); // index 0 threshold.addItem(MessageManager - .getString("label.threshold_feature_above_thereshold")); // index 1 + .getString("label.threshold_feature_above_threshold")); // index 1 threshold.addItem(MessageManager - .getString("label.threshold_feature_below_thereshold")); // index 2 + .getString("label.threshold_feature_below_threshold")); // index 2 jPanel3.setLayout(flowLayout2); thresholdValue.addActionListener(new ActionListener() { @@ -263,7 +263,7 @@ public class FeatureColourChooser extends JalviewDialog slider.setOpaque(false); slider.setPreferredSize(new Dimension(100, 32)); slider.setToolTipText(MessageManager - .getString("label.adjust_thereshold")); + .getString("label.adjust_threshold")); thresholdValue.setEnabled(false); thresholdValue.setColumns(7); jPanel3.setBackground(Color.white); diff --git a/src/jalview/gui/RedundancyPanel.java b/src/jalview/gui/RedundancyPanel.java index 7fb0593..a9d2690 100755 --- a/src/jalview/gui/RedundancyPanel.java +++ b/src/jalview/gui/RedundancyPanel.java @@ -172,7 +172,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable progress = null; label.setText(MessageManager - .getString("label.enter_redundancy_thereshold")); + .getString("label.enter_redundancy_threshold")); slider.setVisible(true); applyButton.setEnabled(true); valueField.setVisible(true); diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java index e1e70dc..c3fec4f 100755 --- a/src/jalview/gui/SliderPanel.java +++ b/src/jalview/gui/SliderPanel.java @@ -220,7 +220,7 @@ public class SliderPanel extends GSliderPanel } PIDSlider.setTitle(MessageManager - .formatMessage("label.percentage_identity_thereshold", + .formatMessage("label.percentage_identity_threshold", new String[] { source })); if (ap.av.getAlignment().getGroups() != null) diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java index f1c6768..39d9c1d 100644 --- a/src/jalview/gui/TextColourChooser.java +++ b/src/jalview/gui/TextColourChooser.java @@ -81,7 +81,7 @@ public class TextColourChooser new JLabel( "" + MessageManager - .getString("label.select_dark_light_set_thereshold") + .getString("label.select_dark_light_set_threshold") + ""), BorderLayout.NORTH); panel.add(col1); panel.add(slider); @@ -133,7 +133,7 @@ public class TextColourChooser ap, bigpanel, MessageManager - .getString("label.adjunst_foreground_text_colour_thereshold"), + .getString("label.adjunst_foreground_text_colour_threshold"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, null); diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 16d7422..d7def6b 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -1589,7 +1589,7 @@ public class GAlignFrame extends JInternalFrame }); JMenuItem modifyPID = new JMenuItem( - MessageManager.getString("label.modify_identity_thereshold")); + MessageManager.getString("label.modify_identity_threshold")); modifyPID.addActionListener(new ActionListener() { @Override @@ -1599,7 +1599,7 @@ public class GAlignFrame extends JInternalFrame } }); modifyConservation.setText(MessageManager - .getString("label.modify_conservation_thereshold")); + .getString("label.modify_conservation_threshold")); modifyConservation.addActionListener(new ActionListener() { @Override diff --git a/src/jalview/ws/SequenceFetcher.java b/src/jalview/ws/SequenceFetcher.java index 65179a2..d5065b5 100644 --- a/src/jalview/ws/SequenceFetcher.java +++ b/src/jalview/ws/SequenceFetcher.java @@ -27,10 +27,8 @@ import jalview.ws.dbsources.EmblSource; import jalview.ws.dbsources.Pdb; import jalview.ws.dbsources.PfamFull; import jalview.ws.dbsources.PfamSeed; -import jalview.ws.dbsources.RfamFull; import jalview.ws.dbsources.RfamSeed; import jalview.ws.dbsources.Uniprot; -import jalview.ws.dbsources.UniprotName; import jalview.ws.dbsources.das.api.jalviewSourceI; import jalview.ws.seqfetcher.ASequenceFetcher; import jalview.ws.seqfetcher.DbSourceProxy; @@ -62,7 +60,7 @@ public class SequenceFetcher extends ASequenceFetcher addDBRefSourceImpl(EmblSource.class); addDBRefSourceImpl(EmblCdsSource.class); addDBRefSourceImpl(Uniprot.class); - addDBRefSourceImpl(UniprotName.class); + // addDBRefSourceImpl(UniprotName.class); addDBRefSourceImpl(Pdb.class); addDBRefSourceImpl(PfamFull.class); addDBRefSourceImpl(PfamSeed.class); -- 1.7.10.2