Skip to content

Commit 10faf8d

Browse files
kopporsubhramit
andauthored
Fix JavaDoc (#13888)
* Fix JavaDoc * Update jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/KeywordMerger.java Co-authored-by: Subhramit Basu <[email protected]> --------- Co-authored-by: Subhramit Basu <[email protected]>
1 parent db1bec8 commit 10faf8d

File tree

14 files changed

+26
-52
lines changed

14 files changed

+26
-52
lines changed

jabgui/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ public void execute() {
5353
edits.end();
5454
}
5555

56-
/**
57-
* @return the number of affected entries
58-
* */
56+
/// @return the number of affected entries
5957
public int executeAndGetAffectedEntriesCount() {
6058
execute();
6159
return affectedEntriesCount;

jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/FieldRowViewModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public enum Selection {
3737
/**
3838
* When the user types something into the merged field value and neither the left nor
3939
* right values match it, NONE is selected
40-
* */
40+
*/
4141
NONE
4242
}
4343

jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/cell/HeaderCell.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import javafx.geometry.Insets;
44
import javafx.scene.control.Label;
55

6-
/**
7-
* A readonly cell used to display the header of the ThreeWayMerge UI at the top of the layout.
8-
* */
6+
/// A readonly cell used to display the header of the ThreeWayMerge UI at the top of the layout.
97
public class HeaderCell extends ThreeWayMergeCell {
108
public static final String DEFAULT_STYLE_CLASS = "merge-header-cell";
119
private final Label label = new Label();

jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/cell/sidebuttons/ToggleMergeUnmergeButton.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ public boolean canMerge() {
6363
return canMerge.get();
6464
}
6565

66-
/**
67-
* Setting {@code canMerge} to {@code false} will disable the merge/unmerge button
68-
* */
66+
/// Setting `canMerge` to `false` will disable the merge/unmerge button
6967
public void setCanMerge(boolean value) {
7068
canMergeProperty().set(value);
7169
}

jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/CommentMerger.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package org.jabref.gui.mergeentries.threewaymerge.fieldsmerger;
22

33
import org.jabref.logic.os.OS;
4-
import org.jabref.model.entry.field.StandardField;
54

6-
/**
7-
* A merger for the {@link StandardField#COMMENT} field
8-
* */
5+
/// A merger for the {@link org.jabref.model.entry.field.StandardField#COMMENT} field
96
public class CommentMerger implements FieldMerger {
107
@Override
118
public String merge(String fieldValueA, String fieldValueB) {

jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/FieldMerger.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package org.jabref.gui.mergeentries.threewaymerge.fieldsmerger;
22

3-
/**
4-
* This class is responsible for taking two values for some field and merging them to into one value
5-
* */
3+
/// This class is responsible for taking two values for some field and merging them into one value
64
@FunctionalInterface
75
public interface FieldMerger {
86
String merge(String fieldValueA, String fieldValueB);

jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/FileMerger.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
import org.jabref.logic.bibtex.FileFieldWriter;
66
import org.jabref.logic.importer.util.FileFieldParser;
77
import org.jabref.model.entry.LinkedFile;
8-
import org.jabref.model.entry.field.StandardField;
98
import org.jabref.model.strings.StringUtil;
109

11-
/**
12-
* A merger for the {@link StandardField#FILE} field
13-
* */
10+
/// A merger for the {@link org.jabref.model.entry.field.StandardField#FILE} field
1411
public class FileMerger implements FieldMerger {
1512
@Override
1613
public String merge(String filesA, String filesB) {

jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/GroupMerger.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44

55
import org.jabref.model.entry.BibEntryPreferences;
66
import org.jabref.model.entry.KeywordList;
7-
import org.jabref.model.entry.field.StandardField;
87
import org.jabref.model.strings.StringUtil;
98

109
import org.jspecify.annotations.NonNull;
1110

12-
/**
13-
* A merger for the {@link StandardField#GROUPS} field
14-
* */
11+
/// A merger for the {@link org.jabref.model.entry.field.StandardField#GROUPS} field
1512
public class GroupMerger implements FieldMerger {
1613

1714
private final @NonNull BibEntryPreferences bibEntryPreferences;

jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/KeywordMerger.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44

55
import org.jabref.model.entry.BibEntryPreferences;
66
import org.jabref.model.entry.KeywordList;
7-
import org.jabref.model.entry.field.StandardField;
87

9-
/**
10-
* A merger for the {@link StandardField#KEYWORDS} field
11-
* */
8+
/// A merger for the {@link org.jabref.model.entry.field.StandardField#KEYWORDS} field
129
public class KeywordMerger implements FieldMerger {
1310
private final BibEntryPreferences bibEntryPreferences;
1411

jablib/src/main/java/org/jabref/logic/layout/format/HTMLChars.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
public class HTMLChars implements ParamLayoutFormatter {
1515

1616
private static final Map<String, String> HTML_CHARS = HTMLUnicodeConversionMaps.LATEX_HTML_CONVERSION_MAP;
17-
/**
18-
* This regex matches '<b>&</b>' that DO NOT BEGIN an HTML entity.
19-
* <p>
20-
* <b>&</b>{@literal amp;} <b>Not Matched</b><br>
21-
* <b>&</b>{@literal #34;} <b>Not Matched</b><br>
22-
* <b>&</b>Hey <b>Matched</b>
23-
* */
17+
18+
/// This regex matches `&` that **do not begin** an HTML entity.
19+
///
20+
/// - `&amp;` **Not Matched**
21+
/// - `&#34;` **Not Matched**
22+
/// - `&Hey` **Matched**
2423
private static final Pattern HTML_ENTITY_PATTERN = Pattern.compile("&(?!(?:[a-z0-9]+|#[0-9]{1,6}|#x[0-9a-fA-F]{1,6});)");
2524

2625
private boolean keepCurlyBraces = false;

0 commit comments

Comments
 (0)