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-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
jalview
/
io
/
packed
/
JalviewDataset.java
diff --git
a/src/jalview/io/packed/JalviewDataset.java
b/src/jalview/io/packed/JalviewDataset.java
index
63263d2
..
c1ca1b7
100644
(file)
--- a/
src/jalview/io/packed/JalviewDataset.java
+++ b/
src/jalview/io/packed/JalviewDataset.java
@@
-211,8
+211,7
@@
public class JalviewDataset
* @param parentAlignment
*/
public JalviewDataset(AlignmentI aldataset,
* @param parentAlignment
*/
public JalviewDataset(AlignmentI aldataset,
- Map<String, FeatureColourI> fc,
- Hashtable seqDets)
+ Map<String, FeatureColourI> fc, Hashtable seqDets)
{
// TODO not used - remove?
this(aldataset, fc, seqDets, null);
{
// TODO not used - remove?
this(aldataset, fc, seqDets, null);
@@
-234,8
+233,8
@@
public class JalviewDataset
* with.
*/
public JalviewDataset(AlignmentI aldataset,
* with.
*/
public JalviewDataset(AlignmentI aldataset,
- Map<String, FeatureColourI> fc,
- Hashtable seqDets, AlignmentI parentAlignment)
+ Map<String, FeatureColourI> fc, Hashtable seqDets,
+ AlignmentI parentAlignment)
{
this();
parentDataset = aldataset;
{
this();
parentDataset = aldataset;