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-1517 update copyright to version 2.8.2
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
a0e45a6
..
51b6ed4
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
@@
-1372,7
+1372,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
{
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
{
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
- { "jar" }, new String[]
+ { "jvp" }, new String[]
{ "Jalview Project" }, "Jalview Project");
chooser.setFileView(new JalviewFileView());
{ "Jalview Project" }, "Jalview Project");
chooser.setFileView(new JalviewFileView());
@@
-1429,8
+1429,8
@@
public class Desktop extends jalview.jbgui.GDesktop implements
{
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
{
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
- { "jar" }, new String[]
- { "Jalview Project" }, "Jalview Project");
+ { "jvp","jar" }, new String[]
+ { "Jalview Project", "Jalview Project (old)" }, "Jalview Project");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle("Restore state");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle("Restore state");
@@
-1515,6
+1515,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
{
if (progressPanel != null)
{
{
if (progressPanel != null)
{
+ synchronized(progressPanel) {
progressPanel.remove(progbar);
GridLayout gl = (GridLayout) progressPanel.getLayout();
gl.setRows(gl.getRows() - 1);
progressPanel.remove(progbar);
GridLayout gl = (GridLayout) progressPanel.getLayout();
gl.setRows(gl.getRows() - 1);
@@
-1523,6
+1524,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
this.getContentPane().remove(progressPanel);
progressPanel = null;
}
this.getContentPane().remove(progressPanel);
progressPanel = null;
}
+ }
}
validate();
}
}
validate();
}
@@
-1532,9
+1534,9
@@
public class Desktop extends jalview.jbgui.GDesktop implements
fileLoadingCount--;
if (fileLoadingCount < 1)
{
fileLoadingCount--;
if (fileLoadingCount < 1)
{
- for (JPanel flp : fileLoadingPanels)
+ while (fileLoadingPanels.size()>0)
{
{
- removeProgressPanel(flp);
+ removeProgressPanel(fileLoadingPanels.remove(0));
}
fileLoadingPanels.clear();
fileLoadingCount = 0;
}
fileLoadingPanels.clear();
fileLoadingCount = 0;