}
}
}
-
+ // <<<<<<< HEAD
+ //
+ // =======
+ // if (minmax == null)
+ // {
+ // minmax = new Hashtable<String, float[][]>();
+ // }
+ //
+ // Set<String> oldGroups = new HashSet<String>(featureGroups.keySet());
+ // >>>>>>> refs/heads/develop
AlignmentI alignment = av.getAlignment();
List<String> allfeatures = new ArrayList<String>(); // or HashSet?
SequenceI asq = alignment.getSequenceAt(i);
for (String group : asq.getFeatures().getFeatureGroups(true))
{
+ // <<<<<<< HEAD
/*
* features in null group are always displayed; other groups
* keep their current visibility; new groups as 'newMadeVisible'
*/
boolean groupDisplayed = true;
if (group != null)
+ // =======
+ // continue;
+ // }
+ //
+ // int index = 0;
+ // while (index < features.length)
+ // {
+ // String fgrp = features[index].getFeatureGroup();
+ // oldGroups.remove(fgrp);
+ // if (!featuresDisplayed.isRegistered(features[index].getType()))
+ // >>>>>>> refs/heads/develop
{
+ // <<<<<<< HEAD
if (featureGroups.containsKey(group))
+ // =======
+ // if (fgrp != null)
+ // >>>>>>> refs/heads/develop
{
groupDisplayed = featureGroups.get(group);
}
}
/*
+ //<<<<<<< HEAD
* mark any new feature types as visible
*/
Collections.sort(allfeatures, String.CASE_INSENSITIVE_ORDER);
setOrder(type, 0);
}
}
+ // =======
+ // * oldGroups now consists of groups that no longer
+ // * have any feature in them - remove these
+ // */
+ // for (String grp : oldGroups)
+ // {
+ // featureGroups.remove(grp);
+ // >>>>>>> refs/heads/develop
}
updateRenderOrder(allfeatures);