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-3081 compiler warnings and formatting improvements
[jalview.git]
/
src
/
jalview
/
io
/
gff
/
Gff3Helper.java
diff --git
a/src/jalview/io/gff/Gff3Helper.java
b/src/jalview/io/gff/Gff3Helper.java
index
28941f5
..
a25a014
100644
(file)
--- a/
src/jalview/io/gff/Gff3Helper.java
+++ b/
src/jalview/io/gff/Gff3Helper.java
@@
-39,6
+39,8
@@
import java.util.Map;
*/
public class Gff3Helper extends GffHelperBase
{
*/
public class Gff3Helper extends GffHelperBase
{
+ public static final String ALLELES = "alleles";
+
protected static final String TARGET = "Target";
protected static final String ID = "ID";
protected static final String TARGET = "Target";
protected static final String ID = "ID";
@@
-152,8
+154,8
@@
public class Gff3Helper extends GffHelperBase
*/
if ("-".equals(strand))
{
*/
if ("-".equals(strand))
{
- System.err
- .println("Skipping mapping from reverse complement as not yet supported");
+ System.err.println(
+ "Skipping mapping from reverse complement as not yet supported");
return null;
}
return null;
}
@@
-244,7
+246,8
@@
public class Gff3Helper extends GffHelperBase
* @return
*/
@SuppressWarnings("unused")
* @return
*/
@SuppressWarnings("unused")
- protected String findTargetId(String target, Map<String, List<String>> set)
+ protected String findTargetId(String target,
+ Map<String, List<String>> set)
{
return target;
}
{
return target;
}
@@
-275,8
+278,8
@@
public class Gff3Helper extends GffHelperBase
* @throws IOException
*/
protected SequenceFeature processProteinMatch(
* @throws IOException
*/
protected SequenceFeature processProteinMatch(
- Map<String, List<String>> set, SequenceI seq,
- String[] gffColumns, AlignmentI align, List<SequenceI> newseqs,
+ Map<String, List<String>> set, SequenceI seq, String[] gffColumns,
+ AlignmentI align, List<SequenceI> newseqs,
boolean relaxedIdMatching)
{
// This is currently tailored to InterProScan GFF output:
boolean relaxedIdMatching)
{
// This is currently tailored to InterProScan GFF output:
@@
-320,8
+323,8
@@
public class Gff3Helper extends GffHelperBase
* renamed with its qualified accession id; renaming has to wait until
* all sequence reference resolution is complete
*/
* renamed with its qualified accession id; renaming has to wait until
* all sequence reference resolution is complete
*/
- String accessionId = StringUtils.listToDelimitedString(
- set.get(NAME), ",");
+ String accessionId = StringUtils
+ .listToDelimitedString(set.get(NAME), ",");
if (accessionId.length() > 0)
{
String database = sf.getType(); // TODO InterProScan only??
if (accessionId.length() > 0)
{
String database = sf.getType(); // TODO InterProScan only??
@@
-398,7
+401,7
@@
public class Gff3Helper extends GffHelperBase
/*
* Ensembl returns dna variants as 'alleles'
*/
/*
* Ensembl returns dna variants as 'alleles'
*/
- desc = StringUtils.listToDelimitedString(attributes.get("alleles"),
+ desc = StringUtils.listToDelimitedString(attributes.get(ALLELES),
",");
}
",");
}