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
Merge branch 'develop' into patch/JAL-4110_stdout_for_tests
[jalview.git]
/
src
/
jalview
/
jbgui
/
GAlignFrame.java
diff --git
a/src/jalview/jbgui/GAlignFrame.java
b/src/jalview/jbgui/GAlignFrame.java
index
c0cdfee
..
7daeb37
100755
(executable)
--- a/
src/jalview/jbgui/GAlignFrame.java
+++ b/
src/jalview/jbgui/GAlignFrame.java
@@
-57,7
+57,6
@@
import jalview.bin.Cache;
import jalview.gui.JvSwingUtils;
import jalview.gui.Preferences;
import jalview.io.FileFormats;
import jalview.gui.JvSwingUtils;
import jalview.gui.Preferences;
import jalview.io.FileFormats;
-import jalview.io.exceptions.ImageOutputException;
import jalview.schemes.ResidueColourScheme;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.schemes.ResidueColourScheme;
import jalview.util.MessageManager;
import jalview.util.Platform;
@@
-221,6
+220,7
@@
public class GAlignFrame extends JInternalFrame
{
try
{
{
try
{
+ setFrameIcon(null);
// for Web-page embedding using id=align-frame-div
setName("jalview-alignment");
// for Web-page embedding using id=align-frame-div
setName("jalview-alignment");
@@
-246,7
+246,7
@@
public class GAlignFrame extends JInternalFrame
}
} catch (Exception e)
{
}
} catch (Exception e)
{
- System.err.println(e.toString());
+ jalview.bin.Console.errPrintln(e.toString());
}
if (Platform.allowMnemonics()) // was "not mac and not JS"
}
if (Platform.allowMnemonics()) // was "not mac and not JS"
@@
-1979,19
+1979,19
@@
public class GAlignFrame extends JInternalFrame
protected void createPNG_actionPerformed(ActionEvent object)
{
// TODO Auto-generated method stub
protected void createPNG_actionPerformed(ActionEvent object)
{
// TODO Auto-generated method stub
-
+
}
protected void createEPS_actionPerformed(ActionEvent object)
{
// TODO Auto-generated method stub
}
protected void createEPS_actionPerformed(ActionEvent object)
{
// TODO Auto-generated method stub
-
+
}
protected void createSVG_actionPerformed(ActionEvent object)
{
// TODO Auto-generated method stub
}
protected void createSVG_actionPerformed(ActionEvent object)
{
// TODO Auto-generated method stub
-
+
}
protected void copyHighlightedColumns_actionPerformed(
}
protected void copyHighlightedColumns_actionPerformed(
@@
-2487,7
+2487,6
@@
public class GAlignFrame extends JInternalFrame
{
}
{
}
-
protected void font_actionPerformed(ActionEvent e)
{
}
protected void font_actionPerformed(ActionEvent e)
{
}
@@
-2501,7
+2500,6
@@
public class GAlignFrame extends JInternalFrame
}
}
-
protected void loadTreeMenuItem_actionPerformed(ActionEvent e)
{
protected void loadTreeMenuItem_actionPerformed(ActionEvent e)
{