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
Get viewport and seqcanvas methods
[jalview.git]
/
src
/
jalview
/
analysis
/
SeqsetUtils.java
diff --git
a/src/jalview/analysis/SeqsetUtils.java
b/src/jalview/analysis/SeqsetUtils.java
index
11a31be
..
564e3f1
100755
(executable)
--- a/
src/jalview/analysis/SeqsetUtils.java
+++ b/
src/jalview/analysis/SeqsetUtils.java
@@
-51,8
+51,8
@@
public class SeqsetUtils
sqinfo.put("End", new Integer(seq.getEnd()));
\r
sqinfo.put("SeqFeatures", (seq.getSequenceFeatures() !=null) ? seq.getSequenceFeatures() : new Vector());
\r
sqinfo.put("PdbId",
\r
sqinfo.put("End", new Integer(seq.getEnd()));
\r
sqinfo.put("SeqFeatures", (seq.getSequenceFeatures() !=null) ? seq.getSequenceFeatures() : new Vector());
\r
sqinfo.put("PdbId",
\r
- (seq.getPDBId() != null) ? seq.getPDBId() : new String(""));
\r
-
\r
+ (seq.getPDBId() != null) ? seq.getPDBId() : new Vector());
\r
+ sqinfo.put("datasetSequence", (seq.getDatasetSequence() !=null) ? seq.getDatasetSequence() : new Sequence("THISISAPLACEHOLDER",""));
\r
return sqinfo;
\r
}
\r
\r
return sqinfo;
\r
}
\r
\r
@@
-71,8
+71,8
@@
public class SeqsetUtils
Integer end = (Integer) sqinfo.get("End");
\r
java.util.Vector sfeatures = (java.util.Vector) sqinfo.get(
\r
"SeqFeatures");
\r
Integer end = (Integer) sqinfo.get("End");
\r
java.util.Vector sfeatures = (java.util.Vector) sqinfo.get(
\r
"SeqFeatures");
\r
- String pdbid = (String) sqinfo.get("PdbId");
\r
-
\r
+ Vector pdbid = (Vector) sqinfo.get("PdbId");
\r
+ Sequence seqds = (Sequence) sqinfo.get("datasetSequence");
\r
if (oldname == null)
\r
{
\r
namePresent = false;
\r
if (oldname == null)
\r
{
\r
namePresent = false;
\r
@@
-97,6
+97,9
@@
public class SeqsetUtils
{
\r
sq.setSequenceFeatures(sfeatures);
\r
}
\r
{
\r
sq.setSequenceFeatures(sfeatures);
\r
}
\r
+ if ((seqds!=null) && !(seqds.getName().equals("THISISAPLACEHOLDER") && seqds.getLength()==0)) {
\r
+ sq.setDatasetSequence(seqds);
\r
+ }
\r
\r
return namePresent;
\r
}
\r
\r
return namePresent;
\r
}
\r