Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 00:45:44 +01:00
Code Issues Packages Projects Releases Activity

Add single trailers, not collection

Browse Source 
Doing so will prevent empty collections being added to the trailers.
This commit is contained in:
René Pfeuffer
2020-06-08 14:33:18 +02:00
parent a7585b4fc0
commit 69361fb5ed
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-webapp/src/main/java/sonia/scm/repository/ChangesetDescriptionTrailerProvider.java
View File

@@ -47,20 +47,20 @@ public class ChangesetDescriptionTrailerProvider implements ChangesetPreProcesso
private static class TrailerChangesetPreProcessor implements ChangesetPreProcessor { private static class TrailerChangesetPreProcessor implements ChangesetPreProcessor {
private final List<Trailer> trailers = new ArrayList<>();
private final StringBuilder newDescription = new StringBuilder(); private final StringBuilder newDescription = new StringBuilder();
private Changeset changeset;
boolean foundEmptyLine; boolean foundEmptyLine;
@Override @Override
public void process(Changeset changeset) { public void process(Changeset changeset) {
this.changeset = changeset;
try (Scanner scanner = new Scanner(changeset.getDescription())) { try (Scanner scanner = new Scanner(changeset.getDescription())) {
while (scanner.hasNextLine()) { while (scanner.hasNextLine()) {
handleLine(scanner, scanner.nextLine()); handleLine(scanner, scanner.nextLine());
} }
} }
changeset.addTrailers(trailers);
changeset.setDescription(newDescription.toString()); changeset.setDescription(newDescription.toString());
} }
@@ -103,7 +103,7 @@ public class ChangesetDescriptionTrailerProvider implements ChangesetPreProcesso
} }
private void createTrailer(String type, String name, String mail) { private void createTrailer(String type, String name, String mail) {
trailers.add(new Trailer(type, new Person(name, mail))); changeset.addTrailer(new Trailer(type, new Person(name, mail)));
} }
} }
} }