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-3066 Fix NullPointerException thrown when showing HMMER run dialog
[jalview.git]
/
src
/
jalview
/
gui
/
AquaInternalFrameManager.java
diff --git
a/src/jalview/gui/AquaInternalFrameManager.java
b/src/jalview/gui/AquaInternalFrameManager.java
index
ea809eb
..
8ef204c
100644
(file)
--- a/
src/jalview/gui/AquaInternalFrameManager.java
+++ b/
src/jalview/gui/AquaInternalFrameManager.java
@@
-60,7
+60,7
@@
import javax.swing.JInternalFrame;
* around to the bottom of the window stack (as the original implementation
* does)
*
* around to the bottom of the window stack (as the original implementation
* does)
*
- * @see com.sun.java.swing.plaf.windows.WindowsDesktopManager
+ * see com.sun.java.swing.plaf.windows.WindowsDesktopManager
*/
public class AquaInternalFrameManager extends DefaultDesktopManager
{
*/
public class AquaInternalFrameManager extends DefaultDesktopManager
{
@@
-152,11
+152,12
@@
public class AquaInternalFrameManager extends DefaultDesktopManager
super.activateFrame(f);
}
super.activateFrame(f);
}
- // If this is the first activation, add to child list.
- if (fChildFrames.indexOf(f) == -1)
+ // add or relocate to top of stack
+ if (fChildFrames.indexOf(f) != -1)
{
{
- fChildFrames.addElement(f);
+ fChildFrames.remove(f);
}
}
+ fChildFrames.addElement(f);
if (fCurrentFrame != null && f != fCurrentFrame)
{
if (fCurrentFrame != null && f != fCurrentFrame)
{
@@
-254,4
+255,4
@@
public class AquaInternalFrameManager extends DefaultDesktopManager
{
switchFrame(false);
}
{
switchFrame(false);
}
-}
\ No newline at end of file
+}