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 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
io
/
ModellerDescription.java
diff --git
a/src/jalview/io/ModellerDescription.java
b/src/jalview/io/ModellerDescription.java
index
f7c94c3
..
442278d
100755
(executable)
--- a/
src/jalview/io/ModellerDescription.java
+++ b/
src/jalview/io/ModellerDescription.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-61,7
+61,8
@@
public class ModellerDescription
*/
final int Types[] = { 0, 0, 1, 0, 1, 0, 0, 0, 0, 0 };
*/
final int Types[] = { 0, 0, 1, 0, 1, 0, 0, 0, 0, 0 };
- final char Padding[] = { ' ', ' ', ' ', '.', ' ', '.', '.', '.', '.', '.' };
+ final char Padding[] = { ' ', ' ', ' ', '.', ' ', '.', '.', '.', '.',
+ '.' };
java.util.Hashtable fields = new java.util.Hashtable();
java.util.Hashtable fields = new java.util.Hashtable();
@@
-244,15
+245,15
@@
public class ModellerDescription
{
// Set start and end before we update the type (in the case of a
// synthesized field set)
{
// Set start and end before we update the type (in the case of a
// synthesized field set)
- if (getStartCode() == null
- || (getStartNum() != seq.getStart() && getStartCode().val != null))
+ if (getStartCode() == null || (getStartNum() != seq.getStart()
+ && getStartCode().val != null))
{
// unset or user updated sequence start position
setStartCode(seq.getStart());
}
{
// unset or user updated sequence start position
setStartCode(seq.getStart());
}
- if (getEndCode() == null
- || (getEndNum() != seq.getEnd() && getStartCode() != null && getStartCode().val != null))
+ if (getEndCode() == null || (getEndNum() != seq.getEnd()
+ && getStartCode() != null && getStartCode().val != null))
{
setEndCode(seq.getEnd());
}
{
setEndCode(seq.getEnd());
}