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
Jalview 2.6 source licence
[jalview.git]
/
src
/
jalview
/
io
/
AnnotationFile.java
diff --git
a/src/jalview/io/AnnotationFile.java
b/src/jalview/io/AnnotationFile.java
index
2721fb2
..
581d9cc
100755
(executable)
--- a/
src/jalview/io/AnnotationFile.java
+++ b/
src/jalview/io/AnnotationFile.java
@@
-1,5
+1,5
@@
/*
\r
/*
\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
\r
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
\r
*
\r
* This file is part of Jalview.
\r
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
\r
*
\r
* This file is part of Jalview.
\r
@@
-416,7
+416,7
@@
public class AnnotationFile
text.append("displayBoxes=" + sg.getDisplayBoxes() + "\t");
\r
text.append("displayText=" + sg.getDisplayText() + "\t");
\r
text.append("colourText=" + sg.getColourText() + "\t");
\r
text.append("displayBoxes=" + sg.getDisplayBoxes() + "\t");
\r
text.append("displayText=" + sg.getDisplayText() + "\t");
\r
text.append("colourText=" + sg.getColourText() + "\t");
\r
- text.append("showUnconserved=" + sg.getShowunconserved() + "\t");
\r
+ text.append("showUnconserved=" + sg.getShowNonconserved() + "\t");
\r
if (sg.textColour != java.awt.Color.black)
\r
{
\r
text.append("textCol1="
\r
if (sg.textColour != java.awt.Color.black)
\r
{
\r
text.append("textCol1="
\r
@@
-1253,7
+1253,7
@@
public class AnnotationFile
}
\r
else if (key.equalsIgnoreCase("showUnconserved"))
\r
{
\r
}
\r
else if (key.equalsIgnoreCase("showUnconserved"))
\r
{
\r
- sg.setShowunconserved(Boolean.valueOf(value).booleanValue());
\r
+ sg.setShowNonconserved(Boolean.valueOf(value).booleanValue());
\r
}
\r
else if (key.equalsIgnoreCase("displayText"))
\r
{
\r
}
\r
else if (key.equalsIgnoreCase("displayText"))
\r
{
\r