git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
04651a0
)
OptionPane warning for out of memory
author
amwaterhouse
<Andrew Waterhouse>
Thu, 15 Sep 2005 10:08:32 +0000
(10:08 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Thu, 15 Sep 2005 10:08:32 +0000
(10:08 +0000)
src/jalview/gui/AlignViewport.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AlignViewport.java
b/src/jalview/gui/AlignViewport.java
index
24d50d4
..
6627941
100755
(executable)
--- a/
src/jalview/gui/AlignViewport.java
+++ b/
src/jalview/gui/AlignViewport.java
@@
-278,10
+278,18
@@
public class AlignViewport
quality.annotations = qannotations;
\r
quality.graphMax = cons.qualityRange[1].floatValue();
\r
}
\r
quality.annotations = qannotations;
\r
quality.graphMax = cons.qualityRange[1].floatValue();
\r
}
\r
- }catch(OutOfMemoryError error)
\r
+ }
\r
+ catch (OutOfMemoryError error)
\r
{
\r
{
\r
- System.out.println("Out of memory calculating conservation.");
\r
+ javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
\r
+ "Out of memory calculating conservation!!"
\r
+ +
\r
+ "\nSee help files for increasing Java Virtual Machine memory."
\r
+ , "Out of memory",
\r
+ javax.swing.JOptionPane.WARNING_MESSAGE);
\r
+ System.out.println("Conservation calculation: " + error);
\r
System.gc();
\r
System.gc();
\r
+
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-358,7
+366,13
@@
public class AlignViewport
\r
}catch(OutOfMemoryError error)
\r
{
\r
\r
}catch(OutOfMemoryError error)
\r
{
\r
- System.out.println("Out of memory calculating consensus.");
\r
+ javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
\r
+ "Out of memory calculating consensus!!"
\r
+ +
\r
+ "\nSee help files for increasing Java Virtual Machine memory."
\r
+ , "Out of memory",
\r
+ javax.swing.JOptionPane.WARNING_MESSAGE);
\r
+ System.out.println("Consensus calculation: " + error);
\r
System.gc();
\r
}
\r
\r
System.gc();
\r
}
\r
\r