hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

better readable code

Browse Source
This commit is contained in:
Ben Bosman
2019-01-29 11:11:48 +01:00
parent 96f08e4414
commit 2dc03adc58
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java
View File

@@ -9,6 +9,7 @@ package org.dspace.content;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@@ -86,11 +87,11 @@ public class RelationshipServiceImpl implements RelationshipService {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
if (!virtualMetadataPopulator.isUseForPlaceTrueForRelationshipType(relationship.getRelationshipType(), true)) { if (!virtualMetadataPopulator.isUseForPlaceTrueForRelationshipType(relationship.getRelationshipType(), true)) {
if (!leftRelationships.isEmpty()) { if (!leftRelationships.isEmpty()) {
leftRelationships.sort((o1, o2) -> o2.getLeftPlace() - o1.getLeftPlace()); leftRelationships.sort(Comparator.comparingInt(Relationship::getLeftPlace));
for (int i = 0; i < leftRelationships.size(); i++) { for (int i = 0; i < leftRelationships.size(); i++) {
leftRelationships.get(leftRelationships.size() - 1 - i).setLeftPlace(i); leftRelationships.get(i).setLeftPlace(i);
} }
relationship.setLeftPlace(leftRelationships.get(0).getLeftPlace() + 1); relationship.setLeftPlace(leftRelationships.size());
} else { } else {
relationship.setLeftPlace(0); relationship.setLeftPlace(0);
} }
@@ -101,11 +102,11 @@ public class RelationshipServiceImpl implements RelationshipService {
if (!virtualMetadataPopulator.isUseForPlaceTrueForRelationshipType(relationship.getRelationshipType(), false)) { if (!virtualMetadataPopulator.isUseForPlaceTrueForRelationshipType(relationship.getRelationshipType(), false)) {
if (!rightRelationships.isEmpty()) { if (!rightRelationships.isEmpty()) {
rightRelationships.sort((o1, o2) -> o2.getRightPlace() - o1.getRightPlace()); rightRelationships.sort(Comparator.comparingInt(Relationship::getRightPlace));
for (int i = 0; i < rightRelationships.size(); i++) { for (int i = 0; i < rightRelationships.size(); i++) {
rightRelationships.get(rightRelationships.size() - 1 - i).setRightPlace(i); rightRelationships.get(i).setRightPlace(i);
} }
relationship.setRightPlace(rightRelationships.get(0).getRightPlace() + 1); relationship.setRightPlace(rightRelationships.size());
} else { } else {
relationship.setRightPlace(0); relationship.setRightPlace(0);
} }