From 044ab17b9ba140377998e14184e465b42c0771b3 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Fri, 21 Feb 2020 01:10:48 +0100 Subject: [PATCH 01/18] Fix casing of "LaTeX" --> either "Latex" (code) or "LaTeX" (code comments, user-facing) Never LaTex --- .../gui/entryeditor/LatexCitationsTabViewModel.java | 6 +++--- .../org/jabref/gui/groups/GroupDialogViewModel.java | 2 +- .../gui/libraryproperties/LibraryPropertiesDialog.fxml | 4 ++-- .../libraryproperties/LibraryPropertiesDialogView.java | 8 ++++---- .../LibraryPropertiesDialogViewModel.java | 10 +++++----- .../jabref/gui/texparser/ParseTexDialogViewModel.java | 2 +- .../jabref/logic/bibtex/comparator/MetaDataDiff.java | 4 ++-- .../org/jabref/logic/exporter/MetaDataSerializer.java | 2 +- .../bibtexfields/OrdinalsToSuperscriptFormatter.java | 2 +- .../org/jabref/logic/importer/util/MetaDataParser.java | 2 +- .../org/jabref/model/entry/field/StandardField.java | 2 +- src/main/java/org/jabref/model/groups/TexGroup.java | 4 ++-- src/main/java/org/jabref/model/metadata/MetaData.java | 8 ++++---- src/main/resources/l10n/JabRef_de.properties | 2 +- src/main/resources/l10n/JabRef_en.properties | 2 +- src/main/resources/l10n/JabRef_es.properties | 2 +- src/main/resources/l10n/JabRef_fr.properties | 4 ++-- src/main/resources/l10n/JabRef_ja.properties | 2 +- src/main/resources/l10n/JabRef_pt.properties | 2 +- src/main/resources/l10n/JabRef_ru.properties | 2 +- src/main/resources/l10n/JabRef_tr.properties | 5 ++--- .../logic/exporter/BibtexDatabaseWriterTest.java | 2 +- .../logic/importer/fileformat/BibtexParserTest.java | 2 +- .../java/org/jabref/model/groups/TexGroupTest.java | 2 +- 24 files changed, 41 insertions(+), 42 deletions(-) diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java index 9ef038f50b5..13546cbc64e 100644 --- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java +++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java @@ -65,7 +65,7 @@ public LatexCitationsTabViewModel(BibDatabaseContext databaseContext, Preference this.preferencesService = preferencesService; this.taskExecutor = taskExecutor; this.dialogService = dialogService; - this.directory = new SimpleObjectProperty<>(databaseContext.getMetaData().getLaTexFileDirectory(preferencesService.getUser()) + this.directory = new SimpleObjectProperty<>(databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getUser()) .orElseGet(preferencesService::getWorkingDir)); this.citationList = FXCollections.observableArrayList(); this.status = new SimpleObjectProperty<>(Status.IN_PROGRESS); @@ -126,7 +126,7 @@ private void cancelSearch() { } private Collection searchAndParse(String citeKey) throws IOException { - Path newDirectory = databaseContext.getMetaData().getLaTexFileDirectory(preferencesService.getUser()) + Path newDirectory = databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getUser()) .orElseGet(preferencesService::getWorkingDir); if (texParserResult == null || !newDirectory.equals(directory.get())) { @@ -168,7 +168,7 @@ public void setLatexDirectory() { .withInitialDirectory(directory.get()).build(); dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(selectedDirectory -> - databaseContext.getMetaData().setLaTexFileDirectory(preferencesService.getUser(), selectedDirectory.toAbsolutePath())); + databaseContext.getMetaData().setLatexFileDirectory(preferencesService.getUser(), selectedDirectory.toAbsolutePath())); init(currentEntry); } diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java index 47a2c88f52f..2a465886d3d 100644 --- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java +++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java @@ -392,7 +392,7 @@ public void openHelpPage() { private List getFileDirectoriesAsPaths() { List fileDirs = new ArrayList<>(); MetaData metaData = currentDatabase.getMetaData(); - metaData.getLaTexFileDirectory(preferencesService.getFilePreferences().getUser()).ifPresent(fileDirs::add); + metaData.getLatexFileDirectory(preferencesService.getFilePreferences().getUser()).ifPresent(fileDirs::add); return fileDirs; } diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml index 7d43bd84e46..50faf887c78 100644 --- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml +++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml @@ -65,9 +65,9 @@