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
first patch for JAL-838 - allow new typed of PID calcs
[jalview.git]
/
src
/
jalview
/
analysis
/
Dna.java
diff --git
a/src/jalview/analysis/Dna.java
b/src/jalview/analysis/Dna.java
index
bf25bcf
..
482c54a
100644
(file)
--- a/
src/jalview/analysis/Dna.java
+++ b/
src/jalview/analysis/Dna.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
@@
-559,8
+559,8
@@
public class Dna
}
\r
if (resSize > 0)
\r
{
\r
}
\r
if (resSize > 0)
\r
{
\r
- SequenceI newseq = new Sequence(selection.getName(), protein
\r
- .toString());
\r
+ SequenceI newseq = new Sequence(selection.getName(),
\r
+ protein.toString());
\r
if (rf != 0)
\r
{
\r
jalview.bin.Cache.log
\r
if (rf != 0)
\r
{
\r
jalview.bin.Cache.log
\r
@@
-655,7
+655,7
@@
public class Dna
}
\r
}
\r
// register the mapping somehow
\r
}
\r
}
\r
// register the mapping somehow
\r
- //
\r
+ //
\r
return null;
\r
}
\r
\r
return null;
\r
}
\r
\r
@@
-700,8
+700,7
@@
public class Dna
fgstate = (featureGroups == null) ? null : ((Boolean) featureGroups
\r
.get(sf[f].featureGroup));
\r
if ((featureTypes == null || featureTypes.containsKey(sf[f]
\r
fgstate = (featureGroups == null) ? null : ((Boolean) featureGroups
\r
.get(sf[f].featureGroup));
\r
if ((featureTypes == null || featureTypes.containsKey(sf[f]
\r
- .getType()))
\r
- && (fgstate == null || fgstate.booleanValue()))
\r
+ .getType())) && (fgstate == null || fgstate.booleanValue()))
\r
{
\r
if (FeatureProperties.isCodingFeature(null, sf[f].getType()))
\r
{
\r
{
\r
if (FeatureProperties.isCodingFeature(null, sf[f].getType()))
\r
{
\r