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 'docs/2_8_1_Release' into Release_2_8_2_Branch
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
73cf8de
..
daee60f
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.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.
@@
-807,6
+807,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
*/
public void drop(DropTargetDropEvent evt)
{
*/
public void drop(DropTargetDropEvent evt)
{
+ boolean success=true;
Transferable t = evt.getTransferable();
java.util.List files = null;
java.util.List protocols = null;
Transferable t = evt.getTransferable();
java.util.List files = null;
java.util.List protocols = null;
@@
-855,6
+856,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
}
} catch (Exception e)
{
}
} catch (Exception e)
{
+ success=false;
}
if (files != null)
}
if (files != null)
@@
-883,8
+885,10
@@
public class Desktop extends jalview.jbgui.GDesktop implements
}
} catch (Exception ex)
{
}
} catch (Exception ex)
{
+ success=false;
}
}
}
}
+ evt.dropComplete(success); // need this to ensure input focus is properly transfered to any new windows created
}
/**
}
/**
@@
-1368,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());
@@
-1425,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");