Skip to content

Commit bf61a46

Browse files
SiedlerchrSiedlerchr
committed
Merge remote-tracking branch 'upstream/main' into auxCliTest
* upstream/main: Visual improvements to LinkedFilesEditor (#9114) SLR Remove "last-search-date" (#9116) Hide diffs when one of the field values is blank a.k.a no conflict (#9110)
2 parents db875b0 + fb80915 commit bf61a46

File tree

14 files changed

+129
-146
lines changed

14 files changed

+129
-146
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
2323
- We call backup files `.bak` and temporary writing files now `.sav`.
2424
- JabRef keeps 10 older versions of a `.bib` file in the [user data dir](https://github.com/harawata/appdirs#supported-directories) (instead of a single `.sav` (now: `.bak`) file in the directory of the `.bib` file)
2525
- We changed the button label from "Return to JabRef" to "Return to library" to better indicate the purpose of the action.
26+
- We removed "last-search-date" from the SLR feature, because the last-search-date can be deducted from the git logs.
2627
- We reworked the External Changes Resolver dialog. [#9021](https://github.com/JabRef/jabref/pull/9021)
2728

2829

@@ -33,6 +34,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
3334
- The [HtmlToLaTeXFormatter](https://docs.jabref.org/finding-sorting-and-cleaning-entries/saveactions#html-to-latex) keeps single `<` characters.
3435
- We fixed a performance regression when opening large libraries [#9041](https://github.com/JabRef/jabref/issues/9041)
3536
- We fixed a bug where spaces are trimmed when highlighting differences in the Entries merge dialog. [koppor#371](https://github.com/koppor/jabref/issues/371)
37+
- We fixed some visual glitches with the linked files editor field in the entry editor and increased its height. [#8823](https://github.com/JabRef/jabref/issues/8823)
3638
- We fixed several bugs regarding the manual and the autosave of library files that sometimes lead to exceptions or data loss. [#9067](https://github.com/JabRef/jabref/pull/9067), [#8448](https://github.com/JabRef/jabref/issues/8484), [#8746](https://github.com/JabRef/jabref/issues/8746), [#6684](https://github.com/JabRef/jabref/issues/6684), [#6644](https://github.com/JabRef/jabref/issues/6644), [#6102](https://github.com/JabRef/jabref/issues/6102), [#6002](https://github.com/JabRef/jabref/issues/6000)
3739
- We fixed an issue where applied save actions on saving the library file would lead to the dialog "The libary has been modified by another program" popping up [#4877](https://github.com/JabRef/jabref/issues/4877)
3840
- We fixed an issue where title case didn't capitalize words after en-dash characters [#9068]
@@ -46,7 +48,6 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
4648

4749

4850

49-
5051
## [5.7] - 2022-08-05
5152

5253
### Added

‎src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@
1616
import javax.net.ssl.SSLSocketFactory;
1717

1818
import javafx.beans.Observable;
19+
import javafx.beans.binding.Bindings;
20+
import javafx.beans.binding.ObjectBinding;
1921
import javafx.beans.property.BooleanProperty;
2022
import javafx.beans.property.DoubleProperty;
2123
import javafx.beans.property.SimpleBooleanProperty;
2224
import javafx.beans.property.SimpleDoubleProperty;
2325
import javafx.beans.property.StringProperty;
26+
import javafx.scene.Node;
2427
import javafx.scene.control.Alert.AlertType;
2528
import javafx.scene.control.ButtonBar.ButtonData;
2629
import javafx.scene.control.ButtonType;
@@ -83,6 +86,8 @@ public class LinkedFileViewModel extends AbstractViewModel {
8386
private final PreferencesService preferences;
8487
private final LinkedFileHandler linkedFileHandler;
8588

89+
private ObjectBinding<Node> linkedFileIconBinding;
90+
8691
private final Validator fileExistsValidator;
8792

8893
public LinkedFileViewModel(LinkedFile linkedFile,
@@ -178,6 +183,14 @@ public JabRefIcon getTypeIcon() {
178183
.orElse(IconTheme.JabRefIcons.FILE);
179184
}
180185

186+
public ObjectBinding<Node> typeIconProperty() {
187+
if (linkedFileIconBinding == null) {
188+
linkedFileIconBinding = Bindings.createObjectBinding(() -> this.getTypeIcon().getGraphicNode(), linkedFile.fileTypeProperty());
189+
}
190+
191+
return linkedFileIconBinding;
192+
}
193+
181194
public void markAsAutomaticallyFound() {
182195
isAutomaticallyFound.setValue(true);
183196
}

‎src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,40 @@
66
<?import javafx.scene.control.Tooltip?>
77
<?import javafx.scene.layout.HBox?>
88
<?import javafx.scene.layout.StackPane?>
9+
<?import javafx.scene.layout.VBox?>
910
<?import org.jabref.gui.icon.JabRefIconView?>
1011
<fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112"
1112
fx:controller="org.jabref.gui.fieldeditors.LinkedFilesEditor">
1213
<ListView fx:id="listView" prefHeight="0" HBox.hgrow="ALWAYS" maxHeight="100" />
13-
<Button onAction="#addNewFile"
14-
styleClass="icon-button">
15-
<graphic>
16-
<JabRefIconView glyph="NEW_FILE"/>
17-
</graphic>
18-
<tooltip>
19-
<Tooltip text="%Open"/>
20-
</tooltip>
21-
</Button>
22-
<Button onAction="#fetchFulltext" styleClass="icon-button">
23-
<graphic>
24-
<StackPane>
25-
<JabRefIconView glyph="FETCH_FULLTEXT"
26-
visible="${controller.viewModel.fulltextLookupInProgress == false}"/>
27-
<ProgressIndicator maxHeight="12.0" maxWidth="12.0"
28-
visible="${controller.viewModel.fulltextLookupInProgress}"/>
29-
</StackPane>
30-
</graphic>
31-
<tooltip>
32-
<Tooltip text="%Get fulltext"/>
33-
</tooltip>
34-
</Button>
35-
<Button
36-
onAction="#addFromURL"
37-
styleClass="icon-button">
38-
<graphic>
39-
<JabRefIconView glyph="DOWNLOAD"/>
40-
</graphic>
41-
<tooltip>
42-
<Tooltip text="%Download from URL"/>
43-
</tooltip>
44-
</Button>
14+
<VBox>
15+
<Button onAction="#addNewFile" styleClass="icon-button">
16+
<graphic>
17+
<JabRefIconView glyph="LINKED_FILE_ADD"/>
18+
</graphic>
19+
<tooltip>
20+
<Tooltip text="%Open"/>
21+
</tooltip>
22+
</Button>
23+
<Button onAction="#fetchFulltext" styleClass="icon-button">
24+
<graphic>
25+
<StackPane>
26+
<JabRefIconView glyph="FETCH_FULLTEXT"
27+
visible="${controller.viewModel.fulltextLookupInProgress == false}"/>
28+
<ProgressIndicator maxHeight="12.0" maxWidth="12.0"
29+
visible="${controller.viewModel.fulltextLookupInProgress}"/>
30+
</StackPane>
31+
</graphic>
32+
<tooltip>
33+
<Tooltip text="%Get fulltext"/>
34+
</tooltip>
35+
</Button>
36+
<Button onAction="#addFromURL" styleClass="icon-button">
37+
<graphic>
38+
<JabRefIconView glyph="DOWNLOAD"/>
39+
</graphic>
40+
<tooltip>
41+
<Tooltip text="%Download from URL"/>
42+
</tooltip>
43+
</Button>
44+
</VBox>
4545
</fx:root>

‎src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import javafx.scene.Parent;
1313
import javafx.scene.control.Button;
1414
import javafx.scene.control.ContextMenu;
15+
import javafx.scene.control.Label;
1516
import javafx.scene.control.ListView;
17+
import javafx.scene.control.OverrunStyle;
1618
import javafx.scene.control.ProgressBar;
1719
import javafx.scene.control.SelectionMode;
1820
import javafx.scene.control.SeparatorMenuItem;
@@ -84,7 +86,7 @@ public LinkedFilesEditor(Field field,
8486
.load();
8587

8688
ViewModelListCellFactory<LinkedFileViewModel> cellFactory = new ViewModelListCellFactory<LinkedFileViewModel>()
87-
.withStringTooltip(LinkedFileViewModel::getDescription)
89+
.withStringTooltip(LinkedFileViewModel::getDescriptionAndLink)
8890
.withGraphic(this::createFileDisplay)
8991
.withContextMenu(this::createContextMenuForFile)
9092
.withOnMouseClickedEvent(this::handleItemMouseClick)
@@ -165,10 +167,17 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
165167
progressIndicator.progressProperty().bind(linkedFile.downloadProgressProperty());
166168
progressIndicator.visibleProperty().bind(linkedFile.downloadOngoingProperty());
167169

170+
Label label = new Label();
171+
label.graphicProperty().bind(linkedFile.typeIconProperty());
172+
label.textProperty().bind(linkedFile.linkProperty());
173+
label.getStyleClass().setAll("file-row-text");
174+
label.textOverrunProperty().setValue(OverrunStyle.LEADING_ELLIPSIS);
175+
EasyBind.subscribe(linkedFile.isAutomaticallyFoundProperty(), found -> label.pseudoClassStateChanged(opacity, found));
176+
168177
HBox info = new HBox(8);
169178
HBox.setHgrow(info, Priority.ALWAYS);
170179
info.setStyle("-fx-padding: 0.5em 0 0.5em 0;"); // To align with buttons below which also have 0.5em padding
171-
info.getChildren().setAll(icon, link, desc, progressIndicator);
180+
info.getChildren().setAll(label, progressIndicator);
172181

173182
Button acceptAutoLinkedFile = IconTheme.JabRefIcons.AUTO_LINKED_FILE.asButton();
174183
acceptAutoLinkedFile.setTooltip(new Tooltip(Localization.lang("This file was found automatically. Do you want to link it to this entry?")));
@@ -177,7 +186,7 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
177186
acceptAutoLinkedFile.setOnAction(event -> linkedFile.acceptAsLinked());
178187
acceptAutoLinkedFile.getStyleClass().setAll("icon-button");
179188

180-
Button writeMetadataToPdf = IconTheme.JabRefIcons.IMPORT.asButton();
189+
Button writeMetadataToPdf = IconTheme.JabRefIcons.PDF_METADATA_WRITE.asButton();
181190
writeMetadataToPdf.setTooltip(new Tooltip(Localization.lang("Write BibTeXEntry metadata to PDF.")));
182191
writeMetadataToPdf.visibleProperty().bind(linkedFile.isOfflinePdfProperty());
183192
writeMetadataToPdf.getStyleClass().setAll("icon-button");
@@ -186,7 +195,7 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
186195
writeMetadataToPdf.disableProperty().bind(writeMetadataToPdfCommand.executableProperty().not());
187196
writeMetadataToPdf.setOnAction(event -> writeMetadataToPdfCommand.execute());
188197

189-
Button parsePdfMetadata = IconTheme.JabRefIcons.FILE_SEARCH.asButton();
198+
Button parsePdfMetadata = IconTheme.JabRefIcons.PDF_METADATA_READ.asButton();
190199
parsePdfMetadata.setTooltip(new Tooltip(Localization.lang("Parse Metadata from PDF.")));
191200
parsePdfMetadata.visibleProperty().bind(linkedFile.isOfflinePdfProperty());
192201
parsePdfMetadata.setOnAction(event -> {
@@ -195,9 +204,9 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
195204
});
196205
parsePdfMetadata.getStyleClass().setAll("icon-button");
197206

198-
HBox container = new HBox(10);
207+
HBox container = new HBox(2);
199208
container.setPrefHeight(Double.NEGATIVE_INFINITY);
200-
209+
container.maxWidthProperty().bind(listView.widthProperty().subtract(20d));
201210
container.getChildren().addAll(acceptAutoLinkedFile, info, writeMetadataToPdf, parsePdfMetadata);
202211

203212
return container;
@@ -261,7 +270,7 @@ private void handleItemMouseClick(LinkedFileViewModel linkedFile, MouseEvent eve
261270

262271
@Override
263272
public double getWeight() {
264-
return 2;
273+
return 3;
265274
}
266275

267276
private ContextMenu createContextMenuForFile(LinkedFileViewModel linkedFile) {

‎src/main/java/org/jabref/gui/icon/IconTheme.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ public enum JabRefIcons implements JabRefIcon {
192192
DELETE_ENTRY(MaterialDesignD.DELETE),
193193
SEARCH(MaterialDesignM.MAGNIFY),
194194
FILE_SEARCH(MaterialDesignF.FILE_FIND),
195+
PDF_METADATA_READ(MaterialDesignF.FORMAT_ALIGN_TOP),
196+
PDF_METADATA_WRITE(MaterialDesignF.FORMAT_ALIGN_BOTTOM),
195197
ADVANCED_SEARCH(Color.CYAN, MaterialDesignM.MAGNIFY),
196198
PREFERENCES(MaterialDesignC.COG),
197199
SELECTORS(MaterialDesignS.STAR_SETTINGS),
@@ -309,6 +311,7 @@ public enum JabRefIcons implements JabRefIcon {
309311
NEW_GROUP(MaterialDesignP.PLUS),
310312
OPEN_LINK(MaterialDesignO.OPEN_IN_NEW),
311313
LOOKUP_IDENTIFIER(MaterialDesignS.SEARCH_WEB),
314+
LINKED_FILE_ADD(MaterialDesignP.PLUS),
312315
FETCH_FULLTEXT(MaterialDesignS.SEARCH_WEB),
313316
FETCH_BY_IDENTIFIER(MaterialDesignC.CLIPBOARD_ARROW_DOWN),
314317
TOGGLE_ABBREVIATION(MaterialDesignF.FORMAT_ALIGN_CENTER),

‎src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.fxml‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,52 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<?import javafx.geometry.Insets?>
43
<?import javafx.scene.control.Button?>
54
<?import javafx.scene.control.ComboBox?>
65
<?import javafx.scene.control.DialogPane?>
76
<?import javafx.scene.control.Label?>
87
<?import javafx.scene.control.TextField?>
8+
<?import javafx.scene.control.Tooltip?>
99
<?import javafx.scene.layout.ColumnConstraints?>
1010
<?import javafx.scene.layout.GridPane?>
1111
<?import javafx.scene.layout.RowConstraints?>
12-
<DialogPane minHeight="-Infinity" prefHeight="150.0" prefWidth="536.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.linkedfile.LinkedFileEditDialogView">
12+
<?import org.jabref.gui.icon.JabRefIconView?>
13+
<DialogPane minHeight="140.0" minWidth="550.0"
14+
xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1"
15+
fx:controller="org.jabref.gui.linkedfile.LinkedFileEditDialogView">
1316
<content>
14-
<GridPane>
17+
<GridPane vgap="4" hgap="4">
1518
<columnConstraints>
1619
<ColumnConstraints hgrow="NEVER" minWidth="10.0" prefWidth="100.0"/>
17-
<ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="200.0"/>
18-
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="108.0"/>
20+
<ColumnConstraints hgrow="ALWAYS" minWidth="10.0"/>
21+
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"/>
1922
</columnConstraints>
2023
<rowConstraints>
21-
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
22-
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
23-
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
24+
<RowConstraints/>
25+
<RowConstraints/>
26+
<RowConstraints/>
2427
</rowConstraints>
25-
<Label minWidth="95.0" text="%Link"/>
26-
<TextField fx:id="link" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="150.0"
28+
29+
<Label text="%Link"/>
30+
<TextField fx:id="link" prefHeight="25.0"
2731
GridPane.columnIndex="1" GridPane.hgrow="ALWAYS"/>
28-
<Label text="Description" GridPane.rowIndex="1"/>
29-
<TextField fx:id="description" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0"
30-
prefWidth="150.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1"/>
31-
<ComboBox fx:id="fileType" minHeight="-Infinity" prefWidth="150.0" GridPane.columnIndex="1"
32-
GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2"/>
33-
<Button id="browse" mnemonicParsing="false" onAction="#openBrowseDialog" text="%Browse"
34-
GridPane.columnIndex="2">
35-
<GridPane.margin>
36-
<Insets left="10.0"/>
37-
</GridPane.margin>
32+
<Button id="browse" onAction="#openBrowseDialog"
33+
styleClass="icon-button,narrow"
34+
prefHeight="20.0" prefWidth="20.0" GridPane.columnIndex="2">
35+
<graphic>
36+
<JabRefIconView glyph="OPEN"/>
37+
</graphic>
38+
<tooltip>
39+
<Tooltip text="%Browse"/>
40+
</tooltip>
3841
</Button>
42+
43+
<Label text="Description" GridPane.rowIndex="1"/>
44+
<TextField fx:id="description" prefHeight="25.0"
45+
GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1"/>
46+
3947
<Label text="Filetype" GridPane.rowIndex="2"/>
48+
<ComboBox fx:id="fileType"
49+
GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2"/>
4050
</GridPane>
4151
</content>
4252
</DialogPane>

‎src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import org.jabref.gui.StateManager;
1313
import org.jabref.gui.externalfiletype.ExternalFileType;
1414
import org.jabref.gui.util.BaseDialog;
15+
import org.jabref.gui.util.ViewModelListCellFactory;
16+
import org.jabref.logic.l10n.Localization;
1517
import org.jabref.model.entry.LinkedFile;
1618
import org.jabref.preferences.PreferencesService;
1719

@@ -40,6 +42,8 @@ public LinkedFileEditDialogView(LinkedFile linkedFile) {
4042
.setAsContent(this.getDialogPane());
4143

4244
this.getDialogPane().getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
45+
this.setResizable(false);
46+
this.setTitle(Localization.lang("Edit file link"));
4347

4448
this.setResultConverter(button -> {
4549
if (button == ButtonType.APPLY) {
@@ -54,6 +58,11 @@ public LinkedFileEditDialogView(LinkedFile linkedFile) {
5458
private void initialize() {
5559
viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences.getFilePreferences());
5660
fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
61+
new ViewModelListCellFactory<ExternalFileType>()
62+
.withIcon(ExternalFileType::getIcon)
63+
.withText(ExternalFileType::getName)
64+
.install(fileType);
65+
5766
description.textProperty().bindBidirectional(viewModel.descriptionProperty());
5867
link.textProperty().bindBidirectional(viewModel.linkProperty());
5968
fileType.valueProperty().bindBidirectional(viewModel.selectedExternalFileTypeProperty());

‎src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar;
2222
import org.jabref.model.entry.BibEntry;
2323
import org.jabref.model.entry.field.Field;
24+
import org.jabref.model.strings.StringUtil;
2425

2526
import com.tobiasdiez.easybind.EasyBind;
2627
import org.fxmisc.richtext.StyleClassedTextArea;
@@ -150,7 +151,7 @@ public MergedFieldCell getMergedValueCell() {
150151
}
151152

152153
public void showDiff(ShowDiffConfig diffConfig) {
153-
if (!rightValueCell.isVisible()) {
154+
if (!rightValueCell.isVisible() || StringUtil.isNullOrEmpty(viewModel.getLeftFieldValue()) || StringUtil.isNullOrEmpty(viewModel.getRightFieldValue())) {
154155
return;
155156
}
156157
LOGGER.debug("Showing diffs...");

‎src/main/java/org/jabref/logic/crawler/StudyRepository.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.nio.charset.UnsupportedCharsetException;
77
import java.nio.file.Files;
88
import java.nio.file.Path;
9-
import java.time.LocalDate;
109
import java.time.LocalDateTime;
1110
import java.time.temporal.ChronoUnit;
1211
import java.util.List;
@@ -119,7 +118,7 @@ public StudyRepository(Path pathToRepository,
119118
gitHandler.createCommitOnCurrentBranch("Setup/Update Repository Structure", false);
120119
gitHandler.checkoutBranch(SEARCH_BRANCH);
121120
// If study definition does not exist on this branch or was changed on work branch, copy it from work
122-
boolean studyDefinitionDoesNotExistOrChanged = !(Files.exists(studyDefinitionFile) && new StudyYamlParser().parseStudyYamlFile(studyDefinitionFile).equalsBesideLastSearchDate(study));
121+
boolean studyDefinitionDoesNotExistOrChanged = !(Files.exists(studyDefinitionFile) && new StudyYamlParser().parseStudyYamlFile(studyDefinitionFile).equals(study));
123122
if (studyDefinitionDoesNotExistOrChanged) {
124123
new StudyYamlParser().writeStudyYamlFile(study, studyDefinitionFile);
125124
}
@@ -218,15 +217,13 @@ public Study getStudy() {
218217
*/
219218
public void persist(List<QueryResult> crawlResults) throws IOException, GitAPIException, SaveException {
220219
updateWorkAndSearchBranch();
221-
study.setLastSearchDate(LocalDate.now());
222220
persistStudy();
223221
gitHandler.createCommitOnCurrentBranch("Update search date", true);
224222
gitHandler.checkoutBranch(SEARCH_BRANCH);
225223
persistResults(crawlResults);
226-
study.setLastSearchDate(LocalDate.now());
227224
persistStudy();
228225
try {
229-
// First commit changes to search branch branch and update remote
226+
// First commit changes to search branch and update remote
230227
String commitMessage = "Conducted search: " + LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
231228
boolean newSearchResults = gitHandler.createCommitOnCurrentBranch(commitMessage, false);
232229
gitHandler.checkoutBranch(WORK_BRANCH);

0 commit comments

Comments
 (0)