File tree Expand file tree Collapse file tree 3 files changed +12
-3
lines changed
opengrok-indexer/src/main/java/org/opengrok/indexer/history Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Original file line number Diff line number Diff line change 19
19
20
20
/*
21
21
* Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
22
+ * Portions Copyright (c) 2019, Chris Fraire <cfraire@me.com>.
22
23
*/
23
24
package org .opengrok .indexer .history ;
24
25
26
+ import static org .opengrok .indexer .history .HistoryEntry .TAGS_SEPARATOR ;
27
+
25
28
import java .io .BufferedReader ;
26
29
import java .io .IOException ;
27
30
import java .io .InputStream ;
@@ -70,7 +73,7 @@ public void processStream(InputStream input) throws IOException {
70
73
if (higher != null && higher .equals (tagEntry )) {
71
74
// Found in the tree, merge tags
72
75
entries .remove (higher );
73
- tagEntry .setTags (higher .getTags () + ", " + tag );
76
+ tagEntry .setTags (higher .getTags () + TAGS_SEPARATOR + tag );
74
77
}
75
78
entries .add (tagEntry );
76
79
}
Original file line number Diff line number Diff line change 19
19
20
20
/*
21
21
* Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
22
- * Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
22
+ * Portions Copyright (c) 2019- 2020, Chris Fraire <cfraire@me.com>.
23
23
*/
24
24
package org .opengrok .indexer .history ;
25
25
26
+ import static org .opengrok .indexer .history .HistoryEntry .TAGS_SEPARATOR ;
27
+
26
28
import java .io .BufferedReader ;
27
29
import java .io .IOException ;
28
30
import java .io .InputStream ;
@@ -114,7 +116,7 @@ public void processStream(InputStream input) throws IOException {
114
116
* See Repository assignTagsInHistory() where multiple
115
117
* identified tags are joined with comma-space.
116
118
*/
117
- String joinedTagNames = String .join (", " , tagNames );
119
+ String joinedTagNames = String .join (TAGS_SEPARATOR , tagNames );
118
120
GitTagEntry tagEntry = new GitTagEntry (hash , date , joinedTagNames );
119
121
entries .add (tagEntry );
120
122
}
Original file line number Diff line number Diff line change 19
19
20
20
/*
21
21
* Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
22
+ * Portions Copyright (c) 2019, Chris Fraire <cfraire@me.com>.
22
23
*/
23
24
/*
24
25
* Copyright 2006 Trond Norbye. All rights reserved.
30
31
import java .util .TreeSet ;
31
32
import java .util .logging .Level ;
32
33
import java .util .logging .Logger ;
34
+
33
35
import org .opengrok .indexer .logger .LoggerFactory ;
34
36
35
37
/**
39
41
*/
40
42
public class HistoryEntry {
41
43
44
+ static final String TAGS_SEPARATOR = ", " ;
45
+
42
46
private static final Logger LOGGER = LoggerFactory .getLogger (HistoryEntry .class );
43
47
44
48
private String revision ;
You can’t perform that action at this time.
0 commit comments