Merge remote-tracking branch 'origin/master' into DS-3851_workflow

This commit is contained in:
Andrea Bollini
2019-01-01 13:00:11 +01:00
690 changed files with 12372 additions and 5001 deletions

View File

@@ -25,8 +25,8 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.log4j.Logger;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.logging.log4j.Logger;
import org.dspace.browse.BrowsableDSpaceObject;
import org.dspace.content.comparator.NameAscendingComparator;
import org.dspace.content.factory.ContentServiceFactory;
@@ -55,7 +55,7 @@ public class Community extends DSpaceObject implements DSpaceObjectLegacySupport
/**
* log4j category
*/
private static final Logger log = Logger.getLogger(Community.class);
private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(Community.class);
@Column(name = "community_id", insertable = false, updatable = false)
private Integer legacyId;
@@ -110,7 +110,7 @@ public class Community extends DSpaceObject implements DSpaceObjectLegacySupport
setModified();
}
void removeSubCommunity(Community subCommunity) {
public void removeSubCommunity(Community subCommunity) {
subCommunities.remove(subCommunity);
setModified();
}