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 'features/JAL-4071_visibleFeaturesCounter' into features/JAL-3417_sdppre...
[jalview.git]
/
src
/
jalview
/
datamodel
/
features
/
SequenceFeatures.java
diff --git
a/src/jalview/datamodel/features/SequenceFeatures.java
b/src/jalview/datamodel/features/SequenceFeatures.java
index
8ac4991
..
905fd8b
100644
(file)
--- a/
src/jalview/datamodel/features/SequenceFeatures.java
+++ b/
src/jalview/datamodel/features/SequenceFeatures.java
@@
-151,8
+151,8
@@
public class SequenceFeatures implements SequenceFeaturesI
return new ArrayList<>();
}
return new ArrayList<>();
}
- return getAllFeatures(featureTypes.toArray(new String[featureTypes
- .size()]));
+ return getAllFeatures(
+ featureTypes.toArray(new String[featureTypes.size()]));
}
/**
}
/**
@@
-320,8
+320,8
@@
public class SequenceFeatures implements SequenceFeaturesI
for (Entry<String, FeatureStore> featureType : featureStore.entrySet())
{
for (Entry<String, FeatureStore> featureType : featureStore.entrySet())
{
- Set<String> featureGroups = featureType.getValue().getFeatureGroups(
- positionalFeatures);
+ Set<String> featureGroups = featureType.getValue()
+ .getFeatureGroups(positionalFeatures);
for (String group : groups)
{
if (featureGroups.contains(group))
for (String group : groups)
{
if (featureGroups.contains(group))
@@
-389,8
+389,9
@@
public class SequenceFeatures implements SequenceFeaturesI
@Override
public float getMinimumScore(String type, boolean positional)
{
@Override
public float getMinimumScore(String type, boolean positional)
{
- return featureStore.containsKey(type) ? featureStore.get(type)
- .getMinimumScore(positional) : Float.NaN;
+ return featureStore.containsKey(type)
+ ? featureStore.get(type).getMinimumScore(positional)
+ : Float.NaN;
}
/**
}
/**
@@
-399,8
+400,9
@@
public class SequenceFeatures implements SequenceFeaturesI
@Override
public float getMaximumScore(String type, boolean positional)
{
@Override
public float getMaximumScore(String type, boolean positional)
{
- return featureStore.containsKey(type) ? featureStore.get(type)
- .getMaximumScore(positional) : Float.NaN;
+ return featureStore.containsKey(type)
+ ? featureStore.get(type).getMaximumScore(positional)
+ : Float.NaN;
}
/**
}
/**
@@
-414,8
+416,7
@@
public class SequenceFeatures implements SequenceFeaturesI
final boolean forwardStrand)
{
Collections.sort(features,
final boolean forwardStrand)
{
Collections.sort(features,
- forwardStrand
- ? IntervalI.COMPARE_BEGIN_ASC_END_DESC
+ forwardStrand ? IntervalI.COMPARE_BEGIN_ASC_END_DESC
: IntervalI.COMPARE_END_DESC);
}
: IntervalI.COMPARE_END_DESC);
}