litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3020 Refactor code that puts properties into groups to loop through properties first, rather than groups, so that properties assigned to non-existent groups get assigned to "other" group rather than being dropped. Also makes more sense this way and avoids unnecessary repetitions. Remove group-level sorting because this is done for the property list as a whole.

Browse source
This commit is contained in:
ryounes 2011-07-22 16:53:06 +00:00
parent adba60a9de
commit e4233c003b
1 changed files with 38 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

78
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
View file

@ -9,6 +9,7 @@ import java.util.Comparator;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -254,7 +255,6 @@ public class GroupedPropertyList extends BaseTemplateModel {
log.warn("groupList has no groups on entering addPropertiesToGroups(); will create a new group"); log.warn("groupList has no groups on entering addPropertiesToGroups(); will create a new group");
PropertyGroup dummyGroup = pgDao.createDummyPropertyGroup(null, 1); PropertyGroup dummyGroup = pgDao.createDummyPropertyGroup(null, 1);
dummyGroup.getPropertyList().addAll(propertyList); dummyGroup.getPropertyList().addAll(propertyList);
sortGroupPropertyList(dummyGroup.getName(), propertyList);
groupList.add(dummyGroup); groupList.add(dummyGroup);
return groupList; return groupList;
} }
@ -303,48 +303,46 @@ public class GroupedPropertyList extends BaseTemplateModel {
private void populateGroupListWithProperties(List<PropertyGroup> groupList, private void populateGroupListWithProperties(List<PropertyGroup> groupList,
PropertyGroup groupForUnassignedProperties, List<Property> propertyList) { PropertyGroup groupForUnassignedProperties, List<Property> propertyList) {
// Assign the properties to the groups // Clear out the property lists on the groups
for (PropertyGroup pg : groupList) { for (PropertyGroup pg : groupList) {
if (pg.getPropertyList().size()>0) { if (pg.getPropertyList().size()>0) {
pg.getPropertyList().clear(); pg.getPropertyList().clear();
}
for (Property p : propertyList) {
if (p.getURI() == null) {
log.error("Property p has null URI in populateGroupsListWithProperties()");
// If the property is not assigned to any group, add it to the group for unassigned properties
} else if (p.getGroupURI()==null) {
if (groupForUnassignedProperties!=null) {
// RY How could it happen that it's already in the group? Maybe we can remove this test.
if (!alreadyOnPropertyList(groupForUnassignedProperties.getPropertyList(),p)) {
groupForUnassignedProperties.getPropertyList().add(p);
if (log.isDebugEnabled()) {
log.debug("adding property " + getLabel(p) + " to group for unassigned properties");
}
}
}
// Otherwise, if the property is assigned to this group, add it to the group if it's not already there
} else if (p.getGroupURI().equals(pg.getURI())) {
// RY How could it happen that it's already in the group? Maybe we can remove this case.
if (!alreadyOnPropertyList(pg.getPropertyList(),p)) {
pg.getPropertyList().add(p);
}
}
}
sortGroupPropertyList(pg.getName(), pg.getPropertyList());
}
}
private void sortGroupPropertyList(String groupName, List<Property> propertyList) {
if (propertyList.size()>1) {
try {
Collections.sort(propertyList,new Property.DisplayComparatorIgnoringPropertyGroup());
} catch (Exception ex) {
log.error("Exception sorting property group "+ groupName + " property list: "+ex.getMessage());
} }
} }
// Assign the properties to the groups
for (Property p : propertyList) {
if (p.getURI() == null) {
log.error("Property p has null URI in populateGroupListWithProperties()");
// If the property is not assigned to any group, add it to the group for unassigned properties
} else {
String groupUriForProperty = p.getGroupURI();
boolean assignedToGroup = false;
if (groupUriForProperty != null) {
for (PropertyGroup pg : groupList) {
String groupUri = pg.getURI();
if (groupUriForProperty.equals(groupUri)) {
pg.getPropertyList().add(p);
assignedToGroup = true;
break;
}
}
}
// Either the property is not assigned to a group, or it is assigned to a group
// not in the list (i.e., a non-existent group).
if (! assignedToGroup) {
if (groupForUnassignedProperties!=null) {
groupForUnassignedProperties.getPropertyList().add(p);
log.debug("adding property " + getLabel(p) + " to group for unassigned properties");
}
}
}
}
} }
private class PropertyRanker implements Comparator { private class PropertyRanker implements Comparator<Property> {
WebappDaoFactory wdf; WebappDaoFactory wdf;
PropertyGroupDao pgDao; PropertyGroupDao pgDao;
@ -354,9 +352,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
this.pgDao = wdf.getPropertyGroupDao(); this.pgDao = wdf.getPropertyGroupDao();
} }
public int compare (Object o1, Object o2) { public int compare(Property p1, Property p2) {
Property p1 = (Property) o1;
Property p2 = (Property) o2;
// sort first by property group rank; if the same, then sort by property rank // sort first by property group rank; if the same, then sort by property rank
final int MAX_GROUP_RANK=99; final int MAX_GROUP_RANK=99;