Merge branch 'pathc_JAL-1354' into develop

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 322bc11..5315376 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -291,7 +291,7 @@ label.successfully_saved_to_file_in_format = Successfully saved to file: {0} in
 label.copied_sequences_to_clipboard = Copied {0} sequences to clipboard.\r
 label.check_file_matches_sequence_ids_alignment = Check that the file matches sequence IDs in the alignment.\r
 label.problem_reading_tcoffee_score_file = Problem reading T-COFFEE score file\r
-label.source_to_target = {0} to '{1}'\r
+label.source_to_target = {0} ... {1}\r
 label.per_sequence_only= Per-sequence only\r
 label.to_file = to File\r
 label.to_textbox = to Textbox\r
@@ -682,7 +682,7 @@ label.your_sequences_have_been_verified = Your sequences have been verified agai
 label.sequence_names_updated = Sequence names updated\r
 label.dbref_search_completed = DBRef search completed\r
 label.show_all_chains = Show all chains\r
-label.fetch_all_param = Fetch all '{0}'\r
+label.fetch_all_param = Fetch all {0}\r
 label.paste_new_window = Paste To New Window\r
 label.settings_for_param = Settings for {0}\r
 label.view_params = View {0}\r

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 2dfeb51..b07593d 100755 (executable)
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -18,13 +18,13 @@
  */
 package jalview.bin;
 
-import jalview.util.MessageManager;
 import jalview.ws.dbsources.das.api.DasSourceRegistryI;
 import jalview.ws.dbsources.das.datamodel.DasSourceRegistry;
 
 import java.awt.Color;
 import java.io.*;
 import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 import org.apache.log4j.*;
@@ -781,7 +781,8 @@ public class Cache
     setProperty(property, jalview.util.Format.getHexString(colour));
   }
 
-  public static final DateFormat date_format = DateFormat.getDateInstance(DateFormat.LONG,MessageManager.getLocale());
+  public static final DateFormat date_format = SimpleDateFormat
+          .getDateTimeInstance();
 
   /**
    * store a date in a jalview property

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 180a72c..d11bd31 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -5302,7 +5302,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                   ++i;
                   if (++icomp >= mcomp || i == (otherdb.size()))
                   {
-                    ifetch.setText(MessageManager.formatMessage("label.source_to_target",new String[]{imname,sname}));
+                    ifetch.setText(MessageManager.formatMessage("label.source_to_target",imname,sname));
                     dfetch.add(ifetch);
                     ifetch = new JMenu();
                     imname = null;
@@ -5314,7 +5314,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
               ++dbi;
               if (comp >= mcomp || dbi >= (dbclasses.length))
               {
-                dfetch.setText(MessageManager.formatMessage("label.source_to_target",new String[]{mname,dbclass}));
+                dfetch.setText(MessageManager.formatMessage("label.source_to_target",mname,dbclass));
                 rfetch.add(dfetch);
                 dfetch = new JMenu();
                 mname = null;

diff --git a/src/jalview/gui/BlogReader.java b/src/jalview/gui/BlogReader.java
index da92179..8326e35 100644 (file)
--- a/src/jalview/gui/BlogReader.java
+++ b/src/jalview/gui/BlogReader.java
@@ -352,7 +352,7 @@ public class BlogReader extends JPanel
     java.util.Date earliest = null;
     try
     {
-      earliest = new SimpleDateFormat("YYYY-MM-DD",MessageManager.getLocale()).parse(chan
+      earliest = new SimpleDateFormat("YYYY-MM-DD").parse(chan
               .getHTTPLastModified());
     } catch (Exception x)
     {

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 170f6b9..d95e1b1 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -1042,7 +1042,7 @@ public class GAlignFrame extends JInternalFrame
         noColourmenuItem_actionPerformed(e);
       }
     });
-    wrapMenuItem.setText(MessageManager.getString("labe.wrap"));
+    wrapMenuItem.setText(MessageManager.getString("label.wrap"));
     wrapMenuItem.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)

diff --git a/src/jalview/util/MessageManager.java b/src/jalview/util/MessageManager.java
index fcf2bfa..5f7f0e2 100644 (file)
--- a/src/jalview/util/MessageManager.java
+++ b/src/jalview/util/MessageManager.java
@@ -61,7 +61,7 @@ public class MessageManager {
        public static Locale getLocale() {
                return loc;
        }
-       public static String formatMessage(String key, Object[] params){
-               return MessageFormat.format(rb.getString(key), params);
+       public static String formatMessage(String key, Object... params){
+               return MessageFormat.format(rb.getString(key), (Object[]) params);
        }
 }