hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-09 19:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename relationship type left and right labels

Browse Source 
Renamed the columns 'left_label' and 'right_label' in the table
'relationship_type' to 'leftward_label' and 'rightward_label'.
Also renamed all instances of [l|L]eftLabel and [r|R]ightLabel
to [l|L]eftwardLabel and [r|R]ightwardLabel, respectively.
This commit is contained in:
Jelle Pelgrims
2019-08-06 13:59:32 +02:00
parent db24de2ef0
commit 3c31fdf648
31 changed files with 302 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dspace-api/src/main/java/org/dspace/content/EntityServiceImpl.java
View File

@@ -83,8 +83,8 @@ public class EntityServiceImpl implements EntityService {
List<Relationship> relationshipList = relationshipService.findAll(context);
for (Relationship relationship : relationshipList) {
RelationshipType relationshipType = relationship.getRelationshipType();
if (StringUtils.equals(relationshipType.getLeftLabel(),label) ||
StringUtils.equals(relationshipType.getRightLabel(),label)) {
if (StringUtils.equals(relationshipType.getLeftwardLabel(),label) ||
StringUtils.equals(relationshipType.getRightwardLabel(),label)) {
listToReturn.add(relationship);
}
}
@@ -132,8 +132,8 @@ public class EntityServiceImpl implements EntityService {
public List<RelationshipType> getRelationshipTypesByLabel(Context context, String label) throws SQLException {
List<RelationshipType> listToReturn = new LinkedList<>();
for (RelationshipType relationshipType : relationshipTypeService.findAll(context)) {
if (StringUtils.equals(relationshipType.getLeftLabel(),label) ||
StringUtils.equals(relationshipType.getRightLabel(),label)) {
if (StringUtils.equals(relationshipType.getLeftwardLabel(),label) ||
StringUtils.equals(relationshipType.getRightwardLabel(),label)) {
listToReturn.add(relationshipType);
}
}