From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 18 Aug 2016 15:16:27 +0000 (+0100)
Subject: JAL-1693 show warning dialog if unable to make CDS for split frame
X-Git-Tag: Release_2_10_0~100^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6e6c032d26e91ae3cb5c71316bcdb2325591608d;p=jalview.git

JAL-1693 show warning dialog if unable to make CDS for split frame
---

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index f20558d..ac665e3 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1028,9 +1028,11 @@ error.implementation_error_need_to_have_httpresponse = Implementation Error: nee
 error.dbrefsource_implementation_exception =DBRefSource Implementation Exception
 error.implementation_error_dbinstance_must_implement_interface = Implmentation Error - getDbInstances must be given a class that implements jalview.ws.seqfetcher.DbSourceProxy (was given{0})
 error.implementation_error_must_init_dbsources =Implementation error. Must initialise dbSources
-label.view_controller_toggled_marked = {0} {1} columns containing features of type {2}  across {3} sequence(s)
+label.view_controller_toggled_marked = {0} {1} columns {2} features of type {3}  across {4} sequence(s)
 label.toggled = Toggled
 label.marked = Marked
+label.containing = containing
+label.not_containing = not containing
 label.not = not
 label.no_feature_of_type_found = No features of type {0} found.
 label.submission_params = Submission {0}
@@ -1310,3 +1312,5 @@ status.obtaining_mapping_with_nw_alignment = Obtaining mapping with NW alignment
 status.exporting_alignment_as_x_file = Exporting alignment as {0} file
 label.column = Column
 label.sequence = Sequence
+label.cant_map_cds = Unable to map CDS to protein\nCDS missing or incomplete
+label.operation_failed = Operation failed
diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties
index 3f04bad..92d4d78 100644
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@ -962,9 +962,11 @@ error.implementation_error_need_to_have_httpresponse = Error de implementaci
 error.dbrefsource_implementation_exception = Excepción de implementación DBRefSource
 error.implementation_error_dbinstance_must_implement_interface = Error de Implementación- getDbInstances debe recibir una clase que implemente jalview.ws.seqfetcher.DbSourceProxy (recibió {0})
 error.implementation_error_must_init_dbsources =Error de implementación. Debe inicializar dbSources
-label.view_controller_toggled_marked = {0} {1} columnas conteniendo características del tipo {2} en {3} secuencia(s)
+label.view_controller_toggled_marked = {0} {1} columnas {2} características del tipo {3} en {4} secuencia(s)
 label.toggled = Invertida
 label.marked = Marcada
+label.containing = conteniendo
+label.not_containing = no conteniendo
 label.not = no
 label.no_feature_of_type_found = No se han encontrado características del tipo {0}.
 label.submission_params = Envío {0}
@@ -1317,3 +1319,5 @@ status.obtaining_mapping_with_nw_alignment=Obteniendo mapeo por alineamiento Nee
 status.exporting_alignment_as_x_file = Exportando alineamiento como fichero tipo {0}
 label.column = Columna
 label.sequence = Secuencia
+label.cant_map_cds = No se pudo mapear CDS a proteína\nDatos CDS faltantes o incompletos
+label.operation_failed = Operación fallada
diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index b0debf8..21f4aac 100644
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -4765,6 +4765,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                       xrefsAlignment.getSequencesArray());
               if (copyAlignment.getHeight() == 0)
               {
+                JOptionPane.showMessageDialog(AlignFrame.this,
+                        MessageManager.getString("label.cant_map_cds"),
+                        MessageManager.getString("label.operation_failed"),
+                        JOptionPane.OK_OPTION);
                 System.err.println("Failed to make CDS alignment");
               }