git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1503 update version in GPL header
[jalview.git]
/
src
/
jalview
/
io
/
FileLoader.java
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
0dddeca
..
b578724
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
@@
-24,6
+24,7
@@
import javax.swing.*;
import jalview.datamodel.*;
import jalview.gui.*;
import jalview.datamodel.*;
import jalview.gui.*;
+import jalview.util.MessageManager;
public class FileLoader implements Runnable
{
public class FileLoader implements Runnable
{
@@
-318,8
+319,7
@@
public class FileLoader implements Runnable
alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
- alignFrame.statusBar.setText("Successfully loaded file "
- + title);
+ alignFrame.statusBar.setText(MessageManager.formatMessage("label.successfully_loaded_file", new String[]{title}));
if (!protocol.equals(AppletFormatAdapter.PASTE))
alignFrame.setFileName(file, format);
if (!protocol.equals(AppletFormatAdapter.PASTE))
alignFrame.setFileName(file, format);
@@
-357,7
+357,7
@@
public class FileLoader implements Runnable
public void run()
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
public void run()
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
- errorMessage, "Error loading file",
+ errorMessage, MessageManager.getString("label.error_loading_file"),
JOptionPane.WARNING_MESSAGE);
}
});
JOptionPane.WARNING_MESSAGE);
}
});
@@
-382,8
+382,8
@@
public class FileLoader implements Runnable
public void run()
{
javax.swing.JOptionPane.showInternalMessageDialog(
public void run()
{
javax.swing.JOptionPane.showInternalMessageDialog(
- Desktop.desktop, "Encountered problems opening " + file
- + "!!", "File open error",
+ Desktop.desktop, MessageManager.formatMessage("label.problems_opening_file", new String[]{file}),
+ MessageManager.getString("label.file_open_error"),
javax.swing.JOptionPane.WARNING_MESSAGE);
}
});
javax.swing.JOptionPane.WARNING_MESSAGE);
}
});