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:
fbd682c
)
Handle feature settings files loaded via drag and drop or import
feature/JAL-4315_fc_draganddrop
author
James Procter
<j.procter@dundee.ac.uk>
Mon, 30 Oct 2023 11:24:22 +0000
(11:24 +0000)
committer
James Procter
<j.procter@dundee.ac.uk>
Mon, 30 Oct 2023 11:24:22 +0000
(11:24 +0000)
src/jalview/gui/AlignFrame.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
ac8ffb9
..
958ebcc
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-4818,7
+4818,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
* Object[] { String,SequenceI}
*/
ArrayList<Object[]> filesmatched = new ArrayList<>();
* Object[] { String,SequenceI}
*/
ArrayList<Object[]> filesmatched = new ArrayList<>();
- ArrayList<Object> filesnotmatched = new ArrayList<>();
+ ArrayList<Object[]> filesnotmatched = new ArrayList<>();
for (int i = 0; i < files.size(); i++)
{
// BH 2018
for (int i = 0; i < files.size(); i++)
{
// BH 2018
@@
-4864,9
+4864,9
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
mtch = idm.findAllIdMatches(pdbfn);
}
}
mtch = idm.findAllIdMatches(pdbfn);
}
+ FileFormatI type=null;
if (mtch != null)
{
if (mtch != null)
{
- FileFormatI type;
try
{
type = new IdentifyFile().identify(file, protocol);
try
{
type = new IdentifyFile().identify(file, protocol);
@@
-4882,7
+4882,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
// File wasn't named like one of the sequences or wasn't a PDB
// file.
}
// File wasn't named like one of the sequences or wasn't a PDB
// file.
- filesnotmatched.add(file);
+ filesnotmatched.add(new Object[] { file, protocol, type});
}
}
int assocfiles = 0;
}
}
int assocfiles = 0;
@@
-4936,7
+4936,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
*/
for (Object[] o : filesmatched)
{
*/
for (Object[] o : filesmatched)
{
- filesnotmatched.add(o[0]);
+ filesnotmatched.add(new Object[] { o[0], o[1]});
}
}
}
}
}
}
@@
-4958,9
+4958,9
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
return;
}
{
return;
}
- for (Object fn : filesnotmatched)
+ for (Object[] fn : filesnotmatched)
{
{
- loadJalviewDataFile(fn, null, null, null);
+ loadJalviewDataFile(fn[0], (DataSourceType) fn[1], (FileFormatI)fn[2], null);
}
}
}
}
@@
-5056,7
+5056,19
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
format = new IdentifyFile().identify(file, sourceType);
}
{
format = new IdentifyFile().identify(file, sourceType);
}
- if (FileFormat.ScoreMatrix == format)
+ if (FileFormat.FeatureSettings == format)
+ {
+ if (featureSettings != null)
+ {
+ featureSettings.load(file, sourceType);
+ }
+ else
+ {
+ FeatureSettings.loadFeatureSettingsFile(getFeatureRenderer(),
+ fileObject, sourceType);
+ }
+ }
+ else if (FileFormat.ScoreMatrix == format)
{
ScoreMatrixFile sm = new ScoreMatrixFile(
new FileParse(file, sourceType));
{
ScoreMatrixFile sm = new ScoreMatrixFile(
new FileParse(file, sourceType));