From fc626a6e9e433a54b46164de94caa1d99a442507 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 6 Feb 2018 18:38:36 +0100 Subject: [PATCH 01/79] Initial gradle build files --- build.gradle | 516 +----- {src/main/doc => docs}/Groups.uml | 0 org.jabref.gui/build.gradle | 437 +++++ .../config/checkstyle/checkstyle.xml | 57 + .../config/checkstyle/suppressions.xml | 10 + .../lib}/AppleJavaExtensions.jar | Bin .../lib}/customjfx-1.0.0.jar | Bin {lib => org.jabref.gui/lib}/spin.jar | Bin org.jabref.gui/settings.gradle | 1 + .../org/jabref/benchmarks/Benchmarks.java | 0 .../importer/fileformat/bibtexml/Article.java | 788 +++++++++ .../importer/fileformat/bibtexml/Book.java | 872 +++++++++ .../importer/fileformat/bibtexml/Booklet.java | 730 ++++++++ .../fileformat/bibtexml/Conference.java | 909 ++++++++++ .../importer/fileformat/bibtexml/Entry.java | 457 +++++ .../importer/fileformat/bibtexml/File.java | 76 + .../importer/fileformat/bibtexml/Inbook.java | 181 ++ .../fileformat/bibtexml/Incollection.java | 980 +++++++++++ .../fileformat/bibtexml/Inproceedings.java | 909 ++++++++++ .../importer/fileformat/bibtexml/Manual.java | 757 ++++++++ .../fileformat/bibtexml/Mastersthesis.java | 752 ++++++++ .../importer/fileformat/bibtexml/Misc.java | 702 ++++++++ .../fileformat/bibtexml/MonthTypeString.java | 88 + .../fileformat/bibtexml/ObjectFactory.java | 512 ++++++ .../fileformat/bibtexml/Phdthesis.java | 752 ++++++++ .../fileformat/bibtexml/Proceedings.java | 842 +++++++++ .../fileformat/bibtexml/Techreport.java | 788 +++++++++ .../fileformat/bibtexml/Unpublished.java | 678 +++++++ .../fileformat/bibtexml/package-info.java | 9 + .../importer/fileformat/medline/Abstract.java | 106 ++ .../fileformat/medline/AbstractText.java | 100 ++ .../medline/AccessionNumberList.java | 78 + .../fileformat/medline/AffiliationInfo.java | 106 ++ .../fileformat/medline/ArtIdTypeInt.java | 67 + .../importer/fileformat/medline/Article.java | 161 ++ .../fileformat/medline/ArticleDate.java | 159 ++ .../fileformat/medline/ArticleId.java | 100 ++ .../fileformat/medline/ArticleIdList.java | 78 + .../fileformat/medline/ArticleTitle.java | 125 ++ .../importer/fileformat/medline/Author.java | 290 +++ .../fileformat/medline/AuthorList.java | 144 ++ .../fileformat/medline/BeginningDate.java | 159 ++ .../importer/fileformat/medline/Book.java | 452 +++++ .../fileformat/medline/BookDocument.java | 579 ++++++ .../fileformat/medline/BookDocumentSet.java | 106 ++ .../fileformat/medline/BookTitle.java | 125 ++ .../importer/fileformat/medline/Chemical.java | 99 ++ .../fileformat/medline/ChemicalList.java | 78 + .../fileformat/medline/CollectionTitle.java | 125 ++ .../medline/CommentsCorrections.java | 158 ++ .../medline/CommentsCorrectionsList.java | 78 + .../fileformat/medline/ContributionDate.java | 159 ++ .../importer/fileformat/medline/DataBank.java | 99 ++ .../fileformat/medline/DataBankList.java | 113 ++ .../fileformat/medline/DateCompleted.java | 127 ++ .../fileformat/medline/DateCreated.java | 127 ++ .../fileformat/medline/DateRevised.java | 127 ++ .../fileformat/medline/DeleteCitation.java | 78 + .../fileformat/medline/DeleteDocument.java | 78 + .../fileformat/medline/DescriptorName.java | 158 ++ .../fileformat/medline/ELocationID.java | 130 ++ .../fileformat/medline/EndingDate.java | 159 ++ .../fileformat/medline/GeneSymbolList.java | 78 + .../fileformat/medline/GeneralNote.java | 103 ++ .../importer/fileformat/medline/Grant.java | 155 ++ .../fileformat/medline/GrantList.java | 113 ++ .../importer/fileformat/medline/History.java | 78 + .../importer/fileformat/medline/ISSN.java | 99 ++ .../fileformat/medline/Identifier.java | 98 ++ .../fileformat/medline/Investigator.java | 258 +++ .../fileformat/medline/InvestigatorList.java | 78 + .../fileformat/medline/IsoLanguageCodes.java | 129 ++ .../importer/fileformat/medline/ItemList.java | 108 ++ .../importer/fileformat/medline/Journal.java | 155 ++ .../fileformat/medline/JournalIssue.java | 158 ++ .../importer/fileformat/medline/Keyword.java | 76 + .../fileformat/medline/KeywordList.java | 113 ++ .../fileformat/medline/LocationLabel.java | 99 ++ .../fileformat/medline/MedlineCitation.java | 752 ++++++++ .../medline/MedlineCitationSet.java | 106 ++ .../medline/MedlineJournalInfo.java | 155 ++ .../fileformat/medline/MeshHeading.java | 106 ++ .../fileformat/medline/MeshHeadingList.java | 78 + .../fileformat/medline/NameOfSubstance.java | 98 ++ .../fileformat/medline/NormalDate.java | 217 +++ .../importer/fileformat/medline/Object.java | 108 ++ .../fileformat/medline/ObjectFactory.java | 1268 ++++++++++++++ .../fileformat/medline/ObjectList.java | 78 + .../fileformat/medline/OtherAbstract.java | 169 ++ .../importer/fileformat/medline/OtherID.java | 99 ++ .../importer/fileformat/medline/PMID.java | 98 ++ .../fileformat/medline/Pagination.java | 101 ++ .../importer/fileformat/medline/Param.java | 71 + .../medline/PersonalNameSubject.java | 155 ++ .../medline/PersonalNameSubjectList.java | 78 + .../importer/fileformat/medline/PubDate.java | 189 ++ .../fileformat/medline/PubMedPubDate.java | 69 + .../fileformat/medline/PubStatusInt.java | 79 + .../fileformat/medline/PublicationType.java | 98 ++ .../medline/PublicationTypeList.java | 78 + .../fileformat/medline/Publisher.java | 99 ++ .../fileformat/medline/PubmedArticle.java | 99 ++ .../fileformat/medline/PubmedArticleSet.java | 84 + .../fileformat/medline/PubmedBookArticle.java | 99 ++ .../medline/PubmedBookArticleSet.java | 78 + .../fileformat/medline/PubmedBookData.java | 155 ++ .../fileformat/medline/PubmedData.java | 155 ++ .../fileformat/medline/QualifierName.java | 131 ++ .../importer/fileformat/medline/Section.java | 134 ++ .../fileformat/medline/SectionTitle.java | 125 ++ .../importer/fileformat/medline/Sections.java | 78 + .../fileformat/medline/SupplMeshList.java | 78 + .../fileformat/medline/SupplMeshName.java | 127 ++ .../importer/fileformat/medline/Text.java | 96 + .../importer/fileformat/medline/URL.java | 125 ++ .../fileformat/mods/AbstractDefinition.java | 396 +++++ .../mods/AccessConditionDefinition.java | 442 +++++ .../fileformat/mods/AreaDefinition.java | 69 + .../mods/CartographicsDefinition.java | 248 +++ .../mods/CitySectionDefinition.java | 69 + .../mods/ClassificationDefinition.java | 181 ++ .../importer/fileformat/mods/CodeOrText.java | 58 + .../mods/CopyInformationDefinition.java | 583 +++++++ .../fileformat/mods/DateDefinition.java | 184 ++ .../fileformat/mods/DateOtherDefinition.java | 67 + .../fileformat/mods/DetailDefinition.java | 144 ++ .../mods/DigitalOriginDefinition.java | 64 + .../EnumerationAndChronologyDefinition.java | 75 + .../fileformat/mods/ExtensionDefinition.java | 113 ++ .../importer/fileformat/mods/Extent.java | 71 + .../fileformat/mods/ExtentDefinition.java | 184 ++ .../fileformat/mods/FormDefinition.java | 67 + .../fileformat/mods/GenreDefinition.java | 154 ++ .../mods/GeographicCodeDefinition.java | 132 ++ .../HierarchicalGeographicDefinition.java | 196 +++ .../fileformat/mods/HierarchicalPart.java | 184 ++ .../mods/HoldingSimpleDefinition.java | 76 + .../fileformat/mods/IdentifierDefinition.java | 182 ++ .../fileformat/mods/IssuanceDefinition.java | 70 + .../mods/ItemIdentifierDefinition.java | 67 + .../fileformat/mods/LanguageDefinition.java | 329 ++++ .../mods/LanguageTermDefinition.java | 161 ++ .../fileformat/mods/LocationDefinition.java | 358 ++++ .../mods/ModsCollectionDefinition.java | 76 + .../fileformat/mods/ModsDefinition.java | 189 ++ .../fileformat/mods/NameDefinition.java | 729 ++++++++ .../fileformat/mods/NamePartDefinition.java | 76 + .../importer/fileformat/mods/NonSort.java | 72 + .../fileformat/mods/NoteDefinition.java | 371 ++++ .../fileformat/mods/ObjectFactory.java | 1553 +++++++++++++++++ .../fileformat/mods/OriginInfoDefinition.java | 300 ++++ .../fileformat/mods/PartDefinition.java | 337 ++++ .../mods/PhysicalDescriptionDefinition.java | 254 +++ .../mods/PhysicalDescriptionNote.java | 344 ++++ .../mods/PhysicalLocationDefinition.java | 283 +++ .../fileformat/mods/PlaceDefinition.java | 110 ++ .../fileformat/mods/PlaceTermDefinition.java | 159 ++ .../mods/RecordIdentifierDefinition.java | 67 + .../fileformat/mods/RecordInfoDefinition.java | 261 +++ .../mods/ReformattingQualityDefinition.java | 61 + .../fileformat/mods/RegionDefinition.java | 69 + .../mods/RelatedItemDefinition.java | 516 ++++++ .../fileformat/mods/RoleDefinition.java | 76 + .../fileformat/mods/RoleTermDefinition.java | 67 + .../fileformat/mods/ScriptTermDefinition.java | 67 + .../fileformat/mods/StringPlusLanguage.java | 194 ++ .../mods/StringPlusLanguagePlusAuthority.java | 132 ++ .../mods/StringPlusLanguagePlusSupplied.java | 77 + .../fileformat/mods/SubjectDefinition.java | 602 +++++++ .../mods/SubjectNameDefinition.java | 567 ++++++ .../mods/SubjectTitleInfoDefinition.java | 564 ++++++ .../mods/TableOfContentsDefinition.java | 396 +++++ .../mods/TargetAudienceDefinition.java | 94 + .../fileformat/mods/TemporalDefinition.java | 122 ++ .../logic/importer/fileformat/mods/Text.java | 285 +++ .../fileformat/mods/TitleInfoDefinition.java | 764 ++++++++ .../mods/TypeOfResourceDefinition.java | 218 +++ .../fileformat/mods/UrlDefinition.java | 219 +++ .../java/oracle/jdbc/OracleConnection.java | 0 .../java/oracle/jdbc/OracleStatement.java | 0 .../oracle/jdbc/dcn/DatabaseChangeEvent.java | 0 .../jdbc/dcn/DatabaseChangeListener.java | 0 .../jdbc/dcn/DatabaseChangeRegistration.java | 0 .../java/oracle/jdbc/driver/OracleDriver.java | 0 .../main/java/oracle/jdbc/package-info.java | 0 .../org/jabref/FallbackExceptionHandler.java | 0 .../src}/main/java/org/jabref/Globals.java | 0 .../main/java/org/jabref/JabRefException.java | 0 .../org/jabref/JabRefExecutorService.java | 0 .../src}/main/java/org/jabref/JabRefGUI.java | 0 .../src}/main/java/org/jabref/JabRefMain.java | 0 .../org/jabref/cli/ArgumentProcessor.java | 0 .../java/org/jabref/cli/AuxCommandLine.java | 0 .../jabref/cli/CrossrefFetcherEvaluator.java | 0 .../jabref/cli/GenerateCharacterTable.java | 0 .../cli/ImportInspectionCommandLine.java | 0 .../main/java/org/jabref/cli/JabRefCLI.java | 0 .../org/jabref/cli/SystemOutputPrinter.java | 0 .../main/java/org/jabref/cli/XMPUtilMain.java | 0 .../org/jabref/gui/AbstractController.java | 0 .../org/jabref/gui/AbstractDialogView.java | 0 .../java/org/jabref/gui/AbstractView.java | 0 .../org/jabref/gui/AbstractViewModel.java | 0 .../main/java/org/jabref/gui/BasePanel.java | 0 .../java/org/jabref/gui/BasePanelMode.java | 0 .../java/org/jabref/gui/ClipBoardManager.java | 0 .../java/org/jabref/gui/DefaultInjector.java | 0 .../src}/main/java/org/jabref/gui/Dialog.java | 0 .../java/org/jabref/gui/DialogService.java | 0 .../jabref/gui/DragAndDropDataFormats.java | 0 .../java/org/jabref/gui/DragDropPane.java | 0 .../org/jabref/gui/DragDropPopupPane.java | 0 .../jabref/gui/DuplicateResolverDialog.java | 0 .../java/org/jabref/gui/DuplicateSearch.java | 0 .../java/org/jabref/gui/EntryContainer.java | 0 .../main/java/org/jabref/gui/EntryMarker.java | 0 .../java/org/jabref/gui/EntryTypeDialog.java | 0 .../main/java/org/jabref/gui/FXDialog.java | 0 .../java/org/jabref/gui/FXDialogService.java | 0 .../jabref/gui/FindUnlinkedFilesDialog.java | 0 .../main/java/org/jabref/gui/GUIGlobals.java | 0 .../org/jabref/gui/GenFieldsCustomizer.java | 0 .../org/jabref/gui/GlobalFocusListener.java | 0 .../main/java/org/jabref/gui/IconTheme.java | 0 .../gui/JEditorPaneWithHighlighting.java | 0 .../java/org/jabref/gui/JabRefDialog.java | 0 .../main/java/org/jabref/gui/JabRefFrame.java | 0 .../src}/main/java/org/jabref/gui/Main.css | 0 .../main/java/org/jabref/gui/MergeDialog.java | 0 .../org/jabref/gui/OSXCompatibleToolbar.java | 0 .../java/org/jabref/gui/PreambleEditor.java | 0 .../java/org/jabref/gui/PreviewPanel.java | 0 .../org/jabref/gui/ReplaceStringDialog.java | 0 .../jabref/gui/SaveOrderConfigDisplay.java | 0 .../main/java/org/jabref/gui/SidePane.java | 0 .../org/jabref/gui/SidePaneComponent.java | 0 .../java/org/jabref/gui/SidePaneManager.java | 0 .../java/org/jabref/gui/StateManager.java | 0 .../java/org/jabref/gui/StringDialog.java | 0 .../jabref/gui/TransferableBibtexEntry.java | 0 .../jabref/gui/UpdateTimestampListener.java | 0 .../org/jabref/gui/WaitForSaveOperation.java | 0 .../main/java/org/jabref/gui/WrapLayout.java | 0 .../java/org/jabref/gui/actions/Actions.java | 0 .../gui/actions/AutoLinkFilesAction.java | 0 .../org/jabref/gui/actions/BaseAction.java | 0 .../jabref/gui/actions/ChangeTypeAction.java | 0 .../org/jabref/gui/actions/CleanupAction.java | 0 .../ConnectToSharedDatabaseAction.java | 0 .../actions/CopyBibTeXKeyAndLinkAction.java | 0 .../jabref/gui/actions/CopyDoiUrlAction.java | 0 .../actions/CopyVersionToClipboardAction.java | 0 .../gui/actions/ErrorConsoleAction.java | 0 .../gui/actions/IntegrityCheckAction.java | 0 .../gui/actions/LookupIdentifierAction.java | 0 .../gui/actions/ManageKeywordsAction.java | 0 .../gui/actions/MassSetFieldAction.java | 0 .../gui/actions/MnemonicAwareAction.java | 0 .../jabref/gui/actions/NewDatabaseAction.java | 0 .../jabref/gui/actions/NewEntryAction.java | 0 .../gui/actions/NewSubDatabaseAction.java | 0 .../jabref/gui/actions/OpenBrowserAction.java | 0 .../gui/actions/SearchForUpdateAction.java | 0 .../jabref/gui/actions/SortTabsAction.java | 0 .../AppendPersonNamesStrategy.java | 0 .../autocompleter/AppendWordsStrategy.java | 0 .../AutoCompleteFirstNameMode.java | 0 .../AutoCompletePreferences.java | 0 .../AutoCompleteSuggestionProvider.java | 0 .../autocompleter/AutoCompleteUpdater.java | 0 .../autocompleter/AutoCompletionInput.java | 0 .../autocompleter/AutoCompletionStrategy.java | 0 .../AutoCompletionTextInputBinding.java | 0 .../BibEntrySuggestionProvider.java | 0 .../ContentSelectorSuggestionProvider.java | 0 .../FieldValueSuggestionProvider.java | 0 .../JournalsSuggestionProvider.java | 0 .../PersonNameStringConverter.java | 0 .../PersonNameSuggestionProvider.java | 0 .../gui/autocompleter/ReplaceStrategy.java | 0 .../StringSuggestionProvider.java | 0 .../gui/autocompleter/SuggestionProvider.java | 0 .../autocompleter/SuggestionProviders.java | 0 .../autocompleter/WordSuggestionProvider.java | 0 .../autosaveandbackup/AutosaveUIManager.java | 0 .../autosaveandbackup/BackupUIManager.java | 0 .../auximport/AuxParserResultViewModel.java | 0 .../jabref/gui/auximport/FromAuxDialog.java | 0 .../BibtexKeyPatternDialog.java | 0 .../BibtexKeyPatternPanel.java | 0 .../ResolveDuplicateLabelDialog.java | 0 .../SearchFixDuplicateLabels.java | 0 .../gui/cleanup/CleanupActionsListModel.java | 0 .../gui/cleanup/CleanupPresetPanel.java | 0 .../cleanup/FieldFormatterCleanupsPanel.java | 0 .../gui/collab/ChangeDisplayDialog.java | 0 .../org/jabref/gui/collab/ChangeScanner.java | 0 .../jabref/gui/collab/ChangeViewModel.java | 0 .../gui/collab/DatabaseChangeMonitor.java | 0 .../gui/collab/EntryAddChangeViewModel.java | 0 .../gui/collab/EntryChangeViewModel.java | 0 .../collab/EntryDeleteChangeViewModel.java | 0 .../jabref/gui/collab/FileUpdatePanel.java | 0 .../gui/collab/GroupChangeViewModel.java | 0 .../java/org/jabref/gui/collab/InfoPane.java | 0 .../gui/collab/MetaDataChangeViewModel.java | 0 .../gui/collab/PreambleChangeViewModel.java | 0 .../gui/collab/StringAddChangeViewModel.java | 0 .../gui/collab/StringChangeViewModel.java | 0 .../gui/collab/StringNameChangeViewModel.java | 0 .../collab/StringRemoveChangeViewModel.java | 0 .../ContentSelectorDialog.java | 0 .../jabref/gui/copyfiles/CopyFilesAction.java | 0 .../copyfiles/CopyFilesDialogController.java | 0 .../gui/copyfiles/CopyFilesDialogView.java | 0 .../copyfiles/CopyFilesDialogViewModel.java | 0 .../CopyFilesResultItemViewModel.java | 0 .../CopyFilesResultListDependency.java | 0 .../jabref/gui/copyfiles/CopyFilesTask.java | 0 .../CustomEntryTypesManager.java | 0 .../EntryCustomizationDialog.java | 0 .../gui/customentrytypes/EntryTypeList.java | 0 .../customentrytypes/FieldSetComponent.java | 0 .../jabref/gui/customjfx/CustomJFXPanel.java | 0 .../DatabasePropertiesDialog.java | 0 .../org/jabref/gui/desktop/JabRefDesktop.java | 0 .../jabref/gui/desktop/os/DefaultDesktop.java | 0 .../java/org/jabref/gui/desktop/os/Linux.java | 0 .../jabref/gui/desktop/os/NativeDesktop.java | 0 .../java/org/jabref/gui/desktop/os/OSX.java | 0 .../org/jabref/gui/desktop/os/Windows.java | 0 .../documentviewer/DocumentPageViewModel.java | 0 .../gui/documentviewer/DocumentViewModel.java | 0 .../gui/documentviewer/DocumentViewer.css | 0 .../gui/documentviewer/DocumentViewer.fxml | 0 .../documentviewer/DocumentViewerControl.java | 0 .../DocumentViewerController.java | 0 .../documentviewer/DocumentViewerView.java | 0 .../DocumentViewerViewModel.java | 0 .../gui/documentviewer/PageDimension.java | 0 .../PdfDocumentPageViewModel.java | 0 .../documentviewer/PdfDocumentViewModel.java | 0 .../ShowDocumentViewerAction.java | 0 .../gui/entryeditor/DeprecatedFieldsTab.java | 0 .../jabref/gui/entryeditor/EntryEditor.css | 0 .../jabref/gui/entryeditor/EntryEditor.fxml | 0 .../jabref/gui/entryeditor/EntryEditor.java | 0 .../gui/entryeditor/EntryEditorTab.java | 0 .../gui/entryeditor/EntryEditorTabList.java | 0 .../gui/entryeditor/FieldsEditorTab.java | 0 .../jabref/gui/entryeditor/MathSciNetTab.java | 0 .../gui/entryeditor/OptionalFields2Tab.java | 0 .../gui/entryeditor/OptionalFieldsTab.java | 0 .../gui/entryeditor/OtherFieldsTab.java | 0 .../gui/entryeditor/RelatedArticlesTab.java | 0 .../gui/entryeditor/RequiredFieldsTab.java | 0 .../org/jabref/gui/entryeditor/SourceTab.java | 0 .../gui/entryeditor/UserDefinedFieldsTab.java | 0 .../fileannotationtab/FileAnnotationTab.fxml | 0 .../fileannotationtab/FileAnnotationTab.java | 0 .../FileAnnotationTabController.java | 0 .../FileAnnotationTabView.java | 0 .../FileAnnotationTabViewModel.java | 0 .../FileAnnotationViewModel.java | 0 .../jabref/gui/errorconsole/ErrorConsole.css | 0 .../jabref/gui/errorconsole/ErrorConsole.fxml | 0 .../errorconsole/ErrorConsoleController.java | 0 .../gui/errorconsole/ErrorConsoleView.java | 0 .../errorconsole/ErrorConsoleViewModel.java | 0 .../gui/errorconsole/LogEventViewModel.java | 0 .../gui/exporter/CustomExportDialog.java | 0 .../org/jabref/gui/exporter/ExportAction.java | 0 .../exporter/ExportCustomizationDialog.java | 0 .../jabref/gui/exporter/ExportFileFilter.java | 0 .../gui/exporter/ExportToClipboardAction.java | 0 .../jabref/gui/exporter/RtfTransferable.java | 0 .../jabref/gui/exporter/SaveAllAction.java | 0 .../gui/exporter/SaveDatabaseAction.java | 0 .../externalfiles/AutoSetFileLinksUtil.java | 0 .../gui/externalfiles/AutoSetLinks.java | 0 .../externalfiles/DownloadExternalFile.java | 0 .../gui/externalfiles/DroppedFileHandler.java | 0 .../gui/externalfiles/FileDownloadTask.java | 0 .../gui/externalfiles/FindFullTextAction.java | 0 .../externalfiles/SynchronizeFileField.java | 0 .../TransferableFileLinkSelection.java | 0 .../gui/externalfiles/WriteXMPAction.java | 0 .../ExternalFileMenuItem.java | 0 .../externalfiletype/ExternalFileType.java | 0 .../ExternalFileTypeEditor.java | 0 .../ExternalFileTypeEntryEditor.java | 0 .../externalfiletype/ExternalFileTypes.java | 0 .../UnknownExternalFileType.java | 0 .../fieldeditors/AbstractEditorViewModel.java | 0 .../gui/fieldeditors/BibtexKeyEditor.fxml | 0 .../gui/fieldeditors/BibtexKeyEditor.java | 0 .../BibtexKeyEditorViewModel.java | 0 .../jabref/gui/fieldeditors/DateEditor.fxml | 0 .../jabref/gui/fieldeditors/DateEditor.java | 0 .../gui/fieldeditors/DateEditorViewModel.java | 0 .../gui/fieldeditors/EditorTextArea.java | 0 .../EditorTypeEditorViewModel.java | 0 .../gui/fieldeditors/EditorValidator.java | 0 .../jabref/gui/fieldeditors/FieldEditor.java | 0 .../gui/fieldeditors/FieldEditorFX.java | 0 .../FieldEditorFocusListener.java | 0 .../jabref/gui/fieldeditors/FieldEditors.java | 0 .../gui/fieldeditors/FieldNameLabel.java | 0 .../FileListEditorTransferHandler.java | 0 .../fieldeditors/GenderEditorViewModel.java | 0 .../gui/fieldeditors/HtmlTransferable.java | 0 .../gui/fieldeditors/IdentifierEditor.fxml | 0 .../gui/fieldeditors/IdentifierEditor.java | 0 .../IdentifierEditorViewModel.java | 0 .../JTextAreaWithHighlighting.java | 0 .../gui/fieldeditors/JournalEditor.fxml | 0 .../gui/fieldeditors/JournalEditor.java | 0 .../fieldeditors/JournalEditorViewModel.java | 0 .../gui/fieldeditors/KeywordsEditor.java | 0 .../gui/fieldeditors/LinkedEntriesEditor.fxml | 0 .../gui/fieldeditors/LinkedEntriesEditor.java | 0 .../LinkedEntriesEditorViewModel.java | 0 .../gui/fieldeditors/LinkedFileViewModel.java | 0 .../gui/fieldeditors/LinkedFilesEditor.fxml | 0 .../gui/fieldeditors/LinkedFilesEditor.java | 0 .../LinkedFilesEditorViewModel.java | 0 .../fieldeditors/MapBasedEditorViewModel.java | 0 .../fieldeditors/MonthEditorViewModel.java | 0 .../gui/fieldeditors/MultilineEditor.java | 0 .../jabref/gui/fieldeditors/OptionEditor.fxml | 0 .../jabref/gui/fieldeditors/OptionEditor.java | 0 .../fieldeditors/OptionEditorViewModel.java | 0 .../jabref/gui/fieldeditors/OwnerEditor.fxml | 0 .../jabref/gui/fieldeditors/OwnerEditor.java | 0 .../fieldeditors/OwnerEditorViewModel.java | 0 .../PaginationEditorViewModel.java | 0 .../PatentTypeEditorViewModel.java | 0 .../gui/fieldeditors/PersonsEditor.java | 0 .../fieldeditors/PersonsEditorViewModel.java | 0 .../jabref/gui/fieldeditors/SimpleEditor.java | 0 .../fieldeditors/SimpleEditorViewModel.java | 0 .../org/jabref/gui/fieldeditors/TextArea.java | 0 .../jabref/gui/fieldeditors/TextField.java | 0 .../gui/fieldeditors/TypeEditorViewModel.java | 0 .../jabref/gui/fieldeditors/UrlEditor.fxml | 0 .../jabref/gui/fieldeditors/UrlEditor.java | 0 .../gui/fieldeditors/UrlEditorViewModel.java | 0 .../gui/fieldeditors/XmlTransferable.java | 0 .../fieldeditors/YesNoEditorViewModel.java | 0 .../contextmenu/CaseChangeMenu.java | 0 .../fieldeditors/contextmenu/ClearField.java | 0 .../contextmenu/ConversionMenu.java | 0 .../fieldeditors/contextmenu/EditorMenus.java | 0 .../contextmenu/ProtectedTermsMenu.java | 0 .../jabref/gui/filelist/AttachFileAction.java | 0 .../ConfirmCloseFileListEntryEditor.java | 0 .../jabref/gui/filelist/FileListEntry.java | 0 .../gui/filelist/FileListEntryEditor.java | 0 .../gui/filelist/FileListTableModel.java | 0 .../gui/groups/DroppingMouseLocation.java | 0 .../gui/groups/EntryTableTransferHandler.java | 0 .../gui/groups/GroupAddRemoveDialog.java | 0 .../jabref/gui/groups/GroupDescriptions.java | 0 .../org/jabref/gui/groups/GroupDialog.java | 0 .../org/jabref/gui/groups/GroupMatcher.java | 0 .../jabref/gui/groups/GroupNodeViewModel.java | 0 .../org/jabref/gui/groups/GroupSidePane.java | 0 .../java/org/jabref/gui/groups/GroupTree.css | 0 .../java/org/jabref/gui/groups/GroupTree.fxml | 0 .../gui/groups/GroupTreeCellRenderer.java | 0 .../gui/groups/GroupTreeController.java | 0 .../gui/groups/GroupTreeNodeViewModel.java | 0 .../org/jabref/gui/groups/GroupTreeView.java | 0 .../jabref/gui/groups/GroupTreeViewModel.java | 0 .../org/jabref/gui/groups/GroupingWorker.java | 0 .../jabref/gui/groups/MoveGroupChange.java | 0 .../groups/TransferableEntrySelection.java | 0 .../gui/groups/UndoableAddOrRemoveGroup.java | 0 .../groups/UndoableChangeEntriesOfGroup.java | 0 .../gui/groups/UndoableModifyGroup.java | 0 .../gui/groups/UndoableModifySubtree.java | 0 .../jabref/gui/groups/UndoableMoveGroup.java | 0 .../gui/groups/WarnAssignmentSideEffects.java | 0 .../java/org/jabref/gui/help/AboutAction.java | 0 .../gui/help/AboutDialogController.java | 0 .../org/jabref/gui/help/AboutDialogView.java | 0 .../jabref/gui/help/AboutDialogViewModel.java | 0 .../java/org/jabref/gui/help/HelpAction.java | 0 .../org/jabref/gui/help/NewVersionDialog.java | 0 .../EntryFromExternalFileCreator.java | 0 .../gui/importer/EntryFromFileCreator.java | 0 .../importer/EntryFromFileCreatorManager.java | 0 .../gui/importer/EntryFromPDFCreator.java | 0 .../gui/importer/FetcherPreviewDialog.java | 0 .../importer/ImportCustomizationDialog.java | 0 .../jabref/gui/importer/ImportFormats.java | 0 .../gui/importer/ImportInspectionDialog.java | 0 .../jabref/gui/importer/ImportMenuItem.java | 0 .../importer/ParserResultWarningDialog.java | 0 .../gui/importer/UnlinkedFilesCrawler.java | 0 .../gui/importer/UnlinkedPDFFileFilter.java | 0 .../jabref/gui/importer/ZipFileChooser.java | 0 .../actions/AppendDatabaseAction.java | 0 .../actions/CheckForNewEntryTypesAction.java | 0 .../importer/actions/GUIPostOpenAction.java | 0 .../actions/HandleDuplicateWarnings.java | 0 .../importer/actions/OpenDatabaseAction.java | 0 .../importer/fetcher/ACMPortalFetcher.java | 0 .../importer/fetcher/CiteSeerXFetcher.java | 0 .../gui/importer/fetcher/DOAJFetcher.java | 0 .../gui/importer/fetcher/EntryFetcher.java | 0 .../gui/importer/fetcher/EntryFetchers.java | 0 .../gui/importer/fetcher/GeneralFetcher.java | 0 .../importer/fetcher/IEEEXploreFetcher.java | 0 .../gui/importer/fetcher/INSPIREFetcher.java | 0 .../gui/importer/fetcher/OAI2Fetcher.java | 0 .../importer/fetcher/PreviewEntryFetcher.java | 0 .../fetcher/SearchBasedEntryFetcher.java | 0 .../gui/importer/fetcher/SpringerFetcher.java | 0 .../jabref/gui/journals/AbbreviateAction.java | 0 .../gui/journals/AbbreviationViewModel.java | 0 .../journals/AbbreviationsFileViewModel.java | 0 .../journals/JournalAbbreviationsUtil.java | 0 .../ManageJournalAbbreviationsController.java | 0 .../ManageJournalAbbreviationsView.java | 0 .../ManageJournalAbbreviationsViewModel.java | 0 .../gui/journals/ManageJournalsAction.java | 0 .../gui/journals/UnabbreviateAction.java | 0 .../gui/journals/UndoableAbbreviator.java | 0 .../gui/journals/UndoableUnabbreviator.java | 0 .../jabref/gui/keyboard/EmacsKeyBindings.java | 0 .../org/jabref/gui/keyboard/KeyBinder.java | 0 .../org/jabref/gui/keyboard/KeyBinding.java | 0 .../jabref/gui/keyboard/KeyBindingAction.java | 0 .../gui/keyboard/KeyBindingCategory.java | 0 .../gui/keyboard/KeyBindingRepository.java | 0 .../gui/keyboard/KeyBindingViewModel.java | 0 .../keyboard/KeyBindingsDialogController.java | 0 .../gui/keyboard/KeyBindingsDialogView.java | 0 .../keyboard/KeyBindingsDialogViewModel.java | 0 .../logging/ApplicationInsightsAppender.java | 0 .../org/jabref/gui/logging/GuiAppender.java | 0 .../gui/maintable/ListSynchronizer.java | 0 .../org/jabref/gui/maintable/MainTable.java | 0 .../jabref/gui/maintable/MainTableColumn.java | 0 .../gui/maintable/MainTableDataModel.java | 0 .../jabref/gui/maintable/MainTableFormat.java | 0 .../maintable/MainTableHeaderRenderer.java | 0 .../gui/maintable/MainTableNameFormatter.java | 0 .../maintable/MainTableSelectionListener.java | 0 .../PersistenceTableColumnListener.java | 0 .../PreventDraggingJTableHeader.java | 0 .../SpecialMainTableColumnsBuilder.java | 0 .../jabref/gui/menus/ChangeEntryTypeMenu.java | 0 .../org/jabref/gui/menus/FileHistoryMenu.java | 0 .../org/jabref/gui/menus/RightClickMenu.java | 0 .../EntryFetchAndMergeWorker.java | 0 .../gui/mergeentries/FetchAndMergeEntry.java | 0 .../gui/mergeentries/FetchAndMergeWorker.java | 0 .../jabref/gui/mergeentries/MergeEntries.java | 0 .../gui/mergeentries/MergeEntriesDialog.java | 0 .../mergeentries/MergeFetchedEntryDialog.java | 0 .../MergeWithFetchedEntryAction.java | 0 .../gui/openoffice/AdvancedCiteDialog.java | 0 .../openoffice/BibEntryNotFoundException.java | 0 .../gui/openoffice/CitationManager.java | 0 .../openoffice/ConnectionLostException.java | 0 .../gui/openoffice/CreationException.java | 0 .../DetectOpenOfficeInstallation.java | 0 .../gui/openoffice/NoDocumentException.java | 0 .../org/jabref/gui/openoffice/OOBibBase.java | 0 .../gui/openoffice/OpenOfficePanel.java | 0 .../gui/openoffice/OpenOfficeSidePanel.java | 0 .../gui/openoffice/StyleSelectDialog.java | 0 .../UndefinedCharacterFormatException.java | 0 .../plaintextimport/TagToMarkedTextStore.java | 0 .../gui/plaintextimport/TextInputDialog.java | 0 .../org/jabref/gui/preftabs/AdvancedTab.java | 0 .../gui/preftabs/AppearancePrefsTab.java | 0 .../gui/preftabs/BibtexKeyPatternPrefTab.java | 0 .../jabref/gui/preftabs/ColorSetupPanel.java | 0 .../gui/preftabs/EntryEditorPrefsTab.java | 0 .../gui/preftabs/ExportSortingPrefsTab.java | 0 .../org/jabref/gui/preftabs/ExternalTab.java | 0 .../java/org/jabref/gui/preftabs/FileTab.java | 0 .../gui/preftabs/FontSelectorDialog.java | 0 .../org/jabref/gui/preftabs/GeneralTab.java | 0 .../jabref/gui/preftabs/GroupsPrefsTab.java | 0 .../gui/preftabs/ImportSettingsTab.java | 0 .../jabref/gui/preftabs/NameFormatterTab.java | 0 .../org/jabref/gui/preftabs/NetworkTab.java | 0 .../gui/preftabs/PreferencesDialog.java | 0 .../gui/preftabs/PreferencesFilterDialog.java | 0 .../org/jabref/gui/preftabs/PrefsTab.java | 0 .../jabref/gui/preftabs/PreviewPrefsTab.java | 0 .../jabref/gui/preftabs/TableColumnsTab.java | 0 .../jabref/gui/preftabs/TablePrefsTab.java | 0 .../org/jabref/gui/preftabs/XmpPrefsTab.java | 0 .../NewProtectedTermsFileDialog.java | 0 .../protectedterms/ProtectedTermsDialog.java | 0 .../gui/push/AbstractPushToApplication.java | 0 .../jabref/gui/push/PushToApplication.java | 0 .../gui/push/PushToApplicationAction.java | 0 .../gui/push/PushToApplicationButton.java | 0 .../jabref/gui/push/PushToApplications.java | 0 .../java/org/jabref/gui/push/PushToEmacs.java | 0 .../java/org/jabref/gui/push/PushToLyx.java | 0 .../org/jabref/gui/push/PushToTeXstudio.java | 0 .../org/jabref/gui/push/PushToTexmaker.java | 0 .../java/org/jabref/gui/push/PushToVim.java | 0 .../org/jabref/gui/push/PushToWinEdt.java | 0 .../gui/remote/JabRefMessageHandler.java | 0 .../jabref/gui/renderer/CompleteRenderer.java | 0 .../jabref/gui/renderer/GeneralRenderer.java | 0 .../gui/renderer/IncompleteRenderer.java | 0 .../jabref/gui/search/GlobalSearchBar.java | 0 .../jabref/gui/search/GlobalSearchWorker.java | 0 .../gui/search/HitOrMissComparator.java | 0 .../jabref/gui/search/SearchDisplayMode.java | 0 .../jabref/gui/search/SearchResultFrame.java | 0 .../jabref/gui/search/SearchTextField.java | 0 .../org/jabref/gui/search/SearchWorker.java | 0 .../search/matchers/EverythingMatcher.java | 0 .../gui/search/matchers/SearchMatcher.java | 0 ...tainsAndRegexBasedSearchRuleDescriber.java | 0 .../GrammarBasedSearchRuleDescriber.java | 0 .../rules/describer/SearchDescriber.java | 0 .../rules/describer/SearchDescribers.java | 0 .../shared/ConnectToSharedDatabaseDialog.java | 0 .../gui/shared/MergeSharedEntryDialog.java | 0 .../gui/shared/MigrationHelpDialog.java | 0 .../gui/shared/SharedDatabaseUIManager.java | 0 .../gui/specialfields/SpecialFieldAction.java | 0 .../SpecialFieldDatabaseChangeListener.java | 0 .../specialfields/SpecialFieldDropDown.java | 0 .../specialfields/SpecialFieldMenuAction.java | 0 .../SpecialFieldUpdateListener.java | 0 .../SpecialFieldValueViewModel.java | 0 .../specialfields/SpecialFieldViewModel.java | 0 .../gui/undo/AbstractUndoableJabRefEdit.java | 0 .../jabref/gui/undo/CountingUndoManager.java | 0 .../org/jabref/gui/undo/NamedCompound.java | 0 .../jabref/gui/undo/UndoableChangeType.java | 0 .../jabref/gui/undo/UndoableFieldChange.java | 0 .../jabref/gui/undo/UndoableInsertEntry.java | 0 .../jabref/gui/undo/UndoableInsertString.java | 0 .../jabref/gui/undo/UndoableKeyChange.java | 0 .../gui/undo/UndoablePreambleChange.java | 0 .../jabref/gui/undo/UndoableRemoveEntry.java | 0 .../jabref/gui/undo/UndoableRemoveString.java | 0 .../jabref/gui/undo/UndoableStringChange.java | 0 .../org/jabref/gui/util/BackgroundTask.java | 0 .../org/jabref/gui/util/BindingsHelper.java | 0 .../org/jabref/gui/util/ControlHelper.java | 0 .../gui/util/CurrentThreadTaskExecutor.java | 0 .../gui/util/DefaultFileUpdateMonitor.java | 0 .../jabref/gui/util/DefaultTaskExecutor.java | 0 .../util/DirectoryDialogConfiguration.java | 0 .../gui/util/FileDialogConfiguration.java | 0 .../jabref/gui/util/FileFilterConverter.java | 0 .../gui/util/IconValidationDecorator.java | 0 .../java/org/jabref/gui/util/MappedList.java | 0 .../jabref/gui/util/OnlyIntegerFormatter.java | 0 .../util/OpenHyperlinksInExternalBrowser.java | 0 .../jabref/gui/util/RecursiveTreeItem.java | 0 .../org/jabref/gui/util/TaskExecutor.java | 0 .../org/jabref/gui/util/TooltipTextUtil.java | 0 .../gui/util/ValueTableCellFactory.java | 0 .../gui/util/ViewModelListCellFactory.java | 0 .../util/ViewModelTreeTableCellFactory.java | 0 .../org/jabref/gui/util/WindowLocation.java | 0 .../comparator/FirstColumnComparator.java | 0 .../gui/util/comparator/IconComparator.java | 0 .../util/comparator/IsMarkedComparator.java | 0 .../comparator/RankingFieldComparator.java | 0 .../gui/util/component/CheckBoxMessage.java | 0 .../component/DiffHighlightingTextPane.java | 0 .../component/JTextAreaWithPlaceholder.java | 0 .../component/JTextFieldWithPlaceholder.java | 0 .../gui/util/component/OverlayPanel.java | 0 .../org/jabref/gui/util/component/Tag.fxml | 0 .../org/jabref/gui/util/component/Tag.java | 0 .../org/jabref/gui/util/component/TagBar.css | 0 .../org/jabref/gui/util/component/TagBar.fxml | 0 .../org/jabref/gui/util/component/TagBar.java | 0 .../component/TemporalAccessorPicker.java | 0 .../gui/util/component/VerticalLabelUI.java | 0 .../org/jabref/gui/worker/AbstractWorker.java | 0 .../java/org/jabref/gui/worker/CallBack.java | 0 .../CitationStyleToClipboardWorker.java | 0 .../gui/worker/LookupIdentifiersWorker.java | 0 .../jabref/gui/worker/MarkEntriesAction.java | 0 .../jabref/gui/worker/SendAsEMailAction.java | 0 .../org/jabref/gui/worker/VersionWorker.java | 0 .../java/org/jabref/logic/TypedBibEntry.java | 0 .../autosaveandbackup/AutosaveManager.java | 0 .../autosaveandbackup/BackupManager.java | 0 .../logic/auxparser/DefaultAuxParser.java | 0 .../jabref/logic/bibtex/BibEntryWriter.java | 0 .../jabref/logic/bibtex/DuplicateCheck.java | 0 .../logic/bibtex/FieldContentParser.java | 0 .../bibtex/FieldContentParserPreferences.java | 0 .../bibtex/InvalidFieldValueException.java | 0 .../logic/bibtex/LatexFieldFormatter.java | 0 .../LatexFieldFormatterPreferences.java | 0 .../bibtex/comparator/BibDatabaseDiff.java | 0 .../logic/bibtex/comparator/BibEntryDiff.java | 0 .../bibtex/comparator/BibStringDiff.java | 0 .../comparator/BibtexStringComparator.java | 0 .../comparator/CrossRefEntryComparator.java | 0 .../bibtex/comparator/EntryComparator.java | 0 .../bibtex/comparator/FieldComparator.java | 0 .../comparator/FieldComparatorStack.java | 0 .../logic/bibtex/comparator/GroupDiff.java | 0 .../logic/bibtex/comparator/IdComparator.java | 0 .../logic/bibtex/comparator/MetaDataDiff.java | 0 .../logic/bibtex/comparator/PreambleDiff.java | 0 .../bibtexkeypattern/BibtexKeyGenerator.java | 0 .../BibtexKeyPatternPreferences.java | 0 .../bibtexkeypattern/BracketedPattern.java | 0 .../jabref/logic/bst/BibtexCaseChanger.java | 0 .../jabref/logic/bst/BibtexNameFormatter.java | 0 .../org/jabref/logic/bst/BibtexPurify.java | 0 .../jabref/logic/bst/BibtexTextPrefix.java | 0 .../org/jabref/logic/bst/BibtexWidth.java | 0 .../jabref/logic/bst/ChangeCaseFunction.java | 0 .../jabref/logic/bst/FormatNameFunction.java | 0 .../org/jabref/logic/bst/PurifyFunction.java | 0 .../jabref/logic/bst/TextPrefixFunction.java | 0 .../main/java/org/jabref/logic/bst/VM.java | 0 .../org/jabref/logic/bst/VMException.java | 0 .../main/java/org/jabref/logic/bst/Warn.java | 0 .../org/jabref/logic/bst/WidthFunction.java | 0 .../logic/citationstyle/CSLAdapter.java | 0 .../logic/citationstyle/CitationStyle.java | 0 .../citationstyle/CitationStyleCache.java | 0 .../citationstyle/CitationStyleGenerator.java | 0 .../CitationStyleOutputFormat.java | 0 .../logic/cleanup/CleanupPreferences.java | 0 .../jabref/logic/cleanup/CleanupPreset.java | 0 .../jabref/logic/cleanup/CleanupWorker.java | 0 .../org/jabref/logic/cleanup/Cleanups.java | 0 .../cleanup/ConvertToBiblatexCleanup.java | 0 .../logic/cleanup/ConvertToBibtexCleanup.java | 0 .../org/jabref/logic/cleanup/DoiCleanup.java | 0 .../logic/cleanup/FileLinksCleanup.java | 0 .../org/jabref/logic/cleanup/ISSNCleanup.java | 0 .../logic/cleanup/MoveFieldCleanup.java | 0 .../logic/cleanup/MoveFilesCleanup.java | 0 .../logic/cleanup/RelativePathsCleanup.java | 0 .../logic/cleanup/RenamePdfCleanup.java | 0 .../cleanup/UpgradePdfPsToFileCleanup.java | 0 .../logic/exporter/BibDatabaseWriter.java | 0 .../logic/exporter/BibTeXMLExporter.java | 0 .../logic/exporter/BibtexDatabaseWriter.java | 0 .../org/jabref/logic/exporter/Exporter.java | 0 .../logic/exporter/ExporterFactory.java | 0 .../logic/exporter/FileSaveSession.java | 0 .../logic/exporter/GroupSerializer.java | 0 .../jabref/logic/exporter/MSBibExporter.java | 0 .../logic/exporter/MetaDataSerializer.java | 0 .../jabref/logic/exporter/ModsExporter.java | 0 .../jabref/logic/exporter/OOCalcDatabase.java | 0 .../exporter/OpenDocumentRepresentation.java | 0 .../OpenDocumentSpreadsheetCreator.java | 0 .../exporter/OpenOfficeDocumentCreator.java | 0 .../jabref/logic/exporter/SaveException.java | 0 .../logic/exporter/SavePreferences.java | 0 .../jabref/logic/exporter/SaveSession.java | 0 .../logic/exporter/StringSaveSession.java | 0 .../logic/exporter/TemplateExporter.java | 0 .../logic/exporter/VerifyingWriter.java | 0 .../jabref/logic/formatter/Formatters.java | 0 .../logic/formatter/IdentityFormatter.java | 0 .../bibtexfields/ClearFormatter.java | 0 .../EscapeUnderscoresFormatter.java | 0 .../bibtexfields/HtmlToLatexFormatter.java | 0 .../bibtexfields/HtmlToUnicodeFormatter.java | 0 .../bibtexfields/LatexCleanupFormatter.java | 0 .../bibtexfields/NormalizeDateFormatter.java | 0 .../bibtexfields/NormalizeMonthFormatter.java | 0 .../bibtexfields/NormalizeNamesFormatter.java | 0 .../bibtexfields/NormalizePagesFormatter.java | 0 .../OrdinalsToSuperscriptFormatter.java | 0 .../bibtexfields/RegexFormatter.java | 0 .../bibtexfields/RemoveBracesFormatter.java | 0 .../RemoveHyphenatedNewlinesFormatter.java | 0 .../bibtexfields/RemoveNewlinesFormatter.java | 0 .../bibtexfields/UnicodeToLatexFormatter.java | 0 .../bibtexfields/UnitsToLatexFormatter.java | 0 .../casechanger/CapitalizeFormatter.java | 0 .../casechanger/LowerCaseFormatter.java | 0 .../casechanger/ProtectTermsFormatter.java | 0 .../casechanger/SentenceCaseFormatter.java | 0 .../logic/formatter/casechanger/Title.java | 0 .../casechanger/TitleCaseFormatter.java | 0 .../formatter/casechanger/TitleParser.java | 0 .../casechanger/UpperCaseFormatter.java | 0 .../logic/formatter/casechanger/Word.java | 0 .../minifier/MinifyNameListFormatter.java | 0 .../logic/groups/DefaultGroupsFactory.java | 0 .../java/org/jabref/logic/help/HelpFile.java | 0 .../logic/importer/EntryBasedFetcher.java | 0 .../importer/EntryBasedParserFetcher.java | 0 .../logic/importer/FetcherException.java | 0 .../logic/importer/FulltextFetcher.java | 0 .../logic/importer/FulltextFetchers.java | 0 .../jabref/logic/importer/IdBasedFetcher.java | 0 .../logic/importer/IdBasedParserFetcher.java | 0 .../org/jabref/logic/importer/IdFetcher.java | 0 .../logic/importer/IdParserFetcher.java | 0 .../logic/importer/ImportException.java | 0 .../importer/ImportFormatPreferences.java | 0 .../logic/importer/ImportFormatReader.java | 0 .../logic/importer/ImportInspector.java | 0 .../org/jabref/logic/importer/Importer.java | 0 .../jabref/logic/importer/OpenDatabase.java | 0 .../jabref/logic/importer/OutputPrinter.java | 0 .../jabref/logic/importer/ParseException.java | 0 .../org/jabref/logic/importer/Parser.java | 0 .../jabref/logic/importer/ParserResult.java | 0 .../logic/importer/SearchBasedFetcher.java | 0 .../importer/SearchBasedParserFetcher.java | 0 .../org/jabref/logic/importer/WebFetcher.java | 0 .../jabref/logic/importer/WebFetchers.java | 0 .../jabref/logic/importer/fetcher/ACS.java | 0 .../importer/fetcher/AbstractIsbnFetcher.java | 0 .../jabref/logic/importer/fetcher/ArXiv.java | 0 .../fetcher/AstrophysicsDataSystem.java | 0 .../importer/fetcher/BibsonomyScraper.java | 0 .../logic/importer/fetcher/CrossRef.java | 0 .../logic/importer/fetcher/DBLPFetcher.java | 0 .../jabref/logic/importer/fetcher/DiVA.java | 0 .../logic/importer/fetcher/DoiFetcher.java | 0 .../logic/importer/fetcher/DoiResolution.java | 0 .../logic/importer/fetcher/GoogleScholar.java | 0 .../logic/importer/fetcher/GvkFetcher.java | 0 .../jabref/logic/importer/fetcher/IEEE.java | 0 .../importer/fetcher/IacrEprintFetcher.java | 0 .../logic/importer/fetcher/IsbnFetcher.java | 0 .../fetcher/IsbnViaChimboriFetcher.java | 0 .../fetcher/IsbnViaEbookDeFetcher.java | 0 .../importer/fetcher/LibraryOfCongress.java | 0 .../logic/importer/fetcher/MathSciNet.java | 0 .../importer/fetcher/MedlineFetcher.java | 0 .../logic/importer/fetcher/MrDLibFetcher.java | 0 .../logic/importer/fetcher/OpenAccessDoi.java | 0 .../logic/importer/fetcher/ScienceDirect.java | 0 .../logic/importer/fetcher/SpringerLink.java | 0 .../logic/importer/fetcher/TitleFetcher.java | 0 .../jabref/logic/importer/fetcher/zbMATH.java | 0 .../importer/fileformat/BibTeXMLImporter.java | 0 .../fileformat/BiblioscapeImporter.java | 0 .../importer/fileformat/BibtexImporter.java | 0 .../importer/fileformat/BibtexParser.java | 0 .../importer/fileformat/CopacImporter.java | 0 .../importer/fileformat/CustomImporter.java | 0 .../importer/fileformat/EndnoteImporter.java | 0 .../importer/fileformat/FreeCiteImporter.java | 0 .../logic/importer/fileformat/GvkParser.java | 0 .../importer/fileformat/InspecImporter.java | 0 .../importer/fileformat/IsiImporter.java | 0 .../importer/fileformat/MedlineImporter.java | 0 .../fileformat/MedlinePlainImporter.java | 0 .../importer/fileformat/ModsImporter.java | 0 .../importer/fileformat/MrDLibImporter.java | 0 .../importer/fileformat/MsBibImporter.java | 0 .../importer/fileformat/OvidImporter.java | 0 .../fileformat/PdfContentImporter.java | 0 .../importer/fileformat/PdfXmpImporter.java | 0 .../importer/fileformat/RepecNepImporter.java | 0 .../importer/fileformat/RisImporter.java | 0 .../fileformat/SilverPlatterImporter.java | 0 .../fileformat/mods/package-info.java | 0 .../util/ConvertLegacyExplicitGroups.java | 0 .../logic/importer/util/GroupsParser.java | 0 .../util/INSPIREBibtexFilterReader.java | 0 .../logic/importer/util/IdentifierParser.java | 0 .../logic/importer/util/JSONEntryParser.java | 0 .../logic/importer/util/JsonReader.java | 0 .../logic/importer/util/MetaDataParser.java | 0 .../logic/importer/util/OAI2Handler.java | 0 .../logic/importer/util/PostOpenAction.java | 0 .../integrity/ASCIICharacterChecker.java | 0 .../logic/integrity/AbbreviationChecker.java | 0 .../logic/integrity/BibStringChecker.java | 0 .../integrity/BibTeXEntryTypeChecker.java | 0 .../logic/integrity/BibtexKeyChecker.java | 0 .../BibtexKeyDuplicationChecker.java | 0 .../integrity/BibtexkeyDeviationChecker.java | 0 .../logic/integrity/BooktitleChecker.java | 0 .../logic/integrity/BracesCorrector.java | 0 .../logic/integrity/BracketChecker.java | 0 .../logic/integrity/DOIValidityChecker.java | 0 .../logic/integrity/EditionChecker.java | 0 .../logic/integrity/EntryLinkChecker.java | 0 .../jabref/logic/integrity/FieldChecker.java | 0 .../jabref/logic/integrity/FieldCheckers.java | 0 .../jabref/logic/integrity/FileChecker.java | 0 .../logic/integrity/HTMLCharacterChecker.java | 0 .../logic/integrity/HowPublishedChecker.java | 0 .../jabref/logic/integrity/ISBNChecker.java | 0 .../jabref/logic/integrity/ISSNChecker.java | 0 .../logic/integrity/IntegrityCheck.java | 0 .../logic/integrity/IntegrityMessage.java | 0 .../JournalInAbbreviationListChecker.java | 0 .../jabref/logic/integrity/MonthChecker.java | 0 .../logic/integrity/NoBibtexFieldChecker.java | 0 .../jabref/logic/integrity/NoteChecker.java | 0 .../jabref/logic/integrity/PagesChecker.java | 0 .../logic/integrity/PersonNamesChecker.java | 0 .../jabref/logic/integrity/TitleChecker.java | 0 .../jabref/logic/integrity/TypeChecker.java | 0 .../jabref/logic/integrity/UrlChecker.java | 0 .../integrity/ValidBibtexKeyChecker.java | 0 .../jabref/logic/integrity/ValueChecker.java | 0 .../jabref/logic/integrity/YearChecker.java | 0 .../jabref/logic/journals/Abbreviation.java | 0 .../logic/journals/AbbreviationParser.java | 0 .../logic/journals/AbbreviationWriter.java | 0 .../journals/JournalAbbreviationLoader.java | 0 .../JournalAbbreviationPreferences.java | 0 .../JournalAbbreviationRepository.java | 0 .../jabref/logic/l10n/EncodingControl.java | 0 .../java/org/jabref/logic/l10n/Encodings.java | 0 .../java/org/jabref/logic/l10n/Languages.java | 0 .../org/jabref/logic/l10n/Localization.java | 0 .../jabref/logic/l10n/LocalizationKey.java | 0 .../logic/l10n/LocalizationKeyParams.java | 0 .../layout/AbstractParamLayoutFormatter.java | 0 .../java/org/jabref/logic/layout/Layout.java | 0 .../org/jabref/logic/layout/LayoutEntry.java | 0 .../jabref/logic/layout/LayoutFormatter.java | 0 .../layout/LayoutFormatterPreferences.java | 0 .../org/jabref/logic/layout/LayoutHelper.java | 0 .../logic/layout/ParamLayoutFormatter.java | 0 .../org/jabref/logic/layout/StringInt.java | 0 .../layout/format/AuthorAbbreviator.java | 0 .../format/AuthorAndToSemicolonReplacer.java | 0 .../format/AuthorAndsCommaReplacer.java | 0 .../layout/format/AuthorAndsReplacer.java | 0 .../format/AuthorFirstAbbrLastCommas.java | 0 .../AuthorFirstAbbrLastOxfordCommas.java | 0 .../logic/layout/format/AuthorFirstFirst.java | 0 .../layout/format/AuthorFirstFirstCommas.java | 0 .../layout/format/AuthorFirstLastCommas.java | 0 .../format/AuthorFirstLastOxfordCommas.java | 0 .../logic/layout/format/AuthorLF_FF.java | 0 .../logic/layout/format/AuthorLF_FFAbbr.java | 0 .../logic/layout/format/AuthorLastFirst.java | 0 .../format/AuthorLastFirstAbbrCommas.java | 0 .../AuthorLastFirstAbbrOxfordCommas.java | 0 .../format/AuthorLastFirstAbbreviator.java | 0 .../layout/format/AuthorLastFirstCommas.java | 0 .../format/AuthorLastFirstOxfordCommas.java | 0 .../logic/layout/format/AuthorNatBib.java | 0 .../logic/layout/format/AuthorOrgSci.java | 0 .../jabref/logic/layout/format/Authors.java | 0 .../logic/layout/format/CompositeFormat.java | 0 .../layout/format/CreateBibORDFAuthors.java | 0 .../layout/format/CreateDocBookAuthors.java | 0 .../layout/format/CreateDocBookEditors.java | 0 .../logic/layout/format/CurrentDate.java | 0 .../jabref/logic/layout/format/DOICheck.java | 0 .../jabref/logic/layout/format/DOIStrip.java | 0 .../logic/layout/format/DateFormatter.java | 0 .../jabref/logic/layout/format/Default.java | 0 .../layout/format/EntryTypeFormatter.java | 0 .../jabref/logic/layout/format/FileLink.java | 0 .../layout/format/FileLinkPreferences.java | 0 .../jabref/logic/layout/format/FirstPage.java | 0 .../layout/format/FormatPagesForHTML.java | 0 .../layout/format/FormatPagesForXML.java | 0 .../layout/format/GetOpenOfficeType.java | 0 .../jabref/logic/layout/format/HTMLChars.java | 0 .../logic/layout/format/HTMLParagraphs.java | 0 .../jabref/logic/layout/format/IfPlural.java | 0 .../logic/layout/format/Iso690FormatDate.java | 0 .../layout/format/Iso690NamesAuthors.java | 0 .../layout/format/JournalAbbreviator.java | 0 .../jabref/logic/layout/format/LastPage.java | 0 .../format/LatexToUnicodeFormatter.java | 0 .../logic/layout/format/NameFormatter.java | 0 .../format/NameFormatterPreferences.java | 0 .../format/NoSpaceBetweenAbbreviations.java | 0 .../layout/format/NotFoundFormatter.java | 0 .../jabref/logic/layout/format/Number.java | 0 .../jabref/logic/layout/format/Ordinal.java | 0 .../jabref/logic/layout/format/RTFChars.java | 0 .../logic/layout/format/RemoveBrackets.java | 0 .../layout/format/RemoveBracketsAddComma.java | 0 .../format/RemoveLatexCommandsFormatter.java | 0 .../logic/layout/format/RemoveTilde.java | 0 .../logic/layout/format/RemoveWhitespace.java | 0 .../jabref/logic/layout/format/Replace.java | 0 .../logic/layout/format/RisAuthors.java | 0 .../logic/layout/format/RisKeywords.java | 0 .../jabref/logic/layout/format/RisMonth.java | 0 .../logic/layout/format/ToLowerCase.java | 0 .../logic/layout/format/ToUpperCase.java | 0 .../logic/layout/format/WrapContent.java | 0 .../logic/layout/format/WrapFileLinks.java | 0 .../jabref/logic/layout/format/XMLChars.java | 0 .../jabref/logic/logging/JabRefLogger.java | 0 .../org/jabref/logic/logging/LogMessages.java | 0 .../jabref/logic/msbib/BibTeXConverter.java | 0 .../jabref/logic/msbib/MSBibConverter.java | 0 .../org/jabref/logic/msbib/MSBibDatabase.java | 0 .../org/jabref/logic/msbib/MSBibEntry.java | 0 .../jabref/logic/msbib/MSBibEntryType.java | 0 .../org/jabref/logic/msbib/MSBibMapping.java | 0 .../org/jabref/logic/msbib/MsBibAuthor.java | 0 .../org/jabref/logic/msbib/PageNumbers.java | 0 .../jabref/logic/net/ProgressInputStream.java | 0 .../jabref/logic/net/ProxyAuthenticator.java | 0 .../jabref/logic/net/ProxyPreferences.java | 0 .../org/jabref/logic/net/ProxyRegisterer.java | 0 .../org/jabref/logic/net/URLDownload.java | 0 .../java/org/jabref/logic/net/URLUtil.java | 0 .../logic/openoffice/CitationEntry.java | 0 .../jabref/logic/openoffice/OOBibStyle.java | 0 .../logic/openoffice/OOPreFormatter.java | 0 .../org/jabref/logic/openoffice/OOUtil.java | 0 .../openoffice/OpenOfficeFileSearch.java | 0 .../openoffice/OpenOfficePreferences.java | 0 .../jabref/logic/openoffice/StyleLoader.java | 0 .../openoffice/UndefinedBibtexEntry.java | 0 .../UndefinedParagraphFormatException.java | 0 .../jabref/logic/pdf/AnnotationImporter.java | 0 .../logic/pdf/EntryAnnotationImporter.java | 0 .../jabref/logic/pdf/FileAnnotationCache.java | 0 .../logic/pdf/PdfAnnotationImporter.java | 0 .../org/jabref/logic/pdf/TextExtractor.java | 0 .../preferences/TimestampPreferences.java | 0 .../protectedterms/ProtectedTermsList.java | 0 .../protectedterms/ProtectedTermsLoader.java | 0 .../protectedterms/ProtectedTermsParser.java | 0 .../ProtectedTermsPreferences.java | 0 .../logic/remote/RemotePreferences.java | 0 .../org/jabref/logic/remote/RemoteUtil.java | 0 .../remote/client/RemoteListenerClient.java | 0 .../logic/remote/server/MessageHandler.java | 0 .../remote/server/RemoteListenerServer.java | 0 .../server/RemoteListenerServerLifecycle.java | 0 .../server/RemoteListenerServerThread.java | 0 .../jabref/logic/remote/shared/Protocol.java | 0 .../jabref/logic/search/DatabaseSearcher.java | 0 .../org/jabref/logic/search/SearchQuery.java | 0 .../search/SearchQueryHighlightListener.java | 0 .../SearchQueryHighlightObservable.java | 0 .../jabref/logic/shared/DBMSConnection.java | 0 .../shared/DBMSConnectionProperties.java | 0 .../jabref/logic/shared/DBMSProcessor.java | 0 .../jabref/logic/shared/DBMSSynchronizer.java | 0 .../jabref/logic/shared/MySQLProcessor.java | 0 .../jabref/logic/shared/OracleProcessor.java | 0 .../logic/shared/PostgreSQLProcessor.java | 0 .../shared/event/ConnectionLostEvent.java | 0 .../event/SharedEntryNotPresentEvent.java | 0 .../shared/event/UpdateRefusedEvent.java | 0 ...alidDBMSConnectionPropertiesException.java | 0 .../NotASharedDatabaseException.java | 0 .../exception/OfflineLockException.java | 0 .../SharedEntryNotPresentException.java | 0 .../listener/OracleNotificationListener.java | 0 .../PostgresSQLNotificationListener.java | 0 .../prefs/SharedDatabasePreferences.java | 0 .../logic/shared/security/Password.java | 0 .../specialfields/SpecialFieldsUtils.java | 0 .../logic/undo/AddUndoableActionEvent.java | 0 .../jabref/logic/undo/UndoChangeEvent.java | 0 .../org/jabref/logic/undo/UndoRedoEvent.java | 0 .../java/org/jabref/logic/util/BuildInfo.java | 0 .../java/org/jabref/logic/util/FileType.java | 0 .../org/jabref/logic/util/JavaVersion.java | 0 .../MetadataSerializationConfiguration.java | 0 .../main/java/org/jabref/logic/util/OS.java | 0 .../java/org/jabref/logic/util/TestEntry.java | 0 .../org/jabref/logic/util/UpdateField.java | 0 .../logic/util/UpdateFieldPreferences.java | 0 .../java/org/jabref/logic/util/Version.java | 0 .../logic/util/io/AutoLinkPreferences.java | 0 .../logic/util/io/CiteKeyBasedFileFinder.java | 0 .../logic/util/io/DatabaseFileLookup.java | 0 .../jabref/logic/util/io/FileBasedLock.java | 0 .../org/jabref/logic/util/io/FileFinder.java | 0 .../org/jabref/logic/util/io/FileFinders.java | 0 .../org/jabref/logic/util/io/FileHistory.java | 0 .../jabref/logic/util/io/FileNameCleaner.java | 0 .../org/jabref/logic/util/io/FileUtil.java | 0 .../logic/util/io/RegExpBasedFileFinder.java | 0 .../org/jabref/logic/util/io/XMLUtil.java | 0 .../logic/util/strings/DiffHighlighting.java | 0 .../strings/HTMLUnicodeConversionMaps.java | 0 .../util/strings/QuotedStringTokenizer.java | 0 .../jabref/logic/util/strings/RtfCharMap.java | 0 .../util/strings/StringLengthComparator.java | 0 .../logic/util/strings/StringSimilarity.java | 0 .../logic/util/strings/XmlCharsMap.java | 0 .../EncryptedPdfsNotSupportedException.java | 0 .../org/jabref/logic/xmp/XMPPreferences.java | 0 .../org/jabref/logic/xmp/XMPSchemaBibtex.java | 0 .../java/org/jabref/logic/xmp/XMPUtil.java | 0 .../CustomEntryTypePreferenceMigration.java | 0 .../migrations/FileLinksUpgradeWarning.java | 0 .../migrations/PreferencesMigrations.java | 0 .../org/jabref/pdfimport/ImportDialog.java | 0 .../org/jabref/pdfimport/PdfFileFilter.java | 0 .../org/jabref/pdfimport/PdfImporter.java | 0 .../jabref/preferences/CustomExportList.java | 0 .../jabref/preferences/CustomImportList.java | 0 .../jabref/preferences/ExportComparator.java | 0 .../jabref/preferences/JabRefPreferences.java | 0 .../preferences/JabRefPreferencesFilter.java | 0 .../LastFocusedTabPreferences.java | 0 .../preferences/PreferencesService.java | 0 .../preferences/PreviewPreferences.java | 0 .../jabref/preferences/SearchPreferences.java | 0 .../preferences/VersionPreferences.java | 0 .../main/java/osx/macadapter/MacAdapter.java | 0 .../main/resources/ApplicationInsights.xml | 0 ...cks.afterburner.injection.PresenterFactory | 0 .../src}/main/resources/build.properties | 0 .../fonts/materialdesignicons-webfont.ttf | Bin .../src}/main/resources/icons/jabref.icns | Bin .../src}/main/resources/icons/jabref.ico | Bin .../src}/main/resources/icons/jabref.svg | 0 .../main/resources/images/Icons.properties | 0 .../images/external/JabRef-icon-128.png | Bin .../images/external/JabRef-icon-16.png | Bin .../images/external/JabRef-icon-20.png | Bin .../images/external/JabRef-icon-32.png | Bin .../images/external/JabRef-icon-40.png | Bin .../images/external/JabRef-icon-48.png | Bin .../images/external/JabRef-icon-64.png | Bin .../resources/images/external/arxiv_32.png | Bin .../main/resources/images/external/emacs.png | Bin .../main/resources/images/external/lyx2.png | Bin .../resources/images/external/mdl-icon.png | Bin .../resources/images/external/mdlListIcon.png | Bin .../resources/images/external/mdlloading.gif | Bin .../resources/images/external/openoffice.png | Bin .../main/resources/images/external/red.png | Bin .../resources/images/external/texmaker.png | Bin .../resources/images/external/texstudio.png | Bin .../main/resources/images/external/vim.png | Bin .../main/resources/images/external/winedt.png | Bin .../resources/images/external/wwwciteseer.png | Bin .../journals/IEEEJournalListCode.txt | 0 .../journals/IEEEJournalListText.txt | 0 .../main/resources/journals/journalList.txt | 0 .../main/resources/l10n/JabRef_da.properties | 0 .../main/resources/l10n/JabRef_de.properties | 0 .../main/resources/l10n/JabRef_el.properties | 0 .../main/resources/l10n/JabRef_en.properties | 0 .../main/resources/l10n/JabRef_es.properties | 0 .../main/resources/l10n/JabRef_fa.properties | 0 .../main/resources/l10n/JabRef_fr.properties | 0 .../main/resources/l10n/JabRef_in.properties | 0 .../main/resources/l10n/JabRef_it.properties | 0 .../main/resources/l10n/JabRef_ja.properties | 0 .../main/resources/l10n/JabRef_nl.properties | 0 .../main/resources/l10n/JabRef_no.properties | 0 .../resources/l10n/JabRef_pt_BR.properties | 0 .../main/resources/l10n/JabRef_ru.properties | 0 .../main/resources/l10n/JabRef_sv.properties | 0 .../main/resources/l10n/JabRef_tr.properties | 0 .../main/resources/l10n/JabRef_vi.properties | 0 .../main/resources/l10n/JabRef_zh.properties | 0 .../main/resources/l10n/Menu_da.properties | 0 .../main/resources/l10n/Menu_de.properties | 0 .../main/resources/l10n/Menu_el.properties | 0 .../main/resources/l10n/Menu_en.properties | 0 .../main/resources/l10n/Menu_es.properties | 0 .../main/resources/l10n/Menu_fa.properties | 0 .../main/resources/l10n/Menu_fr.properties | 0 .../main/resources/l10n/Menu_in.properties | 0 .../main/resources/l10n/Menu_it.properties | 0 .../main/resources/l10n/Menu_ja.properties | 0 .../main/resources/l10n/Menu_nl.properties | 0 .../main/resources/l10n/Menu_no.properties | 0 .../main/resources/l10n/Menu_pt_BR.properties | 0 .../main/resources/l10n/Menu_ru.properties | 0 .../main/resources/l10n/Menu_sv.properties | 0 .../main/resources/l10n/Menu_tr.properties | 0 .../main/resources/l10n/Menu_vi.properties | 0 .../main/resources/l10n/Menu_zh.properties | 0 .../src}/main/resources/log4j2.xml | 0 .../jabref/gui/copyfiles/CopyFilesDialog.fxml | 0 .../org/jabref/gui/help/AboutDialog.css | 0 .../org/jabref/gui/help/AboutDialog.fxml | 0 .../journals/ManageJournalAbbreviations.css | 0 .../journals/ManageJournalAbbreviations.fxml | 0 .../jabref/gui/keyboard/KeyBindingsDialog.css | 0 .../gui/keyboard/KeyBindingsDialog.fxml | 0 .../countries_territories.terms | 0 .../electrical_engineering.terms | 0 .../protectedterms/months_weekdays.terms | 0 .../resource/layout/bibordf.article.layout | 0 .../resource/layout/bibordf.begin.layout | 0 .../resource/layout/bibordf.end.layout | 0 .../resources/resource/layout/bibordf.layout | 0 .../resource/layout/din1505/README.txt | 0 .../din1505/din1505winword.article.layout | 0 .../din1505/din1505winword.begin.layout | 0 .../din1505/din1505winword.conference.layout | 0 .../layout/din1505/din1505winword.end.layout | 0 .../din1505winword.inproceedings.layout | 0 .../layout/din1505/din1505winword.layout | 0 .../resource/layout/docbook.begin.layout | 0 .../resource/layout/docbook.end.layout | 0 .../resources/resource/layout/docbook.layout | 0 .../layout/docbook.mastersthesis.layout | 0 .../layout/endnote/EndNote.article.layout | 0 .../layout/endnote/EndNote.book.layout | 0 .../layout/endnote/EndNote.booklet.layout | 0 .../layout/endnote/EndNote.inbook.layout | 0 .../endnote/EndNote.incollection.layout | 0 .../endnote/EndNote.inproceedings.layout | 0 .../resource/layout/endnote/EndNote.layout | 0 .../layout/endnote/EndNote.manual.layout | 0 .../endnote/EndNote.mastersthesis.layout | 0 .../layout/endnote/EndNote.misc.layout | 0 .../layout/endnote/EndNote.other.layout | 0 .../layout/endnote/EndNote.phdthesis.layout | 0 .../layout/endnote/EndNote.proceedings.layout | 0 .../layout/endnote/EndNote.techreport.layout | 0 .../layout/endnote/EndNote.unpublished.layout | 0 .../resource/layout/endnote/Readme.txt | 0 .../layout/harvard/harvard.article.layout | 0 .../layout/harvard/harvard.begin.layout | 0 .../layout/harvard/harvard.book.layout | 0 .../layout/harvard/harvard.end.layout | 0 .../layout/harvard/harvard.inbook.layout | 0 .../harvard/harvard.incollection.layout | 0 .../harvard/harvard.inproceedings.layout | 0 .../resource/layout/harvard/harvard.layout | 0 .../harvard/harvard.mastersthesis.layout | 0 .../layout/harvard/harvard.phdthesis.layout | 0 .../layout/harvard/harvard.proceedings.layout | 0 .../resource/layout/harvard/harvard.readme | 0 .../resource/layout/html.begin.layout | 0 .../resource/layout/html.book.layout | 0 .../resources/resource/layout/html.end.layout | 0 .../resource/layout/html.inbook.layout | 0 .../resource/layout/html.inproceedings.layout | 0 .../resources/resource/layout/html.layout | 0 .../resource/layout/html.mastersthesis.layout | 0 .../resource/layout/html.phdthesis.layout | 0 .../layout/iso690rtf/iso690RTF.article.layout | 0 .../layout/iso690rtf/iso690RTF.begin.layout | 0 .../layout/iso690rtf/iso690RTF.book.layout | 0 .../layout/iso690rtf/iso690RTF.edocs.layout | 0 .../iso690rtf/iso690RTF.edocsarticle.layout | 0 .../iso690RTF.edocscontribution.layout | 0 .../iso690rtf/iso690RTF.edocsnews.layout | 0 .../iso690RTF.edocsperiodical.layout | 0 .../layout/iso690rtf/iso690RTF.email.layout | 0 .../iso690rtf/iso690RTF.emaillist.layout | 0 .../layout/iso690rtf/iso690RTF.end.layout | 0 .../iso690rtf/iso690RTF.graphics.layout | 0 .../layout/iso690rtf/iso690RTF.inbook.layout | 0 .../layout/iso690rtf/iso690RTF.inedocs.layout | 0 .../iso690rtf/iso690RTF.inproceedings.layout | 0 .../layout/iso690rtf/iso690RTF.layout | 0 .../iso690rtf/iso690RTF.legislation.layout | 0 .../iso690rtf/iso690RTF.mastersthesis.layout | 0 .../layout/iso690rtf/iso690RTF.patent.layout | 0 .../iso690rtf/iso690RTF.periodical.layout | 0 .../iso690rtf/iso690RTF.proceeding.layout | 0 .../layout/iso690rtf/iso690RTF.radiotv.layout | 0 .../iso690rtf/iso690RTF.recording.layout | 0 .../iso690rtf/iso690RTF.standard.layout | 0 .../iso690rtf/iso690RTF.techreport.layout | 0 .../iso690rtf/iso690RTF.unpublished.layout | 0 .../layout/iso690txt/iso690.article.layout | 0 .../layout/iso690txt/iso690.book.layout | 0 .../layout/iso690txt/iso690.edocs.layout | 0 .../iso690txt/iso690.edocsarticle.layout | 0 .../iso690txt/iso690.edocscontribution.layout | 0 .../layout/iso690txt/iso690.edocsnews.layout | 0 .../iso690txt/iso690.edocsperiodical.layout | 0 .../layout/iso690txt/iso690.email.layout | 0 .../layout/iso690txt/iso690.emaillist.layout | 0 .../layout/iso690txt/iso690.graphics.layout | 0 .../layout/iso690txt/iso690.inbook.layout | 0 .../layout/iso690txt/iso690.inedocs.layout | 0 .../iso690txt/iso690.inproceedings.layout | 0 .../resource/layout/iso690txt/iso690.layout | 0 .../iso690txt/iso690.legislation.layout | 0 .../iso690txt/iso690.mastersthesis.layout | 0 .../layout/iso690txt/iso690.patent.layout | 0 .../layout/iso690txt/iso690.periodical.layout | 0 .../layout/iso690txt/iso690.proceeding.layout | 0 .../layout/iso690txt/iso690.radiotv.layout | 0 .../layout/iso690txt/iso690.recording.layout | 0 .../layout/iso690txt/iso690.standard.layout | 0 .../layout/iso690txt/iso690.techreport.layout | 0 .../iso690txt/iso690.unpublished.layout | 0 .../layout/listrefs/listrefs.begin.layout | 0 .../layout/listrefs/listrefs.end.layout | 0 .../resource/layout/listrefs/listrefs.layout | 0 .../layout/listrefs/listrefs.misc.layout | 0 .../resource/layout/misq/misq.article.layout | 0 .../resource/layout/misq/misq.begin.layout | 0 .../resource/layout/misq/misq.book.layout | 0 .../resource/layout/misq/misq.end.layout | 0 .../resource/layout/misq/misq.layout | 0 .../resources/resource/layout/misq/readme.txt | 0 .../resource/layout/openoffice/README | 0 .../openoffice/openoffice-csv.begin.layout | 0 .../layout/openoffice/openoffice-csv.layout | 0 .../resource/layout/ris/ris.article.layout | 0 .../resource/layout/ris/ris.book.layout | 0 .../resource/layout/ris/ris.conference.layout | 0 .../layout/ris/ris.incollection.layout | 0 .../layout/ris/ris.inproceedings.layout | 0 .../resources/resource/layout/ris/ris.layout | 0 .../layout/ris/ris.mastersthesis.layout | 0 .../resource/layout/ris/ris.patent.layout | 0 .../resource/layout/ris/ris.phdthesis.layout | 0 .../resource/layout/ris/ris.techreport.layout | 0 .../layout/ris/ris.unpublished.layout | 0 .../resource/layout/ris/ris.www.layout | 0 .../resource/layout/simplehtml.begin.layout | 0 .../resource/layout/simplehtml.end.layout | 0 .../resource/layout/simplehtml.layout | 0 .../layout/tablerefs/tablerefs.begin.layout | 0 .../layout/tablerefs/tablerefs.end.layout | 0 .../layout/tablerefs/tablerefs.layout | 0 .../tablerefsabsbib.begin.layout | 0 .../tablerefsabsbib.end.layout | 0 .../tablerefsabsbib/tablerefsabsbib.layout | 0 .../resources/resource/layout/text.layout | 0 .../main/resources/resource/ods/manifest.xml | 0 .../src}/main/resources/resource/ods/meta.xml | 0 .../main/resources/resource/ods/settings.xml | 0 .../openoffice/default_authoryear.jstyle | 0 .../openoffice/default_numerical.jstyle | 0 .../resource/openoffice/manifest.xml | 0 .../resources/resource/openoffice/meta.xml | 0 .../resources/resource/openoffice/mimetype | 0 .../main/resources/xjc/bibtexml/bibtexml.xsd | 0 .../resources/xjc/medline/bookdoc_160101.xsd | 0 .../main/resources/xjc/medline/medline.xsd | 0 .../medline/nlmmedlinecitationset_160101.xsd | 0 .../src}/main/resources/xjc/mods/mods-3-6.xsd | 0 .../main/resources/xjc/mods/mods-binding.xjb | 0 .../test/java/org/jabref/BibtexTestData.java | 0 .../org/jabref/CatchExceptionsFromThread.java | 0 .../test/java/org/jabref/CodeStyleTests.java | 0 .../org/jabref/JabRefPreferencesTest.java | 0 .../SearchQueryHighlightListenerTest.java | 0 .../java/org/jabref/TestIconsProperties.java | 0 .../architecture/MainArchitectureTests.java | 0 .../MainArchitectureTestsWithArchUnit.java | 0 .../architecture/TestArchitectureTests.java | 0 .../cleanup/CleanupActionsListModelTest.java | 0 .../org/jabref/cli/AuxCommandLineTest.java | 0 .../java/org/jabref/cli/JabRefCLITest.java | 0 .../org/jabref/gui/AWTExceptionHandler.java | 0 .../java/org/jabref/gui/AbstractUITest.java | 0 .../org/jabref/gui/ClipBoardManagerTest.java | 0 .../test/java/org/jabref/gui/DialogTest.java | 0 .../test/java/org/jabref/gui/DialogTest2.java | 0 .../java/org/jabref/gui/EntryTableTest.java | 0 .../test/java/org/jabref/gui/GUITest.java | 0 .../org/jabref/gui/IdFetcherDialogTest.java | 0 .../gui/ParameterizedDialogNewEntryTest.java | 0 .../jabref/gui/ParameterizedDialogTest.java | 0 .../gui/ParameterizedMenuNewEntryTest.java | 0 .../test/java/org/jabref/gui/UndoTest.java | 0 .../gui/UpdateTimestampListenerTest.java | 0 .../gui/autocompleter/AutoCompleterUtil.java | 0 .../BibEntrySuggestionProviderTest.java | 0 .../DefaultAutoCompleterTest.java | 0 .../FieldValueSuggestionProviderTest.java | 0 .../PersonNameSuggestionProviderTest.java | 0 .../gui/entryeditor/EntryEditorTest.java | 0 .../AutoSetFileLinksUtilTest.java | 0 .../ExternalFileTypeTest.java | 0 .../fieldeditors/HtmlTransferableTest.java | 0 .../IdentifierEditorViewModelTest.java | 0 .../fieldeditors/LinkedFileViewModelTest.java | 0 .../gui/groups/GroupNodeViewModelTest.java | 0 .../gui/groups/GroupTreeViewModelTest.java | 0 .../EntryFromFileCreatorManagerTest.java | 0 .../gui/importer/EntryFromPDFCreatorTest.java | 0 .../fetcher/OAI2HandlerFetcherTest.java | 0 ...nageJournalAbbreviationsViewModelTest.java | 0 .../KeyBindingsDialogViewModelTest.java | 0 ...sAndRegexBasedSearchRuleDescriberTest.java | 0 .../GrammarBasedSearchRuleDescriberTest.java | 0 .../jabref/gui/search/SearchResultsTest.java | 0 .../gui/search/TextFlowEqualityHelper.java | 0 .../gui/util/FileDialogConfigurationTest.java | 0 .../gui/util/RecursiveTreeItemTest.java | 0 .../jabref/gui/util/TooltipTextUtilTest.java | 0 .../CitationStyleToClipboardWorkerTest.java | 0 .../org/jabref/logic/TypedBibEntryTest.java | 0 .../autosaveandbackup/BackupManagerTest.java | 0 .../jabref/logic/auxparser/AuxParserTest.java | 0 .../jabref/logic/bibtex/BibEntryAssert.java | 0 .../logic/bibtex/BibEntryWriterTest.java | 0 .../logic/bibtex/DuplicateCheckTest.java | 0 .../logic/bibtex/FieldContentParserTest.java | 0 .../bibtex/LatexFieldFormatterTests.java | 0 .../comparator/BibDatabaseDiffTest.java | 0 .../BibtexStringComparatorTest.java | 0 .../CrossRefEntryComparatorTest.java | 0 .../comparator/EntryComparatorTest.java | 0 .../comparator/FieldComparatorTest.java | 0 .../bibtex/comparator/MetaDataDiffTest.java | 0 .../BibtexKeyGeneratorTest.java | 0 .../MakeLabelWithDatabaseTest.java | 0 .../MakeLabelWithoutDatabaseTest.java | 0 .../logic/bst/BibtexCaseChangersTest.java | 0 .../logic/bst/BibtexNameFormatterTest.java | 0 .../jabref/logic/bst/BibtexPurifyTest.java | 0 .../org/jabref/logic/bst/BibtexWidthTest.java | 0 .../java/org/jabref/logic/bst/TestVM.java | 0 .../logic/bst/TextPrefixFunctionTest.java | 0 .../CitationStyleGeneratorTest.java | 0 .../citationstyle/CitationStyleTest.java | 0 .../cleanup/BibtexBiblatexRoundtripTest.java | 0 .../logic/cleanup/CleanupWorkerTest.java | 0 .../cleanup/ConvertToBiblatexCleanupTest.java | 0 .../cleanup/ConvertToBibtexCleanupTest.java | 0 .../cleanup/FieldFormatterCleanupTest.java | 0 .../jabref/logic/cleanup/ISSNCleanupTest.java | 0 .../logic/cleanup/MoveFilesCleanupTest.java | 0 .../logic/cleanup/RenamePdfCleanupTest.java | 0 .../exporter/BibTeXMLExporterTestFiles.java | 0 .../exporter/BibtexDatabaseWriterTest.java | 0 .../logic/exporter/CsvExportFormatTest.java | 0 .../jabref/logic/exporter/ExporterTest.java | 0 .../exporter/FieldFormatterCleanupsTest.java | 0 .../logic/exporter/GroupSerializerTest.java | 0 .../logic/exporter/HtmlExportFormatTest.java | 0 .../exporter/MSBibExportFormatTestFiles.java | 0 .../exporter/MetaDataSerializerTest.java | 0 .../logic/exporter/ModsExportFormatTest.java | 0 .../exporter/ModsExportFormatTestFiles.java | 0 .../logic/exporter/MsBibExportFormatTest.java | 0 .../jabref/logic/formatter/FormatterTest.java | 0 .../formatter/IdentityFormatterTest.java | 0 .../bibtexfields/ClearFormatterTest.java | 0 .../EscapeUnderscoresFormatterTest.java | 0 .../HtmlToLatexFormatterTest.java | 0 .../HtmlToUnicodeFormatterTest.java | 0 .../LatexCleanupFormatterTest.java | 0 .../NormalizeDateFormatterTest.java | 0 .../NormalizeMonthFormatterTest.java | 0 .../NormalizeNamesFormatterTest.java | 0 .../NormalizePagesFormatterTest.java | 0 .../OrdinalsToSuperscriptFormatterTest.java | 0 .../bibtexfields/RegexFormatterTest.java | 0 .../RemoveBracesFormatterTest.java | 0 ...RemoveHyphenatedNewlinesFormatterTest.java | 0 .../RemoveNewlinesFormatterTest.java | 0 .../bibtexfields/UnicodeConverterTest.java | 0 .../UnicodeToLatexFormatterTest.java | 0 .../UnitsToLatexFormatterTest.java | 0 .../casechanger/CapitalizeFormatterTest.java | 0 .../casechanger/LowerCaseFormatterTest.java | 0 .../ProtectTermsFormatterTest.java | 0 .../SentenceCaseFormatterTest.java | 0 .../casechanger/TitleCaseFormatterTest.java | 0 .../casechanger/UpperCaseFormatterTest.java | 0 .../minifier/MinifyNameListFormatterTest.java | 0 .../org/jabref/logic/help/HelpFileTest.java | 0 .../importer/BibDatabaseTestsWithFiles.java | 0 .../importer/DatabaseFileLookupTest.java | 0 .../logic/importer/FulltextFetchersTest.java | 0 .../jabref/logic/importer/ImportDataTest.java | 0 .../ImportFormatReaderIntegrationTest.java | 0 .../ImportFormatReaderTestParameterless.java | 0 .../jabref/logic/importer/ImporterTest.java | 0 .../logic/importer/OpenDatabaseTest.java | 0 .../logic/importer/WebFetchersTest.java | 0 .../logic/importer/fetcher/ACSTest.java | 0 .../fetcher/AbstractIsbnFetcherTest.java | 0 .../logic/importer/fetcher/ArXivTest.java | 0 .../fetcher/AstrophysicsDataSystemTest.java | 0 .../logic/importer/fetcher/CrossRefTest.java | 0 .../importer/fetcher/DBLPFetcherTest.java | 0 .../logic/importer/fetcher/DiVATest.java | 0 .../importer/fetcher/DoiFetcherTest.java | 0 .../importer/fetcher/DoiResolutionTest.java | 0 .../importer/fetcher/FulltextFetcherTest.java | 0 .../importer/fetcher/GoogleScholarTest.java | 0 .../importer/fetcher/GvkFetcherTest.java | 0 .../logic/importer/fetcher/GvkParserTest.java | 0 .../logic/importer/fetcher/IEEETest.java | 0 .../fetcher/IacrEprintFetcherTest.java | 0 .../importer/fetcher/IsbnFetcherTest.java | 0 .../fetcher/IsbnViaChimboriFetcherTest.java | 0 .../fetcher/IsbnViaEbookDeFetcherTest.java | 0 .../fetcher/LibraryOfCongressTest.java | 0 .../importer/fetcher/MathSciNetTest.java | 0 .../importer/fetcher/MedlineFetcherTest.java | 0 .../importer/fetcher/MrDLibFetcherTest.java | 0 .../importer/fetcher/OpenAccessDoiTest.java | 0 .../importer/fetcher/ScienceDirectTest.java | 0 .../importer/fetcher/SpringerLinkTest.java | 0 .../importer/fetcher/TitleFetcherTest.java | 0 .../logic/importer/fetcher/zbMATHTest.java | 0 .../fileformat/BibTeXMLImporterTest.java | 0 .../fileformat/BibTeXMLImporterTestFiles.java | 0 .../fileformat/BibTeXMLImporterTestTypes.java | 0 .../fileformat/BiblioscapeImporterTest.java | 0 .../BiblioscapeImporterTestFiles.java | 0 .../BiblioscapeImporterTestTypes.java | 0 .../fileformat/BibtexImporterTest.java | 0 .../importer/fileformat/BibtexParserTest.java | 0 .../fileformat/CopacImporterTest.java | 0 .../fileformat/CopacImporterTestFiles.java | 0 .../fileformat/CustomImporterTest.java | 0 .../fileformat/EndnoteImporterTest.java | 0 .../fileformat/FreeCiteImporterTest.java | 0 .../fileformat/ImporterTestEngine.java | 0 .../fileformat/InspecImporterTest.java | 0 .../importer/fileformat/IsiImporterTest.java | 0 .../fileformat/MedlineImporterTest.java | 0 .../fileformat/MedlineImporterTestFiles.java | 0 .../fileformat/MedlinePlainImporterTest.java | 0 .../fileformat/ModsImporterTestFiles.java | 0 .../fileformat/MrDLibImporterTest.java | 0 .../fileformat/MsBibImporterTest.java | 0 .../fileformat/MsBibImporterTestFiles.java | 0 .../importer/fileformat/OvidImporterTest.java | 0 .../fileformat/PdfContentImporterTest.java | 0 .../PdfContentImporterTestFiles.java | 0 .../fileformat/PdfXmpImporterTest.java | 0 .../importer/fileformat/RISImporterTest.java | 0 .../fileformat/RISImporterTestFiles.java | 0 .../fileformat/RepecNepImporterTest.java | 0 .../fileformat/SilverPlatterImporterTest.java | 0 .../util/ConvertLegacyExplicitGroupsTest.java | 0 .../logic/importer/util/GroupsParserTest.java | 0 .../importer/util/JSONEntryParserTest.java | 0 .../logic/integrity/BracesCorrectorTest.java | 0 .../logic/integrity/EntryLinkCheckerTest.java | 0 .../logic/integrity/IntegrityCheckTest.java | 0 .../integrity/NoBibTexFieldCheckerTest.java | 0 .../integrity/PersonNamesCheckerTest.java | 0 .../journals/AbbreviationParserTest.java | 0 .../logic/journals/AbbreviationTest.java | 0 .../logic/journals/AbbreviationsTest.java | 0 .../JournalAbbreviationRepositoryTest.java | 0 ...ippedJournalAbbreviationDuplicateTest.java | 0 .../org/jabref/logic/l10n/EncodingsTest.java | 0 .../org/jabref/logic/l10n/LanguagesTest.java | 0 .../logic/l10n/LocalizationBundleForTEst.java | 0 .../l10n/LocalizationConsistencyTest.java | 0 .../jabref/logic/l10n/LocalizationEntry.java | 0 .../logic/l10n/LocalizationKeyParamsTest.java | 0 .../logic/l10n/LocalizationKeyTest.java | 0 .../jabref/logic/l10n/LocalizationParser.java | 0 .../logic/l10n/LocalizationParserTest.java | 0 .../jabref/logic/l10n/LocalizationTest.java | 0 .../PropertiesLocaleCompletenessTest.java | 0 .../jabref/logic/layout/LayoutEntryTest.java | 0 .../org/jabref/logic/layout/LayoutTest.java | 0 .../layout/format/AuthorAbbreviatorTest.java | 0 .../AuthorAndToSemicolonReplacerTest.java | 0 .../format/AuthorAndsCommaReplacerTest.java | 0 .../layout/format/AuthorAndsReplacerTest.java | 0 .../format/AuthorFirstAbbrLastCommasTest.java | 0 .../AuthorFirstAbbrLastOxfordCommasTest.java | 0 .../format/AuthorFirstFirstCommasTest.java | 0 .../layout/format/AuthorFirstFirstTest.java | 0 .../format/AuthorFirstLastCommasTest.java | 0 .../AuthorFirstLastOxfordCommasTest.java | 0 .../layout/format/AuthorLF_FFAbbrTest.java | 0 .../logic/layout/format/AuthorLF_FFTest.java | 0 .../format/AuthorLastFirstAbbrCommasTest.java | 0 .../AuthorLastFirstAbbrOxfordCommasTest.java | 0 .../AuthorLastFirstAbbreviatorTester.java | 0 .../format/AuthorLastFirstCommasTest.java | 0 .../AuthorLastFirstOxfordCommasTest.java | 0 .../layout/format/AuthorLastFirstTest.java | 0 .../logic/layout/format/AuthorNatBibTest.java | 0 .../logic/layout/format/AuthorOrgSciTest.java | 0 .../logic/layout/format/AuthorsTest.java | 0 .../layout/format/CompositeFormatTest.java | 0 .../logic/layout/format/DOICheckTest.java | 0 .../logic/layout/format/DOIStripTest.java | 0 .../layout/format/DateFormatterTest.java | 0 .../logic/layout/format/DefaultTest.java | 0 .../layout/format/EntryTypeFormatterTest.java | 0 .../logic/layout/format/FileLinkTest.java | 0 .../logic/layout/format/FirstPageTest.java | 0 .../logic/layout/format/HTMLCharsTest.java | 0 .../layout/format/HTMLParagraphsTest.java | 0 .../logic/layout/format/IfPluralTest.java | 0 .../logic/layout/format/LastPageTest.java | 0 .../format/LatexToUnicodeFormatterTest.java | 0 .../layout/format/NameFormatterTest.java | 0 .../NoSpaceBetweenAbbreviationsTest.java | 0 .../logic/layout/format/OrdinalTest.java | 0 .../logic/layout/format/RTFCharsTest.java | 0 .../format/RemoveBracketsAddCommaTest.java | 0 .../layout/format/RemoveBracketsTest.java | 0 .../logic/layout/format/RemoveTildeTest.java | 0 .../layout/format/RemoveWhitespaceTest.java | 0 .../logic/layout/format/ReplaceTest.java | 0 .../logic/layout/format/RisKeywordsTest.java | 0 .../logic/layout/format/RisMonthTest.java | 0 .../logic/layout/format/ToLowerCaseTest.java | 0 .../logic/layout/format/ToUpperCaseTest.java | 0 .../logic/layout/format/WrapContentTest.java | 0 .../layout/format/WrapFileLinksTest.java | 0 .../jabref/logic/msbib/MsBibAuthorTest.java | 0 .../logic/net/MimeTypeDetectorTest.java | 0 .../org/jabref/logic/net/URLDownloadTest.java | 0 .../org/jabref/logic/net/URLUtilTest.java | 0 .../logic/openoffice/CitationEntryTest.java | 0 .../logic/openoffice/OOBibStyleTest.java | 0 .../logic/openoffice/OOPreFormatterTest.java | 0 .../logic/openoffice/StyleLoaderTest.java | 0 .../pdf/EntryAnnotationImporterTest.java | 0 .../logic/pdf/PdfAnnotationImporterTest.java | 0 .../ProtectedTermsListTest.java | 0 .../ProtectedTermsLoaderTest.java | 0 .../logic/remote/RemotePreferencesTest.java | 0 .../org/jabref/logic/remote/RemoteTest.java | 0 .../jabref/logic/remote/RemoteUtilTest.java | 0 .../logic/search/DatabaseSearcherTest.java | 0 .../SearchQueryHighlightObservableTest.java | 0 .../jabref/logic/search/SearchQueryTest.java | 0 .../logic/shared/DBMSConnectionTest.java | 0 .../logic/shared/DBMSProcessorTest.java | 0 .../logic/shared/DBMSSynchronizerTest.java | 0 .../org/jabref/logic/shared/DBMSTypeTest.java | 0 .../SynchronizationTestEventListener.java | 0 .../shared/SynchronizationTestSimulator.java | 0 .../jabref/logic/shared/TestConnector.java | 0 .../org/jabref/logic/shared/TestManager.java | 0 .../specialfields/SpecialFieldsUtilsTest.java | 0 .../logic/util/BracketedPatternTest.java | 0 .../org/jabref/logic/util/BuildInfoTest.java | 0 .../logic/util/DevelopmentStageTest.java | 0 .../org/jabref/logic/util/FileTypeTest.java | 0 .../jabref/logic/util/JavaVersionTest.java | 0 .../jabref/logic/util/UpdateFieldTest.java | 0 .../org/jabref/logic/util/VersionTest.java | 0 .../util/io/CiteKeyBasedFileFinderTest.java | 0 .../jabref/logic/util/io/FileHistoryTest.java | 0 .../logic/util/io/FileNameCleanerTest.java | 0 .../jabref/logic/util/io/FileUtilTest.java | 0 .../util/io/RegExpBasedFileFinderTests.java | 0 .../util/strings/DiffHighlightingTest.java | 0 .../strings/StringLengthComparatorTest.java | 0 .../jabref/logic/xmp/XMPSchemaBibtexTest.java | 0 .../org/jabref/logic/xmp/XMPUtilTest.java | 0 .../migrations/PreferencesMigrationsTest.java | 0 .../jabref/model/BibDatabaseContextTest.java | 0 .../java/org/jabref/model/EntryTypesTest.java | 0 .../java/org/jabref/model/TreeNodeTest.java | 0 .../org/jabref/model/TreeNodeTestData.java | 0 .../database/BibDatabaseContextTest.java | 0 .../BibDatabaseModeDetectionTest.java | 0 .../model/database/BibDatabaseTest.java | 0 .../database/DuplicationCheckerTest.java | 0 .../model/database/KeyChangeListenerTest.java | 0 .../database/event/AutosaveEventTest.java | 0 .../model/entry/AuthorListParameterTest.java | 0 .../jabref/model/entry/AuthorListTest.java | 0 .../org/jabref/model/entry/AuthorTest.java | 0 .../model/entry/BibEntryEqualityTest.java | 0 .../org/jabref/model/entry/BibEntryTest.java | 0 .../org/jabref/model/entry/BibEntryTests.java | 0 .../jabref/model/entry/BibtexStringTest.java | 0 .../model/entry/CanonicalBibEntryTest.java | 0 .../java/org/jabref/model/entry/DateTest.java | 0 .../jabref/model/entry/EntryLinkListTest.java | 0 .../org/jabref/model/entry/FieldNameTest.java | 0 .../model/entry/FileFieldBibEntryTest.java | 0 .../model/entry/FileFieldWriterTest.java | 0 .../model/entry/IEEETranEntryTypesTest.java | 0 .../jabref/model/entry/IdGeneratorTest.java | 0 .../jabref/model/entry/KeywordListTest.java | 0 .../org/jabref/model/entry/KeywordTest.java | 0 .../org/jabref/model/entry/MonthTest.java | 0 .../entry/identifier/ArXivIdentifierTest.java | 0 .../model/entry/identifier/DOITest.java | 0 .../model/entry/identifier/EprintTest.java | 0 .../model/entry/identifier/ISBNTest.java | 0 .../model/entry/identifier/ISSNTest.java | 0 .../entry/identifier/MathSciNetIdTest.java | 0 .../entry/specialfields/SpecialFieldTest.java | 0 .../jabref/model/event/TestEventListener.java | 0 .../groups/AutomaticKeywordGroupTest.java | 0 .../model/groups/ExplicitGroupTest.java | 0 .../model/groups/GroupTreeNodeTest.java | 0 .../jabref/model/groups/SearchGroupTest.java | 0 .../org/jabref/model/groups/TexGroupTest.java | 0 .../model/groups/WordKeywordGroupTest.java | 0 .../jabref/model/metadata/MetaDataTest.java | 0 .../jabref/model/pdf/FileAnnotationTest.java | 0 .../search/matchers/MatcherSetsTest.java | 0 .../rules/ContainBasedSearchRuleTest.java | 0 .../model/search/rules/MockSearchMatcher.java | 0 .../search/rules/SentenceAnalyzerTest.java | 0 .../jabref/model/strings/StringUtilTest.java | 0 .../performance/BibtexEntryGenerator.java | 0 .../LastFocusedTabPreferencesTest.java | 0 .../org/jabref/support/CIServerCondition.java | 0 .../jabref/support/DisabledOnCIServer.java | 0 .../java/org/jabref/testutils/TestUtils.java | 0 .../testutils/category/DatabaseTest.java | 0 .../testutils/category/FetcherTest.java | 0 .../jabref/testutils/category/GUITest.java | 0 .../src}/test/resources/log4j2.xml | 0 .../resources/org/jabref/bibtexFiles/test.bib | 0 .../test/resources/org/jabref/cli/origin.bib | 0 .../test/resources/org/jabref/cli/paper.aux | 0 .../org/jabref/customPreferences.xml | 0 .../org/jabref/gui/importer/fetcher/oai2.xml | 0 .../org/jabref/gui/importer/fetcher/oai22.xml | 0 .../org/jabref/gui/importer/fetcher/oai23.xml | 0 .../org/jabref/logic/auxparser/badpaper.aux | 0 .../org/jabref/logic/auxparser/config.bib | 0 .../org/jabref/logic/auxparser/crossref.aux | 0 .../org/jabref/logic/auxparser/nested.aux | 0 .../org/jabref/logic/auxparser/origin.bib | 0 .../org/jabref/logic/auxparser/paper.aux | 0 .../org/jabref/logic/auxparser/result.bib | 0 .../resources/org/jabref/logic/bst/abbrv.bst | 0 .../exporter/BibTeXMLExporterTestArticle.bib | 0 .../exporter/BibTeXMLExporterTestArticle.xml | 0 .../BibTeXMLExporterTestArticleWithoutID.bib | 0 .../BibTeXMLExporterTestArticleWithoutID.xml | 0 .../exporter/BibTeXMLExporterTestAuthor.bib | 0 .../exporter/BibTeXMLExporterTestAuthor.xml | 0 .../exporter/BibTeXMLExporterTestBook.bib | 0 .../exporter/BibTeXMLExporterTestBook.xml | 0 .../exporter/BibTeXMLExporterTestBooklet.bib | 0 .../exporter/BibTeXMLExporterTestBooklet.xml | 0 .../BibTeXMLExporterTestConference.bib | 0 .../BibTeXMLExporterTestConference.xml | 0 .../exporter/BibTeXMLExporterTestInBook.bib | 0 .../exporter/BibTeXMLExporterTestInBook.xml | 0 .../BibTeXMLExporterTestInCollection.bib | 0 .../BibTeXMLExporterTestInCollection.xml | 0 .../BibTeXMLExporterTestInProceedings.bib | 0 .../BibTeXMLExporterTestInProceedings.xml | 0 .../BibTeXMLExporterTestInbookLessFields.bib | 0 .../BibTeXMLExporterTestInbookLessFields.xml | 0 .../BibTeXMLExporterTestInvalidInbook.bib | 0 .../BibTeXMLExporterTestInvalidInbook.xml | 0 .../exporter/BibTeXMLExporterTestManual.bib | 0 .../exporter/BibTeXMLExporterTestManual.xml | 0 .../BibTeXMLExporterTestMasterThesis.bib | 0 .../BibTeXMLExporterTestMasterThesis.xml | 0 .../exporter/BibTeXMLExporterTestMisc.bib | 0 .../exporter/BibTeXMLExporterTestMisc.xml | 0 .../BibTeXMLExporterTestPhdThesis.bib | 0 .../BibTeXMLExporterTestPhdThesis.xml | 0 .../BibTeXMLExporterTestProceedings.bib | 0 .../BibTeXMLExporterTestProceedings.xml | 0 .../BibTeXMLExporterTestTechReport.bib | 0 .../BibTeXMLExporterTestTechReport.xml | 0 .../BibTeXMLExporterTestUnpublished.bib | 0 .../BibTeXMLExporterTestUnpublished.xml | 0 .../ModsExportFormatTestAllFields.bib | 0 .../ModsExportFormatTestAllFields.xml | 0 .../exporter/ModsExportFormatTestBook.bib | 0 .../exporter/ModsExportFormatTestBook.xml | 0 .../ModsExportFormatTestMultipleEntries.bib | 0 .../ModsExportFormatTestMultipleEntries.xml | 0 ...ModsExportFormatTestOnlyRequiredFields.bib | 0 ...ModsExportFormatTestOnlyRequiredFields.xml | 0 .../ModsExportFormatTestTotalPages.bib | 0 .../ModsExportFormatTestTotalPages.xml | 0 .../logic/exporter/MsBibExportFormatTest1.bib | 0 .../logic/exporter/MsBibExportFormatTest1.xml | 0 .../logic/exporter/MsBibExportFormatTest2.bib | 0 .../logic/exporter/MsBibExportFormatTest2.xml | 0 .../logic/exporter/MsBibExportFormatTest3.bib | 0 .../logic/exporter/MsBibExportFormatTest3.xml | 0 .../logic/exporter/MsBibExportFormatTest4.bib | 0 .../logic/exporter/MsBibExportFormatTest4.xml | 0 .../logic/exporter/MsBibExportFormatTest5.bib | 0 .../logic/exporter/MsBibExportFormatTest5.xml | 0 .../logic/exporter/MsBibExportFormatTest6.bib | 0 .../logic/exporter/MsBibExportFormatTest6.xml | 0 .../logic/exporter/MsBibExportFormatTest7.bib | 0 .../logic/exporter/MsBibExportFormatTest7.xml | 0 ...BibExportFormatTestAddressWithoutComma.bib | 0 ...BibExportFormatTestAddressWithoutComma.xml | 0 .../MsBibExportFormatTestCorporateAuthor.bib | 0 .../MsBibExportFormatTestCorporateAuthor.xml | 0 .../MsBibExportFormatTestDateAcessed.bib | 0 .../MsBibExportFormatTestDateAcessed.xml | 0 .../exporter/MsBibExportFormatTestDay.bib | 0 .../exporter/MsBibExportFormatTestDay.xml | 0 .../MsBibExportFormatTestLatexFree.bib | 0 .../MsBibExportFormatTestLatexFree.xml | 0 .../exporter/MsBibExportFormatUmlauts.bib | 0 .../exporter/MsBibExportFormatUmlauts.xml | 0 .../jabref/logic/exporter/MsBibKeyTest.bib | 0 .../jabref/logic/exporter/MsBibKeyTest.xml | 0 .../org/jabref/logic/exporter/MsBibLCID.bib | 0 .../org/jabref/logic/exporter/MsBibLCID.xml | 0 .../logic/exporter/MsBibLocationTest.bib | 0 .../logic/exporter/MsBibLocationTest.xml | 0 .../logic/exporter/MsBibMultiAddressTest.bib | 0 .../logic/exporter/MsBibMultiAddressTest.xml | 0 .../org/jabref/logic/exporter/MsBibPatent.bib | 0 .../org/jabref/logic/exporter/MsBibPatent.xml | 0 .../jabref/logic/exporter/MsBibShorttitle.bib | 0 .../jabref/logic/exporter/MsBibShorttitle.xml | 0 .../jabref/logic/importer/encoding-header.bib | 0 .../logic/importer/encodingWithoutNewline.bib | 0 .../fetcher/gvk_artificial_subtitle_test.xml | 0 .../gvk_empty_result_because_of_bad_query.xml | 0 .../logic/importer/fetcher/gvk_gmp.1.bib | 0 .../logic/importer/fetcher/gvk_gmp.2.bib | 0 .../jabref/logic/importer/fetcher/gvk_gmp.xml | 0 .../fetcher/gvk_result_for_797485368.bib | 0 .../fetcher/gvk_result_for_797485368.xml | 0 .../fileformat/AutosavedSharedDatabase.bib | 0 .../BibTeXMLImporterTestArticle.bib | 0 .../BibTeXMLImporterTestArticle.xml | 0 .../BibTeXMLImporterTestArticle2.bib | 18 +- .../BibTeXMLImporterTestArticle2.xml | 0 .../BibTeXMLImporterTestArticleWithoutID.bib | 0 .../BibTeXMLImporterTestArticleWithoutID.xml | 0 .../fileformat/BibTeXMLImporterTestBook.bib | 0 .../fileformat/BibTeXMLImporterTestBook.xml | 0 .../BibTeXMLImporterTestBooklet.bib | 0 .../BibTeXMLImporterTestBooklet.xml | 0 .../BibTeXMLImporterTestConference.bib | 0 .../BibTeXMLImporterTestConference.xml | 0 .../fileformat/BibTeXMLImporterTestEmpty.bib | 6 +- .../fileformat/BibTeXMLImporterTestEmpty.xml | 0 .../fileformat/BibTeXMLImporterTestInBook.bib | 0 .../fileformat/BibTeXMLImporterTestInBook.xml | 0 .../BibTeXMLImporterTestInCollection.bib | 0 .../BibTeXMLImporterTestInCollection.xml | 0 .../BibTeXMLImporterTestInProceedings.bib | 0 .../BibTeXMLImporterTestInProceedings.xml | 0 .../BibTeXMLImporterTestInbookLessFields.bib | 0 .../BibTeXMLImporterTestInbookLessFields.xml | 0 ...ImporterTestIncollectionWithoutChapter.bib | 0 ...ImporterTestIncollectionWithoutChapter.xml | 0 .../BibTeXMLImporterTestInvalidInbook.bib | 0 .../BibTeXMLImporterTestInvalidInbook.xml | 0 .../fileformat/BibTeXMLImporterTestManual.bib | 0 .../fileformat/BibTeXMLImporterTestManual.xml | 0 .../BibTeXMLImporterTestMasterThesis.bib | 0 .../BibTeXMLImporterTestMasterThesis.xml | 0 .../fileformat/BibTeXMLImporterTestMisc.bib | 0 .../fileformat/BibTeXMLImporterTestMisc.xml | 0 .../BibTeXMLImporterTestPhdThesis.bib | 0 .../BibTeXMLImporterTestPhdThesis.xml | 0 .../BibTeXMLImporterTestProceedings.bib | 0 .../BibTeXMLImporterTestProceedings.xml | 0 .../BibTeXMLImporterTestTechReport.bib | 0 .../BibTeXMLImporterTestTechReport.xml | 0 .../BibTeXMLImporterTestUnpublished.bib | 0 .../BibTeXMLImporterTestUnpublished.xml | 0 .../BiblioscapeImporterTestArticleST.bib | 0 .../BiblioscapeImporterTestArticleST.txt | 0 .../BiblioscapeImporterTestComments.bib | 0 .../BiblioscapeImporterTestComments.txt | 0 .../BiblioscapeImporterTestCorrupt.txt | 0 .../BiblioscapeImporterTestInbook.bib | 0 .../BiblioscapeImporterTestInbook.txt | 0 .../BiblioscapeImporterTestJournalArticle.bib | 0 .../BiblioscapeImporterTestJournalArticle.txt | 0 .../BiblioscapeImporterTestKeywords.bib | 0 .../BiblioscapeImporterTestKeywords.txt | 0 .../BiblioscapeImporterTestOptionalFields.bib | 0 .../BiblioscapeImporterTestOptionalFields.txt | 0 .../BiblioscapeImporterTestUnknownFields.bib | 0 .../BiblioscapeImporterTestUnknownFields.txt | 0 .../BiblioscapeImporterTestUnknownType.bib | 0 .../BiblioscapeImporterTestUnknownType.txt | 0 .../fileformat/BibtexImporter.examples.bib | 0 .../fileformat/CopacImporterTest1.bib | 0 .../fileformat/CopacImporterTest1.txt | 0 .../fileformat/CopacImporterTest2.bib | 0 .../fileformat/CopacImporterTest2.txt | 0 .../logic/importer/fileformat/Empty.txt | 0 .../importer/fileformat/EmptyMsBib_Test.xml | 0 .../fileformat/Endnote.book.example.enw | 0 .../importer/fileformat/Endnote.entries.enw | 0 .../importer/fileformat/Endnote.pattern.A.enw | 0 .../importer/fileformat/Endnote.pattern.E.enw | 0 .../fileformat/Endnote.pattern.no_enw | 0 .../logic/importer/fileformat/IEEEImport1.txt | 0 .../importer/fileformat/InspecImportTest.txt | 0 .../importer/fileformat/InspecImportTest2.txt | 0 .../fileformat/InspecImportTestFalse.txt | 0 .../importer/fileformat/IsiImporterTest1.isi | 0 .../importer/fileformat/IsiImporterTest2.isi | 0 .../fileformat/IsiImporterTestEmpty.isi | 0 .../fileformat/IsiImporterTestInspec.isi | 0 .../fileformat/IsiImporterTestMedline.isi | 0 .../fileformat/IsiImporterTestWOS.isi | 0 .../fileformat/LNCS-minimal-protected.bib | 0 .../fileformat/LNCS-minimal-protected.pdf | Bin .../importer/fileformat/LNCS-minimal.bib | 0 .../importer/fileformat/LNCS-minimal.pdf | Bin .../fileformat/MODSImporterTestAllFields.bib | 0 .../fileformat/MODSImporterTestAllFields.xml | 0 .../fileformat/MODSImporterTestMinimal.bib | 0 .../fileformat/MODSImporterTestMinimal.xml | 0 .../fileformat/MODSImporterTestMods.bib | 0 .../fileformat/MODSImporterTestMods.xml | 0 .../MODSImporterTestModsCollection.bib | 0 .../MODSImporterTestModsCollection.xml | 0 .../MedlineImporterTestArticleID.bib | 0 .../MedlineImporterTestArticleID.xml | 0 .../MedlineImporterTestArticleNoISSN.bib | 0 .../MedlineImporterTestArticleNoISSN.xml | 0 .../MedlineImporterTestBookArticleSet.bib | 0 .../MedlineImporterTestBookArticleSet.xml | 0 .../MedlineImporterTestKeywordSingleEntry.bib | 0 .../MedlineImporterTestKeywordSingleEntry.xml | 0 .../MedlineImporterTestMalformedEntry.xml | 0 .../MedlineImporterTestMinimalEntry.bib | 0 .../MedlineImporterTestMinimalEntry.xml | 0 .../fileformat/MedlineImporterTestNbib.bib | 0 .../fileformat/MedlineImporterTestNbib.xml | 0 .../MedlineImporterTestPubmedBook.bib | 0 .../MedlineImporterTestPubmedBook.xml | 0 .../MedlinePlainImporterStringOutOfBounds.bib | 0 .../MedlinePlainImporterStringOutOfBounds.txt | 0 .../MedlinePlainImporterTestCompleteEntry.bib | 0 .../MedlinePlainImporterTestCompleteEntry.txt | 0 .../MedlinePlainImporterTestDOI.bib | 0 .../MedlinePlainImporterTestDOI.txt | 0 .../MedlinePlainImporterTestInproceeding.bib | 0 .../MedlinePlainImporterTestInproceeding.txt | 0 .../MedlinePlainImporterTestInvalidFormat.xml | 0 .../MedlinePlainImporterTestMultiAbstract.bib | 0 .../MedlinePlainImporterTestMultiAbstract.txt | 0 .../MedlinePlainImporterTestMultiTitle.bib | 0 .../MedlinePlainImporterTestMultiTitle.txt | 0 ...edlinePlainImporterTestMultipleEntries.txt | 0 .../fileformat/MsBibExportFormatUmlauts.bib | 0 .../fileformat/MsBibExportFormatUmlauts.xml | 0 .../fileformat/MsBibImporterInvalidMonth.bib | 0 .../fileformat/MsBibImporterInvalidMonth.xml | 0 .../MsBibImporterMsBibFieldsTest.bib | 0 .../MsBibImporterMsBibFieldsTest.xml | 0 .../fileformat/MsBibImporterTest3.bib | 0 .../fileformat/MsBibImporterTest3.xml | 0 .../fileformat/MsBibImporterTest4.bib | 0 .../fileformat/MsBibImporterTest4.xml | 0 .../fileformat/MsBibImporterTest5.bib | 0 .../fileformat/MsBibImporterTest5.xml | 0 .../fileformat/MsBibImporterTest6.bib | 0 .../fileformat/MsBibImporterTest6.xml | 0 .../fileformat/MsBibImporterTest7.bib | 0 .../fileformat/MsBibImporterTest7.xml | 0 .../MsBibImporterTestTranslator.bib | 0 .../MsBibImporterTestTranslator.xml | 0 .../fileformat/MsBibImporterTitleTest.bib | 0 .../fileformat/MsBibImporterTitleTest.xml | 0 .../logic/importer/fileformat/MsBibLCID.bib | 0 .../logic/importer/fileformat/MsBibLCID.xml | 0 .../importer/fileformat/MsBibLocationTest.bib | 0 .../importer/fileformat/MsBibLocationTest.xml | 0 .../MsBibMultiLocationAddressTest.bib | 0 .../MsBibMultiLocationAddressTest.xml | 0 .../logic/importer/fileformat/MsBibPatent.bib | 0 .../logic/importer/fileformat/MsBibPatent.xml | 0 .../importer/fileformat/MsBibShorttitle.bib | 0 .../importer/fileformat/MsBibShorttitle.xml | 0 .../importer/fileformat/NbibImporterTest.bib | 0 .../importer/fileformat/NbibImporterTest.nbib | 0 .../importer/fileformat/OvidImporterTest1.txt | 0 .../fileformat/OvidImporterTest2Invalid.txt | 0 .../importer/fileformat/OvidImporterTest3.txt | 0 .../importer/fileformat/OvidImporterTest4.txt | 0 .../importer/fileformat/OvidImporterTest5.txt | 0 .../importer/fileformat/OvidImporterTest6.txt | 0 .../importer/fileformat/OvidImporterTest7.txt | 0 .../fileformat/OvidImporterTestBib3.bib | 0 .../fileformat/OvidImporterTestBib4.bib | 0 .../fileformat/OvidImporterTestBib5.bib | 0 .../fileformat/OvidImporterTestBib6.bib | 0 .../fileformat/OvidImporterTestBib7.bib | 0 .../fileformat/RepecNepImporterTest1.bib | 0 .../fileformat/RepecNepImporterTest1.txt | 0 .../fileformat/RepecNepImporterTest2.bib | 0 .../fileformat/RepecNepImporterTest2.txt | 0 .../fileformat/RepecNepImporterTest3.bib | 0 .../fileformat/RepecNepImporterTest3.txt | 0 .../fileformat/RisImporterCorrupted.ris | 0 .../importer/fileformat/RisImporterTest1.bib | 0 .../importer/fileformat/RisImporterTest1.ris | 0 .../importer/fileformat/RisImporterTest3.bib | 0 .../importer/fileformat/RisImporterTest3.ris | 0 .../importer/fileformat/RisImporterTest4a.bib | 0 .../importer/fileformat/RisImporterTest4a.ris | 0 .../importer/fileformat/RisImporterTest4b.bib | 0 .../importer/fileformat/RisImporterTest4b.ris | 0 .../importer/fileformat/RisImporterTest4c.bib | 0 .../importer/fileformat/RisImporterTest4c.ris | 0 .../importer/fileformat/RisImporterTest5a.bib | 0 .../importer/fileformat/RisImporterTest5a.ris | 0 .../importer/fileformat/RisImporterTest5b.bib | 0 .../importer/fileformat/RisImporterTest5b.ris | 0 .../importer/fileformat/RisImporterTest6.bib | 0 .../importer/fileformat/RisImporterTest6.ris | 0 .../importer/fileformat/RisImporterTest7.bib | 14 +- .../importer/fileformat/RisImporterTest7.ris | 22 +- .../RisImporterTestDoiAndJournalTitle.bib | 0 .../RisImporterTestDoiAndJournalTitle.ris | 0 .../fileformat/RisImporterTestScience.bib | 0 .../fileformat/RisImporterTestScience.ris | 0 .../fileformat/RisImporterTestScopus.bib | 0 .../fileformat/RisImporterTestScopus.ris | 0 .../fileformat/SilverPlatterImporterTest1.bib | 0 .../fileformat/SilverPlatterImporterTest1.txt | 0 .../fileformat/SilverPlatterImporterTest2.bib | 0 .../fileformat/SilverPlatterImporterTest2.txt | 0 .../logic/importer/fileformat/annotated.pdf | Bin .../logic/importer/fileformat/empty.pdf | Bin .../logic/importer/fileformat/emptyFile.xml | 0 .../logic/importer/fileformat/encrypted.pdf | Bin .../org/jabref/logic/importer/headerless.bib | 0 .../jabref/logic/importer/jabref-header.bib | 0 .../subdirectory/2003_Hippel_209.pdf | Bin .../2017_Gra\305\276ulis_726.pdf" | Bin .../subdirectory/pdfInSubdirectory.pdf | Bin .../unlinkedFilesTestFolder/pdfInDatabase.pdf | Bin .../pdfNotInDatabase.pdf | Bin .../unlinkedFilesTestFolder/testFile.txt | 0 .../jabref/logic/importer/wrong-header.bib | 0 .../resources/org/jabref/logic/net/empty.pdf | Bin .../org/jabref/logic/openoffice/test.jstyle | 0 .../logic/protectedterms/namedterms.terms | 0 .../logic/protectedterms/unnamedterms.terms | 0 .../entry/entryWithMultilineAbstract.bib | 0 .../org/jabref/util/build.properties | 0 .../test/resources/org/jabref/util/twente.bib | 0 .../org/jabref/util/unlinkedFilesTestBib.bib | 0 .../src}/test/resources/pdfs/encrypted.pdf | Bin .../src}/test/resources/pdfs/encrypted.txt | 0 .../resources/pdfs/minimal-foxithighlight.pdf | Bin .../test/resources/pdfs/minimal-foxitnote.pdf | Bin .../pdfs/minimal-highlight-no-note.pdf | Bin .../pdfs/minimal-highlight-with-note.pdf | Bin .../resources/pdfs/minimal-inlinenote.pdf | Bin .../test/resources/pdfs/minimal-polygon.pdf | Bin .../test/resources/pdfs/minimal-popup.pdf | Bin .../test/resources/pdfs/minimal-squiggly.pdf | Bin .../test/resources/pdfs/minimal-strikeout.pdf | Bin .../test/resources/pdfs/minimal-underline.pdf | Bin .../src}/test/resources/pdfs/minimal.pdf | Bin .../test/resources/pdfs/thesis-example.pdf | Bin .../test/resources/pdfs/write-protected.docx | Bin .../test/resources/pdfs/write-protected.pdf | Bin .../resources/testbib/articleWithTitle.bib | 0 .../testbib/articleWithTitleAndFile.bib | 0 .../resources/testbib/bibWithMixedContent.bib | 0 .../bibWithUserCommentAndEntryChange.bib | 0 .../resources/testbib/bibWithUserComments.bib | 0 .../src}/test/resources/testbib/bug1283.bib | 0 .../src}/test/resources/testbib/cleanup.bib | 0 .../src}/test/resources/testbib/complex.bib | 0 .../src}/test/resources/testbib/crossref.bib | 0 .../testbib/issue_181_1.8.0_51-b16.bib | 0 .../testbib/issue_181_1.8.0_60-b27.bib | 0 .../test/resources/testbib/jabref-authors.bib | 0 .../src}/test/resources/testbib/othertype.bib | 0 .../resources/testbib/pdf-field-upgrade.bib | 0 .../resources/testbib/reallyunknowntype.bib | 0 .../test/resources/testbib/save-actions.bib | 0 .../test/resources/testbib/saveactions2.bib | 0 .../test/resources/testbib/special-fields.bib | 0 .../test/resources/testbib/testdocument.tex | 0 .../test/resources/testbib/testjabref.bib | 0 .../resources/testbib/testjabref_210as292.bib | 0 .../test/resources/testbib/testjabref_292.bib | 0 .../resources/testbib/unknownMetaData.bib | 0 .../src}/test/resources/testbib/utf8-bom.bib | 0 xjc.gradle => org.jabref.gui/xjc.gradle | 7 + org.jabref.model/build.gradle | 361 ++++ .../config/checkstyle/checkstyle.xml | 57 + .../config/checkstyle/suppressions.xml | 10 + org.jabref.model/settings.gradle | 0 .../src}/main/antlr3/org/jabref/bst/Bst.g | 0 .../main/antlr4/org/jabref/search/Search.g4 | 0 .../main/gen/org/jabref/logic/bst/Bst.tokens | 39 + .../gen/org/jabref/logic/bst/BstLexer.java | 1151 ++++++++++++ .../gen/org/jabref/logic/bst/BstParser.java | 1406 +++++++++++++++ .../main/gen/org/jabref/search/Search.interp | 43 + .../main/gen/org/jabref/search/Search.tokens | 20 + .../org/jabref/search/SearchBaseVisitor.java | 63 + .../gen/org/jabref/search/SearchLexer.interp | 60 + .../gen/org/jabref/search/SearchLexer.java | 135 ++ .../gen/org/jabref/search/SearchLexer.tokens | 20 + .../gen/org/jabref/search/SearchParser.java | 450 +++++ .../gen/org/jabref/search/SearchVisitor.java | 59 + .../ApacheCommonsLang3Allowed.java | 0 .../main/java/org/jabref/model/ChainNode.java | 0 .../main/java/org/jabref/model/Defaults.java | 0 .../java/org/jabref/model/EntryTypes.java | 0 .../java/org/jabref/model/FieldChange.java | 0 .../main/java/org/jabref/model/TreeNode.java | 0 .../org/jabref/model/auxparser/AuxParser.java | 0 .../model/auxparser/AuxParserResult.java | 0 .../AbstractBibtexKeyPattern.java | 0 .../DatabaseBibtexKeyPattern.java | 0 .../GlobalBibtexKeyPattern.java | 0 .../org/jabref/model/cleanup/CleanupJob.java | 0 .../model/cleanup/FieldFormatterCleanup.java | 0 .../model/cleanup/FieldFormatterCleanups.java | 0 .../org/jabref/model/cleanup/Formatter.java | 0 .../jabref/model/database/BibDatabase.java | 0 .../model/database/BibDatabaseContext.java | 0 .../model/database/BibDatabaseMode.java | 0 .../database/BibDatabaseModeDetection.java | 0 .../jabref/model/database/BibDatabases.java | 0 .../model/database/DuplicationChecker.java | 0 .../model/database/KeyChangeListener.java | 0 .../model/database/KeyCollisionException.java | 0 .../model/database/event/AutosaveEvent.java | 0 .../event/BibDatabaseContextChangedEvent.java | 0 .../database/event/ChangePropagation.java | 0 .../database/event/CoarseChangeFilter.java | 0 .../model/database/event/EntryAddedEvent.java | 0 .../database/event/EntryRemovedEvent.java | 0 .../model/database/shared/DBMSType.java | 0 .../database/shared/DatabaseConnection.java | 0 .../shared/DatabaseConnectionProperties.java | 0 .../database/shared/DatabaseLocation.java | 0 .../shared/DatabaseNotSupportedException.java | 0 .../database/shared/DatabaseSynchronizer.java | 0 .../java/org/jabref/model/entry/Author.java | 0 .../org/jabref/model/entry/AuthorList.java | 0 .../jabref/model/entry/AuthorListParser.java | 0 .../java/org/jabref/model/entry/BibEntry.java | 0 .../jabref/model/entry/BiblatexEntryType.java | 0 .../model/entry/BiblatexEntryTypes.java | 0 .../jabref/model/entry/BibtexEntryType.java | 0 .../jabref/model/entry/BibtexEntryTypes.java | 0 .../jabref/model/entry/BibtexSingleField.java | 0 .../org/jabref/model/entry/BibtexString.java | 0 .../model/entry/CanonicalBibtexEntry.java | 0 .../jabref/model/entry/CustomEntryType.java | 0 .../java/org/jabref/model/entry/Date.java | 0 .../jabref/model/entry/EntryConverter.java | 0 .../org/jabref/model/entry/EntryLinkList.java | 0 .../org/jabref/model/entry/EntryType.java | 0 .../org/jabref/model/entry/FieldName.java | 0 .../org/jabref/model/entry/FieldProperty.java | 0 .../jabref/model/entry/FileFieldParser.java | 0 .../jabref/model/entry/FileFieldWriter.java | 0 .../model/entry/IEEETranEntryTypes.java | 0 .../org/jabref/model/entry/IdGenerator.java | 0 .../model/entry/InternalBibtexFields.java | 0 .../java/org/jabref/model/entry/Keyword.java | 0 .../org/jabref/model/entry/KeywordList.java | 0 .../org/jabref/model/entry/LinkedFile.java | 0 .../java/org/jabref/model/entry/Month.java | 0 .../jabref/model/entry/ParsedEntryLink.java | 0 .../model/entry/SharedBibEntryData.java | 0 .../model/entry/event/EntryChangedEvent.java | 0 .../jabref/model/entry/event/EntryEvent.java | 0 .../model/entry/event/EntryEventSource.java | 0 .../entry/event/FieldAddedOrRemovedEvent.java | 0 .../model/entry/event/FieldChangedEvent.java | 0 .../entry/identifier/ArXivIdentifier.java | 0 .../jabref/model/entry/identifier/DOI.java | 0 .../jabref/model/entry/identifier/Eprint.java | 0 .../jabref/model/entry/identifier/ISBN.java | 0 .../jabref/model/entry/identifier/ISSN.java | 0 .../model/entry/identifier/Identifier.java | 0 .../model/entry/identifier/MathSciNetId.java | 0 .../entry/specialfields/SpecialField.java | 0 .../specialfields/SpecialFieldValue.java | 0 .../jabref/model/groups/AbstractGroup.java | 0 .../jabref/model/groups/AllEntriesGroup.java | 0 .../jabref/model/groups/AutomaticGroup.java | 0 .../model/groups/AutomaticKeywordGroup.java | 0 .../model/groups/AutomaticPersonsGroup.java | 0 .../jabref/model/groups/ExplicitGroup.java | 0 .../model/groups/GroupEntryChanger.java | 0 .../model/groups/GroupHierarchyType.java | 0 .../jabref/model/groups/GroupTreeNode.java | 0 .../org/jabref/model/groups/KeywordGroup.java | 0 .../model/groups/RegexKeywordGroup.java | 0 .../org/jabref/model/groups/SearchGroup.java | 0 .../org/jabref/model/groups/TexGroup.java | 0 .../jabref/model/groups/WordKeywordGroup.java | 0 .../model/groups/event/GroupUpdatedEvent.java | 0 .../model/metadata/ContentSelector.java | 0 .../model/metadata/ContentSelectors.java | 0 .../metadata/FileDirectoryPreferences.java | 0 .../org/jabref/model/metadata/MetaData.java | 0 .../model/metadata/SaveOrderConfig.java | 0 .../metadata/event/MetaDataChangedEvent.java | 0 .../org/jabref/model/pdf/FileAnnotation.java | 0 .../jabref/model/pdf/FileAnnotationType.java | 0 .../jabref/model/search/GroupSearchQuery.java | 0 .../jabref/model/search/SearchMatcher.java | 0 .../model/search/matchers/AndMatcher.java | 0 .../model/search/matchers/MatcherSet.java | 0 .../model/search/matchers/MatcherSets.java | 0 .../model/search/matchers/NotMatcher.java | 0 .../model/search/matchers/OrMatcher.java | 0 .../search/rules/ContainBasedSearchRule.java | 0 .../search/rules/GrammarBasedSearchRule.java | 0 .../search/rules/RegexBasedSearchRule.java | 0 .../jabref/model/search/rules/SearchRule.java | 0 .../model/search/rules/SearchRules.java | 0 .../model/search/rules/SentenceAnalyzer.java | 0 .../model/strings/LatexToUnicodeAdapter.java | 0 .../org/jabref/model/strings/StringUtil.java | 0 .../strings/UnicodeToReadableCharMap.java | 0 .../model/util/DummyFileUpdateMonitor.java | 0 .../org/jabref/model/util/FileHelper.java | 0 .../jabref/model/util/FileUpdateListener.java | 0 .../jabref/model/util/FileUpdateMonitor.java | 0 .../org/jabref/model/util/OptionalUtil.java | 0 .../org/jabref/model/util/TreeCollector.java | 0 settings.gradle | 1 + 2226 files changed, 44052 insertions(+), 527 deletions(-) rename {src/main/doc => docs}/Groups.uml (100%) create mode 100644 org.jabref.gui/build.gradle create mode 100644 org.jabref.gui/config/checkstyle/checkstyle.xml create mode 100644 org.jabref.gui/config/checkstyle/suppressions.xml rename {lib => org.jabref.gui/lib}/AppleJavaExtensions.jar (100%) rename {lib => org.jabref.gui/lib}/customjfx-1.0.0.jar (100%) rename {lib => org.jabref.gui/lib}/spin.jar (100%) create mode 100644 org.jabref.gui/settings.gradle rename {src => org.jabref.gui/src}/jmh/java/org/jabref/benchmarks/Benchmarks.java (100%) create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Article.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Book.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Booklet.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Conference.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Entry.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/File.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Inbook.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Incollection.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Inproceedings.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Manual.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Mastersthesis.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Misc.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/MonthTypeString.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/ObjectFactory.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Phdthesis.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Proceedings.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Techreport.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Unpublished.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/package-info.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Abstract.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AbstractText.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AccessionNumberList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AffiliationInfo.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArtIdTypeInt.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Article.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleDate.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleId.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleIdList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleTitle.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Author.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AuthorList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BeginningDate.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Book.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookDocument.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookDocumentSet.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookTitle.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Chemical.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ChemicalList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CollectionTitle.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CommentsCorrections.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CommentsCorrectionsList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ContributionDate.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DataBank.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DataBankList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateCompleted.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateCreated.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateRevised.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DeleteCitation.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DeleteDocument.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DescriptorName.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ELocationID.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/EndingDate.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GeneSymbolList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GeneralNote.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Grant.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GrantList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/History.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ISSN.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Identifier.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Investigator.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/InvestigatorList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/IsoLanguageCodes.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ItemList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Journal.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/JournalIssue.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Keyword.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/KeywordList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/LocationLabel.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineCitation.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineCitationSet.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineJournalInfo.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MeshHeading.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MeshHeadingList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/NameOfSubstance.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/NormalDate.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Object.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ObjectFactory.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ObjectList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/OtherAbstract.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/OtherID.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PMID.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Pagination.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Param.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PersonalNameSubject.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PersonalNameSubjectList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubDate.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubMedPubDate.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubStatusInt.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PublicationType.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PublicationTypeList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Publisher.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedArticle.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedArticleSet.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookArticle.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookArticleSet.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookData.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedData.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/QualifierName.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Section.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SectionTitle.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Sections.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SupplMeshList.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SupplMeshName.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Text.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/URL.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AbstractDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AccessConditionDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AreaDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CartographicsDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CitySectionDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ClassificationDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CodeOrText.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CopyInformationDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DateDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DateOtherDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DetailDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DigitalOriginDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/EnumerationAndChronologyDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ExtensionDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/Extent.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ExtentDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/FormDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/GenreDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/GeographicCodeDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HierarchicalGeographicDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HierarchicalPart.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HoldingSimpleDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/IdentifierDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/IssuanceDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ItemIdentifierDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LanguageDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LanguageTermDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LocationDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ModsCollectionDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ModsDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NameDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NamePartDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NonSort.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NoteDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ObjectFactory.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/OriginInfoDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PartDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalDescriptionDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalDescriptionNote.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalLocationDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PlaceDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PlaceTermDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RecordIdentifierDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RecordInfoDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ReformattingQualityDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RegionDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RelatedItemDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RoleDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RoleTermDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ScriptTermDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguage.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguagePlusAuthority.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguagePlusSupplied.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectNameDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectTitleInfoDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TableOfContentsDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TargetAudienceDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TemporalDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/Text.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TitleInfoDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TypeOfResourceDefinition.java create mode 100644 org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/UrlDefinition.java rename {src => org.jabref.gui/src}/main/java/oracle/jdbc/OracleConnection.java (100%) rename {src => org.jabref.gui/src}/main/java/oracle/jdbc/OracleStatement.java (100%) rename {src => org.jabref.gui/src}/main/java/oracle/jdbc/dcn/DatabaseChangeEvent.java (100%) rename {src => org.jabref.gui/src}/main/java/oracle/jdbc/dcn/DatabaseChangeListener.java (100%) rename {src => org.jabref.gui/src}/main/java/oracle/jdbc/dcn/DatabaseChangeRegistration.java (100%) rename {src => org.jabref.gui/src}/main/java/oracle/jdbc/driver/OracleDriver.java (100%) rename {src => org.jabref.gui/src}/main/java/oracle/jdbc/package-info.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/FallbackExceptionHandler.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/Globals.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/JabRefException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/JabRefExecutorService.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/JabRefGUI.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/JabRefMain.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/cli/ArgumentProcessor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/cli/AuxCommandLine.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/cli/CrossrefFetcherEvaluator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/cli/GenerateCharacterTable.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/cli/ImportInspectionCommandLine.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/cli/JabRefCLI.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/cli/SystemOutputPrinter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/cli/XMPUtilMain.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/AbstractController.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/AbstractDialogView.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/AbstractView.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/AbstractViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/BasePanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/BasePanelMode.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/ClipBoardManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/DefaultInjector.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/Dialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/DialogService.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/DragAndDropDataFormats.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/DragDropPane.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/DragDropPopupPane.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/DuplicateResolverDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/DuplicateSearch.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/EntryContainer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/EntryMarker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/EntryTypeDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/FXDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/FXDialogService.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/GUIGlobals.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/GenFieldsCustomizer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/GlobalFocusListener.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/IconTheme.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/JabRefDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/JabRefFrame.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/Main.css (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/MergeDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/OSXCompatibleToolbar.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/PreambleEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/PreviewPanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/ReplaceStringDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/SaveOrderConfigDisplay.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/SidePane.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/SidePaneComponent.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/SidePaneManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/StateManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/StringDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/TransferableBibtexEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/UpdateTimestampListener.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/WaitForSaveOperation.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/WrapLayout.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/Actions.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/AutoLinkFilesAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/BaseAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/ChangeTypeAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/CleanupAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/ConnectToSharedDatabaseAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/CopyBibTeXKeyAndLinkAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/CopyDoiUrlAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/CopyVersionToClipboardAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/ErrorConsoleAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/IntegrityCheckAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/LookupIdentifierAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/ManageKeywordsAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/MassSetFieldAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/MnemonicAwareAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/NewDatabaseAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/NewEntryAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/NewSubDatabaseAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/OpenBrowserAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/SearchForUpdateAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/actions/SortTabsAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategy.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/AutoCompleteFirstNameMode.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/AutoCompleteSuggestionProvider.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/AutoCompleteUpdater.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/AutoCompletionInput.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/AutoCompletionStrategy.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/ReplaceStrategy.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/autosaveandbackup/BackupUIManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/auximport/FromAuxDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/bibtexkeypattern/SearchFixDuplicateLabels.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/cleanup/CleanupActionsListModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/ChangeScanner.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/ChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/EntryChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/FileUpdatePanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/GroupChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/InfoPane.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/MetaDataChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/PreambleChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/StringChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/copyfiles/CopyFilesDialogController.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/customentrytypes/CustomEntryTypesManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/customentrytypes/EntryTypeList.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/customentrytypes/FieldSetComponent.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/desktop/JabRefDesktop.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/desktop/os/Linux.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/desktop/os/NativeDesktop.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/desktop/os/OSX.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/desktop/os/Windows.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/DocumentPageViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/DocumentViewer.css (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/DocumentViewerController.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/PageDimension.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/EntryEditor.css (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/EntryEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/EntryEditorTabList.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/SourceTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabController.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/errorconsole/ErrorConsole.css (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/errorconsole/ErrorConsoleController.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/exporter/CustomExportDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/exporter/ExportAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/exporter/ExportFileFilter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/exporter/RtfTransferable.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/exporter/SaveAllAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiles/SynchronizeFileField.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiles/WriteXMPAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/externalfiletype/UnknownExternalFileType.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/DateEditor.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/DateEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/EditorValidator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/FieldEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/FieldEditorFocusListener.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/FieldEditors.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/HtmlTransferable.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/JournalEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/MultilineEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/OptionEditor.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/OptionEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/TextArea.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/TextField.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/UrlEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/XmlTransferable.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/contextmenu/CaseChangeMenu.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/contextmenu/ClearField.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/contextmenu/ConversionMenu.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/filelist/AttachFileAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/filelist/ConfirmCloseFileListEntryEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/filelist/FileListEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/filelist/FileListEntryEditor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/filelist/FileListTableModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/DroppingMouseLocation.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupDescriptions.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupMatcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupNodeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupSidePane.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupTree.css (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupTree.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupTreeCellRenderer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupTreeController.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupTreeView.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupTreeViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/GroupingWorker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/MoveGroupChange.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/TransferableEntrySelection.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/UndoableModifyGroup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/UndoableModifySubtree.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/UndoableMoveGroup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/groups/WarnAssignmentSideEffects.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/help/AboutAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/help/AboutDialogController.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/help/AboutDialogView.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/help/AboutDialogViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/help/HelpAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/help/NewVersionDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/EntryFromExternalFileCreator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/EntryFromFileCreator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/EntryFromFileCreatorManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/EntryFromPDFCreator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/ImportFormats.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/ImportInspectionDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/ImportMenuItem.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/UnlinkedFilesCrawler.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/UnlinkedPDFFileFilter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/ZipFileChooser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/actions/HandleDuplicateWarnings.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/ACMPortalFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/CiteSeerXFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/EntryFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/EntryFetchers.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/GeneralFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/IEEEXploreFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/INSPIREFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/OAI2Fetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/PreviewEntryFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/AbbreviateAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/AbbreviationViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/AbbreviationsFileViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/JournalAbbreviationsUtil.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsController.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/ManageJournalsAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/UnabbreviateAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/UndoableAbbreviator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/keyboard/KeyBinder.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/keyboard/KeyBinding.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/keyboard/KeyBindingAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/keyboard/KeyBindingsDialogController.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/logging/ApplicationInsightsAppender.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/logging/GuiAppender.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/ListSynchronizer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/MainTable.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/MainTableColumn.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/MainTableDataModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/MainTableFormat.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/MainTableHeaderRenderer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/PersistenceTableColumnListener.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/PreventDraggingJTableHeader.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/maintable/SpecialMainTableColumnsBuilder.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/menus/FileHistoryMenu.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/menus/RightClickMenu.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/mergeentries/MergeEntries.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/mergeentries/MergeFetchedEntryDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/CitationManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/ConnectionLostException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/CreationException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/NoDocumentException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/OOBibBase.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/plaintextimport/TagToMarkedTextStore.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/AdvancedTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/ColorSetupPanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/ExternalTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/FileTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/FontSelectorDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/GeneralTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/NameFormatterTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/NetworkTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/PreferencesDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/PreferencesFilterDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/PrefsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/TableColumnsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/TablePrefsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/AbstractPushToApplication.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/PushToApplication.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/PushToApplicationAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/PushToApplicationButton.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/PushToApplications.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/PushToEmacs.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/PushToLyx.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/PushToTeXstudio.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/PushToTexmaker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/PushToVim.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/push/PushToWinEdt.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/remote/JabRefMessageHandler.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/renderer/CompleteRenderer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/renderer/GeneralRenderer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/renderer/IncompleteRenderer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/GlobalSearchBar.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/GlobalSearchWorker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/HitOrMissComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/SearchDisplayMode.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/SearchResultFrame.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/SearchTextField.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/SearchWorker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/matchers/EverythingMatcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/matchers/SearchMatcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/rules/describer/SearchDescriber.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/shared/MigrationHelpDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/specialfields/SpecialFieldDatabaseChangeListener.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/specialfields/SpecialFieldDropDown.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/specialfields/SpecialFieldMenuAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/specialfields/SpecialFieldUpdateListener.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/CountingUndoManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/NamedCompound.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/UndoableChangeType.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/UndoableFieldChange.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/UndoableInsertEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/UndoableInsertString.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/UndoableKeyChange.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/UndoablePreambleChange.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/UndoableRemoveString.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/undo/UndoableStringChange.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/BackgroundTask.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/BindingsHelper.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/ControlHelper.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/DefaultTaskExecutor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/DirectoryDialogConfiguration.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/FileDialogConfiguration.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/FileFilterConverter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/IconValidationDecorator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/MappedList.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/RecursiveTreeItem.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/TaskExecutor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/TooltipTextUtil.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/ValueTableCellFactory.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/ViewModelListCellFactory.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/WindowLocation.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/comparator/FirstColumnComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/comparator/IconComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/comparator/IsMarkedComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/CheckBoxMessage.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/JTextAreaWithPlaceholder.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/JTextFieldWithPlaceholder.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/OverlayPanel.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/Tag.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/Tag.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/TagBar.css (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/TagBar.fxml (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/TagBar.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/util/component/VerticalLabelUI.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/worker/AbstractWorker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/worker/CallBack.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/worker/MarkEntriesAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/worker/SendAsEMailAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/gui/worker/VersionWorker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/TypedBibEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/BibEntryWriter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/DuplicateCheck.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/FieldContentParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/FieldContentParserPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/InvalidFieldValueException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/LatexFieldFormatterPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/BibtexCaseChanger.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/BibtexNameFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/BibtexPurify.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/BibtexTextPrefix.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/BibtexWidth.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/ChangeCaseFunction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/FormatNameFunction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/PurifyFunction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/TextPrefixFunction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/VM.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/VMException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/Warn.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/bst/WidthFunction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/citationstyle/CSLAdapter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/citationstyle/CitationStyle.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/CleanupPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/CleanupPreset.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/CleanupWorker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/Cleanups.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/DoiCleanup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/ISSNCleanup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/Exporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/ExporterFactory.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/FileSaveSession.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/GroupSerializer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/MSBibExporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/MetaDataSerializer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/ModsExporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/OOCalcDatabase.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/SaveException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/SavePreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/SaveSession.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/StringSaveSession.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/TemplateExporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/exporter/VerifyingWriter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/Formatters.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/IdentityFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/casechanger/Title.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/casechanger/Word.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/help/HelpFile.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/EntryBasedFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/FetcherException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/FulltextFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/FulltextFetchers.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/IdBasedFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/IdFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/IdParserFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/ImportException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/ImportFormatPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/ImportFormatReader.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/ImportInspector.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/Importer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/OpenDatabase.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/OutputPrinter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/ParseException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/Parser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/ParserResult.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/SearchBasedFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/WebFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/WebFetchers.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/ACS.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/ArXiv.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/CrossRef.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/DiVA.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/IEEE.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fetcher/zbMATH.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/GvkParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/RisImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroups.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/util/GroupsParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/util/INSPIREBibtexFilterReader.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/util/IdentifierParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/util/JSONEntryParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/util/JsonReader.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/util/MetaDataParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/util/OAI2Handler.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/importer/util/PostOpenAction.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/AbbreviationChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/BibStringChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/BibtexKeyChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/BibtexKeyDuplicationChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/BibtexkeyDeviationChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/BooktitleChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/BracesCorrector.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/BracketChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/DOIValidityChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/EditionChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/EntryLinkChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/FieldChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/FieldCheckers.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/FileChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/HowPublishedChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/ISBNChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/ISSNChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/IntegrityCheck.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/IntegrityMessage.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/MonthChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/NoteChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/PagesChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/PersonNamesChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/TitleChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/TypeChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/UrlChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/ValidBibtexKeyChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/ValueChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/integrity/YearChecker.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/journals/Abbreviation.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/journals/AbbreviationParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/journals/AbbreviationWriter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/l10n/EncodingControl.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/l10n/Encodings.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/l10n/Languages.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/l10n/Localization.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/l10n/LocalizationKey.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/Layout.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/LayoutEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/LayoutFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/LayoutHelper.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/StringInt.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorAbbreviator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommas.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommas.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorFirstFirst.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommas.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorLF_FF.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorLF_FFAbbr.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorLastFirst.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommas.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommas.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorLastFirstCommas.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommas.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorNatBib.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/AuthorOrgSci.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/Authors.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/CompositeFormat.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/CurrentDate.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/DOICheck.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/DOIStrip.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/DateFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/Default.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/FileLink.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/FileLinkPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/FirstPage.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/FormatPagesForHTML.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/FormatPagesForXML.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/GetOpenOfficeType.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/HTMLChars.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/IfPlural.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/LastPage.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/NameFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviations.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/Number.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/Ordinal.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/RTFChars.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/RemoveBrackets.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/RemoveTilde.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/Replace.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/RisAuthors.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/RisKeywords.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/RisMonth.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/ToLowerCase.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/ToUpperCase.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/WrapContent.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/WrapFileLinks.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/layout/format/XMLChars.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/logging/JabRefLogger.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/logging/LogMessages.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/msbib/BibTeXConverter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/msbib/MSBibConverter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/msbib/MSBibDatabase.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/msbib/MSBibEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/msbib/MSBibEntryType.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/msbib/MSBibMapping.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/msbib/MsBibAuthor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/msbib/PageNumbers.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/net/ProgressInputStream.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/net/ProxyAuthenticator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/net/ProxyPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/net/ProxyRegisterer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/net/URLDownload.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/net/URLUtil.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/openoffice/CitationEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/openoffice/OOBibStyle.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/openoffice/OOPreFormatter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/openoffice/OOUtil.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/openoffice/StyleLoader.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/pdf/AnnotationImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/pdf/FileAnnotationCache.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/pdf/TextExtractor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/preferences/TimestampPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/remote/RemotePreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/remote/RemoteUtil.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/remote/client/RemoteListenerClient.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/remote/server/MessageHandler.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/remote/shared/Protocol.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/search/DatabaseSearcher.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/search/SearchQuery.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/search/SearchQueryHighlightListener.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/search/SearchQueryHighlightObservable.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/DBMSConnection.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/DBMSProcessor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/DBMSSynchronizer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/MySQLProcessor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/OracleProcessor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/event/ConnectionLostEvent.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/event/SharedEntryNotPresentEvent.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/event/UpdateRefusedEvent.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/exception/InvalidDBMSConnectionPropertiesException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/exception/NotASharedDatabaseException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/exception/OfflineLockException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/exception/SharedEntryNotPresentException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/shared/security/Password.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/undo/UndoChangeEvent.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/undo/UndoRedoEvent.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/BuildInfo.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/FileType.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/JavaVersion.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/OS.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/TestEntry.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/UpdateField.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/UpdateFieldPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/Version.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/FileBasedLock.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/FileFinder.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/FileFinders.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/FileHistory.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/FileNameCleaner.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/FileUtil.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/io/XMLUtil.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/strings/DiffHighlighting.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/strings/RtfCharMap.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/strings/StringLengthComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/strings/StringSimilarity.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/util/strings/XmlCharsMap.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/xmp/EncryptedPdfsNotSupportedException.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/xmp/XMPPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/logic/xmp/XMPUtil.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/migrations/FileLinksUpgradeWarning.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/migrations/PreferencesMigrations.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/pdfimport/ImportDialog.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/pdfimport/PdfFileFilter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/pdfimport/PdfImporter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/preferences/CustomExportList.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/preferences/CustomImportList.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/preferences/ExportComparator.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/preferences/JabRefPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/preferences/JabRefPreferencesFilter.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/preferences/LastFocusedTabPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/preferences/PreferencesService.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/preferences/PreviewPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/preferences/SearchPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/org/jabref/preferences/VersionPreferences.java (100%) rename {src => org.jabref.gui/src}/main/java/osx/macadapter/MacAdapter.java (100%) rename {src => org.jabref.gui/src}/main/resources/ApplicationInsights.xml (100%) rename {src => org.jabref.gui/src}/main/resources/META-INF/services/com.airhacks.afterburner.injection.PresenterFactory (100%) rename {src => org.jabref.gui/src}/main/resources/build.properties (100%) rename {src => org.jabref.gui/src}/main/resources/fonts/materialdesignicons-webfont.ttf (100%) rename {src => org.jabref.gui/src}/main/resources/icons/jabref.icns (100%) mode change 100755 => 100644 rename {src => org.jabref.gui/src}/main/resources/icons/jabref.ico (100%) rename {src => org.jabref.gui/src}/main/resources/icons/jabref.svg (100%) rename {src => org.jabref.gui/src}/main/resources/images/Icons.properties (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/JabRef-icon-128.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/JabRef-icon-16.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/JabRef-icon-20.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/JabRef-icon-32.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/JabRef-icon-40.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/JabRef-icon-48.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/JabRef-icon-64.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/arxiv_32.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/emacs.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/lyx2.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/mdl-icon.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/mdlListIcon.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/mdlloading.gif (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/openoffice.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/red.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/texmaker.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/texstudio.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/vim.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/winedt.png (100%) rename {src => org.jabref.gui/src}/main/resources/images/external/wwwciteseer.png (100%) rename {src => org.jabref.gui/src}/main/resources/journals/IEEEJournalListCode.txt (100%) rename {src => org.jabref.gui/src}/main/resources/journals/IEEEJournalListText.txt (100%) rename {src => org.jabref.gui/src}/main/resources/journals/journalList.txt (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_da.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_de.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_el.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_en.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_es.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_fa.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_fr.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_in.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_it.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_ja.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_nl.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_no.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_pt_BR.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_ru.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_sv.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_tr.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_vi.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/JabRef_zh.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_da.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_de.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_el.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_en.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_es.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_fa.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_fr.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_in.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_it.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_ja.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_nl.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_no.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_pt_BR.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_ru.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_sv.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_tr.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_vi.properties (100%) rename {src => org.jabref.gui/src}/main/resources/l10n/Menu_zh.properties (100%) rename {src => org.jabref.gui/src}/main/resources/log4j2.xml (100%) rename {src => org.jabref.gui/src}/main/resources/org/jabref/gui/copyfiles/CopyFilesDialog.fxml (100%) rename {src => org.jabref.gui/src}/main/resources/org/jabref/gui/help/AboutDialog.css (100%) rename {src => org.jabref.gui/src}/main/resources/org/jabref/gui/help/AboutDialog.fxml (100%) rename {src => org.jabref.gui/src}/main/resources/org/jabref/gui/journals/ManageJournalAbbreviations.css (100%) rename {src => org.jabref.gui/src}/main/resources/org/jabref/gui/journals/ManageJournalAbbreviations.fxml (100%) rename {src => org.jabref.gui/src}/main/resources/org/jabref/gui/keyboard/KeyBindingsDialog.css (100%) rename {src => org.jabref.gui/src}/main/resources/org/jabref/gui/keyboard/KeyBindingsDialog.fxml (100%) rename {src => org.jabref.gui/src}/main/resources/protectedterms/countries_territories.terms (100%) rename {src => org.jabref.gui/src}/main/resources/protectedterms/electrical_engineering.terms (100%) rename {src => org.jabref.gui/src}/main/resources/protectedterms/months_weekdays.terms (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/bibordf.article.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/bibordf.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/bibordf.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/bibordf.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/din1505/README.txt (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/din1505/din1505winword.article.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/din1505/din1505winword.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/din1505/din1505winword.conference.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/din1505/din1505winword.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/din1505/din1505winword.inproceedings.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/din1505/din1505winword.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/docbook.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/docbook.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/docbook.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/docbook.mastersthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.article.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.book.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.booklet.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.inbook.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.incollection.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.inproceedings.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.manual.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.mastersthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.misc.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.other.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.phdthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.proceedings.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.techreport.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/EndNote.unpublished.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/endnote/Readme.txt (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.article.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.book.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.inbook.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.incollection.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.inproceedings.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.mastersthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.phdthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.proceedings.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/harvard/harvard.readme (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/html.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/html.book.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/html.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/html.inbook.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/html.inproceedings.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/html.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/html.mastersthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/html.phdthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.article.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.book.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.edocs.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.edocsarticle.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.edocscontribution.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.edocsnews.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.edocsperiodical.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.email.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.emaillist.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.graphics.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.inbook.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.inedocs.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.inproceedings.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.legislation.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.mastersthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.patent.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.periodical.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.proceeding.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.radiotv.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.recording.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.standard.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.techreport.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690rtf/iso690RTF.unpublished.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.article.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.book.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.edocs.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.edocsarticle.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.edocscontribution.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.edocsnews.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.edocsperiodical.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.email.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.emaillist.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.graphics.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.inbook.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.inedocs.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.inproceedings.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.legislation.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.mastersthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.patent.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.periodical.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.proceeding.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.radiotv.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.recording.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.standard.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.techreport.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/iso690txt/iso690.unpublished.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/listrefs/listrefs.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/listrefs/listrefs.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/listrefs/listrefs.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/listrefs/listrefs.misc.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/misq/misq.article.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/misq/misq.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/misq/misq.book.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/misq/misq.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/misq/misq.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/misq/readme.txt (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/openoffice/README (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/openoffice/openoffice-csv.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/openoffice/openoffice-csv.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.article.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.book.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.conference.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.incollection.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.inproceedings.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.mastersthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.patent.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.phdthesis.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.techreport.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.unpublished.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/ris/ris.www.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/simplehtml.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/simplehtml.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/simplehtml.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/tablerefs/tablerefs.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/tablerefs/tablerefs.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/tablerefs/tablerefs.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.begin.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.end.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/layout/text.layout (100%) rename {src => org.jabref.gui/src}/main/resources/resource/ods/manifest.xml (100%) rename {src => org.jabref.gui/src}/main/resources/resource/ods/meta.xml (100%) rename {src => org.jabref.gui/src}/main/resources/resource/ods/settings.xml (100%) rename {src => org.jabref.gui/src}/main/resources/resource/openoffice/default_authoryear.jstyle (100%) rename {src => org.jabref.gui/src}/main/resources/resource/openoffice/default_numerical.jstyle (100%) rename {src => org.jabref.gui/src}/main/resources/resource/openoffice/manifest.xml (100%) rename {src => org.jabref.gui/src}/main/resources/resource/openoffice/meta.xml (100%) rename {src => org.jabref.gui/src}/main/resources/resource/openoffice/mimetype (100%) rename {src => org.jabref.gui/src}/main/resources/xjc/bibtexml/bibtexml.xsd (100%) rename {src => org.jabref.gui/src}/main/resources/xjc/medline/bookdoc_160101.xsd (100%) rename {src => org.jabref.gui/src}/main/resources/xjc/medline/medline.xsd (100%) rename {src => org.jabref.gui/src}/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd (100%) rename {src => org.jabref.gui/src}/main/resources/xjc/mods/mods-3-6.xsd (100%) rename {src => org.jabref.gui/src}/main/resources/xjc/mods/mods-binding.xjb (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/BibtexTestData.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/CatchExceptionsFromThread.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/CodeStyleTests.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/JabRefPreferencesTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/SearchQueryHighlightListenerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/TestIconsProperties.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/architecture/MainArchitectureTests.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/architecture/TestArchitectureTests.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/cleanup/CleanupActionsListModelTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/cli/AuxCommandLineTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/cli/JabRefCLITest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/AWTExceptionHandler.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/AbstractUITest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/ClipBoardManagerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/DialogTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/DialogTest2.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/EntryTableTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/GUITest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/IdFetcherDialogTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/ParameterizedDialogTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/UndoTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/UpdateTimestampListenerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/entryeditor/EntryEditorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/externalfiletype/ExternalFileTypeTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/fieldeditors/HtmlTransferableTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/search/ContainsAndRegexBasedSearchRuleDescriberTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/search/SearchResultsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/util/TooltipTextUtilTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/TypedBibEntryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/auxparser/AuxParserTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/BibEntryAssert.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bst/BibtexPurifyTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bst/BibtexWidthTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bst/TestVM.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/ExporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/GroupSerializerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/FormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/help/HelpFileTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/FulltextFetchersTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/ImportDataTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/ImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/OpenDatabaseTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/WebFetchersTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/ACSTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/DiVATest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/GvkParserTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/IEEETest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fetcher/zbMATHTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/RISImporterTestFiles.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroupsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/util/GroupsParserTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/importer/util/JSONEntryParserTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/journals/AbbreviationParserTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/journals/AbbreviationTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/journals/AbbreviationsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/EncodingsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/LanguagesTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/LocalizationBundleForTEst.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/LocalizationEntry.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/LocalizationParser.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/LocalizationParserTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/LocalizationTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/LayoutEntryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/LayoutTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/AuthorsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/DOICheckTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/DOIStripTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/DateFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/DefaultTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/FileLinkTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/FirstPageTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/IfPluralTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/LastPageTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/NameFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/OrdinalTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/RTFCharsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/ReplaceTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/RisMonthTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/WrapContentTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/net/URLDownloadTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/net/URLUtilTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/openoffice/CitationEntryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/remote/RemotePreferencesTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/remote/RemoteTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/remote/RemoteUtilTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/search/DatabaseSearcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/search/SearchQueryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/shared/DBMSConnectionTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/shared/DBMSProcessorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/shared/DBMSTypeTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/shared/SynchronizationTestEventListener.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/shared/TestConnector.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/shared/TestManager.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/BracketedPatternTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/BuildInfoTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/DevelopmentStageTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/FileTypeTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/JavaVersionTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/UpdateFieldTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/VersionTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/io/FileHistoryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/io/FileNameCleanerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/io/FileUtilTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/logic/xmp/XMPUtilTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/migrations/PreferencesMigrationsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/BibDatabaseContextTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/EntryTypesTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/TreeNodeTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/TreeNodeTestData.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/database/BibDatabaseContextTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/database/BibDatabaseTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/database/DuplicationCheckerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/database/KeyChangeListenerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/database/event/AutosaveEventTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/AuthorListParameterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/AuthorListTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/AuthorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/BibEntryEqualityTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/BibEntryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/BibEntryTests.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/BibtexStringTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/DateTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/EntryLinkListTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/FieldNameTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/FileFieldWriterTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/IdGeneratorTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/KeywordListTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/KeywordTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/MonthTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/identifier/DOITest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/identifier/EprintTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/identifier/ISBNTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/identifier/ISSNTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/event/TestEventListener.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/groups/ExplicitGroupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/groups/GroupTreeNodeTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/groups/SearchGroupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/groups/TexGroupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/groups/WordKeywordGroupTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/metadata/MetaDataTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/pdf/FileAnnotationTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/search/rules/MockSearchMatcher.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/model/strings/StringUtilTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/performance/BibtexEntryGenerator.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/preferences/LastFocusedTabPreferencesTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/support/CIServerCondition.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/support/DisabledOnCIServer.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/testutils/TestUtils.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/testutils/category/DatabaseTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/testutils/category/FetcherTest.java (100%) rename {src => org.jabref.gui/src}/test/java/org/jabref/testutils/category/GUITest.java (100%) rename {src => org.jabref.gui/src}/test/resources/log4j2.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/bibtexFiles/test.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/cli/origin.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/cli/paper.aux (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/customPreferences.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/gui/importer/fetcher/oai2.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/gui/importer/fetcher/oai22.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/gui/importer/fetcher/oai23.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/auxparser/badpaper.aux (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/auxparser/config.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/auxparser/crossref.aux (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/auxparser/nested.aux (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/auxparser/origin.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/auxparser/paper.aux (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/auxparser/result.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/bst/abbrv.bst (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibKeyTest.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibKeyTest.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibLCID.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibLCID.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibLocationTest.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibPatent.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibPatent.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibShorttitle.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/exporter/MsBibShorttitle.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/encoding-header.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/encodingWithoutNewline.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fetcher/gvk_artificial_subtitle_test.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fetcher/gvk_empty_result_because_of_bad_query.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.1.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.2.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/AutosavedSharedDatabase.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib (95%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib (87%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestCorrupt.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/BibtexImporter.examples.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/Empty.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/EmptyMsBib_Test.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/Endnote.book.example.enw (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/Endnote.entries.enw (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.A.enw (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.E.enw (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.no_enw (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/IEEEImport1.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest2.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/InspecImportTestFalse.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest1.isi (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest2.isi (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestEmpty.isi (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestInspec.isi (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestMedline.isi (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestWOS.isi (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMalformedEntry.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInvalidFormat.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultipleEntries.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.nbib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest1.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest2Invalid.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest3.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest4.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest5.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest6.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest7.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib3.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib4.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib5.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib6.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib7.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterCorrupted.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib (96%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris (94%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.ris (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/annotated.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/empty.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/emptyFile.xml (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/fileformat/encrypted.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/headerless.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/jabref-header.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf (100%) rename "src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" => "org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/importer/wrong-header.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/net/empty.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/openoffice/test.jstyle (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/protectedterms/namedterms.terms (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/logic/protectedterms/unnamedterms.terms (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/model/entry/entryWithMultilineAbstract.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/util/build.properties (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/util/twente.bib (100%) rename {src => org.jabref.gui/src}/test/resources/org/jabref/util/unlinkedFilesTestBib.bib (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/encrypted.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/encrypted.txt (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal-foxithighlight.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal-foxitnote.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal-highlight-no-note.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal-highlight-with-note.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal-inlinenote.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal-polygon.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal-popup.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal-squiggly.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal-strikeout.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal-underline.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/minimal.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/thesis-example.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/write-protected.docx (100%) rename {src => org.jabref.gui/src}/test/resources/pdfs/write-protected.pdf (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/articleWithTitle.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/articleWithTitleAndFile.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/bibWithMixedContent.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/bibWithUserCommentAndEntryChange.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/bibWithUserComments.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/bug1283.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/cleanup.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/complex.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/crossref.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/issue_181_1.8.0_51-b16.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/issue_181_1.8.0_60-b27.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/jabref-authors.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/othertype.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/pdf-field-upgrade.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/reallyunknowntype.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/save-actions.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/saveactions2.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/special-fields.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/testdocument.tex (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/testjabref.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/testjabref_210as292.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/testjabref_292.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/unknownMetaData.bib (100%) rename {src => org.jabref.gui/src}/test/resources/testbib/utf8-bom.bib (100%) rename xjc.gradle => org.jabref.gui/xjc.gradle (94%) create mode 100644 org.jabref.model/build.gradle create mode 100644 org.jabref.model/config/checkstyle/checkstyle.xml create mode 100644 org.jabref.model/config/checkstyle/suppressions.xml create mode 100644 org.jabref.model/settings.gradle rename {src => org.jabref.model/src}/main/antlr3/org/jabref/bst/Bst.g (100%) rename {src => org.jabref.model/src}/main/antlr4/org/jabref/search/Search.g4 (100%) create mode 100644 org.jabref.model/src/main/gen/org/jabref/logic/bst/Bst.tokens create mode 100644 org.jabref.model/src/main/gen/org/jabref/logic/bst/BstLexer.java create mode 100644 org.jabref.model/src/main/gen/org/jabref/logic/bst/BstParser.java create mode 100644 org.jabref.model/src/main/gen/org/jabref/search/Search.interp create mode 100644 org.jabref.model/src/main/gen/org/jabref/search/Search.tokens create mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchBaseVisitor.java create mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.interp create mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.java create mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.tokens create mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchParser.java create mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchVisitor.java rename {src => org.jabref.model/src}/main/java/org/jabref/architecture/ApacheCommonsLang3Allowed.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/ChainNode.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/Defaults.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/EntryTypes.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/FieldChange.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/TreeNode.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/auxparser/AuxParser.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/auxparser/AuxParserResult.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/bibtexkeypattern/AbstractBibtexKeyPattern.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/bibtexkeypattern/DatabaseBibtexKeyPattern.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/bibtexkeypattern/GlobalBibtexKeyPattern.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/cleanup/CleanupJob.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/cleanup/FieldFormatterCleanup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/cleanup/FieldFormatterCleanups.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/cleanup/Formatter.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/BibDatabase.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/BibDatabaseContext.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/BibDatabaseMode.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/BibDatabaseModeDetection.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/BibDatabases.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/DuplicationChecker.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/KeyChangeListener.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/KeyCollisionException.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/event/AutosaveEvent.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/event/ChangePropagation.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/event/CoarseChangeFilter.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/event/EntryAddedEvent.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/event/EntryRemovedEvent.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/shared/DBMSType.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/shared/DatabaseConnection.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/shared/DatabaseLocation.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/shared/DatabaseNotSupportedException.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/database/shared/DatabaseSynchronizer.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/Author.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/AuthorList.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/AuthorListParser.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/BibEntry.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/BiblatexEntryType.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/BiblatexEntryTypes.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/BibtexEntryType.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/BibtexEntryTypes.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/BibtexSingleField.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/BibtexString.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/CanonicalBibtexEntry.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/CustomEntryType.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/Date.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/EntryConverter.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/EntryLinkList.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/EntryType.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/FieldName.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/FieldProperty.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/FileFieldParser.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/FileFieldWriter.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/IEEETranEntryTypes.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/IdGenerator.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/InternalBibtexFields.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/Keyword.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/KeywordList.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/LinkedFile.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/Month.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/ParsedEntryLink.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/SharedBibEntryData.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/event/EntryChangedEvent.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/event/EntryEvent.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/event/EntryEventSource.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/event/FieldChangedEvent.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/identifier/DOI.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/identifier/Eprint.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/identifier/ISBN.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/identifier/ISSN.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/identifier/Identifier.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/identifier/MathSciNetId.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/specialfields/SpecialField.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/entry/specialfields/SpecialFieldValue.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/AbstractGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/AllEntriesGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/AutomaticGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/ExplicitGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/GroupEntryChanger.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/GroupHierarchyType.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/GroupTreeNode.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/KeywordGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/RegexKeywordGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/SearchGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/TexGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/WordKeywordGroup.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/groups/event/GroupUpdatedEvent.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/metadata/ContentSelector.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/metadata/ContentSelectors.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/metadata/FileDirectoryPreferences.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/metadata/MetaData.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/metadata/SaveOrderConfig.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/metadata/event/MetaDataChangedEvent.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/pdf/FileAnnotation.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/pdf/FileAnnotationType.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/GroupSearchQuery.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/SearchMatcher.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/matchers/AndMatcher.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/matchers/MatcherSet.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/matchers/MatcherSets.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/matchers/NotMatcher.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/matchers/OrMatcher.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/rules/ContainBasedSearchRule.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/rules/SearchRule.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/rules/SearchRules.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/search/rules/SentenceAnalyzer.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/strings/StringUtil.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/util/DummyFileUpdateMonitor.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/util/FileHelper.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/util/FileUpdateListener.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/util/FileUpdateMonitor.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/util/OptionalUtil.java (100%) rename {src => org.jabref.model/src}/main/java/org/jabref/model/util/TreeCollector.java (100%) diff --git a/build.gradle b/build.gradle index eff760eaba1..f1e27e4cb86 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,3 @@ -import groovy.json.JsonSlurper -import org.gradle.internal.os.OperatingSystem - -// to update the gradle wrapper, execute -// ./gradlew wrapper --gradle-version=4.4.1 --distribution-type=bin - buildscript { repositories { mavenLocal() @@ -18,503 +12,31 @@ buildscript { } plugins { - id 'com.gradle.build-scan' version '1.11' - id 'com.install4j.gradle' version '7.0.3' - id 'com.github.johnrengelman.shadow' version '2.0.2' - id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" - id "com.simonharrer.modernizer" version '1.5.0-1' - id 'me.champeau.gradle.jmh' version '0.4.3' - id 'net.ltgt.errorprone' version '0.0.13' - id 'com.github.ben-manes.versions' version '0.17.0' -} - -// use the gradle build scan feature: https://scans.gradle.com/get-started -buildScan { - licenseAgreementUrl = 'https://gradle.com/terms-of-service' - licenseAgree = 'yes' -} - -apply plugin: 'java' -apply plugin: 'application' -apply plugin: 'project-report' -apply plugin: 'jacoco' -apply plugin: 'install4j' -apply plugin: 'me.champeau.gradle.jmh' -apply plugin: 'checkstyle' -apply plugin: 'org.junit.platform.gradle.plugin' - -apply from: 'eclipse.gradle' -apply from: 'localization.gradle' -apply from: 'xjc.gradle' - -group = "org.jabref" -version = "4.2-dev" -project.ext.threeDotVersion = "4.1.0.1" -project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j6' : 'install4j6') -sourceCompatibility = 1.8 -targetCompatibility = 1.8 -mainClassName = "org.jabref.JabRefMain" - -// These are the Java version requirements we will check on each start of JabRef -ext.minRequiredJavaVersion = "1.8.0_144" -ext.allowJava9 = false - -sourceSets { - main { - java { - srcDirs = ["src/main/java", "src/main/gen"] - } - - resources { - srcDirs = ["src/main/java", "src/main/resources"] - } - } -} - -repositories { - mavenLocal() - jcenter() - maven { - url 'https://oss.sonatype.org/content/groups/public' - } -} - -configurations { - antlr3 - antlr4 -} - -dependencies { - compile fileTree(dir: 'lib', includes: ['*.jar']) - - compile 'com.jgoodies:jgoodies-common:1.8.1' - compile 'com.jgoodies:jgoodies-forms:1.9.0' - - // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 - compile 'org.apache.pdfbox:pdfbox:1.8.13' - compile 'org.apache.pdfbox:fontbox:1.8.13' - compile 'org.apache.pdfbox:jempbox:1.8.13' - - // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 - compile 'org.bouncycastle:bcprov-jdk15on:1.59' - - compile 'commons-cli:commons-cli:1.4' - - compile "org.libreoffice:juh:5.4.2" - compile "org.libreoffice:jurt:5.4.2" - compile "org.libreoffice:ridl:5.4.2" - compile "org.libreoffice:unoil:5.4.2" - - compile 'com.github.bkromhout:java-diff-utils:2.1.1' - compile 'info.debatty:java-string-similarity:1.0.1' - - antlr3 'org.antlr:antlr:3.5.2' - compile 'org.antlr:antlr-runtime:3.5.2' - - antlr4 'org.antlr:antlr4:4.7.1' - compile 'org.antlr:antlr4-runtime:4.7.1' - - // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release" - compile 'mysql:mysql-connector-java:5.1.45' - - compile 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1' - - compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1' - - compile 'com.google.guava:guava:24.0-jre' - - // JavaFX stuff - compile 'com.airhacks:afterburner.fx:1.7.0' - compile 'de.codecentric.centerdevice:javafxsvg:1.2.1' - compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' - compile 'de.saxsys:mvvmfx-validation:1.7.0' - compile 'org.fxmisc.easybind:easybind:1.0.3' - compile 'org.fxmisc.flowless:flowless:0.6' - compile 'org.fxmisc.richtext:richtextfx:0.8.2' - - // Cannot be updated to 9.*.* until Jabref works with Java 9 - compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT' - - compile 'org.jsoup:jsoup:1.11.2' - compile 'com.mashape.unirest:unirest-java:1.4.9' - - // >1.8.0-beta is required for java 9 compatibility - compile 'org.slf4j:slf4j-api:1.8.0-beta1' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' - compile 'org.apache.logging.log4j:log4j-jcl:2.10.0' - compile 'org.apache.logging.log4j:log4j-api:2.10.0' - compile 'org.apache.logging.log4j:log4j-core:2.10.0' - - // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles - compile 'org.citationstyles:styles:1.0.1-SNAPSHOT' - compile 'org.citationstyles:locales:1.0.1-SNAPSHOT' - compile 'de.undercouch:citeproc-java:1.0.1' - - compile 'com.github.tomtung:latex2unicode_2.12:0.2.2' - - compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9' - compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' - - testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' - testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' - testCompile 'org.junit.platform:junit-platform-launcher:1.1.0-M2' - testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' - testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.mockito:mockito-core:2.13.0' - testCompile 'com.github.tomakehurst:wiremock:2.14.0' - testCompile 'org.assertj:assertj-swing-junit:3.8.0' - testCompile 'org.reflections:reflections:0.9.11' - testCompile 'org.xmlunit:xmlunit-core:2.5.1' - testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' - testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' - testCompile "org.testfx:testfx-core:4.0.+" - testCompile "org.testfx:testfx-junit:4.0.+" - - checkstyle 'com.puppycrawl.tools:checkstyle:8.8' -} - -dependencyUpdates { - outputFormatter = "json" -} - -// We have some dependencies which cannot be updated due to various reasons. -dependencyUpdates.resolutionStrategy = { - componentSelection { - withModule("org.controlsfx:controlsfx") { ComponentSelection selection -> - if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher - selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9") - } - } - withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> - if (selection.candidate.version.equals("1.0.10")) { - selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") - } - } - withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> - if (selection.candidate.version.equals("1.0.10")) { - selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") - } - } - withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> - if (selection.candidate.version.equals("2.0.0-BETA")) { - selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") - } - } - withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> - if (selection.candidate.version.equals("2.0.0-BETA")) { - selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") - } - } - withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("Cannot be upgraded to version 2") - } - } - withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") - } - } - withModule("org.apache.pdfbox:pdfbox") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") - } - } - withModule("mysql:mysql-connector-java") { ComponentSelection selection -> - if (selection.candidate.version ==~ /[6-9].*/) { - selection.reject("http://dev.mysql.com/downloads/connector/j/ lists the version 5.* as last stable version.") - } - } - - } -} - -task checkOutdatedDependencies(dependsOn: dependencyUpdates) { - doLast { - def dependencyReport = new JsonSlurper().parseText(new File("build/dependencyUpdates/report.json").text) - assert dependencyReport.outdated.count == 0: "There are outdated dependencies in build.gradle!\n Run ./gradlew dependencyUpdates to see which" - } -} - -clean { - delete "src/main/gen" -} - -processResources { - filteringCharset = 'UTF-8' - - filesMatching("build.properties") { - expand(version: project.version, - "year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)), - "authors": new File('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "), - "developers": new File('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "), - "azureInstrumentationKey": System.getenv('AzureInstrumentationKey'), - "minRequiredJavaVersion": minRequiredJavaVersion, - "allowJava9": allowJava9 - - ) - filteringCharset = 'UTF-8' - } - - filesMatching("resource/**/meta.xml") { - expand version: project.version - } -} - - -task generateSource(dependsOn: ["generateBstGrammarSource", "generateSearchGrammarSource"]) { - group = 'JabRef' - description 'Generates all Java source files.' -} - -task generateBstGrammarSource(type: JavaExec) { - group 'JabRef' - description 'Generates BstLexer.java and BstParser.java from the Bst.g grammar file using antlr3.' - - File antlrSource = file('src/main/antlr3/org/jabref/bst/Bst.g') - - inputs.file antlrSource - outputs.file file('src/main/gen/org/jabref/logic/bst/BstLexer.java') - outputs.file file('src/main/gen/org/jabref/logic/bst/BstParser.java') - - main = 'org.antlr.Tool' - classpath = configurations.antlr3 - args = ["-o", file('src/main/gen/org/jabref/logic/bst/'), antlrSource] + id 'nebula.lint' version '8.3.1' + id 'nebula.info' version '3.6.0' } -task generateSearchGrammarSource(type: JavaExec) { - String grammarFile = "Search" +subprojects { + apply plugin: 'java' + apply plugin: 'checkstyle' - group 'JabRef' - description "Generates java files for ${grammarFile}.g antlr4." + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + + group = "org.jabref" + version = "4.2-dev" - String packagePath = "org/jabref/search" - File antlrPath = file("src/main/antlr4") - File genPath = file("src/main/gen") - - File antlrSource = file("$antlrPath/$packagePath/${grammarFile}.g4") - File destinationDir = file("$genPath/$packagePath") - - inputs.file antlrSource - outputs.file file("$destinationDir/${grammarFile}Parser.java") - outputs.file file("$destinationDir/${grammarFile}Lexer.java") - outputs.file file("$destinationDir/${grammarFile}Visitor.java") - outputs.file file("$destinationDir/${grammarFile}BaseVisitor.java") - outputs.file file("$destinationDir/${grammarFile}.tokens") - outputs.file file("$destinationDir/${grammarFile}Lexer.tokens") - - main = 'org.antlr.v4.Tool' - classpath = configurations.antlr4 - args = ["-o", destinationDir, "-visitor", "-no-listener", "-package", "org.jabref.search", antlrSource] -} - -compileJava { - options.encoding = 'UTF-8' - options.compilerArgs << "-Xlint:none" -} -compileJava.dependsOn "generateSource" - -compileTestJava { - options.encoding = 'UTF-8' -} - -javadoc { - options { - encoding = 'UTF-8' - version = true - author = true - } -} - -// Test tasks -junitPlatform { - filters { - tags { - exclude 'DatabaseTest', 'FetcherTest', 'GUITest', 'org.jabref.testutils.category.FetcherTest', 'org.jabref.testutils.category.GUITest' - } - } - - logManager 'org.apache.logging.log4j.jul.LogManager' -} - -task databaseTest(type: Test) { - useJUnit { - includeCategories 'org.jabref.testutils.category.DatabaseTest' - } -} - -task fetcherTest(type: Test) { - useJUnit { - includeCategories 'org.jabref.testutils.category.FetcherTest' - } -} - -task guiTest(type: Test) { - useJUnit { - includeCategories 'org.jabref.testutils.category.GUITest' - } -} - -// Test result tasks -task copyTestResources(type: Copy) { - from "${projectDir}/src/test/resources" - into "${buildDir}/classes/test" -} -processTestResources.dependsOn copyTestResources - -tasks.withType(Test) { - reports.html.destination = file("${reporting.baseDir}/${name}") - - jacoco { - append = true - } -} - -task jacocoMerge(type: JacocoMerge) { - executionData file("$buildDir/jacoco/junitPlatformTest.exec"), file("$buildDir/jacoco/databaseTest.exec"), file("$buildDir/jacoco/fetcherTest.exec") - dependsOn junitPlatformTest, databaseTest, fetcherTest -} - -jacocoTestReport { - executionData jacocoMerge.destinationFile - dependsOn jacocoMerge - - reports { - xml.enabled = true // coveralls plugin depends on xml format report - html.enabled = true - } -} - -afterEvaluate { - def junitPlatformTest = tasks.junitPlatformTest - - jacoco { - toolVersion = '0.8.0' - applyTo(junitPlatformTest) - } - - task jacocoJunit5TestReport(type: JacocoReport) { - executionData jacocoMerge.destinationFile - dependsOn jacocoMerge - sourceSets sourceSets.main - sourceDirectories = files(sourceSets.main.allSource.srcDirs) - classDirectories = files(sourceSets.main.output) - - reports { - xml.enabled true - html.enabled true - } - } -} - -// Code quality tasks -checkstyle { - // do not use other packages for checkstyle, excluding gen(erated) sources - checkstyleMain.source = "src/main/java" - toolVersion = '8.5' -} - -checkstyleMain.shouldRunAfter test -checkstyleTest.shouldRunAfter test - -modernizer { - // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. - // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer - failOnViolations = false -} - -// Release tasks -shadowJar { - classifier 'fat' -} - -/* - * Changes project.version to VERSION--snapshot--DATE--GIT_HASH - */ -if (hasProperty('dev')) { - String command = "git log --pretty=format:%cd--%h -n 1 --date=short" - String commitInfo = "" - if (OperatingSystem.current().isWindows()) { - commitInfo = "cmd /c $command".execute().in.text - } else { - commitInfo = command.execute().in.text - } - - // determine branch - command = "git symbolic-ref -q --short HEAD" - String branchName = "" - if (OperatingSystem.current().isWindows()) { - branchName = "cmd /c $command".execute().in.text - } else { - branchName = command.execute().in.text - } - // A newline is returned. Remove it. (trim()) - // In the context of github, the branch name could be something like "pull/277" - // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" - // http://stackoverflow.com/a/15075907/873282 describes the used pattern. - branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") - - // hack string - // first the date (%cd), then the branch name, and finally the commit id (%h) - String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) - - project.version += "--snapshot--" + infoString -} - -install4j { - installDir = file(project.ext.install4jDir) -} - -// has to be defined AFTER 'dev' things to have the correct project.version -task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") { - projectFile = file('jabref.install4j') - release = project.version - winKeystorePassword = System.getenv('CERTIFICATE_PW') - macKeystorePassword = System.getenv('CERTIFICATE_PW') - variables = [ - versionFourDots: project.ext.threeDotVersion, - buildFileName : jar.archiveName, - version : project.version - ] - - doLast { - copy { - from "build/install4j" - into "build/releases" - } - } -} - - -task release(dependsOn: ["media", "releaseJar"]) { - group = 'JabRef - Release' - description 'Creates a release for all target platforms.' -} - -task releaseJar(dependsOn: "shadowJar") { - group = 'JabRef - Release' - description "Creates a Jar release." - doLast { - copy { - from("$buildDir/libs/JabRef-${project.version}-fat.jar") - into("$buildDir/releases") - rename { String fileName -> - fileName.replace('-fat', '') - } + repositories { + mavenLocal() + jcenter() + maven { + url 'https://oss.sonatype.org/content/groups/public' } - // set executable with read permissions (first true) and for all (false) - file("$buildDir/releases/JabRef-${project.version}.jar").setExecutable(true, false) } } -task snapJar(dependsOn: "releaseJar", type: Delete) { - delete fileTree(dir: "$buildDir/releases/", exclude: "JabRef-${project.version}.jar") -} - -jmh { - warmupIterations = 5 - iterations = 10 - fork = 2 +allprojects { + // linter for gradle - documentation: https://github.com/nebula-plugins/gradle-lint-plugin/wiki + apply plugin: 'nebula.lint' + gradleLint.rules = ['all-dependency'] } diff --git a/src/main/doc/Groups.uml b/docs/Groups.uml similarity index 100% rename from src/main/doc/Groups.uml rename to docs/Groups.uml diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle new file mode 100644 index 00000000000..6415757adac --- /dev/null +++ b/org.jabref.gui/build.gradle @@ -0,0 +1,437 @@ +import groovy.json.JsonSlurper +import org.gradle.internal.os.OperatingSystem + +buildscript { + repositories { + mavenLocal() + jcenter() + maven { + url 'https://oss.sonatype.org/content/groups/public' + } + } + dependencies { + classpath 'org.junit.platform:junit-platform-gradle-plugin:1.1.0-M1' + } +} + +plugins { + id 'com.install4j.gradle' version '7.0.3' + id 'com.github.johnrengelman.shadow' version '2.0.2' + id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" + id "com.simonharrer.modernizer" version '1.5.0-1' + id 'me.champeau.gradle.jmh' version '0.4.3' + id 'net.ltgt.errorprone' version '0.0.13' + id 'com.github.ben-manes.versions' version '0.17.0' +} + +apply plugin: 'application' +apply plugin: 'project-report' +apply plugin: 'jacoco' +apply plugin: 'install4j' +apply plugin: 'me.champeau.gradle.jmh' +apply plugin: 'org.junit.platform.gradle.plugin' + +apply from: 'xjc.gradle' + +project.ext.threeDotVersion = "4.1.0.1" +project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j6' : 'install4j6') +mainClassName = "org.jabref.JabRefMain" + +// These are the Java version requirements we will check on each start of JabRef +ext.minRequiredJavaVersion = "1.8.0_144" +ext.allowJava9 = false + +sourceSets { + main { + java { + srcDirs = ["src/main/java", "src/main/gen"] + } + + resources { + srcDirs = ["src/main/java", "src/main/resources"] + } + } +} + +dependencies { + compile project(':org.jabref.model') + + compile fileTree(dir: 'lib', includes: ['*.jar']) + + compile 'com.jgoodies:jgoodies-common:1.8.1' + compile 'com.jgoodies:jgoodies-forms:1.9.0' + + // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 + compile 'org.apache.pdfbox:pdfbox:1.8.13' + compile 'org.apache.pdfbox:fontbox:1.8.13' + compile 'org.apache.pdfbox:jempbox:1.8.13' + + // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 + compile 'org.bouncycastle:bcprov-jdk15on:1.59' + + compile 'commons-cli:commons-cli:1.4' + + compile "org.libreoffice:juh:5.4.2" + compile "org.libreoffice:jurt:5.4.2" + compile "org.libreoffice:ridl:5.4.2" + compile "org.libreoffice:unoil:5.4.2" + + compile 'com.github.bkromhout:java-diff-utils:2.1.1' + compile 'info.debatty:java-string-similarity:1.0.1' + + // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release" + compile 'mysql:mysql-connector-java:5.1.45' + + compile 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1' + + compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1' + + compile 'com.google.guava:guava:24.0-jre' + + // JavaFX stuff + compile 'com.airhacks:afterburner.fx:1.7.0' + compile 'de.codecentric.centerdevice:javafxsvg:1.2.1' + compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' + compile 'de.saxsys:mvvmfx-validation:1.7.0' + compile 'org.fxmisc.easybind:easybind:1.0.3' + compile 'org.fxmisc.flowless:flowless:0.6' + compile 'org.fxmisc.richtext:richtextfx:0.8.2' + + // Cannot be updated to 9.*.* until Jabref works with Java 9 + compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT' + + compile 'org.jsoup:jsoup:1.11.2' + compile 'com.mashape.unirest:unirest-java:1.4.9' + + // >1.8.0-beta is required for java 9 compatibility + compile 'org.slf4j:slf4j-api:1.8.0-beta1' + compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' + compile 'org.apache.logging.log4j:log4j-jcl:2.10.0' + compile 'org.apache.logging.log4j:log4j-api:2.10.0' + compile 'org.apache.logging.log4j:log4j-core:2.10.0' + + // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles + compile 'org.citationstyles:styles:1.0.1-SNAPSHOT' + compile 'org.citationstyles:locales:1.0.1-SNAPSHOT' + compile 'de.undercouch:citeproc-java:1.0.1' + + compile 'com.github.tomtung:latex2unicode_2.12:0.2.2' + + compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9' + compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' + + testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' + testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' + testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' + testCompile 'org.junit.platform:junit-platform-launcher:1.1.0-M2' + testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' + testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' + testCompile 'org.mockito:mockito-core:2.13.0' + testCompile 'com.github.tomakehurst:wiremock:2.14.0' + testCompile 'org.assertj:assertj-swing-junit:3.8.0' + testCompile 'org.reflections:reflections:0.9.11' + testCompile 'org.xmlunit:xmlunit-core:2.5.1' + testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' + testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' + testCompile "org.testfx:testfx-core:4.0.+" + testCompile "org.testfx:testfx-junit:4.0.+" + + checkstyle 'com.puppycrawl.tools:checkstyle:8.8' +} + +dependencyUpdates { + outputFormatter = "json" +} + +// We have some dependencies which cannot be updated due to various reasons. +dependencyUpdates.resolutionStrategy = { + componentSelection { + withModule("org.controlsfx:controlsfx") { ComponentSelection selection -> + if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher + selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9") + } + } + withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> + if (selection.candidate.version.equals("1.0.10")) { + selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") + } + } + withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> + if (selection.candidate.version.equals("1.0.10")) { + selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") + } + } + withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> + if (selection.candidate.version.equals("2.0.0-BETA")) { + selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") + } + } + withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> + if (selection.candidate.version.equals("2.0.0-BETA")) { + selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") + } + } + withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("Cannot be upgraded to version 2") + } + } + withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") + } + } + withModule("org.apache.pdfbox:pdfbox") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") + } + } + withModule("mysql:mysql-connector-java") { ComponentSelection selection -> + if (selection.candidate.version ==~ /[6-9].*/) { + selection.reject("http://dev.mysql.com/downloads/connector/j/ lists the version 5.* as last stable version.") + } + } + + } +} + +task checkOutdatedDependencies(dependsOn: dependencyUpdates) { + doLast { + def dependencyReport = new JsonSlurper().parseText(new File("build/dependencyUpdates/report.json").text) + assert dependencyReport.outdated.count == 0: "There are outdated dependencies in build.gradle!\n Run ./gradlew dependencyUpdates to see which" + } +} + +clean { + delete "src/main/gen" +} + +processResources { + filteringCharset = 'UTF-8' + + filesMatching("build.properties") { + expand(version: project.version, + "year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)), + "authors": new File('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "), + "developers": new File('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "), + "azureInstrumentationKey": System.getenv('AzureInstrumentationKey'), + "minRequiredJavaVersion": minRequiredJavaVersion, + "allowJava9": allowJava9 + + ) + filteringCharset = 'UTF-8' + } + + filesMatching("resource/**/meta.xml") { + expand version: project.version + } +} + +compileJava { + options.encoding = 'UTF-8' + options.compilerArgs << "-Xlint:none" +} + +compileTestJava { + options.encoding = 'UTF-8' +} + +javadoc { + options { + encoding = 'UTF-8' + version = true + author = true + } +} + +// Test tasks +junitPlatform { + filters { + tags { + exclude 'DatabaseTest', 'FetcherTest', 'GUITest', 'org.jabref.testutils.category.FetcherTest', 'org.jabref.testutils.category.GUITest' + } + } + + logManager 'org.apache.logging.log4j.jul.LogManager' +} + +task databaseTest(type: Test) { + useJUnit { + includeCategories 'org.jabref.testutils.category.DatabaseTest' + } +} + +task fetcherTest(type: Test) { + useJUnit { + includeCategories 'org.jabref.testutils.category.FetcherTest' + } +} + +task guiTest(type: Test) { + useJUnit { + includeCategories 'org.jabref.testutils.category.GUITest' + } +} + +// Test result tasks +task copyTestResources(type: Copy) { + from "${projectDir}/src/test/resources" + into "${buildDir}/classes/test" +} +processTestResources.dependsOn copyTestResources + +tasks.withType(Test) { + reports.html.destination = file("${reporting.baseDir}/${name}") + + jacoco { + append = true + } +} + +task jacocoMerge(type: JacocoMerge) { + executionData file("$buildDir/jacoco/junitPlatformTest.exec"), file("$buildDir/jacoco/databaseTest.exec"), file("$buildDir/jacoco/fetcherTest.exec") + dependsOn junitPlatformTest, databaseTest, fetcherTest +} + +jacocoTestReport { + executionData jacocoMerge.destinationFile + dependsOn jacocoMerge + + reports { + xml.enabled = true // coveralls plugin depends on xml format report + html.enabled = true + } +} + +afterEvaluate { + def junitPlatformTest = tasks.junitPlatformTest + + jacoco { + toolVersion = '0.8.0' + applyTo(junitPlatformTest) + } + + task jacocoJunit5TestReport(type: JacocoReport) { + executionData jacocoMerge.destinationFile + dependsOn jacocoMerge + sourceSets sourceSets.main + sourceDirectories = files(sourceSets.main.allSource.srcDirs) + classDirectories = files(sourceSets.main.output) + + reports { + xml.enabled true + html.enabled true + } + } +} + +// Code quality tasks +checkstyle { + // do not use other packages for checkstyle, excluding gen(erated) sources + checkstyleMain.source = "src/main/java" + toolVersion = '8.5' +} + +checkstyleMain.shouldRunAfter test +checkstyleTest.shouldRunAfter test + +modernizer { + // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. + // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer + failOnViolations = false +} + +// Release tasks +shadowJar { + classifier 'fat' +} + +/* + * Changes project.version to VERSION--snapshot--DATE--GIT_HASH + */ +if (hasProperty('dev')) { + String command = "git log --pretty=format:%cd--%h -n 1 --date=short" + String commitInfo = "" + if (OperatingSystem.current().isWindows()) { + commitInfo = "cmd /c $command".execute().in.text + } else { + commitInfo = command.execute().in.text + } + + // determine branch + command = "git symbolic-ref -q --short HEAD" + String branchName = "" + if (OperatingSystem.current().isWindows()) { + branchName = "cmd /c $command".execute().in.text + } else { + branchName = command.execute().in.text + } + // A newline is returned. Remove it. (trim()) + // In the context of github, the branch name could be something like "pull/277" + // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" + // http://stackoverflow.com/a/15075907/873282 describes the used pattern. + branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") + + // hack string + // first the date (%cd), then the branch name, and finally the commit id (%h) + String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) + + project.version += "--snapshot--" + infoString +} + +install4j { + installDir = file(project.ext.install4jDir) +} + +// has to be defined AFTER 'dev' things to have the correct project.version +task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") { + projectFile = file('jabref.install4j') + release = project.version + winKeystorePassword = System.getenv('CERTIFICATE_PW') + macKeystorePassword = System.getenv('CERTIFICATE_PW') + variables = [ + versionFourDots: project.ext.threeDotVersion, + buildFileName : jar.archiveName, + version : project.version + ] + + doLast { + copy { + from "build/install4j" + into "build/releases" + } + } +} + + +task release(dependsOn: ["media", "releaseJar"]) { + group = 'JabRef - Release' + description 'Creates a release for all target platforms.' +} + +task releaseJar(dependsOn: "shadowJar") { + group = 'JabRef - Release' + description "Creates a Jar release." + doLast { + copy { + from("$buildDir/libs/JabRef-${project.version}-fat.jar") + into("$buildDir/releases") + rename { String fileName -> + fileName.replace('-fat', '') + } + } + // set executable with read permissions (first true) and for all (false) + file("$buildDir/releases/JabRef-${project.version}.jar").setExecutable(true, false) + } +} + +task snapJar(dependsOn: "releaseJar", type: Delete) { + delete fileTree(dir: "$buildDir/releases/", exclude: "JabRef-${project.version}.jar") +} + +jmh { + warmupIterations = 5 + iterations = 10 + fork = 2 +} diff --git a/org.jabref.gui/config/checkstyle/checkstyle.xml b/org.jabref.gui/config/checkstyle/checkstyle.xml new file mode 100644 index 00000000000..20cbcee3f60 --- /dev/null +++ b/org.jabref.gui/config/checkstyle/checkstyle.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.jabref.gui/config/checkstyle/suppressions.xml b/org.jabref.gui/config/checkstyle/suppressions.xml new file mode 100644 index 00000000000..7e853704d9d --- /dev/null +++ b/org.jabref.gui/config/checkstyle/suppressions.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/lib/AppleJavaExtensions.jar b/org.jabref.gui/lib/AppleJavaExtensions.jar similarity index 100% rename from lib/AppleJavaExtensions.jar rename to org.jabref.gui/lib/AppleJavaExtensions.jar diff --git a/lib/customjfx-1.0.0.jar b/org.jabref.gui/lib/customjfx-1.0.0.jar similarity index 100% rename from lib/customjfx-1.0.0.jar rename to org.jabref.gui/lib/customjfx-1.0.0.jar diff --git a/lib/spin.jar b/org.jabref.gui/lib/spin.jar similarity index 100% rename from lib/spin.jar rename to org.jabref.gui/lib/spin.jar diff --git a/org.jabref.gui/settings.gradle b/org.jabref.gui/settings.gradle new file mode 100644 index 00000000000..08cd0c3de41 --- /dev/null +++ b/org.jabref.gui/settings.gradle @@ -0,0 +1 @@ +include 'org.jabref.model' diff --git a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java b/org.jabref.gui/src/jmh/java/org/jabref/benchmarks/Benchmarks.java similarity index 100% rename from src/jmh/java/org/jabref/benchmarks/Benchmarks.java rename to org.jabref.gui/src/jmh/java/org/jabref/benchmarks/Benchmarks.java diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Article.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Article.java new file mode 100644 index 00000000000..baac900ab4e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Article.java @@ -0,0 +1,788 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="author" type="{http://bibtexml.sf.net/}authorType"/>
+ *         <element name="title" type="{http://bibtexml.sf.net/}titleType"/>
+ *         <element name="journal" type="{http://bibtexml.sf.net/}journalType"/>
+ *         <element name="year" type="{http://bibtexml.sf.net/}yearType"/>
+ *         <element name="volume" type="{http://bibtexml.sf.net/}volumeType" minOccurs="0"/>
+ *         <element name="number" type="{http://bibtexml.sf.net/}numberType" minOccurs="0"/>
+ *         <element name="pages" type="{http://bibtexml.sf.net/}pagesType" minOccurs="0"/>
+ *         <element name="month" type="{http://bibtexml.sf.net/}monthType" minOccurs="0"/>
+ *         <element name="note" type="{http://bibtexml.sf.net/}noteType" minOccurs="0"/>
+ *         <group ref="{http://bibtexml.sf.net/}common"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "journal", + "year", + "volume", + "number", + "pages", + "month", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "article") +public class Article { + + @XmlElement(required = true) + protected String author; + @XmlElement(required = true) + protected String title; + @XmlElement(required = true) + protected String journal; + @XmlElement(required = true) + protected XMLGregorianCalendar year; + protected String volume; + protected BigInteger number; + protected String pages; + protected String month; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the journal property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getJournal() { + return journal; + } + + /** + * Sets the value of the journal property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setJournal(String value) { + this.journal = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the volume property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVolume() { + return volume; + } + + /** + * Sets the value of the volume property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVolume(String value) { + this.volume = value; + } + + /** + * Gets the value of the number property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getNumber() { + return number; + } + + /** + * Sets the value of the number property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setNumber(BigInteger value) { + this.number = value; + } + + /** + * Gets the value of the pages property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPages() { + return pages; + } + + /** + * Sets the value of the pages property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPages(String value) { + this.pages = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Book.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Book.java new file mode 100644 index 00000000000..2da0884d644 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Book.java @@ -0,0 +1,872 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <element name="author" type="{http://bibtexml.sf.net/}authorType"/>
+ *           <element name="editor" type="{http://bibtexml.sf.net/}editorType"/>
+ *         </choice>
+ *         <element name="title" type="{http://bibtexml.sf.net/}titleType"/>
+ *         <element name="publisher" type="{http://bibtexml.sf.net/}publisherType"/>
+ *         <element name="year" type="{http://bibtexml.sf.net/}yearType"/>
+ *         <choice minOccurs="0">
+ *           <element name="volume" type="{http://bibtexml.sf.net/}volumeType" minOccurs="0"/>
+ *           <element name="number" type="{http://bibtexml.sf.net/}numberType" minOccurs="0"/>
+ *         </choice>
+ *         <element name="series" type="{http://bibtexml.sf.net/}seriesType" minOccurs="0"/>
+ *         <element name="address" type="{http://bibtexml.sf.net/}addressType" minOccurs="0"/>
+ *         <element name="edition" type="{http://bibtexml.sf.net/}editionType" minOccurs="0"/>
+ *         <element name="month" type="{http://bibtexml.sf.net/}monthType" minOccurs="0"/>
+ *         <element name="note" type="{http://bibtexml.sf.net/}noteType" minOccurs="0"/>
+ *         <group ref="{http://bibtexml.sf.net/}common"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "editor", + "title", + "publisher", + "year", + "volume", + "number", + "series", + "address", + "edition", + "month", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "book") +public class Book { + + protected String author; + protected String editor; + @XmlElement(required = true) + protected String title; + @XmlElement(required = true) + protected String publisher; + @XmlElement(required = true) + protected XMLGregorianCalendar year; + protected String volume; + protected BigInteger number; + protected String series; + protected String address; + protected String edition; + protected String month; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the editor property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEditor() { + return editor; + } + + /** + * Sets the value of the editor property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEditor(String value) { + this.editor = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the publisher property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPublisher() { + return publisher; + } + + /** + * Sets the value of the publisher property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPublisher(String value) { + this.publisher = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the volume property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVolume() { + return volume; + } + + /** + * Sets the value of the volume property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVolume(String value) { + this.volume = value; + } + + /** + * Gets the value of the number property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getNumber() { + return number; + } + + /** + * Sets the value of the number property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setNumber(BigInteger value) { + this.number = value; + } + + /** + * Gets the value of the series property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeries() { + return series; + } + + /** + * Sets the value of the series property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeries(String value) { + this.series = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the edition property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEdition() { + return edition; + } + + /** + * Sets the value of the edition property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEdition(String value) { + this.edition = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Booklet.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Booklet.java new file mode 100644 index 00000000000..798942fbf19 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Booklet.java @@ -0,0 +1,730 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="author" type="{http://bibtexml.sf.net/}authorType" minOccurs="0"/>
+ *         <element name="title" type="{http://bibtexml.sf.net/}titleType"/>
+ *         <element name="howpublished" type="{http://bibtexml.sf.net/}howpublishedType" minOccurs="0"/>
+ *         <element name="address" type="{http://bibtexml.sf.net/}addressType" minOccurs="0"/>
+ *         <element name="month" type="{http://bibtexml.sf.net/}monthType" minOccurs="0"/>
+ *         <element name="year" type="{http://bibtexml.sf.net/}yearType" minOccurs="0"/>
+ *         <element name="note" type="{http://bibtexml.sf.net/}noteType" minOccurs="0"/>
+ *         <group ref="{http://bibtexml.sf.net/}common"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "howpublished", + "address", + "month", + "year", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "booklet") +public class Booklet { + + protected String author; + @XmlElement(required = true) + protected String title; + protected String howpublished; + protected String address; + protected String month; + protected XMLGregorianCalendar year; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the howpublished property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHowpublished() { + return howpublished; + } + + /** + * Sets the value of the howpublished property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHowpublished(String value) { + this.howpublished = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Conference.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Conference.java new file mode 100644 index 00000000000..4502bff5316 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Conference.java @@ -0,0 +1,909 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{http://bibtexml.sf.net/}InProceedings"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "booktitle", + "year", + "editor", + "volume", + "number", + "series", + "pages", + "address", + "month", + "organization", + "publisher", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "conference") +public class Conference { + + @XmlElement(required = true) + protected String author; + @XmlElement(required = true) + protected String title; + @XmlElement(required = true) + protected String booktitle; + @XmlElement(required = true) + protected XMLGregorianCalendar year; + protected String editor; + protected String volume; + protected BigInteger number; + protected String series; + protected String pages; + protected String address; + protected String month; + protected String organization; + protected String publisher; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the booktitle property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBooktitle() { + return booktitle; + } + + /** + * Sets the value of the booktitle property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBooktitle(String value) { + this.booktitle = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the editor property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEditor() { + return editor; + } + + /** + * Sets the value of the editor property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEditor(String value) { + this.editor = value; + } + + /** + * Gets the value of the volume property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVolume() { + return volume; + } + + /** + * Sets the value of the volume property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVolume(String value) { + this.volume = value; + } + + /** + * Gets the value of the number property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getNumber() { + return number; + } + + /** + * Sets the value of the number property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setNumber(BigInteger value) { + this.number = value; + } + + /** + * Gets the value of the series property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeries() { + return series; + } + + /** + * Sets the value of the series property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeries(String value) { + this.series = value; + } + + /** + * Gets the value of the pages property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPages() { + return pages; + } + + /** + * Sets the value of the pages property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPages(String value) { + this.pages = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the organization property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOrganization() { + return organization; + } + + /** + * Sets the value of the organization property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOrganization(String value) { + this.organization = value; + } + + /** + * Gets the value of the publisher property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPublisher() { + return publisher; + } + + /** + * Sets the value of the publisher property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPublisher(String value) { + this.publisher = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Entry.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Entry.java new file mode 100644 index 00000000000..26f4e7128c5 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Entry.java @@ -0,0 +1,457 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <element ref="{http://bibtexml.sf.net/}article"/>
+ *           <element ref="{http://bibtexml.sf.net/}book"/>
+ *           <element ref="{http://bibtexml.sf.net/}booklet"/>
+ *           <element ref="{http://bibtexml.sf.net/}manual"/>
+ *           <element ref="{http://bibtexml.sf.net/}techreport"/>
+ *           <element ref="{http://bibtexml.sf.net/}mastersthesis"/>
+ *           <element ref="{http://bibtexml.sf.net/}phdthesis"/>
+ *           <element ref="{http://bibtexml.sf.net/}inbook"/>
+ *           <element ref="{http://bibtexml.sf.net/}incollection"/>
+ *           <element ref="{http://bibtexml.sf.net/}proceedings"/>
+ *           <element ref="{http://bibtexml.sf.net/}inproceedings"/>
+ *           <element ref="{http://bibtexml.sf.net/}conference"/>
+ *           <element ref="{http://bibtexml.sf.net/}unpublished"/>
+ *           <element ref="{http://bibtexml.sf.net/}misc"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "article", + "book", + "booklet", + "manual", + "techreport", + "mastersthesis", + "phdthesis", + "inbook", + "incollection", + "proceedings", + "inproceedings", + "conference", + "unpublished", + "misc" +}) +@XmlRootElement(name = "entry") +public class Entry { + + protected Article article; + protected Book book; + protected Booklet booklet; + protected Manual manual; + protected Techreport techreport; + protected Mastersthesis mastersthesis; + protected Phdthesis phdthesis; + protected Inbook inbook; + protected Incollection incollection; + protected Proceedings proceedings; + protected Inproceedings inproceedings; + protected Conference conference; + protected Unpublished unpublished; + protected Misc misc; + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Gets the value of the article property. + * + * @return + * possible object is + * {@link Article } + * + */ + public Article getArticle() { + return article; + } + + /** + * Sets the value of the article property. + * + * @param value + * allowed object is + * {@link Article } + * + */ + public void setArticle(Article value) { + this.article = value; + } + + /** + * Gets the value of the book property. + * + * @return + * possible object is + * {@link Book } + * + */ + public Book getBook() { + return book; + } + + /** + * Sets the value of the book property. + * + * @param value + * allowed object is + * {@link Book } + * + */ + public void setBook(Book value) { + this.book = value; + } + + /** + * Gets the value of the booklet property. + * + * @return + * possible object is + * {@link Booklet } + * + */ + public Booklet getBooklet() { + return booklet; + } + + /** + * Sets the value of the booklet property. + * + * @param value + * allowed object is + * {@link Booklet } + * + */ + public void setBooklet(Booklet value) { + this.booklet = value; + } + + /** + * Gets the value of the manual property. + * + * @return + * possible object is + * {@link Manual } + * + */ + public Manual getManual() { + return manual; + } + + /** + * Sets the value of the manual property. + * + * @param value + * allowed object is + * {@link Manual } + * + */ + public void setManual(Manual value) { + this.manual = value; + } + + /** + * Gets the value of the techreport property. + * + * @return + * possible object is + * {@link Techreport } + * + */ + public Techreport getTechreport() { + return techreport; + } + + /** + * Sets the value of the techreport property. + * + * @param value + * allowed object is + * {@link Techreport } + * + */ + public void setTechreport(Techreport value) { + this.techreport = value; + } + + /** + * Gets the value of the mastersthesis property. + * + * @return + * possible object is + * {@link Mastersthesis } + * + */ + public Mastersthesis getMastersthesis() { + return mastersthesis; + } + + /** + * Sets the value of the mastersthesis property. + * + * @param value + * allowed object is + * {@link Mastersthesis } + * + */ + public void setMastersthesis(Mastersthesis value) { + this.mastersthesis = value; + } + + /** + * Gets the value of the phdthesis property. + * + * @return + * possible object is + * {@link Phdthesis } + * + */ + public Phdthesis getPhdthesis() { + return phdthesis; + } + + /** + * Sets the value of the phdthesis property. + * + * @param value + * allowed object is + * {@link Phdthesis } + * + */ + public void setPhdthesis(Phdthesis value) { + this.phdthesis = value; + } + + /** + * Gets the value of the inbook property. + * + * @return + * possible object is + * {@link Inbook } + * + */ + public Inbook getInbook() { + return inbook; + } + + /** + * Sets the value of the inbook property. + * + * @param value + * allowed object is + * {@link Inbook } + * + */ + public void setInbook(Inbook value) { + this.inbook = value; + } + + /** + * Gets the value of the incollection property. + * + * @return + * possible object is + * {@link Incollection } + * + */ + public Incollection getIncollection() { + return incollection; + } + + /** + * Sets the value of the incollection property. + * + * @param value + * allowed object is + * {@link Incollection } + * + */ + public void setIncollection(Incollection value) { + this.incollection = value; + } + + /** + * Gets the value of the proceedings property. + * + * @return + * possible object is + * {@link Proceedings } + * + */ + public Proceedings getProceedings() { + return proceedings; + } + + /** + * Sets the value of the proceedings property. + * + * @param value + * allowed object is + * {@link Proceedings } + * + */ + public void setProceedings(Proceedings value) { + this.proceedings = value; + } + + /** + * Gets the value of the inproceedings property. + * + * @return + * possible object is + * {@link Inproceedings } + * + */ + public Inproceedings getInproceedings() { + return inproceedings; + } + + /** + * Sets the value of the inproceedings property. + * + * @param value + * allowed object is + * {@link Inproceedings } + * + */ + public void setInproceedings(Inproceedings value) { + this.inproceedings = value; + } + + /** + * Gets the value of the conference property. + * + * @return + * possible object is + * {@link Conference } + * + */ + public Conference getConference() { + return conference; + } + + /** + * Sets the value of the conference property. + * + * @param value + * allowed object is + * {@link Conference } + * + */ + public void setConference(Conference value) { + this.conference = value; + } + + /** + * Gets the value of the unpublished property. + * + * @return + * possible object is + * {@link Unpublished } + * + */ + public Unpublished getUnpublished() { + return unpublished; + } + + /** + * Sets the value of the unpublished property. + * + * @param value + * allowed object is + * {@link Unpublished } + * + */ + public void setUnpublished(Unpublished value) { + this.unpublished = value; + } + + /** + * Gets the value of the misc property. + * + * @return + * possible object is + * {@link Misc } + * + */ + public Misc getMisc() { + return misc; + } + + /** + * Sets the value of the misc property. + * + * @param value + * allowed object is + * {@link Misc } + * + */ + public void setMisc(Misc value) { + this.misc = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/File.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/File.java new file mode 100644 index 00000000000..9a1527186e2 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/File.java @@ -0,0 +1,76 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://bibtexml.sf.net/}entry" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "entry" +}) +@XmlRootElement(name = "file") +public class File { + + protected List entry; + + /** + * Gets the value of the entry property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the entry property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getEntry().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Entry } + * + * + */ + public List getEntry() { + if (entry == null) { + entry = new ArrayList(); + } + return this.entry; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Inbook.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Inbook.java new file mode 100644 index 00000000000..7aa9f1413d6 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Inbook.java @@ -0,0 +1,181 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <element name="author" type="{http://bibtexml.sf.net/}authorType"/>
+ *         </choice>
+ *         <element name="title" type="{http://bibtexml.sf.net/}titleType"/>
+ *         <choice>
+ *           <group ref="{http://bibtexml.sf.net/}inbookGroup1"/>
+ *           <element name="pages" type="{http://bibtexml.sf.net/}pagesType"/>
+ *         </choice>
+ *         <element name="publisher" type="{http://bibtexml.sf.net/}publisherType" minOccurs="0"/>
+ *         <element name="year" type="{http://bibtexml.sf.net/}yearType" minOccurs="0"/>
+ *         <choice minOccurs="0">
+ *           <element name="volume" type="{http://bibtexml.sf.net/}volumeType"/>
+ *           <element name="number" type="{http://bibtexml.sf.net/}numberType"/>
+ *         </choice>
+ *         <element name="series" type="{http://bibtexml.sf.net/}seriesType" minOccurs="0"/>
+ *         <element name="editor" type="{http://bibtexml.sf.net/}editorType"/>
+ *         <element name="type" type="{http://bibtexml.sf.net/}typeType" minOccurs="0"/>
+ *         <element name="address" type="{http://bibtexml.sf.net/}addressType" minOccurs="0"/>
+ *         <element name="edition" type="{http://bibtexml.sf.net/}editionType" minOccurs="0"/>
+ *         <element name="month" type="{http://bibtexml.sf.net/}monthType" minOccurs="0"/>
+ *         <element name="note" type="{http://bibtexml.sf.net/}noteType" minOccurs="0"/>
+ *         <group ref="{http://bibtexml.sf.net/}common"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "inbook") +public class Inbook { + + @XmlElementRefs({ + @XmlElementRef(name = "month", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "editor", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "url", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "pages", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "location", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "category", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "key", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "lccn", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "size", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "edition", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "abstract", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "volume", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "address", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "contents", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "chapter", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "series", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "note", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "title", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "annotate", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "isbn", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "copyright", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "publisher", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "keywords", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "author", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "crossref", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "price", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "language", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "year", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "affiliation", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "number", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "type", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "doi", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "issn", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false), + @XmlElementRef(name = "mrnumber", namespace = "http://bibtexml.sf.net/", type = JAXBElement.class, required = false) + }) + protected List> content; + + /** + * Gets the rest of the content model. + * + *

+ * You are getting this "catch-all" property because of the following reason: + * The field name "Pages" is used by two different parts of a schema. See: + * line 405 of file:/C:/git-repositories/jabref/jabref-multi-module-build/org.jabref.gui/src/main/resources/xjc/bibtexml/bibtexml.xsd + * line 446 of file:/C:/git-repositories/jabref/jabref-multi-module-build/org.jabref.gui/src/main/resources/xjc/bibtexml/bibtexml.xsd + *

+ * To get rid of this property, apply a property customization to one + * of both of the following declarations to change their names: + * Gets the value of the content property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the content property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getContent().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * + * + */ + public List> getContent() { + if (content == null) { + content = new ArrayList>(); + } + return this.content; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Incollection.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Incollection.java new file mode 100644 index 00000000000..0466a3263be --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Incollection.java @@ -0,0 +1,980 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="author" type="{http://bibtexml.sf.net/}authorType"/>
+ *         <element name="title" type="{http://bibtexml.sf.net/}titleType"/>
+ *         <element name="booktitle" type="{http://bibtexml.sf.net/}booktitleType"/>
+ *         <element name="publisher" type="{http://bibtexml.sf.net/}publisherType"/>
+ *         <element name="year" type="{http://bibtexml.sf.net/}yearType"/>
+ *         <element name="editor" type="{http://bibtexml.sf.net/}editorType" minOccurs="0"/>
+ *         <choice minOccurs="0">
+ *           <element name="volume" type="{http://bibtexml.sf.net/}volumeType"/>
+ *           <element name="number" type="{http://bibtexml.sf.net/}numberType"/>
+ *         </choice>
+ *         <element name="series" type="{http://bibtexml.sf.net/}seriesType" minOccurs="0"/>
+ *         <element name="type" type="{http://bibtexml.sf.net/}typeType" minOccurs="0"/>
+ *         <element name="chapter" type="{http://bibtexml.sf.net/}chapterType" minOccurs="0"/>
+ *         <element name="pages" type="{http://bibtexml.sf.net/}pagesType" minOccurs="0"/>
+ *         <element name="address" type="{http://bibtexml.sf.net/}addressType" minOccurs="0"/>
+ *         <element name="edition" type="{http://bibtexml.sf.net/}editionType" minOccurs="0"/>
+ *         <element name="month" type="{http://bibtexml.sf.net/}monthType" minOccurs="0"/>
+ *         <element name="note" type="{http://bibtexml.sf.net/}noteType" minOccurs="0"/>
+ *         <group ref="{http://bibtexml.sf.net/}common"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "booktitle", + "publisher", + "year", + "editor", + "volume", + "number", + "series", + "type", + "chapter", + "pages", + "address", + "edition", + "month", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "incollection") +public class Incollection { + + @XmlElement(required = true) + protected String author; + @XmlElement(required = true) + protected String title; + @XmlElement(required = true) + protected String booktitle; + @XmlElement(required = true) + protected String publisher; + @XmlElement(required = true) + protected XMLGregorianCalendar year; + protected String editor; + protected String volume; + protected BigInteger number; + protected String series; + protected String type; + protected BigInteger chapter; + protected String pages; + protected String address; + protected String edition; + protected String month; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the booktitle property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBooktitle() { + return booktitle; + } + + /** + * Sets the value of the booktitle property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBooktitle(String value) { + this.booktitle = value; + } + + /** + * Gets the value of the publisher property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPublisher() { + return publisher; + } + + /** + * Sets the value of the publisher property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPublisher(String value) { + this.publisher = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the editor property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEditor() { + return editor; + } + + /** + * Sets the value of the editor property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEditor(String value) { + this.editor = value; + } + + /** + * Gets the value of the volume property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVolume() { + return volume; + } + + /** + * Sets the value of the volume property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVolume(String value) { + this.volume = value; + } + + /** + * Gets the value of the number property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getNumber() { + return number; + } + + /** + * Sets the value of the number property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setNumber(BigInteger value) { + this.number = value; + } + + /** + * Gets the value of the series property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeries() { + return series; + } + + /** + * Sets the value of the series property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeries(String value) { + this.series = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the chapter property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getChapter() { + return chapter; + } + + /** + * Sets the value of the chapter property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setChapter(BigInteger value) { + this.chapter = value; + } + + /** + * Gets the value of the pages property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPages() { + return pages; + } + + /** + * Sets the value of the pages property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPages(String value) { + this.pages = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the edition property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEdition() { + return edition; + } + + /** + * Sets the value of the edition property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEdition(String value) { + this.edition = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Inproceedings.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Inproceedings.java new file mode 100644 index 00000000000..83ee2f1d784 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Inproceedings.java @@ -0,0 +1,909 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{http://bibtexml.sf.net/}InProceedings"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "booktitle", + "year", + "editor", + "volume", + "number", + "series", + "pages", + "address", + "month", + "organization", + "publisher", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "inproceedings") +public class Inproceedings { + + @XmlElement(required = true) + protected String author; + @XmlElement(required = true) + protected String title; + @XmlElement(required = true) + protected String booktitle; + @XmlElement(required = true) + protected XMLGregorianCalendar year; + protected String editor; + protected String volume; + protected BigInteger number; + protected String series; + protected String pages; + protected String address; + protected String month; + protected String organization; + protected String publisher; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the booktitle property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBooktitle() { + return booktitle; + } + + /** + * Sets the value of the booktitle property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBooktitle(String value) { + this.booktitle = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the editor property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEditor() { + return editor; + } + + /** + * Sets the value of the editor property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEditor(String value) { + this.editor = value; + } + + /** + * Gets the value of the volume property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVolume() { + return volume; + } + + /** + * Sets the value of the volume property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVolume(String value) { + this.volume = value; + } + + /** + * Gets the value of the number property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getNumber() { + return number; + } + + /** + * Sets the value of the number property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setNumber(BigInteger value) { + this.number = value; + } + + /** + * Gets the value of the series property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeries() { + return series; + } + + /** + * Sets the value of the series property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeries(String value) { + this.series = value; + } + + /** + * Gets the value of the pages property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPages() { + return pages; + } + + /** + * Sets the value of the pages property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPages(String value) { + this.pages = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the organization property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOrganization() { + return organization; + } + + /** + * Sets the value of the organization property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOrganization(String value) { + this.organization = value; + } + + /** + * Gets the value of the publisher property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPublisher() { + return publisher; + } + + /** + * Sets the value of the publisher property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPublisher(String value) { + this.publisher = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Manual.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Manual.java new file mode 100644 index 00000000000..03b8bccf79c --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Manual.java @@ -0,0 +1,757 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="author" type="{http://bibtexml.sf.net/}authorType" minOccurs="0"/>
+ *         <element name="title" type="{http://bibtexml.sf.net/}titleType"/>
+ *         <element name="organization" type="{http://bibtexml.sf.net/}organizationType" minOccurs="0"/>
+ *         <element name="address" type="{http://bibtexml.sf.net/}addressType" minOccurs="0"/>
+ *         <element name="edition" type="{http://bibtexml.sf.net/}editionType" minOccurs="0"/>
+ *         <element name="month" type="{http://bibtexml.sf.net/}monthType" minOccurs="0"/>
+ *         <element name="year" type="{http://bibtexml.sf.net/}yearType" minOccurs="0"/>
+ *         <element name="note" type="{http://bibtexml.sf.net/}noteType" minOccurs="0"/>
+ *         <group ref="{http://bibtexml.sf.net/}common"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "organization", + "address", + "edition", + "month", + "year", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "manual") +public class Manual { + + protected String author; + @XmlElement(required = true) + protected String title; + protected String organization; + protected String address; + protected String edition; + protected String month; + protected XMLGregorianCalendar year; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the organization property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOrganization() { + return organization; + } + + /** + * Sets the value of the organization property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOrganization(String value) { + this.organization = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the edition property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEdition() { + return edition; + } + + /** + * Sets the value of the edition property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEdition(String value) { + this.edition = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Mastersthesis.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Mastersthesis.java new file mode 100644 index 00000000000..6fa9b8a5135 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Mastersthesis.java @@ -0,0 +1,752 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{http://bibtexml.sf.net/}PHDThesis"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "school", + "year", + "type", + "address", + "month", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "mastersthesis") +public class Mastersthesis { + + @XmlElement(required = true) + protected String author; + @XmlElement(required = true) + protected String title; + @XmlElement(required = true) + protected String school; + @XmlElement(required = true) + protected XMLGregorianCalendar year; + protected String type; + protected String address; + protected String month; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the school property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSchool() { + return school; + } + + /** + * Sets the value of the school property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSchool(String value) { + this.school = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Misc.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Misc.java new file mode 100644 index 00000000000..6373708e72d --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Misc.java @@ -0,0 +1,702 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="author" type="{http://bibtexml.sf.net/}authorType" minOccurs="0"/>
+ *         <element name="title" type="{http://bibtexml.sf.net/}titleType" minOccurs="0"/>
+ *         <element name="howpublished" type="{http://bibtexml.sf.net/}howpublishedType" minOccurs="0"/>
+ *         <element name="month" type="{http://bibtexml.sf.net/}monthType" minOccurs="0"/>
+ *         <element name="year" type="{http://bibtexml.sf.net/}yearType" minOccurs="0"/>
+ *         <element name="note" type="{http://bibtexml.sf.net/}noteType" minOccurs="0"/>
+ *         <group ref="{http://bibtexml.sf.net/}common"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "howpublished", + "month", + "year", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "misc") +public class Misc { + + protected String author; + protected String title; + protected String howpublished; + protected String month; + protected XMLGregorianCalendar year; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the howpublished property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHowpublished() { + return howpublished; + } + + /** + * Sets the value of the howpublished property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHowpublished(String value) { + this.howpublished = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/MonthTypeString.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/MonthTypeString.java new file mode 100644 index 00000000000..fcb62763e77 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/MonthTypeString.java @@ -0,0 +1,88 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for monthTypeString. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ * 

+ * <simpleType name="monthTypeString">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="Jan"/>
+ *     <enumeration value="Feb"/>
+ *     <enumeration value="Mar"/>
+ *     <enumeration value="Apr"/>
+ *     <enumeration value="May"/>
+ *     <enumeration value="Jun"/>
+ *     <enumeration value="Jul"/>
+ *     <enumeration value="Aug"/>
+ *     <enumeration value="Sep"/>
+ *     <enumeration value="Oct"/>
+ *     <enumeration value="Nov"/>
+ *     <enumeration value="Dec"/>
+ *   </restriction>
+ * </simpleType>
+ *
+ * + */ +@XmlType(name = "monthTypeString") +@XmlEnum +public enum MonthTypeString { + + @XmlEnumValue("Jan") + JAN("Jan"), + @XmlEnumValue("Feb") + FEB("Feb"), + @XmlEnumValue("Mar") + MAR("Mar"), + @XmlEnumValue("Apr") + APR("Apr"), + @XmlEnumValue("May") + MAY("May"), + @XmlEnumValue("Jun") + JUN("Jun"), + @XmlEnumValue("Jul") + JUL("Jul"), + @XmlEnumValue("Aug") + AUG("Aug"), + @XmlEnumValue("Sep") + SEP("Sep"), + @XmlEnumValue("Oct") + OCT("Oct"), + @XmlEnumValue("Nov") + NOV("Nov"), + @XmlEnumValue("Dec") + DEC("Dec"); + private final String value; + + MonthTypeString(String v) { + value = v; + } + + public String value() { + return value; + } + + public static MonthTypeString fromValue(String v) { + for (MonthTypeString c: MonthTypeString.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/ObjectFactory.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/ObjectFactory.java new file mode 100644 index 00000000000..4f793205c90 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/ObjectFactory.java @@ -0,0 +1,512 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import java.math.BigInteger; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jabref.logic.importer.fileformat.bibtexml package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _InbookCrossref_QNAME = new QName("http://bibtexml.sf.net/", "crossref"); + private final static QName _InbookKey_QNAME = new QName("http://bibtexml.sf.net/", "key"); + private final static QName _InbookLccn_QNAME = new QName("http://bibtexml.sf.net/", "lccn"); + private final static QName _InbookNumber_QNAME = new QName("http://bibtexml.sf.net/", "number"); + private final static QName _InbookMrnumber_QNAME = new QName("http://bibtexml.sf.net/", "mrnumber"); + private final static QName _InbookPages_QNAME = new QName("http://bibtexml.sf.net/", "pages"); + private final static QName _InbookAffiliation_QNAME = new QName("http://bibtexml.sf.net/", "affiliation"); + private final static QName _InbookPrice_QNAME = new QName("http://bibtexml.sf.net/", "price"); + private final static QName _InbookEdition_QNAME = new QName("http://bibtexml.sf.net/", "edition"); + private final static QName _InbookAnnotate_QNAME = new QName("http://bibtexml.sf.net/", "annotate"); + private final static QName _InbookLanguage_QNAME = new QName("http://bibtexml.sf.net/", "language"); + private final static QName _InbookTitle_QNAME = new QName("http://bibtexml.sf.net/", "title"); + private final static QName _InbookType_QNAME = new QName("http://bibtexml.sf.net/", "type"); + private final static QName _InbookChapter_QNAME = new QName("http://bibtexml.sf.net/", "chapter"); + private final static QName _InbookNote_QNAME = new QName("http://bibtexml.sf.net/", "note"); + private final static QName _InbookCopyright_QNAME = new QName("http://bibtexml.sf.net/", "copyright"); + private final static QName _InbookKeywords_QNAME = new QName("http://bibtexml.sf.net/", "keywords"); + private final static QName _InbookYear_QNAME = new QName("http://bibtexml.sf.net/", "year"); + private final static QName _InbookIsbn_QNAME = new QName("http://bibtexml.sf.net/", "isbn"); + private final static QName _InbookPublisher_QNAME = new QName("http://bibtexml.sf.net/", "publisher"); + private final static QName _InbookLocation_QNAME = new QName("http://bibtexml.sf.net/", "location"); + private final static QName _InbookCategory_QNAME = new QName("http://bibtexml.sf.net/", "category"); + private final static QName _InbookDoi_QNAME = new QName("http://bibtexml.sf.net/", "doi"); + private final static QName _InbookVolume_QNAME = new QName("http://bibtexml.sf.net/", "volume"); + private final static QName _InbookMonth_QNAME = new QName("http://bibtexml.sf.net/", "month"); + private final static QName _InbookIssn_QNAME = new QName("http://bibtexml.sf.net/", "issn"); + private final static QName _InbookSize_QNAME = new QName("http://bibtexml.sf.net/", "size"); + private final static QName _InbookContents_QNAME = new QName("http://bibtexml.sf.net/", "contents"); + private final static QName _InbookSeries_QNAME = new QName("http://bibtexml.sf.net/", "series"); + private final static QName _InbookAbstract_QNAME = new QName("http://bibtexml.sf.net/", "abstract"); + private final static QName _InbookUrl_QNAME = new QName("http://bibtexml.sf.net/", "url"); + private final static QName _InbookEditor_QNAME = new QName("http://bibtexml.sf.net/", "editor"); + private final static QName _InbookAddress_QNAME = new QName("http://bibtexml.sf.net/", "address"); + private final static QName _InbookAuthor_QNAME = new QName("http://bibtexml.sf.net/", "author"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jabref.logic.importer.fileformat.bibtexml + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link Conference } + * + */ + public Conference createConference() { + return new Conference(); + } + + /** + * Create an instance of {@link Techreport } + * + */ + public Techreport createTechreport() { + return new Techreport(); + } + + /** + * Create an instance of {@link Book } + * + */ + public Book createBook() { + return new Book(); + } + + /** + * Create an instance of {@link Inbook } + * + */ + public Inbook createInbook() { + return new Inbook(); + } + + /** + * Create an instance of {@link Booklet } + * + */ + public Booklet createBooklet() { + return new Booklet(); + } + + /** + * Create an instance of {@link Manual } + * + */ + public Manual createManual() { + return new Manual(); + } + + /** + * Create an instance of {@link Unpublished } + * + */ + public Unpublished createUnpublished() { + return new Unpublished(); + } + + /** + * Create an instance of {@link Inproceedings } + * + */ + public Inproceedings createInproceedings() { + return new Inproceedings(); + } + + /** + * Create an instance of {@link Phdthesis } + * + */ + public Phdthesis createPhdthesis() { + return new Phdthesis(); + } + + /** + * Create an instance of {@link Article } + * + */ + public Article createArticle() { + return new Article(); + } + + /** + * Create an instance of {@link Entry } + * + */ + public Entry createEntry() { + return new Entry(); + } + + /** + * Create an instance of {@link Mastersthesis } + * + */ + public Mastersthesis createMastersthesis() { + return new Mastersthesis(); + } + + /** + * Create an instance of {@link Incollection } + * + */ + public Incollection createIncollection() { + return new Incollection(); + } + + /** + * Create an instance of {@link Proceedings } + * + */ + public Proceedings createProceedings() { + return new Proceedings(); + } + + /** + * Create an instance of {@link Misc } + * + */ + public Misc createMisc() { + return new Misc(); + } + + /** + * Create an instance of {@link File } + * + */ + public File createFile() { + return new File(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "crossref", scope = Inbook.class) + public JAXBElement createInbookCrossref(String value) { + return new JAXBElement(_InbookCrossref_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "key", scope = Inbook.class) + public JAXBElement createInbookKey(String value) { + return new JAXBElement(_InbookKey_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "lccn", scope = Inbook.class) + public JAXBElement createInbookLccn(String value) { + return new JAXBElement(_InbookLccn_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "number", scope = Inbook.class) + public JAXBElement createInbookNumber(BigInteger value) { + return new JAXBElement(_InbookNumber_QNAME, BigInteger.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "mrnumber", scope = Inbook.class) + public JAXBElement createInbookMrnumber(String value) { + return new JAXBElement(_InbookMrnumber_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "pages", scope = Inbook.class) + public JAXBElement createInbookPages(String value) { + return new JAXBElement(_InbookPages_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "affiliation", scope = Inbook.class) + public JAXBElement createInbookAffiliation(String value) { + return new JAXBElement(_InbookAffiliation_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "price", scope = Inbook.class) + public JAXBElement createInbookPrice(String value) { + return new JAXBElement(_InbookPrice_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "edition", scope = Inbook.class) + public JAXBElement createInbookEdition(String value) { + return new JAXBElement(_InbookEdition_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "annotate", scope = Inbook.class) + public JAXBElement createInbookAnnotate(String value) { + return new JAXBElement(_InbookAnnotate_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "language", scope = Inbook.class) + public JAXBElement createInbookLanguage(String value) { + return new JAXBElement(_InbookLanguage_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "title", scope = Inbook.class) + public JAXBElement createInbookTitle(String value) { + return new JAXBElement(_InbookTitle_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "type", scope = Inbook.class) + public JAXBElement createInbookType(String value) { + return new JAXBElement(_InbookType_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "chapter", scope = Inbook.class) + public JAXBElement createInbookChapter(BigInteger value) { + return new JAXBElement(_InbookChapter_QNAME, BigInteger.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "note", scope = Inbook.class) + public JAXBElement createInbookNote(String value) { + return new JAXBElement(_InbookNote_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "copyright", scope = Inbook.class) + public JAXBElement createInbookCopyright(String value) { + return new JAXBElement(_InbookCopyright_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "keywords", scope = Inbook.class) + public JAXBElement createInbookKeywords(String value) { + return new JAXBElement(_InbookKeywords_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "year", scope = Inbook.class) + public JAXBElement createInbookYear(XMLGregorianCalendar value) { + return new JAXBElement(_InbookYear_QNAME, XMLGregorianCalendar.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "isbn", scope = Inbook.class) + public JAXBElement createInbookIsbn(String value) { + return new JAXBElement(_InbookIsbn_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "publisher", scope = Inbook.class) + public JAXBElement createInbookPublisher(String value) { + return new JAXBElement(_InbookPublisher_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "location", scope = Inbook.class) + public JAXBElement createInbookLocation(String value) { + return new JAXBElement(_InbookLocation_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "category", scope = Inbook.class) + public JAXBElement createInbookCategory(String value) { + return new JAXBElement(_InbookCategory_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "doi", scope = Inbook.class) + public JAXBElement createInbookDoi(String value) { + return new JAXBElement(_InbookDoi_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "volume", scope = Inbook.class) + public JAXBElement createInbookVolume(String value) { + return new JAXBElement(_InbookVolume_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "month", scope = Inbook.class) + public JAXBElement createInbookMonth(String value) { + return new JAXBElement(_InbookMonth_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "issn", scope = Inbook.class) + public JAXBElement createInbookIssn(String value) { + return new JAXBElement(_InbookIssn_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "size", scope = Inbook.class) + public JAXBElement createInbookSize(String value) { + return new JAXBElement(_InbookSize_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "contents", scope = Inbook.class) + public JAXBElement createInbookContents(String value) { + return new JAXBElement(_InbookContents_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "series", scope = Inbook.class) + public JAXBElement createInbookSeries(String value) { + return new JAXBElement(_InbookSeries_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "abstract", scope = Inbook.class) + public JAXBElement createInbookAbstract(String value) { + return new JAXBElement(_InbookAbstract_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "url", scope = Inbook.class) + public JAXBElement createInbookUrl(String value) { + return new JAXBElement(_InbookUrl_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "editor", scope = Inbook.class) + public JAXBElement createInbookEditor(String value) { + return new JAXBElement(_InbookEditor_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "address", scope = Inbook.class) + public JAXBElement createInbookAddress(String value) { + return new JAXBElement(_InbookAddress_QNAME, String.class, Inbook.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://bibtexml.sf.net/", name = "author", scope = Inbook.class) + public JAXBElement createInbookAuthor(String value) { + return new JAXBElement(_InbookAuthor_QNAME, String.class, Inbook.class, value); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Phdthesis.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Phdthesis.java new file mode 100644 index 00000000000..0e899bca2e9 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Phdthesis.java @@ -0,0 +1,752 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{http://bibtexml.sf.net/}PHDThesis"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "school", + "year", + "type", + "address", + "month", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "phdthesis") +public class Phdthesis { + + @XmlElement(required = true) + protected String author; + @XmlElement(required = true) + protected String title; + @XmlElement(required = true) + protected String school; + @XmlElement(required = true) + protected XMLGregorianCalendar year; + protected String type; + protected String address; + protected String month; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the school property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSchool() { + return school; + } + + /** + * Sets the value of the school property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSchool(String value) { + this.school = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Proceedings.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Proceedings.java new file mode 100644 index 00000000000..48535470559 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Proceedings.java @@ -0,0 +1,842 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="editor" type="{http://bibtexml.sf.net/}editorType" minOccurs="0"/>
+ *         <element name="title" type="{http://bibtexml.sf.net/}titleType"/>
+ *         <element name="year" type="{http://bibtexml.sf.net/}yearType"/>
+ *         <choice minOccurs="0">
+ *           <element name="volume" type="{http://bibtexml.sf.net/}volumeType" minOccurs="0"/>
+ *           <element name="number" type="{http://bibtexml.sf.net/}numberType" minOccurs="0"/>
+ *         </choice>
+ *         <element name="series" type="{http://bibtexml.sf.net/}seriesType" minOccurs="0"/>
+ *         <element name="address" type="{http://bibtexml.sf.net/}addressType" minOccurs="0"/>
+ *         <element name="month" type="{http://bibtexml.sf.net/}monthType" minOccurs="0"/>
+ *         <element name="organization" type="{http://bibtexml.sf.net/}organizationType" minOccurs="0"/>
+ *         <element name="publisher" type="{http://bibtexml.sf.net/}publisherType" minOccurs="0"/>
+ *         <element name="note" type="{http://bibtexml.sf.net/}noteType" minOccurs="0"/>
+ *         <group ref="{http://bibtexml.sf.net/}common"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "editor", + "title", + "year", + "volume", + "number", + "series", + "address", + "month", + "organization", + "publisher", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "proceedings") +public class Proceedings { + + protected String editor; + @XmlElement(required = true) + protected String title; + @XmlElement(required = true) + protected XMLGregorianCalendar year; + protected String volume; + protected BigInteger number; + protected String series; + protected String address; + protected String month; + protected String organization; + protected String publisher; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the editor property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEditor() { + return editor; + } + + /** + * Sets the value of the editor property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEditor(String value) { + this.editor = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the volume property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVolume() { + return volume; + } + + /** + * Sets the value of the volume property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVolume(String value) { + this.volume = value; + } + + /** + * Gets the value of the number property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getNumber() { + return number; + } + + /** + * Sets the value of the number property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setNumber(BigInteger value) { + this.number = value; + } + + /** + * Gets the value of the series property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeries() { + return series; + } + + /** + * Sets the value of the series property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeries(String value) { + this.series = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the organization property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOrganization() { + return organization; + } + + /** + * Sets the value of the organization property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOrganization(String value) { + this.organization = value; + } + + /** + * Gets the value of the publisher property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPublisher() { + return publisher; + } + + /** + * Sets the value of the publisher property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPublisher(String value) { + this.publisher = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Techreport.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Techreport.java new file mode 100644 index 00000000000..aa29a6ac198 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Techreport.java @@ -0,0 +1,788 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="author" type="{http://bibtexml.sf.net/}authorType"/>
+ *         <element name="title" type="{http://bibtexml.sf.net/}titleType"/>
+ *         <element name="institution" type="{http://bibtexml.sf.net/}institutionType"/>
+ *         <element name="year" type="{http://bibtexml.sf.net/}yearType"/>
+ *         <element name="type" type="{http://bibtexml.sf.net/}typeType" minOccurs="0"/>
+ *         <element name="number" type="{http://bibtexml.sf.net/}numberType" minOccurs="0"/>
+ *         <element name="address" type="{http://bibtexml.sf.net/}addressType" minOccurs="0"/>
+ *         <element name="month" type="{http://bibtexml.sf.net/}monthType" minOccurs="0"/>
+ *         <element name="note" type="{http://bibtexml.sf.net/}noteType" minOccurs="0"/>
+ *         <group ref="{http://bibtexml.sf.net/}common"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "institution", + "year", + "type", + "number", + "address", + "month", + "note", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "techreport") +public class Techreport { + + @XmlElement(required = true) + protected String author; + @XmlElement(required = true) + protected String title; + @XmlElement(required = true) + protected String institution; + @XmlElement(required = true) + protected XMLGregorianCalendar year; + protected String type; + protected BigInteger number; + protected String address; + protected String month; + protected String note; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the institution property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getInstitution() { + return institution; + } + + /** + * Sets the value of the institution property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setInstitution(String value) { + this.institution = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the number property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getNumber() { + return number; + } + + /** + * Sets the value of the number property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setNumber(BigInteger value) { + this.number = value; + } + + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAddress() { + return address; + } + + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAddress(String value) { + this.address = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Unpublished.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Unpublished.java new file mode 100644 index 00000000000..ca679d11d42 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/Unpublished.java @@ -0,0 +1,678 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + + +package org.jabref.logic.importer.fileformat.bibtexml; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="author" type="{http://bibtexml.sf.net/}authorType"/>
+ *         <element name="title" type="{http://bibtexml.sf.net/}titleType"/>
+ *         <element name="note" type="{http://bibtexml.sf.net/}noteType"/>
+ *         <element name="month" type="{http://bibtexml.sf.net/}monthType" minOccurs="0"/>
+ *         <element name="year" type="{http://bibtexml.sf.net/}yearType" minOccurs="0"/>
+ *         <group ref="{http://bibtexml.sf.net/}common"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author", + "title", + "note", + "month", + "year", + "key", + "annotate", + "crossref", + "_abstract", + "affiliation", + "contents", + "copyright", + "doi", + "isbn", + "issn", + "keywords", + "language", + "lccn", + "location", + "mrnumber", + "price", + "size", + "url", + "category" +}) +@XmlRootElement(name = "unpublished") +public class Unpublished { + + @XmlElement(required = true) + protected String author; + @XmlElement(required = true) + protected String title; + @XmlElement(required = true) + protected String note; + protected String month; + protected XMLGregorianCalendar year; + protected String key; + protected String annotate; + protected String crossref; + @XmlElement(name = "abstract") + protected String _abstract; + protected String affiliation; + protected String contents; + protected String copyright; + protected String doi; + protected String isbn; + protected String issn; + protected String keywords; + protected String language; + protected String lccn; + protected String location; + protected String mrnumber; + protected String price; + protected String size; + protected String url; + protected String category; + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setYear(XMLGregorianCalendar value) { + this.year = value; + } + + /** + * Gets the value of the key property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKey() { + return key; + } + + /** + * Sets the value of the key property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKey(String value) { + this.key = value; + } + + /** + * Gets the value of the annotate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnnotate() { + return annotate; + } + + /** + * Sets the value of the annotate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnnotate(String value) { + this.annotate = value; + } + + /** + * Gets the value of the crossref property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCrossref() { + return crossref; + } + + /** + * Sets the value of the crossref property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCrossref(String value) { + this.crossref = value; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAbstract(String value) { + this._abstract = value; + } + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAffiliation(String value) { + this.affiliation = value; + } + + /** + * Gets the value of the contents property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContents() { + return contents; + } + + /** + * Sets the value of the contents property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContents(String value) { + this.contents = value; + } + + /** + * Gets the value of the copyright property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyright() { + return copyright; + } + + /** + * Sets the value of the copyright property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyright(String value) { + this.copyright = value; + } + + /** + * Gets the value of the doi property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDoi() { + return doi; + } + + /** + * Sets the value of the doi property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDoi(String value) { + this.doi = value; + } + + /** + * Gets the value of the isbn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsbn() { + return isbn; + } + + /** + * Sets the value of the isbn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsbn(String value) { + this.isbn = value; + } + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssn() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssn(String value) { + this.issn = value; + } + + /** + * Gets the value of the keywords property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeywords() { + return keywords; + } + + /** + * Sets the value of the keywords property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeywords(String value) { + this.keywords = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + + /** + * Gets the value of the lccn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLccn() { + return lccn; + } + + /** + * Sets the value of the lccn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLccn(String value) { + this.lccn = value; + } + + /** + * Gets the value of the location property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLocation() { + return location; + } + + /** + * Sets the value of the location property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLocation(String value) { + this.location = value; + } + + /** + * Gets the value of the mrnumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMrnumber() { + return mrnumber; + } + + /** + * Sets the value of the mrnumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMrnumber(String value) { + this.mrnumber = value; + } + + /** + * Gets the value of the price property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrice(String value) { + this.price = value; + } + + /** + * Gets the value of the size property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSize(String value) { + this.size = value; + } + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCategory(String value) { + this.category = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/package-info.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/package-info.java new file mode 100644 index 00000000000..f7eab28768f --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/bibtexml/package-info.java @@ -0,0 +1,9 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:32 PM CET +// + +@javax.xml.bind.annotation.XmlSchema(namespace = "http://bibtexml.sf.net/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.jabref.logic.importer.fileformat.bibtexml; diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Abstract.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Abstract.java new file mode 100644 index 00000000000..d66def1e8bd --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Abstract.java @@ -0,0 +1,106 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}AbstractText" maxOccurs="unbounded"/>
+ *         <element ref="{}CopyrightInformation" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "abstractText", + "copyrightInformation" +}) +@XmlRootElement(name = "Abstract") +public class Abstract { + + @XmlElement(name = "AbstractText", required = true) + protected List abstractText; + @XmlElement(name = "CopyrightInformation") + protected String copyrightInformation; + + /** + * Gets the value of the abstractText property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the abstractText property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAbstractText().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AbstractText } + * + * + */ + public List getAbstractText() { + if (abstractText == null) { + abstractText = new ArrayList(); + } + return this.abstractText; + } + + /** + * Gets the value of the copyrightInformation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyrightInformation() { + return copyrightInformation; + } + + /** + * Sets the value of the copyrightInformation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyrightInformation(String value) { + this.copyrightInformation = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AbstractText.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AbstractText.java new file mode 100644 index 00000000000..24c41bcf0cd --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AbstractText.java @@ -0,0 +1,100 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{}text">
+ *       <attGroup ref="{}attlist.AbstractText"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "AbstractText") +public class AbstractText + extends Text +{ + + @XmlAttribute(name = "Label") + @XmlSchemaType(name = "anySimpleType") + protected String label; + @XmlAttribute(name = "NlmCategory") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String nlmCategory; + + /** + * Gets the value of the label property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLabel() { + return label; + } + + /** + * Sets the value of the label property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLabel(String value) { + this.label = value; + } + + /** + * Gets the value of the nlmCategory property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNlmCategory() { + return nlmCategory; + } + + /** + * Sets the value of the nlmCategory property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNlmCategory(String value) { + this.nlmCategory = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AccessionNumberList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AccessionNumberList.java new file mode 100644 index 00000000000..6ee1caadb3f --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AccessionNumberList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}AccessionNumber" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "accessionNumber" +}) +@XmlRootElement(name = "AccessionNumberList") +public class AccessionNumberList { + + @XmlElement(name = "AccessionNumber", required = true) + protected List accessionNumber; + + /** + * Gets the value of the accessionNumber property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the accessionNumber property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAccessionNumber().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getAccessionNumber() { + if (accessionNumber == null) { + accessionNumber = new ArrayList(); + } + return this.accessionNumber; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AffiliationInfo.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AffiliationInfo.java new file mode 100644 index 00000000000..23d960f1240 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AffiliationInfo.java @@ -0,0 +1,106 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Affiliation"/>
+ *         <element ref="{}Identifier" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "affiliation", + "identifier" +}) +@XmlRootElement(name = "AffiliationInfo") +public class AffiliationInfo { + + @XmlElement(name = "Affiliation", required = true) + protected Text affiliation; + @XmlElement(name = "Identifier") + protected List identifier; + + /** + * Gets the value of the affiliation property. + * + * @return + * possible object is + * {@link Text } + * + */ + public Text getAffiliation() { + return affiliation; + } + + /** + * Sets the value of the affiliation property. + * + * @param value + * allowed object is + * {@link Text } + * + */ + public void setAffiliation(Text value) { + this.affiliation = value; + } + + /** + * Gets the value of the identifier property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the identifier property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getIdentifier().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Identifier } + * + * + */ + public List getIdentifier() { + if (identifier == null) { + identifier = new ArrayList(); + } + return this.identifier; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArtIdTypeInt.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArtIdTypeInt.java new file mode 100644 index 00000000000..6e58e3e2c1b --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArtIdTypeInt.java @@ -0,0 +1,67 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for art.id.type.int. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ * 

+ * <simpleType name="art.id.type.int">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *     <enumeration value="pubmed"/>
+ *     <enumeration value="medline"/>
+ *     <enumeration value="pmcid"/>
+ *     <enumeration value="pmcbook"/>
+ *     <enumeration value="bookaccession"/>
+ *   </restriction>
+ * </simpleType>
+ *
+ * + */ +@XmlType(name = "art.id.type.int") +@XmlEnum +public enum ArtIdTypeInt { + + @XmlEnumValue("pubmed") + PUBMED("pubmed"), + @XmlEnumValue("medline") + MEDLINE("medline"), + @XmlEnumValue("pmcid") + PMCID("pmcid"), + @XmlEnumValue("pmcbook") + PMCBOOK("pmcbook"), + @XmlEnumValue("bookaccession") + BOOKACCESSION("bookaccession"); + private final String value; + + ArtIdTypeInt(String v) { + value = v; + } + + public String value() { + return value; + } + + public static ArtIdTypeInt fromValue(String v) { + for (ArtIdTypeInt c: ArtIdTypeInt.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Article.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Article.java new file mode 100644 index 00000000000..45baaff17ab --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Article.java @@ -0,0 +1,161 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Journal"/>
+ *         <element ref="{}ArticleTitle"/>
+ *         <choice>
+ *           <sequence>
+ *             <element ref="{}Pagination"/>
+ *             <element ref="{}ELocationID" maxOccurs="unbounded" minOccurs="0"/>
+ *           </sequence>
+ *           <element ref="{}ELocationID" maxOccurs="unbounded"/>
+ *         </choice>
+ *         <element ref="{}Abstract" minOccurs="0"/>
+ *         <element ref="{}AuthorList" minOccurs="0"/>
+ *         <element ref="{}Language" maxOccurs="unbounded"/>
+ *         <element ref="{}DataBankList" minOccurs="0"/>
+ *         <element ref="{}GrantList" minOccurs="0"/>
+ *         <element ref="{}PublicationTypeList"/>
+ *         <element ref="{}VernacularTitle" minOccurs="0"/>
+ *         <element ref="{}ArticleDate" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.Article"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "Article") +public class Article { + + @XmlElementRefs({ + @XmlElementRef(name = "Journal", type = Journal.class, required = false), + @XmlElementRef(name = "VernacularTitle", type = JAXBElement.class, required = false), + @XmlElementRef(name = "ArticleTitle", type = ArticleTitle.class, required = false), + @XmlElementRef(name = "Abstract", type = Abstract.class, required = false), + @XmlElementRef(name = "DataBankList", type = DataBankList.class, required = false), + @XmlElementRef(name = "PublicationTypeList", type = PublicationTypeList.class, required = false), + @XmlElementRef(name = "ELocationID", type = ELocationID.class, required = false), + @XmlElementRef(name = "ArticleDate", type = ArticleDate.class, required = false), + @XmlElementRef(name = "GrantList", type = GrantList.class, required = false), + @XmlElementRef(name = "AuthorList", type = AuthorList.class, required = false), + @XmlElementRef(name = "Language", type = JAXBElement.class, required = false), + @XmlElementRef(name = "Pagination", type = Pagination.class, required = false) + }) + protected List content; + @XmlAttribute(name = "PubModel", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String pubModel; + + /** + * Gets the rest of the content model. + * + *

+ * You are getting this "catch-all" property because of the following reason: + * The field name "ELocationID" is used by two different parts of a schema. See: + * line 185 of file:/C:/git-repositories/jabref/jabref-multi-module-build/org.jabref.gui/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd + * line 183 of file:/C:/git-repositories/jabref/jabref-multi-module-build/org.jabref.gui/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd + *

+ * To get rid of this property, apply a property customization to one + * of both of the following declarations to change their names: + * Gets the value of the content property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the content property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getContent().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Journal } + * {@link JAXBElement }{@code <}{@link Text }{@code >} + * {@link ArticleTitle } + * {@link Abstract } + * {@link DataBankList } + * {@link PublicationTypeList } + * {@link ELocationID } + * {@link ArticleDate } + * {@link GrantList } + * {@link AuthorList } + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link Pagination } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } + + /** + * Gets the value of the pubModel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPubModel() { + return pubModel; + } + + /** + * Sets the value of the pubModel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPubModel(String value) { + this.pubModel = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleDate.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleDate.java new file mode 100644 index 00000000000..58c1cbf020a --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleDate.java @@ -0,0 +1,159 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Year"/>
+ *         <element ref="{}Month"/>
+ *         <element ref="{}Day"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.ArticleDate"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "year", + "month", + "day" +}) +@XmlRootElement(name = "ArticleDate") +public class ArticleDate { + + @XmlElement(name = "Year", required = true) + protected String year; + @XmlElement(name = "Month", required = true) + protected String month; + @XmlElement(name = "Day", required = true) + protected String day; + @XmlAttribute(name = "DateType") + protected String dateType; + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setYear(String value) { + this.year = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the day property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDay() { + return day; + } + + /** + * Sets the value of the day property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDay(String value) { + this.day = value; + } + + /** + * Gets the value of the dateType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDateType() { + if (dateType == null) { + return "Electronic"; + } else { + return dateType; + } + } + + /** + * Sets the value of the dateType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDateType(String value) { + this.dateType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleId.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleId.java new file mode 100644 index 00000000000..4e631af6c01 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleId.java @@ -0,0 +1,100 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.ArticleId"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "ArticleId") +public class ArticleId { + + @XmlValue + protected String content; + @XmlAttribute(name = "IdType") + protected String idType; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the idType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIdType() { + if (idType == null) { + return "pubmed"; + } else { + return idType; + } + } + + /** + * Sets the value of the idType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIdType(String value) { + this.idType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleIdList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleIdList.java new file mode 100644 index 00000000000..319048fd860 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleIdList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}ArticleId" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "articleId" +}) +@XmlRootElement(name = "ArticleIdList") +public class ArticleIdList { + + @XmlElement(name = "ArticleId", required = true) + protected List articleId; + + /** + * Gets the value of the articleId property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the articleId property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getArticleId().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ArticleId } + * + * + */ + public List getArticleId() { + if (articleId == null) { + articleId = new ArrayList(); + } + return this.articleId; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleTitle.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleTitle.java new file mode 100644 index 00000000000..7fcb5e17004 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ArticleTitle.java @@ -0,0 +1,125 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{}text">
+ *       <attGroup ref="{}attlist.ArticleTitle"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "ArticleTitle") +public class ArticleTitle + extends Text +{ + + @XmlAttribute(name = "book") + @XmlSchemaType(name = "anySimpleType") + protected String book; + @XmlAttribute(name = "part") + @XmlSchemaType(name = "anySimpleType") + protected String part; + @XmlAttribute(name = "sec") + @XmlSchemaType(name = "anySimpleType") + protected String sec; + + /** + * Gets the value of the book property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBook() { + return book; + } + + /** + * Sets the value of the book property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBook(String value) { + this.book = value; + } + + /** + * Gets the value of the part property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPart() { + return part; + } + + /** + * Sets the value of the part property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPart(String value) { + this.part = value; + } + + /** + * Gets the value of the sec property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSec() { + return sec; + } + + /** + * Sets the value of the sec property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSec(String value) { + this.sec = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Author.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Author.java new file mode 100644 index 00000000000..5506e7073ea --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Author.java @@ -0,0 +1,290 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <sequence>
+ *             <element ref="{}LastName"/>
+ *             <element ref="{}ForeName" minOccurs="0"/>
+ *             <element ref="{}Initials" minOccurs="0"/>
+ *             <element ref="{}Suffix" minOccurs="0"/>
+ *           </sequence>
+ *           <element ref="{}CollectiveName"/>
+ *         </choice>
+ *         <element ref="{}Identifier" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}AffiliationInfo" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.Author"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "lastName", + "foreName", + "initials", + "suffix", + "collectiveName", + "identifier", + "affiliationInfo" +}) +@XmlRootElement(name = "Author") +public class Author { + + @XmlElement(name = "LastName") + protected String lastName; + @XmlElement(name = "ForeName") + protected String foreName; + @XmlElement(name = "Initials") + protected String initials; + @XmlElement(name = "Suffix") + protected Text suffix; + @XmlElement(name = "CollectiveName") + protected Text collectiveName; + @XmlElement(name = "Identifier") + protected List identifier; + @XmlElement(name = "AffiliationInfo") + protected List affiliationInfo; + @XmlAttribute(name = "ValidYN") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String validYN; + + /** + * Gets the value of the lastName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLastName() { + return lastName; + } + + /** + * Sets the value of the lastName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLastName(String value) { + this.lastName = value; + } + + /** + * Gets the value of the foreName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getForeName() { + return foreName; + } + + /** + * Sets the value of the foreName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setForeName(String value) { + this.foreName = value; + } + + /** + * Gets the value of the initials property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getInitials() { + return initials; + } + + /** + * Sets the value of the initials property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setInitials(String value) { + this.initials = value; + } + + /** + * Gets the value of the suffix property. + * + * @return + * possible object is + * {@link Text } + * + */ + public Text getSuffix() { + return suffix; + } + + /** + * Sets the value of the suffix property. + * + * @param value + * allowed object is + * {@link Text } + * + */ + public void setSuffix(Text value) { + this.suffix = value; + } + + /** + * Gets the value of the collectiveName property. + * + * @return + * possible object is + * {@link Text } + * + */ + public Text getCollectiveName() { + return collectiveName; + } + + /** + * Sets the value of the collectiveName property. + * + * @param value + * allowed object is + * {@link Text } + * + */ + public void setCollectiveName(Text value) { + this.collectiveName = value; + } + + /** + * Gets the value of the identifier property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the identifier property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getIdentifier().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Identifier } + * + * + */ + public List getIdentifier() { + if (identifier == null) { + identifier = new ArrayList(); + } + return this.identifier; + } + + /** + * Gets the value of the affiliationInfo property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the affiliationInfo property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAffiliationInfo().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AffiliationInfo } + * + * + */ + public List getAffiliationInfo() { + if (affiliationInfo == null) { + affiliationInfo = new ArrayList(); + } + return this.affiliationInfo; + } + + /** + * Gets the value of the validYN property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValidYN() { + if (validYN == null) { + return "Y"; + } else { + return validYN; + } + } + + /** + * Sets the value of the validYN property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValidYN(String value) { + this.validYN = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AuthorList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AuthorList.java new file mode 100644 index 00000000000..e0f5d0120b6 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/AuthorList.java @@ -0,0 +1,144 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Author" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.AuthorList"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "author" +}) +@XmlRootElement(name = "AuthorList") +public class AuthorList { + + @XmlElement(name = "Author", required = true) + protected List author; + @XmlAttribute(name = "CompleteYN") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String completeYN; + @XmlAttribute(name = "Type") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String type; + + /** + * Gets the value of the author property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the author property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAuthor().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Author } + * + * + */ + public List getAuthor() { + if (author == null) { + author = new ArrayList(); + } + return this.author; + } + + /** + * Gets the value of the completeYN property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCompleteYN() { + if (completeYN == null) { + return "Y"; + } else { + return completeYN; + } + } + + /** + * Sets the value of the completeYN property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCompleteYN(String value) { + this.completeYN = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "authors"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BeginningDate.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BeginningDate.java new file mode 100644 index 00000000000..aa438a25742 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BeginningDate.java @@ -0,0 +1,159 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Year"/>
+ *         <choice minOccurs="0">
+ *           <sequence>
+ *             <element ref="{}Month"/>
+ *             <element ref="{}Day" minOccurs="0"/>
+ *           </sequence>
+ *           <element ref="{}Season"/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "year", + "month", + "day", + "season" +}) +@XmlRootElement(name = "BeginningDate") +public class BeginningDate { + + @XmlElement(name = "Year", required = true) + protected String year; + @XmlElement(name = "Month") + protected String month; + @XmlElement(name = "Day") + protected String day; + @XmlElement(name = "Season") + protected String season; + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setYear(String value) { + this.year = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the day property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDay() { + return day; + } + + /** + * Sets the value of the day property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDay(String value) { + this.day = value; + } + + /** + * Gets the value of the season property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeason() { + return season; + } + + /** + * Sets the value of the season property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeason(String value) { + this.season = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Book.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Book.java new file mode 100644 index 00000000000..97fb158e450 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Book.java @@ -0,0 +1,452 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Publisher"/>
+ *         <element ref="{}BookTitle"/>
+ *         <element ref="{}PubDate"/>
+ *         <element ref="{}BeginningDate" minOccurs="0"/>
+ *         <element ref="{}EndingDate" minOccurs="0"/>
+ *         <element ref="{}AuthorList" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}Volume" minOccurs="0"/>
+ *         <element ref="{}VolumeTitle" minOccurs="0"/>
+ *         <element ref="{}Edition" minOccurs="0"/>
+ *         <element ref="{}CollectionTitle" minOccurs="0"/>
+ *         <element ref="{}Isbn" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}ELocationID" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}Medium" minOccurs="0"/>
+ *         <element ref="{}ReportNumber" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "publisher", + "bookTitle", + "pubDate", + "beginningDate", + "endingDate", + "authorList", + "volume", + "volumeTitle", + "edition", + "collectionTitle", + "isbn", + "eLocationID", + "medium", + "reportNumber" +}) +@XmlRootElement(name = "Book") +public class Book { + + @XmlElement(name = "Publisher", required = true) + protected Publisher publisher; + @XmlElement(name = "BookTitle", required = true) + protected BookTitle bookTitle; + @XmlElement(name = "PubDate", required = true) + protected PubDate pubDate; + @XmlElement(name = "BeginningDate") + protected BeginningDate beginningDate; + @XmlElement(name = "EndingDate") + protected EndingDate endingDate; + @XmlElement(name = "AuthorList") + protected List authorList; + @XmlElement(name = "Volume") + protected String volume; + @XmlElement(name = "VolumeTitle") + protected Text volumeTitle; + @XmlElement(name = "Edition") + protected String edition; + @XmlElement(name = "CollectionTitle") + protected CollectionTitle collectionTitle; + @XmlElement(name = "Isbn") + protected List isbn; + @XmlElement(name = "ELocationID") + protected List eLocationID; + @XmlElement(name = "Medium") + protected String medium; + @XmlElement(name = "ReportNumber") + protected String reportNumber; + + /** + * Gets the value of the publisher property. + * + * @return + * possible object is + * {@link Publisher } + * + */ + public Publisher getPublisher() { + return publisher; + } + + /** + * Sets the value of the publisher property. + * + * @param value + * allowed object is + * {@link Publisher } + * + */ + public void setPublisher(Publisher value) { + this.publisher = value; + } + + /** + * Gets the value of the bookTitle property. + * + * @return + * possible object is + * {@link BookTitle } + * + */ + public BookTitle getBookTitle() { + return bookTitle; + } + + /** + * Sets the value of the bookTitle property. + * + * @param value + * allowed object is + * {@link BookTitle } + * + */ + public void setBookTitle(BookTitle value) { + this.bookTitle = value; + } + + /** + * Gets the value of the pubDate property. + * + * @return + * possible object is + * {@link PubDate } + * + */ + public PubDate getPubDate() { + return pubDate; + } + + /** + * Sets the value of the pubDate property. + * + * @param value + * allowed object is + * {@link PubDate } + * + */ + public void setPubDate(PubDate value) { + this.pubDate = value; + } + + /** + * Gets the value of the beginningDate property. + * + * @return + * possible object is + * {@link BeginningDate } + * + */ + public BeginningDate getBeginningDate() { + return beginningDate; + } + + /** + * Sets the value of the beginningDate property. + * + * @param value + * allowed object is + * {@link BeginningDate } + * + */ + public void setBeginningDate(BeginningDate value) { + this.beginningDate = value; + } + + /** + * Gets the value of the endingDate property. + * + * @return + * possible object is + * {@link EndingDate } + * + */ + public EndingDate getEndingDate() { + return endingDate; + } + + /** + * Sets the value of the endingDate property. + * + * @param value + * allowed object is + * {@link EndingDate } + * + */ + public void setEndingDate(EndingDate value) { + this.endingDate = value; + } + + /** + * Gets the value of the authorList property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the authorList property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAuthorList().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AuthorList } + * + * + */ + public List getAuthorList() { + if (authorList == null) { + authorList = new ArrayList(); + } + return this.authorList; + } + + /** + * Gets the value of the volume property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVolume() { + return volume; + } + + /** + * Sets the value of the volume property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVolume(String value) { + this.volume = value; + } + + /** + * Gets the value of the volumeTitle property. + * + * @return + * possible object is + * {@link Text } + * + */ + public Text getVolumeTitle() { + return volumeTitle; + } + + /** + * Sets the value of the volumeTitle property. + * + * @param value + * allowed object is + * {@link Text } + * + */ + public void setVolumeTitle(Text value) { + this.volumeTitle = value; + } + + /** + * Gets the value of the edition property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEdition() { + return edition; + } + + /** + * Sets the value of the edition property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEdition(String value) { + this.edition = value; + } + + /** + * Gets the value of the collectionTitle property. + * + * @return + * possible object is + * {@link CollectionTitle } + * + */ + public CollectionTitle getCollectionTitle() { + return collectionTitle; + } + + /** + * Sets the value of the collectionTitle property. + * + * @param value + * allowed object is + * {@link CollectionTitle } + * + */ + public void setCollectionTitle(CollectionTitle value) { + this.collectionTitle = value; + } + + /** + * Gets the value of the isbn property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the isbn property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getIsbn().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getIsbn() { + if (isbn == null) { + isbn = new ArrayList(); + } + return this.isbn; + } + + /** + * Gets the value of the eLocationID property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the eLocationID property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getELocationID().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ELocationID } + * + * + */ + public List getELocationID() { + if (eLocationID == null) { + eLocationID = new ArrayList(); + } + return this.eLocationID; + } + + /** + * Gets the value of the medium property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMedium() { + return medium; + } + + /** + * Sets the value of the medium property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMedium(String value) { + this.medium = value; + } + + /** + * Gets the value of the reportNumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getReportNumber() { + return reportNumber; + } + + /** + * Sets the value of the reportNumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReportNumber(String value) { + this.reportNumber = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookDocument.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookDocument.java new file mode 100644 index 00000000000..c918b459ff4 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookDocument.java @@ -0,0 +1,579 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}PMID"/>
+ *         <element ref="{}ArticleIdList"/>
+ *         <element ref="{}Book"/>
+ *         <element ref="{}LocationLabel" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}ArticleTitle" minOccurs="0"/>
+ *         <element ref="{}VernacularTitle" minOccurs="0"/>
+ *         <element ref="{}Pagination" minOccurs="0"/>
+ *         <element ref="{}Language" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}AuthorList" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}PublicationType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}Abstract" minOccurs="0"/>
+ *         <element ref="{}Sections" minOccurs="0"/>
+ *         <element ref="{}KeywordList" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}ContributionDate" minOccurs="0"/>
+ *         <element ref="{}DateRevised" minOccurs="0"/>
+ *         <element ref="{}CitationString" minOccurs="0"/>
+ *         <element ref="{}GrantList" minOccurs="0"/>
+ *         <element ref="{}ItemList" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "pmid", + "articleIdList", + "book", + "locationLabel", + "articleTitle", + "vernacularTitle", + "pagination", + "language", + "authorList", + "publicationType", + "_abstract", + "sections", + "keywordList", + "contributionDate", + "dateRevised", + "citationString", + "grantList", + "itemList" +}) +@XmlRootElement(name = "BookDocument") +public class BookDocument { + + @XmlElement(name = "PMID", required = true) + protected PMID pmid; + @XmlElement(name = "ArticleIdList", required = true) + protected ArticleIdList articleIdList; + @XmlElement(name = "Book", required = true) + protected Book book; + @XmlElement(name = "LocationLabel") + protected List locationLabel; + @XmlElement(name = "ArticleTitle") + protected ArticleTitle articleTitle; + @XmlElement(name = "VernacularTitle") + protected Text vernacularTitle; + @XmlElement(name = "Pagination") + protected Pagination pagination; + @XmlElement(name = "Language") + protected List language; + @XmlElement(name = "AuthorList") + protected List authorList; + @XmlElement(name = "PublicationType") + protected List publicationType; + @XmlElement(name = "Abstract") + protected Abstract _abstract; + @XmlElement(name = "Sections") + protected Sections sections; + @XmlElement(name = "KeywordList") + protected List keywordList; + @XmlElement(name = "ContributionDate") + protected ContributionDate contributionDate; + @XmlElement(name = "DateRevised") + protected DateRevised dateRevised; + @XmlElement(name = "CitationString") + protected Text citationString; + @XmlElement(name = "GrantList") + protected GrantList grantList; + @XmlElement(name = "ItemList") + protected List itemList; + + /** + * Gets the value of the pmid property. + * + * @return + * possible object is + * {@link PMID } + * + */ + public PMID getPMID() { + return pmid; + } + + /** + * Sets the value of the pmid property. + * + * @param value + * allowed object is + * {@link PMID } + * + */ + public void setPMID(PMID value) { + this.pmid = value; + } + + /** + * Gets the value of the articleIdList property. + * + * @return + * possible object is + * {@link ArticleIdList } + * + */ + public ArticleIdList getArticleIdList() { + return articleIdList; + } + + /** + * Sets the value of the articleIdList property. + * + * @param value + * allowed object is + * {@link ArticleIdList } + * + */ + public void setArticleIdList(ArticleIdList value) { + this.articleIdList = value; + } + + /** + * Gets the value of the book property. + * + * @return + * possible object is + * {@link Book } + * + */ + public Book getBook() { + return book; + } + + /** + * Sets the value of the book property. + * + * @param value + * allowed object is + * {@link Book } + * + */ + public void setBook(Book value) { + this.book = value; + } + + /** + * Gets the value of the locationLabel property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the locationLabel property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getLocationLabel().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link LocationLabel } + * + * + */ + public List getLocationLabel() { + if (locationLabel == null) { + locationLabel = new ArrayList(); + } + return this.locationLabel; + } + + /** + * Gets the value of the articleTitle property. + * + * @return + * possible object is + * {@link ArticleTitle } + * + */ + public ArticleTitle getArticleTitle() { + return articleTitle; + } + + /** + * Sets the value of the articleTitle property. + * + * @param value + * allowed object is + * {@link ArticleTitle } + * + */ + public void setArticleTitle(ArticleTitle value) { + this.articleTitle = value; + } + + /** + * Gets the value of the vernacularTitle property. + * + * @return + * possible object is + * {@link Text } + * + */ + public Text getVernacularTitle() { + return vernacularTitle; + } + + /** + * Sets the value of the vernacularTitle property. + * + * @param value + * allowed object is + * {@link Text } + * + */ + public void setVernacularTitle(Text value) { + this.vernacularTitle = value; + } + + /** + * Gets the value of the pagination property. + * + * @return + * possible object is + * {@link Pagination } + * + */ + public Pagination getPagination() { + return pagination; + } + + /** + * Sets the value of the pagination property. + * + * @param value + * allowed object is + * {@link Pagination } + * + */ + public void setPagination(Pagination value) { + this.pagination = value; + } + + /** + * Gets the value of the language property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the language property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getLanguage().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getLanguage() { + if (language == null) { + language = new ArrayList(); + } + return this.language; + } + + /** + * Gets the value of the authorList property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the authorList property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAuthorList().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AuthorList } + * + * + */ + public List getAuthorList() { + if (authorList == null) { + authorList = new ArrayList(); + } + return this.authorList; + } + + /** + * Gets the value of the publicationType property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the publicationType property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPublicationType().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PublicationType } + * + * + */ + public List getPublicationType() { + if (publicationType == null) { + publicationType = new ArrayList(); + } + return this.publicationType; + } + + /** + * Gets the value of the abstract property. + * + * @return + * possible object is + * {@link Abstract } + * + */ + public Abstract getAbstract() { + return _abstract; + } + + /** + * Sets the value of the abstract property. + * + * @param value + * allowed object is + * {@link Abstract } + * + */ + public void setAbstract(Abstract value) { + this._abstract = value; + } + + /** + * Gets the value of the sections property. + * + * @return + * possible object is + * {@link Sections } + * + */ + public Sections getSections() { + return sections; + } + + /** + * Sets the value of the sections property. + * + * @param value + * allowed object is + * {@link Sections } + * + */ + public void setSections(Sections value) { + this.sections = value; + } + + /** + * Gets the value of the keywordList property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the keywordList property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getKeywordList().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link KeywordList } + * + * + */ + public List getKeywordList() { + if (keywordList == null) { + keywordList = new ArrayList(); + } + return this.keywordList; + } + + /** + * Gets the value of the contributionDate property. + * + * @return + * possible object is + * {@link ContributionDate } + * + */ + public ContributionDate getContributionDate() { + return contributionDate; + } + + /** + * Sets the value of the contributionDate property. + * + * @param value + * allowed object is + * {@link ContributionDate } + * + */ + public void setContributionDate(ContributionDate value) { + this.contributionDate = value; + } + + /** + * Gets the value of the dateRevised property. + * + * @return + * possible object is + * {@link DateRevised } + * + */ + public DateRevised getDateRevised() { + return dateRevised; + } + + /** + * Sets the value of the dateRevised property. + * + * @param value + * allowed object is + * {@link DateRevised } + * + */ + public void setDateRevised(DateRevised value) { + this.dateRevised = value; + } + + /** + * Gets the value of the citationString property. + * + * @return + * possible object is + * {@link Text } + * + */ + public Text getCitationString() { + return citationString; + } + + /** + * Sets the value of the citationString property. + * + * @param value + * allowed object is + * {@link Text } + * + */ + public void setCitationString(Text value) { + this.citationString = value; + } + + /** + * Gets the value of the grantList property. + * + * @return + * possible object is + * {@link GrantList } + * + */ + public GrantList getGrantList() { + return grantList; + } + + /** + * Sets the value of the grantList property. + * + * @param value + * allowed object is + * {@link GrantList } + * + */ + public void setGrantList(GrantList value) { + this.grantList = value; + } + + /** + * Gets the value of the itemList property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the itemList property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getItemList().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ItemList } + * + * + */ + public List getItemList() { + if (itemList == null) { + itemList = new ArrayList(); + } + return this.itemList; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookDocumentSet.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookDocumentSet.java new file mode 100644 index 00000000000..f6686c2b651 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookDocumentSet.java @@ -0,0 +1,106 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}BookDocument" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}DeleteDocument" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "bookDocument", + "deleteDocument" +}) +@XmlRootElement(name = "BookDocumentSet") +public class BookDocumentSet { + + @XmlElement(name = "BookDocument") + protected List bookDocument; + @XmlElement(name = "DeleteDocument") + protected DeleteDocument deleteDocument; + + /** + * Gets the value of the bookDocument property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the bookDocument property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getBookDocument().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link BookDocument } + * + * + */ + public List getBookDocument() { + if (bookDocument == null) { + bookDocument = new ArrayList(); + } + return this.bookDocument; + } + + /** + * Gets the value of the deleteDocument property. + * + * @return + * possible object is + * {@link DeleteDocument } + * + */ + public DeleteDocument getDeleteDocument() { + return deleteDocument; + } + + /** + * Sets the value of the deleteDocument property. + * + * @param value + * allowed object is + * {@link DeleteDocument } + * + */ + public void setDeleteDocument(DeleteDocument value) { + this.deleteDocument = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookTitle.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookTitle.java new file mode 100644 index 00000000000..2c3964a1b7c --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/BookTitle.java @@ -0,0 +1,125 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{}text">
+ *       <attGroup ref="{}attlist.BookTitle"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "BookTitle") +public class BookTitle + extends Text +{ + + @XmlAttribute(name = "book") + @XmlSchemaType(name = "anySimpleType") + protected String book; + @XmlAttribute(name = "part") + @XmlSchemaType(name = "anySimpleType") + protected String part; + @XmlAttribute(name = "sec") + @XmlSchemaType(name = "anySimpleType") + protected String sec; + + /** + * Gets the value of the book property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBook() { + return book; + } + + /** + * Sets the value of the book property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBook(String value) { + this.book = value; + } + + /** + * Gets the value of the part property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPart() { + return part; + } + + /** + * Sets the value of the part property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPart(String value) { + this.part = value; + } + + /** + * Gets the value of the sec property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSec() { + return sec; + } + + /** + * Sets the value of the sec property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSec(String value) { + this.sec = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Chemical.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Chemical.java new file mode 100644 index 00000000000..3484c09c756 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Chemical.java @@ -0,0 +1,99 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}RegistryNumber"/>
+ *         <element ref="{}NameOfSubstance"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "registryNumber", + "nameOfSubstance" +}) +@XmlRootElement(name = "Chemical") +public class Chemical { + + @XmlElement(name = "RegistryNumber", required = true) + protected String registryNumber; + @XmlElement(name = "NameOfSubstance", required = true) + protected NameOfSubstance nameOfSubstance; + + /** + * Gets the value of the registryNumber property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRegistryNumber() { + return registryNumber; + } + + /** + * Sets the value of the registryNumber property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRegistryNumber(String value) { + this.registryNumber = value; + } + + /** + * Gets the value of the nameOfSubstance property. + * + * @return + * possible object is + * {@link NameOfSubstance } + * + */ + public NameOfSubstance getNameOfSubstance() { + return nameOfSubstance; + } + + /** + * Sets the value of the nameOfSubstance property. + * + * @param value + * allowed object is + * {@link NameOfSubstance } + * + */ + public void setNameOfSubstance(NameOfSubstance value) { + this.nameOfSubstance = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ChemicalList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ChemicalList.java new file mode 100644 index 00000000000..f4052954f44 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ChemicalList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Chemical" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "chemical" +}) +@XmlRootElement(name = "ChemicalList") +public class ChemicalList { + + @XmlElement(name = "Chemical", required = true) + protected List chemical; + + /** + * Gets the value of the chemical property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the chemical property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getChemical().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Chemical } + * + * + */ + public List getChemical() { + if (chemical == null) { + chemical = new ArrayList(); + } + return this.chemical; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CollectionTitle.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CollectionTitle.java new file mode 100644 index 00000000000..2a358dd379f --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CollectionTitle.java @@ -0,0 +1,125 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{}text">
+ *       <attGroup ref="{}attlist.CollectionTitle"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "CollectionTitle") +public class CollectionTitle + extends Text +{ + + @XmlAttribute(name = "book") + @XmlSchemaType(name = "anySimpleType") + protected String book; + @XmlAttribute(name = "part") + @XmlSchemaType(name = "anySimpleType") + protected String part; + @XmlAttribute(name = "sec") + @XmlSchemaType(name = "anySimpleType") + protected String sec; + + /** + * Gets the value of the book property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBook() { + return book; + } + + /** + * Sets the value of the book property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBook(String value) { + this.book = value; + } + + /** + * Gets the value of the part property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPart() { + return part; + } + + /** + * Sets the value of the part property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPart(String value) { + this.part = value; + } + + /** + * Gets the value of the sec property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSec() { + return sec; + } + + /** + * Sets the value of the sec property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSec(String value) { + this.sec = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CommentsCorrections.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CommentsCorrections.java new file mode 100644 index 00000000000..c541faaf471 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CommentsCorrections.java @@ -0,0 +1,158 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}RefSource"/>
+ *         <element ref="{}PMID" minOccurs="0"/>
+ *         <element ref="{}Note" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.CommentsCorrections"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "refSource", + "pmid", + "note" +}) +@XmlRootElement(name = "CommentsCorrections") +public class CommentsCorrections { + + @XmlElement(name = "RefSource", required = true) + protected String refSource; + @XmlElement(name = "PMID") + protected PMID pmid; + @XmlElement(name = "Note") + protected String note; + @XmlAttribute(name = "RefType", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String refType; + + /** + * Gets the value of the refSource property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRefSource() { + return refSource; + } + + /** + * Sets the value of the refSource property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRefSource(String value) { + this.refSource = value; + } + + /** + * Gets the value of the pmid property. + * + * @return + * possible object is + * {@link PMID } + * + */ + public PMID getPMID() { + return pmid; + } + + /** + * Sets the value of the pmid property. + * + * @param value + * allowed object is + * {@link PMID } + * + */ + public void setPMID(PMID value) { + this.pmid = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the refType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRefType() { + return refType; + } + + /** + * Sets the value of the refType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRefType(String value) { + this.refType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CommentsCorrectionsList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CommentsCorrectionsList.java new file mode 100644 index 00000000000..f811a4aaed8 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/CommentsCorrectionsList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}CommentsCorrections" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "commentsCorrections" +}) +@XmlRootElement(name = "CommentsCorrectionsList") +public class CommentsCorrectionsList { + + @XmlElement(name = "CommentsCorrections", required = true) + protected List commentsCorrections; + + /** + * Gets the value of the commentsCorrections property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the commentsCorrections property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getCommentsCorrections().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link CommentsCorrections } + * + * + */ + public List getCommentsCorrections() { + if (commentsCorrections == null) { + commentsCorrections = new ArrayList(); + } + return this.commentsCorrections; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ContributionDate.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ContributionDate.java new file mode 100644 index 00000000000..ce127c56d01 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ContributionDate.java @@ -0,0 +1,159 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Year"/>
+ *         <choice minOccurs="0">
+ *           <sequence>
+ *             <element ref="{}Month"/>
+ *             <element ref="{}Day" minOccurs="0"/>
+ *           </sequence>
+ *           <element ref="{}Season"/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "year", + "month", + "day", + "season" +}) +@XmlRootElement(name = "ContributionDate") +public class ContributionDate { + + @XmlElement(name = "Year", required = true) + protected String year; + @XmlElement(name = "Month") + protected String month; + @XmlElement(name = "Day") + protected String day; + @XmlElement(name = "Season") + protected String season; + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setYear(String value) { + this.year = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the day property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDay() { + return day; + } + + /** + * Sets the value of the day property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDay(String value) { + this.day = value; + } + + /** + * Gets the value of the season property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeason() { + return season; + } + + /** + * Sets the value of the season property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeason(String value) { + this.season = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DataBank.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DataBank.java new file mode 100644 index 00000000000..af2d7ce076e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DataBank.java @@ -0,0 +1,99 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}DataBankName"/>
+ *         <element ref="{}AccessionNumberList" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "dataBankName", + "accessionNumberList" +}) +@XmlRootElement(name = "DataBank") +public class DataBank { + + @XmlElement(name = "DataBankName", required = true) + protected String dataBankName; + @XmlElement(name = "AccessionNumberList") + protected AccessionNumberList accessionNumberList; + + /** + * Gets the value of the dataBankName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataBankName() { + return dataBankName; + } + + /** + * Sets the value of the dataBankName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataBankName(String value) { + this.dataBankName = value; + } + + /** + * Gets the value of the accessionNumberList property. + * + * @return + * possible object is + * {@link AccessionNumberList } + * + */ + public AccessionNumberList getAccessionNumberList() { + return accessionNumberList; + } + + /** + * Sets the value of the accessionNumberList property. + * + * @param value + * allowed object is + * {@link AccessionNumberList } + * + */ + public void setAccessionNumberList(AccessionNumberList value) { + this.accessionNumberList = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DataBankList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DataBankList.java new file mode 100644 index 00000000000..dc4934f9562 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DataBankList.java @@ -0,0 +1,113 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}DataBank" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.DataBankList"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "dataBank" +}) +@XmlRootElement(name = "DataBankList") +public class DataBankList { + + @XmlElement(name = "DataBank", required = true) + protected List dataBank; + @XmlAttribute(name = "CompleteYN") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String completeYN; + + /** + * Gets the value of the dataBank property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the dataBank property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getDataBank().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link DataBank } + * + * + */ + public List getDataBank() { + if (dataBank == null) { + dataBank = new ArrayList(); + } + return this.dataBank; + } + + /** + * Gets the value of the completeYN property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCompleteYN() { + if (completeYN == null) { + return "Y"; + } else { + return completeYN; + } + } + + /** + * Sets the value of the completeYN property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCompleteYN(String value) { + this.completeYN = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateCompleted.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateCompleted.java new file mode 100644 index 00000000000..8c1a43d10e2 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateCompleted.java @@ -0,0 +1,127 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Year"/>
+ *         <element ref="{}Month"/>
+ *         <element ref="{}Day"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "year", + "month", + "day" +}) +@XmlRootElement(name = "DateCompleted") +public class DateCompleted { + + @XmlElement(name = "Year", required = true) + protected String year; + @XmlElement(name = "Month", required = true) + protected String month; + @XmlElement(name = "Day", required = true) + protected String day; + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setYear(String value) { + this.year = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the day property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDay() { + return day; + } + + /** + * Sets the value of the day property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDay(String value) { + this.day = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateCreated.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateCreated.java new file mode 100644 index 00000000000..fe6d6120a1e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateCreated.java @@ -0,0 +1,127 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Year"/>
+ *         <element ref="{}Month"/>
+ *         <element ref="{}Day"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "year", + "month", + "day" +}) +@XmlRootElement(name = "DateCreated") +public class DateCreated { + + @XmlElement(name = "Year", required = true) + protected String year; + @XmlElement(name = "Month", required = true) + protected String month; + @XmlElement(name = "Day", required = true) + protected String day; + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setYear(String value) { + this.year = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the day property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDay() { + return day; + } + + /** + * Sets the value of the day property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDay(String value) { + this.day = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateRevised.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateRevised.java new file mode 100644 index 00000000000..e30cd9c6a1e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DateRevised.java @@ -0,0 +1,127 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Year"/>
+ *         <element ref="{}Month"/>
+ *         <element ref="{}Day"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "year", + "month", + "day" +}) +@XmlRootElement(name = "DateRevised") +public class DateRevised { + + @XmlElement(name = "Year", required = true) + protected String year; + @XmlElement(name = "Month", required = true) + protected String month; + @XmlElement(name = "Day", required = true) + protected String day; + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setYear(String value) { + this.year = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the day property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDay() { + return day; + } + + /** + * Sets the value of the day property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDay(String value) { + this.day = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DeleteCitation.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DeleteCitation.java new file mode 100644 index 00000000000..3a50e920493 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DeleteCitation.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}PMID" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "pmid" +}) +@XmlRootElement(name = "DeleteCitation") +public class DeleteCitation { + + @XmlElement(name = "PMID", required = true) + protected List pmid; + + /** + * Gets the value of the pmid property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the pmid property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPMID().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PMID } + * + * + */ + public List getPMID() { + if (pmid == null) { + pmid = new ArrayList(); + } + return this.pmid; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DeleteDocument.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DeleteDocument.java new file mode 100644 index 00000000000..b9cbbad084e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DeleteDocument.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}PMID" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "pmid" +}) +@XmlRootElement(name = "DeleteDocument") +public class DeleteDocument { + + @XmlElement(name = "PMID") + protected List pmid; + + /** + * Gets the value of the pmid property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the pmid property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPMID().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PMID } + * + * + */ + public List getPMID() { + if (pmid == null) { + pmid = new ArrayList(); + } + return this.pmid; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DescriptorName.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DescriptorName.java new file mode 100644 index 00000000000..e21e2d8ceea --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/DescriptorName.java @@ -0,0 +1,158 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.DescriptorName"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "DescriptorName") +public class DescriptorName { + + @XmlValue + protected String content; + @XmlAttribute(name = "MajorTopicYN") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String majorTopicYN; + @XmlAttribute(name = "Type") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String type; + @XmlAttribute(name = "UI", required = true) + @XmlSchemaType(name = "anySimpleType") + protected String ui; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the majorTopicYN property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMajorTopicYN() { + if (majorTopicYN == null) { + return "N"; + } else { + return majorTopicYN; + } + } + + /** + * Sets the value of the majorTopicYN property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMajorTopicYN(String value) { + this.majorTopicYN = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the ui property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUI() { + return ui; + } + + /** + * Sets the value of the ui property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUI(String value) { + this.ui = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ELocationID.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ELocationID.java new file mode 100644 index 00000000000..2462ac1971d --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ELocationID.java @@ -0,0 +1,130 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.ELocationID"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "ELocationID") +public class ELocationID { + + @XmlValue + protected String content; + @XmlAttribute(name = "EIdType", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String eIdType; + @XmlAttribute(name = "ValidYN") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String validYN; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the eIdType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEIdType() { + return eIdType; + } + + /** + * Sets the value of the eIdType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEIdType(String value) { + this.eIdType = value; + } + + /** + * Gets the value of the validYN property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValidYN() { + if (validYN == null) { + return "Y"; + } else { + return validYN; + } + } + + /** + * Sets the value of the validYN property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValidYN(String value) { + this.validYN = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/EndingDate.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/EndingDate.java new file mode 100644 index 00000000000..757873b3609 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/EndingDate.java @@ -0,0 +1,159 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Year"/>
+ *         <choice minOccurs="0">
+ *           <sequence>
+ *             <element ref="{}Month"/>
+ *             <element ref="{}Day" minOccurs="0"/>
+ *           </sequence>
+ *           <element ref="{}Season"/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "year", + "month", + "day", + "season" +}) +@XmlRootElement(name = "EndingDate") +public class EndingDate { + + @XmlElement(name = "Year", required = true) + protected String year; + @XmlElement(name = "Month") + protected String month; + @XmlElement(name = "Day") + protected String day; + @XmlElement(name = "Season") + protected String season; + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setYear(String value) { + this.year = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the day property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDay() { + return day; + } + + /** + * Sets the value of the day property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDay(String value) { + this.day = value; + } + + /** + * Gets the value of the season property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeason() { + return season; + } + + /** + * Sets the value of the season property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeason(String value) { + this.season = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GeneSymbolList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GeneSymbolList.java new file mode 100644 index 00000000000..0c85d6900bd --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GeneSymbolList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}GeneSymbol" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "geneSymbol" +}) +@XmlRootElement(name = "GeneSymbolList") +public class GeneSymbolList { + + @XmlElement(name = "GeneSymbol", required = true) + protected List geneSymbol; + + /** + * Gets the value of the geneSymbol property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the geneSymbol property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getGeneSymbol().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getGeneSymbol() { + if (geneSymbol == null) { + geneSymbol = new ArrayList(); + } + return this.geneSymbol; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GeneralNote.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GeneralNote.java new file mode 100644 index 00000000000..2852ffe677d --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GeneralNote.java @@ -0,0 +1,103 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.GeneralNote"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "GeneralNote") +public class GeneralNote { + + @XmlValue + protected String content; + @XmlAttribute(name = "Owner") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String owner; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the owner property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOwner() { + if (owner == null) { + return "NLM"; + } else { + return owner; + } + } + + /** + * Sets the value of the owner property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOwner(String value) { + this.owner = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Grant.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Grant.java new file mode 100644 index 00000000000..e2e85ad4cc2 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Grant.java @@ -0,0 +1,155 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}GrantID" minOccurs="0"/>
+ *         <element ref="{}Acronym" minOccurs="0"/>
+ *         <element ref="{}Agency"/>
+ *         <element ref="{}Country"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "grantID", + "acronym", + "agency", + "country" +}) +@XmlRootElement(name = "Grant") +public class Grant { + + @XmlElement(name = "GrantID") + protected String grantID; + @XmlElement(name = "Acronym") + protected String acronym; + @XmlElement(name = "Agency", required = true) + protected String agency; + @XmlElement(name = "Country", required = true) + protected String country; + + /** + * Gets the value of the grantID property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getGrantID() { + return grantID; + } + + /** + * Sets the value of the grantID property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setGrantID(String value) { + this.grantID = value; + } + + /** + * Gets the value of the acronym property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAcronym() { + return acronym; + } + + /** + * Sets the value of the acronym property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAcronym(String value) { + this.acronym = value; + } + + /** + * Gets the value of the agency property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgency() { + return agency; + } + + /** + * Sets the value of the agency property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgency(String value) { + this.agency = value; + } + + /** + * Gets the value of the country property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCountry() { + return country; + } + + /** + * Sets the value of the country property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCountry(String value) { + this.country = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GrantList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GrantList.java new file mode 100644 index 00000000000..7ec7f02e26e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/GrantList.java @@ -0,0 +1,113 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Grant" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.GrantList"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "grant" +}) +@XmlRootElement(name = "GrantList") +public class GrantList { + + @XmlElement(name = "Grant", required = true) + protected List grant; + @XmlAttribute(name = "CompleteYN") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String completeYN; + + /** + * Gets the value of the grant property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the grant property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getGrant().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grant } + * + * + */ + public List getGrant() { + if (grant == null) { + grant = new ArrayList(); + } + return this.grant; + } + + /** + * Gets the value of the completeYN property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCompleteYN() { + if (completeYN == null) { + return "Y"; + } else { + return completeYN; + } + } + + /** + * Sets the value of the completeYN property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCompleteYN(String value) { + this.completeYN = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/History.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/History.java new file mode 100644 index 00000000000..23396b2278c --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/History.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}PubMedPubDate" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "pubMedPubDate" +}) +@XmlRootElement(name = "History") +public class History { + + @XmlElement(name = "PubMedPubDate", required = true) + protected List pubMedPubDate; + + /** + * Gets the value of the pubMedPubDate property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the pubMedPubDate property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPubMedPubDate().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PubMedPubDate } + * + * + */ + public List getPubMedPubDate() { + if (pubMedPubDate == null) { + pubMedPubDate = new ArrayList(); + } + return this.pubMedPubDate; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ISSN.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ISSN.java new file mode 100644 index 00000000000..6cdafa1f669 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ISSN.java @@ -0,0 +1,99 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.ISSN"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "ISSN") +public class ISSN { + + @XmlValue + protected String content; + @XmlAttribute(name = "IssnType", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String issnType; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the issnType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssnType() { + return issnType; + } + + /** + * Sets the value of the issnType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssnType(String value) { + this.issnType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Identifier.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Identifier.java new file mode 100644 index 00000000000..039a069eb07 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Identifier.java @@ -0,0 +1,98 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.Identifier"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "Identifier") +public class Identifier { + + @XmlValue + protected String content; + @XmlAttribute(name = "Source", required = true) + @XmlSchemaType(name = "anySimpleType") + protected String source; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the source property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSource() { + return source; + } + + /** + * Sets the value of the source property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSource(String value) { + this.source = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Investigator.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Investigator.java new file mode 100644 index 00000000000..ad41f199e6d --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Investigator.java @@ -0,0 +1,258 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}LastName"/>
+ *         <element ref="{}ForeName" minOccurs="0"/>
+ *         <element ref="{}Initials" minOccurs="0"/>
+ *         <element ref="{}Suffix" minOccurs="0"/>
+ *         <element ref="{}Identifier" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}AffiliationInfo" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.Investigator"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "lastName", + "foreName", + "initials", + "suffix", + "identifier", + "affiliationInfo" +}) +@XmlRootElement(name = "Investigator") +public class Investigator { + + @XmlElement(name = "LastName", required = true) + protected String lastName; + @XmlElement(name = "ForeName") + protected String foreName; + @XmlElement(name = "Initials") + protected String initials; + @XmlElement(name = "Suffix") + protected Text suffix; + @XmlElement(name = "Identifier") + protected List identifier; + @XmlElement(name = "AffiliationInfo") + protected List affiliationInfo; + @XmlAttribute(name = "ValidYN") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String validYN; + + /** + * Gets the value of the lastName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLastName() { + return lastName; + } + + /** + * Sets the value of the lastName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLastName(String value) { + this.lastName = value; + } + + /** + * Gets the value of the foreName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getForeName() { + return foreName; + } + + /** + * Sets the value of the foreName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setForeName(String value) { + this.foreName = value; + } + + /** + * Gets the value of the initials property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getInitials() { + return initials; + } + + /** + * Sets the value of the initials property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setInitials(String value) { + this.initials = value; + } + + /** + * Gets the value of the suffix property. + * + * @return + * possible object is + * {@link Text } + * + */ + public Text getSuffix() { + return suffix; + } + + /** + * Sets the value of the suffix property. + * + * @param value + * allowed object is + * {@link Text } + * + */ + public void setSuffix(Text value) { + this.suffix = value; + } + + /** + * Gets the value of the identifier property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the identifier property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getIdentifier().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Identifier } + * + * + */ + public List getIdentifier() { + if (identifier == null) { + identifier = new ArrayList(); + } + return this.identifier; + } + + /** + * Gets the value of the affiliationInfo property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the affiliationInfo property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAffiliationInfo().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AffiliationInfo } + * + * + */ + public List getAffiliationInfo() { + if (affiliationInfo == null) { + affiliationInfo = new ArrayList(); + } + return this.affiliationInfo; + } + + /** + * Gets the value of the validYN property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValidYN() { + if (validYN == null) { + return "Y"; + } else { + return validYN; + } + } + + /** + * Sets the value of the validYN property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValidYN(String value) { + this.validYN = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/InvestigatorList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/InvestigatorList.java new file mode 100644 index 00000000000..5b97c8e81f4 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/InvestigatorList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Investigator" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "investigator" +}) +@XmlRootElement(name = "InvestigatorList") +public class InvestigatorList { + + @XmlElement(name = "Investigator", required = true) + protected List investigator; + + /** + * Gets the value of the investigator property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the investigator property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getInvestigator().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Investigator } + * + * + */ + public List getInvestigator() { + if (investigator == null) { + investigator = new ArrayList(); + } + return this.investigator; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/IsoLanguageCodes.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/IsoLanguageCodes.java new file mode 100644 index 00000000000..e9c5159ddda --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/IsoLanguageCodes.java @@ -0,0 +1,129 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for iso.language.codes. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ * 

+ * <simpleType name="iso.language.codes">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *     <enumeration value="AF"/>
+ *     <enumeration value="AR"/>
+ *     <enumeration value="AZ"/>
+ *     <enumeration value="BG"/>
+ *     <enumeration value="CS"/>
+ *     <enumeration value="DA"/>
+ *     <enumeration value="DE"/>
+ *     <enumeration value="EN"/>
+ *     <enumeration value="EL"/>
+ *     <enumeration value="ES"/>
+ *     <enumeration value="FA"/>
+ *     <enumeration value="FI"/>
+ *     <enumeration value="FR"/>
+ *     <enumeration value="HE"/>
+ *     <enumeration value="HU"/>
+ *     <enumeration value="HY"/>
+ *     <enumeration value="IN"/>
+ *     <enumeration value="IS"/>
+ *     <enumeration value="IT"/>
+ *     <enumeration value="IW"/>
+ *     <enumeration value="JA"/>
+ *     <enumeration value="KA"/>
+ *     <enumeration value="KO"/>
+ *     <enumeration value="LT"/>
+ *     <enumeration value="MK"/>
+ *     <enumeration value="ML"/>
+ *     <enumeration value="NL"/>
+ *     <enumeration value="NO"/>
+ *     <enumeration value="PL"/>
+ *     <enumeration value="PT"/>
+ *     <enumeration value="PS"/>
+ *     <enumeration value="RO"/>
+ *     <enumeration value="RU"/>
+ *     <enumeration value="SL"/>
+ *     <enumeration value="SK"/>
+ *     <enumeration value="SQ"/>
+ *     <enumeration value="SR"/>
+ *     <enumeration value="SV"/>
+ *     <enumeration value="SW"/>
+ *     <enumeration value="TH"/>
+ *     <enumeration value="TR"/>
+ *     <enumeration value="UK"/>
+ *     <enumeration value="VI"/>
+ *     <enumeration value="ZH"/>
+ *   </restriction>
+ * </simpleType>
+ *
+ * + */ +@XmlType(name = "iso.language.codes") +@XmlEnum +public enum IsoLanguageCodes { + + AF, + AR, + AZ, + BG, + CS, + DA, + DE, + EN, + EL, + ES, + FA, + FI, + FR, + HE, + HU, + HY, + IN, + IS, + IT, + IW, + JA, + KA, + KO, + LT, + MK, + ML, + NL, + NO, + PL, + PT, + PS, + RO, + RU, + SL, + SK, + SQ, + SR, + SV, + SW, + TH, + TR, + UK, + VI, + ZH; + + public String value() { + return name(); + } + + public static IsoLanguageCodes fromValue(String v) { + return valueOf(v); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ItemList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ItemList.java new file mode 100644 index 00000000000..584f75c93d7 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ItemList.java @@ -0,0 +1,108 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Item" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.ItemList"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "item" +}) +@XmlRootElement(name = "ItemList") +public class ItemList { + + @XmlElement(name = "Item", required = true) + protected List item; + @XmlAttribute(name = "ListType", required = true) + @XmlSchemaType(name = "anySimpleType") + protected String listType; + + /** + * Gets the value of the item property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the item property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getItem().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getItem() { + if (item == null) { + item = new ArrayList(); + } + return this.item; + } + + /** + * Gets the value of the listType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getListType() { + return listType; + } + + /** + * Sets the value of the listType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setListType(String value) { + this.listType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Journal.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Journal.java new file mode 100644 index 00000000000..90abcbf2176 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Journal.java @@ -0,0 +1,155 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}ISSN" minOccurs="0"/>
+ *         <element ref="{}JournalIssue"/>
+ *         <element ref="{}Title" minOccurs="0"/>
+ *         <element ref="{}ISOAbbreviation" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "issn", + "journalIssue", + "title", + "isoAbbreviation" +}) +@XmlRootElement(name = "Journal") +public class Journal { + + @XmlElement(name = "ISSN") + protected ISSN issn; + @XmlElement(name = "JournalIssue", required = true) + protected JournalIssue journalIssue; + @XmlElement(name = "Title") + protected String title; + @XmlElement(name = "ISOAbbreviation") + protected String isoAbbreviation; + + /** + * Gets the value of the issn property. + * + * @return + * possible object is + * {@link ISSN } + * + */ + public ISSN getISSN() { + return issn; + } + + /** + * Sets the value of the issn property. + * + * @param value + * allowed object is + * {@link ISSN } + * + */ + public void setISSN(ISSN value) { + this.issn = value; + } + + /** + * Gets the value of the journalIssue property. + * + * @return + * possible object is + * {@link JournalIssue } + * + */ + public JournalIssue getJournalIssue() { + return journalIssue; + } + + /** + * Sets the value of the journalIssue property. + * + * @param value + * allowed object is + * {@link JournalIssue } + * + */ + public void setJournalIssue(JournalIssue value) { + this.journalIssue = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the isoAbbreviation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getISOAbbreviation() { + return isoAbbreviation; + } + + /** + * Sets the value of the isoAbbreviation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setISOAbbreviation(String value) { + this.isoAbbreviation = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/JournalIssue.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/JournalIssue.java new file mode 100644 index 00000000000..8a1f04c149c --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/JournalIssue.java @@ -0,0 +1,158 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Volume" minOccurs="0"/>
+ *         <element ref="{}Issue" minOccurs="0"/>
+ *         <element ref="{}PubDate"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.JournalIssue"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "volume", + "issue", + "pubDate" +}) +@XmlRootElement(name = "JournalIssue") +public class JournalIssue { + + @XmlElement(name = "Volume") + protected String volume; + @XmlElement(name = "Issue") + protected String issue; + @XmlElement(name = "PubDate", required = true) + protected PubDate pubDate; + @XmlAttribute(name = "CitedMedium", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String citedMedium; + + /** + * Gets the value of the volume property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVolume() { + return volume; + } + + /** + * Sets the value of the volume property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVolume(String value) { + this.volume = value; + } + + /** + * Gets the value of the issue property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIssue() { + return issue; + } + + /** + * Sets the value of the issue property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIssue(String value) { + this.issue = value; + } + + /** + * Gets the value of the pubDate property. + * + * @return + * possible object is + * {@link PubDate } + * + */ + public PubDate getPubDate() { + return pubDate; + } + + /** + * Sets the value of the pubDate property. + * + * @param value + * allowed object is + * {@link PubDate } + * + */ + public void setPubDate(PubDate value) { + this.pubDate = value; + } + + /** + * Gets the value of the citedMedium property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCitedMedium() { + return citedMedium; + } + + /** + * Sets the value of the citedMedium property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCitedMedium(String value) { + this.citedMedium = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Keyword.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Keyword.java new file mode 100644 index 00000000000..3b48260effc --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Keyword.java @@ -0,0 +1,76 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{}text">
+ *       <attGroup ref="{}attlist.Keyword"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "Keyword") +public class Keyword + extends Text +{ + + @XmlAttribute(name = "MajorTopicYN") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String majorTopicYN; + + /** + * Gets the value of the majorTopicYN property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMajorTopicYN() { + if (majorTopicYN == null) { + return "N"; + } else { + return majorTopicYN; + } + } + + /** + * Sets the value of the majorTopicYN property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMajorTopicYN(String value) { + this.majorTopicYN = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/KeywordList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/KeywordList.java new file mode 100644 index 00000000000..0b96e5ccb93 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/KeywordList.java @@ -0,0 +1,113 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Keyword" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.KeywordList"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "keyword" +}) +@XmlRootElement(name = "KeywordList") +public class KeywordList { + + @XmlElement(name = "Keyword", required = true) + protected List keyword; + @XmlAttribute(name = "Owner") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String owner; + + /** + * Gets the value of the keyword property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the keyword property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getKeyword().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Keyword } + * + * + */ + public List getKeyword() { + if (keyword == null) { + keyword = new ArrayList(); + } + return this.keyword; + } + + /** + * Gets the value of the owner property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOwner() { + if (owner == null) { + return "NLM"; + } else { + return owner; + } + } + + /** + * Sets the value of the owner property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOwner(String value) { + this.owner = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/LocationLabel.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/LocationLabel.java new file mode 100644 index 00000000000..9984436eac0 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/LocationLabel.java @@ -0,0 +1,99 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.LocationLabel"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "LocationLabel") +public class LocationLabel { + + @XmlValue + protected String content; + @XmlAttribute(name = "Type") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String type; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineCitation.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineCitation.java new file mode 100644 index 00000000000..040524888ee --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineCitation.java @@ -0,0 +1,752 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}PMID"/>
+ *         <element ref="{}DateCreated"/>
+ *         <element ref="{}DateCompleted" minOccurs="0"/>
+ *         <element ref="{}DateRevised" minOccurs="0"/>
+ *         <element ref="{}Article"/>
+ *         <element ref="{}MedlineJournalInfo"/>
+ *         <element ref="{}ChemicalList" minOccurs="0"/>
+ *         <element ref="{}SupplMeshList" minOccurs="0"/>
+ *         <element ref="{}CitationSubset" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}CommentsCorrectionsList" minOccurs="0"/>
+ *         <element ref="{}GeneSymbolList" minOccurs="0"/>
+ *         <element ref="{}MeshHeadingList" minOccurs="0"/>
+ *         <element ref="{}NumberOfReferences" minOccurs="0"/>
+ *         <element ref="{}PersonalNameSubjectList" minOccurs="0"/>
+ *         <element ref="{}OtherID" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}OtherAbstract" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}KeywordList" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}SpaceFlightMission" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}InvestigatorList" minOccurs="0"/>
+ *         <element ref="{}GeneralNote" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.MedlineCitation"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "pmid", + "dateCreated", + "dateCompleted", + "dateRevised", + "article", + "medlineJournalInfo", + "chemicalList", + "supplMeshList", + "citationSubset", + "commentsCorrectionsList", + "geneSymbolList", + "meshHeadingList", + "numberOfReferences", + "personalNameSubjectList", + "otherID", + "otherAbstract", + "keywordList", + "spaceFlightMission", + "investigatorList", + "generalNote" +}) +@XmlRootElement(name = "MedlineCitation") +public class MedlineCitation { + + @XmlElement(name = "PMID", required = true) + protected PMID pmid; + @XmlElement(name = "DateCreated", required = true) + protected DateCreated dateCreated; + @XmlElement(name = "DateCompleted") + protected DateCompleted dateCompleted; + @XmlElement(name = "DateRevised") + protected DateRevised dateRevised; + @XmlElement(name = "Article", required = true) + protected Article article; + @XmlElement(name = "MedlineJournalInfo", required = true) + protected MedlineJournalInfo medlineJournalInfo; + @XmlElement(name = "ChemicalList") + protected ChemicalList chemicalList; + @XmlElement(name = "SupplMeshList") + protected SupplMeshList supplMeshList; + @XmlElement(name = "CitationSubset") + protected List citationSubset; + @XmlElement(name = "CommentsCorrectionsList") + protected CommentsCorrectionsList commentsCorrectionsList; + @XmlElement(name = "GeneSymbolList") + protected GeneSymbolList geneSymbolList; + @XmlElement(name = "MeshHeadingList") + protected MeshHeadingList meshHeadingList; + @XmlElement(name = "NumberOfReferences") + protected String numberOfReferences; + @XmlElement(name = "PersonalNameSubjectList") + protected PersonalNameSubjectList personalNameSubjectList; + @XmlElement(name = "OtherID") + protected List otherID; + @XmlElement(name = "OtherAbstract") + protected List otherAbstract; + @XmlElement(name = "KeywordList") + protected List keywordList; + @XmlElement(name = "SpaceFlightMission") + protected List spaceFlightMission; + @XmlElement(name = "InvestigatorList") + protected InvestigatorList investigatorList; + @XmlElement(name = "GeneralNote") + protected List generalNote; + @XmlAttribute(name = "Owner") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String owner; + @XmlAttribute(name = "Status", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String status; + @XmlAttribute(name = "VersionID") + @XmlSchemaType(name = "anySimpleType") + protected String versionID; + @XmlAttribute(name = "VersionDate") + @XmlSchemaType(name = "anySimpleType") + protected String versionDate; + + /** + * Gets the value of the pmid property. + * + * @return + * possible object is + * {@link PMID } + * + */ + public PMID getPMID() { + return pmid; + } + + /** + * Sets the value of the pmid property. + * + * @param value + * allowed object is + * {@link PMID } + * + */ + public void setPMID(PMID value) { + this.pmid = value; + } + + /** + * Gets the value of the dateCreated property. + * + * @return + * possible object is + * {@link DateCreated } + * + */ + public DateCreated getDateCreated() { + return dateCreated; + } + + /** + * Sets the value of the dateCreated property. + * + * @param value + * allowed object is + * {@link DateCreated } + * + */ + public void setDateCreated(DateCreated value) { + this.dateCreated = value; + } + + /** + * Gets the value of the dateCompleted property. + * + * @return + * possible object is + * {@link DateCompleted } + * + */ + public DateCompleted getDateCompleted() { + return dateCompleted; + } + + /** + * Sets the value of the dateCompleted property. + * + * @param value + * allowed object is + * {@link DateCompleted } + * + */ + public void setDateCompleted(DateCompleted value) { + this.dateCompleted = value; + } + + /** + * Gets the value of the dateRevised property. + * + * @return + * possible object is + * {@link DateRevised } + * + */ + public DateRevised getDateRevised() { + return dateRevised; + } + + /** + * Sets the value of the dateRevised property. + * + * @param value + * allowed object is + * {@link DateRevised } + * + */ + public void setDateRevised(DateRevised value) { + this.dateRevised = value; + } + + /** + * Gets the value of the article property. + * + * @return + * possible object is + * {@link Article } + * + */ + public Article getArticle() { + return article; + } + + /** + * Sets the value of the article property. + * + * @param value + * allowed object is + * {@link Article } + * + */ + public void setArticle(Article value) { + this.article = value; + } + + /** + * Gets the value of the medlineJournalInfo property. + * + * @return + * possible object is + * {@link MedlineJournalInfo } + * + */ + public MedlineJournalInfo getMedlineJournalInfo() { + return medlineJournalInfo; + } + + /** + * Sets the value of the medlineJournalInfo property. + * + * @param value + * allowed object is + * {@link MedlineJournalInfo } + * + */ + public void setMedlineJournalInfo(MedlineJournalInfo value) { + this.medlineJournalInfo = value; + } + + /** + * Gets the value of the chemicalList property. + * + * @return + * possible object is + * {@link ChemicalList } + * + */ + public ChemicalList getChemicalList() { + return chemicalList; + } + + /** + * Sets the value of the chemicalList property. + * + * @param value + * allowed object is + * {@link ChemicalList } + * + */ + public void setChemicalList(ChemicalList value) { + this.chemicalList = value; + } + + /** + * Gets the value of the supplMeshList property. + * + * @return + * possible object is + * {@link SupplMeshList } + * + */ + public SupplMeshList getSupplMeshList() { + return supplMeshList; + } + + /** + * Sets the value of the supplMeshList property. + * + * @param value + * allowed object is + * {@link SupplMeshList } + * + */ + public void setSupplMeshList(SupplMeshList value) { + this.supplMeshList = value; + } + + /** + * Gets the value of the citationSubset property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the citationSubset property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getCitationSubset().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getCitationSubset() { + if (citationSubset == null) { + citationSubset = new ArrayList(); + } + return this.citationSubset; + } + + /** + * Gets the value of the commentsCorrectionsList property. + * + * @return + * possible object is + * {@link CommentsCorrectionsList } + * + */ + public CommentsCorrectionsList getCommentsCorrectionsList() { + return commentsCorrectionsList; + } + + /** + * Sets the value of the commentsCorrectionsList property. + * + * @param value + * allowed object is + * {@link CommentsCorrectionsList } + * + */ + public void setCommentsCorrectionsList(CommentsCorrectionsList value) { + this.commentsCorrectionsList = value; + } + + /** + * Gets the value of the geneSymbolList property. + * + * @return + * possible object is + * {@link GeneSymbolList } + * + */ + public GeneSymbolList getGeneSymbolList() { + return geneSymbolList; + } + + /** + * Sets the value of the geneSymbolList property. + * + * @param value + * allowed object is + * {@link GeneSymbolList } + * + */ + public void setGeneSymbolList(GeneSymbolList value) { + this.geneSymbolList = value; + } + + /** + * Gets the value of the meshHeadingList property. + * + * @return + * possible object is + * {@link MeshHeadingList } + * + */ + public MeshHeadingList getMeshHeadingList() { + return meshHeadingList; + } + + /** + * Sets the value of the meshHeadingList property. + * + * @param value + * allowed object is + * {@link MeshHeadingList } + * + */ + public void setMeshHeadingList(MeshHeadingList value) { + this.meshHeadingList = value; + } + + /** + * Gets the value of the numberOfReferences property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumberOfReferences() { + return numberOfReferences; + } + + /** + * Sets the value of the numberOfReferences property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumberOfReferences(String value) { + this.numberOfReferences = value; + } + + /** + * Gets the value of the personalNameSubjectList property. + * + * @return + * possible object is + * {@link PersonalNameSubjectList } + * + */ + public PersonalNameSubjectList getPersonalNameSubjectList() { + return personalNameSubjectList; + } + + /** + * Sets the value of the personalNameSubjectList property. + * + * @param value + * allowed object is + * {@link PersonalNameSubjectList } + * + */ + public void setPersonalNameSubjectList(PersonalNameSubjectList value) { + this.personalNameSubjectList = value; + } + + /** + * Gets the value of the otherID property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the otherID property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getOtherID().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link OtherID } + * + * + */ + public List getOtherID() { + if (otherID == null) { + otherID = new ArrayList(); + } + return this.otherID; + } + + /** + * Gets the value of the otherAbstract property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the otherAbstract property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getOtherAbstract().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link OtherAbstract } + * + * + */ + public List getOtherAbstract() { + if (otherAbstract == null) { + otherAbstract = new ArrayList(); + } + return this.otherAbstract; + } + + /** + * Gets the value of the keywordList property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the keywordList property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getKeywordList().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link KeywordList } + * + * + */ + public List getKeywordList() { + if (keywordList == null) { + keywordList = new ArrayList(); + } + return this.keywordList; + } + + /** + * Gets the value of the spaceFlightMission property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the spaceFlightMission property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getSpaceFlightMission().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getSpaceFlightMission() { + if (spaceFlightMission == null) { + spaceFlightMission = new ArrayList(); + } + return this.spaceFlightMission; + } + + /** + * Gets the value of the investigatorList property. + * + * @return + * possible object is + * {@link InvestigatorList } + * + */ + public InvestigatorList getInvestigatorList() { + return investigatorList; + } + + /** + * Sets the value of the investigatorList property. + * + * @param value + * allowed object is + * {@link InvestigatorList } + * + */ + public void setInvestigatorList(InvestigatorList value) { + this.investigatorList = value; + } + + /** + * Gets the value of the generalNote property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the generalNote property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getGeneralNote().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link GeneralNote } + * + * + */ + public List getGeneralNote() { + if (generalNote == null) { + generalNote = new ArrayList(); + } + return this.generalNote; + } + + /** + * Gets the value of the owner property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOwner() { + if (owner == null) { + return "NLM"; + } else { + return owner; + } + } + + /** + * Sets the value of the owner property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOwner(String value) { + this.owner = value; + } + + /** + * Gets the value of the status property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getStatus() { + return status; + } + + /** + * Sets the value of the status property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStatus(String value) { + this.status = value; + } + + /** + * Gets the value of the versionID property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersionID() { + return versionID; + } + + /** + * Sets the value of the versionID property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersionID(String value) { + this.versionID = value; + } + + /** + * Gets the value of the versionDate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersionDate() { + return versionDate; + } + + /** + * Sets the value of the versionDate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersionDate(String value) { + this.versionDate = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineCitationSet.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineCitationSet.java new file mode 100644 index 00000000000..9aa9128ba15 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineCitationSet.java @@ -0,0 +1,106 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}MedlineCitation" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{}DeleteCitation" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "medlineCitation", + "deleteCitation" +}) +@XmlRootElement(name = "MedlineCitationSet") +public class MedlineCitationSet { + + @XmlElement(name = "MedlineCitation") + protected List medlineCitation; + @XmlElement(name = "DeleteCitation") + protected DeleteCitation deleteCitation; + + /** + * Gets the value of the medlineCitation property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the medlineCitation property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getMedlineCitation().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link MedlineCitation } + * + * + */ + public List getMedlineCitation() { + if (medlineCitation == null) { + medlineCitation = new ArrayList(); + } + return this.medlineCitation; + } + + /** + * Gets the value of the deleteCitation property. + * + * @return + * possible object is + * {@link DeleteCitation } + * + */ + public DeleteCitation getDeleteCitation() { + return deleteCitation; + } + + /** + * Sets the value of the deleteCitation property. + * + * @param value + * allowed object is + * {@link DeleteCitation } + * + */ + public void setDeleteCitation(DeleteCitation value) { + this.deleteCitation = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineJournalInfo.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineJournalInfo.java new file mode 100644 index 00000000000..0d1e1eec03b --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MedlineJournalInfo.java @@ -0,0 +1,155 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Country" minOccurs="0"/>
+ *         <element ref="{}MedlineTA"/>
+ *         <element ref="{}NlmUniqueID" minOccurs="0"/>
+ *         <element ref="{}ISSNLinking" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "country", + "medlineTA", + "nlmUniqueID", + "issnLinking" +}) +@XmlRootElement(name = "MedlineJournalInfo") +public class MedlineJournalInfo { + + @XmlElement(name = "Country") + protected String country; + @XmlElement(name = "MedlineTA", required = true) + protected String medlineTA; + @XmlElement(name = "NlmUniqueID") + protected String nlmUniqueID; + @XmlElement(name = "ISSNLinking") + protected String issnLinking; + + /** + * Gets the value of the country property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCountry() { + return country; + } + + /** + * Sets the value of the country property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCountry(String value) { + this.country = value; + } + + /** + * Gets the value of the medlineTA property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMedlineTA() { + return medlineTA; + } + + /** + * Sets the value of the medlineTA property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMedlineTA(String value) { + this.medlineTA = value; + } + + /** + * Gets the value of the nlmUniqueID property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNlmUniqueID() { + return nlmUniqueID; + } + + /** + * Sets the value of the nlmUniqueID property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNlmUniqueID(String value) { + this.nlmUniqueID = value; + } + + /** + * Gets the value of the issnLinking property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getISSNLinking() { + return issnLinking; + } + + /** + * Sets the value of the issnLinking property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setISSNLinking(String value) { + this.issnLinking = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MeshHeading.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MeshHeading.java new file mode 100644 index 00000000000..6ff67640567 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MeshHeading.java @@ -0,0 +1,106 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}DescriptorName"/>
+ *         <element ref="{}QualifierName" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "descriptorName", + "qualifierName" +}) +@XmlRootElement(name = "MeshHeading") +public class MeshHeading { + + @XmlElement(name = "DescriptorName", required = true) + protected DescriptorName descriptorName; + @XmlElement(name = "QualifierName") + protected List qualifierName; + + /** + * Gets the value of the descriptorName property. + * + * @return + * possible object is + * {@link DescriptorName } + * + */ + public DescriptorName getDescriptorName() { + return descriptorName; + } + + /** + * Sets the value of the descriptorName property. + * + * @param value + * allowed object is + * {@link DescriptorName } + * + */ + public void setDescriptorName(DescriptorName value) { + this.descriptorName = value; + } + + /** + * Gets the value of the qualifierName property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the qualifierName property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getQualifierName().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link QualifierName } + * + * + */ + public List getQualifierName() { + if (qualifierName == null) { + qualifierName = new ArrayList(); + } + return this.qualifierName; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MeshHeadingList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MeshHeadingList.java new file mode 100644 index 00000000000..3311f796add --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/MeshHeadingList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}MeshHeading" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "meshHeading" +}) +@XmlRootElement(name = "MeshHeadingList") +public class MeshHeadingList { + + @XmlElement(name = "MeshHeading", required = true) + protected List meshHeading; + + /** + * Gets the value of the meshHeading property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the meshHeading property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getMeshHeading().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link MeshHeading } + * + * + */ + public List getMeshHeading() { + if (meshHeading == null) { + meshHeading = new ArrayList(); + } + return this.meshHeading; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/NameOfSubstance.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/NameOfSubstance.java new file mode 100644 index 00000000000..2e84947b55b --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/NameOfSubstance.java @@ -0,0 +1,98 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.NameOfSubstance"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "NameOfSubstance") +public class NameOfSubstance { + + @XmlValue + protected String content; + @XmlAttribute(name = "UI", required = true) + @XmlSchemaType(name = "anySimpleType") + protected String ui; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the ui property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUI() { + return ui; + } + + /** + * Sets the value of the ui property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUI(String value) { + this.ui = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/NormalDate.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/NormalDate.java new file mode 100644 index 00000000000..b6e34f39d7d --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/NormalDate.java @@ -0,0 +1,217 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for normal.date complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="normal.date">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Year"/>
+ *         <element ref="{}Month"/>
+ *         <element ref="{}Day"/>
+ *         <sequence minOccurs="0">
+ *           <element ref="{}Hour"/>
+ *           <sequence minOccurs="0">
+ *             <element ref="{}Minute"/>
+ *             <element ref="{}Second" minOccurs="0"/>
+ *           </sequence>
+ *         </sequence>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "normal.date", propOrder = { + "year", + "month", + "day", + "hour", + "minute", + "second" +}) +@XmlSeeAlso({ + PubMedPubDate.class +}) +public class NormalDate { + + @XmlElement(name = "Year", required = true) + protected String year; + @XmlElement(name = "Month", required = true) + protected String month; + @XmlElement(name = "Day", required = true) + protected String day; + @XmlElement(name = "Hour") + protected String hour; + @XmlElement(name = "Minute") + protected String minute; + @XmlElement(name = "Second") + protected String second; + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setYear(String value) { + this.year = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the day property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDay() { + return day; + } + + /** + * Sets the value of the day property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDay(String value) { + this.day = value; + } + + /** + * Gets the value of the hour property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHour() { + return hour; + } + + /** + * Sets the value of the hour property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHour(String value) { + this.hour = value; + } + + /** + * Gets the value of the minute property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMinute() { + return minute; + } + + /** + * Sets the value of the minute property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMinute(String value) { + this.minute = value; + } + + /** + * Gets the value of the second property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSecond() { + return second; + } + + /** + * Sets the value of the second property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSecond(String value) { + this.second = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Object.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Object.java new file mode 100644 index 00000000000..0df07adf0d4 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Object.java @@ -0,0 +1,108 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Param" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.Object"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "param" +}) +@XmlRootElement(name = "Object") +public class Object { + + @XmlElement(name = "Param") + protected List param; + @XmlAttribute(name = "Type", required = true) + @XmlSchemaType(name = "anySimpleType") + protected String type; + + /** + * Gets the value of the param property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the param property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getParam().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Param } + * + * + */ + public List getParam() { + if (param == null) { + param = new ArrayList(); + } + return this.param; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ObjectFactory.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ObjectFactory.java new file mode 100644 index 00000000000..d7c47c0acf0 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ObjectFactory.java @@ -0,0 +1,1268 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jabref.logic.importer.fileformat.medline package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _MedlinePgn_QNAME = new QName("", "MedlinePgn"); + private final static QName _EndPage_QNAME = new QName("", "EndPage"); + private final static QName _NlmUniqueID_QNAME = new QName("", "NlmUniqueID"); + private final static QName _ContractNumber_QNAME = new QName("", "ContractNumber"); + private final static QName _Issue_QNAME = new QName("", "Issue"); + private final static QName _CopyrightInformation_QNAME = new QName("", "CopyrightInformation"); + private final static QName _ISOAbbreviation_QNAME = new QName("", "ISOAbbreviation"); + private final static QName _NumberOfReferences_QNAME = new QName("", "NumberOfReferences"); + private final static QName _Month_QNAME = new QName("", "Month"); + private final static QName _Item_QNAME = new QName("", "Item"); + private final static QName _CitationSubset_QNAME = new QName("", "CitationSubset"); + private final static QName _VolumeTitle_QNAME = new QName("", "VolumeTitle"); + private final static QName _PublicationStatus_QNAME = new QName("", "PublicationStatus"); + private final static QName _RefSource_QNAME = new QName("", "RefSource"); + private final static QName _Affiliation_QNAME = new QName("", "Affiliation"); + private final static QName _SpaceFlightMission_QNAME = new QName("", "SpaceFlightMission"); + private final static QName _ForeName_QNAME = new QName("", "ForeName"); + private final static QName _Hour_QNAME = new QName("", "Hour"); + private final static QName _Format_QNAME = new QName("", "format"); + private final static QName _MedlineTA_QNAME = new QName("", "MedlineTA"); + private final static QName _Initials_QNAME = new QName("", "Initials"); + private final static QName _Edition_QNAME = new QName("", "Edition"); + private final static QName _Suffix_QNAME = new QName("", "Suffix"); + private final static QName _Isbn_QNAME = new QName("", "Isbn"); + private final static QName _Volume_QNAME = new QName("", "Volume"); + private final static QName _Medium_QNAME = new QName("", "Medium"); + private final static QName _PublisherName_QNAME = new QName("", "PublisherName"); + private final static QName _Note_QNAME = new QName("", "Note"); + private final static QName _Country_QNAME = new QName("", "Country"); + private final static QName _LastName_QNAME = new QName("", "LastName"); + private final static QName _AccessionNumber_QNAME = new QName("", "AccessionNumber"); + private final static QName _MedlineDate_QNAME = new QName("", "MedlineDate"); + private final static QName _Sub_QNAME = new QName("", "sub"); + private final static QName _DataBankName_QNAME = new QName("", "DataBankName"); + private final static QName _Sup_QNAME = new QName("", "sup"); + private final static QName _PublisherLocation_QNAME = new QName("", "PublisherLocation"); + private final static QName _Minute_QNAME = new QName("", "Minute"); + private final static QName _Language_QNAME = new QName("", "Language"); + private final static QName _Season_QNAME = new QName("", "Season"); + private final static QName _GeneSymbol_QNAME = new QName("", "GeneSymbol"); + private final static QName _RegistryNumber_QNAME = new QName("", "RegistryNumber"); + private final static QName _B_QNAME = new QName("", "b"); + private final static QName _Agency_QNAME = new QName("", "Agency"); + private final static QName _Title_QNAME = new QName("", "Title"); + private final static QName _I_QNAME = new QName("", "i"); + private final static QName _CitationString_QNAME = new QName("", "CitationString"); + private final static QName _VernacularTitle_QNAME = new QName("", "VernacularTitle"); + private final static QName _Year_QNAME = new QName("", "Year"); + private final static QName _Second_QNAME = new QName("", "Second"); + private final static QName _StartPage_QNAME = new QName("", "StartPage"); + private final static QName _U_QNAME = new QName("", "u"); + private final static QName _ReportNumber_QNAME = new QName("", "ReportNumber"); + private final static QName _CollectiveName_QNAME = new QName("", "CollectiveName"); + private final static QName _GrantID_QNAME = new QName("", "GrantID"); + private final static QName _ISSNLinking_QNAME = new QName("", "ISSNLinking"); + private final static QName _Acronym_QNAME = new QName("", "Acronym"); + private final static QName _Day_QNAME = new QName("", "Day"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jabref.logic.importer.fileformat.medline + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GrantList } + * + */ + public GrantList createGrantList() { + return new GrantList(); + } + + /** + * Create an instance of {@link Grant } + * + */ + public Grant createGrant() { + return new Grant(); + } + + /** + * Create an instance of {@link GeneSymbolList } + * + */ + public GeneSymbolList createGeneSymbolList() { + return new GeneSymbolList(); + } + + /** + * Create an instance of {@link History } + * + */ + public History createHistory() { + return new History(); + } + + /** + * Create an instance of {@link PubMedPubDate } + * + */ + public PubMedPubDate createPubMedPubDate() { + return new PubMedPubDate(); + } + + /** + * Create an instance of {@link NormalDate } + * + */ + public NormalDate createNormalDate() { + return new NormalDate(); + } + + /** + * Create an instance of {@link NameOfSubstance } + * + */ + public NameOfSubstance createNameOfSubstance() { + return new NameOfSubstance(); + } + + /** + * Create an instance of {@link MedlineJournalInfo } + * + */ + public MedlineJournalInfo createMedlineJournalInfo() { + return new MedlineJournalInfo(); + } + + /** + * Create an instance of {@link BeginningDate } + * + */ + public BeginningDate createBeginningDate() { + return new BeginningDate(); + } + + /** + * Create an instance of {@link CollectionTitle } + * + */ + public CollectionTitle createCollectionTitle() { + return new CollectionTitle(); + } + + /** + * Create an instance of {@link Text } + * + */ + public Text createText() { + return new Text(); + } + + /** + * Create an instance of {@link PubmedBookArticle } + * + */ + public PubmedBookArticle createPubmedBookArticle() { + return new PubmedBookArticle(); + } + + /** + * Create an instance of {@link BookDocument } + * + */ + public BookDocument createBookDocument() { + return new BookDocument(); + } + + /** + * Create an instance of {@link PMID } + * + */ + public PMID createPMID() { + return new PMID(); + } + + /** + * Create an instance of {@link ArticleIdList } + * + */ + public ArticleIdList createArticleIdList() { + return new ArticleIdList(); + } + + /** + * Create an instance of {@link ArticleId } + * + */ + public ArticleId createArticleId() { + return new ArticleId(); + } + + /** + * Create an instance of {@link Book } + * + */ + public Book createBook() { + return new Book(); + } + + /** + * Create an instance of {@link Publisher } + * + */ + public Publisher createPublisher() { + return new Publisher(); + } + + /** + * Create an instance of {@link BookTitle } + * + */ + public BookTitle createBookTitle() { + return new BookTitle(); + } + + /** + * Create an instance of {@link PubDate } + * + */ + public PubDate createPubDate() { + return new PubDate(); + } + + /** + * Create an instance of {@link EndingDate } + * + */ + public EndingDate createEndingDate() { + return new EndingDate(); + } + + /** + * Create an instance of {@link AuthorList } + * + */ + public AuthorList createAuthorList() { + return new AuthorList(); + } + + /** + * Create an instance of {@link Author } + * + */ + public Author createAuthor() { + return new Author(); + } + + /** + * Create an instance of {@link Identifier } + * + */ + public Identifier createIdentifier() { + return new Identifier(); + } + + /** + * Create an instance of {@link AffiliationInfo } + * + */ + public AffiliationInfo createAffiliationInfo() { + return new AffiliationInfo(); + } + + /** + * Create an instance of {@link ELocationID } + * + */ + public ELocationID createELocationID() { + return new ELocationID(); + } + + /** + * Create an instance of {@link LocationLabel } + * + */ + public LocationLabel createLocationLabel() { + return new LocationLabel(); + } + + /** + * Create an instance of {@link ArticleTitle } + * + */ + public ArticleTitle createArticleTitle() { + return new ArticleTitle(); + } + + /** + * Create an instance of {@link Pagination } + * + */ + public Pagination createPagination() { + return new Pagination(); + } + + /** + * Create an instance of {@link PublicationType } + * + */ + public PublicationType createPublicationType() { + return new PublicationType(); + } + + /** + * Create an instance of {@link Abstract } + * + */ + public Abstract createAbstract() { + return new Abstract(); + } + + /** + * Create an instance of {@link AbstractText } + * + */ + public AbstractText createAbstractText() { + return new AbstractText(); + } + + /** + * Create an instance of {@link Sections } + * + */ + public Sections createSections() { + return new Sections(); + } + + /** + * Create an instance of {@link Section } + * + */ + public Section createSection() { + return new Section(); + } + + /** + * Create an instance of {@link SectionTitle } + * + */ + public SectionTitle createSectionTitle() { + return new SectionTitle(); + } + + /** + * Create an instance of {@link KeywordList } + * + */ + public KeywordList createKeywordList() { + return new KeywordList(); + } + + /** + * Create an instance of {@link Keyword } + * + */ + public Keyword createKeyword() { + return new Keyword(); + } + + /** + * Create an instance of {@link ContributionDate } + * + */ + public ContributionDate createContributionDate() { + return new ContributionDate(); + } + + /** + * Create an instance of {@link DateRevised } + * + */ + public DateRevised createDateRevised() { + return new DateRevised(); + } + + /** + * Create an instance of {@link ItemList } + * + */ + public ItemList createItemList() { + return new ItemList(); + } + + /** + * Create an instance of {@link PubmedBookData } + * + */ + public PubmedBookData createPubmedBookData() { + return new PubmedBookData(); + } + + /** + * Create an instance of {@link ObjectList } + * + */ + public ObjectList createObjectList() { + return new ObjectList(); + } + + /** + * Create an instance of {@link Object } + * + */ + public Object createObject() { + return new Object(); + } + + /** + * Create an instance of {@link Param } + * + */ + public Param createParam() { + return new Param(); + } + + /** + * Create an instance of {@link GeneralNote } + * + */ + public GeneralNote createGeneralNote() { + return new GeneralNote(); + } + + /** + * Create an instance of {@link JournalIssue } + * + */ + public JournalIssue createJournalIssue() { + return new JournalIssue(); + } + + /** + * Create an instance of {@link BookDocumentSet } + * + */ + public BookDocumentSet createBookDocumentSet() { + return new BookDocumentSet(); + } + + /** + * Create an instance of {@link DeleteDocument } + * + */ + public DeleteDocument createDeleteDocument() { + return new DeleteDocument(); + } + + /** + * Create an instance of {@link PubmedArticleSet } + * + */ + public PubmedArticleSet createPubmedArticleSet() { + return new PubmedArticleSet(); + } + + /** + * Create an instance of {@link PubmedArticle } + * + */ + public PubmedArticle createPubmedArticle() { + return new PubmedArticle(); + } + + /** + * Create an instance of {@link MedlineCitation } + * + */ + public MedlineCitation createMedlineCitation() { + return new MedlineCitation(); + } + + /** + * Create an instance of {@link DateCreated } + * + */ + public DateCreated createDateCreated() { + return new DateCreated(); + } + + /** + * Create an instance of {@link DateCompleted } + * + */ + public DateCompleted createDateCompleted() { + return new DateCompleted(); + } + + /** + * Create an instance of {@link Article } + * + */ + public Article createArticle() { + return new Article(); + } + + /** + * Create an instance of {@link Journal } + * + */ + public Journal createJournal() { + return new Journal(); + } + + /** + * Create an instance of {@link ISSN } + * + */ + public ISSN createISSN() { + return new ISSN(); + } + + /** + * Create an instance of {@link DataBankList } + * + */ + public DataBankList createDataBankList() { + return new DataBankList(); + } + + /** + * Create an instance of {@link DataBank } + * + */ + public DataBank createDataBank() { + return new DataBank(); + } + + /** + * Create an instance of {@link AccessionNumberList } + * + */ + public AccessionNumberList createAccessionNumberList() { + return new AccessionNumberList(); + } + + /** + * Create an instance of {@link PublicationTypeList } + * + */ + public PublicationTypeList createPublicationTypeList() { + return new PublicationTypeList(); + } + + /** + * Create an instance of {@link ArticleDate } + * + */ + public ArticleDate createArticleDate() { + return new ArticleDate(); + } + + /** + * Create an instance of {@link ChemicalList } + * + */ + public ChemicalList createChemicalList() { + return new ChemicalList(); + } + + /** + * Create an instance of {@link Chemical } + * + */ + public Chemical createChemical() { + return new Chemical(); + } + + /** + * Create an instance of {@link SupplMeshList } + * + */ + public SupplMeshList createSupplMeshList() { + return new SupplMeshList(); + } + + /** + * Create an instance of {@link SupplMeshName } + * + */ + public SupplMeshName createSupplMeshName() { + return new SupplMeshName(); + } + + /** + * Create an instance of {@link CommentsCorrectionsList } + * + */ + public CommentsCorrectionsList createCommentsCorrectionsList() { + return new CommentsCorrectionsList(); + } + + /** + * Create an instance of {@link CommentsCorrections } + * + */ + public CommentsCorrections createCommentsCorrections() { + return new CommentsCorrections(); + } + + /** + * Create an instance of {@link MeshHeadingList } + * + */ + public MeshHeadingList createMeshHeadingList() { + return new MeshHeadingList(); + } + + /** + * Create an instance of {@link MeshHeading } + * + */ + public MeshHeading createMeshHeading() { + return new MeshHeading(); + } + + /** + * Create an instance of {@link DescriptorName } + * + */ + public DescriptorName createDescriptorName() { + return new DescriptorName(); + } + + /** + * Create an instance of {@link QualifierName } + * + */ + public QualifierName createQualifierName() { + return new QualifierName(); + } + + /** + * Create an instance of {@link PersonalNameSubjectList } + * + */ + public PersonalNameSubjectList createPersonalNameSubjectList() { + return new PersonalNameSubjectList(); + } + + /** + * Create an instance of {@link PersonalNameSubject } + * + */ + public PersonalNameSubject createPersonalNameSubject() { + return new PersonalNameSubject(); + } + + /** + * Create an instance of {@link OtherID } + * + */ + public OtherID createOtherID() { + return new OtherID(); + } + + /** + * Create an instance of {@link OtherAbstract } + * + */ + public OtherAbstract createOtherAbstract() { + return new OtherAbstract(); + } + + /** + * Create an instance of {@link InvestigatorList } + * + */ + public InvestigatorList createInvestigatorList() { + return new InvestigatorList(); + } + + /** + * Create an instance of {@link Investigator } + * + */ + public Investigator createInvestigator() { + return new Investigator(); + } + + /** + * Create an instance of {@link PubmedData } + * + */ + public PubmedData createPubmedData() { + return new PubmedData(); + } + + /** + * Create an instance of {@link PubmedBookArticleSet } + * + */ + public PubmedBookArticleSet createPubmedBookArticleSet() { + return new PubmedBookArticleSet(); + } + + /** + * Create an instance of {@link DeleteCitation } + * + */ + public DeleteCitation createDeleteCitation() { + return new DeleteCitation(); + } + + /** + * Create an instance of {@link URL } + * + */ + public URL createURL() { + return new URL(); + } + + /** + * Create an instance of {@link MedlineCitationSet } + * + */ + public MedlineCitationSet createMedlineCitationSet() { + return new MedlineCitationSet(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "MedlinePgn") + public JAXBElement createMedlinePgn(String value) { + return new JAXBElement(_MedlinePgn_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "EndPage") + public JAXBElement createEndPage(String value) { + return new JAXBElement(_EndPage_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "NlmUniqueID") + public JAXBElement createNlmUniqueID(String value) { + return new JAXBElement(_NlmUniqueID_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "ContractNumber") + public JAXBElement createContractNumber(String value) { + return new JAXBElement(_ContractNumber_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Issue") + public JAXBElement createIssue(String value) { + return new JAXBElement(_Issue_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "CopyrightInformation") + public JAXBElement createCopyrightInformation(String value) { + return new JAXBElement(_CopyrightInformation_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "ISOAbbreviation") + public JAXBElement createISOAbbreviation(String value) { + return new JAXBElement(_ISOAbbreviation_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "NumberOfReferences") + public JAXBElement createNumberOfReferences(String value) { + return new JAXBElement(_NumberOfReferences_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Month") + public JAXBElement createMonth(String value) { + return new JAXBElement(_Month_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Item") + public JAXBElement createItem(String value) { + return new JAXBElement(_Item_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "CitationSubset") + public JAXBElement createCitationSubset(String value) { + return new JAXBElement(_CitationSubset_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "VolumeTitle") + public JAXBElement createVolumeTitle(Text value) { + return new JAXBElement(_VolumeTitle_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "PublicationStatus") + public JAXBElement createPublicationStatus(String value) { + return new JAXBElement(_PublicationStatus_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "RefSource") + public JAXBElement createRefSource(String value) { + return new JAXBElement(_RefSource_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Affiliation") + public JAXBElement createAffiliation(Text value) { + return new JAXBElement(_Affiliation_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "SpaceFlightMission") + public JAXBElement createSpaceFlightMission(String value) { + return new JAXBElement(_SpaceFlightMission_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "ForeName") + public JAXBElement createForeName(String value) { + return new JAXBElement(_ForeName_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Hour") + public JAXBElement createHour(String value) { + return new JAXBElement(_Hour_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "format") + public JAXBElement createFormat(Text value) { + return new JAXBElement(_Format_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "MedlineTA") + public JAXBElement createMedlineTA(String value) { + return new JAXBElement(_MedlineTA_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Initials") + public JAXBElement createInitials(String value) { + return new JAXBElement(_Initials_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Edition") + public JAXBElement createEdition(String value) { + return new JAXBElement(_Edition_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Suffix") + public JAXBElement createSuffix(Text value) { + return new JAXBElement(_Suffix_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Isbn") + public JAXBElement createIsbn(String value) { + return new JAXBElement(_Isbn_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Volume") + public JAXBElement createVolume(String value) { + return new JAXBElement(_Volume_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Medium") + public JAXBElement createMedium(String value) { + return new JAXBElement(_Medium_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "PublisherName") + public JAXBElement createPublisherName(Text value) { + return new JAXBElement(_PublisherName_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Note") + public JAXBElement createNote(String value) { + return new JAXBElement(_Note_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Country") + public JAXBElement createCountry(String value) { + return new JAXBElement(_Country_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "LastName") + public JAXBElement createLastName(String value) { + return new JAXBElement(_LastName_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "AccessionNumber") + public JAXBElement createAccessionNumber(String value) { + return new JAXBElement(_AccessionNumber_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "MedlineDate") + public JAXBElement createMedlineDate(String value) { + return new JAXBElement(_MedlineDate_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "sub", substitutionHeadNamespace = "", substitutionHeadName = "format") + public JAXBElement createSub(Text value) { + return new JAXBElement(_Sub_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "DataBankName") + public JAXBElement createDataBankName(String value) { + return new JAXBElement(_DataBankName_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "sup", substitutionHeadNamespace = "", substitutionHeadName = "format") + public JAXBElement createSup(Text value) { + return new JAXBElement(_Sup_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "PublisherLocation") + public JAXBElement createPublisherLocation(String value) { + return new JAXBElement(_PublisherLocation_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Minute") + public JAXBElement createMinute(String value) { + return new JAXBElement(_Minute_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Language") + public JAXBElement createLanguage(String value) { + return new JAXBElement(_Language_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Season") + public JAXBElement createSeason(String value) { + return new JAXBElement(_Season_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "GeneSymbol") + public JAXBElement createGeneSymbol(String value) { + return new JAXBElement(_GeneSymbol_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "RegistryNumber") + public JAXBElement createRegistryNumber(String value) { + return new JAXBElement(_RegistryNumber_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "b", substitutionHeadNamespace = "", substitutionHeadName = "format") + public JAXBElement createB(Text value) { + return new JAXBElement(_B_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Agency") + public JAXBElement createAgency(String value) { + return new JAXBElement(_Agency_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Title") + public JAXBElement createTitle(String value) { + return new JAXBElement(_Title_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "i", substitutionHeadNamespace = "", substitutionHeadName = "format") + public JAXBElement createI(Text value) { + return new JAXBElement(_I_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "CitationString") + public JAXBElement createCitationString(Text value) { + return new JAXBElement(_CitationString_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "VernacularTitle") + public JAXBElement createVernacularTitle(Text value) { + return new JAXBElement(_VernacularTitle_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Year") + public JAXBElement createYear(String value) { + return new JAXBElement(_Year_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Second") + public JAXBElement createSecond(String value) { + return new JAXBElement(_Second_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "StartPage") + public JAXBElement createStartPage(String value) { + return new JAXBElement(_StartPage_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "u", substitutionHeadNamespace = "", substitutionHeadName = "format") + public JAXBElement createU(Text value) { + return new JAXBElement(_U_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "ReportNumber") + public JAXBElement createReportNumber(String value) { + return new JAXBElement(_ReportNumber_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Text }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "CollectiveName") + public JAXBElement createCollectiveName(Text value) { + return new JAXBElement(_CollectiveName_QNAME, Text.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "GrantID") + public JAXBElement createGrantID(String value) { + return new JAXBElement(_GrantID_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "ISSNLinking") + public JAXBElement createISSNLinking(String value) { + return new JAXBElement(_ISSNLinking_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Acronym") + public JAXBElement createAcronym(String value) { + return new JAXBElement(_Acronym_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "Day") + public JAXBElement createDay(String value) { + return new JAXBElement(_Day_QNAME, String.class, null, value); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ObjectList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ObjectList.java new file mode 100644 index 00000000000..c38a9650336 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/ObjectList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Object" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "object" +}) +@XmlRootElement(name = "ObjectList") +public class ObjectList { + + @XmlElement(name = "Object", required = true) + protected List object; + + /** + * Gets the value of the object property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the object property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getObject().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Object } + * + * + */ + public List getObject() { + if (object == null) { + object = new ArrayList(); + } + return this.object; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/OtherAbstract.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/OtherAbstract.java new file mode 100644 index 00000000000..9303e5f0097 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/OtherAbstract.java @@ -0,0 +1,169 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}AbstractText" maxOccurs="unbounded"/>
+ *         <element ref="{}CopyrightInformation" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{}attlist.OtherAbstract"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "abstractText", + "copyrightInformation" +}) +@XmlRootElement(name = "OtherAbstract") +public class OtherAbstract { + + @XmlElement(name = "AbstractText", required = true) + protected List abstractText; + @XmlElement(name = "CopyrightInformation") + protected String copyrightInformation; + @XmlAttribute(name = "Type", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String type; + @XmlAttribute(name = "Language") + @XmlSchemaType(name = "anySimpleType") + protected String language; + + /** + * Gets the value of the abstractText property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the abstractText property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAbstractText().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AbstractText } + * + * + */ + public List getAbstractText() { + if (abstractText == null) { + abstractText = new ArrayList(); + } + return this.abstractText; + } + + /** + * Gets the value of the copyrightInformation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCopyrightInformation() { + return copyrightInformation; + } + + /** + * Sets the value of the copyrightInformation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCopyrightInformation(String value) { + this.copyrightInformation = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the language property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLanguage() { + if (language == null) { + return "eng"; + } else { + return language; + } + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLanguage(String value) { + this.language = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/OtherID.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/OtherID.java new file mode 100644 index 00000000000..02a46d347bb --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/OtherID.java @@ -0,0 +1,99 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.OtherID"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "OtherID") +public class OtherID { + + @XmlValue + protected String content; + @XmlAttribute(name = "Source", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String source; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the source property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSource() { + return source; + } + + /** + * Sets the value of the source property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSource(String value) { + this.source = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PMID.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PMID.java new file mode 100644 index 00000000000..9574fc7f9b9 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PMID.java @@ -0,0 +1,98 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.PMID"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "PMID") +public class PMID { + + @XmlValue + protected String content; + @XmlAttribute(name = "Version", required = true) + @XmlSchemaType(name = "anySimpleType") + protected String version; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the version property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersion() { + return version; + } + + /** + * Sets the value of the version property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersion(String value) { + this.version = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Pagination.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Pagination.java new file mode 100644 index 00000000000..19a31d91c84 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Pagination.java @@ -0,0 +1,101 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence>
+ *           <element ref="{}StartPage"/>
+ *           <element ref="{}EndPage" minOccurs="0"/>
+ *           <element ref="{}MedlinePgn" minOccurs="0"/>
+ *         </sequence>
+ *         <element ref="{}MedlinePgn"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "Pagination") +public class Pagination { + + @XmlElementRefs({ + @XmlElementRef(name = "EndPage", type = JAXBElement.class, required = false), + @XmlElementRef(name = "MedlinePgn", type = JAXBElement.class, required = false), + @XmlElementRef(name = "StartPage", type = JAXBElement.class, required = false) + }) + protected List> content; + + /** + * Gets the rest of the content model. + * + *

+ * You are getting this "catch-all" property because of the following reason: + * The field name "MedlinePgn" is used by two different parts of a schema. See: + * line 752 of file:/C:/git-repositories/jabref/jabref-multi-module-build/org.jabref.gui/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd + * line 750 of file:/C:/git-repositories/jabref/jabref-multi-module-build/org.jabref.gui/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd + *

+ * To get rid of this property, apply a property customization to one + * of both of the following declarations to change their names: + * Gets the value of the content property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the content property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getContent().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * + * + */ + public List> getContent() { + if (content == null) { + content = new ArrayList>(); + } + return this.content; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Param.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Param.java new file mode 100644 index 00000000000..ad214420c0f --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Param.java @@ -0,0 +1,71 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{}text">
+ *       <attGroup ref="{}attlist.Param"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "Param") +public class Param + extends Text +{ + + @XmlAttribute(name = "Name", required = true) + @XmlSchemaType(name = "anySimpleType") + protected String name; + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PersonalNameSubject.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PersonalNameSubject.java new file mode 100644 index 00000000000..350d87ca072 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PersonalNameSubject.java @@ -0,0 +1,155 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}LastName"/>
+ *         <element ref="{}ForeName" minOccurs="0"/>
+ *         <element ref="{}Initials" minOccurs="0"/>
+ *         <element ref="{}Suffix" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "lastName", + "foreName", + "initials", + "suffix" +}) +@XmlRootElement(name = "PersonalNameSubject") +public class PersonalNameSubject { + + @XmlElement(name = "LastName", required = true) + protected String lastName; + @XmlElement(name = "ForeName") + protected String foreName; + @XmlElement(name = "Initials") + protected String initials; + @XmlElement(name = "Suffix") + protected Text suffix; + + /** + * Gets the value of the lastName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLastName() { + return lastName; + } + + /** + * Sets the value of the lastName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLastName(String value) { + this.lastName = value; + } + + /** + * Gets the value of the foreName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getForeName() { + return foreName; + } + + /** + * Sets the value of the foreName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setForeName(String value) { + this.foreName = value; + } + + /** + * Gets the value of the initials property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getInitials() { + return initials; + } + + /** + * Sets the value of the initials property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setInitials(String value) { + this.initials = value; + } + + /** + * Gets the value of the suffix property. + * + * @return + * possible object is + * {@link Text } + * + */ + public Text getSuffix() { + return suffix; + } + + /** + * Sets the value of the suffix property. + * + * @param value + * allowed object is + * {@link Text } + * + */ + public void setSuffix(Text value) { + this.suffix = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PersonalNameSubjectList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PersonalNameSubjectList.java new file mode 100644 index 00000000000..105f9afce33 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PersonalNameSubjectList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}PersonalNameSubject" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "personalNameSubject" +}) +@XmlRootElement(name = "PersonalNameSubjectList") +public class PersonalNameSubjectList { + + @XmlElement(name = "PersonalNameSubject", required = true) + protected List personalNameSubject; + + /** + * Gets the value of the personalNameSubject property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the personalNameSubject property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPersonalNameSubject().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PersonalNameSubject } + * + * + */ + public List getPersonalNameSubject() { + if (personalNameSubject == null) { + personalNameSubject = new ArrayList(); + } + return this.personalNameSubject; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubDate.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubDate.java new file mode 100644 index 00000000000..c8cc0026a42 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubDate.java @@ -0,0 +1,189 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence>
+ *           <element ref="{}Year"/>
+ *           <choice minOccurs="0">
+ *             <sequence>
+ *               <element ref="{}Month"/>
+ *               <element ref="{}Day" minOccurs="0"/>
+ *             </sequence>
+ *             <element ref="{}Season"/>
+ *           </choice>
+ *         </sequence>
+ *         <element ref="{}MedlineDate"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "year", + "month", + "day", + "season", + "medlineDate" +}) +@XmlRootElement(name = "PubDate") +public class PubDate { + + @XmlElement(name = "Year") + protected String year; + @XmlElement(name = "Month") + protected String month; + @XmlElement(name = "Day") + protected String day; + @XmlElement(name = "Season") + protected String season; + @XmlElement(name = "MedlineDate") + protected String medlineDate; + + /** + * Gets the value of the year property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setYear(String value) { + this.year = value; + } + + /** + * Gets the value of the month property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMonth() { + return month; + } + + /** + * Sets the value of the month property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMonth(String value) { + this.month = value; + } + + /** + * Gets the value of the day property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDay() { + return day; + } + + /** + * Sets the value of the day property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDay(String value) { + this.day = value; + } + + /** + * Gets the value of the season property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeason() { + return season; + } + + /** + * Sets the value of the season property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeason(String value) { + this.season = value; + } + + /** + * Gets the value of the medlineDate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMedlineDate() { + return medlineDate; + } + + /** + * Sets the value of the medlineDate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMedlineDate(String value) { + this.medlineDate = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubMedPubDate.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubMedPubDate.java new file mode 100644 index 00000000000..ef3464a31f8 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubMedPubDate.java @@ -0,0 +1,69 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{}normal.date">
+ *       <attGroup ref="{}attlist.PubMedPubDate"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "PubMedPubDate") +public class PubMedPubDate + extends NormalDate +{ + + @XmlAttribute(name = "PubStatus", required = true) + protected String pubStatus; + + /** + * Gets the value of the pubStatus property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPubStatus() { + return pubStatus; + } + + /** + * Sets the value of the pubStatus property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPubStatus(String value) { + this.pubStatus = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubStatusInt.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubStatusInt.java new file mode 100644 index 00000000000..715beecf33f --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubStatusInt.java @@ -0,0 +1,79 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for pub.status.int. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ * 

+ * <simpleType name="pub.status.int">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *     <enumeration value="pmc"/>
+ *     <enumeration value="pmcr"/>
+ *     <enumeration value="pubmed"/>
+ *     <enumeration value="pubmedr"/>
+ *     <enumeration value="premedline"/>
+ *     <enumeration value="medline"/>
+ *     <enumeration value="medliner"/>
+ *     <enumeration value="entrez"/>
+ *     <enumeration value="pmc-release"/>
+ *   </restriction>
+ * </simpleType>
+ *
+ * + */ +@XmlType(name = "pub.status.int") +@XmlEnum +public enum PubStatusInt { + + @XmlEnumValue("pmc") + PMC("pmc"), + @XmlEnumValue("pmcr") + PMCR("pmcr"), + @XmlEnumValue("pubmed") + PUBMED("pubmed"), + @XmlEnumValue("pubmedr") + PUBMEDR("pubmedr"), + @XmlEnumValue("premedline") + PREMEDLINE("premedline"), + @XmlEnumValue("medline") + MEDLINE("medline"), + @XmlEnumValue("medliner") + MEDLINER("medliner"), + @XmlEnumValue("entrez") + ENTREZ("entrez"), + @XmlEnumValue("pmc-release") + PMC_RELEASE("pmc-release"); + private final String value; + + PubStatusInt(String v) { + value = v; + } + + public String value() { + return value; + } + + public static PubStatusInt fromValue(String v) { + for (PubStatusInt c: PubStatusInt.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PublicationType.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PublicationType.java new file mode 100644 index 00000000000..bc6f58c5172 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PublicationType.java @@ -0,0 +1,98 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.PublicationType"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "PublicationType") +public class PublicationType { + + @XmlValue + protected String content; + @XmlAttribute(name = "UI", required = true) + @XmlSchemaType(name = "anySimpleType") + protected String ui; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the ui property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUI() { + return ui; + } + + /** + * Sets the value of the ui property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUI(String value) { + this.ui = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PublicationTypeList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PublicationTypeList.java new file mode 100644 index 00000000000..2b068bd15e9 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PublicationTypeList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}PublicationType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "publicationType" +}) +@XmlRootElement(name = "PublicationTypeList") +public class PublicationTypeList { + + @XmlElement(name = "PublicationType", required = true) + protected List publicationType; + + /** + * Gets the value of the publicationType property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the publicationType property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPublicationType().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PublicationType } + * + * + */ + public List getPublicationType() { + if (publicationType == null) { + publicationType = new ArrayList(); + } + return this.publicationType; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Publisher.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Publisher.java new file mode 100644 index 00000000000..38ea6b5d9d0 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Publisher.java @@ -0,0 +1,99 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}PublisherName"/>
+ *         <element ref="{}PublisherLocation" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "publisherName", + "publisherLocation" +}) +@XmlRootElement(name = "Publisher") +public class Publisher { + + @XmlElement(name = "PublisherName", required = true) + protected Text publisherName; + @XmlElement(name = "PublisherLocation") + protected String publisherLocation; + + /** + * Gets the value of the publisherName property. + * + * @return + * possible object is + * {@link Text } + * + */ + public Text getPublisherName() { + return publisherName; + } + + /** + * Sets the value of the publisherName property. + * + * @param value + * allowed object is + * {@link Text } + * + */ + public void setPublisherName(Text value) { + this.publisherName = value; + } + + /** + * Gets the value of the publisherLocation property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPublisherLocation() { + return publisherLocation; + } + + /** + * Sets the value of the publisherLocation property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPublisherLocation(String value) { + this.publisherLocation = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedArticle.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedArticle.java new file mode 100644 index 00000000000..dc46ad0307c --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedArticle.java @@ -0,0 +1,99 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}MedlineCitation"/>
+ *         <element ref="{}PubmedData" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "medlineCitation", + "pubmedData" +}) +@XmlRootElement(name = "PubmedArticle") +public class PubmedArticle { + + @XmlElement(name = "MedlineCitation", required = true) + protected MedlineCitation medlineCitation; + @XmlElement(name = "PubmedData") + protected PubmedData pubmedData; + + /** + * Gets the value of the medlineCitation property. + * + * @return + * possible object is + * {@link MedlineCitation } + * + */ + public MedlineCitation getMedlineCitation() { + return medlineCitation; + } + + /** + * Sets the value of the medlineCitation property. + * + * @param value + * allowed object is + * {@link MedlineCitation } + * + */ + public void setMedlineCitation(MedlineCitation value) { + this.medlineCitation = value; + } + + /** + * Gets the value of the pubmedData property. + * + * @return + * possible object is + * {@link PubmedData } + * + */ + public PubmedData getPubmedData() { + return pubmedData; + } + + /** + * Sets the value of the pubmedData property. + * + * @param value + * allowed object is + * {@link PubmedData } + * + */ + public void setPubmedData(PubmedData value) { + this.pubmedData = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedArticleSet.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedArticleSet.java new file mode 100644 index 00000000000..38d0138c859 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedArticleSet.java @@ -0,0 +1,84 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{}PubmedArticle"/>
+ *         <element ref="{}PubmedBookArticle"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "pubmedArticleOrPubmedBookArticle" +}) +@XmlRootElement(name = "PubmedArticleSet") +public class PubmedArticleSet { + + @XmlElements({ + @XmlElement(name = "PubmedArticle", type = PubmedArticle.class), + @XmlElement(name = "PubmedBookArticle", type = PubmedBookArticle.class) + }) + protected List pubmedArticleOrPubmedBookArticle; + + /** + * Gets the value of the pubmedArticleOrPubmedBookArticle property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the pubmedArticleOrPubmedBookArticle property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPubmedArticleOrPubmedBookArticle().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PubmedArticle } + * {@link PubmedBookArticle } + * + * + */ + public List getPubmedArticleOrPubmedBookArticle() { + if (pubmedArticleOrPubmedBookArticle == null) { + pubmedArticleOrPubmedBookArticle = new ArrayList(); + } + return this.pubmedArticleOrPubmedBookArticle; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookArticle.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookArticle.java new file mode 100644 index 00000000000..0c5584f3154 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookArticle.java @@ -0,0 +1,99 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}BookDocument"/>
+ *         <element ref="{}PubmedBookData" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "bookDocument", + "pubmedBookData" +}) +@XmlRootElement(name = "PubmedBookArticle") +public class PubmedBookArticle { + + @XmlElement(name = "BookDocument", required = true) + protected BookDocument bookDocument; + @XmlElement(name = "PubmedBookData") + protected PubmedBookData pubmedBookData; + + /** + * Gets the value of the bookDocument property. + * + * @return + * possible object is + * {@link BookDocument } + * + */ + public BookDocument getBookDocument() { + return bookDocument; + } + + /** + * Sets the value of the bookDocument property. + * + * @param value + * allowed object is + * {@link BookDocument } + * + */ + public void setBookDocument(BookDocument value) { + this.bookDocument = value; + } + + /** + * Gets the value of the pubmedBookData property. + * + * @return + * possible object is + * {@link PubmedBookData } + * + */ + public PubmedBookData getPubmedBookData() { + return pubmedBookData; + } + + /** + * Sets the value of the pubmedBookData property. + * + * @param value + * allowed object is + * {@link PubmedBookData } + * + */ + public void setPubmedBookData(PubmedBookData value) { + this.pubmedBookData = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookArticleSet.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookArticleSet.java new file mode 100644 index 00000000000..9a73c4133a1 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookArticleSet.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}PubmedBookArticle" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "pubmedBookArticle" +}) +@XmlRootElement(name = "PubmedBookArticleSet") +public class PubmedBookArticleSet { + + @XmlElement(name = "PubmedBookArticle") + protected List pubmedBookArticle; + + /** + * Gets the value of the pubmedBookArticle property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the pubmedBookArticle property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPubmedBookArticle().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PubmedBookArticle } + * + * + */ + public List getPubmedBookArticle() { + if (pubmedBookArticle == null) { + pubmedBookArticle = new ArrayList(); + } + return this.pubmedBookArticle; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookData.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookData.java new file mode 100644 index 00000000000..f5467bc76c9 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedBookData.java @@ -0,0 +1,155 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}History" minOccurs="0"/>
+ *         <element ref="{}PublicationStatus"/>
+ *         <element ref="{}ArticleIdList"/>
+ *         <element ref="{}ObjectList" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "history", + "publicationStatus", + "articleIdList", + "objectList" +}) +@XmlRootElement(name = "PubmedBookData") +public class PubmedBookData { + + @XmlElement(name = "History") + protected History history; + @XmlElement(name = "PublicationStatus", required = true) + protected String publicationStatus; + @XmlElement(name = "ArticleIdList", required = true) + protected ArticleIdList articleIdList; + @XmlElement(name = "ObjectList") + protected ObjectList objectList; + + /** + * Gets the value of the history property. + * + * @return + * possible object is + * {@link History } + * + */ + public History getHistory() { + return history; + } + + /** + * Sets the value of the history property. + * + * @param value + * allowed object is + * {@link History } + * + */ + public void setHistory(History value) { + this.history = value; + } + + /** + * Gets the value of the publicationStatus property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPublicationStatus() { + return publicationStatus; + } + + /** + * Sets the value of the publicationStatus property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPublicationStatus(String value) { + this.publicationStatus = value; + } + + /** + * Gets the value of the articleIdList property. + * + * @return + * possible object is + * {@link ArticleIdList } + * + */ + public ArticleIdList getArticleIdList() { + return articleIdList; + } + + /** + * Sets the value of the articleIdList property. + * + * @param value + * allowed object is + * {@link ArticleIdList } + * + */ + public void setArticleIdList(ArticleIdList value) { + this.articleIdList = value; + } + + /** + * Gets the value of the objectList property. + * + * @return + * possible object is + * {@link ObjectList } + * + */ + public ObjectList getObjectList() { + return objectList; + } + + /** + * Sets the value of the objectList property. + * + * @param value + * allowed object is + * {@link ObjectList } + * + */ + public void setObjectList(ObjectList value) { + this.objectList = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedData.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedData.java new file mode 100644 index 00000000000..ffe1f89fec2 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/PubmedData.java @@ -0,0 +1,155 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}History" minOccurs="0"/>
+ *         <element ref="{}PublicationStatus"/>
+ *         <element ref="{}ArticleIdList"/>
+ *         <element ref="{}ObjectList" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "history", + "publicationStatus", + "articleIdList", + "objectList" +}) +@XmlRootElement(name = "PubmedData") +public class PubmedData { + + @XmlElement(name = "History") + protected History history; + @XmlElement(name = "PublicationStatus", required = true) + protected String publicationStatus; + @XmlElement(name = "ArticleIdList", required = true) + protected ArticleIdList articleIdList; + @XmlElement(name = "ObjectList") + protected ObjectList objectList; + + /** + * Gets the value of the history property. + * + * @return + * possible object is + * {@link History } + * + */ + public History getHistory() { + return history; + } + + /** + * Sets the value of the history property. + * + * @param value + * allowed object is + * {@link History } + * + */ + public void setHistory(History value) { + this.history = value; + } + + /** + * Gets the value of the publicationStatus property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPublicationStatus() { + return publicationStatus; + } + + /** + * Sets the value of the publicationStatus property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPublicationStatus(String value) { + this.publicationStatus = value; + } + + /** + * Gets the value of the articleIdList property. + * + * @return + * possible object is + * {@link ArticleIdList } + * + */ + public ArticleIdList getArticleIdList() { + return articleIdList; + } + + /** + * Sets the value of the articleIdList property. + * + * @param value + * allowed object is + * {@link ArticleIdList } + * + */ + public void setArticleIdList(ArticleIdList value) { + this.articleIdList = value; + } + + /** + * Gets the value of the objectList property. + * + * @return + * possible object is + * {@link ObjectList } + * + */ + public ObjectList getObjectList() { + return objectList; + } + + /** + * Sets the value of the objectList property. + * + * @param value + * allowed object is + * {@link ObjectList } + * + */ + public void setObjectList(ObjectList value) { + this.objectList = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/QualifierName.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/QualifierName.java new file mode 100644 index 00000000000..5c952f90574 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/QualifierName.java @@ -0,0 +1,131 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.QualifierName"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "QualifierName") +public class QualifierName { + + @XmlValue + protected String content; + @XmlAttribute(name = "MajorTopicYN") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String majorTopicYN; + @XmlAttribute(name = "UI", required = true) + @XmlSchemaType(name = "anySimpleType") + protected String ui; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the majorTopicYN property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMajorTopicYN() { + if (majorTopicYN == null) { + return "N"; + } else { + return majorTopicYN; + } + } + + /** + * Sets the value of the majorTopicYN property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMajorTopicYN(String value) { + this.majorTopicYN = value; + } + + /** + * Gets the value of the ui property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUI() { + return ui; + } + + /** + * Sets the value of the ui property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUI(String value) { + this.ui = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Section.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Section.java new file mode 100644 index 00000000000..254b37ab242 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Section.java @@ -0,0 +1,134 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}LocationLabel" minOccurs="0"/>
+ *         <element ref="{}SectionTitle"/>
+ *         <element ref="{}Section" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "locationLabel", + "sectionTitle", + "section" +}) +@XmlRootElement(name = "Section") +public class Section { + + @XmlElement(name = "LocationLabel") + protected LocationLabel locationLabel; + @XmlElement(name = "SectionTitle", required = true) + protected SectionTitle sectionTitle; + @XmlElement(name = "Section") + protected List
section; + + /** + * Gets the value of the locationLabel property. + * + * @return + * possible object is + * {@link LocationLabel } + * + */ + public LocationLabel getLocationLabel() { + return locationLabel; + } + + /** + * Sets the value of the locationLabel property. + * + * @param value + * allowed object is + * {@link LocationLabel } + * + */ + public void setLocationLabel(LocationLabel value) { + this.locationLabel = value; + } + + /** + * Gets the value of the sectionTitle property. + * + * @return + * possible object is + * {@link SectionTitle } + * + */ + public SectionTitle getSectionTitle() { + return sectionTitle; + } + + /** + * Sets the value of the sectionTitle property. + * + * @param value + * allowed object is + * {@link SectionTitle } + * + */ + public void setSectionTitle(SectionTitle value) { + this.sectionTitle = value; + } + + /** + * Gets the value of the section property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the section property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getSection().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Section } + * + * + */ + public List

getSection() { + if (section == null) { + section = new ArrayList
(); + } + return this.section; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SectionTitle.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SectionTitle.java new file mode 100644 index 00000000000..ab79cec2cda --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SectionTitle.java @@ -0,0 +1,125 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{}text">
+ *       <attGroup ref="{}attlist.SectionTitle"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "SectionTitle") +public class SectionTitle + extends Text +{ + + @XmlAttribute(name = "book") + @XmlSchemaType(name = "anySimpleType") + protected String book; + @XmlAttribute(name = "part") + @XmlSchemaType(name = "anySimpleType") + protected String part; + @XmlAttribute(name = "sec") + @XmlSchemaType(name = "anySimpleType") + protected String sec; + + /** + * Gets the value of the book property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBook() { + return book; + } + + /** + * Sets the value of the book property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBook(String value) { + this.book = value; + } + + /** + * Gets the value of the part property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPart() { + return part; + } + + /** + * Sets the value of the part property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPart(String value) { + this.part = value; + } + + /** + * Gets the value of the sec property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSec() { + return sec; + } + + /** + * Sets the value of the sec property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSec(String value) { + this.sec = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Sections.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Sections.java new file mode 100644 index 00000000000..9be94c85c4a --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Sections.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Section" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "section" +}) +@XmlRootElement(name = "Sections") +public class Sections { + + @XmlElement(name = "Section", required = true) + protected List
section; + + /** + * Gets the value of the section property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the section property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getSection().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Section } + * + * + */ + public List

getSection() { + if (section == null) { + section = new ArrayList
(); + } + return this.section; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SupplMeshList.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SupplMeshList.java new file mode 100644 index 00000000000..31d57542b88 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SupplMeshList.java @@ -0,0 +1,78 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}SupplMeshName" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "supplMeshName" +}) +@XmlRootElement(name = "SupplMeshList") +public class SupplMeshList { + + @XmlElement(name = "SupplMeshName", required = true) + protected List supplMeshName; + + /** + * Gets the value of the supplMeshName property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the supplMeshName property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getSupplMeshName().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link SupplMeshName } + * + * + */ + public List getSupplMeshName() { + if (supplMeshName == null) { + supplMeshName = new ArrayList(); + } + return this.supplMeshName; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SupplMeshName.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SupplMeshName.java new file mode 100644 index 00000000000..6fff834f664 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/SupplMeshName.java @@ -0,0 +1,127 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.SupplMeshName"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "SupplMeshName") +public class SupplMeshName { + + @XmlValue + protected String content; + @XmlAttribute(name = "Type", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String type; + @XmlAttribute(name = "UI", required = true) + @XmlSchemaType(name = "anySimpleType") + protected String ui; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the ui property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUI() { + return ui; + } + + /** + * Sets the value of the ui property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUI(String value) { + this.ui = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Text.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Text.java new file mode 100644 index 00000000000..51fe1267dda --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/Text.java @@ -0,0 +1,96 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlMixed; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for text complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="text">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}format" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "text", propOrder = { + "content" +}) +@XmlSeeAlso({ + Param.class, + Keyword.class, + SectionTitle.class, + AbstractText.class, + ArticleTitle.class, + BookTitle.class, + CollectionTitle.class +}) +public class Text { + + @XmlElementRef(name = "format", type = JAXBElement.class, required = false) + @XmlMixed + protected List content; + + /** + * Gets the value of the content property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the content property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getContent().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link Text }{@code >} + * {@link JAXBElement }{@code <}{@link Text }{@code >} + * {@link JAXBElement }{@code <}{@link Text }{@code >} + * {@link JAXBElement }{@code <}{@link Text }{@code >} + * {@link JAXBElement }{@code <}{@link Text }{@code >} + * {@link String } + * {@link JAXBElement }{@code <}{@link Text }{@code >} + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/URL.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/URL.java new file mode 100644 index 00000000000..76c602d41c0 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/medline/URL.java @@ -0,0 +1,125 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:29 PM CET +// + + +package org.jabref.logic.importer.fileformat.medline; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{}attlist.URL"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "content" +}) +@XmlRootElement(name = "URL") +public class URL { + + @XmlValue + protected String content; + @XmlAttribute(name = "lang") + protected IsoLanguageCodes lang; + @XmlAttribute(name = "Type") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String type; + + /** + * Gets the value of the content property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContent() { + return content; + } + + /** + * Sets the value of the content property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContent(String value) { + this.content = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link IsoLanguageCodes } + * + */ + public IsoLanguageCodes getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link IsoLanguageCodes } + * + */ + public void setLang(IsoLanguageCodes value) { + this.lang = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AbstractDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AbstractDefinition.java new file mode 100644 index 00000000000..5aac6dd2d3e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AbstractDefinition.java @@ -0,0 +1,396 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for abstractDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="abstractDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}altFormatAttributeGroup"/>
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="shareable" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="no" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "abstractDefinition", namespace = "http://www.loc.gov/mods/v3") +public class AbstractDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "shareable") + @XmlSchemaType(name = "anySimpleType") + protected String shareable; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "altFormat") + @XmlSchemaType(name = "anyURI") + protected String altFormat; + @XmlAttribute(name = "contentType") + protected String contentType; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the shareable property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShareable() { + if (shareable == null) { + return "no"; + } else { + return shareable; + } + } + + /** + * Sets the value of the shareable property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShareable(String value) { + this.shareable = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the altFormat property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltFormat() { + return altFormat; + } + + /** + * Sets the value of the altFormat property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltFormat(String value) { + this.altFormat = value; + } + + /** + * Gets the value of the contentType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContentType() { + return contentType; + } + + /** + * Sets the value of the contentType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContentType(String value) { + this.contentType = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AccessConditionDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AccessConditionDefinition.java new file mode 100644 index 00000000000..ed59599354e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AccessConditionDefinition.java @@ -0,0 +1,442 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for accessConditionDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="accessConditionDefinition">
+ *   <complexContent>
+ *     <extension base="{http://www.loc.gov/mods/v3}extensionDefinition">
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}altFormatAttributeGroup"/>
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "accessConditionDefinition", namespace = "http://www.loc.gov/mods/v3") +public class AccessConditionDefinition + extends ExtensionDefinition +{ + + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + @XmlAttribute(name = "altFormat") + @XmlSchemaType(name = "anyURI") + protected String altFormat; + @XmlAttribute(name = "contentType") + protected String contentType; + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + + /** + * Gets the value of the altFormat property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltFormat() { + return altFormat; + } + + /** + * Sets the value of the altFormat property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltFormat(String value) { + this.altFormat = value; + } + + /** + * Gets the value of the contentType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContentType() { + return contentType; + } + + /** + * Sets the value of the contentType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContentType(String value) { + this.contentType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AreaDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AreaDefinition.java new file mode 100644 index 00000000000..a7cab3d4596 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/AreaDefinition.java @@ -0,0 +1,69 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for areaDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="areaDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>hierarchicalPart">
+ *       <attribute name="areaType" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "areaDefinition", namespace = "http://www.loc.gov/mods/v3") +public class AreaDefinition + extends HierarchicalPart +{ + + @XmlAttribute(name = "areaType") + @XmlSchemaType(name = "anySimpleType") + protected String areaType; + + /** + * Gets the value of the areaType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAreaType() { + return areaType; + } + + /** + * Sets the value of the areaType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAreaType(String value) { + this.areaType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CartographicsDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CartographicsDefinition.java new file mode 100644 index 00000000000..521df08155c --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CartographicsDefinition.java @@ -0,0 +1,248 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cartographicsDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="cartographicsDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.loc.gov/mods/v3}scale" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}projection" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}coordinates" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}cartographicExtension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}authorityAttributeGroup"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cartographicsDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "scale", + "projection", + "coordinates", + "cartographicExtension" +}) +public class CartographicsDefinition { + + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected StringPlusLanguage scale; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected StringPlusLanguage projection; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List coordinates; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List cartographicExtension; + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + + /** + * Gets the value of the scale property. + * + * @return + * possible object is + * {@link StringPlusLanguage } + * + */ + public StringPlusLanguage getScale() { + return scale; + } + + /** + * Sets the value of the scale property. + * + * @param value + * allowed object is + * {@link StringPlusLanguage } + * + */ + public void setScale(StringPlusLanguage value) { + this.scale = value; + } + + /** + * Gets the value of the projection property. + * + * @return + * possible object is + * {@link StringPlusLanguage } + * + */ + public StringPlusLanguage getProjection() { + return projection; + } + + /** + * Sets the value of the projection property. + * + * @param value + * allowed object is + * {@link StringPlusLanguage } + * + */ + public void setProjection(StringPlusLanguage value) { + this.projection = value; + } + + /** + * Gets the value of the coordinates property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the coordinates property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getCoordinates().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link StringPlusLanguage } + * + * + */ + public List getCoordinates() { + if (coordinates == null) { + coordinates = new ArrayList(); + } + return this.coordinates; + } + + /** + * Gets the value of the cartographicExtension property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the cartographicExtension property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getCartographicExtension().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExtensionDefinition } + * + * + */ + public List getCartographicExtension() { + if (cartographicExtension == null) { + cartographicExtension = new ArrayList(); + } + return this.cartographicExtension; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CitySectionDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CitySectionDefinition.java new file mode 100644 index 00000000000..98ec5e59847 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CitySectionDefinition.java @@ -0,0 +1,69 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for citySectionDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="citySectionDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>hierarchicalPart">
+ *       <attribute name="citySectionType" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "citySectionDefinition", namespace = "http://www.loc.gov/mods/v3") +public class CitySectionDefinition + extends HierarchicalPart +{ + + @XmlAttribute(name = "citySectionType") + @XmlSchemaType(name = "anySimpleType") + protected String citySectionType; + + /** + * Gets the value of the citySectionType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCitySectionType() { + return citySectionType; + } + + /** + * Sets the value of the citySectionType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCitySectionType(String value) { + this.citySectionType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ClassificationDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ClassificationDefinition.java new file mode 100644 index 00000000000..55491269b29 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ClassificationDefinition.java @@ -0,0 +1,181 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for classificationDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="classificationDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguagePlusAuthority">
+ *       <attribute name="edition" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="usage" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="primary" />
+ *       <attribute name="generator" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "classificationDefinition", namespace = "http://www.loc.gov/mods/v3") +public class ClassificationDefinition + extends StringPlusLanguagePlusAuthority +{ + + @XmlAttribute(name = "edition") + protected String edition; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "usage") + @XmlSchemaType(name = "anySimpleType") + protected String usage; + @XmlAttribute(name = "generator") + protected String generator; + + /** + * Gets the value of the edition property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEdition() { + return edition; + } + + /** + * Sets the value of the edition property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEdition(String value) { + this.edition = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the usage property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUsage() { + if (usage == null) { + return "primary"; + } else { + return usage; + } + } + + /** + * Sets the value of the usage property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUsage(String value) { + this.usage = value; + } + + /** + * Gets the value of the generator property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getGenerator() { + return generator; + } + + /** + * Sets the value of the generator property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setGenerator(String value) { + this.generator = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CodeOrText.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CodeOrText.java new file mode 100644 index 00000000000..7bbd4815f1e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CodeOrText.java @@ -0,0 +1,58 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for codeOrText. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ * 

+ * <simpleType name="codeOrText">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="code"/>
+ *     <enumeration value="text"/>
+ *   </restriction>
+ * </simpleType>
+ *
+ * + */ +@XmlType(name = "codeOrText", namespace = "http://www.loc.gov/mods/v3") +@XmlEnum +public enum CodeOrText { + + @XmlEnumValue("code") + CODE("code"), + @XmlEnumValue("text") + TEXT("text"); + private final String value; + + CodeOrText(String v) { + value = v; + } + + public String value() { + return value; + } + + public static CodeOrText fromValue(String v) { + for (CodeOrText c: CodeOrText.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CopyInformationDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CopyInformationDefinition.java new file mode 100644 index 00000000000..844a807ecc2 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/CopyInformationDefinition.java @@ -0,0 +1,583 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for copyInformationDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="copyInformationDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.loc.gov/mods/v3}form" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}subLocation" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}shelfLocator" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}electronicLocator" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="note" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *                 <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *                 <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{http://www.loc.gov/mods/v3}enumerationAndChronology" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}itemIdentifier" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "copyInformationDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "form", + "subLocation", + "shelfLocator", + "electronicLocator", + "note", + "enumerationAndChronology", + "itemIdentifier" +}) +public class CopyInformationDefinition { + + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected FormDefinition form; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List subLocation; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List shelfLocator; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List electronicLocator; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List note; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List enumerationAndChronology; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List itemIdentifier; + + /** + * Gets the value of the form property. + * + * @return + * possible object is + * {@link FormDefinition } + * + */ + public FormDefinition getForm() { + return form; + } + + /** + * Sets the value of the form property. + * + * @param value + * allowed object is + * {@link FormDefinition } + * + */ + public void setForm(FormDefinition value) { + this.form = value; + } + + /** + * Gets the value of the subLocation property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the subLocation property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getSubLocation().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link StringPlusLanguage } + * + * + */ + public List getSubLocation() { + if (subLocation == null) { + subLocation = new ArrayList(); + } + return this.subLocation; + } + + /** + * Gets the value of the shelfLocator property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the shelfLocator property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getShelfLocator().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link StringPlusLanguage } + * + * + */ + public List getShelfLocator() { + if (shelfLocator == null) { + shelfLocator = new ArrayList(); + } + return this.shelfLocator; + } + + /** + * Gets the value of the electronicLocator property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the electronicLocator property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getElectronicLocator().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link StringPlusLanguage } + * + * + */ + public List getElectronicLocator() { + if (electronicLocator == null) { + electronicLocator = new ArrayList(); + } + return this.electronicLocator; + } + + /** + * Gets the value of the note property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the note property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getNote().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link CopyInformationDefinition.Note } + * + * + */ + public List getNote() { + if (note == null) { + note = new ArrayList(); + } + return this.note; + } + + /** + * Gets the value of the enumerationAndChronology property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the enumerationAndChronology property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getEnumerationAndChronology().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link EnumerationAndChronologyDefinition } + * + * + */ + public List getEnumerationAndChronology() { + if (enumerationAndChronology == null) { + enumerationAndChronology = new ArrayList(); + } + return this.enumerationAndChronology; + } + + /** + * Gets the value of the itemIdentifier property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the itemIdentifier property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getItemIdentifier().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ItemIdentifierDefinition } + * + * + */ + public List getItemIdentifier() { + if (itemIdentifier == null) { + itemIdentifier = new ArrayList(); + } + return this.itemIdentifier; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+     *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+     *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
+     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Note + extends StringPlusLanguage + { + + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DateDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DateDefinition.java new file mode 100644 index 00000000000..80f1af77fbb --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DateDefinition.java @@ -0,0 +1,184 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for dateDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="dateDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute name="encoding">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="w3cdtf"/>
+ *             <enumeration value="iso8601"/>
+ *             <enumeration value="marc"/>
+ *             <enumeration value="temper"/>
+ *             <enumeration value="edtf"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="qualifier">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="approximate"/>
+ *             <enumeration value="inferred"/>
+ *             <enumeration value="questionable"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="point">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="start"/>
+ *             <enumeration value="end"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="keyDate" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="yes" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "dateDefinition", namespace = "http://www.loc.gov/mods/v3") +@XmlSeeAlso({ + TemporalDefinition.class, + DateOtherDefinition.class +}) +public class DateDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "encoding") + protected String encoding; + @XmlAttribute(name = "qualifier") + protected String qualifier; + @XmlAttribute(name = "point") + protected String point; + @XmlAttribute(name = "keyDate") + @XmlSchemaType(name = "anySimpleType") + protected String keyDate; + + /** + * Gets the value of the encoding property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEncoding() { + return encoding; + } + + /** + * Sets the value of the encoding property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEncoding(String value) { + this.encoding = value; + } + + /** + * Gets the value of the qualifier property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getQualifier() { + return qualifier; + } + + /** + * Sets the value of the qualifier property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setQualifier(String value) { + this.qualifier = value; + } + + /** + * Gets the value of the point property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPoint() { + return point; + } + + /** + * Sets the value of the point property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPoint(String value) { + this.point = value; + } + + /** + * Gets the value of the keyDate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKeyDate() { + if (keyDate == null) { + return "yes"; + } else { + return keyDate; + } + } + + /** + * Sets the value of the keyDate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKeyDate(String value) { + this.keyDate = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DateOtherDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DateOtherDefinition.java new file mode 100644 index 00000000000..17d9e22e247 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DateOtherDefinition.java @@ -0,0 +1,67 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for dateOtherDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="dateOtherDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>dateDefinition">
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "dateOtherDefinition", namespace = "http://www.loc.gov/mods/v3") +public class DateOtherDefinition + extends DateDefinition +{ + + @XmlAttribute(name = "type") + protected String type; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DetailDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DetailDefinition.java new file mode 100644 index 00000000000..b0edd970115 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DetailDefinition.java @@ -0,0 +1,144 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for detailDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="detailDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://www.loc.gov/mods/v3}number"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}caption"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}title"/>
+ *       </choice>
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="level" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "detailDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "numberOrCaptionOrTitle" +}) +public class DetailDefinition { + + @XmlElementRefs({ + @XmlElementRef(name = "number", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "title", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "caption", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false) + }) + protected List> numberOrCaptionOrTitle; + @XmlAttribute(name = "type") + protected String type; + @XmlAttribute(name = "level") + @XmlSchemaType(name = "positiveInteger") + protected BigInteger level; + + /** + * Gets the value of the numberOrCaptionOrTitle property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the numberOrCaptionOrTitle property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getNumberOrCaptionOrTitle().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * + * + */ + public List> getNumberOrCaptionOrTitle() { + if (numberOrCaptionOrTitle == null) { + numberOrCaptionOrTitle = new ArrayList>(); + } + return this.numberOrCaptionOrTitle; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the level property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setLevel(BigInteger value) { + this.level = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DigitalOriginDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DigitalOriginDefinition.java new file mode 100644 index 00000000000..8218382fdff --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/DigitalOriginDefinition.java @@ -0,0 +1,64 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for digitalOriginDefinition. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ * 

+ * <simpleType name="digitalOriginDefinition">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="born digital"/>
+ *     <enumeration value="reformatted digital"/>
+ *     <enumeration value="digitized microfilm"/>
+ *     <enumeration value="digitized other analog"/>
+ *   </restriction>
+ * </simpleType>
+ *
+ * + */ +@XmlType(name = "digitalOriginDefinition", namespace = "http://www.loc.gov/mods/v3") +@XmlEnum +public enum DigitalOriginDefinition { + + @XmlEnumValue("born digital") + BORN_DIGITAL("born digital"), + @XmlEnumValue("reformatted digital") + REFORMATTED_DIGITAL("reformatted digital"), + @XmlEnumValue("digitized microfilm") + DIGITIZED_MICROFILM("digitized microfilm"), + @XmlEnumValue("digitized other analog") + DIGITIZED_OTHER_ANALOG("digitized other analog"); + private final String value; + + DigitalOriginDefinition(String v) { + value = v; + } + + public String value() { + return value; + } + + public static DigitalOriginDefinition fromValue(String v) { + for (DigitalOriginDefinition c: DigitalOriginDefinition.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/EnumerationAndChronologyDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/EnumerationAndChronologyDefinition.java new file mode 100644 index 00000000000..209a1887778 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/EnumerationAndChronologyDefinition.java @@ -0,0 +1,75 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for enumerationAndChronologyDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="enumerationAndChronologyDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute name="unitType">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="1"/>
+ *             <enumeration value="2"/>
+ *             <enumeration value="3"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "enumerationAndChronologyDefinition", namespace = "http://www.loc.gov/mods/v3") +public class EnumerationAndChronologyDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "unitType") + protected String unitType; + + /** + * Gets the value of the unitType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUnitType() { + return unitType; + } + + /** + * Sets the value of the unitType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUnitType(String value) { + this.unitType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ExtensionDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ExtensionDefinition.java new file mode 100644 index 00000000000..6458fc7b998 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ExtensionDefinition.java @@ -0,0 +1,113 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlMixed; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import org.w3c.dom.Element; + + +/** + *

Java class for extensionDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="extensionDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any processContents='lax' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "extensionDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "content" +}) +@XmlSeeAlso({ + AccessConditionDefinition.class +}) +public class ExtensionDefinition { + + @XmlMixed + @XmlAnyElement(lax = true) + protected List content; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + + /** + * Gets the value of the content property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the content property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getContent().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Element } + * {@link String } + * {@link Object } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/Extent.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/Extent.java new file mode 100644 index 00000000000..4547019bf10 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/Extent.java @@ -0,0 +1,71 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguagePlusSupplied">
+ *       <attribute name="unit" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "extent", namespace = "http://www.loc.gov/mods/v3") +public class Extent + extends StringPlusLanguagePlusSupplied +{ + + @XmlAttribute(name = "unit") + @XmlSchemaType(name = "anySimpleType") + protected String unit; + + /** + * Gets the value of the unit property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUnit() { + return unit; + } + + /** + * Sets the value of the unit property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUnit(String value) { + this.unit = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ExtentDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ExtentDefinition.java new file mode 100644 index 00000000000..1deb1dfc7f5 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ExtentDefinition.java @@ -0,0 +1,184 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for extentDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="extentDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.loc.gov/mods/v3}start" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}end" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}total" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}list" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="unit" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "extentDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "start", + "end", + "total", + "list" +}) +public class ExtentDefinition { + + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected StringPlusLanguage start; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected StringPlusLanguage end; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + @XmlSchemaType(name = "positiveInteger") + protected BigInteger total; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected StringPlusLanguage list; + @XmlAttribute(name = "unit") + protected String unit; + + /** + * Gets the value of the start property. + * + * @return + * possible object is + * {@link StringPlusLanguage } + * + */ + public StringPlusLanguage getStart() { + return start; + } + + /** + * Sets the value of the start property. + * + * @param value + * allowed object is + * {@link StringPlusLanguage } + * + */ + public void setStart(StringPlusLanguage value) { + this.start = value; + } + + /** + * Gets the value of the end property. + * + * @return + * possible object is + * {@link StringPlusLanguage } + * + */ + public StringPlusLanguage getEnd() { + return end; + } + + /** + * Sets the value of the end property. + * + * @param value + * allowed object is + * {@link StringPlusLanguage } + * + */ + public void setEnd(StringPlusLanguage value) { + this.end = value; + } + + /** + * Gets the value of the total property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getTotal() { + return total; + } + + /** + * Sets the value of the total property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setTotal(BigInteger value) { + this.total = value; + } + + /** + * Gets the value of the list property. + * + * @return + * possible object is + * {@link StringPlusLanguage } + * + */ + public StringPlusLanguage getList() { + return list; + } + + /** + * Sets the value of the list property. + * + * @param value + * allowed object is + * {@link StringPlusLanguage } + * + */ + public void setList(StringPlusLanguage value) { + this.list = value; + } + + /** + * Gets the value of the unit property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUnit() { + return unit; + } + + /** + * Sets the value of the unit property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUnit(String value) { + this.unit = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/FormDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/FormDefinition.java new file mode 100644 index 00000000000..b1a73b5c40a --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/FormDefinition.java @@ -0,0 +1,67 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for formDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="formDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguagePlusAuthority">
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "formDefinition", namespace = "http://www.loc.gov/mods/v3") +public class FormDefinition + extends StringPlusLanguagePlusAuthority +{ + + @XmlAttribute(name = "type") + protected String type; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/GenreDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/GenreDefinition.java new file mode 100644 index 00000000000..34f434ccc15 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/GenreDefinition.java @@ -0,0 +1,154 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for genreDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="genreDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguagePlusAuthority">
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="usage" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="primary" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "genreDefinition", namespace = "http://www.loc.gov/mods/v3") +public class GenreDefinition + extends StringPlusLanguagePlusAuthority +{ + + @XmlAttribute(name = "type") + protected String type; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "usage") + @XmlSchemaType(name = "anySimpleType") + protected String usage; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the usage property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUsage() { + if (usage == null) { + return "primary"; + } else { + return usage; + } + } + + /** + * Sets the value of the usage property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUsage(String value) { + this.usage = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/GeographicCodeDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/GeographicCodeDefinition.java new file mode 100644 index 00000000000..4ab866fb1dc --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/GeographicCodeDefinition.java @@ -0,0 +1,132 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for geographicCodeDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="geographicCodeDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute name="authorityURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="valueURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="authority">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="marcgac"/>
+ *             <enumeration value="marccountry"/>
+ *             <enumeration value="iso3166"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "geographicCodeDefinition", namespace = "http://www.loc.gov/mods/v3") +public class GeographicCodeDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + @XmlAttribute(name = "authority") + protected String authority; + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HierarchicalGeographicDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HierarchicalGeographicDefinition.java new file mode 100644 index 00000000000..52654cc346d --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HierarchicalGeographicDefinition.java @@ -0,0 +1,196 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for hierarchicalGeographicDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="hierarchicalGeographicDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://www.loc.gov/mods/v3}extraTerrestrialArea"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}continent"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}country"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}province"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}region"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}state"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}territory"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}county"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}city"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}citySection"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}island"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}area"/>
+ *       </choice>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}authorityAttributeGroup"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "hierarchicalGeographicDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "extraTerrestrialAreaOrContinentOrCountry" +}) +public class HierarchicalGeographicDefinition { + + @XmlElementRefs({ + @XmlElementRef(name = "continent", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "city", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "island", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "territory", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "state", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "extraTerrestrialArea", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "country", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "province", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "county", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "region", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "area", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "citySection", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false) + }) + protected List> extraTerrestrialAreaOrContinentOrCountry; + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + + /** + * Gets the value of the extraTerrestrialAreaOrContinentOrCountry property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the extraTerrestrialAreaOrContinentOrCountry property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getExtraTerrestrialAreaOrContinentOrCountry().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >} + * {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >} + * {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >} + * {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >} + * {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >} + * {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >} + * {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >} + * {@link JAXBElement }{@code <}{@link RegionDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link AreaDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CitySectionDefinition }{@code >} + * + * + */ + public List> getExtraTerrestrialAreaOrContinentOrCountry() { + if (extraTerrestrialAreaOrContinentOrCountry == null) { + extraTerrestrialAreaOrContinentOrCountry = new ArrayList>(); + } + return this.extraTerrestrialAreaOrContinentOrCountry; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HierarchicalPart.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HierarchicalPart.java new file mode 100644 index 00000000000..6390db37241 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HierarchicalPart.java @@ -0,0 +1,184 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for hierarchicalPart complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="hierarchicalPart">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}authorityAttributeGroup"/>
+ *       <attribute name="level" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *       <attribute name="period" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "hierarchicalPart", namespace = "http://www.loc.gov/mods/v3") +@XmlSeeAlso({ + CitySectionDefinition.class, + AreaDefinition.class, + RegionDefinition.class +}) +public class HierarchicalPart + extends StringPlusLanguage +{ + + @XmlAttribute(name = "level") + @XmlSchemaType(name = "anySimpleType") + protected String level; + @XmlAttribute(name = "period") + @XmlSchemaType(name = "anySimpleType") + protected String period; + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + + /** + * Gets the value of the level property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLevel(String value) { + this.level = value; + } + + /** + * Gets the value of the period property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPeriod() { + return period; + } + + /** + * Sets the value of the period property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPeriod(String value) { + this.period = value; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HoldingSimpleDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HoldingSimpleDefinition.java new file mode 100644 index 00000000000..537df76ef0e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/HoldingSimpleDefinition.java @@ -0,0 +1,76 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for holdingSimpleDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="holdingSimpleDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.loc.gov/mods/v3}copyInformation" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "holdingSimpleDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "copyInformation" +}) +public class HoldingSimpleDefinition { + + @XmlElement(namespace = "http://www.loc.gov/mods/v3", required = true) + protected List copyInformation; + + /** + * Gets the value of the copyInformation property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the copyInformation property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getCopyInformation().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link CopyInformationDefinition } + * + * + */ + public List getCopyInformation() { + if (copyInformation == null) { + copyInformation = new ArrayList(); + } + return this.copyInformation; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/IdentifierDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/IdentifierDefinition.java new file mode 100644 index 00000000000..420ac2c244b --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/IdentifierDefinition.java @@ -0,0 +1,182 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for identifierDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="identifierDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="typeURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="invalid" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="yes" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "identifierDefinition", namespace = "http://www.loc.gov/mods/v3") +public class IdentifierDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "type") + protected String type; + @XmlAttribute(name = "typeURI") + @XmlSchemaType(name = "anyURI") + protected String typeURI; + @XmlAttribute(name = "invalid") + @XmlSchemaType(name = "anySimpleType") + protected String invalid; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the typeURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTypeURI() { + return typeURI; + } + + /** + * Sets the value of the typeURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTypeURI(String value) { + this.typeURI = value; + } + + /** + * Gets the value of the invalid property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getInvalid() { + if (invalid == null) { + return "yes"; + } else { + return invalid; + } + } + + /** + * Sets the value of the invalid property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setInvalid(String value) { + this.invalid = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/IssuanceDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/IssuanceDefinition.java new file mode 100644 index 00000000000..46515d57169 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/IssuanceDefinition.java @@ -0,0 +1,70 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for issuanceDefinition. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ * 

+ * <simpleType name="issuanceDefinition">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="continuing"/>
+ *     <enumeration value="monographic"/>
+ *     <enumeration value="single unit"/>
+ *     <enumeration value="multipart monograph"/>
+ *     <enumeration value="serial"/>
+ *     <enumeration value="integrating resource"/>
+ *   </restriction>
+ * </simpleType>
+ *
+ * + */ +@XmlType(name = "issuanceDefinition", namespace = "http://www.loc.gov/mods/v3") +@XmlEnum +public enum IssuanceDefinition { + + @XmlEnumValue("continuing") + CONTINUING("continuing"), + @XmlEnumValue("monographic") + MONOGRAPHIC("monographic"), + @XmlEnumValue("single unit") + SINGLE_UNIT("single unit"), + @XmlEnumValue("multipart monograph") + MULTIPART_MONOGRAPH("multipart monograph"), + @XmlEnumValue("serial") + SERIAL("serial"), + @XmlEnumValue("integrating resource") + INTEGRATING_RESOURCE("integrating resource"); + private final String value; + + IssuanceDefinition(String v) { + value = v; + } + + public String value() { + return value; + } + + public static IssuanceDefinition fromValue(String v) { + for (IssuanceDefinition c: IssuanceDefinition.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ItemIdentifierDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ItemIdentifierDefinition.java new file mode 100644 index 00000000000..9b879ad0449 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ItemIdentifierDefinition.java @@ -0,0 +1,67 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for itemIdentifierDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="itemIdentifierDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "itemIdentifierDefinition", namespace = "http://www.loc.gov/mods/v3") +public class ItemIdentifierDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "type") + protected String type; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LanguageDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LanguageDefinition.java new file mode 100644 index 00000000000..33900198544 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LanguageDefinition.java @@ -0,0 +1,329 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for languageDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="languageDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.loc.gov/mods/v3}languageTerm" maxOccurs="unbounded"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}scriptTerm" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attribute name="objectPart" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="usage" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="primary" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "languageDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "languageTerm", + "scriptTerm" +}) +public class LanguageDefinition { + + @XmlElement(namespace = "http://www.loc.gov/mods/v3", required = true) + protected List languageTerm; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List scriptTerm; + @XmlAttribute(name = "objectPart") + protected String objectPart; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "usage") + @XmlSchemaType(name = "anySimpleType") + protected String usage; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + + /** + * Gets the value of the languageTerm property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the languageTerm property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getLanguageTerm().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link LanguageTermDefinition } + * + * + */ + public List getLanguageTerm() { + if (languageTerm == null) { + languageTerm = new ArrayList(); + } + return this.languageTerm; + } + + /** + * Gets the value of the scriptTerm property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the scriptTerm property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getScriptTerm().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ScriptTermDefinition } + * + * + */ + public List getScriptTerm() { + if (scriptTerm == null) { + scriptTerm = new ArrayList(); + } + return this.scriptTerm; + } + + /** + * Gets the value of the objectPart property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getObjectPart() { + return objectPart; + } + + /** + * Sets the value of the objectPart property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setObjectPart(String value) { + this.objectPart = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the usage property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUsage() { + if (usage == null) { + return "primary"; + } else { + return usage; + } + } + + /** + * Sets the value of the usage property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUsage(String value) { + this.usage = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LanguageTermDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LanguageTermDefinition.java new file mode 100644 index 00000000000..4e92fc10fef --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LanguageTermDefinition.java @@ -0,0 +1,161 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for languageTermDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="languageTermDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute name="authorityURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="valueURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="authority">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="rfc3066"/>
+ *             <enumeration value="iso639-2b"/>
+ *             <enumeration value="iso639-3"/>
+ *             <enumeration value="rfc4646"/>
+ *             <enumeration value="rfc5646"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="type" type="{http://www.loc.gov/mods/v3}codeOrText" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "languageTermDefinition", namespace = "http://www.loc.gov/mods/v3") +public class LanguageTermDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "type") + protected CodeOrText type; + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link CodeOrText } + * + */ + public CodeOrText getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link CodeOrText } + * + */ + public void setType(CodeOrText value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LocationDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LocationDefinition.java new file mode 100644 index 00000000000..2fc5b8f45f3 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/LocationDefinition.java @@ -0,0 +1,358 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for locationDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="locationDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.loc.gov/mods/v3}physicalLocation" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}shelfLocator" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}url" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}holdingSimple" minOccurs="0"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}holdingExternal" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "locationDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "physicalLocation", + "shelfLocator", + "url", + "holdingSimple", + "holdingExternal" +}) +public class LocationDefinition { + + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List physicalLocation; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List shelfLocator; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected List url; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected HoldingSimpleDefinition holdingSimple; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected ExtensionDefinition holdingExternal; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + + /** + * Gets the value of the physicalLocation property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the physicalLocation property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPhysicalLocation().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PhysicalLocationDefinition } + * + * + */ + public List getPhysicalLocation() { + if (physicalLocation == null) { + physicalLocation = new ArrayList(); + } + return this.physicalLocation; + } + + /** + * Gets the value of the shelfLocator property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the shelfLocator property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getShelfLocator().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link StringPlusLanguage } + * + * + */ + public List getShelfLocator() { + if (shelfLocator == null) { + shelfLocator = new ArrayList(); + } + return this.shelfLocator; + } + + /** + * Gets the value of the url property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the url property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getUrl().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link UrlDefinition } + * + * + */ + public List getUrl() { + if (url == null) { + url = new ArrayList(); + } + return this.url; + } + + /** + * Gets the value of the holdingSimple property. + * + * @return + * possible object is + * {@link HoldingSimpleDefinition } + * + */ + public HoldingSimpleDefinition getHoldingSimple() { + return holdingSimple; + } + + /** + * Sets the value of the holdingSimple property. + * + * @param value + * allowed object is + * {@link HoldingSimpleDefinition } + * + */ + public void setHoldingSimple(HoldingSimpleDefinition value) { + this.holdingSimple = value; + } + + /** + * Gets the value of the holdingExternal property. + * + * @return + * possible object is + * {@link ExtensionDefinition } + * + */ + public ExtensionDefinition getHoldingExternal() { + return holdingExternal; + } + + /** + * Sets the value of the holdingExternal property. + * + * @param value + * allowed object is + * {@link ExtensionDefinition } + * + */ + public void setHoldingExternal(ExtensionDefinition value) { + this.holdingExternal = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ModsCollectionDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ModsCollectionDefinition.java new file mode 100644 index 00000000000..28def4c7ee4 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ModsCollectionDefinition.java @@ -0,0 +1,76 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for modsCollectionDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="modsCollectionDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.loc.gov/mods/v3}mods" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "modsCollectionDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "mods" +}) +public class ModsCollectionDefinition { + + @XmlElement(namespace = "http://www.loc.gov/mods/v3", required = true) + protected List mods; + + /** + * Gets the value of the mods property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the mods property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getMods().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ModsDefinition } + * + * + */ + public List getMods() { + if (mods == null) { + mods = new ArrayList(); + } + return this.mods; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ModsDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ModsDefinition.java new file mode 100644 index 00000000000..94295885492 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ModsDefinition.java @@ -0,0 +1,189 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for modsDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="modsDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <group ref="{http://www.loc.gov/mods/v3}modsGroup" maxOccurs="unbounded"/>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="version">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="3.6"/>
+ *             <enumeration value="3.5"/>
+ *             <enumeration value="3.4"/>
+ *             <enumeration value="3.3"/>
+ *             <enumeration value="3.2"/>
+ *             <enumeration value="3.1"/>
+ *             <enumeration value="3.0"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "modsDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "modsGroup" +}) +public class ModsDefinition { + + @XmlElements({ + @XmlElement(name = "abstract", namespace = "http://www.loc.gov/mods/v3", type = AbstractDefinition.class), + @XmlElement(name = "accessCondition", namespace = "http://www.loc.gov/mods/v3", type = AccessConditionDefinition.class), + @XmlElement(name = "classification", namespace = "http://www.loc.gov/mods/v3", type = ClassificationDefinition.class), + @XmlElement(name = "extension", namespace = "http://www.loc.gov/mods/v3", type = ExtensionDefinition.class), + @XmlElement(name = "genre", namespace = "http://www.loc.gov/mods/v3", type = GenreDefinition.class), + @XmlElement(name = "identifier", namespace = "http://www.loc.gov/mods/v3", type = IdentifierDefinition.class), + @XmlElement(name = "language", namespace = "http://www.loc.gov/mods/v3", type = LanguageDefinition.class), + @XmlElement(name = "location", namespace = "http://www.loc.gov/mods/v3", type = LocationDefinition.class), + @XmlElement(name = "name", namespace = "http://www.loc.gov/mods/v3", type = NameDefinition.class), + @XmlElement(name = "note", namespace = "http://www.loc.gov/mods/v3", type = NoteDefinition.class), + @XmlElement(name = "originInfo", namespace = "http://www.loc.gov/mods/v3", type = OriginInfoDefinition.class), + @XmlElement(name = "part", namespace = "http://www.loc.gov/mods/v3", type = PartDefinition.class), + @XmlElement(name = "physicalDescription", namespace = "http://www.loc.gov/mods/v3", type = PhysicalDescriptionDefinition.class), + @XmlElement(name = "recordInfo", namespace = "http://www.loc.gov/mods/v3", type = RecordInfoDefinition.class), + @XmlElement(name = "relatedItem", namespace = "http://www.loc.gov/mods/v3", type = RelatedItemDefinition.class), + @XmlElement(name = "subject", namespace = "http://www.loc.gov/mods/v3", type = SubjectDefinition.class), + @XmlElement(name = "tableOfContents", namespace = "http://www.loc.gov/mods/v3", type = TableOfContentsDefinition.class), + @XmlElement(name = "targetAudience", namespace = "http://www.loc.gov/mods/v3", type = TargetAudienceDefinition.class), + @XmlElement(name = "titleInfo", namespace = "http://www.loc.gov/mods/v3", type = TitleInfoDefinition.class), + @XmlElement(name = "typeOfResource", namespace = "http://www.loc.gov/mods/v3", type = TypeOfResourceDefinition.class) + }) + protected List modsGroup; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "version") + protected String version; + + /** + * Gets the value of the modsGroup property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the modsGroup property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getModsGroup().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AbstractDefinition } + * {@link AccessConditionDefinition } + * {@link ClassificationDefinition } + * {@link ExtensionDefinition } + * {@link GenreDefinition } + * {@link IdentifierDefinition } + * {@link LanguageDefinition } + * {@link LocationDefinition } + * {@link NameDefinition } + * {@link NoteDefinition } + * {@link OriginInfoDefinition } + * {@link PartDefinition } + * {@link PhysicalDescriptionDefinition } + * {@link RecordInfoDefinition } + * {@link RelatedItemDefinition } + * {@link SubjectDefinition } + * {@link TableOfContentsDefinition } + * {@link TargetAudienceDefinition } + * {@link TitleInfoDefinition } + * {@link TypeOfResourceDefinition } + * + * + */ + public List getModsGroup() { + if (modsGroup == null) { + modsGroup = new ArrayList(); + } + return this.modsGroup; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the version property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersion() { + return version; + } + + /** + * Sets the value of the version property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersion(String value) { + this.version = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NameDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NameDefinition.java new file mode 100644 index 00000000000..0553f4c7e91 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NameDefinition.java @@ -0,0 +1,729 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for nameDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="nameDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <choice maxOccurs="unbounded" minOccurs="0">
+ *           <element ref="{http://www.loc.gov/mods/v3}namePart"/>
+ *           <element ref="{http://www.loc.gov/mods/v3}displayForm"/>
+ *           <element ref="{http://www.loc.gov/mods/v3}affiliation"/>
+ *           <element ref="{http://www.loc.gov/mods/v3}role"/>
+ *           <element ref="{http://www.loc.gov/mods/v3}description"/>
+ *           <element ref="{http://www.loc.gov/mods/v3}nameIdentifier"/>
+ *         </choice>
+ *         <sequence>
+ *           <element ref="{http://www.loc.gov/mods/v3}etal"/>
+ *           <choice maxOccurs="unbounded" minOccurs="0">
+ *             <element ref="{http://www.loc.gov/mods/v3}affiliation"/>
+ *             <element ref="{http://www.loc.gov/mods/v3}role"/>
+ *             <element ref="{http://www.loc.gov/mods/v3}description"/>
+ *           </choice>
+ *         </sequence>
+ *       </choice>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}authorityAttributeGroup"/>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="nameTitleGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="usage" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="primary" />
+ *       <attribute name="type">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="personal"/>
+ *             <enumeration value="corporate"/>
+ *             <enumeration value="conference"/>
+ *             <enumeration value="family"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "nameDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "namePartOrDisplayFormOrAffiliation", + "etal", + "affiliationOrRoleOrDescription" +}) +public class NameDefinition { + + @XmlElementRefs({ + @XmlElementRef(name = "displayForm", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "description", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "namePart", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "nameIdentifier", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "affiliation", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "role", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false) + }) + protected List> namePartOrDisplayFormOrAffiliation; + @XmlElement(namespace = "http://www.loc.gov/mods/v3") + protected StringPlusLanguage etal; + @XmlElementRefs({ + @XmlElementRef(name = "description", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "affiliation", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "role", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false) + }) + protected List> affiliationOrRoleOrDescription; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "nameTitleGroup") + protected String nameTitleGroup; + @XmlAttribute(name = "usage") + @XmlSchemaType(name = "anySimpleType") + protected String usage; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + + /** + * Gets the value of the namePartOrDisplayFormOrAffiliation property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the namePartOrDisplayFormOrAffiliation property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getNamePartOrDisplayFormOrAffiliation().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link IdentifierDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link NamePartDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link RoleDefinition }{@code >} + * + * + */ + public List> getNamePartOrDisplayFormOrAffiliation() { + if (namePartOrDisplayFormOrAffiliation == null) { + namePartOrDisplayFormOrAffiliation = new ArrayList>(); + } + return this.namePartOrDisplayFormOrAffiliation; + } + + /** + * Gets the value of the etal property. + * + * @return + * possible object is + * {@link StringPlusLanguage } + * + */ + public StringPlusLanguage getEtal() { + return etal; + } + + /** + * Sets the value of the etal property. + * + * @param value + * allowed object is + * {@link StringPlusLanguage } + * + */ + public void setEtal(StringPlusLanguage value) { + this.etal = value; + } + + /** + * Gets the value of the affiliationOrRoleOrDescription property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the affiliationOrRoleOrDescription property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getAffiliationOrRoleOrDescription().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link RoleDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * + * + */ + public List> getAffiliationOrRoleOrDescription() { + if (affiliationOrRoleOrDescription == null) { + affiliationOrRoleOrDescription = new ArrayList>(); + } + return this.affiliationOrRoleOrDescription; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the nameTitleGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNameTitleGroup() { + return nameTitleGroup; + } + + /** + * Sets the value of the nameTitleGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNameTitleGroup(String value) { + this.nameTitleGroup = value; + } + + /** + * Gets the value of the usage property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUsage() { + if (usage == null) { + return "primary"; + } else { + return usage; + } + } + + /** + * Sets the value of the usage property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUsage(String value) { + this.usage = value; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NamePartDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NamePartDefinition.java new file mode 100644 index 00000000000..1be4706a3c8 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NamePartDefinition.java @@ -0,0 +1,76 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for namePartDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="namePartDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute name="type">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="date"/>
+ *             <enumeration value="family"/>
+ *             <enumeration value="given"/>
+ *             <enumeration value="termsOfAddress"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "namePartDefinition", namespace = "http://www.loc.gov/mods/v3") +public class NamePartDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "type") + protected String atType; + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NonSort.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NonSort.java new file mode 100644 index 00000000000..03895c545d0 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NonSort.java @@ -0,0 +1,72 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute ref="{http://www.w3.org/XML/1998/namespace}space"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "nonSort", namespace = "http://www.loc.gov/mods/v3") +public class NonSort + extends StringPlusLanguage +{ + + @XmlAttribute(name = "space", namespace = "http://www.w3.org/XML/1998/namespace") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String space; + + /** + * Gets the value of the space property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSpace() { + return space; + } + + /** + * Sets the value of the space property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSpace(String value) { + this.space = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NoteDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NoteDefinition.java new file mode 100644 index 00000000000..8be8ab14fa4 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/NoteDefinition.java @@ -0,0 +1,371 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for noteDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="noteDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="typeURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "noteDefinition", namespace = "http://www.loc.gov/mods/v3") +public class NoteDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "typeURI") + @XmlSchemaType(name = "anyURI") + protected String typeURI; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the typeURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTypeURI() { + return typeURI; + } + + /** + * Sets the value of the typeURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTypeURI(String value) { + this.typeURI = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ObjectFactory.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ObjectFactory.java new file mode 100644 index 00000000000..78b04652abf --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ObjectFactory.java @@ -0,0 +1,1553 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.math.BigInteger; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jabref.logic.importer.fileformat.mods package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _Total_QNAME = new QName("http://www.loc.gov/mods/v3", "total"); + private final static QName _DateCreated_QNAME = new QName("http://www.loc.gov/mods/v3", "dateCreated"); + private final static QName _RecordCreationDate_QNAME = new QName("http://www.loc.gov/mods/v3", "recordCreationDate"); + private final static QName _End_QNAME = new QName("http://www.loc.gov/mods/v3", "end"); + private final static QName _ElectronicLocator_QNAME = new QName("http://www.loc.gov/mods/v3", "electronicLocator"); + private final static QName _Projection_QNAME = new QName("http://www.loc.gov/mods/v3", "projection"); + private final static QName _Note_QNAME = new QName("http://www.loc.gov/mods/v3", "note"); + private final static QName _PlaceTerm_QNAME = new QName("http://www.loc.gov/mods/v3", "placeTerm"); + private final static QName _Part_QNAME = new QName("http://www.loc.gov/mods/v3", "part"); + private final static QName _Description_QNAME = new QName("http://www.loc.gov/mods/v3", "description"); + private final static QName _Edition_QNAME = new QName("http://www.loc.gov/mods/v3", "edition"); + private final static QName _Scale_QNAME = new QName("http://www.loc.gov/mods/v3", "scale"); + private final static QName _Title_QNAME = new QName("http://www.loc.gov/mods/v3", "title"); + private final static QName _PartName_QNAME = new QName("http://www.loc.gov/mods/v3", "partName"); + private final static QName _Form_QNAME = new QName("http://www.loc.gov/mods/v3", "form"); + private final static QName _TargetAudience_QNAME = new QName("http://www.loc.gov/mods/v3", "targetAudience"); + private final static QName _Issuance_QNAME = new QName("http://www.loc.gov/mods/v3", "issuance"); + private final static QName _Location_QNAME = new QName("http://www.loc.gov/mods/v3", "location"); + private final static QName _CopyrightDate_QNAME = new QName("http://www.loc.gov/mods/v3", "copyrightDate"); + private final static QName _Territory_QNAME = new QName("http://www.loc.gov/mods/v3", "territory"); + private final static QName _Start_QNAME = new QName("http://www.loc.gov/mods/v3", "start"); + private final static QName _DateModified_QNAME = new QName("http://www.loc.gov/mods/v3", "dateModified"); + private final static QName _RecordChangeDate_QNAME = new QName("http://www.loc.gov/mods/v3", "recordChangeDate"); + private final static QName _Geographic_QNAME = new QName("http://www.loc.gov/mods/v3", "geographic"); + private final static QName _SubTitle_QNAME = new QName("http://www.loc.gov/mods/v3", "subTitle"); + private final static QName _Affiliation_QNAME = new QName("http://www.loc.gov/mods/v3", "affiliation"); + private final static QName _DateCaptured_QNAME = new QName("http://www.loc.gov/mods/v3", "dateCaptured"); + private final static QName _HoldingExternal_QNAME = new QName("http://www.loc.gov/mods/v3", "holdingExternal"); + private final static QName _Date_QNAME = new QName("http://www.loc.gov/mods/v3", "date"); + private final static QName _InternetMediaType_QNAME = new QName("http://www.loc.gov/mods/v3", "internetMediaType"); + private final static QName _Country_QNAME = new QName("http://www.loc.gov/mods/v3", "country"); + private final static QName _Mods_QNAME = new QName("http://www.loc.gov/mods/v3", "mods"); + private final static QName _HierarchicalGeographic_QNAME = new QName("http://www.loc.gov/mods/v3", "hierarchicalGeographic"); + private final static QName _Subject_QNAME = new QName("http://www.loc.gov/mods/v3", "subject"); + private final static QName _TitleInfo_QNAME = new QName("http://www.loc.gov/mods/v3", "titleInfo"); + private final static QName _Language_QNAME = new QName("http://www.loc.gov/mods/v3", "language"); + private final static QName _RelatedItem_QNAME = new QName("http://www.loc.gov/mods/v3", "relatedItem"); + private final static QName _DisplayForm_QNAME = new QName("http://www.loc.gov/mods/v3", "displayForm"); + private final static QName _Frequency_QNAME = new QName("http://www.loc.gov/mods/v3", "frequency"); + private final static QName _LanguageTerm_QNAME = new QName("http://www.loc.gov/mods/v3", "languageTerm"); + private final static QName _DigitalOrigin_QNAME = new QName("http://www.loc.gov/mods/v3", "digitalOrigin"); + private final static QName _Name_QNAME = new QName("http://www.loc.gov/mods/v3", "name"); + private final static QName _Publisher_QNAME = new QName("http://www.loc.gov/mods/v3", "publisher"); + private final static QName _Topic_QNAME = new QName("http://www.loc.gov/mods/v3", "topic"); + private final static QName _SubLocation_QNAME = new QName("http://www.loc.gov/mods/v3", "subLocation"); + private final static QName _Region_QNAME = new QName("http://www.loc.gov/mods/v3", "region"); + private final static QName _TableOfContents_QNAME = new QName("http://www.loc.gov/mods/v3", "tableOfContents"); + private final static QName _NameIdentifier_QNAME = new QName("http://www.loc.gov/mods/v3", "nameIdentifier"); + private final static QName _RecordContentSource_QNAME = new QName("http://www.loc.gov/mods/v3", "recordContentSource"); + private final static QName _Area_QNAME = new QName("http://www.loc.gov/mods/v3", "area"); + private final static QName _ExtraTerrestrialArea_QNAME = new QName("http://www.loc.gov/mods/v3", "extraTerrestrialArea"); + private final static QName _ShelfLocator_QNAME = new QName("http://www.loc.gov/mods/v3", "shelfLocator"); + private final static QName _Island_QNAME = new QName("http://www.loc.gov/mods/v3", "island"); + private final static QName _List_QNAME = new QName("http://www.loc.gov/mods/v3", "list"); + private final static QName _CartographicExtension_QNAME = new QName("http://www.loc.gov/mods/v3", "cartographicExtension"); + private final static QName _NamePart_QNAME = new QName("http://www.loc.gov/mods/v3", "namePart"); + private final static QName _DescriptionStandard_QNAME = new QName("http://www.loc.gov/mods/v3", "descriptionStandard"); + private final static QName _CitySection_QNAME = new QName("http://www.loc.gov/mods/v3", "citySection"); + private final static QName _LanguageOfCataloging_QNAME = new QName("http://www.loc.gov/mods/v3", "languageOfCataloging"); + private final static QName _RecordInfo_QNAME = new QName("http://www.loc.gov/mods/v3", "recordInfo"); + private final static QName _Genre_QNAME = new QName("http://www.loc.gov/mods/v3", "genre"); + private final static QName _OriginInfo_QNAME = new QName("http://www.loc.gov/mods/v3", "originInfo"); + private final static QName _Place_QNAME = new QName("http://www.loc.gov/mods/v3", "place"); + private final static QName _Continent_QNAME = new QName("http://www.loc.gov/mods/v3", "continent"); + private final static QName _Extension_QNAME = new QName("http://www.loc.gov/mods/v3", "extension"); + private final static QName _Role_QNAME = new QName("http://www.loc.gov/mods/v3", "role"); + private final static QName _City_QNAME = new QName("http://www.loc.gov/mods/v3", "city"); + private final static QName _ModsCollection_QNAME = new QName("http://www.loc.gov/mods/v3", "modsCollection"); + private final static QName _DateOther_QNAME = new QName("http://www.loc.gov/mods/v3", "dateOther"); + private final static QName _DateValid_QNAME = new QName("http://www.loc.gov/mods/v3", "dateValid"); + private final static QName _EnumerationAndChronology_QNAME = new QName("http://www.loc.gov/mods/v3", "enumerationAndChronology"); + private final static QName _CopyInformation_QNAME = new QName("http://www.loc.gov/mods/v3", "copyInformation"); + private final static QName _PartNumber_QNAME = new QName("http://www.loc.gov/mods/v3", "partNumber"); + private final static QName _DateIssued_QNAME = new QName("http://www.loc.gov/mods/v3", "dateIssued"); + private final static QName _GeographicCode_QNAME = new QName("http://www.loc.gov/mods/v3", "geographicCode"); + private final static QName _PhysicalLocation_QNAME = new QName("http://www.loc.gov/mods/v3", "physicalLocation"); + private final static QName _AccessCondition_QNAME = new QName("http://www.loc.gov/mods/v3", "accessCondition"); + private final static QName _Coordinates_QNAME = new QName("http://www.loc.gov/mods/v3", "coordinates"); + private final static QName _ReformattingQuality_QNAME = new QName("http://www.loc.gov/mods/v3", "reformattingQuality"); + private final static QName _Abstract_QNAME = new QName("http://www.loc.gov/mods/v3", "abstract"); + private final static QName _Url_QNAME = new QName("http://www.loc.gov/mods/v3", "url"); + private final static QName _Number_QNAME = new QName("http://www.loc.gov/mods/v3", "number"); + private final static QName _Province_QNAME = new QName("http://www.loc.gov/mods/v3", "province"); + private final static QName _State_QNAME = new QName("http://www.loc.gov/mods/v3", "state"); + private final static QName _Cartographics_QNAME = new QName("http://www.loc.gov/mods/v3", "cartographics"); + private final static QName _RoleTerm_QNAME = new QName("http://www.loc.gov/mods/v3", "roleTerm"); + private final static QName _Temporal_QNAME = new QName("http://www.loc.gov/mods/v3", "temporal"); + private final static QName _Occupation_QNAME = new QName("http://www.loc.gov/mods/v3", "occupation"); + private final static QName _ScriptTerm_QNAME = new QName("http://www.loc.gov/mods/v3", "scriptTerm"); + private final static QName _RecordInfoNote_QNAME = new QName("http://www.loc.gov/mods/v3", "recordInfoNote"); + private final static QName _County_QNAME = new QName("http://www.loc.gov/mods/v3", "county"); + private final static QName _Caption_QNAME = new QName("http://www.loc.gov/mods/v3", "caption"); + private final static QName _TypeOfResource_QNAME = new QName("http://www.loc.gov/mods/v3", "typeOfResource"); + private final static QName _RecordOrigin_QNAME = new QName("http://www.loc.gov/mods/v3", "recordOrigin"); + private final static QName _Etal_QNAME = new QName("http://www.loc.gov/mods/v3", "etal"); + private final static QName _ItemIdentifier_QNAME = new QName("http://www.loc.gov/mods/v3", "itemIdentifier"); + private final static QName _Detail_QNAME = new QName("http://www.loc.gov/mods/v3", "detail"); + private final static QName _PhysicalDescription_QNAME = new QName("http://www.loc.gov/mods/v3", "physicalDescription"); + private final static QName _RecordIdentifier_QNAME = new QName("http://www.loc.gov/mods/v3", "recordIdentifier"); + private final static QName _Identifier_QNAME = new QName("http://www.loc.gov/mods/v3", "identifier"); + private final static QName _HoldingSimple_QNAME = new QName("http://www.loc.gov/mods/v3", "holdingSimple"); + private final static QName _Classification_QNAME = new QName("http://www.loc.gov/mods/v3", "classification"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jabref.logic.importer.fileformat.mods + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link CopyInformationDefinition } + * + */ + public CopyInformationDefinition createCopyInformationDefinition() { + return new CopyInformationDefinition(); + } + + /** + * Create an instance of {@link Extent } + * + */ + public Extent createExtent() { + return new Extent(); + } + + /** + * Create an instance of {@link StringPlusLanguagePlusSupplied } + * + */ + public StringPlusLanguagePlusSupplied createStringPlusLanguagePlusSupplied() { + return new StringPlusLanguagePlusSupplied(); + } + + /** + * Create an instance of {@link StringPlusLanguage } + * + */ + public StringPlusLanguage createStringPlusLanguage() { + return new StringPlusLanguage(); + } + + /** + * Create an instance of {@link StringPlusLanguagePlusAuthority } + * + */ + public StringPlusLanguagePlusAuthority createStringPlusLanguagePlusAuthority() { + return new StringPlusLanguagePlusAuthority(); + } + + /** + * Create an instance of {@link ScriptTermDefinition } + * + */ + public ScriptTermDefinition createScriptTermDefinition() { + return new ScriptTermDefinition(); + } + + /** + * Create an instance of {@link NoteDefinition } + * + */ + public NoteDefinition createNoteDefinition() { + return new NoteDefinition(); + } + + /** + * Create an instance of {@link HierarchicalPart } + * + */ + public HierarchicalPart createHierarchicalPart() { + return new HierarchicalPart(); + } + + /** + * Create an instance of {@link TypeOfResourceDefinition } + * + */ + public TypeOfResourceDefinition createTypeOfResourceDefinition() { + return new TypeOfResourceDefinition(); + } + + /** + * Create an instance of {@link Text } + * + */ + public Text createText() { + return new Text(); + } + + /** + * Create an instance of {@link CartographicsDefinition } + * + */ + public CartographicsDefinition createCartographicsDefinition() { + return new CartographicsDefinition(); + } + + /** + * Create an instance of {@link RoleTermDefinition } + * + */ + public RoleTermDefinition createRoleTermDefinition() { + return new RoleTermDefinition(); + } + + /** + * Create an instance of {@link TemporalDefinition } + * + */ + public TemporalDefinition createTemporalDefinition() { + return new TemporalDefinition(); + } + + /** + * Create an instance of {@link IdentifierDefinition } + * + */ + public IdentifierDefinition createIdentifierDefinition() { + return new IdentifierDefinition(); + } + + /** + * Create an instance of {@link HoldingSimpleDefinition } + * + */ + public HoldingSimpleDefinition createHoldingSimpleDefinition() { + return new HoldingSimpleDefinition(); + } + + /** + * Create an instance of {@link ClassificationDefinition } + * + */ + public ClassificationDefinition createClassificationDefinition() { + return new ClassificationDefinition(); + } + + /** + * Create an instance of {@link ItemIdentifierDefinition } + * + */ + public ItemIdentifierDefinition createItemIdentifierDefinition() { + return new ItemIdentifierDefinition(); + } + + /** + * Create an instance of {@link DetailDefinition } + * + */ + public DetailDefinition createDetailDefinition() { + return new DetailDefinition(); + } + + /** + * Create an instance of {@link PhysicalDescriptionDefinition } + * + */ + public PhysicalDescriptionDefinition createPhysicalDescriptionDefinition() { + return new PhysicalDescriptionDefinition(); + } + + /** + * Create an instance of {@link RecordIdentifierDefinition } + * + */ + public RecordIdentifierDefinition createRecordIdentifierDefinition() { + return new RecordIdentifierDefinition(); + } + + /** + * Create an instance of {@link ExtensionDefinition } + * + */ + public ExtensionDefinition createExtensionDefinition() { + return new ExtensionDefinition(); + } + + /** + * Create an instance of {@link RoleDefinition } + * + */ + public RoleDefinition createRoleDefinition() { + return new RoleDefinition(); + } + + /** + * Create an instance of {@link ModsCollectionDefinition } + * + */ + public ModsCollectionDefinition createModsCollectionDefinition() { + return new ModsCollectionDefinition(); + } + + /** + * Create an instance of {@link DateOtherDefinition } + * + */ + public DateOtherDefinition createDateOtherDefinition() { + return new DateOtherDefinition(); + } + + /** + * Create an instance of {@link DateDefinition } + * + */ + public DateDefinition createDateDefinition() { + return new DateDefinition(); + } + + /** + * Create an instance of {@link CitySectionDefinition } + * + */ + public CitySectionDefinition createCitySectionDefinition() { + return new CitySectionDefinition(); + } + + /** + * Create an instance of {@link LanguageDefinition } + * + */ + public LanguageDefinition createLanguageDefinition() { + return new LanguageDefinition(); + } + + /** + * Create an instance of {@link RecordInfoDefinition } + * + */ + public RecordInfoDefinition createRecordInfoDefinition() { + return new RecordInfoDefinition(); + } + + /** + * Create an instance of {@link GenreDefinition } + * + */ + public GenreDefinition createGenreDefinition() { + return new GenreDefinition(); + } + + /** + * Create an instance of {@link OriginInfoDefinition } + * + */ + public OriginInfoDefinition createOriginInfoDefinition() { + return new OriginInfoDefinition(); + } + + /** + * Create an instance of {@link PlaceDefinition } + * + */ + public PlaceDefinition createPlaceDefinition() { + return new PlaceDefinition(); + } + + /** + * Create an instance of {@link GeographicCodeDefinition } + * + */ + public GeographicCodeDefinition createGeographicCodeDefinition() { + return new GeographicCodeDefinition(); + } + + /** + * Create an instance of {@link PhysicalLocationDefinition } + * + */ + public PhysicalLocationDefinition createPhysicalLocationDefinition() { + return new PhysicalLocationDefinition(); + } + + /** + * Create an instance of {@link AccessConditionDefinition } + * + */ + public AccessConditionDefinition createAccessConditionDefinition() { + return new AccessConditionDefinition(); + } + + /** + * Create an instance of {@link AbstractDefinition } + * + */ + public AbstractDefinition createAbstractDefinition() { + return new AbstractDefinition(); + } + + /** + * Create an instance of {@link UrlDefinition } + * + */ + public UrlDefinition createUrlDefinition() { + return new UrlDefinition(); + } + + /** + * Create an instance of {@link EnumerationAndChronologyDefinition } + * + */ + public EnumerationAndChronologyDefinition createEnumerationAndChronologyDefinition() { + return new EnumerationAndChronologyDefinition(); + } + + /** + * Create an instance of {@link ModsDefinition } + * + */ + public ModsDefinition createModsDefinition() { + return new ModsDefinition(); + } + + /** + * Create an instance of {@link HierarchicalGeographicDefinition } + * + */ + public HierarchicalGeographicDefinition createHierarchicalGeographicDefinition() { + return new HierarchicalGeographicDefinition(); + } + + /** + * Create an instance of {@link SubjectDefinition } + * + */ + public SubjectDefinition createSubjectDefinition() { + return new SubjectDefinition(); + } + + /** + * Create an instance of {@link NonSort } + * + */ + public NonSort createNonSort() { + return new NonSort(); + } + + /** + * Create an instance of {@link TitleInfoDefinition } + * + */ + public TitleInfoDefinition createTitleInfoDefinition() { + return new TitleInfoDefinition(); + } + + /** + * Create an instance of {@link RelatedItemDefinition } + * + */ + public RelatedItemDefinition createRelatedItemDefinition() { + return new RelatedItemDefinition(); + } + + /** + * Create an instance of {@link AreaDefinition } + * + */ + public AreaDefinition createAreaDefinition() { + return new AreaDefinition(); + } + + /** + * Create an instance of {@link NamePartDefinition } + * + */ + public NamePartDefinition createNamePartDefinition() { + return new NamePartDefinition(); + } + + /** + * Create an instance of {@link LanguageTermDefinition } + * + */ + public LanguageTermDefinition createLanguageTermDefinition() { + return new LanguageTermDefinition(); + } + + /** + * Create an instance of {@link NameDefinition } + * + */ + public NameDefinition createNameDefinition() { + return new NameDefinition(); + } + + /** + * Create an instance of {@link RegionDefinition } + * + */ + public RegionDefinition createRegionDefinition() { + return new RegionDefinition(); + } + + /** + * Create an instance of {@link TableOfContentsDefinition } + * + */ + public TableOfContentsDefinition createTableOfContentsDefinition() { + return new TableOfContentsDefinition(); + } + + /** + * Create an instance of {@link PlaceTermDefinition } + * + */ + public PlaceTermDefinition createPlaceTermDefinition() { + return new PlaceTermDefinition(); + } + + /** + * Create an instance of {@link PartDefinition } + * + */ + public PartDefinition createPartDefinition() { + return new PartDefinition(); + } + + /** + * Create an instance of {@link FormDefinition } + * + */ + public FormDefinition createFormDefinition() { + return new FormDefinition(); + } + + /** + * Create an instance of {@link TargetAudienceDefinition } + * + */ + public TargetAudienceDefinition createTargetAudienceDefinition() { + return new TargetAudienceDefinition(); + } + + /** + * Create an instance of {@link LocationDefinition } + * + */ + public LocationDefinition createLocationDefinition() { + return new LocationDefinition(); + } + + /** + * Create an instance of {@link SubjectNameDefinition } + * + */ + public SubjectNameDefinition createSubjectNameDefinition() { + return new SubjectNameDefinition(); + } + + /** + * Create an instance of {@link PhysicalDescriptionNote } + * + */ + public PhysicalDescriptionNote createPhysicalDescriptionNote() { + return new PhysicalDescriptionNote(); + } + + /** + * Create an instance of {@link SubjectTitleInfoDefinition } + * + */ + public SubjectTitleInfoDefinition createSubjectTitleInfoDefinition() { + return new SubjectTitleInfoDefinition(); + } + + /** + * Create an instance of {@link ExtentDefinition } + * + */ + public ExtentDefinition createExtentDefinition() { + return new ExtentDefinition(); + } + + /** + * Create an instance of {@link CopyInformationDefinition.Note } + * + */ + public CopyInformationDefinition.Note createCopyInformationDefinitionNote() { + return new CopyInformationDefinition.Note(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "total") + public JAXBElement createTotal(BigInteger value) { + return new JAXBElement(_Total_QNAME, BigInteger.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DateDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "dateCreated") + public JAXBElement createDateCreated(DateDefinition value) { + return new JAXBElement(_DateCreated_QNAME, DateDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DateDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "recordCreationDate") + public JAXBElement createRecordCreationDate(DateDefinition value) { + return new JAXBElement(_RecordCreationDate_QNAME, DateDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "end") + public JAXBElement createEnd(StringPlusLanguage value) { + return new JAXBElement(_End_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "electronicLocator") + public JAXBElement createElectronicLocator(StringPlusLanguage value) { + return new JAXBElement(_ElectronicLocator_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "projection") + public JAXBElement createProjection(StringPlusLanguage value) { + return new JAXBElement(_Projection_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link NoteDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "note") + public JAXBElement createNote(NoteDefinition value) { + return new JAXBElement(_Note_QNAME, NoteDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link PlaceTermDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "placeTerm") + public JAXBElement createPlaceTerm(PlaceTermDefinition value) { + return new JAXBElement(_PlaceTerm_QNAME, PlaceTermDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link PartDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "part") + public JAXBElement createPart(PartDefinition value) { + return new JAXBElement(_Part_QNAME, PartDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "description") + public JAXBElement createDescription(StringPlusLanguage value) { + return new JAXBElement(_Description_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusSupplied }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "edition") + public JAXBElement createEdition(StringPlusLanguagePlusSupplied value) { + return new JAXBElement(_Edition_QNAME, StringPlusLanguagePlusSupplied.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "scale") + public JAXBElement createScale(StringPlusLanguage value) { + return new JAXBElement(_Scale_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "title") + public JAXBElement createTitle(StringPlusLanguage value) { + return new JAXBElement(_Title_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "partName") + public JAXBElement createPartName(StringPlusLanguage value) { + return new JAXBElement(_PartName_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link FormDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "form") + public JAXBElement createForm(FormDefinition value) { + return new JAXBElement(_Form_QNAME, FormDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TargetAudienceDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "targetAudience") + public JAXBElement createTargetAudience(TargetAudienceDefinition value) { + return new JAXBElement(_TargetAudience_QNAME, TargetAudienceDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IssuanceDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "issuance") + public JAXBElement createIssuance(IssuanceDefinition value) { + return new JAXBElement(_Issuance_QNAME, IssuanceDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link LocationDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "location") + public JAXBElement createLocation(LocationDefinition value) { + return new JAXBElement(_Location_QNAME, LocationDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DateDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "copyrightDate") + public JAXBElement createCopyrightDate(DateDefinition value) { + return new JAXBElement(_CopyrightDate_QNAME, DateDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "territory") + public JAXBElement createTerritory(HierarchicalPart value) { + return new JAXBElement(_Territory_QNAME, HierarchicalPart.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "start") + public JAXBElement createStart(StringPlusLanguage value) { + return new JAXBElement(_Start_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DateDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "dateModified") + public JAXBElement createDateModified(DateDefinition value) { + return new JAXBElement(_DateModified_QNAME, DateDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DateDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "recordChangeDate") + public JAXBElement createRecordChangeDate(DateDefinition value) { + return new JAXBElement(_RecordChangeDate_QNAME, DateDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "geographic") + public JAXBElement createGeographic(StringPlusLanguagePlusAuthority value) { + return new JAXBElement(_Geographic_QNAME, StringPlusLanguagePlusAuthority.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "subTitle") + public JAXBElement createSubTitle(StringPlusLanguage value) { + return new JAXBElement(_SubTitle_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "affiliation") + public JAXBElement createAffiliation(StringPlusLanguage value) { + return new JAXBElement(_Affiliation_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DateDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "dateCaptured") + public JAXBElement createDateCaptured(DateDefinition value) { + return new JAXBElement(_DateCaptured_QNAME, DateDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "holdingExternal") + public JAXBElement createHoldingExternal(ExtensionDefinition value) { + return new JAXBElement(_HoldingExternal_QNAME, ExtensionDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DateDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "date") + public JAXBElement createDate(DateDefinition value) { + return new JAXBElement(_Date_QNAME, DateDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "internetMediaType") + public JAXBElement createInternetMediaType(StringPlusLanguage value) { + return new JAXBElement(_InternetMediaType_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "country") + public JAXBElement createCountry(HierarchicalPart value) { + return new JAXBElement(_Country_QNAME, HierarchicalPart.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ModsDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "mods") + public JAXBElement createMods(ModsDefinition value) { + return new JAXBElement(_Mods_QNAME, ModsDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HierarchicalGeographicDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "hierarchicalGeographic") + public JAXBElement createHierarchicalGeographic(HierarchicalGeographicDefinition value) { + return new JAXBElement(_HierarchicalGeographic_QNAME, HierarchicalGeographicDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SubjectDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "subject") + public JAXBElement createSubject(SubjectDefinition value) { + return new JAXBElement(_Subject_QNAME, SubjectDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TitleInfoDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "titleInfo") + public JAXBElement createTitleInfo(TitleInfoDefinition value) { + return new JAXBElement(_TitleInfo_QNAME, TitleInfoDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link LanguageDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "language") + public JAXBElement createLanguage(LanguageDefinition value) { + return new JAXBElement(_Language_QNAME, LanguageDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RelatedItemDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "relatedItem") + public JAXBElement createRelatedItem(RelatedItemDefinition value) { + return new JAXBElement(_RelatedItem_QNAME, RelatedItemDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "displayForm") + public JAXBElement createDisplayForm(StringPlusLanguage value) { + return new JAXBElement(_DisplayForm_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "frequency") + public JAXBElement createFrequency(StringPlusLanguagePlusAuthority value) { + return new JAXBElement(_Frequency_QNAME, StringPlusLanguagePlusAuthority.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link LanguageTermDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "languageTerm") + public JAXBElement createLanguageTerm(LanguageTermDefinition value) { + return new JAXBElement(_LanguageTerm_QNAME, LanguageTermDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DigitalOriginDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "digitalOrigin") + public JAXBElement createDigitalOrigin(DigitalOriginDefinition value) { + return new JAXBElement(_DigitalOrigin_QNAME, DigitalOriginDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link NameDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "name") + public JAXBElement createName(NameDefinition value) { + return new JAXBElement(_Name_QNAME, NameDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusSupplied }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "publisher") + public JAXBElement createPublisher(StringPlusLanguagePlusSupplied value) { + return new JAXBElement(_Publisher_QNAME, StringPlusLanguagePlusSupplied.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "topic") + public JAXBElement createTopic(StringPlusLanguagePlusAuthority value) { + return new JAXBElement(_Topic_QNAME, StringPlusLanguagePlusAuthority.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "subLocation") + public JAXBElement createSubLocation(StringPlusLanguage value) { + return new JAXBElement(_SubLocation_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RegionDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "region") + public JAXBElement createRegion(RegionDefinition value) { + return new JAXBElement(_Region_QNAME, RegionDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TableOfContentsDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "tableOfContents") + public JAXBElement createTableOfContents(TableOfContentsDefinition value) { + return new JAXBElement(_TableOfContents_QNAME, TableOfContentsDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IdentifierDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "nameIdentifier") + public JAXBElement createNameIdentifier(IdentifierDefinition value) { + return new JAXBElement(_NameIdentifier_QNAME, IdentifierDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "recordContentSource") + public JAXBElement createRecordContentSource(StringPlusLanguagePlusAuthority value) { + return new JAXBElement(_RecordContentSource_QNAME, StringPlusLanguagePlusAuthority.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AreaDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "area") + public JAXBElement createArea(AreaDefinition value) { + return new JAXBElement(_Area_QNAME, AreaDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "extraTerrestrialArea") + public JAXBElement createExtraTerrestrialArea(HierarchicalPart value) { + return new JAXBElement(_ExtraTerrestrialArea_QNAME, HierarchicalPart.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "shelfLocator") + public JAXBElement createShelfLocator(StringPlusLanguage value) { + return new JAXBElement(_ShelfLocator_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "island") + public JAXBElement createIsland(HierarchicalPart value) { + return new JAXBElement(_Island_QNAME, HierarchicalPart.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "list") + public JAXBElement createList(StringPlusLanguage value) { + return new JAXBElement(_List_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "cartographicExtension") + public JAXBElement createCartographicExtension(ExtensionDefinition value) { + return new JAXBElement(_CartographicExtension_QNAME, ExtensionDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link NamePartDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "namePart") + public JAXBElement createNamePart(NamePartDefinition value) { + return new JAXBElement(_NamePart_QNAME, NamePartDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "descriptionStandard") + public JAXBElement createDescriptionStandard(StringPlusLanguagePlusAuthority value) { + return new JAXBElement(_DescriptionStandard_QNAME, StringPlusLanguagePlusAuthority.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CitySectionDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "citySection") + public JAXBElement createCitySection(CitySectionDefinition value) { + return new JAXBElement(_CitySection_QNAME, CitySectionDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link LanguageDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "languageOfCataloging") + public JAXBElement createLanguageOfCataloging(LanguageDefinition value) { + return new JAXBElement(_LanguageOfCataloging_QNAME, LanguageDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RecordInfoDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "recordInfo") + public JAXBElement createRecordInfo(RecordInfoDefinition value) { + return new JAXBElement(_RecordInfo_QNAME, RecordInfoDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GenreDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "genre") + public JAXBElement createGenre(GenreDefinition value) { + return new JAXBElement(_Genre_QNAME, GenreDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link OriginInfoDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "originInfo") + public JAXBElement createOriginInfo(OriginInfoDefinition value) { + return new JAXBElement(_OriginInfo_QNAME, OriginInfoDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link PlaceDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "place") + public JAXBElement createPlace(PlaceDefinition value) { + return new JAXBElement(_Place_QNAME, PlaceDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "continent") + public JAXBElement createContinent(HierarchicalPart value) { + return new JAXBElement(_Continent_QNAME, HierarchicalPart.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "extension") + public JAXBElement createExtension(ExtensionDefinition value) { + return new JAXBElement(_Extension_QNAME, ExtensionDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RoleDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "role") + public JAXBElement createRole(RoleDefinition value) { + return new JAXBElement(_Role_QNAME, RoleDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "city") + public JAXBElement createCity(HierarchicalPart value) { + return new JAXBElement(_City_QNAME, HierarchicalPart.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ModsCollectionDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "modsCollection") + public JAXBElement createModsCollection(ModsCollectionDefinition value) { + return new JAXBElement(_ModsCollection_QNAME, ModsCollectionDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DateOtherDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "dateOther") + public JAXBElement createDateOther(DateOtherDefinition value) { + return new JAXBElement(_DateOther_QNAME, DateOtherDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DateDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "dateValid") + public JAXBElement createDateValid(DateDefinition value) { + return new JAXBElement(_DateValid_QNAME, DateDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link EnumerationAndChronologyDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "enumerationAndChronology") + public JAXBElement createEnumerationAndChronology(EnumerationAndChronologyDefinition value) { + return new JAXBElement(_EnumerationAndChronology_QNAME, EnumerationAndChronologyDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CopyInformationDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "copyInformation") + public JAXBElement createCopyInformation(CopyInformationDefinition value) { + return new JAXBElement(_CopyInformation_QNAME, CopyInformationDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "partNumber") + public JAXBElement createPartNumber(StringPlusLanguage value) { + return new JAXBElement(_PartNumber_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DateDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "dateIssued") + public JAXBElement createDateIssued(DateDefinition value) { + return new JAXBElement(_DateIssued_QNAME, DateDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GeographicCodeDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "geographicCode") + public JAXBElement createGeographicCode(GeographicCodeDefinition value) { + return new JAXBElement(_GeographicCode_QNAME, GeographicCodeDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link PhysicalLocationDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "physicalLocation") + public JAXBElement createPhysicalLocation(PhysicalLocationDefinition value) { + return new JAXBElement(_PhysicalLocation_QNAME, PhysicalLocationDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AccessConditionDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "accessCondition") + public JAXBElement createAccessCondition(AccessConditionDefinition value) { + return new JAXBElement(_AccessCondition_QNAME, AccessConditionDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "coordinates") + public JAXBElement createCoordinates(StringPlusLanguage value) { + return new JAXBElement(_Coordinates_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ReformattingQualityDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "reformattingQuality") + public JAXBElement createReformattingQuality(ReformattingQualityDefinition value) { + return new JAXBElement(_ReformattingQuality_QNAME, ReformattingQualityDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AbstractDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "abstract") + public JAXBElement createAbstract(AbstractDefinition value) { + return new JAXBElement(_Abstract_QNAME, AbstractDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link UrlDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "url") + public JAXBElement createUrl(UrlDefinition value) { + return new JAXBElement(_Url_QNAME, UrlDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "number") + public JAXBElement createNumber(StringPlusLanguage value) { + return new JAXBElement(_Number_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "province") + public JAXBElement createProvince(StringPlusLanguage value) { + return new JAXBElement(_Province_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "state") + public JAXBElement createState(HierarchicalPart value) { + return new JAXBElement(_State_QNAME, HierarchicalPart.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CartographicsDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "cartographics") + public JAXBElement createCartographics(CartographicsDefinition value) { + return new JAXBElement(_Cartographics_QNAME, CartographicsDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RoleTermDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "roleTerm") + public JAXBElement createRoleTerm(RoleTermDefinition value) { + return new JAXBElement(_RoleTerm_QNAME, RoleTermDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TemporalDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "temporal") + public JAXBElement createTemporal(TemporalDefinition value) { + return new JAXBElement(_Temporal_QNAME, TemporalDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "occupation") + public JAXBElement createOccupation(StringPlusLanguagePlusAuthority value) { + return new JAXBElement(_Occupation_QNAME, StringPlusLanguagePlusAuthority.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ScriptTermDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "scriptTerm") + public JAXBElement createScriptTerm(ScriptTermDefinition value) { + return new JAXBElement(_ScriptTerm_QNAME, ScriptTermDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link NoteDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "recordInfoNote") + public JAXBElement createRecordInfoNote(NoteDefinition value) { + return new JAXBElement(_RecordInfoNote_QNAME, NoteDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HierarchicalPart }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "county") + public JAXBElement createCounty(HierarchicalPart value) { + return new JAXBElement(_County_QNAME, HierarchicalPart.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "caption") + public JAXBElement createCaption(StringPlusLanguage value) { + return new JAXBElement(_Caption_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TypeOfResourceDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "typeOfResource") + public JAXBElement createTypeOfResource(TypeOfResourceDefinition value) { + return new JAXBElement(_TypeOfResource_QNAME, TypeOfResourceDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "recordOrigin") + public JAXBElement createRecordOrigin(StringPlusLanguage value) { + return new JAXBElement(_RecordOrigin_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "etal") + public JAXBElement createEtal(StringPlusLanguage value) { + return new JAXBElement(_Etal_QNAME, StringPlusLanguage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ItemIdentifierDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "itemIdentifier") + public JAXBElement createItemIdentifier(ItemIdentifierDefinition value) { + return new JAXBElement(_ItemIdentifier_QNAME, ItemIdentifierDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DetailDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "detail") + public JAXBElement createDetail(DetailDefinition value) { + return new JAXBElement(_Detail_QNAME, DetailDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link PhysicalDescriptionDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "physicalDescription") + public JAXBElement createPhysicalDescription(PhysicalDescriptionDefinition value) { + return new JAXBElement(_PhysicalDescription_QNAME, PhysicalDescriptionDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RecordIdentifierDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "recordIdentifier") + public JAXBElement createRecordIdentifier(RecordIdentifierDefinition value) { + return new JAXBElement(_RecordIdentifier_QNAME, RecordIdentifierDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IdentifierDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "identifier") + public JAXBElement createIdentifier(IdentifierDefinition value) { + return new JAXBElement(_Identifier_QNAME, IdentifierDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HoldingSimpleDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "holdingSimple") + public JAXBElement createHoldingSimple(HoldingSimpleDefinition value) { + return new JAXBElement(_HoldingSimple_QNAME, HoldingSimpleDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ClassificationDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "classification") + public JAXBElement createClassification(ClassificationDefinition value) { + return new JAXBElement(_Classification_QNAME, ClassificationDefinition.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SubjectTitleInfoDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "titleInfo", scope = SubjectDefinition.class) + public JAXBElement createSubjectDefinitionTitleInfo(SubjectTitleInfoDefinition value) { + return new JAXBElement(_TitleInfo_QNAME, SubjectTitleInfoDefinition.class, SubjectDefinition.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SubjectNameDefinition }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.loc.gov/mods/v3", name = "name", scope = SubjectDefinition.class) + public JAXBElement createSubjectDefinitionName(SubjectNameDefinition value) { + return new JAXBElement(_Name_QNAME, SubjectNameDefinition.class, SubjectDefinition.class, value); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/OriginInfoDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/OriginInfoDefinition.java new file mode 100644 index 00000000000..92cdf65f6f7 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/OriginInfoDefinition.java @@ -0,0 +1,300 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for originInfoDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="originInfoDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://www.loc.gov/mods/v3}place"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}publisher"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}dateIssued"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}dateCreated"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}dateCaptured"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}dateValid"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}dateModified"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}copyrightDate"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}dateOther"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}edition"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}issuance"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}frequency"/>
+ *       </choice>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="eventType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "originInfoDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "placeOrPublisherOrDateIssued" +}) +public class OriginInfoDefinition { + + @XmlElementRefs({ + @XmlElementRef(name = "dateValid", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "dateCaptured", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "dateModified", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "issuance", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "copyrightDate", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "frequency", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "publisher", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "edition", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "dateIssued", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "place", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "dateOther", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "dateCreated", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false) + }) + protected List> placeOrPublisherOrDateIssued; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "eventType") + protected String eventType; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + + /** + * Gets the value of the placeOrPublisherOrDateIssued property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the placeOrPublisherOrDateIssued property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPlaceOrPublisherOrDateIssued().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link DateDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link DateDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link DateDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link IssuanceDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link DateDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusSupplied }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusSupplied }{@code >} + * {@link JAXBElement }{@code <}{@link DateDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PlaceDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link DateOtherDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link DateDefinition }{@code >} + * + * + */ + public List> getPlaceOrPublisherOrDateIssued() { + if (placeOrPublisherOrDateIssued == null) { + placeOrPublisherOrDateIssued = new ArrayList>(); + } + return this.placeOrPublisherOrDateIssued; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the eventType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEventType() { + return eventType; + } + + /** + * Sets the value of the eventType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEventType(String value) { + this.eventType = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PartDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PartDefinition.java new file mode 100644 index 00000000000..a0c38fafb59 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PartDefinition.java @@ -0,0 +1,337 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for partDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="partDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{http://www.loc.gov/mods/v3}detail"/>
+ *         <element name="extent" type="{http://www.loc.gov/mods/v3}extentDefinition"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}date"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}text"/>
+ *       </choice>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="order" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "partDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "detailOrExtentOrDate" +}) +public class PartDefinition { + + @XmlElements({ + @XmlElement(name = "detail", namespace = "http://www.loc.gov/mods/v3", type = DetailDefinition.class), + @XmlElement(name = "extent", namespace = "http://www.loc.gov/mods/v3", type = ExtentDefinition.class), + @XmlElement(name = "date", namespace = "http://www.loc.gov/mods/v3", type = DateDefinition.class), + @XmlElement(name = "text", namespace = "http://www.loc.gov/mods/v3", type = Text.class) + }) + protected List detailOrExtentOrDate; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "type") + protected String type; + @XmlAttribute(name = "order") + protected BigInteger order; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + + /** + * Gets the value of the detailOrExtentOrDate property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the detailOrExtentOrDate property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getDetailOrExtentOrDate().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link DetailDefinition } + * {@link ExtentDefinition } + * {@link DateDefinition } + * {@link Text } + * + * + */ + public List getDetailOrExtentOrDate() { + if (detailOrExtentOrDate == null) { + detailOrExtentOrDate = new ArrayList(); + } + return this.detailOrExtentOrDate; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the order property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getOrder() { + return order; + } + + /** + * Sets the value of the order property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setOrder(BigInteger value) { + this.order = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalDescriptionDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalDescriptionDefinition.java new file mode 100644 index 00000000000..ad61c54c519 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalDescriptionDefinition.java @@ -0,0 +1,254 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for physicalDescriptionDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="physicalDescriptionDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://www.loc.gov/mods/v3}form"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}reformattingQuality"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}internetMediaType"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}extent"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}digitalOrigin"/>
+ *         <element name="note" type="{http://www.loc.gov/mods/v3}physicalDescriptionNote"/>
+ *       </choice>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "physicalDescriptionDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "formOrReformattingQualityOrInternetMediaType" +}) +public class PhysicalDescriptionDefinition { + + @XmlElements({ + @XmlElement(name = "form", namespace = "http://www.loc.gov/mods/v3", type = FormDefinition.class), + @XmlElement(name = "reformattingQuality", namespace = "http://www.loc.gov/mods/v3", type = ReformattingQualityDefinition.class), + @XmlElement(name = "internetMediaType", namespace = "http://www.loc.gov/mods/v3", type = StringPlusLanguage.class), + @XmlElement(name = "extent", namespace = "http://www.loc.gov/mods/v3", type = Extent.class), + @XmlElement(name = "digitalOrigin", namespace = "http://www.loc.gov/mods/v3", type = DigitalOriginDefinition.class), + @XmlElement(name = "note", namespace = "http://www.loc.gov/mods/v3", type = PhysicalDescriptionNote.class) + }) + protected List formOrReformattingQualityOrInternetMediaType; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + + /** + * Gets the value of the formOrReformattingQualityOrInternetMediaType property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the formOrReformattingQualityOrInternetMediaType property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getFormOrReformattingQualityOrInternetMediaType().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link FormDefinition } + * {@link ReformattingQualityDefinition } + * {@link StringPlusLanguage } + * {@link Extent } + * {@link DigitalOriginDefinition } + * {@link PhysicalDescriptionNote } + * + * + */ + public List getFormOrReformattingQualityOrInternetMediaType() { + if (formOrReformattingQualityOrInternetMediaType == null) { + formOrReformattingQualityOrInternetMediaType = new ArrayList(); + } + return this.formOrReformattingQualityOrInternetMediaType; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalDescriptionNote.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalDescriptionNote.java new file mode 100644 index 00000000000..1cc3eab7369 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalDescriptionNote.java @@ -0,0 +1,344 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for physicalDescriptionNote complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="physicalDescriptionNote">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="typeURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "physicalDescriptionNote", namespace = "http://www.loc.gov/mods/v3") +public class PhysicalDescriptionNote + extends StringPlusLanguage +{ + + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "typeURI") + @XmlSchemaType(name = "anyURI") + protected String typeURI; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the typeURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTypeURI() { + return typeURI; + } + + /** + * Sets the value of the typeURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTypeURI(String value) { + this.typeURI = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalLocationDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalLocationDefinition.java new file mode 100644 index 00000000000..5058e67adc6 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PhysicalLocationDefinition.java @@ -0,0 +1,283 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for physicalLocationDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="physicalLocationDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguagePlusAuthority">
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "physicalLocationDefinition", namespace = "http://www.loc.gov/mods/v3") +public class PhysicalLocationDefinition + extends StringPlusLanguagePlusAuthority +{ + + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PlaceDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PlaceDefinition.java new file mode 100644 index 00000000000..0440cc53181 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PlaceDefinition.java @@ -0,0 +1,110 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for placeDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="placeDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.loc.gov/mods/v3}placeTerm" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="supplied" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="yes" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "placeDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "placeTerm" +}) +public class PlaceDefinition { + + @XmlElement(namespace = "http://www.loc.gov/mods/v3", required = true) + protected List placeTerm; + @XmlAttribute(name = "supplied") + @XmlSchemaType(name = "anySimpleType") + protected String supplied; + + /** + * Gets the value of the placeTerm property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the placeTerm property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getPlaceTerm().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PlaceTermDefinition } + * + * + */ + public List getPlaceTerm() { + if (placeTerm == null) { + placeTerm = new ArrayList(); + } + return this.placeTerm; + } + + /** + * Gets the value of the supplied property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSupplied() { + if (supplied == null) { + return "yes"; + } else { + return supplied; + } + } + + /** + * Sets the value of the supplied property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSupplied(String value) { + this.supplied = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PlaceTermDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PlaceTermDefinition.java new file mode 100644 index 00000000000..fd10d732feb --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/PlaceTermDefinition.java @@ -0,0 +1,159 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for placeTermDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="placeTermDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute name="authorityURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="valueURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="authority">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="marcgac"/>
+ *             <enumeration value="marccountry"/>
+ *             <enumeration value="iso3166"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="type" type="{http://www.loc.gov/mods/v3}codeOrText" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "placeTermDefinition", namespace = "http://www.loc.gov/mods/v3") +public class PlaceTermDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "type") + protected CodeOrText type; + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link CodeOrText } + * + */ + public CodeOrText getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link CodeOrText } + * + */ + public void setType(CodeOrText value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RecordIdentifierDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RecordIdentifierDefinition.java new file mode 100644 index 00000000000..7468e949b9d --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RecordIdentifierDefinition.java @@ -0,0 +1,67 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for recordIdentifierDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="recordIdentifierDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "recordIdentifierDefinition", namespace = "http://www.loc.gov/mods/v3") +public class RecordIdentifierDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "source") + protected String source; + + /** + * Gets the value of the source property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSource() { + return source; + } + + /** + * Sets the value of the source property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSource(String value) { + this.source = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RecordInfoDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RecordInfoDefinition.java new file mode 100644 index 00000000000..dfb5693c9d7 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RecordInfoDefinition.java @@ -0,0 +1,261 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for recordInfoDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="recordInfoDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://www.loc.gov/mods/v3}recordContentSource"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}recordCreationDate"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}recordChangeDate"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}recordIdentifier"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}languageOfCataloging"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}recordOrigin"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}descriptionStandard"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}recordInfoNote"/>
+ *       </choice>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "recordInfoDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "recordContentSourceOrRecordCreationDateOrRecordChangeDate" +}) +public class RecordInfoDefinition { + + @XmlElementRefs({ + @XmlElementRef(name = "recordOrigin", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "recordInfoNote", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "recordCreationDate", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "recordIdentifier", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "languageOfCataloging", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "recordContentSource", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "recordChangeDate", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "descriptionStandard", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false) + }) + protected List> recordContentSourceOrRecordCreationDateOrRecordChangeDate; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + + /** + * Gets the value of the recordContentSourceOrRecordCreationDateOrRecordChangeDate property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the recordContentSourceOrRecordCreationDateOrRecordChangeDate property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getRecordContentSourceOrRecordCreationDateOrRecordChangeDate().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link NoteDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link DateDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link RecordIdentifierDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link LanguageDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >} + * {@link JAXBElement }{@code <}{@link DateDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >} + * + * + */ + public List> getRecordContentSourceOrRecordCreationDateOrRecordChangeDate() { + if (recordContentSourceOrRecordCreationDateOrRecordChangeDate == null) { + recordContentSourceOrRecordCreationDateOrRecordChangeDate = new ArrayList>(); + } + return this.recordContentSourceOrRecordCreationDateOrRecordChangeDate; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ReformattingQualityDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ReformattingQualityDefinition.java new file mode 100644 index 00000000000..a61cd3ec00c --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ReformattingQualityDefinition.java @@ -0,0 +1,61 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for reformattingQualityDefinition. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ * 

+ * <simpleType name="reformattingQualityDefinition">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="access"/>
+ *     <enumeration value="preservation"/>
+ *     <enumeration value="replacement"/>
+ *   </restriction>
+ * </simpleType>
+ *
+ * + */ +@XmlType(name = "reformattingQualityDefinition", namespace = "http://www.loc.gov/mods/v3") +@XmlEnum +public enum ReformattingQualityDefinition { + + @XmlEnumValue("access") + ACCESS("access"), + @XmlEnumValue("preservation") + PRESERVATION("preservation"), + @XmlEnumValue("replacement") + REPLACEMENT("replacement"); + private final String value; + + ReformattingQualityDefinition(String v) { + value = v; + } + + public String value() { + return value; + } + + public static ReformattingQualityDefinition fromValue(String v) { + for (ReformattingQualityDefinition c: ReformattingQualityDefinition.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v); + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RegionDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RegionDefinition.java new file mode 100644 index 00000000000..c95a3c7f3b2 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RegionDefinition.java @@ -0,0 +1,69 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for regionDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="regionDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>hierarchicalPart">
+ *       <attribute name="regionType" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "regionDefinition", namespace = "http://www.loc.gov/mods/v3") +public class RegionDefinition + extends HierarchicalPart +{ + + @XmlAttribute(name = "regionType") + @XmlSchemaType(name = "anySimpleType") + protected String regionType; + + /** + * Gets the value of the regionType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRegionType() { + return regionType; + } + + /** + * Sets the value of the regionType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRegionType(String value) { + this.regionType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RelatedItemDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RelatedItemDefinition.java new file mode 100644 index 00000000000..c20f71c2052 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RelatedItemDefinition.java @@ -0,0 +1,516 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for relatedItemDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="relatedItemDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <group ref="{http://www.loc.gov/mods/v3}modsGroup" maxOccurs="unbounded" minOccurs="0"/>
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attribute name="type">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="preceding"/>
+ *             <enumeration value="succeeding"/>
+ *             <enumeration value="original"/>
+ *             <enumeration value="host"/>
+ *             <enumeration value="constituent"/>
+ *             <enumeration value="series"/>
+ *             <enumeration value="otherVersion"/>
+ *             <enumeration value="otherFormat"/>
+ *             <enumeration value="isReferencedBy"/>
+ *             <enumeration value="references"/>
+ *             <enumeration value="reviewOf"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="otherType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="otherTypeAuth" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="otherTypeAuthURI" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="otherTypeURI" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "relatedItemDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "modsGroup" +}) +public class RelatedItemDefinition { + + @XmlElements({ + @XmlElement(name = "abstract", namespace = "http://www.loc.gov/mods/v3", type = AbstractDefinition.class), + @XmlElement(name = "accessCondition", namespace = "http://www.loc.gov/mods/v3", type = AccessConditionDefinition.class), + @XmlElement(name = "classification", namespace = "http://www.loc.gov/mods/v3", type = ClassificationDefinition.class), + @XmlElement(name = "extension", namespace = "http://www.loc.gov/mods/v3", type = ExtensionDefinition.class), + @XmlElement(name = "genre", namespace = "http://www.loc.gov/mods/v3", type = GenreDefinition.class), + @XmlElement(name = "identifier", namespace = "http://www.loc.gov/mods/v3", type = IdentifierDefinition.class), + @XmlElement(name = "language", namespace = "http://www.loc.gov/mods/v3", type = LanguageDefinition.class), + @XmlElement(name = "location", namespace = "http://www.loc.gov/mods/v3", type = LocationDefinition.class), + @XmlElement(name = "name", namespace = "http://www.loc.gov/mods/v3", type = NameDefinition.class), + @XmlElement(name = "note", namespace = "http://www.loc.gov/mods/v3", type = NoteDefinition.class), + @XmlElement(name = "originInfo", namespace = "http://www.loc.gov/mods/v3", type = OriginInfoDefinition.class), + @XmlElement(name = "part", namespace = "http://www.loc.gov/mods/v3", type = PartDefinition.class), + @XmlElement(name = "physicalDescription", namespace = "http://www.loc.gov/mods/v3", type = PhysicalDescriptionDefinition.class), + @XmlElement(name = "recordInfo", namespace = "http://www.loc.gov/mods/v3", type = RecordInfoDefinition.class), + @XmlElement(name = "relatedItem", namespace = "http://www.loc.gov/mods/v3", type = RelatedItemDefinition.class), + @XmlElement(name = "subject", namespace = "http://www.loc.gov/mods/v3", type = SubjectDefinition.class), + @XmlElement(name = "tableOfContents", namespace = "http://www.loc.gov/mods/v3", type = TableOfContentsDefinition.class), + @XmlElement(name = "targetAudience", namespace = "http://www.loc.gov/mods/v3", type = TargetAudienceDefinition.class), + @XmlElement(name = "titleInfo", namespace = "http://www.loc.gov/mods/v3", type = TitleInfoDefinition.class), + @XmlElement(name = "typeOfResource", namespace = "http://www.loc.gov/mods/v3", type = TypeOfResourceDefinition.class) + }) + protected List modsGroup; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "otherType") + protected String otherType; + @XmlAttribute(name = "otherTypeAuth") + protected String otherTypeAuth; + @XmlAttribute(name = "otherTypeAuthURI") + protected String otherTypeAuthURI; + @XmlAttribute(name = "otherTypeURI") + protected String otherTypeURI; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + + /** + * Gets the value of the modsGroup property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the modsGroup property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getModsGroup().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AbstractDefinition } + * {@link AccessConditionDefinition } + * {@link ClassificationDefinition } + * {@link ExtensionDefinition } + * {@link GenreDefinition } + * {@link IdentifierDefinition } + * {@link LanguageDefinition } + * {@link LocationDefinition } + * {@link NameDefinition } + * {@link NoteDefinition } + * {@link OriginInfoDefinition } + * {@link PartDefinition } + * {@link PhysicalDescriptionDefinition } + * {@link RecordInfoDefinition } + * {@link RelatedItemDefinition } + * {@link SubjectDefinition } + * {@link TableOfContentsDefinition } + * {@link TargetAudienceDefinition } + * {@link TitleInfoDefinition } + * {@link TypeOfResourceDefinition } + * + * + */ + public List getModsGroup() { + if (modsGroup == null) { + modsGroup = new ArrayList(); + } + return this.modsGroup; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the otherType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOtherType() { + return otherType; + } + + /** + * Sets the value of the otherType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOtherType(String value) { + this.otherType = value; + } + + /** + * Gets the value of the otherTypeAuth property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOtherTypeAuth() { + return otherTypeAuth; + } + + /** + * Sets the value of the otherTypeAuth property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOtherTypeAuth(String value) { + this.otherTypeAuth = value; + } + + /** + * Gets the value of the otherTypeAuthURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOtherTypeAuthURI() { + return otherTypeAuthURI; + } + + /** + * Sets the value of the otherTypeAuthURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOtherTypeAuthURI(String value) { + this.otherTypeAuthURI = value; + } + + /** + * Gets the value of the otherTypeURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOtherTypeURI() { + return otherTypeURI; + } + + /** + * Sets the value of the otherTypeURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOtherTypeURI(String value) { + this.otherTypeURI = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RoleDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RoleDefinition.java new file mode 100644 index 00000000000..b17aafd3a5c --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RoleDefinition.java @@ -0,0 +1,76 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for roleDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="roleDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element ref="{http://www.loc.gov/mods/v3}roleTerm"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "roleDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "roleTerm" +}) +public class RoleDefinition { + + @XmlElement(namespace = "http://www.loc.gov/mods/v3", required = true) + protected List roleTerm; + + /** + * Gets the value of the roleTerm property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the roleTerm property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getRoleTerm().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link RoleTermDefinition } + * + * + */ + public List getRoleTerm() { + if (roleTerm == null) { + roleTerm = new ArrayList(); + } + return this.roleTerm; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RoleTermDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RoleTermDefinition.java new file mode 100644 index 00000000000..d0affd2992c --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/RoleTermDefinition.java @@ -0,0 +1,67 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for roleTermDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="roleTermDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguagePlusAuthority">
+ *       <attribute name="type" type="{http://www.loc.gov/mods/v3}codeOrText" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "roleTermDefinition", namespace = "http://www.loc.gov/mods/v3") +public class RoleTermDefinition + extends StringPlusLanguagePlusAuthority +{ + + @XmlAttribute(name = "type") + protected CodeOrText type; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link CodeOrText } + * + */ + public CodeOrText getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link CodeOrText } + * + */ + public void setType(CodeOrText value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ScriptTermDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ScriptTermDefinition.java new file mode 100644 index 00000000000..7d6b69966c1 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/ScriptTermDefinition.java @@ -0,0 +1,67 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for scriptTermDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="scriptTermDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguagePlusAuthority">
+ *       <attribute name="type" type="{http://www.loc.gov/mods/v3}codeOrText" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "scriptTermDefinition", namespace = "http://www.loc.gov/mods/v3") +public class ScriptTermDefinition + extends StringPlusLanguagePlusAuthority +{ + + @XmlAttribute(name = "type") + protected CodeOrText type; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link CodeOrText } + * + */ + public CodeOrText getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link CodeOrText } + * + */ + public void setType(CodeOrText value) { + this.type = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguage.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguage.java new file mode 100644 index 00000000000..af51146ea3f --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguage.java @@ -0,0 +1,194 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for stringPlusLanguage complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="stringPlusLanguage">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "stringPlusLanguage", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "value" +}) +@XmlSeeAlso({ + NoteDefinition.class, + IdentifierDefinition.class, + ItemIdentifierDefinition.class, + RecordIdentifierDefinition.class, + DateDefinition.class, + GeographicCodeDefinition.class, + AbstractDefinition.class, + EnumerationAndChronologyDefinition.class, + org.jabref.logic.importer.fileformat.mods.CopyInformationDefinition.Note.class, + NamePartDefinition.class, + LanguageTermDefinition.class, + HierarchicalPart.class, + TableOfContentsDefinition.class, + PlaceTermDefinition.class, + StringPlusLanguagePlusAuthority.class, + PhysicalDescriptionNote.class, + NonSort.class, + Text.class, + StringPlusLanguagePlusSupplied.class +}) +public class StringPlusLanguage { + + @XmlValue + protected String value; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguagePlusAuthority.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguagePlusAuthority.java new file mode 100644 index 00000000000..44786433ff7 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguagePlusAuthority.java @@ -0,0 +1,132 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for stringPlusLanguagePlusAuthority complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="stringPlusLanguagePlusAuthority">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}authorityAttributeGroup"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "stringPlusLanguagePlusAuthority", namespace = "http://www.loc.gov/mods/v3") +@XmlSeeAlso({ + ScriptTermDefinition.class, + RoleTermDefinition.class, + ClassificationDefinition.class, + GenreDefinition.class, + PhysicalLocationDefinition.class, + FormDefinition.class, + TargetAudienceDefinition.class +}) +public class StringPlusLanguagePlusAuthority + extends StringPlusLanguage +{ + + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguagePlusSupplied.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguagePlusSupplied.java new file mode 100644 index 00000000000..f372ed69c8e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/StringPlusLanguagePlusSupplied.java @@ -0,0 +1,77 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for stringPlusLanguagePlusSupplied complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="stringPlusLanguagePlusSupplied">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attribute name="supplied" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="yes" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "stringPlusLanguagePlusSupplied", namespace = "http://www.loc.gov/mods/v3") +@XmlSeeAlso({ + Extent.class +}) +public class StringPlusLanguagePlusSupplied + extends StringPlusLanguage +{ + + @XmlAttribute(name = "supplied") + @XmlSchemaType(name = "anySimpleType") + protected String supplied; + + /** + * Gets the value of the supplied property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSupplied() { + if (supplied == null) { + return "yes"; + } else { + return supplied; + } + } + + /** + * Sets the value of the supplied property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSupplied(String value) { + this.supplied = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectDefinition.java new file mode 100644 index 00000000000..ad573d7218e --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectDefinition.java @@ -0,0 +1,602 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for subjectDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="subjectDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{http://www.loc.gov/mods/v3}topic"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}geographic"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}temporal"/>
+ *         <element name="titleInfo" type="{http://www.loc.gov/mods/v3}subjectTitleInfoDefinition"/>
+ *         <element name="name" type="{http://www.loc.gov/mods/v3}subjectNameDefinition"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}geographicCode"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}hierarchicalGeographic"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}cartographics"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}occupation"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}genre"/>
+ *       </choice>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}authorityAttributeGroup"/>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="usage" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="primary" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "subjectDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "topicOrGeographicOrTemporal" +}) +public class SubjectDefinition { + + @XmlElementRefs({ + @XmlElementRef(name = "hierarchicalGeographic", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "geographicCode", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "geographic", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "cartographics", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "occupation", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "titleInfo", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "genre", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "temporal", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "name", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "topic", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false) + }) + protected List> topicOrGeographicOrTemporal; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "usage") + @XmlSchemaType(name = "anySimpleType") + protected String usage; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + + /** + * Gets the value of the topicOrGeographicOrTemporal property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the topicOrGeographicOrTemporal property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getTopicOrGeographicOrTemporal().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link HierarchicalGeographicDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link GeographicCodeDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >} + * {@link JAXBElement }{@code <}{@link CartographicsDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >} + * {@link JAXBElement }{@code <}{@link SubjectTitleInfoDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link GenreDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TemporalDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link SubjectNameDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguagePlusAuthority }{@code >} + * + * + */ + public List> getTopicOrGeographicOrTemporal() { + if (topicOrGeographicOrTemporal == null) { + topicOrGeographicOrTemporal = new ArrayList>(); + } + return this.topicOrGeographicOrTemporal; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the usage property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUsage() { + if (usage == null) { + return "primary"; + } else { + return usage; + } + } + + /** + * Sets the value of the usage property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUsage(String value) { + this.usage = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectNameDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectNameDefinition.java new file mode 100644 index 00000000000..313ac6a781d --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectNameDefinition.java @@ -0,0 +1,567 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for subjectNameDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="subjectNameDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{http://www.loc.gov/mods/v3}namePart"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}displayForm"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}affiliation"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}role"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}description"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}nameIdentifier"/>
+ *       </choice>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}authorityAttributeGroup"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attribute name="type">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="personal"/>
+ *             <enumeration value="corporate"/>
+ *             <enumeration value="conference"/>
+ *             <enumeration value="family"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "subjectNameDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "namePartOrDisplayFormOrAffiliation" +}) +public class SubjectNameDefinition { + + @XmlElementRefs({ + @XmlElementRef(name = "displayForm", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "description", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "namePart", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "nameIdentifier", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "affiliation", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "role", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false) + }) + protected List> namePartOrDisplayFormOrAffiliation; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + + /** + * Gets the value of the namePartOrDisplayFormOrAffiliation property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the namePartOrDisplayFormOrAffiliation property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getNamePartOrDisplayFormOrAffiliation().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link IdentifierDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link NamePartDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link RoleDefinition }{@code >} + * + * + */ + public List> getNamePartOrDisplayFormOrAffiliation() { + if (namePartOrDisplayFormOrAffiliation == null) { + namePartOrDisplayFormOrAffiliation = new ArrayList>(); + } + return this.namePartOrDisplayFormOrAffiliation; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectTitleInfoDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectTitleInfoDefinition.java new file mode 100644 index 00000000000..275f10ec8da --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/SubjectTitleInfoDefinition.java @@ -0,0 +1,564 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for subjectTitleInfoDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="subjectTitleInfoDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{http://www.loc.gov/mods/v3}title"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}subTitle"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}partNumber"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}partName"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}nonSort"/>
+ *       </choice>
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}authorityAttributeGroup"/>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="type">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="abbreviated"/>
+ *             <enumeration value="translated"/>
+ *             <enumeration value="alternative"/>
+ *             <enumeration value="uniform"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "subjectTitleInfoDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "titleOrSubTitleOrPartNumber" +}) +public class SubjectTitleInfoDefinition { + + @XmlElementRefs({ + @XmlElementRef(name = "subTitle", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "partNumber", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "title", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "nonSort", namespace = "http://www.loc.gov/mods/v3", type = NonSort.class, required = false), + @XmlElementRef(name = "partName", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false) + }) + protected List titleOrSubTitleOrPartNumber; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + + /** + * Gets the value of the titleOrSubTitleOrPartNumber property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the titleOrSubTitleOrPartNumber property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getTitleOrSubTitleOrPartNumber().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link NonSort } + * + * + */ + public List getTitleOrSubTitleOrPartNumber() { + if (titleOrSubTitleOrPartNumber == null) { + titleOrSubTitleOrPartNumber = new ArrayList(); + } + return this.titleOrSubTitleOrPartNumber; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TableOfContentsDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TableOfContentsDefinition.java new file mode 100644 index 00000000000..c06a970dc85 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TableOfContentsDefinition.java @@ -0,0 +1,396 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for tableOfContentsDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="tableOfContentsDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}altFormatAttributeGroup"/>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="shareable" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="no" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "tableOfContentsDefinition", namespace = "http://www.loc.gov/mods/v3") +public class TableOfContentsDefinition + extends StringPlusLanguage +{ + + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "shareable") + @XmlSchemaType(name = "anySimpleType") + protected String shareable; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + @XmlAttribute(name = "altFormat") + @XmlSchemaType(name = "anyURI") + protected String altFormat; + @XmlAttribute(name = "contentType") + protected String contentType; + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the shareable property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShareable() { + if (shareable == null) { + return "no"; + } else { + return shareable; + } + } + + /** + * Sets the value of the shareable property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShareable(String value) { + this.shareable = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + + /** + * Gets the value of the altFormat property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltFormat() { + return altFormat; + } + + /** + * Sets the value of the altFormat property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltFormat(String value) { + this.altFormat = value; + } + + /** + * Gets the value of the contentType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContentType() { + return contentType; + } + + /** + * Sets the value of the contentType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContentType(String value) { + this.contentType = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TargetAudienceDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TargetAudienceDefinition.java new file mode 100644 index 00000000000..beef1923be5 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TargetAudienceDefinition.java @@ -0,0 +1,94 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for targetAudienceDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="targetAudienceDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguagePlusAuthority">
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "targetAudienceDefinition", namespace = "http://www.loc.gov/mods/v3") +public class TargetAudienceDefinition + extends StringPlusLanguagePlusAuthority +{ + + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TemporalDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TemporalDefinition.java new file mode 100644 index 00000000000..7e9531684bb --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TemporalDefinition.java @@ -0,0 +1,122 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for temporalDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="temporalDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>dateDefinition">
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}authorityAttributeGroup"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "temporalDefinition", namespace = "http://www.loc.gov/mods/v3") +public class TemporalDefinition + extends DateDefinition +{ + + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/Text.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/Text.java new file mode 100644 index 00000000000..ae0c6bc5c16 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/Text.java @@ -0,0 +1,285 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>stringPlusLanguage">
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "text", namespace = "http://www.loc.gov/mods/v3") +public class Text + extends StringPlusLanguage +{ + + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TitleInfoDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TitleInfoDefinition.java new file mode 100644 index 00000000000..c92903f0e0b --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TitleInfoDefinition.java @@ -0,0 +1,764 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Java class for titleInfoDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="titleInfoDefinition">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{http://www.loc.gov/mods/v3}title"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}subTitle"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}partNumber"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}partName"/>
+ *         <element ref="{http://www.loc.gov/mods/v3}nonSort"/>
+ *       </choice>
+ *       <attGroup ref="{http://www.w3.org/1999/xlink}simpleLink"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}altFormatAttributeGroup"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}languageAttributeGroup"/>
+ *       <attGroup ref="{http://www.loc.gov/mods/v3}authorityAttributeGroup"/>
+ *       <attribute name="type">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="abbreviated"/>
+ *             <enumeration value="translated"/>
+ *             <enumeration value="alternative"/>
+ *             <enumeration value="uniform"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="otherType" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *       <attribute name="supplied" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="yes" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="nameTitleGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="usage" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="primary" />
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "titleInfoDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "titleOrSubTitleOrPartNumber" +}) +public class TitleInfoDefinition { + + @XmlElementRefs({ + @XmlElementRef(name = "subTitle", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "partNumber", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "title", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false), + @XmlElementRef(name = "nonSort", namespace = "http://www.loc.gov/mods/v3", type = NonSort.class, required = false), + @XmlElementRef(name = "partName", namespace = "http://www.loc.gov/mods/v3", type = JAXBElement.class, required = false) + }) + protected List titleOrSubTitleOrPartNumber; + @XmlAttribute(name = "type") + protected String atType; + @XmlAttribute(name = "otherType") + @XmlSchemaType(name = "anySimpleType") + protected String otherType; + @XmlAttribute(name = "supplied") + @XmlSchemaType(name = "anySimpleType") + protected String supplied; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "nameTitleGroup") + protected String nameTitleGroup; + @XmlAttribute(name = "usage") + @XmlSchemaType(name = "anySimpleType") + protected String usage; + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink") + protected String type; + @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink") + @XmlSchemaType(name = "anyURI") + protected String href; + @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink") + protected String role; + @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink") + protected String arcrole; + @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink") + protected String title; + @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink") + protected String show; + @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink") + protected String actuate; + @XmlAttribute(name = "altFormat") + @XmlSchemaType(name = "anyURI") + protected String altFormat; + @XmlAttribute(name = "contentType") + protected String contentType; + @XmlAttribute(name = "lang") + protected String atlang; + @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") + protected String lang; + @XmlAttribute(name = "script") + protected String script; + @XmlAttribute(name = "transliteration") + protected String transliteration; + @XmlAttribute(name = "authority") + protected String authority; + @XmlAttribute(name = "authorityURI") + @XmlSchemaType(name = "anyURI") + protected String authorityURI; + @XmlAttribute(name = "valueURI") + @XmlSchemaType(name = "anyURI") + protected String valueURI; + + /** + * Gets the value of the titleOrSubTitleOrPartNumber property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the titleOrSubTitleOrPartNumber property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getTitleOrSubTitleOrPartNumber().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link JAXBElement }{@code <}{@link StringPlusLanguage }{@code >} + * {@link NonSort } + * + * + */ + public List getTitleOrSubTitleOrPartNumber() { + if (titleOrSubTitleOrPartNumber == null) { + titleOrSubTitleOrPartNumber = new ArrayList(); + } + return this.titleOrSubTitleOrPartNumber; + } + + /** + * Gets the value of the atType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtType() { + return atType; + } + + /** + * Sets the value of the atType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtType(String value) { + this.atType = value; + } + + /** + * Gets the value of the otherType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOtherType() { + return otherType; + } + + /** + * Sets the value of the otherType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOtherType(String value) { + this.otherType = value; + } + + /** + * Gets the value of the supplied property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSupplied() { + if (supplied == null) { + return "yes"; + } else { + return supplied; + } + } + + /** + * Sets the value of the supplied property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSupplied(String value) { + this.supplied = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the nameTitleGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNameTitleGroup() { + return nameTitleGroup; + } + + /** + * Sets the value of the nameTitleGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNameTitleGroup(String value) { + this.nameTitleGroup = value; + } + + /** + * Gets the value of the usage property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUsage() { + if (usage == null) { + return "primary"; + } else { + return usage; + } + } + + /** + * Sets the value of the usage property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUsage(String value) { + this.usage = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + if (type == null) { + return "simple"; + } else { + return type; + } + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the href property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHref() { + return href; + } + + /** + * Sets the value of the href property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHref(String value) { + this.href = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRole(String value) { + this.role = value; + } + + /** + * Gets the value of the arcrole property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArcrole() { + return arcrole; + } + + /** + * Sets the value of the arcrole property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArcrole(String value) { + this.arcrole = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the show property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShow() { + return show; + } + + /** + * Sets the value of the show property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShow(String value) { + this.show = value; + } + + /** + * Gets the value of the actuate property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getActuate() { + return actuate; + } + + /** + * Sets the value of the actuate property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setActuate(String value) { + this.actuate = value; + } + + /** + * Gets the value of the altFormat property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltFormat() { + return altFormat; + } + + /** + * Sets the value of the altFormat property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltFormat(String value) { + this.altFormat = value; + } + + /** + * Gets the value of the contentType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getContentType() { + return contentType; + } + + /** + * Sets the value of the contentType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setContentType(String value) { + this.contentType = value; + } + + /** + * Gets the value of the atlang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtlang() { + return atlang; + } + + /** + * Sets the value of the atlang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtlang(String value) { + this.atlang = value; + } + + /** + * Gets the value of the lang property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLang() { + return lang; + } + + /** + * Sets the value of the lang property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLang(String value) { + this.lang = value; + } + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + /** + * Gets the value of the transliteration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransliteration() { + return transliteration; + } + + /** + * Sets the value of the transliteration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransliteration(String value) { + this.transliteration = value; + } + + /** + * Gets the value of the authority property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthority() { + return authority; + } + + /** + * Sets the value of the authority property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthority(String value) { + this.authority = value; + } + + /** + * Gets the value of the authorityURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthorityURI() { + return authorityURI; + } + + /** + * Sets the value of the authorityURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthorityURI(String value) { + this.authorityURI = value; + } + + /** + * Gets the value of the valueURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValueURI() { + return valueURI; + } + + /** + * Sets the value of the valueURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValueURI(String value) { + this.valueURI = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TypeOfResourceDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TypeOfResourceDefinition.java new file mode 100644 index 00000000000..fba1d8c4c9f --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/TypeOfResourceDefinition.java @@ -0,0 +1,218 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for typeOfResourceDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="typeOfResourceDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.loc.gov/mods/v3>resourceTypeDefinition">
+ *       <attribute name="collection" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="yes" />
+ *       <attribute name="manuscript" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="yes" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="altRepGroup" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="usage" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" fixed="primary" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "typeOfResourceDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "value" +}) +public class TypeOfResourceDefinition { + + @XmlValue + protected String value; + @XmlAttribute(name = "collection") + @XmlSchemaType(name = "anySimpleType") + protected String collection; + @XmlAttribute(name = "manuscript") + @XmlSchemaType(name = "anySimpleType") + protected String manuscript; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "altRepGroup") + protected String altRepGroup; + @XmlAttribute(name = "usage") + @XmlSchemaType(name = "anySimpleType") + protected String usage; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the collection property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCollection() { + if (collection == null) { + return "yes"; + } else { + return collection; + } + } + + /** + * Sets the value of the collection property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCollection(String value) { + this.collection = value; + } + + /** + * Gets the value of the manuscript property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getManuscript() { + if (manuscript == null) { + return "yes"; + } else { + return manuscript; + } + } + + /** + * Sets the value of the manuscript property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setManuscript(String value) { + this.manuscript = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the altRepGroup property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAltRepGroup() { + return altRepGroup; + } + + /** + * Sets the value of the altRepGroup property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAltRepGroup(String value) { + this.altRepGroup = value; + } + + /** + * Gets the value of the usage property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUsage() { + if (usage == null) { + return "primary"; + } else { + return usage; + } + } + + /** + * Sets the value of the usage property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUsage(String value) { + this.usage = value; + } + +} diff --git a/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/UrlDefinition.java b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/UrlDefinition.java new file mode 100644 index 00000000000..403da136d79 --- /dev/null +++ b/org.jabref.gui/src/main/gen/org/jabref/logic/importer/fileformat/mods/UrlDefinition.java @@ -0,0 +1,219 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2018.02.06 at 09:03:38 PM CET +// + + +package org.jabref.logic.importer.fileformat.mods; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for urlDefinition complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="urlDefinition">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="dateLastAccessed" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="displayLabel" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="note" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="access">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="preview"/>
+ *             <enumeration value="raw object"/>
+ *             <enumeration value="object in context"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="usage">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="primary display"/>
+ *             <enumeration value="primary"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "urlDefinition", namespace = "http://www.loc.gov/mods/v3", propOrder = { + "value" +}) +public class UrlDefinition { + + @XmlValue + @XmlSchemaType(name = "anyURI") + protected String value; + @XmlAttribute(name = "dateLastAccessed") + protected String dateLastAccessed; + @XmlAttribute(name = "displayLabel") + protected String displayLabel; + @XmlAttribute(name = "note") + protected String note; + @XmlAttribute(name = "access") + protected String access; + @XmlAttribute(name = "usage") + protected String usage; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the dateLastAccessed property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDateLastAccessed() { + return dateLastAccessed; + } + + /** + * Sets the value of the dateLastAccessed property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDateLastAccessed(String value) { + this.dateLastAccessed = value; + } + + /** + * Gets the value of the displayLabel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDisplayLabel() { + return displayLabel; + } + + /** + * Sets the value of the displayLabel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDisplayLabel(String value) { + this.displayLabel = value; + } + + /** + * Gets the value of the note property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNote() { + return note; + } + + /** + * Sets the value of the note property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNote(String value) { + this.note = value; + } + + /** + * Gets the value of the access property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAccess() { + return access; + } + + /** + * Sets the value of the access property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAccess(String value) { + this.access = value; + } + + /** + * Gets the value of the usage property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUsage() { + return usage; + } + + /** + * Sets the value of the usage property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUsage(String value) { + this.usage = value; + } + +} diff --git a/src/main/java/oracle/jdbc/OracleConnection.java b/org.jabref.gui/src/main/java/oracle/jdbc/OracleConnection.java similarity index 100% rename from src/main/java/oracle/jdbc/OracleConnection.java rename to org.jabref.gui/src/main/java/oracle/jdbc/OracleConnection.java diff --git a/src/main/java/oracle/jdbc/OracleStatement.java b/org.jabref.gui/src/main/java/oracle/jdbc/OracleStatement.java similarity index 100% rename from src/main/java/oracle/jdbc/OracleStatement.java rename to org.jabref.gui/src/main/java/oracle/jdbc/OracleStatement.java diff --git a/src/main/java/oracle/jdbc/dcn/DatabaseChangeEvent.java b/org.jabref.gui/src/main/java/oracle/jdbc/dcn/DatabaseChangeEvent.java similarity index 100% rename from src/main/java/oracle/jdbc/dcn/DatabaseChangeEvent.java rename to org.jabref.gui/src/main/java/oracle/jdbc/dcn/DatabaseChangeEvent.java diff --git a/src/main/java/oracle/jdbc/dcn/DatabaseChangeListener.java b/org.jabref.gui/src/main/java/oracle/jdbc/dcn/DatabaseChangeListener.java similarity index 100% rename from src/main/java/oracle/jdbc/dcn/DatabaseChangeListener.java rename to org.jabref.gui/src/main/java/oracle/jdbc/dcn/DatabaseChangeListener.java diff --git a/src/main/java/oracle/jdbc/dcn/DatabaseChangeRegistration.java b/org.jabref.gui/src/main/java/oracle/jdbc/dcn/DatabaseChangeRegistration.java similarity index 100% rename from src/main/java/oracle/jdbc/dcn/DatabaseChangeRegistration.java rename to org.jabref.gui/src/main/java/oracle/jdbc/dcn/DatabaseChangeRegistration.java diff --git a/src/main/java/oracle/jdbc/driver/OracleDriver.java b/org.jabref.gui/src/main/java/oracle/jdbc/driver/OracleDriver.java similarity index 100% rename from src/main/java/oracle/jdbc/driver/OracleDriver.java rename to org.jabref.gui/src/main/java/oracle/jdbc/driver/OracleDriver.java diff --git a/src/main/java/oracle/jdbc/package-info.java b/org.jabref.gui/src/main/java/oracle/jdbc/package-info.java similarity index 100% rename from src/main/java/oracle/jdbc/package-info.java rename to org.jabref.gui/src/main/java/oracle/jdbc/package-info.java diff --git a/src/main/java/org/jabref/FallbackExceptionHandler.java b/org.jabref.gui/src/main/java/org/jabref/FallbackExceptionHandler.java similarity index 100% rename from src/main/java/org/jabref/FallbackExceptionHandler.java rename to org.jabref.gui/src/main/java/org/jabref/FallbackExceptionHandler.java diff --git a/src/main/java/org/jabref/Globals.java b/org.jabref.gui/src/main/java/org/jabref/Globals.java similarity index 100% rename from src/main/java/org/jabref/Globals.java rename to org.jabref.gui/src/main/java/org/jabref/Globals.java diff --git a/src/main/java/org/jabref/JabRefException.java b/org.jabref.gui/src/main/java/org/jabref/JabRefException.java similarity index 100% rename from src/main/java/org/jabref/JabRefException.java rename to org.jabref.gui/src/main/java/org/jabref/JabRefException.java diff --git a/src/main/java/org/jabref/JabRefExecutorService.java b/org.jabref.gui/src/main/java/org/jabref/JabRefExecutorService.java similarity index 100% rename from src/main/java/org/jabref/JabRefExecutorService.java rename to org.jabref.gui/src/main/java/org/jabref/JabRefExecutorService.java diff --git a/src/main/java/org/jabref/JabRefGUI.java b/org.jabref.gui/src/main/java/org/jabref/JabRefGUI.java similarity index 100% rename from src/main/java/org/jabref/JabRefGUI.java rename to org.jabref.gui/src/main/java/org/jabref/JabRefGUI.java diff --git a/src/main/java/org/jabref/JabRefMain.java b/org.jabref.gui/src/main/java/org/jabref/JabRefMain.java similarity index 100% rename from src/main/java/org/jabref/JabRefMain.java rename to org.jabref.gui/src/main/java/org/jabref/JabRefMain.java diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/org.jabref.gui/src/main/java/org/jabref/cli/ArgumentProcessor.java similarity index 100% rename from src/main/java/org/jabref/cli/ArgumentProcessor.java rename to org.jabref.gui/src/main/java/org/jabref/cli/ArgumentProcessor.java diff --git a/src/main/java/org/jabref/cli/AuxCommandLine.java b/org.jabref.gui/src/main/java/org/jabref/cli/AuxCommandLine.java similarity index 100% rename from src/main/java/org/jabref/cli/AuxCommandLine.java rename to org.jabref.gui/src/main/java/org/jabref/cli/AuxCommandLine.java diff --git a/src/main/java/org/jabref/cli/CrossrefFetcherEvaluator.java b/org.jabref.gui/src/main/java/org/jabref/cli/CrossrefFetcherEvaluator.java similarity index 100% rename from src/main/java/org/jabref/cli/CrossrefFetcherEvaluator.java rename to org.jabref.gui/src/main/java/org/jabref/cli/CrossrefFetcherEvaluator.java diff --git a/src/main/java/org/jabref/cli/GenerateCharacterTable.java b/org.jabref.gui/src/main/java/org/jabref/cli/GenerateCharacterTable.java similarity index 100% rename from src/main/java/org/jabref/cli/GenerateCharacterTable.java rename to org.jabref.gui/src/main/java/org/jabref/cli/GenerateCharacterTable.java diff --git a/src/main/java/org/jabref/cli/ImportInspectionCommandLine.java b/org.jabref.gui/src/main/java/org/jabref/cli/ImportInspectionCommandLine.java similarity index 100% rename from src/main/java/org/jabref/cli/ImportInspectionCommandLine.java rename to org.jabref.gui/src/main/java/org/jabref/cli/ImportInspectionCommandLine.java diff --git a/src/main/java/org/jabref/cli/JabRefCLI.java b/org.jabref.gui/src/main/java/org/jabref/cli/JabRefCLI.java similarity index 100% rename from src/main/java/org/jabref/cli/JabRefCLI.java rename to org.jabref.gui/src/main/java/org/jabref/cli/JabRefCLI.java diff --git a/src/main/java/org/jabref/cli/SystemOutputPrinter.java b/org.jabref.gui/src/main/java/org/jabref/cli/SystemOutputPrinter.java similarity index 100% rename from src/main/java/org/jabref/cli/SystemOutputPrinter.java rename to org.jabref.gui/src/main/java/org/jabref/cli/SystemOutputPrinter.java diff --git a/src/main/java/org/jabref/cli/XMPUtilMain.java b/org.jabref.gui/src/main/java/org/jabref/cli/XMPUtilMain.java similarity index 100% rename from src/main/java/org/jabref/cli/XMPUtilMain.java rename to org.jabref.gui/src/main/java/org/jabref/cli/XMPUtilMain.java diff --git a/src/main/java/org/jabref/gui/AbstractController.java b/org.jabref.gui/src/main/java/org/jabref/gui/AbstractController.java similarity index 100% rename from src/main/java/org/jabref/gui/AbstractController.java rename to org.jabref.gui/src/main/java/org/jabref/gui/AbstractController.java diff --git a/src/main/java/org/jabref/gui/AbstractDialogView.java b/org.jabref.gui/src/main/java/org/jabref/gui/AbstractDialogView.java similarity index 100% rename from src/main/java/org/jabref/gui/AbstractDialogView.java rename to org.jabref.gui/src/main/java/org/jabref/gui/AbstractDialogView.java diff --git a/src/main/java/org/jabref/gui/AbstractView.java b/org.jabref.gui/src/main/java/org/jabref/gui/AbstractView.java similarity index 100% rename from src/main/java/org/jabref/gui/AbstractView.java rename to org.jabref.gui/src/main/java/org/jabref/gui/AbstractView.java diff --git a/src/main/java/org/jabref/gui/AbstractViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/AbstractViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/AbstractViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/AbstractViewModel.java diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java similarity index 100% rename from src/main/java/org/jabref/gui/BasePanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java diff --git a/src/main/java/org/jabref/gui/BasePanelMode.java b/org.jabref.gui/src/main/java/org/jabref/gui/BasePanelMode.java similarity index 100% rename from src/main/java/org/jabref/gui/BasePanelMode.java rename to org.jabref.gui/src/main/java/org/jabref/gui/BasePanelMode.java diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/org.jabref.gui/src/main/java/org/jabref/gui/ClipBoardManager.java similarity index 100% rename from src/main/java/org/jabref/gui/ClipBoardManager.java rename to org.jabref.gui/src/main/java/org/jabref/gui/ClipBoardManager.java diff --git a/src/main/java/org/jabref/gui/DefaultInjector.java b/org.jabref.gui/src/main/java/org/jabref/gui/DefaultInjector.java similarity index 100% rename from src/main/java/org/jabref/gui/DefaultInjector.java rename to org.jabref.gui/src/main/java/org/jabref/gui/DefaultInjector.java diff --git a/src/main/java/org/jabref/gui/Dialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/Dialog.java similarity index 100% rename from src/main/java/org/jabref/gui/Dialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/Dialog.java diff --git a/src/main/java/org/jabref/gui/DialogService.java b/org.jabref.gui/src/main/java/org/jabref/gui/DialogService.java similarity index 100% rename from src/main/java/org/jabref/gui/DialogService.java rename to org.jabref.gui/src/main/java/org/jabref/gui/DialogService.java diff --git a/src/main/java/org/jabref/gui/DragAndDropDataFormats.java b/org.jabref.gui/src/main/java/org/jabref/gui/DragAndDropDataFormats.java similarity index 100% rename from src/main/java/org/jabref/gui/DragAndDropDataFormats.java rename to org.jabref.gui/src/main/java/org/jabref/gui/DragAndDropDataFormats.java diff --git a/src/main/java/org/jabref/gui/DragDropPane.java b/org.jabref.gui/src/main/java/org/jabref/gui/DragDropPane.java similarity index 100% rename from src/main/java/org/jabref/gui/DragDropPane.java rename to org.jabref.gui/src/main/java/org/jabref/gui/DragDropPane.java diff --git a/src/main/java/org/jabref/gui/DragDropPopupPane.java b/org.jabref.gui/src/main/java/org/jabref/gui/DragDropPopupPane.java similarity index 100% rename from src/main/java/org/jabref/gui/DragDropPopupPane.java rename to org.jabref.gui/src/main/java/org/jabref/gui/DragDropPopupPane.java diff --git a/src/main/java/org/jabref/gui/DuplicateResolverDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/DuplicateResolverDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/DuplicateResolverDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/DuplicateResolverDialog.java diff --git a/src/main/java/org/jabref/gui/DuplicateSearch.java b/org.jabref.gui/src/main/java/org/jabref/gui/DuplicateSearch.java similarity index 100% rename from src/main/java/org/jabref/gui/DuplicateSearch.java rename to org.jabref.gui/src/main/java/org/jabref/gui/DuplicateSearch.java diff --git a/src/main/java/org/jabref/gui/EntryContainer.java b/org.jabref.gui/src/main/java/org/jabref/gui/EntryContainer.java similarity index 100% rename from src/main/java/org/jabref/gui/EntryContainer.java rename to org.jabref.gui/src/main/java/org/jabref/gui/EntryContainer.java diff --git a/src/main/java/org/jabref/gui/EntryMarker.java b/org.jabref.gui/src/main/java/org/jabref/gui/EntryMarker.java similarity index 100% rename from src/main/java/org/jabref/gui/EntryMarker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/EntryMarker.java diff --git a/src/main/java/org/jabref/gui/EntryTypeDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/EntryTypeDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/EntryTypeDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/EntryTypeDialog.java diff --git a/src/main/java/org/jabref/gui/FXDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/FXDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/FXDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/FXDialog.java diff --git a/src/main/java/org/jabref/gui/FXDialogService.java b/org.jabref.gui/src/main/java/org/jabref/gui/FXDialogService.java similarity index 100% rename from src/main/java/org/jabref/gui/FXDialogService.java rename to org.jabref.gui/src/main/java/org/jabref/gui/FXDialogService.java diff --git a/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java diff --git a/src/main/java/org/jabref/gui/GUIGlobals.java b/org.jabref.gui/src/main/java/org/jabref/gui/GUIGlobals.java similarity index 100% rename from src/main/java/org/jabref/gui/GUIGlobals.java rename to org.jabref.gui/src/main/java/org/jabref/gui/GUIGlobals.java diff --git a/src/main/java/org/jabref/gui/GenFieldsCustomizer.java b/org.jabref.gui/src/main/java/org/jabref/gui/GenFieldsCustomizer.java similarity index 100% rename from src/main/java/org/jabref/gui/GenFieldsCustomizer.java rename to org.jabref.gui/src/main/java/org/jabref/gui/GenFieldsCustomizer.java diff --git a/src/main/java/org/jabref/gui/GlobalFocusListener.java b/org.jabref.gui/src/main/java/org/jabref/gui/GlobalFocusListener.java similarity index 100% rename from src/main/java/org/jabref/gui/GlobalFocusListener.java rename to org.jabref.gui/src/main/java/org/jabref/gui/GlobalFocusListener.java diff --git a/src/main/java/org/jabref/gui/IconTheme.java b/org.jabref.gui/src/main/java/org/jabref/gui/IconTheme.java similarity index 100% rename from src/main/java/org/jabref/gui/IconTheme.java rename to org.jabref.gui/src/main/java/org/jabref/gui/IconTheme.java diff --git a/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java b/org.jabref.gui/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java similarity index 100% rename from src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java rename to org.jabref.gui/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java diff --git a/src/main/java/org/jabref/gui/JabRefDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/JabRefDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/JabRefDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/JabRefDialog.java diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/org.jabref.gui/src/main/java/org/jabref/gui/JabRefFrame.java similarity index 100% rename from src/main/java/org/jabref/gui/JabRefFrame.java rename to org.jabref.gui/src/main/java/org/jabref/gui/JabRefFrame.java diff --git a/src/main/java/org/jabref/gui/Main.css b/org.jabref.gui/src/main/java/org/jabref/gui/Main.css similarity index 100% rename from src/main/java/org/jabref/gui/Main.css rename to org.jabref.gui/src/main/java/org/jabref/gui/Main.css diff --git a/src/main/java/org/jabref/gui/MergeDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/MergeDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/MergeDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/MergeDialog.java diff --git a/src/main/java/org/jabref/gui/OSXCompatibleToolbar.java b/org.jabref.gui/src/main/java/org/jabref/gui/OSXCompatibleToolbar.java similarity index 100% rename from src/main/java/org/jabref/gui/OSXCompatibleToolbar.java rename to org.jabref.gui/src/main/java/org/jabref/gui/OSXCompatibleToolbar.java diff --git a/src/main/java/org/jabref/gui/PreambleEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/PreambleEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/PreambleEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/PreambleEditor.java diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/PreviewPanel.java similarity index 100% rename from src/main/java/org/jabref/gui/PreviewPanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/PreviewPanel.java diff --git a/src/main/java/org/jabref/gui/ReplaceStringDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/ReplaceStringDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/ReplaceStringDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/ReplaceStringDialog.java diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java b/org.jabref.gui/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java similarity index 100% rename from src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java rename to org.jabref.gui/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java diff --git a/src/main/java/org/jabref/gui/SidePane.java b/org.jabref.gui/src/main/java/org/jabref/gui/SidePane.java similarity index 100% rename from src/main/java/org/jabref/gui/SidePane.java rename to org.jabref.gui/src/main/java/org/jabref/gui/SidePane.java diff --git a/src/main/java/org/jabref/gui/SidePaneComponent.java b/org.jabref.gui/src/main/java/org/jabref/gui/SidePaneComponent.java similarity index 100% rename from src/main/java/org/jabref/gui/SidePaneComponent.java rename to org.jabref.gui/src/main/java/org/jabref/gui/SidePaneComponent.java diff --git a/src/main/java/org/jabref/gui/SidePaneManager.java b/org.jabref.gui/src/main/java/org/jabref/gui/SidePaneManager.java similarity index 100% rename from src/main/java/org/jabref/gui/SidePaneManager.java rename to org.jabref.gui/src/main/java/org/jabref/gui/SidePaneManager.java diff --git a/src/main/java/org/jabref/gui/StateManager.java b/org.jabref.gui/src/main/java/org/jabref/gui/StateManager.java similarity index 100% rename from src/main/java/org/jabref/gui/StateManager.java rename to org.jabref.gui/src/main/java/org/jabref/gui/StateManager.java diff --git a/src/main/java/org/jabref/gui/StringDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/StringDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/StringDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/StringDialog.java diff --git a/src/main/java/org/jabref/gui/TransferableBibtexEntry.java b/org.jabref.gui/src/main/java/org/jabref/gui/TransferableBibtexEntry.java similarity index 100% rename from src/main/java/org/jabref/gui/TransferableBibtexEntry.java rename to org.jabref.gui/src/main/java/org/jabref/gui/TransferableBibtexEntry.java diff --git a/src/main/java/org/jabref/gui/UpdateTimestampListener.java b/org.jabref.gui/src/main/java/org/jabref/gui/UpdateTimestampListener.java similarity index 100% rename from src/main/java/org/jabref/gui/UpdateTimestampListener.java rename to org.jabref.gui/src/main/java/org/jabref/gui/UpdateTimestampListener.java diff --git a/src/main/java/org/jabref/gui/WaitForSaveOperation.java b/org.jabref.gui/src/main/java/org/jabref/gui/WaitForSaveOperation.java similarity index 100% rename from src/main/java/org/jabref/gui/WaitForSaveOperation.java rename to org.jabref.gui/src/main/java/org/jabref/gui/WaitForSaveOperation.java diff --git a/src/main/java/org/jabref/gui/WrapLayout.java b/org.jabref.gui/src/main/java/org/jabref/gui/WrapLayout.java similarity index 100% rename from src/main/java/org/jabref/gui/WrapLayout.java rename to org.jabref.gui/src/main/java/org/jabref/gui/WrapLayout.java diff --git a/src/main/java/org/jabref/gui/actions/Actions.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/Actions.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/Actions.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/Actions.java diff --git a/src/main/java/org/jabref/gui/actions/AutoLinkFilesAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/AutoLinkFilesAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/AutoLinkFilesAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/AutoLinkFilesAction.java diff --git a/src/main/java/org/jabref/gui/actions/BaseAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/BaseAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/BaseAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/BaseAction.java diff --git a/src/main/java/org/jabref/gui/actions/ChangeTypeAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/ChangeTypeAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/ChangeTypeAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/ChangeTypeAction.java diff --git a/src/main/java/org/jabref/gui/actions/CleanupAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/CleanupAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/CleanupAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/CleanupAction.java diff --git a/src/main/java/org/jabref/gui/actions/ConnectToSharedDatabaseAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/ConnectToSharedDatabaseAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/ConnectToSharedDatabaseAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/ConnectToSharedDatabaseAction.java diff --git a/src/main/java/org/jabref/gui/actions/CopyBibTeXKeyAndLinkAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/CopyBibTeXKeyAndLinkAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/CopyBibTeXKeyAndLinkAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/CopyBibTeXKeyAndLinkAction.java diff --git a/src/main/java/org/jabref/gui/actions/CopyDoiUrlAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/CopyDoiUrlAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/CopyDoiUrlAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/CopyDoiUrlAction.java diff --git a/src/main/java/org/jabref/gui/actions/CopyVersionToClipboardAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/CopyVersionToClipboardAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/CopyVersionToClipboardAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/CopyVersionToClipboardAction.java diff --git a/src/main/java/org/jabref/gui/actions/ErrorConsoleAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/ErrorConsoleAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/ErrorConsoleAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/ErrorConsoleAction.java diff --git a/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java diff --git a/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java diff --git a/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/ManageKeywordsAction.java diff --git a/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/MassSetFieldAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java diff --git a/src/main/java/org/jabref/gui/actions/MnemonicAwareAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/MnemonicAwareAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/MnemonicAwareAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/MnemonicAwareAction.java diff --git a/src/main/java/org/jabref/gui/actions/NewDatabaseAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/NewDatabaseAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/NewDatabaseAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/NewDatabaseAction.java diff --git a/src/main/java/org/jabref/gui/actions/NewEntryAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/NewEntryAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/NewEntryAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/NewEntryAction.java diff --git a/src/main/java/org/jabref/gui/actions/NewSubDatabaseAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/NewSubDatabaseAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/NewSubDatabaseAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/NewSubDatabaseAction.java diff --git a/src/main/java/org/jabref/gui/actions/OpenBrowserAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/OpenBrowserAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/OpenBrowserAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/OpenBrowserAction.java diff --git a/src/main/java/org/jabref/gui/actions/SearchForUpdateAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/SearchForUpdateAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/SearchForUpdateAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/SearchForUpdateAction.java diff --git a/src/main/java/org/jabref/gui/actions/SortTabsAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/SortTabsAction.java similarity index 100% rename from src/main/java/org/jabref/gui/actions/SortTabsAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/actions/SortTabsAction.java diff --git a/src/main/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategy.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategy.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategy.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategy.java diff --git a/src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompleteFirstNameMode.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompleteFirstNameMode.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/AutoCompleteFirstNameMode.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompleteFirstNameMode.java diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompleteSuggestionProvider.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompleteSuggestionProvider.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/AutoCompleteSuggestionProvider.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompleteSuggestionProvider.java diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompleteUpdater.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompleteUpdater.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/AutoCompleteUpdater.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompleteUpdater.java diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionInput.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompletionInput.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/AutoCompletionInput.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompletionInput.java diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionStrategy.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompletionStrategy.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/AutoCompletionStrategy.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompletionStrategy.java diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java diff --git a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java diff --git a/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java diff --git a/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java diff --git a/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java diff --git a/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java diff --git a/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java diff --git a/src/main/java/org/jabref/gui/autocompleter/ReplaceStrategy.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/ReplaceStrategy.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/ReplaceStrategy.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/ReplaceStrategy.java diff --git a/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java diff --git a/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java diff --git a/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java diff --git a/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java b/org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java similarity index 100% rename from src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java diff --git a/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java b/org.jabref.gui/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java similarity index 100% rename from src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java diff --git a/src/main/java/org/jabref/gui/autosaveandbackup/BackupUIManager.java b/org.jabref.gui/src/main/java/org/jabref/gui/autosaveandbackup/BackupUIManager.java similarity index 100% rename from src/main/java/org/jabref/gui/autosaveandbackup/BackupUIManager.java rename to org.jabref.gui/src/main/java/org/jabref/gui/autosaveandbackup/BackupUIManager.java diff --git a/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/auximport/FromAuxDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java similarity index 100% rename from src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/SearchFixDuplicateLabels.java b/org.jabref.gui/src/main/java/org/jabref/gui/bibtexkeypattern/SearchFixDuplicateLabels.java similarity index 100% rename from src/main/java/org/jabref/gui/bibtexkeypattern/SearchFixDuplicateLabels.java rename to org.jabref.gui/src/main/java/org/jabref/gui/bibtexkeypattern/SearchFixDuplicateLabels.java diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupActionsListModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/cleanup/CleanupActionsListModel.java similarity index 100% rename from src/main/java/org/jabref/gui/cleanup/CleanupActionsListModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/cleanup/CleanupActionsListModel.java diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java similarity index 100% rename from src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java diff --git a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java similarity index 100% rename from src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java diff --git a/src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeScanner.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/ChangeScanner.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeScanner.java diff --git a/src/main/java/org/jabref/gui/collab/ChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/ChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java diff --git a/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/collab/FileUpdatePanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/FileUpdatePanel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/FileUpdatePanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/FileUpdatePanel.java diff --git a/src/main/java/org/jabref/gui/collab/GroupChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/GroupChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/GroupChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/GroupChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/collab/InfoPane.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/InfoPane.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/InfoPane.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/InfoPane.java diff --git a/src/main/java/org/jabref/gui/collab/MetaDataChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/MetaDataChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/MetaDataChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/MetaDataChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/collab/PreambleChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/PreambleChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/PreambleChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/PreambleChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/StringChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java similarity index 100% rename from src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogController.java b/org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogController.java similarity index 100% rename from src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogController.java rename to org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogController.java diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java b/org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java similarity index 100% rename from src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java rename to org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java b/org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java similarity index 100% rename from src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java rename to org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java b/org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java similarity index 100% rename from src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java rename to org.jabref.gui/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java diff --git a/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypesManager.java b/org.jabref.gui/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypesManager.java similarity index 100% rename from src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypesManager.java rename to org.jabref.gui/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypesManager.java diff --git a/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/customentrytypes/EntryCustomizationDialog.java diff --git a/src/main/java/org/jabref/gui/customentrytypes/EntryTypeList.java b/org.jabref.gui/src/main/java/org/jabref/gui/customentrytypes/EntryTypeList.java similarity index 100% rename from src/main/java/org/jabref/gui/customentrytypes/EntryTypeList.java rename to org.jabref.gui/src/main/java/org/jabref/gui/customentrytypes/EntryTypeList.java diff --git a/src/main/java/org/jabref/gui/customentrytypes/FieldSetComponent.java b/org.jabref.gui/src/main/java/org/jabref/gui/customentrytypes/FieldSetComponent.java similarity index 100% rename from src/main/java/org/jabref/gui/customentrytypes/FieldSetComponent.java rename to org.jabref.gui/src/main/java/org/jabref/gui/customentrytypes/FieldSetComponent.java diff --git a/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java similarity index 100% rename from src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java diff --git a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/org.jabref.gui/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java similarity index 100% rename from src/main/java/org/jabref/gui/desktop/JabRefDesktop.java rename to org.jabref.gui/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java diff --git a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java b/org.jabref.gui/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java similarity index 100% rename from src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java rename to org.jabref.gui/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java diff --git a/src/main/java/org/jabref/gui/desktop/os/Linux.java b/org.jabref.gui/src/main/java/org/jabref/gui/desktop/os/Linux.java similarity index 100% rename from src/main/java/org/jabref/gui/desktop/os/Linux.java rename to org.jabref.gui/src/main/java/org/jabref/gui/desktop/os/Linux.java diff --git a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java b/org.jabref.gui/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java similarity index 100% rename from src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java rename to org.jabref.gui/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java diff --git a/src/main/java/org/jabref/gui/desktop/os/OSX.java b/org.jabref.gui/src/main/java/org/jabref/gui/desktop/os/OSX.java similarity index 100% rename from src/main/java/org/jabref/gui/desktop/os/OSX.java rename to org.jabref.gui/src/main/java/org/jabref/gui/desktop/os/OSX.java diff --git a/src/main/java/org/jabref/gui/desktop/os/Windows.java b/org.jabref.gui/src/main/java/org/jabref/gui/desktop/os/Windows.java similarity index 100% rename from src/main/java/org/jabref/gui/desktop/os/Windows.java rename to org.jabref.gui/src/main/java/org/jabref/gui/desktop/os/Windows.java diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentPageViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentPageViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/DocumentPageViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentPageViewModel.java diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerController.java b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewerController.java similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/DocumentViewerController.java rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewerController.java diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java diff --git a/src/main/java/org/jabref/gui/documentviewer/PageDimension.java b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/PageDimension.java similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/PageDimension.java rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/PageDimension.java diff --git a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java diff --git a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java diff --git a/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java similarity index 100% rename from src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/EntryEditor.css rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/EntryEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTabList.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditorTabList.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/EntryEditorTabList.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditorTabList.java diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/SourceTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/SourceTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/SourceTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabController.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabController.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabController.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabController.java diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css b/org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css similarity index 100% rename from src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css rename to org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml similarity index 100% rename from src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleController.java b/org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleController.java similarity index 100% rename from src/main/java/org/jabref/gui/errorconsole/ErrorConsoleController.java rename to org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleController.java diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java b/org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java similarity index 100% rename from src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java rename to org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java diff --git a/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java diff --git a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/exporter/CustomExportDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java diff --git a/src/main/java/org/jabref/gui/exporter/ExportAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportAction.java similarity index 100% rename from src/main/java/org/jabref/gui/exporter/ExportAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportAction.java diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java diff --git a/src/main/java/org/jabref/gui/exporter/ExportFileFilter.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportFileFilter.java similarity index 100% rename from src/main/java/org/jabref/gui/exporter/ExportFileFilter.java rename to org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportFileFilter.java diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java similarity index 100% rename from src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java diff --git a/src/main/java/org/jabref/gui/exporter/RtfTransferable.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/RtfTransferable.java similarity index 100% rename from src/main/java/org/jabref/gui/exporter/RtfTransferable.java rename to org.jabref.gui/src/main/java/org/jabref/gui/exporter/RtfTransferable.java diff --git a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveAllAction.java similarity index 100% rename from src/main/java/org/jabref/gui/exporter/SaveAllAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveAllAction.java diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java similarity index 100% rename from src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java diff --git a/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java diff --git a/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java diff --git a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java diff --git a/src/main/java/org/jabref/gui/externalfiles/SynchronizeFileField.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/SynchronizeFileField.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiles/SynchronizeFileField.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/SynchronizeFileField.java diff --git a/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java diff --git a/src/main/java/org/jabref/gui/externalfiles/WriteXMPAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/WriteXMPAction.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiles/WriteXMPAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiles/WriteXMPAction.java diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java diff --git a/src/main/java/org/jabref/gui/externalfiletype/UnknownExternalFileType.java b/org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/UnknownExternalFileType.java similarity index 100% rename from src/main/java/org/jabref/gui/externalfiletype/UnknownExternalFileType.java rename to org.jabref.gui/src/main/java/org/jabref/gui/externalfiletype/UnknownExternalFileType.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml diff --git a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/DateEditor.fxml similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/DateEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/DateEditor.fxml diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/DateEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FieldEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/FieldEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FieldEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFocusListener.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFocusListener.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/FieldEditorFocusListener.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFocusListener.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/HtmlTransferable.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/HtmlTransferable.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/HtmlTransferable.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/HtmlTransferable.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml diff --git a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/MultilineEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/MultilineEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/MultilineEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/MultilineEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.fxml similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/OptionEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.fxml diff --git a/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml diff --git a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/TextArea.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/TextArea.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/TextArea.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/TextArea.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/TextField.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/TextField.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/TextField.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/TextField.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/XmlTransferable.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/XmlTransferable.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/XmlTransferable.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/XmlTransferable.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/CaseChangeMenu.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/CaseChangeMenu.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/contextmenu/CaseChangeMenu.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/CaseChangeMenu.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ClearField.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ClearField.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/contextmenu/ClearField.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ClearField.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ConversionMenu.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ConversionMenu.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/contextmenu/ConversionMenu.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ConversionMenu.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java similarity index 100% rename from src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/filelist/AttachFileAction.java similarity index 100% rename from src/main/java/org/jabref/gui/filelist/AttachFileAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/filelist/AttachFileAction.java diff --git a/src/main/java/org/jabref/gui/filelist/ConfirmCloseFileListEntryEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/filelist/ConfirmCloseFileListEntryEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/filelist/ConfirmCloseFileListEntryEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/filelist/ConfirmCloseFileListEntryEditor.java diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntry.java b/org.jabref.gui/src/main/java/org/jabref/gui/filelist/FileListEntry.java similarity index 100% rename from src/main/java/org/jabref/gui/filelist/FileListEntry.java rename to org.jabref.gui/src/main/java/org/jabref/gui/filelist/FileListEntry.java diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java b/org.jabref.gui/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java similarity index 100% rename from src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java diff --git a/src/main/java/org/jabref/gui/filelist/FileListTableModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/filelist/FileListTableModel.java similarity index 100% rename from src/main/java/org/jabref/gui/filelist/FileListTableModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/filelist/FileListTableModel.java diff --git a/src/main/java/org/jabref/gui/groups/DroppingMouseLocation.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/DroppingMouseLocation.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/DroppingMouseLocation.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/DroppingMouseLocation.java diff --git a/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java diff --git a/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java diff --git a/src/main/java/org/jabref/gui/groups/GroupDescriptions.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupDescriptions.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupDescriptions.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupDescriptions.java diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupDialog.java diff --git a/src/main/java/org/jabref/gui/groups/GroupMatcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupMatcher.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupMatcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupMatcher.java diff --git a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java diff --git a/src/main/java/org/jabref/gui/groups/GroupSidePane.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupSidePane.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupSidePane.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupSidePane.java diff --git a/src/main/java/org/jabref/gui/groups/GroupTree.css b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.css similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupTree.css rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.css diff --git a/src/main/java/org/jabref/gui/groups/GroupTree.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.fxml similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupTree.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.fxml diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeCellRenderer.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTreeCellRenderer.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupTreeCellRenderer.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTreeCellRenderer.java diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeController.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTreeController.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupTreeController.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTreeController.java diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTreeView.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupTreeView.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTreeView.java diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java diff --git a/src/main/java/org/jabref/gui/groups/GroupingWorker.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupingWorker.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/GroupingWorker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupingWorker.java diff --git a/src/main/java/org/jabref/gui/groups/MoveGroupChange.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/MoveGroupChange.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/MoveGroupChange.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/MoveGroupChange.java diff --git a/src/main/java/org/jabref/gui/groups/TransferableEntrySelection.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/TransferableEntrySelection.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/TransferableEntrySelection.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/TransferableEntrySelection.java diff --git a/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java diff --git a/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java diff --git a/src/main/java/org/jabref/gui/groups/UndoableModifyGroup.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/UndoableModifyGroup.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/UndoableModifyGroup.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/UndoableModifyGroup.java diff --git a/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java diff --git a/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java diff --git a/src/main/java/org/jabref/gui/groups/WarnAssignmentSideEffects.java b/org.jabref.gui/src/main/java/org/jabref/gui/groups/WarnAssignmentSideEffects.java similarity index 100% rename from src/main/java/org/jabref/gui/groups/WarnAssignmentSideEffects.java rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/WarnAssignmentSideEffects.java diff --git a/src/main/java/org/jabref/gui/help/AboutAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/help/AboutAction.java similarity index 100% rename from src/main/java/org/jabref/gui/help/AboutAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/help/AboutAction.java diff --git a/src/main/java/org/jabref/gui/help/AboutDialogController.java b/org.jabref.gui/src/main/java/org/jabref/gui/help/AboutDialogController.java similarity index 100% rename from src/main/java/org/jabref/gui/help/AboutDialogController.java rename to org.jabref.gui/src/main/java/org/jabref/gui/help/AboutDialogController.java diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/org.jabref.gui/src/main/java/org/jabref/gui/help/AboutDialogView.java similarity index 100% rename from src/main/java/org/jabref/gui/help/AboutDialogView.java rename to org.jabref.gui/src/main/java/org/jabref/gui/help/AboutDialogView.java diff --git a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/help/AboutDialogViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java diff --git a/src/main/java/org/jabref/gui/help/HelpAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/help/HelpAction.java similarity index 100% rename from src/main/java/org/jabref/gui/help/HelpAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/help/HelpAction.java diff --git a/src/main/java/org/jabref/gui/help/NewVersionDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/help/NewVersionDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/help/NewVersionDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/help/NewVersionDialog.java diff --git a/src/main/java/org/jabref/gui/importer/EntryFromExternalFileCreator.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/EntryFromExternalFileCreator.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/EntryFromExternalFileCreator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/EntryFromExternalFileCreator.java diff --git a/src/main/java/org/jabref/gui/importer/EntryFromFileCreator.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/EntryFromFileCreator.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/EntryFromFileCreator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/EntryFromFileCreator.java diff --git a/src/main/java/org/jabref/gui/importer/EntryFromFileCreatorManager.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/EntryFromFileCreatorManager.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/EntryFromFileCreatorManager.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/EntryFromFileCreatorManager.java diff --git a/src/main/java/org/jabref/gui/importer/EntryFromPDFCreator.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/EntryFromPDFCreator.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/EntryFromPDFCreator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/EntryFromPDFCreator.java diff --git a/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/FetcherPreviewDialog.java diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java diff --git a/src/main/java/org/jabref/gui/importer/ImportFormats.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/ImportFormats.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/ImportFormats.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/ImportFormats.java diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java diff --git a/src/main/java/org/jabref/gui/importer/ImportMenuItem.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/ImportMenuItem.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/ImportMenuItem.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/ImportMenuItem.java diff --git a/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java diff --git a/src/main/java/org/jabref/gui/importer/UnlinkedFilesCrawler.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/UnlinkedFilesCrawler.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/UnlinkedFilesCrawler.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/UnlinkedFilesCrawler.java diff --git a/src/main/java/org/jabref/gui/importer/UnlinkedPDFFileFilter.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/UnlinkedPDFFileFilter.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/UnlinkedPDFFileFilter.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/UnlinkedPDFFileFilter.java diff --git a/src/main/java/org/jabref/gui/importer/ZipFileChooser.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/ZipFileChooser.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/ZipFileChooser.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/ZipFileChooser.java diff --git a/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java diff --git a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java diff --git a/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java diff --git a/src/main/java/org/jabref/gui/importer/actions/HandleDuplicateWarnings.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/actions/HandleDuplicateWarnings.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/actions/HandleDuplicateWarnings.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/actions/HandleDuplicateWarnings.java diff --git a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/ACMPortalFetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/ACMPortalFetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/ACMPortalFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/ACMPortalFetcher.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/CiteSeerXFetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/CiteSeerXFetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/CiteSeerXFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/CiteSeerXFetcher.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/EntryFetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/EntryFetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/EntryFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/EntryFetcher.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/EntryFetchers.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/EntryFetchers.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/EntryFetchers.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/EntryFetchers.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/GeneralFetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/GeneralFetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/GeneralFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/GeneralFetcher.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/IEEEXploreFetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/IEEEXploreFetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/IEEEXploreFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/IEEEXploreFetcher.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/INSPIREFetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/INSPIREFetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/INSPIREFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/INSPIREFetcher.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/OAI2Fetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/OAI2Fetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/OAI2Fetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/OAI2Fetcher.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/PreviewEntryFetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/PreviewEntryFetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/PreviewEntryFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/PreviewEntryFetcher.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java diff --git a/src/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java similarity index 100% rename from src/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java diff --git a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/AbbreviateAction.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/AbbreviateAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/AbbreviateAction.java diff --git a/src/main/java/org/jabref/gui/journals/AbbreviationViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/AbbreviationViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/AbbreviationViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/AbbreviationViewModel.java diff --git a/src/main/java/org/jabref/gui/journals/AbbreviationsFileViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/AbbreviationsFileViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/AbbreviationsFileViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/AbbreviationsFileViewModel.java diff --git a/src/main/java/org/jabref/gui/journals/JournalAbbreviationsUtil.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/JournalAbbreviationsUtil.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/JournalAbbreviationsUtil.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/JournalAbbreviationsUtil.java diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsController.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsController.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsController.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsController.java diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalsAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/ManageJournalsAction.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/ManageJournalsAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/ManageJournalsAction.java diff --git a/src/main/java/org/jabref/gui/journals/UnabbreviateAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/UnabbreviateAction.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/UnabbreviateAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/UnabbreviateAction.java diff --git a/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java diff --git a/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java b/org.jabref.gui/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java similarity index 100% rename from src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java diff --git a/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java b/org.jabref.gui/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java similarity index 100% rename from src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java rename to org.jabref.gui/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinder.java b/org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBinder.java similarity index 100% rename from src/main/java/org/jabref/gui/keyboard/KeyBinder.java rename to org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBinder.java diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBinding.java similarity index 100% rename from src/main/java/org/jabref/gui/keyboard/KeyBinding.java rename to org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBinding.java diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingAction.java similarity index 100% rename from src/main/java/org/jabref/gui/keyboard/KeyBindingAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingAction.java diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java b/org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java similarity index 100% rename from src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java rename to org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java b/org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java similarity index 100% rename from src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java rename to org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogController.java b/org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogController.java similarity index 100% rename from src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogController.java rename to org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogController.java diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java b/org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java similarity index 100% rename from src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java rename to org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java diff --git a/src/main/java/org/jabref/gui/logging/ApplicationInsightsAppender.java b/org.jabref.gui/src/main/java/org/jabref/gui/logging/ApplicationInsightsAppender.java similarity index 100% rename from src/main/java/org/jabref/gui/logging/ApplicationInsightsAppender.java rename to org.jabref.gui/src/main/java/org/jabref/gui/logging/ApplicationInsightsAppender.java diff --git a/src/main/java/org/jabref/gui/logging/GuiAppender.java b/org.jabref.gui/src/main/java/org/jabref/gui/logging/GuiAppender.java similarity index 100% rename from src/main/java/org/jabref/gui/logging/GuiAppender.java rename to org.jabref.gui/src/main/java/org/jabref/gui/logging/GuiAppender.java diff --git a/src/main/java/org/jabref/gui/maintable/ListSynchronizer.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/ListSynchronizer.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/ListSynchronizer.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/ListSynchronizer.java diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTable.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/MainTable.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTable.java diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumn.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableColumn.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/MainTableColumn.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableColumn.java diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/MainTableDataModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java diff --git a/src/main/java/org/jabref/gui/maintable/MainTableFormat.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableFormat.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/MainTableFormat.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableFormat.java diff --git a/src/main/java/org/jabref/gui/maintable/MainTableHeaderRenderer.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableHeaderRenderer.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/MainTableHeaderRenderer.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableHeaderRenderer.java diff --git a/src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java diff --git a/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java diff --git a/src/main/java/org/jabref/gui/maintable/PersistenceTableColumnListener.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/PersistenceTableColumnListener.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/PersistenceTableColumnListener.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/PersistenceTableColumnListener.java diff --git a/src/main/java/org/jabref/gui/maintable/PreventDraggingJTableHeader.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/PreventDraggingJTableHeader.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/PreventDraggingJTableHeader.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/PreventDraggingJTableHeader.java diff --git a/src/main/java/org/jabref/gui/maintable/SpecialMainTableColumnsBuilder.java b/org.jabref.gui/src/main/java/org/jabref/gui/maintable/SpecialMainTableColumnsBuilder.java similarity index 100% rename from src/main/java/org/jabref/gui/maintable/SpecialMainTableColumnsBuilder.java rename to org.jabref.gui/src/main/java/org/jabref/gui/maintable/SpecialMainTableColumnsBuilder.java diff --git a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java b/org.jabref.gui/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java similarity index 100% rename from src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java rename to org.jabref.gui/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java diff --git a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java b/org.jabref.gui/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java similarity index 100% rename from src/main/java/org/jabref/gui/menus/FileHistoryMenu.java rename to org.jabref.gui/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java diff --git a/src/main/java/org/jabref/gui/menus/RightClickMenu.java b/org.jabref.gui/src/main/java/org/jabref/gui/menus/RightClickMenu.java similarity index 100% rename from src/main/java/org/jabref/gui/menus/RightClickMenu.java rename to org.jabref.gui/src/main/java/org/jabref/gui/menus/RightClickMenu.java diff --git a/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java b/org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java similarity index 100% rename from src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java b/org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java similarity index 100% rename from src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java rename to org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java b/org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java similarity index 100% rename from src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java b/org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java similarity index 100% rename from src/main/java/org/jabref/gui/mergeentries/MergeEntries.java rename to org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeFetchedEntryDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/MergeFetchedEntryDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/mergeentries/MergeFetchedEntryDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/MergeFetchedEntryDialog.java diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java similarity index 100% rename from src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java diff --git a/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java diff --git a/src/main/java/org/jabref/gui/openoffice/CitationManager.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/CitationManager.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/CitationManager.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/CitationManager.java diff --git a/src/main/java/org/jabref/gui/openoffice/ConnectionLostException.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/ConnectionLostException.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/ConnectionLostException.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/ConnectionLostException.java diff --git a/src/main/java/org/jabref/gui/openoffice/CreationException.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/CreationException.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/CreationException.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/CreationException.java diff --git a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java diff --git a/src/main/java/org/jabref/gui/openoffice/NoDocumentException.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/NoDocumentException.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/NoDocumentException.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/NoDocumentException.java diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OOBibBase.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/OOBibBase.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OOBibBase.java diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java diff --git a/src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java similarity index 100% rename from src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java rename to org.jabref.gui/src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java diff --git a/src/main/java/org/jabref/gui/plaintextimport/TagToMarkedTextStore.java b/org.jabref.gui/src/main/java/org/jabref/gui/plaintextimport/TagToMarkedTextStore.java similarity index 100% rename from src/main/java/org/jabref/gui/plaintextimport/TagToMarkedTextStore.java rename to org.jabref.gui/src/main/java/org/jabref/gui/plaintextimport/TagToMarkedTextStore.java diff --git a/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java diff --git a/src/main/java/org/jabref/gui/preftabs/AdvancedTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/AdvancedTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/AdvancedTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/AdvancedTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/ColorSetupPanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/ColorSetupPanel.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/ColorSetupPanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/ColorSetupPanel.java diff --git a/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/ExternalTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/ExternalTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/ExternalTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/ExternalTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/FileTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/FileTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/FileTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/FileTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/FontSelectorDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/FontSelectorDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/FontSelectorDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/FontSelectorDialog.java diff --git a/src/main/java/org/jabref/gui/preftabs/GeneralTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/GeneralTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/GeneralTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/GeneralTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/NetworkTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/NetworkTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/NetworkTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/NetworkTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java diff --git a/src/main/java/org/jabref/gui/preftabs/PreferencesFilterDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PreferencesFilterDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/PreferencesFilterDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PreferencesFilterDialog.java diff --git a/src/main/java/org/jabref/gui/preftabs/PrefsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PrefsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/PrefsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PrefsTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java diff --git a/src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java similarity index 100% rename from src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java rename to org.jabref.gui/src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java diff --git a/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java diff --git a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java similarity index 100% rename from src/main/java/org/jabref/gui/push/AbstractPushToApplication.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java diff --git a/src/main/java/org/jabref/gui/push/PushToApplication.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/PushToApplication.java similarity index 100% rename from src/main/java/org/jabref/gui/push/PushToApplication.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/PushToApplication.java diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/PushToApplicationAction.java similarity index 100% rename from src/main/java/org/jabref/gui/push/PushToApplicationAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/PushToApplicationAction.java diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationButton.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/PushToApplicationButton.java similarity index 100% rename from src/main/java/org/jabref/gui/push/PushToApplicationButton.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/PushToApplicationButton.java diff --git a/src/main/java/org/jabref/gui/push/PushToApplications.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/PushToApplications.java similarity index 100% rename from src/main/java/org/jabref/gui/push/PushToApplications.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/PushToApplications.java diff --git a/src/main/java/org/jabref/gui/push/PushToEmacs.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/PushToEmacs.java similarity index 100% rename from src/main/java/org/jabref/gui/push/PushToEmacs.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/PushToEmacs.java diff --git a/src/main/java/org/jabref/gui/push/PushToLyx.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/PushToLyx.java similarity index 100% rename from src/main/java/org/jabref/gui/push/PushToLyx.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/PushToLyx.java diff --git a/src/main/java/org/jabref/gui/push/PushToTeXstudio.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/PushToTeXstudio.java similarity index 100% rename from src/main/java/org/jabref/gui/push/PushToTeXstudio.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/PushToTeXstudio.java diff --git a/src/main/java/org/jabref/gui/push/PushToTexmaker.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/PushToTexmaker.java similarity index 100% rename from src/main/java/org/jabref/gui/push/PushToTexmaker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/PushToTexmaker.java diff --git a/src/main/java/org/jabref/gui/push/PushToVim.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/PushToVim.java similarity index 100% rename from src/main/java/org/jabref/gui/push/PushToVim.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/PushToVim.java diff --git a/src/main/java/org/jabref/gui/push/PushToWinEdt.java b/org.jabref.gui/src/main/java/org/jabref/gui/push/PushToWinEdt.java similarity index 100% rename from src/main/java/org/jabref/gui/push/PushToWinEdt.java rename to org.jabref.gui/src/main/java/org/jabref/gui/push/PushToWinEdt.java diff --git a/src/main/java/org/jabref/gui/remote/JabRefMessageHandler.java b/org.jabref.gui/src/main/java/org/jabref/gui/remote/JabRefMessageHandler.java similarity index 100% rename from src/main/java/org/jabref/gui/remote/JabRefMessageHandler.java rename to org.jabref.gui/src/main/java/org/jabref/gui/remote/JabRefMessageHandler.java diff --git a/src/main/java/org/jabref/gui/renderer/CompleteRenderer.java b/org.jabref.gui/src/main/java/org/jabref/gui/renderer/CompleteRenderer.java similarity index 100% rename from src/main/java/org/jabref/gui/renderer/CompleteRenderer.java rename to org.jabref.gui/src/main/java/org/jabref/gui/renderer/CompleteRenderer.java diff --git a/src/main/java/org/jabref/gui/renderer/GeneralRenderer.java b/org.jabref.gui/src/main/java/org/jabref/gui/renderer/GeneralRenderer.java similarity index 100% rename from src/main/java/org/jabref/gui/renderer/GeneralRenderer.java rename to org.jabref.gui/src/main/java/org/jabref/gui/renderer/GeneralRenderer.java diff --git a/src/main/java/org/jabref/gui/renderer/IncompleteRenderer.java b/org.jabref.gui/src/main/java/org/jabref/gui/renderer/IncompleteRenderer.java similarity index 100% rename from src/main/java/org/jabref/gui/renderer/IncompleteRenderer.java rename to org.jabref.gui/src/main/java/org/jabref/gui/renderer/IncompleteRenderer.java diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java similarity index 100% rename from src/main/java/org/jabref/gui/search/GlobalSearchBar.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java similarity index 100% rename from src/main/java/org/jabref/gui/search/GlobalSearchWorker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java diff --git a/src/main/java/org/jabref/gui/search/HitOrMissComparator.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/HitOrMissComparator.java similarity index 100% rename from src/main/java/org/jabref/gui/search/HitOrMissComparator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/HitOrMissComparator.java diff --git a/src/main/java/org/jabref/gui/search/SearchDisplayMode.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/SearchDisplayMode.java similarity index 100% rename from src/main/java/org/jabref/gui/search/SearchDisplayMode.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/SearchDisplayMode.java diff --git a/src/main/java/org/jabref/gui/search/SearchResultFrame.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/SearchResultFrame.java similarity index 100% rename from src/main/java/org/jabref/gui/search/SearchResultFrame.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/SearchResultFrame.java diff --git a/src/main/java/org/jabref/gui/search/SearchTextField.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/SearchTextField.java similarity index 100% rename from src/main/java/org/jabref/gui/search/SearchTextField.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/SearchTextField.java diff --git a/src/main/java/org/jabref/gui/search/SearchWorker.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/SearchWorker.java similarity index 100% rename from src/main/java/org/jabref/gui/search/SearchWorker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/SearchWorker.java diff --git a/src/main/java/org/jabref/gui/search/matchers/EverythingMatcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/matchers/EverythingMatcher.java similarity index 100% rename from src/main/java/org/jabref/gui/search/matchers/EverythingMatcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/matchers/EverythingMatcher.java diff --git a/src/main/java/org/jabref/gui/search/matchers/SearchMatcher.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/matchers/SearchMatcher.java similarity index 100% rename from src/main/java/org/jabref/gui/search/matchers/SearchMatcher.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/matchers/SearchMatcher.java diff --git a/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java similarity index 100% rename from src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java diff --git a/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java similarity index 100% rename from src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java diff --git a/src/main/java/org/jabref/gui/search/rules/describer/SearchDescriber.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/rules/describer/SearchDescriber.java similarity index 100% rename from src/main/java/org/jabref/gui/search/rules/describer/SearchDescriber.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/rules/describer/SearchDescriber.java diff --git a/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java b/org.jabref.gui/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java similarity index 100% rename from src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java rename to org.jabref.gui/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java diff --git a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java diff --git a/src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java diff --git a/src/main/java/org/jabref/gui/shared/MigrationHelpDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/shared/MigrationHelpDialog.java similarity index 100% rename from src/main/java/org/jabref/gui/shared/MigrationHelpDialog.java rename to org.jabref.gui/src/main/java/org/jabref/gui/shared/MigrationHelpDialog.java diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/org.jabref.gui/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java similarity index 100% rename from src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java rename to org.jabref.gui/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java similarity index 100% rename from src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldDatabaseChangeListener.java b/org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldDatabaseChangeListener.java similarity index 100% rename from src/main/java/org/jabref/gui/specialfields/SpecialFieldDatabaseChangeListener.java rename to org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldDatabaseChangeListener.java diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldDropDown.java b/org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldDropDown.java similarity index 100% rename from src/main/java/org/jabref/gui/specialfields/SpecialFieldDropDown.java rename to org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldDropDown.java diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuAction.java similarity index 100% rename from src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuAction.java diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldUpdateListener.java b/org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldUpdateListener.java similarity index 100% rename from src/main/java/org/jabref/gui/specialfields/SpecialFieldUpdateListener.java rename to org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldUpdateListener.java diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java b/org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java similarity index 100% rename from src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java diff --git a/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java diff --git a/src/main/java/org/jabref/gui/undo/CountingUndoManager.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/CountingUndoManager.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/CountingUndoManager.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/CountingUndoManager.java diff --git a/src/main/java/org/jabref/gui/undo/NamedCompound.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/NamedCompound.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/NamedCompound.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/NamedCompound.java diff --git a/src/main/java/org/jabref/gui/undo/UndoableChangeType.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableChangeType.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/UndoableChangeType.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableChangeType.java diff --git a/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/UndoableFieldChange.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableInsertString.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/UndoableInsertString.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableInsertString.java diff --git a/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/UndoableKeyChange.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java diff --git a/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/UndoableRemoveString.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java diff --git a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java b/org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableStringChange.java similarity index 100% rename from src/main/java/org/jabref/gui/undo/UndoableStringChange.java rename to org.jabref.gui/src/main/java/org/jabref/gui/undo/UndoableStringChange.java diff --git a/src/main/java/org/jabref/gui/util/BackgroundTask.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/BackgroundTask.java similarity index 100% rename from src/main/java/org/jabref/gui/util/BackgroundTask.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/BackgroundTask.java diff --git a/src/main/java/org/jabref/gui/util/BindingsHelper.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/BindingsHelper.java similarity index 100% rename from src/main/java/org/jabref/gui/util/BindingsHelper.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/BindingsHelper.java diff --git a/src/main/java/org/jabref/gui/util/ControlHelper.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/ControlHelper.java similarity index 100% rename from src/main/java/org/jabref/gui/util/ControlHelper.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/ControlHelper.java diff --git a/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java similarity index 100% rename from src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java diff --git a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java similarity index 100% rename from src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java diff --git a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java similarity index 100% rename from src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java diff --git a/src/main/java/org/jabref/gui/util/DirectoryDialogConfiguration.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/DirectoryDialogConfiguration.java similarity index 100% rename from src/main/java/org/jabref/gui/util/DirectoryDialogConfiguration.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/DirectoryDialogConfiguration.java diff --git a/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java similarity index 100% rename from src/main/java/org/jabref/gui/util/FileDialogConfiguration.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java diff --git a/src/main/java/org/jabref/gui/util/FileFilterConverter.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/FileFilterConverter.java similarity index 100% rename from src/main/java/org/jabref/gui/util/FileFilterConverter.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/FileFilterConverter.java diff --git a/src/main/java/org/jabref/gui/util/IconValidationDecorator.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/IconValidationDecorator.java similarity index 100% rename from src/main/java/org/jabref/gui/util/IconValidationDecorator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/IconValidationDecorator.java diff --git a/src/main/java/org/jabref/gui/util/MappedList.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/MappedList.java similarity index 100% rename from src/main/java/org/jabref/gui/util/MappedList.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/MappedList.java diff --git a/src/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java similarity index 100% rename from src/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java diff --git a/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java similarity index 100% rename from src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java diff --git a/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java similarity index 100% rename from src/main/java/org/jabref/gui/util/RecursiveTreeItem.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java diff --git a/src/main/java/org/jabref/gui/util/TaskExecutor.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/TaskExecutor.java similarity index 100% rename from src/main/java/org/jabref/gui/util/TaskExecutor.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/TaskExecutor.java diff --git a/src/main/java/org/jabref/gui/util/TooltipTextUtil.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/TooltipTextUtil.java similarity index 100% rename from src/main/java/org/jabref/gui/util/TooltipTextUtil.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/TooltipTextUtil.java diff --git a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java similarity index 100% rename from src/main/java/org/jabref/gui/util/ValueTableCellFactory.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java diff --git a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java similarity index 100% rename from src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java similarity index 100% rename from src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java diff --git a/src/main/java/org/jabref/gui/util/WindowLocation.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/WindowLocation.java similarity index 100% rename from src/main/java/org/jabref/gui/util/WindowLocation.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/WindowLocation.java diff --git a/src/main/java/org/jabref/gui/util/comparator/FirstColumnComparator.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/comparator/FirstColumnComparator.java similarity index 100% rename from src/main/java/org/jabref/gui/util/comparator/FirstColumnComparator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/comparator/FirstColumnComparator.java diff --git a/src/main/java/org/jabref/gui/util/comparator/IconComparator.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/comparator/IconComparator.java similarity index 100% rename from src/main/java/org/jabref/gui/util/comparator/IconComparator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/comparator/IconComparator.java diff --git a/src/main/java/org/jabref/gui/util/comparator/IsMarkedComparator.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/comparator/IsMarkedComparator.java similarity index 100% rename from src/main/java/org/jabref/gui/util/comparator/IsMarkedComparator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/comparator/IsMarkedComparator.java diff --git a/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java similarity index 100% rename from src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java diff --git a/src/main/java/org/jabref/gui/util/component/CheckBoxMessage.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/CheckBoxMessage.java similarity index 100% rename from src/main/java/org/jabref/gui/util/component/CheckBoxMessage.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/CheckBoxMessage.java diff --git a/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java similarity index 100% rename from src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java diff --git a/src/main/java/org/jabref/gui/util/component/JTextAreaWithPlaceholder.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/JTextAreaWithPlaceholder.java similarity index 100% rename from src/main/java/org/jabref/gui/util/component/JTextAreaWithPlaceholder.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/JTextAreaWithPlaceholder.java diff --git a/src/main/java/org/jabref/gui/util/component/JTextFieldWithPlaceholder.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/JTextFieldWithPlaceholder.java similarity index 100% rename from src/main/java/org/jabref/gui/util/component/JTextFieldWithPlaceholder.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/JTextFieldWithPlaceholder.java diff --git a/src/main/java/org/jabref/gui/util/component/OverlayPanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/OverlayPanel.java similarity index 100% rename from src/main/java/org/jabref/gui/util/component/OverlayPanel.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/OverlayPanel.java diff --git a/src/main/java/org/jabref/gui/util/component/Tag.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/Tag.fxml similarity index 100% rename from src/main/java/org/jabref/gui/util/component/Tag.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/Tag.fxml diff --git a/src/main/java/org/jabref/gui/util/component/Tag.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/Tag.java similarity index 100% rename from src/main/java/org/jabref/gui/util/component/Tag.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/Tag.java diff --git a/src/main/java/org/jabref/gui/util/component/TagBar.css b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.css similarity index 100% rename from src/main/java/org/jabref/gui/util/component/TagBar.css rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.css diff --git a/src/main/java/org/jabref/gui/util/component/TagBar.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.fxml similarity index 100% rename from src/main/java/org/jabref/gui/util/component/TagBar.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.fxml diff --git a/src/main/java/org/jabref/gui/util/component/TagBar.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.java similarity index 100% rename from src/main/java/org/jabref/gui/util/component/TagBar.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.java diff --git a/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java similarity index 100% rename from src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java diff --git a/src/main/java/org/jabref/gui/util/component/VerticalLabelUI.java b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/VerticalLabelUI.java similarity index 100% rename from src/main/java/org/jabref/gui/util/component/VerticalLabelUI.java rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/VerticalLabelUI.java diff --git a/src/main/java/org/jabref/gui/worker/AbstractWorker.java b/org.jabref.gui/src/main/java/org/jabref/gui/worker/AbstractWorker.java similarity index 100% rename from src/main/java/org/jabref/gui/worker/AbstractWorker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/worker/AbstractWorker.java diff --git a/src/main/java/org/jabref/gui/worker/CallBack.java b/org.jabref.gui/src/main/java/org/jabref/gui/worker/CallBack.java similarity index 100% rename from src/main/java/org/jabref/gui/worker/CallBack.java rename to org.jabref.gui/src/main/java/org/jabref/gui/worker/CallBack.java diff --git a/src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java b/org.jabref.gui/src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java similarity index 100% rename from src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java diff --git a/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java b/org.jabref.gui/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java similarity index 100% rename from src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java diff --git a/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java similarity index 100% rename from src/main/java/org/jabref/gui/worker/MarkEntriesAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java diff --git a/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java similarity index 100% rename from src/main/java/org/jabref/gui/worker/SendAsEMailAction.java rename to org.jabref.gui/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java diff --git a/src/main/java/org/jabref/gui/worker/VersionWorker.java b/org.jabref.gui/src/main/java/org/jabref/gui/worker/VersionWorker.java similarity index 100% rename from src/main/java/org/jabref/gui/worker/VersionWorker.java rename to org.jabref.gui/src/main/java/org/jabref/gui/worker/VersionWorker.java diff --git a/src/main/java/org/jabref/logic/TypedBibEntry.java b/org.jabref.gui/src/main/java/org/jabref/logic/TypedBibEntry.java similarity index 100% rename from src/main/java/org/jabref/logic/TypedBibEntry.java rename to org.jabref.gui/src/main/java/org/jabref/logic/TypedBibEntry.java diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java b/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java similarity index 100% rename from src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java rename to org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java similarity index 100% rename from src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java rename to org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java diff --git a/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java similarity index 100% rename from src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java diff --git a/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java diff --git a/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java diff --git a/src/main/java/org/jabref/logic/bibtex/FieldContentParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/FieldContentParser.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/FieldContentParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/FieldContentParser.java diff --git a/src/main/java/org/jabref/logic/bibtex/FieldContentParserPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/FieldContentParserPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/FieldContentParserPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/FieldContentParserPreferences.java diff --git a/src/main/java/org/jabref/logic/bibtex/InvalidFieldValueException.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/InvalidFieldValueException.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/InvalidFieldValueException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/InvalidFieldValueException.java diff --git a/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java diff --git a/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatterPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatterPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/LatexFieldFormatterPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatterPreferences.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java b/org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java similarity index 100% rename from src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java diff --git a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java diff --git a/src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java diff --git a/src/main/java/org/jabref/logic/bst/BibtexPurify.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexPurify.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/BibtexPurify.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexPurify.java diff --git a/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java diff --git a/src/main/java/org/jabref/logic/bst/BibtexWidth.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexWidth.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/BibtexWidth.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexWidth.java diff --git a/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java diff --git a/src/main/java/org/jabref/logic/bst/FormatNameFunction.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/FormatNameFunction.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/FormatNameFunction.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/FormatNameFunction.java diff --git a/src/main/java/org/jabref/logic/bst/PurifyFunction.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/PurifyFunction.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/PurifyFunction.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/PurifyFunction.java diff --git a/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/TextPrefixFunction.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java diff --git a/src/main/java/org/jabref/logic/bst/VM.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/VM.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/VM.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/VM.java diff --git a/src/main/java/org/jabref/logic/bst/VMException.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/VMException.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/VMException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/VMException.java diff --git a/src/main/java/org/jabref/logic/bst/Warn.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/Warn.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/Warn.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/Warn.java diff --git a/src/main/java/org/jabref/logic/bst/WidthFunction.java b/org.jabref.gui/src/main/java/org/jabref/logic/bst/WidthFunction.java similarity index 100% rename from src/main/java/org/jabref/logic/bst/WidthFunction.java rename to org.jabref.gui/src/main/java/org/jabref/logic/bst/WidthFunction.java diff --git a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java b/org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java similarity index 100% rename from src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java b/org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java similarity index 100% rename from src/main/java/org/jabref/logic/citationstyle/CitationStyle.java rename to org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java b/org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java similarity index 100% rename from src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java rename to org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java b/org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java similarity index 100% rename from src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java b/org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java similarity index 100% rename from src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java rename to org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/CleanupPreset.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/CleanupWorker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java diff --git a/src/main/java/org/jabref/logic/cleanup/Cleanups.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/Cleanups.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/Cleanups.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/Cleanups.java diff --git a/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java diff --git a/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java diff --git a/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/DoiCleanup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java diff --git a/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java diff --git a/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java diff --git a/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java diff --git a/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java b/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java similarity index 100% rename from src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java diff --git a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java diff --git a/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java diff --git a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java diff --git a/src/main/java/org/jabref/logic/exporter/Exporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/Exporter.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/Exporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/Exporter.java diff --git a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/ExporterFactory.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/ExporterFactory.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/ExporterFactory.java diff --git a/src/main/java/org/jabref/logic/exporter/FileSaveSession.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/FileSaveSession.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/FileSaveSession.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/FileSaveSession.java diff --git a/src/main/java/org/jabref/logic/exporter/GroupSerializer.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/GroupSerializer.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/GroupSerializer.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/GroupSerializer.java diff --git a/src/main/java/org/jabref/logic/exporter/MSBibExporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/MSBibExporter.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/MSBibExporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/MSBibExporter.java diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java diff --git a/src/main/java/org/jabref/logic/exporter/ModsExporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/ModsExporter.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/ModsExporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/ModsExporter.java diff --git a/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java diff --git a/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java diff --git a/src/main/java/org/jabref/logic/exporter/SaveException.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/SaveException.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/SaveException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/SaveException.java diff --git a/src/main/java/org/jabref/logic/exporter/SavePreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/SavePreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/SavePreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/SavePreferences.java diff --git a/src/main/java/org/jabref/logic/exporter/SaveSession.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/SaveSession.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/SaveSession.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/SaveSession.java diff --git a/src/main/java/org/jabref/logic/exporter/StringSaveSession.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/StringSaveSession.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/StringSaveSession.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/StringSaveSession.java diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/TemplateExporter.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/TemplateExporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/TemplateExporter.java diff --git a/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java b/org.jabref.gui/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java similarity index 100% rename from src/main/java/org/jabref/logic/exporter/VerifyingWriter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java diff --git a/src/main/java/org/jabref/logic/formatter/Formatters.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/Formatters.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/Formatters.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/Formatters.java diff --git a/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/IdentityFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/Title.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/Title.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/casechanger/Title.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/Title.java diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/Word.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/Word.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/casechanger/Word.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/Word.java diff --git a/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java diff --git a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java b/org.jabref.gui/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java similarity index 100% rename from src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java rename to org.jabref.gui/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java diff --git a/src/main/java/org/jabref/logic/help/HelpFile.java b/org.jabref.gui/src/main/java/org/jabref/logic/help/HelpFile.java similarity index 100% rename from src/main/java/org/jabref/logic/help/HelpFile.java rename to org.jabref.gui/src/main/java/org/jabref/logic/help/HelpFile.java diff --git a/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/FetcherException.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/FetcherException.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/FetcherException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/FetcherException.java diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/FulltextFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/FulltextFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/FulltextFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/FulltextFetchers.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/FulltextFetchers.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/FulltextFetchers.java diff --git a/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/IdBasedFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/IdFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/IdFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/IdFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/IdFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/IdParserFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/IdParserFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/IdParserFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/ImportException.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportException.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/ImportException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportException.java diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportFormatReader.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/ImportFormatReader.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportFormatReader.java diff --git a/src/main/java/org/jabref/logic/importer/ImportInspector.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportInspector.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/ImportInspector.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportInspector.java diff --git a/src/main/java/org/jabref/logic/importer/Importer.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/Importer.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/Importer.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/Importer.java diff --git a/src/main/java/org/jabref/logic/importer/OpenDatabase.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/OpenDatabase.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/OpenDatabase.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/OpenDatabase.java diff --git a/src/main/java/org/jabref/logic/importer/OutputPrinter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/OutputPrinter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/OutputPrinter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/OutputPrinter.java diff --git a/src/main/java/org/jabref/logic/importer/ParseException.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/ParseException.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/ParseException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/ParseException.java diff --git a/src/main/java/org/jabref/logic/importer/Parser.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/Parser.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/Parser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/Parser.java diff --git a/src/main/java/org/jabref/logic/importer/ParserResult.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/ParserResult.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/ParserResult.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/ParserResult.java diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/WebFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/WebFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/WebFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/WebFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/WebFetchers.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/WebFetchers.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/WebFetchers.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ACS.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ACS.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/ACS.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ACS.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/DiVA.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/IEEE.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java diff --git a/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java diff --git a/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java diff --git a/src/main/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroups.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroups.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroups.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroups.java diff --git a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/GroupsParser.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/util/GroupsParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/util/GroupsParser.java diff --git a/src/main/java/org/jabref/logic/importer/util/INSPIREBibtexFilterReader.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/INSPIREBibtexFilterReader.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/util/INSPIREBibtexFilterReader.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/util/INSPIREBibtexFilterReader.java diff --git a/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/util/IdentifierParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java diff --git a/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java diff --git a/src/main/java/org/jabref/logic/importer/util/JsonReader.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/JsonReader.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/util/JsonReader.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/util/JsonReader.java diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/util/MetaDataParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java diff --git a/src/main/java/org/jabref/logic/importer/util/OAI2Handler.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/OAI2Handler.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/util/OAI2Handler.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/util/OAI2Handler.java diff --git a/src/main/java/org/jabref/logic/importer/util/PostOpenAction.java b/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/PostOpenAction.java similarity index 100% rename from src/main/java/org/jabref/logic/importer/util/PostOpenAction.java rename to org.jabref.gui/src/main/java/org/jabref/logic/importer/util/PostOpenAction.java diff --git a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/BibStringChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibStringChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/BibStringChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibStringChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/BibtexKeyChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexKeyChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/BibtexKeyChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexKeyChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/BibtexKeyDuplicationChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexKeyDuplicationChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/BibtexKeyDuplicationChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexKeyDuplicationChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/BibtexkeyDeviationChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexkeyDeviationChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/BibtexkeyDeviationChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexkeyDeviationChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/BooktitleChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/BracesCorrector.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BracesCorrector.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/BracesCorrector.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/BracesCorrector.java diff --git a/src/main/java/org/jabref/logic/integrity/BracketChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BracketChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/BracketChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/BracketChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/DOIValidityChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/DOIValidityChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/DOIValidityChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/DOIValidityChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/EditionChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/EditionChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/EditionChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/EditionChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/FieldChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/FieldChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/FieldChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/FieldChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/FieldCheckers.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/FieldCheckers.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/FieldCheckers.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/FieldCheckers.java diff --git a/src/main/java/org/jabref/logic/integrity/FileChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/FileChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/FileChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/FileChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/ISBNChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/ISBNChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/ISBNChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/ISSNChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/ISSNChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/ISSNChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/IntegrityCheck.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/IntegrityMessage.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java diff --git a/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/MonthChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/MonthChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/MonthChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/MonthChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/NoteChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/NoteChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/NoteChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/NoteChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/PagesChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/PagesChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/PagesChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/TitleChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/TitleChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/TitleChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/TitleChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/TypeChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/TypeChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/TypeChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/TypeChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/UrlChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/UrlChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/UrlChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/UrlChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/ValidBibtexKeyChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/ValidBibtexKeyChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/ValidBibtexKeyChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/ValidBibtexKeyChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/ValueChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/ValueChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/ValueChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/ValueChecker.java diff --git a/src/main/java/org/jabref/logic/integrity/YearChecker.java b/org.jabref.gui/src/main/java/org/jabref/logic/integrity/YearChecker.java similarity index 100% rename from src/main/java/org/jabref/logic/integrity/YearChecker.java rename to org.jabref.gui/src/main/java/org/jabref/logic/integrity/YearChecker.java diff --git a/src/main/java/org/jabref/logic/journals/Abbreviation.java b/org.jabref.gui/src/main/java/org/jabref/logic/journals/Abbreviation.java similarity index 100% rename from src/main/java/org/jabref/logic/journals/Abbreviation.java rename to org.jabref.gui/src/main/java/org/jabref/logic/journals/Abbreviation.java diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/journals/AbbreviationParser.java similarity index 100% rename from src/main/java/org/jabref/logic/journals/AbbreviationParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/journals/AbbreviationParser.java diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java b/org.jabref.gui/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java similarity index 100% rename from src/main/java/org/jabref/logic/journals/AbbreviationWriter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java b/org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java similarity index 100% rename from src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java rename to org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java b/org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java similarity index 100% rename from src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java rename to org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java diff --git a/src/main/java/org/jabref/logic/l10n/EncodingControl.java b/org.jabref.gui/src/main/java/org/jabref/logic/l10n/EncodingControl.java similarity index 100% rename from src/main/java/org/jabref/logic/l10n/EncodingControl.java rename to org.jabref.gui/src/main/java/org/jabref/logic/l10n/EncodingControl.java diff --git a/src/main/java/org/jabref/logic/l10n/Encodings.java b/org.jabref.gui/src/main/java/org/jabref/logic/l10n/Encodings.java similarity index 100% rename from src/main/java/org/jabref/logic/l10n/Encodings.java rename to org.jabref.gui/src/main/java/org/jabref/logic/l10n/Encodings.java diff --git a/src/main/java/org/jabref/logic/l10n/Languages.java b/org.jabref.gui/src/main/java/org/jabref/logic/l10n/Languages.java similarity index 100% rename from src/main/java/org/jabref/logic/l10n/Languages.java rename to org.jabref.gui/src/main/java/org/jabref/logic/l10n/Languages.java diff --git a/src/main/java/org/jabref/logic/l10n/Localization.java b/org.jabref.gui/src/main/java/org/jabref/logic/l10n/Localization.java similarity index 100% rename from src/main/java/org/jabref/logic/l10n/Localization.java rename to org.jabref.gui/src/main/java/org/jabref/logic/l10n/Localization.java diff --git a/src/main/java/org/jabref/logic/l10n/LocalizationKey.java b/org.jabref.gui/src/main/java/org/jabref/logic/l10n/LocalizationKey.java similarity index 100% rename from src/main/java/org/jabref/logic/l10n/LocalizationKey.java rename to org.jabref.gui/src/main/java/org/jabref/logic/l10n/LocalizationKey.java diff --git a/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java b/org.jabref.gui/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java similarity index 100% rename from src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java rename to org.jabref.gui/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java diff --git a/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java diff --git a/src/main/java/org/jabref/logic/layout/Layout.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/Layout.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/Layout.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/Layout.java diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutEntry.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/LayoutEntry.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutEntry.java diff --git a/src/main/java/org/jabref/logic/layout/LayoutFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/LayoutFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutFormatter.java diff --git a/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java diff --git a/src/main/java/org/jabref/logic/layout/LayoutHelper.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutHelper.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/LayoutHelper.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutHelper.java diff --git a/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java diff --git a/src/main/java/org/jabref/logic/layout/StringInt.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/StringInt.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/StringInt.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/StringInt.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorAbbreviator.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAbbreviator.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorAbbreviator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAbbreviator.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommas.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommas.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommas.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommas.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommas.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommas.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommas.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommas.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirst.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirst.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorFirstFirst.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirst.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommas.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommas.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommas.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommas.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorLF_FF.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLF_FF.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorLF_FF.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLF_FF.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorLF_FFAbbr.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLF_FFAbbr.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorLF_FFAbbr.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLF_FFAbbr.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorLastFirst.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirst.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorLastFirst.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirst.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommas.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommas.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommas.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommas.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommas.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommas.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommas.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommas.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviator.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviator.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviator.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstCommas.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstCommas.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorLastFirstCommas.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstCommas.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommas.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommas.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommas.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommas.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorNatBib.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorNatBib.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorNatBib.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorNatBib.java diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorOrgSci.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorOrgSci.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/AuthorOrgSci.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorOrgSci.java diff --git a/src/main/java/org/jabref/logic/layout/format/Authors.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Authors.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/Authors.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Authors.java diff --git a/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/CompositeFormat.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java diff --git a/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java diff --git a/src/main/java/org/jabref/logic/layout/format/CurrentDate.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CurrentDate.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/CurrentDate.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CurrentDate.java diff --git a/src/main/java/org/jabref/logic/layout/format/DOICheck.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DOICheck.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/DOICheck.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DOICheck.java diff --git a/src/main/java/org/jabref/logic/layout/format/DOIStrip.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DOIStrip.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/DOIStrip.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DOIStrip.java diff --git a/src/main/java/org/jabref/logic/layout/format/DateFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DateFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/DateFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DateFormatter.java diff --git a/src/main/java/org/jabref/logic/layout/format/Default.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Default.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/Default.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Default.java diff --git a/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java diff --git a/src/main/java/org/jabref/logic/layout/format/FileLink.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FileLink.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/FileLink.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FileLink.java diff --git a/src/main/java/org/jabref/logic/layout/format/FileLinkPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FileLinkPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/FileLinkPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FileLinkPreferences.java diff --git a/src/main/java/org/jabref/logic/layout/format/FirstPage.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FirstPage.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/FirstPage.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FirstPage.java diff --git a/src/main/java/org/jabref/logic/layout/format/FormatPagesForHTML.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FormatPagesForHTML.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/FormatPagesForHTML.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FormatPagesForHTML.java diff --git a/src/main/java/org/jabref/logic/layout/format/FormatPagesForXML.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FormatPagesForXML.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/FormatPagesForXML.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FormatPagesForXML.java diff --git a/src/main/java/org/jabref/logic/layout/format/GetOpenOfficeType.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/GetOpenOfficeType.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/GetOpenOfficeType.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/GetOpenOfficeType.java diff --git a/src/main/java/org/jabref/logic/layout/format/HTMLChars.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/HTMLChars.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/HTMLChars.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/HTMLChars.java diff --git a/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java diff --git a/src/main/java/org/jabref/logic/layout/format/IfPlural.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/IfPlural.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/IfPlural.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/IfPlural.java diff --git a/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java diff --git a/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java diff --git a/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java diff --git a/src/main/java/org/jabref/logic/layout/format/LastPage.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/LastPage.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/LastPage.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/LastPage.java diff --git a/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java diff --git a/src/main/java/org/jabref/logic/layout/format/NameFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NameFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/NameFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NameFormatter.java diff --git a/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java diff --git a/src/main/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviations.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviations.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviations.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviations.java diff --git a/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java diff --git a/src/main/java/org/jabref/logic/layout/format/Number.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Number.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/Number.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Number.java diff --git a/src/main/java/org/jabref/logic/layout/format/Ordinal.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Ordinal.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/Ordinal.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Ordinal.java diff --git a/src/main/java/org/jabref/logic/layout/format/RTFChars.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RTFChars.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/RTFChars.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RTFChars.java diff --git a/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java diff --git a/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java diff --git a/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java diff --git a/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/RemoveTilde.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java diff --git a/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java diff --git a/src/main/java/org/jabref/logic/layout/format/Replace.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Replace.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/Replace.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Replace.java diff --git a/src/main/java/org/jabref/logic/layout/format/RisAuthors.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisAuthors.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/RisAuthors.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisAuthors.java diff --git a/src/main/java/org/jabref/logic/layout/format/RisKeywords.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisKeywords.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/RisKeywords.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisKeywords.java diff --git a/src/main/java/org/jabref/logic/layout/format/RisMonth.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisMonth.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/RisMonth.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisMonth.java diff --git a/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/ToLowerCase.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java diff --git a/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/ToUpperCase.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java diff --git a/src/main/java/org/jabref/logic/layout/format/WrapContent.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/WrapContent.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/WrapContent.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/WrapContent.java diff --git a/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java diff --git a/src/main/java/org/jabref/logic/layout/format/XMLChars.java b/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/XMLChars.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/XMLChars.java rename to org.jabref.gui/src/main/java/org/jabref/logic/layout/format/XMLChars.java diff --git a/src/main/java/org/jabref/logic/logging/JabRefLogger.java b/org.jabref.gui/src/main/java/org/jabref/logic/logging/JabRefLogger.java similarity index 100% rename from src/main/java/org/jabref/logic/logging/JabRefLogger.java rename to org.jabref.gui/src/main/java/org/jabref/logic/logging/JabRefLogger.java diff --git a/src/main/java/org/jabref/logic/logging/LogMessages.java b/org.jabref.gui/src/main/java/org/jabref/logic/logging/LogMessages.java similarity index 100% rename from src/main/java/org/jabref/logic/logging/LogMessages.java rename to org.jabref.gui/src/main/java/org/jabref/logic/logging/LogMessages.java diff --git a/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java b/org.jabref.gui/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java similarity index 100% rename from src/main/java/org/jabref/logic/msbib/BibTeXConverter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java diff --git a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java b/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibConverter.java similarity index 100% rename from src/main/java/org/jabref/logic/msbib/MSBibConverter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibConverter.java diff --git a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java b/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java similarity index 100% rename from src/main/java/org/jabref/logic/msbib/MSBibDatabase.java rename to org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java diff --git a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java b/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibEntry.java similarity index 100% rename from src/main/java/org/jabref/logic/msbib/MSBibEntry.java rename to org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibEntry.java diff --git a/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java b/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java similarity index 100% rename from src/main/java/org/jabref/logic/msbib/MSBibEntryType.java rename to org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java diff --git a/src/main/java/org/jabref/logic/msbib/MSBibMapping.java b/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibMapping.java similarity index 100% rename from src/main/java/org/jabref/logic/msbib/MSBibMapping.java rename to org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibMapping.java diff --git a/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java b/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java similarity index 100% rename from src/main/java/org/jabref/logic/msbib/MsBibAuthor.java rename to org.jabref.gui/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java diff --git a/src/main/java/org/jabref/logic/msbib/PageNumbers.java b/org.jabref.gui/src/main/java/org/jabref/logic/msbib/PageNumbers.java similarity index 100% rename from src/main/java/org/jabref/logic/msbib/PageNumbers.java rename to org.jabref.gui/src/main/java/org/jabref/logic/msbib/PageNumbers.java diff --git a/src/main/java/org/jabref/logic/net/ProgressInputStream.java b/org.jabref.gui/src/main/java/org/jabref/logic/net/ProgressInputStream.java similarity index 100% rename from src/main/java/org/jabref/logic/net/ProgressInputStream.java rename to org.jabref.gui/src/main/java/org/jabref/logic/net/ProgressInputStream.java diff --git a/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java b/org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java similarity index 100% rename from src/main/java/org/jabref/logic/net/ProxyAuthenticator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java diff --git a/src/main/java/org/jabref/logic/net/ProxyPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/net/ProxyPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyPreferences.java diff --git a/src/main/java/org/jabref/logic/net/ProxyRegisterer.java b/org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyRegisterer.java similarity index 100% rename from src/main/java/org/jabref/logic/net/ProxyRegisterer.java rename to org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyRegisterer.java diff --git a/src/main/java/org/jabref/logic/net/URLDownload.java b/org.jabref.gui/src/main/java/org/jabref/logic/net/URLDownload.java similarity index 100% rename from src/main/java/org/jabref/logic/net/URLDownload.java rename to org.jabref.gui/src/main/java/org/jabref/logic/net/URLDownload.java diff --git a/src/main/java/org/jabref/logic/net/URLUtil.java b/org.jabref.gui/src/main/java/org/jabref/logic/net/URLUtil.java similarity index 100% rename from src/main/java/org/jabref/logic/net/URLUtil.java rename to org.jabref.gui/src/main/java/org/jabref/logic/net/URLUtil.java diff --git a/src/main/java/org/jabref/logic/openoffice/CitationEntry.java b/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/CitationEntry.java similarity index 100% rename from src/main/java/org/jabref/logic/openoffice/CitationEntry.java rename to org.jabref.gui/src/main/java/org/jabref/logic/openoffice/CitationEntry.java diff --git a/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java b/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java similarity index 100% rename from src/main/java/org/jabref/logic/openoffice/OOBibStyle.java rename to org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java diff --git a/src/main/java/org/jabref/logic/openoffice/OOPreFormatter.java b/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOPreFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/openoffice/OOPreFormatter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOPreFormatter.java diff --git a/src/main/java/org/jabref/logic/openoffice/OOUtil.java b/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOUtil.java similarity index 100% rename from src/main/java/org/jabref/logic/openoffice/OOUtil.java rename to org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOUtil.java diff --git a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java b/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java similarity index 100% rename from src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java rename to org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java diff --git a/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java diff --git a/src/main/java/org/jabref/logic/openoffice/StyleLoader.java b/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/StyleLoader.java similarity index 100% rename from src/main/java/org/jabref/logic/openoffice/StyleLoader.java rename to org.jabref.gui/src/main/java/org/jabref/logic/openoffice/StyleLoader.java diff --git a/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java b/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java similarity index 100% rename from src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java rename to org.jabref.gui/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java diff --git a/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java b/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java similarity index 100% rename from src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java diff --git a/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/pdf/AnnotationImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java diff --git a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java diff --git a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java b/org.jabref.gui/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java similarity index 100% rename from src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java rename to org.jabref.gui/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java diff --git a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java b/org.jabref.gui/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java similarity index 100% rename from src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java rename to org.jabref.gui/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java diff --git a/src/main/java/org/jabref/logic/pdf/TextExtractor.java b/org.jabref.gui/src/main/java/org/jabref/logic/pdf/TextExtractor.java similarity index 100% rename from src/main/java/org/jabref/logic/pdf/TextExtractor.java rename to org.jabref.gui/src/main/java/org/jabref/logic/pdf/TextExtractor.java diff --git a/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/preferences/TimestampPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java b/org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java similarity index 100% rename from src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java rename to org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java b/org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java similarity index 100% rename from src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java rename to org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java b/org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java similarity index 100% rename from src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java rename to org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java diff --git a/src/main/java/org/jabref/logic/remote/RemotePreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/remote/RemotePreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/remote/RemotePreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/remote/RemotePreferences.java diff --git a/src/main/java/org/jabref/logic/remote/RemoteUtil.java b/org.jabref.gui/src/main/java/org/jabref/logic/remote/RemoteUtil.java similarity index 100% rename from src/main/java/org/jabref/logic/remote/RemoteUtil.java rename to org.jabref.gui/src/main/java/org/jabref/logic/remote/RemoteUtil.java diff --git a/src/main/java/org/jabref/logic/remote/client/RemoteListenerClient.java b/org.jabref.gui/src/main/java/org/jabref/logic/remote/client/RemoteListenerClient.java similarity index 100% rename from src/main/java/org/jabref/logic/remote/client/RemoteListenerClient.java rename to org.jabref.gui/src/main/java/org/jabref/logic/remote/client/RemoteListenerClient.java diff --git a/src/main/java/org/jabref/logic/remote/server/MessageHandler.java b/org.jabref.gui/src/main/java/org/jabref/logic/remote/server/MessageHandler.java similarity index 100% rename from src/main/java/org/jabref/logic/remote/server/MessageHandler.java rename to org.jabref.gui/src/main/java/org/jabref/logic/remote/server/MessageHandler.java diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java b/org.jabref.gui/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java similarity index 100% rename from src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java rename to org.jabref.gui/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java b/org.jabref.gui/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java similarity index 100% rename from src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java rename to org.jabref.gui/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java b/org.jabref.gui/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java similarity index 100% rename from src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java rename to org.jabref.gui/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java diff --git a/src/main/java/org/jabref/logic/remote/shared/Protocol.java b/org.jabref.gui/src/main/java/org/jabref/logic/remote/shared/Protocol.java similarity index 100% rename from src/main/java/org/jabref/logic/remote/shared/Protocol.java rename to org.jabref.gui/src/main/java/org/jabref/logic/remote/shared/Protocol.java diff --git a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java b/org.jabref.gui/src/main/java/org/jabref/logic/search/DatabaseSearcher.java similarity index 100% rename from src/main/java/org/jabref/logic/search/DatabaseSearcher.java rename to org.jabref.gui/src/main/java/org/jabref/logic/search/DatabaseSearcher.java diff --git a/src/main/java/org/jabref/logic/search/SearchQuery.java b/org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQuery.java similarity index 100% rename from src/main/java/org/jabref/logic/search/SearchQuery.java rename to org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQuery.java diff --git a/src/main/java/org/jabref/logic/search/SearchQueryHighlightListener.java b/org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQueryHighlightListener.java similarity index 100% rename from src/main/java/org/jabref/logic/search/SearchQueryHighlightListener.java rename to org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQueryHighlightListener.java diff --git a/src/main/java/org/jabref/logic/search/SearchQueryHighlightObservable.java b/org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQueryHighlightObservable.java similarity index 100% rename from src/main/java/org/jabref/logic/search/SearchQueryHighlightObservable.java rename to org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQueryHighlightObservable.java diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnection.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/DBMSConnection.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/DBMSConnection.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/DBMSConnection.java diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java diff --git a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/DBMSProcessor.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/DBMSProcessor.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/DBMSProcessor.java diff --git a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java diff --git a/src/main/java/org/jabref/logic/shared/MySQLProcessor.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/MySQLProcessor.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/MySQLProcessor.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/MySQLProcessor.java diff --git a/src/main/java/org/jabref/logic/shared/OracleProcessor.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/OracleProcessor.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/OracleProcessor.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/OracleProcessor.java diff --git a/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java diff --git a/src/main/java/org/jabref/logic/shared/event/ConnectionLostEvent.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/event/ConnectionLostEvent.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/event/ConnectionLostEvent.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/event/ConnectionLostEvent.java diff --git a/src/main/java/org/jabref/logic/shared/event/SharedEntryNotPresentEvent.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/event/SharedEntryNotPresentEvent.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/event/SharedEntryNotPresentEvent.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/event/SharedEntryNotPresentEvent.java diff --git a/src/main/java/org/jabref/logic/shared/event/UpdateRefusedEvent.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/event/UpdateRefusedEvent.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/event/UpdateRefusedEvent.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/event/UpdateRefusedEvent.java diff --git a/src/main/java/org/jabref/logic/shared/exception/InvalidDBMSConnectionPropertiesException.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/exception/InvalidDBMSConnectionPropertiesException.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/exception/InvalidDBMSConnectionPropertiesException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/exception/InvalidDBMSConnectionPropertiesException.java diff --git a/src/main/java/org/jabref/logic/shared/exception/NotASharedDatabaseException.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/exception/NotASharedDatabaseException.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/exception/NotASharedDatabaseException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/exception/NotASharedDatabaseException.java diff --git a/src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java diff --git a/src/main/java/org/jabref/logic/shared/exception/SharedEntryNotPresentException.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/exception/SharedEntryNotPresentException.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/exception/SharedEntryNotPresentException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/exception/SharedEntryNotPresentException.java diff --git a/src/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java diff --git a/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java diff --git a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java diff --git a/src/main/java/org/jabref/logic/shared/security/Password.java b/org.jabref.gui/src/main/java/org/jabref/logic/shared/security/Password.java similarity index 100% rename from src/main/java/org/jabref/logic/shared/security/Password.java rename to org.jabref.gui/src/main/java/org/jabref/logic/shared/security/Password.java diff --git a/src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java b/org.jabref.gui/src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java similarity index 100% rename from src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java rename to org.jabref.gui/src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java diff --git a/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java b/org.jabref.gui/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java similarity index 100% rename from src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java rename to org.jabref.gui/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java diff --git a/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java b/org.jabref.gui/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java similarity index 100% rename from src/main/java/org/jabref/logic/undo/UndoChangeEvent.java rename to org.jabref.gui/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java diff --git a/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java b/org.jabref.gui/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java similarity index 100% rename from src/main/java/org/jabref/logic/undo/UndoRedoEvent.java rename to org.jabref.gui/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java diff --git a/src/main/java/org/jabref/logic/util/BuildInfo.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/BuildInfo.java similarity index 100% rename from src/main/java/org/jabref/logic/util/BuildInfo.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/BuildInfo.java diff --git a/src/main/java/org/jabref/logic/util/FileType.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/FileType.java similarity index 100% rename from src/main/java/org/jabref/logic/util/FileType.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/FileType.java diff --git a/src/main/java/org/jabref/logic/util/JavaVersion.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/JavaVersion.java similarity index 100% rename from src/main/java/org/jabref/logic/util/JavaVersion.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/JavaVersion.java diff --git a/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java similarity index 100% rename from src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java diff --git a/src/main/java/org/jabref/logic/util/OS.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/OS.java similarity index 100% rename from src/main/java/org/jabref/logic/util/OS.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/OS.java diff --git a/src/main/java/org/jabref/logic/util/TestEntry.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/TestEntry.java similarity index 100% rename from src/main/java/org/jabref/logic/util/TestEntry.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/TestEntry.java diff --git a/src/main/java/org/jabref/logic/util/UpdateField.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/UpdateField.java similarity index 100% rename from src/main/java/org/jabref/logic/util/UpdateField.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/UpdateField.java diff --git a/src/main/java/org/jabref/logic/util/UpdateFieldPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/UpdateFieldPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/util/UpdateFieldPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/UpdateFieldPreferences.java diff --git a/src/main/java/org/jabref/logic/util/Version.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/Version.java similarity index 100% rename from src/main/java/org/jabref/logic/util/Version.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/Version.java diff --git a/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java diff --git a/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java diff --git a/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java diff --git a/src/main/java/org/jabref/logic/util/io/FileBasedLock.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileBasedLock.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/FileBasedLock.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileBasedLock.java diff --git a/src/main/java/org/jabref/logic/util/io/FileFinder.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileFinder.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/FileFinder.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileFinder.java diff --git a/src/main/java/org/jabref/logic/util/io/FileFinders.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileFinders.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/FileFinders.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileFinders.java diff --git a/src/main/java/org/jabref/logic/util/io/FileHistory.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileHistory.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/FileHistory.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileHistory.java diff --git a/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/FileNameCleaner.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java diff --git a/src/main/java/org/jabref/logic/util/io/FileUtil.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileUtil.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/FileUtil.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileUtil.java diff --git a/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java diff --git a/src/main/java/org/jabref/logic/util/io/XMLUtil.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/io/XMLUtil.java similarity index 100% rename from src/main/java/org/jabref/logic/util/io/XMLUtil.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/io/XMLUtil.java diff --git a/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java similarity index 100% rename from src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java diff --git a/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java similarity index 100% rename from src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java diff --git a/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java similarity index 100% rename from src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java diff --git a/src/main/java/org/jabref/logic/util/strings/RtfCharMap.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/RtfCharMap.java similarity index 100% rename from src/main/java/org/jabref/logic/util/strings/RtfCharMap.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/strings/RtfCharMap.java diff --git a/src/main/java/org/jabref/logic/util/strings/StringLengthComparator.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/StringLengthComparator.java similarity index 100% rename from src/main/java/org/jabref/logic/util/strings/StringLengthComparator.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/strings/StringLengthComparator.java diff --git a/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java similarity index 100% rename from src/main/java/org/jabref/logic/util/strings/StringSimilarity.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java diff --git a/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java b/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java similarity index 100% rename from src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java rename to org.jabref.gui/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java diff --git a/src/main/java/org/jabref/logic/xmp/EncryptedPdfsNotSupportedException.java b/org.jabref.gui/src/main/java/org/jabref/logic/xmp/EncryptedPdfsNotSupportedException.java similarity index 100% rename from src/main/java/org/jabref/logic/xmp/EncryptedPdfsNotSupportedException.java rename to org.jabref.gui/src/main/java/org/jabref/logic/xmp/EncryptedPdfsNotSupportedException.java diff --git a/src/main/java/org/jabref/logic/xmp/XMPPreferences.java b/org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPPreferences.java similarity index 100% rename from src/main/java/org/jabref/logic/xmp/XMPPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPPreferences.java diff --git a/src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java b/org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java similarity index 100% rename from src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java rename to org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java diff --git a/src/main/java/org/jabref/logic/xmp/XMPUtil.java b/org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPUtil.java similarity index 100% rename from src/main/java/org/jabref/logic/xmp/XMPUtil.java rename to org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPUtil.java diff --git a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java b/org.jabref.gui/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java similarity index 100% rename from src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java rename to org.jabref.gui/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java diff --git a/src/main/java/org/jabref/migrations/FileLinksUpgradeWarning.java b/org.jabref.gui/src/main/java/org/jabref/migrations/FileLinksUpgradeWarning.java similarity index 100% rename from src/main/java/org/jabref/migrations/FileLinksUpgradeWarning.java rename to org.jabref.gui/src/main/java/org/jabref/migrations/FileLinksUpgradeWarning.java diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/org.jabref.gui/src/main/java/org/jabref/migrations/PreferencesMigrations.java similarity index 100% rename from src/main/java/org/jabref/migrations/PreferencesMigrations.java rename to org.jabref.gui/src/main/java/org/jabref/migrations/PreferencesMigrations.java diff --git a/src/main/java/org/jabref/pdfimport/ImportDialog.java b/org.jabref.gui/src/main/java/org/jabref/pdfimport/ImportDialog.java similarity index 100% rename from src/main/java/org/jabref/pdfimport/ImportDialog.java rename to org.jabref.gui/src/main/java/org/jabref/pdfimport/ImportDialog.java diff --git a/src/main/java/org/jabref/pdfimport/PdfFileFilter.java b/org.jabref.gui/src/main/java/org/jabref/pdfimport/PdfFileFilter.java similarity index 100% rename from src/main/java/org/jabref/pdfimport/PdfFileFilter.java rename to org.jabref.gui/src/main/java/org/jabref/pdfimport/PdfFileFilter.java diff --git a/src/main/java/org/jabref/pdfimport/PdfImporter.java b/org.jabref.gui/src/main/java/org/jabref/pdfimport/PdfImporter.java similarity index 100% rename from src/main/java/org/jabref/pdfimport/PdfImporter.java rename to org.jabref.gui/src/main/java/org/jabref/pdfimport/PdfImporter.java diff --git a/src/main/java/org/jabref/preferences/CustomExportList.java b/org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java similarity index 100% rename from src/main/java/org/jabref/preferences/CustomExportList.java rename to org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java diff --git a/src/main/java/org/jabref/preferences/CustomImportList.java b/org.jabref.gui/src/main/java/org/jabref/preferences/CustomImportList.java similarity index 100% rename from src/main/java/org/jabref/preferences/CustomImportList.java rename to org.jabref.gui/src/main/java/org/jabref/preferences/CustomImportList.java diff --git a/src/main/java/org/jabref/preferences/ExportComparator.java b/org.jabref.gui/src/main/java/org/jabref/preferences/ExportComparator.java similarity index 100% rename from src/main/java/org/jabref/preferences/ExportComparator.java rename to org.jabref.gui/src/main/java/org/jabref/preferences/ExportComparator.java diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java similarity index 100% rename from src/main/java/org/jabref/preferences/JabRefPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java diff --git a/src/main/java/org/jabref/preferences/JabRefPreferencesFilter.java b/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferencesFilter.java similarity index 100% rename from src/main/java/org/jabref/preferences/JabRefPreferencesFilter.java rename to org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferencesFilter.java diff --git a/src/main/java/org/jabref/preferences/LastFocusedTabPreferences.java b/org.jabref.gui/src/main/java/org/jabref/preferences/LastFocusedTabPreferences.java similarity index 100% rename from src/main/java/org/jabref/preferences/LastFocusedTabPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/preferences/LastFocusedTabPreferences.java diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/org.jabref.gui/src/main/java/org/jabref/preferences/PreferencesService.java similarity index 100% rename from src/main/java/org/jabref/preferences/PreferencesService.java rename to org.jabref.gui/src/main/java/org/jabref/preferences/PreferencesService.java diff --git a/src/main/java/org/jabref/preferences/PreviewPreferences.java b/org.jabref.gui/src/main/java/org/jabref/preferences/PreviewPreferences.java similarity index 100% rename from src/main/java/org/jabref/preferences/PreviewPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/preferences/PreviewPreferences.java diff --git a/src/main/java/org/jabref/preferences/SearchPreferences.java b/org.jabref.gui/src/main/java/org/jabref/preferences/SearchPreferences.java similarity index 100% rename from src/main/java/org/jabref/preferences/SearchPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/preferences/SearchPreferences.java diff --git a/src/main/java/org/jabref/preferences/VersionPreferences.java b/org.jabref.gui/src/main/java/org/jabref/preferences/VersionPreferences.java similarity index 100% rename from src/main/java/org/jabref/preferences/VersionPreferences.java rename to org.jabref.gui/src/main/java/org/jabref/preferences/VersionPreferences.java diff --git a/src/main/java/osx/macadapter/MacAdapter.java b/org.jabref.gui/src/main/java/osx/macadapter/MacAdapter.java similarity index 100% rename from src/main/java/osx/macadapter/MacAdapter.java rename to org.jabref.gui/src/main/java/osx/macadapter/MacAdapter.java diff --git a/src/main/resources/ApplicationInsights.xml b/org.jabref.gui/src/main/resources/ApplicationInsights.xml similarity index 100% rename from src/main/resources/ApplicationInsights.xml rename to org.jabref.gui/src/main/resources/ApplicationInsights.xml diff --git a/src/main/resources/META-INF/services/com.airhacks.afterburner.injection.PresenterFactory b/org.jabref.gui/src/main/resources/META-INF/services/com.airhacks.afterburner.injection.PresenterFactory similarity index 100% rename from src/main/resources/META-INF/services/com.airhacks.afterburner.injection.PresenterFactory rename to org.jabref.gui/src/main/resources/META-INF/services/com.airhacks.afterburner.injection.PresenterFactory diff --git a/src/main/resources/build.properties b/org.jabref.gui/src/main/resources/build.properties similarity index 100% rename from src/main/resources/build.properties rename to org.jabref.gui/src/main/resources/build.properties diff --git a/src/main/resources/fonts/materialdesignicons-webfont.ttf b/org.jabref.gui/src/main/resources/fonts/materialdesignicons-webfont.ttf similarity index 100% rename from src/main/resources/fonts/materialdesignicons-webfont.ttf rename to org.jabref.gui/src/main/resources/fonts/materialdesignicons-webfont.ttf diff --git a/src/main/resources/icons/jabref.icns b/org.jabref.gui/src/main/resources/icons/jabref.icns old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/icons/jabref.icns rename to org.jabref.gui/src/main/resources/icons/jabref.icns diff --git a/src/main/resources/icons/jabref.ico b/org.jabref.gui/src/main/resources/icons/jabref.ico similarity index 100% rename from src/main/resources/icons/jabref.ico rename to org.jabref.gui/src/main/resources/icons/jabref.ico diff --git a/src/main/resources/icons/jabref.svg b/org.jabref.gui/src/main/resources/icons/jabref.svg similarity index 100% rename from src/main/resources/icons/jabref.svg rename to org.jabref.gui/src/main/resources/icons/jabref.svg diff --git a/src/main/resources/images/Icons.properties b/org.jabref.gui/src/main/resources/images/Icons.properties similarity index 100% rename from src/main/resources/images/Icons.properties rename to org.jabref.gui/src/main/resources/images/Icons.properties diff --git a/src/main/resources/images/external/JabRef-icon-128.png b/org.jabref.gui/src/main/resources/images/external/JabRef-icon-128.png similarity index 100% rename from src/main/resources/images/external/JabRef-icon-128.png rename to org.jabref.gui/src/main/resources/images/external/JabRef-icon-128.png diff --git a/src/main/resources/images/external/JabRef-icon-16.png b/org.jabref.gui/src/main/resources/images/external/JabRef-icon-16.png similarity index 100% rename from src/main/resources/images/external/JabRef-icon-16.png rename to org.jabref.gui/src/main/resources/images/external/JabRef-icon-16.png diff --git a/src/main/resources/images/external/JabRef-icon-20.png b/org.jabref.gui/src/main/resources/images/external/JabRef-icon-20.png similarity index 100% rename from src/main/resources/images/external/JabRef-icon-20.png rename to org.jabref.gui/src/main/resources/images/external/JabRef-icon-20.png diff --git a/src/main/resources/images/external/JabRef-icon-32.png b/org.jabref.gui/src/main/resources/images/external/JabRef-icon-32.png similarity index 100% rename from src/main/resources/images/external/JabRef-icon-32.png rename to org.jabref.gui/src/main/resources/images/external/JabRef-icon-32.png diff --git a/src/main/resources/images/external/JabRef-icon-40.png b/org.jabref.gui/src/main/resources/images/external/JabRef-icon-40.png similarity index 100% rename from src/main/resources/images/external/JabRef-icon-40.png rename to org.jabref.gui/src/main/resources/images/external/JabRef-icon-40.png diff --git a/src/main/resources/images/external/JabRef-icon-48.png b/org.jabref.gui/src/main/resources/images/external/JabRef-icon-48.png similarity index 100% rename from src/main/resources/images/external/JabRef-icon-48.png rename to org.jabref.gui/src/main/resources/images/external/JabRef-icon-48.png diff --git a/src/main/resources/images/external/JabRef-icon-64.png b/org.jabref.gui/src/main/resources/images/external/JabRef-icon-64.png similarity index 100% rename from src/main/resources/images/external/JabRef-icon-64.png rename to org.jabref.gui/src/main/resources/images/external/JabRef-icon-64.png diff --git a/src/main/resources/images/external/arxiv_32.png b/org.jabref.gui/src/main/resources/images/external/arxiv_32.png similarity index 100% rename from src/main/resources/images/external/arxiv_32.png rename to org.jabref.gui/src/main/resources/images/external/arxiv_32.png diff --git a/src/main/resources/images/external/emacs.png b/org.jabref.gui/src/main/resources/images/external/emacs.png similarity index 100% rename from src/main/resources/images/external/emacs.png rename to org.jabref.gui/src/main/resources/images/external/emacs.png diff --git a/src/main/resources/images/external/lyx2.png b/org.jabref.gui/src/main/resources/images/external/lyx2.png similarity index 100% rename from src/main/resources/images/external/lyx2.png rename to org.jabref.gui/src/main/resources/images/external/lyx2.png diff --git a/src/main/resources/images/external/mdl-icon.png b/org.jabref.gui/src/main/resources/images/external/mdl-icon.png similarity index 100% rename from src/main/resources/images/external/mdl-icon.png rename to org.jabref.gui/src/main/resources/images/external/mdl-icon.png diff --git a/src/main/resources/images/external/mdlListIcon.png b/org.jabref.gui/src/main/resources/images/external/mdlListIcon.png similarity index 100% rename from src/main/resources/images/external/mdlListIcon.png rename to org.jabref.gui/src/main/resources/images/external/mdlListIcon.png diff --git a/src/main/resources/images/external/mdlloading.gif b/org.jabref.gui/src/main/resources/images/external/mdlloading.gif similarity index 100% rename from src/main/resources/images/external/mdlloading.gif rename to org.jabref.gui/src/main/resources/images/external/mdlloading.gif diff --git a/src/main/resources/images/external/openoffice.png b/org.jabref.gui/src/main/resources/images/external/openoffice.png similarity index 100% rename from src/main/resources/images/external/openoffice.png rename to org.jabref.gui/src/main/resources/images/external/openoffice.png diff --git a/src/main/resources/images/external/red.png b/org.jabref.gui/src/main/resources/images/external/red.png similarity index 100% rename from src/main/resources/images/external/red.png rename to org.jabref.gui/src/main/resources/images/external/red.png diff --git a/src/main/resources/images/external/texmaker.png b/org.jabref.gui/src/main/resources/images/external/texmaker.png similarity index 100% rename from src/main/resources/images/external/texmaker.png rename to org.jabref.gui/src/main/resources/images/external/texmaker.png diff --git a/src/main/resources/images/external/texstudio.png b/org.jabref.gui/src/main/resources/images/external/texstudio.png similarity index 100% rename from src/main/resources/images/external/texstudio.png rename to org.jabref.gui/src/main/resources/images/external/texstudio.png diff --git a/src/main/resources/images/external/vim.png b/org.jabref.gui/src/main/resources/images/external/vim.png similarity index 100% rename from src/main/resources/images/external/vim.png rename to org.jabref.gui/src/main/resources/images/external/vim.png diff --git a/src/main/resources/images/external/winedt.png b/org.jabref.gui/src/main/resources/images/external/winedt.png similarity index 100% rename from src/main/resources/images/external/winedt.png rename to org.jabref.gui/src/main/resources/images/external/winedt.png diff --git a/src/main/resources/images/external/wwwciteseer.png b/org.jabref.gui/src/main/resources/images/external/wwwciteseer.png similarity index 100% rename from src/main/resources/images/external/wwwciteseer.png rename to org.jabref.gui/src/main/resources/images/external/wwwciteseer.png diff --git a/src/main/resources/journals/IEEEJournalListCode.txt b/org.jabref.gui/src/main/resources/journals/IEEEJournalListCode.txt similarity index 100% rename from src/main/resources/journals/IEEEJournalListCode.txt rename to org.jabref.gui/src/main/resources/journals/IEEEJournalListCode.txt diff --git a/src/main/resources/journals/IEEEJournalListText.txt b/org.jabref.gui/src/main/resources/journals/IEEEJournalListText.txt similarity index 100% rename from src/main/resources/journals/IEEEJournalListText.txt rename to org.jabref.gui/src/main/resources/journals/IEEEJournalListText.txt diff --git a/src/main/resources/journals/journalList.txt b/org.jabref.gui/src/main/resources/journals/journalList.txt similarity index 100% rename from src/main/resources/journals/journalList.txt rename to org.jabref.gui/src/main/resources/journals/journalList.txt diff --git a/src/main/resources/l10n/JabRef_da.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_da.properties similarity index 100% rename from src/main/resources/l10n/JabRef_da.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_da.properties diff --git a/src/main/resources/l10n/JabRef_de.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_de.properties similarity index 100% rename from src/main/resources/l10n/JabRef_de.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_de.properties diff --git a/src/main/resources/l10n/JabRef_el.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_el.properties similarity index 100% rename from src/main/resources/l10n/JabRef_el.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_el.properties diff --git a/src/main/resources/l10n/JabRef_en.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_en.properties similarity index 100% rename from src/main/resources/l10n/JabRef_en.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_en.properties diff --git a/src/main/resources/l10n/JabRef_es.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_es.properties similarity index 100% rename from src/main/resources/l10n/JabRef_es.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_es.properties diff --git a/src/main/resources/l10n/JabRef_fa.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_fa.properties similarity index 100% rename from src/main/resources/l10n/JabRef_fa.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_fa.properties diff --git a/src/main/resources/l10n/JabRef_fr.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_fr.properties similarity index 100% rename from src/main/resources/l10n/JabRef_fr.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_fr.properties diff --git a/src/main/resources/l10n/JabRef_in.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_in.properties similarity index 100% rename from src/main/resources/l10n/JabRef_in.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_in.properties diff --git a/src/main/resources/l10n/JabRef_it.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_it.properties similarity index 100% rename from src/main/resources/l10n/JabRef_it.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_it.properties diff --git a/src/main/resources/l10n/JabRef_ja.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_ja.properties similarity index 100% rename from src/main/resources/l10n/JabRef_ja.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_ja.properties diff --git a/src/main/resources/l10n/JabRef_nl.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_nl.properties similarity index 100% rename from src/main/resources/l10n/JabRef_nl.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_nl.properties diff --git a/src/main/resources/l10n/JabRef_no.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_no.properties similarity index 100% rename from src/main/resources/l10n/JabRef_no.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_no.properties diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_pt_BR.properties similarity index 100% rename from src/main/resources/l10n/JabRef_pt_BR.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_pt_BR.properties diff --git a/src/main/resources/l10n/JabRef_ru.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_ru.properties similarity index 100% rename from src/main/resources/l10n/JabRef_ru.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_ru.properties diff --git a/src/main/resources/l10n/JabRef_sv.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_sv.properties similarity index 100% rename from src/main/resources/l10n/JabRef_sv.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_sv.properties diff --git a/src/main/resources/l10n/JabRef_tr.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_tr.properties similarity index 100% rename from src/main/resources/l10n/JabRef_tr.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_tr.properties diff --git a/src/main/resources/l10n/JabRef_vi.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_vi.properties similarity index 100% rename from src/main/resources/l10n/JabRef_vi.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_vi.properties diff --git a/src/main/resources/l10n/JabRef_zh.properties b/org.jabref.gui/src/main/resources/l10n/JabRef_zh.properties similarity index 100% rename from src/main/resources/l10n/JabRef_zh.properties rename to org.jabref.gui/src/main/resources/l10n/JabRef_zh.properties diff --git a/src/main/resources/l10n/Menu_da.properties b/org.jabref.gui/src/main/resources/l10n/Menu_da.properties similarity index 100% rename from src/main/resources/l10n/Menu_da.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_da.properties diff --git a/src/main/resources/l10n/Menu_de.properties b/org.jabref.gui/src/main/resources/l10n/Menu_de.properties similarity index 100% rename from src/main/resources/l10n/Menu_de.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_de.properties diff --git a/src/main/resources/l10n/Menu_el.properties b/org.jabref.gui/src/main/resources/l10n/Menu_el.properties similarity index 100% rename from src/main/resources/l10n/Menu_el.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_el.properties diff --git a/src/main/resources/l10n/Menu_en.properties b/org.jabref.gui/src/main/resources/l10n/Menu_en.properties similarity index 100% rename from src/main/resources/l10n/Menu_en.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_en.properties diff --git a/src/main/resources/l10n/Menu_es.properties b/org.jabref.gui/src/main/resources/l10n/Menu_es.properties similarity index 100% rename from src/main/resources/l10n/Menu_es.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_es.properties diff --git a/src/main/resources/l10n/Menu_fa.properties b/org.jabref.gui/src/main/resources/l10n/Menu_fa.properties similarity index 100% rename from src/main/resources/l10n/Menu_fa.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_fa.properties diff --git a/src/main/resources/l10n/Menu_fr.properties b/org.jabref.gui/src/main/resources/l10n/Menu_fr.properties similarity index 100% rename from src/main/resources/l10n/Menu_fr.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_fr.properties diff --git a/src/main/resources/l10n/Menu_in.properties b/org.jabref.gui/src/main/resources/l10n/Menu_in.properties similarity index 100% rename from src/main/resources/l10n/Menu_in.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_in.properties diff --git a/src/main/resources/l10n/Menu_it.properties b/org.jabref.gui/src/main/resources/l10n/Menu_it.properties similarity index 100% rename from src/main/resources/l10n/Menu_it.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_it.properties diff --git a/src/main/resources/l10n/Menu_ja.properties b/org.jabref.gui/src/main/resources/l10n/Menu_ja.properties similarity index 100% rename from src/main/resources/l10n/Menu_ja.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_ja.properties diff --git a/src/main/resources/l10n/Menu_nl.properties b/org.jabref.gui/src/main/resources/l10n/Menu_nl.properties similarity index 100% rename from src/main/resources/l10n/Menu_nl.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_nl.properties diff --git a/src/main/resources/l10n/Menu_no.properties b/org.jabref.gui/src/main/resources/l10n/Menu_no.properties similarity index 100% rename from src/main/resources/l10n/Menu_no.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_no.properties diff --git a/src/main/resources/l10n/Menu_pt_BR.properties b/org.jabref.gui/src/main/resources/l10n/Menu_pt_BR.properties similarity index 100% rename from src/main/resources/l10n/Menu_pt_BR.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_pt_BR.properties diff --git a/src/main/resources/l10n/Menu_ru.properties b/org.jabref.gui/src/main/resources/l10n/Menu_ru.properties similarity index 100% rename from src/main/resources/l10n/Menu_ru.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_ru.properties diff --git a/src/main/resources/l10n/Menu_sv.properties b/org.jabref.gui/src/main/resources/l10n/Menu_sv.properties similarity index 100% rename from src/main/resources/l10n/Menu_sv.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_sv.properties diff --git a/src/main/resources/l10n/Menu_tr.properties b/org.jabref.gui/src/main/resources/l10n/Menu_tr.properties similarity index 100% rename from src/main/resources/l10n/Menu_tr.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_tr.properties diff --git a/src/main/resources/l10n/Menu_vi.properties b/org.jabref.gui/src/main/resources/l10n/Menu_vi.properties similarity index 100% rename from src/main/resources/l10n/Menu_vi.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_vi.properties diff --git a/src/main/resources/l10n/Menu_zh.properties b/org.jabref.gui/src/main/resources/l10n/Menu_zh.properties similarity index 100% rename from src/main/resources/l10n/Menu_zh.properties rename to org.jabref.gui/src/main/resources/l10n/Menu_zh.properties diff --git a/src/main/resources/log4j2.xml b/org.jabref.gui/src/main/resources/log4j2.xml similarity index 100% rename from src/main/resources/log4j2.xml rename to org.jabref.gui/src/main/resources/log4j2.xml diff --git a/src/main/resources/org/jabref/gui/copyfiles/CopyFilesDialog.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/copyfiles/CopyFilesDialog.fxml similarity index 100% rename from src/main/resources/org/jabref/gui/copyfiles/CopyFilesDialog.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/copyfiles/CopyFilesDialog.fxml diff --git a/src/main/resources/org/jabref/gui/help/AboutDialog.css b/org.jabref.gui/src/main/resources/org/jabref/gui/help/AboutDialog.css similarity index 100% rename from src/main/resources/org/jabref/gui/help/AboutDialog.css rename to org.jabref.gui/src/main/resources/org/jabref/gui/help/AboutDialog.css diff --git a/src/main/resources/org/jabref/gui/help/AboutDialog.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/help/AboutDialog.fxml similarity index 100% rename from src/main/resources/org/jabref/gui/help/AboutDialog.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/help/AboutDialog.fxml diff --git a/src/main/resources/org/jabref/gui/journals/ManageJournalAbbreviations.css b/org.jabref.gui/src/main/resources/org/jabref/gui/journals/ManageJournalAbbreviations.css similarity index 100% rename from src/main/resources/org/jabref/gui/journals/ManageJournalAbbreviations.css rename to org.jabref.gui/src/main/resources/org/jabref/gui/journals/ManageJournalAbbreviations.css diff --git a/src/main/resources/org/jabref/gui/journals/ManageJournalAbbreviations.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/journals/ManageJournalAbbreviations.fxml similarity index 100% rename from src/main/resources/org/jabref/gui/journals/ManageJournalAbbreviations.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/journals/ManageJournalAbbreviations.fxml diff --git a/src/main/resources/org/jabref/gui/keyboard/KeyBindingsDialog.css b/org.jabref.gui/src/main/resources/org/jabref/gui/keyboard/KeyBindingsDialog.css similarity index 100% rename from src/main/resources/org/jabref/gui/keyboard/KeyBindingsDialog.css rename to org.jabref.gui/src/main/resources/org/jabref/gui/keyboard/KeyBindingsDialog.css diff --git a/src/main/resources/org/jabref/gui/keyboard/KeyBindingsDialog.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/keyboard/KeyBindingsDialog.fxml similarity index 100% rename from src/main/resources/org/jabref/gui/keyboard/KeyBindingsDialog.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/keyboard/KeyBindingsDialog.fxml diff --git a/src/main/resources/protectedterms/countries_territories.terms b/org.jabref.gui/src/main/resources/protectedterms/countries_territories.terms similarity index 100% rename from src/main/resources/protectedterms/countries_territories.terms rename to org.jabref.gui/src/main/resources/protectedterms/countries_territories.terms diff --git a/src/main/resources/protectedterms/electrical_engineering.terms b/org.jabref.gui/src/main/resources/protectedterms/electrical_engineering.terms similarity index 100% rename from src/main/resources/protectedterms/electrical_engineering.terms rename to org.jabref.gui/src/main/resources/protectedterms/electrical_engineering.terms diff --git a/src/main/resources/protectedterms/months_weekdays.terms b/org.jabref.gui/src/main/resources/protectedterms/months_weekdays.terms similarity index 100% rename from src/main/resources/protectedterms/months_weekdays.terms rename to org.jabref.gui/src/main/resources/protectedterms/months_weekdays.terms diff --git a/src/main/resources/resource/layout/bibordf.article.layout b/org.jabref.gui/src/main/resources/resource/layout/bibordf.article.layout similarity index 100% rename from src/main/resources/resource/layout/bibordf.article.layout rename to org.jabref.gui/src/main/resources/resource/layout/bibordf.article.layout diff --git a/src/main/resources/resource/layout/bibordf.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/bibordf.begin.layout similarity index 100% rename from src/main/resources/resource/layout/bibordf.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/bibordf.begin.layout diff --git a/src/main/resources/resource/layout/bibordf.end.layout b/org.jabref.gui/src/main/resources/resource/layout/bibordf.end.layout similarity index 100% rename from src/main/resources/resource/layout/bibordf.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/bibordf.end.layout diff --git a/src/main/resources/resource/layout/bibordf.layout b/org.jabref.gui/src/main/resources/resource/layout/bibordf.layout similarity index 100% rename from src/main/resources/resource/layout/bibordf.layout rename to org.jabref.gui/src/main/resources/resource/layout/bibordf.layout diff --git a/src/main/resources/resource/layout/din1505/README.txt b/org.jabref.gui/src/main/resources/resource/layout/din1505/README.txt similarity index 100% rename from src/main/resources/resource/layout/din1505/README.txt rename to org.jabref.gui/src/main/resources/resource/layout/din1505/README.txt diff --git a/src/main/resources/resource/layout/din1505/din1505winword.article.layout b/org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.article.layout similarity index 100% rename from src/main/resources/resource/layout/din1505/din1505winword.article.layout rename to org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.article.layout diff --git a/src/main/resources/resource/layout/din1505/din1505winword.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.begin.layout similarity index 100% rename from src/main/resources/resource/layout/din1505/din1505winword.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.begin.layout diff --git a/src/main/resources/resource/layout/din1505/din1505winword.conference.layout b/org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.conference.layout similarity index 100% rename from src/main/resources/resource/layout/din1505/din1505winword.conference.layout rename to org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.conference.layout diff --git a/src/main/resources/resource/layout/din1505/din1505winword.end.layout b/org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.end.layout similarity index 100% rename from src/main/resources/resource/layout/din1505/din1505winword.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.end.layout diff --git a/src/main/resources/resource/layout/din1505/din1505winword.inproceedings.layout b/org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.inproceedings.layout similarity index 100% rename from src/main/resources/resource/layout/din1505/din1505winword.inproceedings.layout rename to org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.inproceedings.layout diff --git a/src/main/resources/resource/layout/din1505/din1505winword.layout b/org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.layout similarity index 100% rename from src/main/resources/resource/layout/din1505/din1505winword.layout rename to org.jabref.gui/src/main/resources/resource/layout/din1505/din1505winword.layout diff --git a/src/main/resources/resource/layout/docbook.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/docbook.begin.layout similarity index 100% rename from src/main/resources/resource/layout/docbook.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/docbook.begin.layout diff --git a/src/main/resources/resource/layout/docbook.end.layout b/org.jabref.gui/src/main/resources/resource/layout/docbook.end.layout similarity index 100% rename from src/main/resources/resource/layout/docbook.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/docbook.end.layout diff --git a/src/main/resources/resource/layout/docbook.layout b/org.jabref.gui/src/main/resources/resource/layout/docbook.layout similarity index 100% rename from src/main/resources/resource/layout/docbook.layout rename to org.jabref.gui/src/main/resources/resource/layout/docbook.layout diff --git a/src/main/resources/resource/layout/docbook.mastersthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/docbook.mastersthesis.layout similarity index 100% rename from src/main/resources/resource/layout/docbook.mastersthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/docbook.mastersthesis.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.article.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.article.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.article.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.article.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.book.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.book.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.book.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.book.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.booklet.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.booklet.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.booklet.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.booklet.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.inbook.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.inbook.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.inbook.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.inbook.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.incollection.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.incollection.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.incollection.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.incollection.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.inproceedings.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.inproceedings.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.inproceedings.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.inproceedings.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.manual.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.manual.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.manual.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.manual.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.mastersthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.mastersthesis.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.mastersthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.mastersthesis.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.misc.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.misc.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.misc.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.misc.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.other.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.other.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.other.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.other.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.phdthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.phdthesis.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.phdthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.phdthesis.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.proceedings.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.proceedings.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.proceedings.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.proceedings.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.techreport.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.techreport.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.techreport.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.techreport.layout diff --git a/src/main/resources/resource/layout/endnote/EndNote.unpublished.layout b/org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.unpublished.layout similarity index 100% rename from src/main/resources/resource/layout/endnote/EndNote.unpublished.layout rename to org.jabref.gui/src/main/resources/resource/layout/endnote/EndNote.unpublished.layout diff --git a/src/main/resources/resource/layout/endnote/Readme.txt b/org.jabref.gui/src/main/resources/resource/layout/endnote/Readme.txt similarity index 100% rename from src/main/resources/resource/layout/endnote/Readme.txt rename to org.jabref.gui/src/main/resources/resource/layout/endnote/Readme.txt diff --git a/src/main/resources/resource/layout/harvard/harvard.article.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.article.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.article.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.article.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.begin.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.begin.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.book.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.book.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.book.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.book.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.end.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.end.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.end.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.inbook.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.inbook.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.inbook.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.inbook.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.incollection.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.incollection.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.incollection.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.incollection.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.inproceedings.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.inproceedings.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.inproceedings.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.inproceedings.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.mastersthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.mastersthesis.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.mastersthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.mastersthesis.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.phdthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.phdthesis.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.phdthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.phdthesis.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.proceedings.layout b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.proceedings.layout similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.proceedings.layout rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.proceedings.layout diff --git a/src/main/resources/resource/layout/harvard/harvard.readme b/org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.readme similarity index 100% rename from src/main/resources/resource/layout/harvard/harvard.readme rename to org.jabref.gui/src/main/resources/resource/layout/harvard/harvard.readme diff --git a/src/main/resources/resource/layout/html.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/html.begin.layout similarity index 100% rename from src/main/resources/resource/layout/html.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/html.begin.layout diff --git a/src/main/resources/resource/layout/html.book.layout b/org.jabref.gui/src/main/resources/resource/layout/html.book.layout similarity index 100% rename from src/main/resources/resource/layout/html.book.layout rename to org.jabref.gui/src/main/resources/resource/layout/html.book.layout diff --git a/src/main/resources/resource/layout/html.end.layout b/org.jabref.gui/src/main/resources/resource/layout/html.end.layout similarity index 100% rename from src/main/resources/resource/layout/html.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/html.end.layout diff --git a/src/main/resources/resource/layout/html.inbook.layout b/org.jabref.gui/src/main/resources/resource/layout/html.inbook.layout similarity index 100% rename from src/main/resources/resource/layout/html.inbook.layout rename to org.jabref.gui/src/main/resources/resource/layout/html.inbook.layout diff --git a/src/main/resources/resource/layout/html.inproceedings.layout b/org.jabref.gui/src/main/resources/resource/layout/html.inproceedings.layout similarity index 100% rename from src/main/resources/resource/layout/html.inproceedings.layout rename to org.jabref.gui/src/main/resources/resource/layout/html.inproceedings.layout diff --git a/src/main/resources/resource/layout/html.layout b/org.jabref.gui/src/main/resources/resource/layout/html.layout similarity index 100% rename from src/main/resources/resource/layout/html.layout rename to org.jabref.gui/src/main/resources/resource/layout/html.layout diff --git a/src/main/resources/resource/layout/html.mastersthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/html.mastersthesis.layout similarity index 100% rename from src/main/resources/resource/layout/html.mastersthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/html.mastersthesis.layout diff --git a/src/main/resources/resource/layout/html.phdthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/html.phdthesis.layout similarity index 100% rename from src/main/resources/resource/layout/html.phdthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/html.phdthesis.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.article.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.article.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.article.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.article.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.begin.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.begin.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.book.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.book.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.book.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.book.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocs.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocs.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.edocs.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocs.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsarticle.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsarticle.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsarticle.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsarticle.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocscontribution.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocscontribution.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.edocscontribution.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocscontribution.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsnews.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsnews.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsnews.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsnews.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsperiodical.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsperiodical.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsperiodical.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.edocsperiodical.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.email.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.email.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.email.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.email.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.emaillist.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.emaillist.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.emaillist.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.emaillist.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.end.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.end.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.end.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.graphics.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.graphics.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.graphics.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.graphics.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.inbook.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.inbook.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.inbook.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.inbook.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.inedocs.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.inedocs.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.inedocs.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.inedocs.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.inproceedings.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.inproceedings.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.inproceedings.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.inproceedings.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.legislation.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.legislation.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.legislation.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.legislation.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.mastersthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.mastersthesis.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.mastersthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.mastersthesis.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.patent.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.patent.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.patent.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.patent.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.periodical.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.periodical.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.periodical.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.periodical.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.proceeding.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.proceeding.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.proceeding.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.proceeding.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.radiotv.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.radiotv.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.radiotv.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.radiotv.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.recording.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.recording.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.recording.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.recording.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.standard.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.standard.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.standard.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.standard.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.techreport.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.techreport.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.techreport.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.techreport.layout diff --git a/src/main/resources/resource/layout/iso690rtf/iso690RTF.unpublished.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.unpublished.layout similarity index 100% rename from src/main/resources/resource/layout/iso690rtf/iso690RTF.unpublished.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690rtf/iso690RTF.unpublished.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.article.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.article.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.article.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.article.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.book.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.book.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.book.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.book.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.edocs.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.edocs.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.edocs.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.edocs.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.edocsarticle.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.edocsarticle.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.edocsarticle.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.edocsarticle.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.edocscontribution.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.edocscontribution.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.edocscontribution.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.edocscontribution.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.edocsnews.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.edocsnews.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.edocsnews.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.edocsnews.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.edocsperiodical.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.edocsperiodical.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.edocsperiodical.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.edocsperiodical.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.email.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.email.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.email.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.email.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.emaillist.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.emaillist.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.emaillist.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.emaillist.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.graphics.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.graphics.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.graphics.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.graphics.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.inbook.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.inbook.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.inbook.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.inbook.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.inedocs.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.inedocs.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.inedocs.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.inedocs.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.inproceedings.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.inproceedings.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.inproceedings.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.inproceedings.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.legislation.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.legislation.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.legislation.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.legislation.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.mastersthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.mastersthesis.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.mastersthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.mastersthesis.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.patent.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.patent.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.patent.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.patent.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.periodical.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.periodical.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.periodical.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.periodical.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.proceeding.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.proceeding.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.proceeding.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.proceeding.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.radiotv.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.radiotv.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.radiotv.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.radiotv.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.recording.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.recording.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.recording.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.recording.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.standard.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.standard.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.standard.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.standard.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.techreport.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.techreport.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.techreport.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.techreport.layout diff --git a/src/main/resources/resource/layout/iso690txt/iso690.unpublished.layout b/org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.unpublished.layout similarity index 100% rename from src/main/resources/resource/layout/iso690txt/iso690.unpublished.layout rename to org.jabref.gui/src/main/resources/resource/layout/iso690txt/iso690.unpublished.layout diff --git a/src/main/resources/resource/layout/listrefs/listrefs.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/listrefs/listrefs.begin.layout similarity index 100% rename from src/main/resources/resource/layout/listrefs/listrefs.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/listrefs/listrefs.begin.layout diff --git a/src/main/resources/resource/layout/listrefs/listrefs.end.layout b/org.jabref.gui/src/main/resources/resource/layout/listrefs/listrefs.end.layout similarity index 100% rename from src/main/resources/resource/layout/listrefs/listrefs.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/listrefs/listrefs.end.layout diff --git a/src/main/resources/resource/layout/listrefs/listrefs.layout b/org.jabref.gui/src/main/resources/resource/layout/listrefs/listrefs.layout similarity index 100% rename from src/main/resources/resource/layout/listrefs/listrefs.layout rename to org.jabref.gui/src/main/resources/resource/layout/listrefs/listrefs.layout diff --git a/src/main/resources/resource/layout/listrefs/listrefs.misc.layout b/org.jabref.gui/src/main/resources/resource/layout/listrefs/listrefs.misc.layout similarity index 100% rename from src/main/resources/resource/layout/listrefs/listrefs.misc.layout rename to org.jabref.gui/src/main/resources/resource/layout/listrefs/listrefs.misc.layout diff --git a/src/main/resources/resource/layout/misq/misq.article.layout b/org.jabref.gui/src/main/resources/resource/layout/misq/misq.article.layout similarity index 100% rename from src/main/resources/resource/layout/misq/misq.article.layout rename to org.jabref.gui/src/main/resources/resource/layout/misq/misq.article.layout diff --git a/src/main/resources/resource/layout/misq/misq.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/misq/misq.begin.layout similarity index 100% rename from src/main/resources/resource/layout/misq/misq.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/misq/misq.begin.layout diff --git a/src/main/resources/resource/layout/misq/misq.book.layout b/org.jabref.gui/src/main/resources/resource/layout/misq/misq.book.layout similarity index 100% rename from src/main/resources/resource/layout/misq/misq.book.layout rename to org.jabref.gui/src/main/resources/resource/layout/misq/misq.book.layout diff --git a/src/main/resources/resource/layout/misq/misq.end.layout b/org.jabref.gui/src/main/resources/resource/layout/misq/misq.end.layout similarity index 100% rename from src/main/resources/resource/layout/misq/misq.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/misq/misq.end.layout diff --git a/src/main/resources/resource/layout/misq/misq.layout b/org.jabref.gui/src/main/resources/resource/layout/misq/misq.layout similarity index 100% rename from src/main/resources/resource/layout/misq/misq.layout rename to org.jabref.gui/src/main/resources/resource/layout/misq/misq.layout diff --git a/src/main/resources/resource/layout/misq/readme.txt b/org.jabref.gui/src/main/resources/resource/layout/misq/readme.txt similarity index 100% rename from src/main/resources/resource/layout/misq/readme.txt rename to org.jabref.gui/src/main/resources/resource/layout/misq/readme.txt diff --git a/src/main/resources/resource/layout/openoffice/README b/org.jabref.gui/src/main/resources/resource/layout/openoffice/README similarity index 100% rename from src/main/resources/resource/layout/openoffice/README rename to org.jabref.gui/src/main/resources/resource/layout/openoffice/README diff --git a/src/main/resources/resource/layout/openoffice/openoffice-csv.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/openoffice/openoffice-csv.begin.layout similarity index 100% rename from src/main/resources/resource/layout/openoffice/openoffice-csv.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/openoffice/openoffice-csv.begin.layout diff --git a/src/main/resources/resource/layout/openoffice/openoffice-csv.layout b/org.jabref.gui/src/main/resources/resource/layout/openoffice/openoffice-csv.layout similarity index 100% rename from src/main/resources/resource/layout/openoffice/openoffice-csv.layout rename to org.jabref.gui/src/main/resources/resource/layout/openoffice/openoffice-csv.layout diff --git a/src/main/resources/resource/layout/ris/ris.article.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.article.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.article.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.article.layout diff --git a/src/main/resources/resource/layout/ris/ris.book.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.book.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.book.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.book.layout diff --git a/src/main/resources/resource/layout/ris/ris.conference.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.conference.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.conference.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.conference.layout diff --git a/src/main/resources/resource/layout/ris/ris.incollection.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.incollection.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.incollection.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.incollection.layout diff --git a/src/main/resources/resource/layout/ris/ris.inproceedings.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.inproceedings.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.inproceedings.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.inproceedings.layout diff --git a/src/main/resources/resource/layout/ris/ris.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.layout diff --git a/src/main/resources/resource/layout/ris/ris.mastersthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.mastersthesis.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.mastersthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.mastersthesis.layout diff --git a/src/main/resources/resource/layout/ris/ris.patent.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.patent.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.patent.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.patent.layout diff --git a/src/main/resources/resource/layout/ris/ris.phdthesis.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.phdthesis.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.phdthesis.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.phdthesis.layout diff --git a/src/main/resources/resource/layout/ris/ris.techreport.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.techreport.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.techreport.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.techreport.layout diff --git a/src/main/resources/resource/layout/ris/ris.unpublished.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.unpublished.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.unpublished.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.unpublished.layout diff --git a/src/main/resources/resource/layout/ris/ris.www.layout b/org.jabref.gui/src/main/resources/resource/layout/ris/ris.www.layout similarity index 100% rename from src/main/resources/resource/layout/ris/ris.www.layout rename to org.jabref.gui/src/main/resources/resource/layout/ris/ris.www.layout diff --git a/src/main/resources/resource/layout/simplehtml.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/simplehtml.begin.layout similarity index 100% rename from src/main/resources/resource/layout/simplehtml.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/simplehtml.begin.layout diff --git a/src/main/resources/resource/layout/simplehtml.end.layout b/org.jabref.gui/src/main/resources/resource/layout/simplehtml.end.layout similarity index 100% rename from src/main/resources/resource/layout/simplehtml.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/simplehtml.end.layout diff --git a/src/main/resources/resource/layout/simplehtml.layout b/org.jabref.gui/src/main/resources/resource/layout/simplehtml.layout similarity index 100% rename from src/main/resources/resource/layout/simplehtml.layout rename to org.jabref.gui/src/main/resources/resource/layout/simplehtml.layout diff --git a/src/main/resources/resource/layout/tablerefs/tablerefs.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/tablerefs/tablerefs.begin.layout similarity index 100% rename from src/main/resources/resource/layout/tablerefs/tablerefs.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/tablerefs/tablerefs.begin.layout diff --git a/src/main/resources/resource/layout/tablerefs/tablerefs.end.layout b/org.jabref.gui/src/main/resources/resource/layout/tablerefs/tablerefs.end.layout similarity index 100% rename from src/main/resources/resource/layout/tablerefs/tablerefs.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/tablerefs/tablerefs.end.layout diff --git a/src/main/resources/resource/layout/tablerefs/tablerefs.layout b/org.jabref.gui/src/main/resources/resource/layout/tablerefs/tablerefs.layout similarity index 100% rename from src/main/resources/resource/layout/tablerefs/tablerefs.layout rename to org.jabref.gui/src/main/resources/resource/layout/tablerefs/tablerefs.layout diff --git a/src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.begin.layout b/org.jabref.gui/src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.begin.layout similarity index 100% rename from src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.begin.layout rename to org.jabref.gui/src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.begin.layout diff --git a/src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.end.layout b/org.jabref.gui/src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.end.layout similarity index 100% rename from src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.end.layout rename to org.jabref.gui/src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.end.layout diff --git a/src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.layout b/org.jabref.gui/src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.layout similarity index 100% rename from src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.layout rename to org.jabref.gui/src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.layout diff --git a/src/main/resources/resource/layout/text.layout b/org.jabref.gui/src/main/resources/resource/layout/text.layout similarity index 100% rename from src/main/resources/resource/layout/text.layout rename to org.jabref.gui/src/main/resources/resource/layout/text.layout diff --git a/src/main/resources/resource/ods/manifest.xml b/org.jabref.gui/src/main/resources/resource/ods/manifest.xml similarity index 100% rename from src/main/resources/resource/ods/manifest.xml rename to org.jabref.gui/src/main/resources/resource/ods/manifest.xml diff --git a/src/main/resources/resource/ods/meta.xml b/org.jabref.gui/src/main/resources/resource/ods/meta.xml similarity index 100% rename from src/main/resources/resource/ods/meta.xml rename to org.jabref.gui/src/main/resources/resource/ods/meta.xml diff --git a/src/main/resources/resource/ods/settings.xml b/org.jabref.gui/src/main/resources/resource/ods/settings.xml similarity index 100% rename from src/main/resources/resource/ods/settings.xml rename to org.jabref.gui/src/main/resources/resource/ods/settings.xml diff --git a/src/main/resources/resource/openoffice/default_authoryear.jstyle b/org.jabref.gui/src/main/resources/resource/openoffice/default_authoryear.jstyle similarity index 100% rename from src/main/resources/resource/openoffice/default_authoryear.jstyle rename to org.jabref.gui/src/main/resources/resource/openoffice/default_authoryear.jstyle diff --git a/src/main/resources/resource/openoffice/default_numerical.jstyle b/org.jabref.gui/src/main/resources/resource/openoffice/default_numerical.jstyle similarity index 100% rename from src/main/resources/resource/openoffice/default_numerical.jstyle rename to org.jabref.gui/src/main/resources/resource/openoffice/default_numerical.jstyle diff --git a/src/main/resources/resource/openoffice/manifest.xml b/org.jabref.gui/src/main/resources/resource/openoffice/manifest.xml similarity index 100% rename from src/main/resources/resource/openoffice/manifest.xml rename to org.jabref.gui/src/main/resources/resource/openoffice/manifest.xml diff --git a/src/main/resources/resource/openoffice/meta.xml b/org.jabref.gui/src/main/resources/resource/openoffice/meta.xml similarity index 100% rename from src/main/resources/resource/openoffice/meta.xml rename to org.jabref.gui/src/main/resources/resource/openoffice/meta.xml diff --git a/src/main/resources/resource/openoffice/mimetype b/org.jabref.gui/src/main/resources/resource/openoffice/mimetype similarity index 100% rename from src/main/resources/resource/openoffice/mimetype rename to org.jabref.gui/src/main/resources/resource/openoffice/mimetype diff --git a/src/main/resources/xjc/bibtexml/bibtexml.xsd b/org.jabref.gui/src/main/resources/xjc/bibtexml/bibtexml.xsd similarity index 100% rename from src/main/resources/xjc/bibtexml/bibtexml.xsd rename to org.jabref.gui/src/main/resources/xjc/bibtexml/bibtexml.xsd diff --git a/src/main/resources/xjc/medline/bookdoc_160101.xsd b/org.jabref.gui/src/main/resources/xjc/medline/bookdoc_160101.xsd similarity index 100% rename from src/main/resources/xjc/medline/bookdoc_160101.xsd rename to org.jabref.gui/src/main/resources/xjc/medline/bookdoc_160101.xsd diff --git a/src/main/resources/xjc/medline/medline.xsd b/org.jabref.gui/src/main/resources/xjc/medline/medline.xsd similarity index 100% rename from src/main/resources/xjc/medline/medline.xsd rename to org.jabref.gui/src/main/resources/xjc/medline/medline.xsd diff --git a/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd b/org.jabref.gui/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd similarity index 100% rename from src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd rename to org.jabref.gui/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd diff --git a/src/main/resources/xjc/mods/mods-3-6.xsd b/org.jabref.gui/src/main/resources/xjc/mods/mods-3-6.xsd similarity index 100% rename from src/main/resources/xjc/mods/mods-3-6.xsd rename to org.jabref.gui/src/main/resources/xjc/mods/mods-3-6.xsd diff --git a/src/main/resources/xjc/mods/mods-binding.xjb b/org.jabref.gui/src/main/resources/xjc/mods/mods-binding.xjb similarity index 100% rename from src/main/resources/xjc/mods/mods-binding.xjb rename to org.jabref.gui/src/main/resources/xjc/mods/mods-binding.xjb diff --git a/src/test/java/org/jabref/BibtexTestData.java b/org.jabref.gui/src/test/java/org/jabref/BibtexTestData.java similarity index 100% rename from src/test/java/org/jabref/BibtexTestData.java rename to org.jabref.gui/src/test/java/org/jabref/BibtexTestData.java diff --git a/src/test/java/org/jabref/CatchExceptionsFromThread.java b/org.jabref.gui/src/test/java/org/jabref/CatchExceptionsFromThread.java similarity index 100% rename from src/test/java/org/jabref/CatchExceptionsFromThread.java rename to org.jabref.gui/src/test/java/org/jabref/CatchExceptionsFromThread.java diff --git a/src/test/java/org/jabref/CodeStyleTests.java b/org.jabref.gui/src/test/java/org/jabref/CodeStyleTests.java similarity index 100% rename from src/test/java/org/jabref/CodeStyleTests.java rename to org.jabref.gui/src/test/java/org/jabref/CodeStyleTests.java diff --git a/src/test/java/org/jabref/JabRefPreferencesTest.java b/org.jabref.gui/src/test/java/org/jabref/JabRefPreferencesTest.java similarity index 100% rename from src/test/java/org/jabref/JabRefPreferencesTest.java rename to org.jabref.gui/src/test/java/org/jabref/JabRefPreferencesTest.java diff --git a/src/test/java/org/jabref/SearchQueryHighlightListenerTest.java b/org.jabref.gui/src/test/java/org/jabref/SearchQueryHighlightListenerTest.java similarity index 100% rename from src/test/java/org/jabref/SearchQueryHighlightListenerTest.java rename to org.jabref.gui/src/test/java/org/jabref/SearchQueryHighlightListenerTest.java diff --git a/src/test/java/org/jabref/TestIconsProperties.java b/org.jabref.gui/src/test/java/org/jabref/TestIconsProperties.java similarity index 100% rename from src/test/java/org/jabref/TestIconsProperties.java rename to org.jabref.gui/src/test/java/org/jabref/TestIconsProperties.java diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTests.java b/org.jabref.gui/src/test/java/org/jabref/architecture/MainArchitectureTests.java similarity index 100% rename from src/test/java/org/jabref/architecture/MainArchitectureTests.java rename to org.jabref.gui/src/test/java/org/jabref/architecture/MainArchitectureTests.java diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java b/org.jabref.gui/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java similarity index 100% rename from src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java rename to org.jabref.gui/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java diff --git a/src/test/java/org/jabref/architecture/TestArchitectureTests.java b/org.jabref.gui/src/test/java/org/jabref/architecture/TestArchitectureTests.java similarity index 100% rename from src/test/java/org/jabref/architecture/TestArchitectureTests.java rename to org.jabref.gui/src/test/java/org/jabref/architecture/TestArchitectureTests.java diff --git a/src/test/java/org/jabref/cleanup/CleanupActionsListModelTest.java b/org.jabref.gui/src/test/java/org/jabref/cleanup/CleanupActionsListModelTest.java similarity index 100% rename from src/test/java/org/jabref/cleanup/CleanupActionsListModelTest.java rename to org.jabref.gui/src/test/java/org/jabref/cleanup/CleanupActionsListModelTest.java diff --git a/src/test/java/org/jabref/cli/AuxCommandLineTest.java b/org.jabref.gui/src/test/java/org/jabref/cli/AuxCommandLineTest.java similarity index 100% rename from src/test/java/org/jabref/cli/AuxCommandLineTest.java rename to org.jabref.gui/src/test/java/org/jabref/cli/AuxCommandLineTest.java diff --git a/src/test/java/org/jabref/cli/JabRefCLITest.java b/org.jabref.gui/src/test/java/org/jabref/cli/JabRefCLITest.java similarity index 100% rename from src/test/java/org/jabref/cli/JabRefCLITest.java rename to org.jabref.gui/src/test/java/org/jabref/cli/JabRefCLITest.java diff --git a/src/test/java/org/jabref/gui/AWTExceptionHandler.java b/org.jabref.gui/src/test/java/org/jabref/gui/AWTExceptionHandler.java similarity index 100% rename from src/test/java/org/jabref/gui/AWTExceptionHandler.java rename to org.jabref.gui/src/test/java/org/jabref/gui/AWTExceptionHandler.java diff --git a/src/test/java/org/jabref/gui/AbstractUITest.java b/org.jabref.gui/src/test/java/org/jabref/gui/AbstractUITest.java similarity index 100% rename from src/test/java/org/jabref/gui/AbstractUITest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/AbstractUITest.java diff --git a/src/test/java/org/jabref/gui/ClipBoardManagerTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/ClipBoardManagerTest.java similarity index 100% rename from src/test/java/org/jabref/gui/ClipBoardManagerTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/ClipBoardManagerTest.java diff --git a/src/test/java/org/jabref/gui/DialogTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/DialogTest.java similarity index 100% rename from src/test/java/org/jabref/gui/DialogTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/DialogTest.java diff --git a/src/test/java/org/jabref/gui/DialogTest2.java b/org.jabref.gui/src/test/java/org/jabref/gui/DialogTest2.java similarity index 100% rename from src/test/java/org/jabref/gui/DialogTest2.java rename to org.jabref.gui/src/test/java/org/jabref/gui/DialogTest2.java diff --git a/src/test/java/org/jabref/gui/EntryTableTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/EntryTableTest.java similarity index 100% rename from src/test/java/org/jabref/gui/EntryTableTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/EntryTableTest.java diff --git a/src/test/java/org/jabref/gui/GUITest.java b/org.jabref.gui/src/test/java/org/jabref/gui/GUITest.java similarity index 100% rename from src/test/java/org/jabref/gui/GUITest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/GUITest.java diff --git a/src/test/java/org/jabref/gui/IdFetcherDialogTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/IdFetcherDialogTest.java similarity index 100% rename from src/test/java/org/jabref/gui/IdFetcherDialogTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/IdFetcherDialogTest.java diff --git a/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java similarity index 100% rename from src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java diff --git a/src/test/java/org/jabref/gui/ParameterizedDialogTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/ParameterizedDialogTest.java similarity index 100% rename from src/test/java/org/jabref/gui/ParameterizedDialogTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/ParameterizedDialogTest.java diff --git a/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java similarity index 100% rename from src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java diff --git a/src/test/java/org/jabref/gui/UndoTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/UndoTest.java similarity index 100% rename from src/test/java/org/jabref/gui/UndoTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/UndoTest.java diff --git a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java similarity index 100% rename from src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java diff --git a/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java b/org.jabref.gui/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java similarity index 100% rename from src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java rename to org.jabref.gui/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java diff --git a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java similarity index 100% rename from src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java diff --git a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java similarity index 100% rename from src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java diff --git a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java similarity index 100% rename from src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java diff --git a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java similarity index 100% rename from src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java diff --git a/src/test/java/org/jabref/gui/entryeditor/EntryEditorTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/entryeditor/EntryEditorTest.java similarity index 100% rename from src/test/java/org/jabref/gui/entryeditor/EntryEditorTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/entryeditor/EntryEditorTest.java diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java similarity index 100% rename from src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java diff --git a/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypeTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypeTest.java similarity index 100% rename from src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypeTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypeTest.java diff --git a/src/test/java/org/jabref/gui/fieldeditors/HtmlTransferableTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/fieldeditors/HtmlTransferableTest.java similarity index 100% rename from src/test/java/org/jabref/gui/fieldeditors/HtmlTransferableTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/fieldeditors/HtmlTransferableTest.java diff --git a/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java similarity index 100% rename from src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java similarity index 100% rename from src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java diff --git a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java similarity index 100% rename from src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java diff --git a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java similarity index 100% rename from src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java diff --git a/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java similarity index 100% rename from src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java diff --git a/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java similarity index 100% rename from src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java diff --git a/src/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java diff --git a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelTest.java similarity index 100% rename from src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelTest.java diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java similarity index 100% rename from src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java diff --git a/src/test/java/org/jabref/gui/search/ContainsAndRegexBasedSearchRuleDescriberTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/search/ContainsAndRegexBasedSearchRuleDescriberTest.java similarity index 100% rename from src/test/java/org/jabref/gui/search/ContainsAndRegexBasedSearchRuleDescriberTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/search/ContainsAndRegexBasedSearchRuleDescriberTest.java diff --git a/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java similarity index 100% rename from src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java diff --git a/src/test/java/org/jabref/gui/search/SearchResultsTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/search/SearchResultsTest.java similarity index 100% rename from src/test/java/org/jabref/gui/search/SearchResultsTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/search/SearchResultsTest.java diff --git a/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java b/org.jabref.gui/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java similarity index 100% rename from src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java rename to org.jabref.gui/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java diff --git a/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java similarity index 100% rename from src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java diff --git a/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java similarity index 100% rename from src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java diff --git a/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java similarity index 100% rename from src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java diff --git a/src/test/java/org/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java similarity index 100% rename from src/test/java/org/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java diff --git a/src/test/java/org/jabref/logic/TypedBibEntryTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/TypedBibEntryTest.java similarity index 100% rename from src/test/java/org/jabref/logic/TypedBibEntryTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/TypedBibEntryTest.java diff --git a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java diff --git a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java similarity index 100% rename from src/test/java/org/jabref/logic/auxparser/AuxParserTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java diff --git a/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java diff --git a/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java diff --git a/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java diff --git a/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java diff --git a/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java diff --git a/src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java diff --git a/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bst/BibtexWidthTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java diff --git a/src/test/java/org/jabref/logic/bst/TestVM.java b/org.jabref.gui/src/test/java/org/jabref/logic/bst/TestVM.java similarity index 100% rename from src/test/java/org/jabref/logic/bst/TestVM.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bst/TestVM.java diff --git a/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java similarity index 100% rename from src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java diff --git a/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java diff --git a/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java similarity index 100% rename from src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java diff --git a/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java similarity index 100% rename from src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java diff --git a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java diff --git a/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java similarity index 100% rename from src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java diff --git a/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java similarity index 100% rename from src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java diff --git a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java similarity index 100% rename from src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java diff --git a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java similarity index 100% rename from src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java diff --git a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java similarity index 100% rename from src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java diff --git a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java similarity index 100% rename from src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java diff --git a/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java diff --git a/src/test/java/org/jabref/logic/exporter/ExporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/ExporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/ExporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/ExporterTest.java diff --git a/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java diff --git a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java diff --git a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java diff --git a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java diff --git a/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java similarity index 100% rename from src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java diff --git a/src/test/java/org/jabref/logic/formatter/FormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/FormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/FormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/FormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java diff --git a/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java diff --git a/src/test/java/org/jabref/logic/help/HelpFileTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/help/HelpFileTest.java similarity index 100% rename from src/test/java/org/jabref/logic/help/HelpFileTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/help/HelpFileTest.java diff --git a/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java diff --git a/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java diff --git a/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java diff --git a/src/test/java/org/jabref/logic/importer/ImportDataTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportDataTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/ImportDataTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportDataTest.java diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java diff --git a/src/test/java/org/jabref/logic/importer/ImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/ImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/ImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/WebFetchersTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/WebFetchersTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/WebFetchersTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GvkParserTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GvkParserTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/GvkParserTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GvkParserTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java diff --git a/src/test/java/org/jabref/logic/importer/fetcher/zbMATHTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/zbMATHTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fetcher/zbMATHTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/zbMATHTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestFiles.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTestFiles.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/RISImporterTestFiles.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTestFiles.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java diff --git a/src/test/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroupsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroupsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroupsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroupsTest.java diff --git a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java diff --git a/src/test/java/org/jabref/logic/importer/util/JSONEntryParserTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/util/JSONEntryParserTest.java similarity index 100% rename from src/test/java/org/jabref/logic/importer/util/JSONEntryParserTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/importer/util/JSONEntryParserTest.java diff --git a/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java diff --git a/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java similarity index 100% rename from src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java diff --git a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java diff --git a/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java similarity index 100% rename from src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationTest.java similarity index 100% rename from src/test/java/org/jabref/logic/journals/AbbreviationTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationTest.java diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/journals/AbbreviationsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java diff --git a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java similarity index 100% rename from src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java diff --git a/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java similarity index 100% rename from src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java diff --git a/src/test/java/org/jabref/logic/l10n/EncodingsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/EncodingsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/EncodingsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/EncodingsTest.java diff --git a/src/test/java/org/jabref/logic/l10n/LanguagesTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LanguagesTest.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/LanguagesTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/LanguagesTest.java diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTEst.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTEst.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/LocalizationBundleForTEst.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTEst.java diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/LocalizationEntry.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationParser.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/LocalizationParser.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationParser.java diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationTest.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/LocalizationTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationTest.java diff --git a/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java similarity index 100% rename from src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java diff --git a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/LayoutEntryTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java diff --git a/src/test/java/org/jabref/logic/layout/LayoutTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/LayoutTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/LayoutTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/LayoutTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/AuthorsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/DOICheckTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/DOIStripTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/DefaultTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DefaultTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/DefaultTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DefaultTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/FileLinkTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/FirstPageTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/IfPluralTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/LastPageTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/LastPageTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/LastPageTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/LastPageTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/OrdinalTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/ReplaceTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/RisMonthTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/WrapContentTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java diff --git a/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java diff --git a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java diff --git a/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java diff --git a/src/test/java/org/jabref/logic/net/URLDownloadTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/net/URLDownloadTest.java similarity index 100% rename from src/test/java/org/jabref/logic/net/URLDownloadTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/net/URLDownloadTest.java diff --git a/src/test/java/org/jabref/logic/net/URLUtilTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/net/URLUtilTest.java similarity index 100% rename from src/test/java/org/jabref/logic/net/URLUtilTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/net/URLUtilTest.java diff --git a/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java similarity index 100% rename from src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java diff --git a/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java similarity index 100% rename from src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java diff --git a/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java diff --git a/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java similarity index 100% rename from src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java diff --git a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java diff --git a/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java similarity index 100% rename from src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java similarity index 100% rename from src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java diff --git a/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java similarity index 100% rename from src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java diff --git a/src/test/java/org/jabref/logic/remote/RemoteTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/remote/RemoteTest.java similarity index 100% rename from src/test/java/org/jabref/logic/remote/RemoteTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/remote/RemoteTest.java diff --git a/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java similarity index 100% rename from src/test/java/org/jabref/logic/remote/RemoteUtilTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java diff --git a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java similarity index 100% rename from src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java diff --git a/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java similarity index 100% rename from src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java diff --git a/src/test/java/org/jabref/logic/search/SearchQueryTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/search/SearchQueryTest.java similarity index 100% rename from src/test/java/org/jabref/logic/search/SearchQueryTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/search/SearchQueryTest.java diff --git a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java similarity index 100% rename from src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java diff --git a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java diff --git a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java diff --git a/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java similarity index 100% rename from src/test/java/org/jabref/logic/shared/DBMSTypeTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java diff --git a/src/test/java/org/jabref/logic/shared/SynchronizationTestEventListener.java b/org.jabref.gui/src/test/java/org/jabref/logic/shared/SynchronizationTestEventListener.java similarity index 100% rename from src/test/java/org/jabref/logic/shared/SynchronizationTestEventListener.java rename to org.jabref.gui/src/test/java/org/jabref/logic/shared/SynchronizationTestEventListener.java diff --git a/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java b/org.jabref.gui/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java similarity index 100% rename from src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java rename to org.jabref.gui/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java diff --git a/src/test/java/org/jabref/logic/shared/TestConnector.java b/org.jabref.gui/src/test/java/org/jabref/logic/shared/TestConnector.java similarity index 100% rename from src/test/java/org/jabref/logic/shared/TestConnector.java rename to org.jabref.gui/src/test/java/org/jabref/logic/shared/TestConnector.java diff --git a/src/test/java/org/jabref/logic/shared/TestManager.java b/org.jabref.gui/src/test/java/org/jabref/logic/shared/TestManager.java similarity index 100% rename from src/test/java/org/jabref/logic/shared/TestManager.java rename to org.jabref.gui/src/test/java/org/jabref/logic/shared/TestManager.java diff --git a/src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java similarity index 100% rename from src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java diff --git a/src/test/java/org/jabref/logic/util/BracketedPatternTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/BracketedPatternTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/BracketedPatternTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/BracketedPatternTest.java diff --git a/src/test/java/org/jabref/logic/util/BuildInfoTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/BuildInfoTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/BuildInfoTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/BuildInfoTest.java diff --git a/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/DevelopmentStageTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java diff --git a/src/test/java/org/jabref/logic/util/FileTypeTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/FileTypeTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/FileTypeTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/FileTypeTest.java diff --git a/src/test/java/org/jabref/logic/util/JavaVersionTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/JavaVersionTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/JavaVersionTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/JavaVersionTest.java diff --git a/src/test/java/org/jabref/logic/util/UpdateFieldTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/UpdateFieldTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/UpdateFieldTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/UpdateFieldTest.java diff --git a/src/test/java/org/jabref/logic/util/VersionTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/VersionTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/VersionTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/VersionTest.java diff --git a/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java diff --git a/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/io/FileHistoryTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java diff --git a/src/test/java/org/jabref/logic/util/io/FileNameCleanerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileNameCleanerTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/io/FileNameCleanerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileNameCleanerTest.java diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileUtilTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/io/FileUtilTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileUtilTest.java diff --git a/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java similarity index 100% rename from src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java diff --git a/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java diff --git a/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java similarity index 100% rename from src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java diff --git a/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java similarity index 100% rename from src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java diff --git a/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java similarity index 100% rename from src/test/java/org/jabref/logic/xmp/XMPUtilTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java diff --git a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java b/org.jabref.gui/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java similarity index 100% rename from src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java rename to org.jabref.gui/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java diff --git a/src/test/java/org/jabref/model/BibDatabaseContextTest.java b/org.jabref.gui/src/test/java/org/jabref/model/BibDatabaseContextTest.java similarity index 100% rename from src/test/java/org/jabref/model/BibDatabaseContextTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/BibDatabaseContextTest.java diff --git a/src/test/java/org/jabref/model/EntryTypesTest.java b/org.jabref.gui/src/test/java/org/jabref/model/EntryTypesTest.java similarity index 100% rename from src/test/java/org/jabref/model/EntryTypesTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/EntryTypesTest.java diff --git a/src/test/java/org/jabref/model/TreeNodeTest.java b/org.jabref.gui/src/test/java/org/jabref/model/TreeNodeTest.java similarity index 100% rename from src/test/java/org/jabref/model/TreeNodeTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/TreeNodeTest.java diff --git a/src/test/java/org/jabref/model/TreeNodeTestData.java b/org.jabref.gui/src/test/java/org/jabref/model/TreeNodeTestData.java similarity index 100% rename from src/test/java/org/jabref/model/TreeNodeTestData.java rename to org.jabref.gui/src/test/java/org/jabref/model/TreeNodeTestData.java diff --git a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java b/org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java similarity index 100% rename from src/test/java/org/jabref/model/database/BibDatabaseContextTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java diff --git a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java b/org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java similarity index 100% rename from src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java diff --git a/src/test/java/org/jabref/model/database/BibDatabaseTest.java b/org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseTest.java similarity index 100% rename from src/test/java/org/jabref/model/database/BibDatabaseTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseTest.java diff --git a/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java b/org.jabref.gui/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java similarity index 100% rename from src/test/java/org/jabref/model/database/DuplicationCheckerTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java diff --git a/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java b/org.jabref.gui/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java similarity index 100% rename from src/test/java/org/jabref/model/database/KeyChangeListenerTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java diff --git a/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java b/org.jabref.gui/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java similarity index 100% rename from src/test/java/org/jabref/model/database/event/AutosaveEventTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java diff --git a/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/AuthorListParameterTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java diff --git a/src/test/java/org/jabref/model/entry/AuthorListTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorListTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/AuthorListTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorListTest.java diff --git a/src/test/java/org/jabref/model/entry/AuthorTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/AuthorTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorTest.java diff --git a/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java diff --git a/src/test/java/org/jabref/model/entry/BibEntryTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/BibEntryTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryTest.java diff --git a/src/test/java/org/jabref/model/entry/BibEntryTests.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryTests.java similarity index 100% rename from src/test/java/org/jabref/model/entry/BibEntryTests.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryTests.java diff --git a/src/test/java/org/jabref/model/entry/BibtexStringTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/BibtexStringTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/BibtexStringTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/BibtexStringTest.java diff --git a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java diff --git a/src/test/java/org/jabref/model/entry/DateTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/DateTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/DateTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/DateTest.java diff --git a/src/test/java/org/jabref/model/entry/EntryLinkListTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/EntryLinkListTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/EntryLinkListTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/EntryLinkListTest.java diff --git a/src/test/java/org/jabref/model/entry/FieldNameTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/FieldNameTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/FieldNameTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/FieldNameTest.java diff --git a/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java diff --git a/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/FileFieldWriterTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java diff --git a/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java diff --git a/src/test/java/org/jabref/model/entry/IdGeneratorTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/IdGeneratorTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/IdGeneratorTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/IdGeneratorTest.java diff --git a/src/test/java/org/jabref/model/entry/KeywordListTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/KeywordListTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/KeywordListTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/KeywordListTest.java diff --git a/src/test/java/org/jabref/model/entry/KeywordTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/KeywordTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/KeywordTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/KeywordTest.java diff --git a/src/test/java/org/jabref/model/entry/MonthTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/MonthTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/MonthTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/MonthTest.java diff --git a/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java diff --git a/src/test/java/org/jabref/model/entry/identifier/DOITest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/DOITest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/identifier/DOITest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/DOITest.java diff --git a/src/test/java/org/jabref/model/entry/identifier/EprintTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/EprintTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/identifier/EprintTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/EprintTest.java diff --git a/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/identifier/ISBNTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java diff --git a/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/identifier/ISSNTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java diff --git a/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java diff --git a/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java b/org.jabref.gui/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java similarity index 100% rename from src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java diff --git a/src/test/java/org/jabref/model/event/TestEventListener.java b/org.jabref.gui/src/test/java/org/jabref/model/event/TestEventListener.java similarity index 100% rename from src/test/java/org/jabref/model/event/TestEventListener.java rename to org.jabref.gui/src/test/java/org/jabref/model/event/TestEventListener.java diff --git a/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java b/org.jabref.gui/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java similarity index 100% rename from src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java diff --git a/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java b/org.jabref.gui/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java similarity index 100% rename from src/test/java/org/jabref/model/groups/ExplicitGroupTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java diff --git a/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java b/org.jabref.gui/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java similarity index 100% rename from src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java diff --git a/src/test/java/org/jabref/model/groups/SearchGroupTest.java b/org.jabref.gui/src/test/java/org/jabref/model/groups/SearchGroupTest.java similarity index 100% rename from src/test/java/org/jabref/model/groups/SearchGroupTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/groups/SearchGroupTest.java diff --git a/src/test/java/org/jabref/model/groups/TexGroupTest.java b/org.jabref.gui/src/test/java/org/jabref/model/groups/TexGroupTest.java similarity index 100% rename from src/test/java/org/jabref/model/groups/TexGroupTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/groups/TexGroupTest.java diff --git a/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java b/org.jabref.gui/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java similarity index 100% rename from src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java diff --git a/src/test/java/org/jabref/model/metadata/MetaDataTest.java b/org.jabref.gui/src/test/java/org/jabref/model/metadata/MetaDataTest.java similarity index 100% rename from src/test/java/org/jabref/model/metadata/MetaDataTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/metadata/MetaDataTest.java diff --git a/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java b/org.jabref.gui/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java similarity index 100% rename from src/test/java/org/jabref/model/pdf/FileAnnotationTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java diff --git a/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java b/org.jabref.gui/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java similarity index 100% rename from src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java diff --git a/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java b/org.jabref.gui/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java similarity index 100% rename from src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java diff --git a/src/test/java/org/jabref/model/search/rules/MockSearchMatcher.java b/org.jabref.gui/src/test/java/org/jabref/model/search/rules/MockSearchMatcher.java similarity index 100% rename from src/test/java/org/jabref/model/search/rules/MockSearchMatcher.java rename to org.jabref.gui/src/test/java/org/jabref/model/search/rules/MockSearchMatcher.java diff --git a/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java b/org.jabref.gui/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java similarity index 100% rename from src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java diff --git a/src/test/java/org/jabref/model/strings/StringUtilTest.java b/org.jabref.gui/src/test/java/org/jabref/model/strings/StringUtilTest.java similarity index 100% rename from src/test/java/org/jabref/model/strings/StringUtilTest.java rename to org.jabref.gui/src/test/java/org/jabref/model/strings/StringUtilTest.java diff --git a/src/test/java/org/jabref/performance/BibtexEntryGenerator.java b/org.jabref.gui/src/test/java/org/jabref/performance/BibtexEntryGenerator.java similarity index 100% rename from src/test/java/org/jabref/performance/BibtexEntryGenerator.java rename to org.jabref.gui/src/test/java/org/jabref/performance/BibtexEntryGenerator.java diff --git a/src/test/java/org/jabref/preferences/LastFocusedTabPreferencesTest.java b/org.jabref.gui/src/test/java/org/jabref/preferences/LastFocusedTabPreferencesTest.java similarity index 100% rename from src/test/java/org/jabref/preferences/LastFocusedTabPreferencesTest.java rename to org.jabref.gui/src/test/java/org/jabref/preferences/LastFocusedTabPreferencesTest.java diff --git a/src/test/java/org/jabref/support/CIServerCondition.java b/org.jabref.gui/src/test/java/org/jabref/support/CIServerCondition.java similarity index 100% rename from src/test/java/org/jabref/support/CIServerCondition.java rename to org.jabref.gui/src/test/java/org/jabref/support/CIServerCondition.java diff --git a/src/test/java/org/jabref/support/DisabledOnCIServer.java b/org.jabref.gui/src/test/java/org/jabref/support/DisabledOnCIServer.java similarity index 100% rename from src/test/java/org/jabref/support/DisabledOnCIServer.java rename to org.jabref.gui/src/test/java/org/jabref/support/DisabledOnCIServer.java diff --git a/src/test/java/org/jabref/testutils/TestUtils.java b/org.jabref.gui/src/test/java/org/jabref/testutils/TestUtils.java similarity index 100% rename from src/test/java/org/jabref/testutils/TestUtils.java rename to org.jabref.gui/src/test/java/org/jabref/testutils/TestUtils.java diff --git a/src/test/java/org/jabref/testutils/category/DatabaseTest.java b/org.jabref.gui/src/test/java/org/jabref/testutils/category/DatabaseTest.java similarity index 100% rename from src/test/java/org/jabref/testutils/category/DatabaseTest.java rename to org.jabref.gui/src/test/java/org/jabref/testutils/category/DatabaseTest.java diff --git a/src/test/java/org/jabref/testutils/category/FetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/testutils/category/FetcherTest.java similarity index 100% rename from src/test/java/org/jabref/testutils/category/FetcherTest.java rename to org.jabref.gui/src/test/java/org/jabref/testutils/category/FetcherTest.java diff --git a/src/test/java/org/jabref/testutils/category/GUITest.java b/org.jabref.gui/src/test/java/org/jabref/testutils/category/GUITest.java similarity index 100% rename from src/test/java/org/jabref/testutils/category/GUITest.java rename to org.jabref.gui/src/test/java/org/jabref/testutils/category/GUITest.java diff --git a/src/test/resources/log4j2.xml b/org.jabref.gui/src/test/resources/log4j2.xml similarity index 100% rename from src/test/resources/log4j2.xml rename to org.jabref.gui/src/test/resources/log4j2.xml diff --git a/src/test/resources/org/jabref/bibtexFiles/test.bib b/org.jabref.gui/src/test/resources/org/jabref/bibtexFiles/test.bib similarity index 100% rename from src/test/resources/org/jabref/bibtexFiles/test.bib rename to org.jabref.gui/src/test/resources/org/jabref/bibtexFiles/test.bib diff --git a/src/test/resources/org/jabref/cli/origin.bib b/org.jabref.gui/src/test/resources/org/jabref/cli/origin.bib similarity index 100% rename from src/test/resources/org/jabref/cli/origin.bib rename to org.jabref.gui/src/test/resources/org/jabref/cli/origin.bib diff --git a/src/test/resources/org/jabref/cli/paper.aux b/org.jabref.gui/src/test/resources/org/jabref/cli/paper.aux similarity index 100% rename from src/test/resources/org/jabref/cli/paper.aux rename to org.jabref.gui/src/test/resources/org/jabref/cli/paper.aux diff --git a/src/test/resources/org/jabref/customPreferences.xml b/org.jabref.gui/src/test/resources/org/jabref/customPreferences.xml similarity index 100% rename from src/test/resources/org/jabref/customPreferences.xml rename to org.jabref.gui/src/test/resources/org/jabref/customPreferences.xml diff --git a/src/test/resources/org/jabref/gui/importer/fetcher/oai2.xml b/org.jabref.gui/src/test/resources/org/jabref/gui/importer/fetcher/oai2.xml similarity index 100% rename from src/test/resources/org/jabref/gui/importer/fetcher/oai2.xml rename to org.jabref.gui/src/test/resources/org/jabref/gui/importer/fetcher/oai2.xml diff --git a/src/test/resources/org/jabref/gui/importer/fetcher/oai22.xml b/org.jabref.gui/src/test/resources/org/jabref/gui/importer/fetcher/oai22.xml similarity index 100% rename from src/test/resources/org/jabref/gui/importer/fetcher/oai22.xml rename to org.jabref.gui/src/test/resources/org/jabref/gui/importer/fetcher/oai22.xml diff --git a/src/test/resources/org/jabref/gui/importer/fetcher/oai23.xml b/org.jabref.gui/src/test/resources/org/jabref/gui/importer/fetcher/oai23.xml similarity index 100% rename from src/test/resources/org/jabref/gui/importer/fetcher/oai23.xml rename to org.jabref.gui/src/test/resources/org/jabref/gui/importer/fetcher/oai23.xml diff --git a/src/test/resources/org/jabref/logic/auxparser/badpaper.aux b/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/badpaper.aux similarity index 100% rename from src/test/resources/org/jabref/logic/auxparser/badpaper.aux rename to org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/badpaper.aux diff --git a/src/test/resources/org/jabref/logic/auxparser/config.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/config.bib similarity index 100% rename from src/test/resources/org/jabref/logic/auxparser/config.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/config.bib diff --git a/src/test/resources/org/jabref/logic/auxparser/crossref.aux b/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/crossref.aux similarity index 100% rename from src/test/resources/org/jabref/logic/auxparser/crossref.aux rename to org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/crossref.aux diff --git a/src/test/resources/org/jabref/logic/auxparser/nested.aux b/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/nested.aux similarity index 100% rename from src/test/resources/org/jabref/logic/auxparser/nested.aux rename to org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/nested.aux diff --git a/src/test/resources/org/jabref/logic/auxparser/origin.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/origin.bib similarity index 100% rename from src/test/resources/org/jabref/logic/auxparser/origin.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/origin.bib diff --git a/src/test/resources/org/jabref/logic/auxparser/paper.aux b/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/paper.aux similarity index 100% rename from src/test/resources/org/jabref/logic/auxparser/paper.aux rename to org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/paper.aux diff --git a/src/test/resources/org/jabref/logic/auxparser/result.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/result.bib similarity index 100% rename from src/test/resources/org/jabref/logic/auxparser/result.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/result.bib diff --git a/src/test/resources/org/jabref/logic/bst/abbrv.bst b/org.jabref.gui/src/test/resources/org/jabref/logic/bst/abbrv.bst similarity index 100% rename from src/test/resources/org/jabref/logic/bst/abbrv.bst rename to org.jabref.gui/src/test/resources/org/jabref/logic/bst/abbrv.bst diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.xml diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.xml diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.bib diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.bib diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.xml diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.bib diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.xml diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.bib diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.xml diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.bib diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibLCID.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLCID.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibLCID.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLCID.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibPatent.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibPatent.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibPatent.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibPatent.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibPatent.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibPatent.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibPatent.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibPatent.xml diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.bib similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.bib diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.xml similarity index 100% rename from src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.xml diff --git a/src/test/resources/org/jabref/logic/importer/encoding-header.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/encoding-header.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/encoding-header.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/encoding-header.bib diff --git a/src/test/resources/org/jabref/logic/importer/encodingWithoutNewline.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/encodingWithoutNewline.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/encodingWithoutNewline.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/encodingWithoutNewline.bib diff --git a/src/test/resources/org/jabref/logic/importer/fetcher/gvk_artificial_subtitle_test.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_artificial_subtitle_test.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fetcher/gvk_artificial_subtitle_test.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_artificial_subtitle_test.xml diff --git a/src/test/resources/org/jabref/logic/importer/fetcher/gvk_empty_result_because_of_bad_query.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_empty_result_because_of_bad_query.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fetcher/gvk_empty_result_because_of_bad_query.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_empty_result_because_of_bad_query.xml diff --git a/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.1.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.1.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.1.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.1.bib diff --git a/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.2.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.2.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.2.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.2.bib diff --git a/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.xml diff --git a/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.bib diff --git a/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/AutosavedSharedDatabase.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/AutosavedSharedDatabase.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/AutosavedSharedDatabase.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/AutosavedSharedDatabase.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib similarity index 95% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib index 515e1a1367b..b9f3c67b3ab 100644 --- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib +++ b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib @@ -1,9 +1,9 @@ -@article{Mustermann2016, - author = {Max Mustermann}, - journal = {Java Journal}, - keywords = {java}, - month = {February}, - pages = {2}, - title = {Java tricks}, - year = {2016} -} +@article{Mustermann2016, + author = {Max Mustermann}, + journal = {Java Journal}, + keywords = {java}, + month = {February}, + pages = {2}, + title = {Java tricks}, + year = {2016} +} diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib similarity index 87% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib index abc96e4f08b..5e40fa403f5 100644 --- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib +++ b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib @@ -1,3 +1,3 @@ -@misc{EmptyEntry, - -} +@misc{EmptyEntry, + +} diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestCorrupt.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestCorrupt.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestCorrupt.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestCorrupt.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibtexImporter.examples.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibtexImporter.examples.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/BibtexImporter.examples.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibtexImporter.examples.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/Empty.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Empty.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/Empty.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Empty.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/EmptyMsBib_Test.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/EmptyMsBib_Test.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/EmptyMsBib_Test.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/EmptyMsBib_Test.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.book.example.enw b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.book.example.enw similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/Endnote.book.example.enw rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.book.example.enw diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.entries.enw b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.entries.enw similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/Endnote.entries.enw rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.entries.enw diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.A.enw b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.A.enw similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.A.enw rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.A.enw diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.E.enw b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.E.enw similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.E.enw rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.E.enw diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.no_enw b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.no_enw similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.no_enw rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.no_enw diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/IEEEImport1.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IEEEImport1.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/IEEEImport1.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IEEEImport1.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest2.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest2.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest2.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest2.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTestFalse.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTestFalse.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTestFalse.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTestFalse.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest1.isi b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest1.isi similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest1.isi rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest1.isi diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest2.isi b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest2.isi similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest2.isi rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest2.isi diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestEmpty.isi b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestEmpty.isi similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestEmpty.isi rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestEmpty.isi diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestInspec.isi b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestInspec.isi similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestInspec.isi rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestInspec.isi diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestMedline.isi b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestMedline.isi similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestMedline.isi rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestMedline.isi diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestWOS.isi b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestWOS.isi similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestWOS.isi rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestWOS.isi diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.pdf b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.pdf similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.pdf rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.pdf diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.pdf b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.pdf similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.pdf rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.pdf diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMalformedEntry.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMalformedEntry.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMalformedEntry.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMalformedEntry.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInvalidFormat.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInvalidFormat.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInvalidFormat.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInvalidFormat.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultipleEntries.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultipleEntries.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultipleEntries.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultipleEntries.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.nbib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.nbib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.nbib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.nbib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest1.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest1.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest1.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest1.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest2Invalid.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest2Invalid.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest2Invalid.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest2Invalid.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest3.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest3.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest3.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest3.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest4.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest4.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest4.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest4.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest5.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest5.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest5.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest5.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest6.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest6.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest6.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest6.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest7.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest7.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest7.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest7.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib3.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib3.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib3.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib3.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib4.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib4.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib4.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib4.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib5.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib5.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib5.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib5.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib6.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib6.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib6.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib6.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib7.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib7.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib7.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib7.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterCorrupted.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterCorrupted.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterCorrupted.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterCorrupted.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib similarity index 96% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib index fcef995ec0f..9bd610a27ad 100644 --- a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib +++ b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib @@ -1,7 +1,7 @@ -@book{, - author = {Smith, Bob and Doe, Jan and Brown, Judy and Martin, Steve and Clark, Joe}, - publisher = {Test Publisher}, - title = {Testing Book Title}, - volume = {1}, - year = {2015} -} +@book{, + author = {Smith, Bob and Doe, Jan and Brown, Judy and Martin, Steve and Clark, Joe}, + publisher = {Test Publisher}, + title = {Testing Book Title}, + volume = {1}, + year = {2015} +} diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris similarity index 94% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris index 8ab75edbec0..41c642a802e 100644 --- a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris +++ b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris @@ -1,11 +1,11 @@ -TY - BOOK -AU - Smith, Bob -AU - Doe, Jan -AU - Brown, Judy -A2 - Martin, Steve -A2 - Clark, Joe -T1 - Testing Book Title -PB - Test Publisher -Y1 - 2015/october -VL - 1 -ER - +TY - BOOK +AU - Smith, Bob +AU - Doe, Jan +AU - Brown, Judy +A2 - Martin, Steve +A2 - Clark, Joe +T1 - Testing Book Title +PB - Test Publisher +Y1 - 2015/october +VL - 1 +ER - diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.ris b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.ris similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.ris rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.ris diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.bib diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.txt diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/annotated.pdf b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/annotated.pdf similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/annotated.pdf rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/annotated.pdf diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/empty.pdf b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/empty.pdf similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/empty.pdf rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/empty.pdf diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/emptyFile.xml b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/emptyFile.xml similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/emptyFile.xml rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/emptyFile.xml diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/encrypted.pdf b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/encrypted.pdf similarity index 100% rename from src/test/resources/org/jabref/logic/importer/fileformat/encrypted.pdf rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/encrypted.pdf diff --git a/src/test/resources/org/jabref/logic/importer/headerless.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/headerless.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/headerless.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/headerless.bib diff --git a/src/test/resources/org/jabref/logic/importer/jabref-header.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/jabref-header.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/jabref-header.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/jabref-header.bib diff --git a/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf similarity index 100% rename from src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf diff --git "a/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" "b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" similarity index 100% rename from "src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" rename to "org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" diff --git a/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf similarity index 100% rename from src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf diff --git a/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf similarity index 100% rename from src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf diff --git a/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf similarity index 100% rename from src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf diff --git a/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt similarity index 100% rename from src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt diff --git a/src/test/resources/org/jabref/logic/importer/wrong-header.bib b/org.jabref.gui/src/test/resources/org/jabref/logic/importer/wrong-header.bib similarity index 100% rename from src/test/resources/org/jabref/logic/importer/wrong-header.bib rename to org.jabref.gui/src/test/resources/org/jabref/logic/importer/wrong-header.bib diff --git a/src/test/resources/org/jabref/logic/net/empty.pdf b/org.jabref.gui/src/test/resources/org/jabref/logic/net/empty.pdf similarity index 100% rename from src/test/resources/org/jabref/logic/net/empty.pdf rename to org.jabref.gui/src/test/resources/org/jabref/logic/net/empty.pdf diff --git a/src/test/resources/org/jabref/logic/openoffice/test.jstyle b/org.jabref.gui/src/test/resources/org/jabref/logic/openoffice/test.jstyle similarity index 100% rename from src/test/resources/org/jabref/logic/openoffice/test.jstyle rename to org.jabref.gui/src/test/resources/org/jabref/logic/openoffice/test.jstyle diff --git a/src/test/resources/org/jabref/logic/protectedterms/namedterms.terms b/org.jabref.gui/src/test/resources/org/jabref/logic/protectedterms/namedterms.terms similarity index 100% rename from src/test/resources/org/jabref/logic/protectedterms/namedterms.terms rename to org.jabref.gui/src/test/resources/org/jabref/logic/protectedterms/namedterms.terms diff --git a/src/test/resources/org/jabref/logic/protectedterms/unnamedterms.terms b/org.jabref.gui/src/test/resources/org/jabref/logic/protectedterms/unnamedterms.terms similarity index 100% rename from src/test/resources/org/jabref/logic/protectedterms/unnamedterms.terms rename to org.jabref.gui/src/test/resources/org/jabref/logic/protectedterms/unnamedterms.terms diff --git a/src/test/resources/org/jabref/model/entry/entryWithMultilineAbstract.bib b/org.jabref.gui/src/test/resources/org/jabref/model/entry/entryWithMultilineAbstract.bib similarity index 100% rename from src/test/resources/org/jabref/model/entry/entryWithMultilineAbstract.bib rename to org.jabref.gui/src/test/resources/org/jabref/model/entry/entryWithMultilineAbstract.bib diff --git a/src/test/resources/org/jabref/util/build.properties b/org.jabref.gui/src/test/resources/org/jabref/util/build.properties similarity index 100% rename from src/test/resources/org/jabref/util/build.properties rename to org.jabref.gui/src/test/resources/org/jabref/util/build.properties diff --git a/src/test/resources/org/jabref/util/twente.bib b/org.jabref.gui/src/test/resources/org/jabref/util/twente.bib similarity index 100% rename from src/test/resources/org/jabref/util/twente.bib rename to org.jabref.gui/src/test/resources/org/jabref/util/twente.bib diff --git a/src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib b/org.jabref.gui/src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib similarity index 100% rename from src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib rename to org.jabref.gui/src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib diff --git a/src/test/resources/pdfs/encrypted.pdf b/org.jabref.gui/src/test/resources/pdfs/encrypted.pdf similarity index 100% rename from src/test/resources/pdfs/encrypted.pdf rename to org.jabref.gui/src/test/resources/pdfs/encrypted.pdf diff --git a/src/test/resources/pdfs/encrypted.txt b/org.jabref.gui/src/test/resources/pdfs/encrypted.txt similarity index 100% rename from src/test/resources/pdfs/encrypted.txt rename to org.jabref.gui/src/test/resources/pdfs/encrypted.txt diff --git a/src/test/resources/pdfs/minimal-foxithighlight.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal-foxithighlight.pdf similarity index 100% rename from src/test/resources/pdfs/minimal-foxithighlight.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal-foxithighlight.pdf diff --git a/src/test/resources/pdfs/minimal-foxitnote.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal-foxitnote.pdf similarity index 100% rename from src/test/resources/pdfs/minimal-foxitnote.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal-foxitnote.pdf diff --git a/src/test/resources/pdfs/minimal-highlight-no-note.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal-highlight-no-note.pdf similarity index 100% rename from src/test/resources/pdfs/minimal-highlight-no-note.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal-highlight-no-note.pdf diff --git a/src/test/resources/pdfs/minimal-highlight-with-note.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal-highlight-with-note.pdf similarity index 100% rename from src/test/resources/pdfs/minimal-highlight-with-note.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal-highlight-with-note.pdf diff --git a/src/test/resources/pdfs/minimal-inlinenote.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal-inlinenote.pdf similarity index 100% rename from src/test/resources/pdfs/minimal-inlinenote.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal-inlinenote.pdf diff --git a/src/test/resources/pdfs/minimal-polygon.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal-polygon.pdf similarity index 100% rename from src/test/resources/pdfs/minimal-polygon.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal-polygon.pdf diff --git a/src/test/resources/pdfs/minimal-popup.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal-popup.pdf similarity index 100% rename from src/test/resources/pdfs/minimal-popup.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal-popup.pdf diff --git a/src/test/resources/pdfs/minimal-squiggly.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal-squiggly.pdf similarity index 100% rename from src/test/resources/pdfs/minimal-squiggly.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal-squiggly.pdf diff --git a/src/test/resources/pdfs/minimal-strikeout.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal-strikeout.pdf similarity index 100% rename from src/test/resources/pdfs/minimal-strikeout.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal-strikeout.pdf diff --git a/src/test/resources/pdfs/minimal-underline.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal-underline.pdf similarity index 100% rename from src/test/resources/pdfs/minimal-underline.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal-underline.pdf diff --git a/src/test/resources/pdfs/minimal.pdf b/org.jabref.gui/src/test/resources/pdfs/minimal.pdf similarity index 100% rename from src/test/resources/pdfs/minimal.pdf rename to org.jabref.gui/src/test/resources/pdfs/minimal.pdf diff --git a/src/test/resources/pdfs/thesis-example.pdf b/org.jabref.gui/src/test/resources/pdfs/thesis-example.pdf similarity index 100% rename from src/test/resources/pdfs/thesis-example.pdf rename to org.jabref.gui/src/test/resources/pdfs/thesis-example.pdf diff --git a/src/test/resources/pdfs/write-protected.docx b/org.jabref.gui/src/test/resources/pdfs/write-protected.docx similarity index 100% rename from src/test/resources/pdfs/write-protected.docx rename to org.jabref.gui/src/test/resources/pdfs/write-protected.docx diff --git a/src/test/resources/pdfs/write-protected.pdf b/org.jabref.gui/src/test/resources/pdfs/write-protected.pdf similarity index 100% rename from src/test/resources/pdfs/write-protected.pdf rename to org.jabref.gui/src/test/resources/pdfs/write-protected.pdf diff --git a/src/test/resources/testbib/articleWithTitle.bib b/org.jabref.gui/src/test/resources/testbib/articleWithTitle.bib similarity index 100% rename from src/test/resources/testbib/articleWithTitle.bib rename to org.jabref.gui/src/test/resources/testbib/articleWithTitle.bib diff --git a/src/test/resources/testbib/articleWithTitleAndFile.bib b/org.jabref.gui/src/test/resources/testbib/articleWithTitleAndFile.bib similarity index 100% rename from src/test/resources/testbib/articleWithTitleAndFile.bib rename to org.jabref.gui/src/test/resources/testbib/articleWithTitleAndFile.bib diff --git a/src/test/resources/testbib/bibWithMixedContent.bib b/org.jabref.gui/src/test/resources/testbib/bibWithMixedContent.bib similarity index 100% rename from src/test/resources/testbib/bibWithMixedContent.bib rename to org.jabref.gui/src/test/resources/testbib/bibWithMixedContent.bib diff --git a/src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib b/org.jabref.gui/src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib similarity index 100% rename from src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib rename to org.jabref.gui/src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib diff --git a/src/test/resources/testbib/bibWithUserComments.bib b/org.jabref.gui/src/test/resources/testbib/bibWithUserComments.bib similarity index 100% rename from src/test/resources/testbib/bibWithUserComments.bib rename to org.jabref.gui/src/test/resources/testbib/bibWithUserComments.bib diff --git a/src/test/resources/testbib/bug1283.bib b/org.jabref.gui/src/test/resources/testbib/bug1283.bib similarity index 100% rename from src/test/resources/testbib/bug1283.bib rename to org.jabref.gui/src/test/resources/testbib/bug1283.bib diff --git a/src/test/resources/testbib/cleanup.bib b/org.jabref.gui/src/test/resources/testbib/cleanup.bib similarity index 100% rename from src/test/resources/testbib/cleanup.bib rename to org.jabref.gui/src/test/resources/testbib/cleanup.bib diff --git a/src/test/resources/testbib/complex.bib b/org.jabref.gui/src/test/resources/testbib/complex.bib similarity index 100% rename from src/test/resources/testbib/complex.bib rename to org.jabref.gui/src/test/resources/testbib/complex.bib diff --git a/src/test/resources/testbib/crossref.bib b/org.jabref.gui/src/test/resources/testbib/crossref.bib similarity index 100% rename from src/test/resources/testbib/crossref.bib rename to org.jabref.gui/src/test/resources/testbib/crossref.bib diff --git a/src/test/resources/testbib/issue_181_1.8.0_51-b16.bib b/org.jabref.gui/src/test/resources/testbib/issue_181_1.8.0_51-b16.bib similarity index 100% rename from src/test/resources/testbib/issue_181_1.8.0_51-b16.bib rename to org.jabref.gui/src/test/resources/testbib/issue_181_1.8.0_51-b16.bib diff --git a/src/test/resources/testbib/issue_181_1.8.0_60-b27.bib b/org.jabref.gui/src/test/resources/testbib/issue_181_1.8.0_60-b27.bib similarity index 100% rename from src/test/resources/testbib/issue_181_1.8.0_60-b27.bib rename to org.jabref.gui/src/test/resources/testbib/issue_181_1.8.0_60-b27.bib diff --git a/src/test/resources/testbib/jabref-authors.bib b/org.jabref.gui/src/test/resources/testbib/jabref-authors.bib similarity index 100% rename from src/test/resources/testbib/jabref-authors.bib rename to org.jabref.gui/src/test/resources/testbib/jabref-authors.bib diff --git a/src/test/resources/testbib/othertype.bib b/org.jabref.gui/src/test/resources/testbib/othertype.bib similarity index 100% rename from src/test/resources/testbib/othertype.bib rename to org.jabref.gui/src/test/resources/testbib/othertype.bib diff --git a/src/test/resources/testbib/pdf-field-upgrade.bib b/org.jabref.gui/src/test/resources/testbib/pdf-field-upgrade.bib similarity index 100% rename from src/test/resources/testbib/pdf-field-upgrade.bib rename to org.jabref.gui/src/test/resources/testbib/pdf-field-upgrade.bib diff --git a/src/test/resources/testbib/reallyunknowntype.bib b/org.jabref.gui/src/test/resources/testbib/reallyunknowntype.bib similarity index 100% rename from src/test/resources/testbib/reallyunknowntype.bib rename to org.jabref.gui/src/test/resources/testbib/reallyunknowntype.bib diff --git a/src/test/resources/testbib/save-actions.bib b/org.jabref.gui/src/test/resources/testbib/save-actions.bib similarity index 100% rename from src/test/resources/testbib/save-actions.bib rename to org.jabref.gui/src/test/resources/testbib/save-actions.bib diff --git a/src/test/resources/testbib/saveactions2.bib b/org.jabref.gui/src/test/resources/testbib/saveactions2.bib similarity index 100% rename from src/test/resources/testbib/saveactions2.bib rename to org.jabref.gui/src/test/resources/testbib/saveactions2.bib diff --git a/src/test/resources/testbib/special-fields.bib b/org.jabref.gui/src/test/resources/testbib/special-fields.bib similarity index 100% rename from src/test/resources/testbib/special-fields.bib rename to org.jabref.gui/src/test/resources/testbib/special-fields.bib diff --git a/src/test/resources/testbib/testdocument.tex b/org.jabref.gui/src/test/resources/testbib/testdocument.tex similarity index 100% rename from src/test/resources/testbib/testdocument.tex rename to org.jabref.gui/src/test/resources/testbib/testdocument.tex diff --git a/src/test/resources/testbib/testjabref.bib b/org.jabref.gui/src/test/resources/testbib/testjabref.bib similarity index 100% rename from src/test/resources/testbib/testjabref.bib rename to org.jabref.gui/src/test/resources/testbib/testjabref.bib diff --git a/src/test/resources/testbib/testjabref_210as292.bib b/org.jabref.gui/src/test/resources/testbib/testjabref_210as292.bib similarity index 100% rename from src/test/resources/testbib/testjabref_210as292.bib rename to org.jabref.gui/src/test/resources/testbib/testjabref_210as292.bib diff --git a/src/test/resources/testbib/testjabref_292.bib b/org.jabref.gui/src/test/resources/testbib/testjabref_292.bib similarity index 100% rename from src/test/resources/testbib/testjabref_292.bib rename to org.jabref.gui/src/test/resources/testbib/testjabref_292.bib diff --git a/src/test/resources/testbib/unknownMetaData.bib b/org.jabref.gui/src/test/resources/testbib/unknownMetaData.bib similarity index 100% rename from src/test/resources/testbib/unknownMetaData.bib rename to org.jabref.gui/src/test/resources/testbib/unknownMetaData.bib diff --git a/src/test/resources/testbib/utf8-bom.bib b/org.jabref.gui/src/test/resources/testbib/utf8-bom.bib similarity index 100% rename from src/test/resources/testbib/utf8-bom.bib rename to org.jabref.gui/src/test/resources/testbib/utf8-bom.bib diff --git a/xjc.gradle b/org.jabref.gui/xjc.gradle similarity index 94% rename from xjc.gradle rename to org.jabref.gui/xjc.gradle index 3285a93ba3e..638a075f617 100644 --- a/xjc.gradle +++ b/org.jabref.gui/xjc.gradle @@ -2,6 +2,13 @@ configurations { xjc } +buildscript { + repositories { + mavenLocal() + jcenter() + } +} + dependencies { // Cannot be updated. xjc 'com.sun.xml.bind:jaxb-xjc:2.2.4-1' diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle new file mode 100644 index 00000000000..3d03f1aefd5 --- /dev/null +++ b/org.jabref.model/build.gradle @@ -0,0 +1,361 @@ +import groovy.json.JsonSlurper +import org.gradle.internal.os.OperatingSystem + +plugins { + id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" + id "com.simonharrer.modernizer" version '1.5.0-1' + id 'me.champeau.gradle.jmh' version '0.4.3' + id 'net.ltgt.errorprone' version '0.0.13' + id 'com.github.ben-manes.versions' version '0.17.0' +} + +apply plugin: 'project-report' +apply plugin: 'jacoco' +apply plugin: 'me.champeau.gradle.jmh' +apply plugin: 'org.junit.platform.gradle.plugin' + +sourceSets { + main { + java { + srcDirs = ["src/main/java", "src/main/gen"] + } + + resources { + srcDirs = ["src/main/java", "src/main/resources"] + } + } +} + +configurations { + antlr3 + antlr4 +} + +dependencies { + // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 + compile 'org.apache.pdfbox:pdfbox:1.8.13' + compile 'org.apache.pdfbox:fontbox:1.8.13' + compile 'org.apache.pdfbox:jempbox:1.8.13' + + // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 + compile 'org.bouncycastle:bcprov-jdk15on:1.59' + + compile 'commons-cli:commons-cli:1.4' + + compile "org.libreoffice:juh:5.4.2" + compile "org.libreoffice:jurt:5.4.2" + compile "org.libreoffice:ridl:5.4.2" + compile "org.libreoffice:unoil:5.4.2" + + compile 'com.github.bkromhout:java-diff-utils:2.1.1' + compile 'info.debatty:java-string-similarity:1.0.1' + + antlr3 'org.antlr:antlr:3.5.2' + compile 'org.antlr:antlr-runtime:3.5.2' + + antlr4 'org.antlr:antlr4:4.7.1' + compile 'org.antlr:antlr4-runtime:4.7.1' + + // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release" + compile 'mysql:mysql-connector-java:5.1.45' + + compile 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1' + + compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1' + + compile 'com.google.guava:guava:24.0-jre' + + // JavaFX stuff + compile 'com.airhacks:afterburner.fx:1.7.0' + compile 'de.codecentric.centerdevice:javafxsvg:1.2.1' + compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' + compile 'de.saxsys:mvvmfx-validation:1.7.0' + compile 'org.fxmisc.easybind:easybind:1.0.3' + compile 'org.fxmisc.flowless:flowless:0.6' + compile 'org.fxmisc.richtext:richtextfx:0.8.2' + + // Cannot be updated to 9.*.* until Jabref works with Java 9 + compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT' + + compile 'org.jsoup:jsoup:1.11.2' + compile 'com.mashape.unirest:unirest-java:1.4.9' + + // >1.8.0-beta is required for java 9 compatibility + compile 'org.slf4j:slf4j-api:1.8.0-beta1' + compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' + compile 'org.apache.logging.log4j:log4j-jcl:2.10.0' + compile 'org.apache.logging.log4j:log4j-api:2.10.0' + compile 'org.apache.logging.log4j:log4j-core:2.10.0' + + // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles + compile 'org.citationstyles:styles:1.0.1-SNAPSHOT' + compile 'org.citationstyles:locales:1.0.1-SNAPSHOT' + compile 'de.undercouch:citeproc-java:1.0.1' + + compile 'com.github.tomtung:latex2unicode_2.12:0.2.2' + + compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9' + compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' + + testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' + testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' + testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' + testCompile 'org.junit.platform:junit-platform-launcher:1.1.0-M2' + testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' + testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' + testCompile 'org.mockito:mockito-core:2.13.0' + testCompile 'com.github.tomakehurst:wiremock:2.14.0' + testCompile 'org.assertj:assertj-swing-junit:3.8.0' + testCompile 'org.reflections:reflections:0.9.11' + testCompile 'org.xmlunit:xmlunit-core:2.5.1' + testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' + testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' + testCompile "org.testfx:testfx-core:4.0.+" + testCompile "org.testfx:testfx-junit:4.0.+" + + checkstyle 'com.puppycrawl.tools:checkstyle:8.8' +} + +dependencyUpdates { + outputFormatter = "json" +} + +// We have some dependencies which cannot be updated due to various reasons. +dependencyUpdates.resolutionStrategy = { + componentSelection { + withModule("org.controlsfx:controlsfx") { ComponentSelection selection -> + if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher + selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9") + } + } + withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> + if (selection.candidate.version.equals("1.0.10")) { + selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") + } + } + withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> + if (selection.candidate.version.equals("1.0.10")) { + selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") + } + } + withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> + if (selection.candidate.version.equals("2.0.0-BETA")) { + selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") + } + } + withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> + if (selection.candidate.version.equals("2.0.0-BETA")) { + selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") + } + } + withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("Cannot be upgraded to version 2") + } + } + withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") + } + } + withModule("org.apache.pdfbox:pdfbox") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") + } + } + withModule("mysql:mysql-connector-java") { ComponentSelection selection -> + if (selection.candidate.version ==~ /[6-9].*/) { + selection.reject("http://dev.mysql.com/downloads/connector/j/ lists the version 5.* as last stable version.") + } + } + + } +} + +task checkOutdatedDependencies(dependsOn: dependencyUpdates) { + doLast { + def dependencyReport = new JsonSlurper().parseText(new File("build/dependencyUpdates/report.json").text) + assert dependencyReport.outdated.count == 0: "There are outdated dependencies in build.gradle!\n Run ./gradlew dependencyUpdates to see which" + } +} + +clean { + delete "src/main/gen" +} + +task generateSource(dependsOn: ["generateBstGrammarSource", "generateSearchGrammarSource"]) { + group = 'JabRef' + description 'Generates all Java source files.' +} + +task generateBstGrammarSource(type: JavaExec) { + group 'JabRef' + description 'Generates BstLexer.java and BstParser.java from the Bst.g grammar file using antlr3.' + + File antlrSource = file('src/main/antlr3/org/jabref/bst/Bst.g') + + inputs.file antlrSource + outputs.file file('src/main/gen/org/jabref/logic/bst/BstLexer.java') + outputs.file file('src/main/gen/org/jabref/logic/bst/BstParser.java') + + main = 'org.antlr.Tool' + classpath = configurations.antlr3 + args = ["-o", file('src/main/gen/org/jabref/logic/bst/'), antlrSource] +} + +task generateSearchGrammarSource(type: JavaExec) { + String grammarFile = "Search" + + group 'JabRef' + description "Generates java files for ${grammarFile}.g antlr4." + + String packagePath = "org/jabref/search" + File antlrPath = file("src/main/antlr4") + File genPath = file("src/main/gen") + + File antlrSource = file("$antlrPath/$packagePath/${grammarFile}.g4") + File destinationDir = file("$genPath/$packagePath") + + inputs.file antlrSource + outputs.file file("$destinationDir/${grammarFile}Parser.java") + outputs.file file("$destinationDir/${grammarFile}Lexer.java") + outputs.file file("$destinationDir/${grammarFile}Visitor.java") + outputs.file file("$destinationDir/${grammarFile}BaseVisitor.java") + outputs.file file("$destinationDir/${grammarFile}.tokens") + outputs.file file("$destinationDir/${grammarFile}Lexer.tokens") + + main = 'org.antlr.v4.Tool' + classpath = configurations.antlr4 + args = ["-o", destinationDir, "-visitor", "-no-listener", "-package", "org.jabref.search", antlrSource] +} + +compileJava { + options.encoding = 'UTF-8' + options.compilerArgs << "-Xlint:none" +} +compileJava.dependsOn "generateSource" + +compileTestJava { + options.encoding = 'UTF-8' +} + +javadoc { + options { + encoding = 'UTF-8' + version = true + author = true + } +} + +// Test tasks +junitPlatform { + logManager 'org.apache.logging.log4j.jul.LogManager' +} + +// Test result tasks +task copyTestResources(type: Copy) { + from "${projectDir}/src/test/resources" + into "${buildDir}/classes/test" +} +processTestResources.dependsOn copyTestResources + +tasks.withType(Test) { + reports.html.destination = file("${reporting.baseDir}/${name}") + + jacoco { + append = true + } +} + +task jacocoMerge(type: JacocoMerge) { + executionData file("$buildDir/jacoco/junitPlatformTest.exec") + dependsOn junitPlatformTest +} + +jacocoTestReport { + executionData jacocoMerge.destinationFile + dependsOn jacocoMerge + + reports { + xml.enabled = true // coveralls plugin depends on xml format report + html.enabled = true + } +} + +afterEvaluate { + def junitPlatformTest = tasks.junitPlatformTest + + jacoco { + toolVersion = '0.8.0' + applyTo(junitPlatformTest) + } + + task jacocoJunit5TestReport(type: JacocoReport) { + executionData jacocoMerge.destinationFile + dependsOn jacocoMerge + sourceSets sourceSets.main + sourceDirectories = files(sourceSets.main.allSource.srcDirs) + classDirectories = files(sourceSets.main.output) + + reports { + xml.enabled true + html.enabled true + } + } +} + +// Code quality tasks +checkstyle { + // do not use other packages for checkstyle, excluding gen(erated) sources + checkstyleMain.source = "src/main/java" + toolVersion = '8.5' +} + +checkstyleMain.shouldRunAfter test +checkstyleTest.shouldRunAfter test + +modernizer { + // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. + // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer + failOnViolations = false +} + +/* + * Changes project.version to VERSION--snapshot--DATE--GIT_HASH + */ +if (hasProperty('dev')) { + String command = "git log --pretty=format:%cd--%h -n 1 --date=short" + String commitInfo = "" + if (OperatingSystem.current().isWindows()) { + commitInfo = "cmd /c $command".execute().in.text + } else { + commitInfo = command.execute().in.text + } + + // determine branch + command = "git symbolic-ref -q --short HEAD" + String branchName = "" + if (OperatingSystem.current().isWindows()) { + branchName = "cmd /c $command".execute().in.text + } else { + branchName = command.execute().in.text + } + // A newline is returned. Remove it. (trim()) + // In the context of github, the branch name could be something like "pull/277" + // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" + // http://stackoverflow.com/a/15075907/873282 describes the used pattern. + branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") + + // hack string + // first the date (%cd), then the branch name, and finally the commit id (%h) + String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) + + project.version += "--snapshot--" + infoString +} + +jmh { + warmupIterations = 5 + iterations = 10 + fork = 2 +} diff --git a/org.jabref.model/config/checkstyle/checkstyle.xml b/org.jabref.model/config/checkstyle/checkstyle.xml new file mode 100644 index 00000000000..20cbcee3f60 --- /dev/null +++ b/org.jabref.model/config/checkstyle/checkstyle.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.jabref.model/config/checkstyle/suppressions.xml b/org.jabref.model/config/checkstyle/suppressions.xml new file mode 100644 index 00000000000..7e853704d9d --- /dev/null +++ b/org.jabref.model/config/checkstyle/suppressions.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/org.jabref.model/settings.gradle b/org.jabref.model/settings.gradle new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/main/antlr3/org/jabref/bst/Bst.g b/org.jabref.model/src/main/antlr3/org/jabref/bst/Bst.g similarity index 100% rename from src/main/antlr3/org/jabref/bst/Bst.g rename to org.jabref.model/src/main/antlr3/org/jabref/bst/Bst.g diff --git a/src/main/antlr4/org/jabref/search/Search.g4 b/org.jabref.model/src/main/antlr4/org/jabref/search/Search.g4 similarity index 100% rename from src/main/antlr4/org/jabref/search/Search.g4 rename to org.jabref.model/src/main/antlr4/org/jabref/search/Search.g4 diff --git a/org.jabref.model/src/main/gen/org/jabref/logic/bst/Bst.tokens b/org.jabref.model/src/main/gen/org/jabref/logic/bst/Bst.tokens new file mode 100644 index 00000000000..b17e7fce7e6 --- /dev/null +++ b/org.jabref.model/src/main/gen/org/jabref/logic/bst/Bst.tokens @@ -0,0 +1,39 @@ +T__25=25 +T__26=26 +T__27=27 +T__28=28 +T__29=29 +T__30=30 +T__31=31 +T__32=32 +T__33=33 +COMMANDS=4 +ENTRY=5 +EXECUTE=6 +FUNCTION=7 +IDENTIFIER=8 +IDLIST=9 +INTEGER=10 +INTEGERS=11 +ITERATE=12 +LETTER=13 +LINE_COMMENT=14 +MACRO=15 +NUMERAL=16 +QUOTED=17 +READ=18 +REVERSE=19 +SORT=20 +STACK=21 +STRING=22 +STRINGS=23 +WS=24 +'*'=25 +'+'=26 +'-'=27 +':='=28 +'<'=29 +'='=30 +'>'=31 +'{'=32 +'}'=33 diff --git a/org.jabref.model/src/main/gen/org/jabref/logic/bst/BstLexer.java b/org.jabref.model/src/main/gen/org/jabref/logic/bst/BstLexer.java new file mode 100644 index 00000000000..9a4452f4822 --- /dev/null +++ b/org.jabref.model/src/main/gen/org/jabref/logic/bst/BstLexer.java @@ -0,0 +1,1151 @@ +// $ANTLR 3.5.2 C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g 2018-02-06 20:44:31 +// Generated by ANTLR +package org.jabref.logic.bst; + +import org.antlr.runtime.*; +import java.util.Stack; +import java.util.List; +import java.util.ArrayList; + +@SuppressWarnings("all") +public class BstLexer extends Lexer { + public static final int EOF=-1; + public static final int T__25=25; + public static final int T__26=26; + public static final int T__27=27; + public static final int T__28=28; + public static final int T__29=29; + public static final int T__30=30; + public static final int T__31=31; + public static final int T__32=32; + public static final int T__33=33; + public static final int COMMANDS=4; + public static final int ENTRY=5; + public static final int EXECUTE=6; + public static final int FUNCTION=7; + public static final int IDENTIFIER=8; + public static final int IDLIST=9; + public static final int INTEGER=10; + public static final int INTEGERS=11; + public static final int ITERATE=12; + public static final int LETTER=13; + public static final int LINE_COMMENT=14; + public static final int MACRO=15; + public static final int NUMERAL=16; + public static final int QUOTED=17; + public static final int READ=18; + public static final int REVERSE=19; + public static final int SORT=20; + public static final int STACK=21; + public static final int STRING=22; + public static final int STRINGS=23; + public static final int WS=24; + + // delegates + // delegators + public Lexer[] getDelegates() { + return new Lexer[] {}; + } + + public BstLexer() {} + public BstLexer(CharStream input) { + this(input, new RecognizerSharedState()); + } + public BstLexer(CharStream input, RecognizerSharedState state) { + super(input,state); + } + @Override public String getGrammarFileName() { return "C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g"; } + + // $ANTLR start "T__25" + public final void mT__25() throws RecognitionException { + try { + int _type = T__25; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:5:7: ( '*' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:5:9: '*' + { + match('*'); + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "T__25" + + // $ANTLR start "T__26" + public final void mT__26() throws RecognitionException { + try { + int _type = T__26; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:6:7: ( '+' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:6:9: '+' + { + match('+'); + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "T__26" + + // $ANTLR start "T__27" + public final void mT__27() throws RecognitionException { + try { + int _type = T__27; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:7:7: ( '-' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:7:9: '-' + { + match('-'); + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "T__27" + + // $ANTLR start "T__28" + public final void mT__28() throws RecognitionException { + try { + int _type = T__28; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:8:7: ( ':=' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:8:9: ':=' + { + match(":="); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "T__28" + + // $ANTLR start "T__29" + public final void mT__29() throws RecognitionException { + try { + int _type = T__29; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:9:7: ( '<' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:9:9: '<' + { + match('<'); + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "T__29" + + // $ANTLR start "T__30" + public final void mT__30() throws RecognitionException { + try { + int _type = T__30; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:10:7: ( '=' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:10:9: '=' + { + match('='); + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "T__30" + + // $ANTLR start "T__31" + public final void mT__31() throws RecognitionException { + try { + int _type = T__31; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:11:7: ( '>' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:11:9: '>' + { + match('>'); + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "T__31" + + // $ANTLR start "T__32" + public final void mT__32() throws RecognitionException { + try { + int _type = T__32; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:12:7: ( '{' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:12:9: '{' + { + match('{'); + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "T__32" + + // $ANTLR start "T__33" + public final void mT__33() throws RecognitionException { + try { + int _type = T__33; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:13:7: ( '}' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:13:9: '}' + { + match('}'); + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "T__33" + + // $ANTLR start "STRINGS" + public final void mSTRINGS() throws RecognitionException { + try { + int _type = STRINGS; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:61:9: ( 'STRINGS' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:61:11: 'STRINGS' + { + match("STRINGS"); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "STRINGS" + + // $ANTLR start "INTEGERS" + public final void mINTEGERS() throws RecognitionException { + try { + int _type = INTEGERS; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:62:10: ( 'INTEGERS' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:62:12: 'INTEGERS' + { + match("INTEGERS"); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "INTEGERS" + + // $ANTLR start "FUNCTION" + public final void mFUNCTION() throws RecognitionException { + try { + int _type = FUNCTION; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:63:10: ( 'FUNCTION' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:63:12: 'FUNCTION' + { + match("FUNCTION"); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "FUNCTION" + + // $ANTLR start "EXECUTE" + public final void mEXECUTE() throws RecognitionException { + try { + int _type = EXECUTE; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:64:9: ( 'EXECUTE' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:64:11: 'EXECUTE' + { + match("EXECUTE"); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "EXECUTE" + + // $ANTLR start "SORT" + public final void mSORT() throws RecognitionException { + try { + int _type = SORT; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:65:6: ( 'SORT' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:65:8: 'SORT' + { + match("SORT"); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "SORT" + + // $ANTLR start "ITERATE" + public final void mITERATE() throws RecognitionException { + try { + int _type = ITERATE; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:66:9: ( 'ITERATE' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:66:11: 'ITERATE' + { + match("ITERATE"); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "ITERATE" + + // $ANTLR start "REVERSE" + public final void mREVERSE() throws RecognitionException { + try { + int _type = REVERSE; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:67:9: ( 'REVERSE' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:67:11: 'REVERSE' + { + match("REVERSE"); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "REVERSE" + + // $ANTLR start "ENTRY" + public final void mENTRY() throws RecognitionException { + try { + int _type = ENTRY; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:68:7: ( 'ENTRY' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:68:9: 'ENTRY' + { + match("ENTRY"); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "ENTRY" + + // $ANTLR start "READ" + public final void mREAD() throws RecognitionException { + try { + int _type = READ; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:69:6: ( 'READ' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:69:8: 'READ' + { + match("READ"); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "READ" + + // $ANTLR start "MACRO" + public final void mMACRO() throws RecognitionException { + try { + int _type = MACRO; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:70:7: ( 'MACRO' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:70:9: 'MACRO' + { + match("MACRO"); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "MACRO" + + // $ANTLR start "QUOTED" + public final void mQUOTED() throws RecognitionException { + try { + int _type = QUOTED; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:73:2: ( '\\'' IDENTIFIER ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:73:4: '\\'' IDENTIFIER + { + match('\''); + mIDENTIFIER(); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "QUOTED" + + // $ANTLR start "IDENTIFIER" + public final void mIDENTIFIER() throws RecognitionException { + try { + int _type = IDENTIFIER; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:76:2: ( LETTER ( LETTER | NUMERAL )* ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:76:4: LETTER ( LETTER | NUMERAL )* + { + mLETTER(); + + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:76:11: ( LETTER | NUMERAL )* + loop1: + while (true) { + int alt1=2; + int LA1_0 = input.LA(1); + if ( (LA1_0=='$'||LA1_0=='.'||(LA1_0 >= '0' && LA1_0 <= '9')||(LA1_0 >= 'A' && LA1_0 <= 'Z')||(LA1_0 >= 'a' && LA1_0 <= 'z')) ) { + alt1=1; + } + + switch (alt1) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: + { + if ( input.LA(1)=='$'||input.LA(1)=='.'||(input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||(input.LA(1) >= 'a' && input.LA(1) <= 'z') ) { + input.consume(); + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse; + } + } + break; + + default : + break loop1; + } + } + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "IDENTIFIER" + + // $ANTLR start "LETTER" + public final void mLETTER() throws RecognitionException { + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:79:2: ( ( 'a' .. 'z' | 'A' .. 'Z' | '.' | '$' ) ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: + { + if ( input.LA(1)=='$'||input.LA(1)=='.'||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||(input.LA(1) >= 'a' && input.LA(1) <= 'z') ) { + input.consume(); + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse; + } + } + + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "LETTER" + + // $ANTLR start "STRING" + public final void mSTRING() throws RecognitionException { + try { + int _type = STRING; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:82:2: ( '\"' (~ ( '\"' ) )* '\"' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:82:4: '\"' (~ ( '\"' ) )* '\"' + { + match('\"'); + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:82:8: (~ ( '\"' ) )* + loop2: + while (true) { + int alt2=2; + int LA2_0 = input.LA(1); + if ( ((LA2_0 >= '\u0000' && LA2_0 <= '!')||(LA2_0 >= '#' && LA2_0 <= '\uFFFF')) ) { + alt2=1; + } + + switch (alt2) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: + { + if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '!')||(input.LA(1) >= '#' && input.LA(1) <= '\uFFFF') ) { + input.consume(); + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse; + } + } + break; + + default : + break loop2; + } + } + + match('\"'); + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "STRING" + + // $ANTLR start "INTEGER" + public final void mINTEGER() throws RecognitionException { + try { + int _type = INTEGER; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:85:2: ( '#' ( '+' | '-' )? ( NUMERAL )+ ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:85:4: '#' ( '+' | '-' )? ( NUMERAL )+ + { + match('#'); + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:85:8: ( '+' | '-' )? + int alt3=2; + int LA3_0 = input.LA(1); + if ( (LA3_0=='+'||LA3_0=='-') ) { + alt3=1; + } + switch (alt3) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: + { + if ( input.LA(1)=='+'||input.LA(1)=='-' ) { + input.consume(); + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse; + } + } + break; + + } + + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:85:19: ( NUMERAL )+ + int cnt4=0; + loop4: + while (true) { + int alt4=2; + int LA4_0 = input.LA(1); + if ( ((LA4_0 >= '0' && LA4_0 <= '9')) ) { + alt4=1; + } + + switch (alt4) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: + { + if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) { + input.consume(); + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse; + } + } + break; + + default : + if ( cnt4 >= 1 ) break loop4; + EarlyExitException eee = new EarlyExitException(4, input); + throw eee; + } + cnt4++; + } + + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "INTEGER" + + // $ANTLR start "NUMERAL" + public final void mNUMERAL() throws RecognitionException { + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:88:2: ( ( '0' .. '9' ) ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: + { + if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) { + input.consume(); + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse; + } + } + + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "NUMERAL" + + // $ANTLR start "WS" + public final void mWS() throws RecognitionException { + try { + int _type = WS; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:91:2: ( ( ' ' | '\\t' | '\\n' | '\\r' )+ ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:91:4: ( ' ' | '\\t' | '\\n' | '\\r' )+ + { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:91:4: ( ' ' | '\\t' | '\\n' | '\\r' )+ + int cnt5=0; + loop5: + while (true) { + int alt5=2; + int LA5_0 = input.LA(1); + if ( ((LA5_0 >= '\t' && LA5_0 <= '\n')||LA5_0=='\r'||LA5_0==' ') ) { + alt5=1; + } + + switch (alt5) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: + { + if ( (input.LA(1) >= '\t' && input.LA(1) <= '\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) { + input.consume(); + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse; + } + } + break; + + default : + if ( cnt5 >= 1 ) break loop5; + EarlyExitException eee = new EarlyExitException(5, input); + throw eee; + } + cnt5++; + } + + _channel=99; + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "WS" + + // $ANTLR start "LINE_COMMENT" + public final void mLINE_COMMENT() throws RecognitionException { + try { + int _type = LINE_COMMENT; + int _channel = DEFAULT_TOKEN_CHANNEL; + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:94:5: ( '%' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:94:7: '%' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' + { + match('%'); + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:94:11: (~ ( '\\n' | '\\r' ) )* + loop6: + while (true) { + int alt6=2; + int LA6_0 = input.LA(1); + if ( ((LA6_0 >= '\u0000' && LA6_0 <= '\t')||(LA6_0 >= '\u000B' && LA6_0 <= '\f')||(LA6_0 >= '\u000E' && LA6_0 <= '\uFFFF')) ) { + alt6=1; + } + + switch (alt6) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: + { + if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '\t')||(input.LA(1) >= '\u000B' && input.LA(1) <= '\f')||(input.LA(1) >= '\u000E' && input.LA(1) <= '\uFFFF') ) { + input.consume(); + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse; + } + } + break; + + default : + break loop6; + } + } + + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:94:25: ( '\\r' )? + int alt7=2; + int LA7_0 = input.LA(1); + if ( (LA7_0=='\r') ) { + alt7=1; + } + switch (alt7) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:94:25: '\\r' + { + match('\r'); + } + break; + + } + + match('\n'); + _channel=99; + } + + state.type = _type; + state.channel = _channel; + } + finally { + // do for sure before leaving + } + } + // $ANTLR end "LINE_COMMENT" + + @Override + public void mTokens() throws RecognitionException { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:8: ( T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | STRINGS | INTEGERS | FUNCTION | EXECUTE | SORT | ITERATE | REVERSE | ENTRY | READ | MACRO | QUOTED | IDENTIFIER | STRING | INTEGER | WS | LINE_COMMENT ) + int alt8=25; + alt8 = dfa8.predict(input); + switch (alt8) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:10: T__25 + { + mT__25(); + + } + break; + case 2 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:16: T__26 + { + mT__26(); + + } + break; + case 3 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:22: T__27 + { + mT__27(); + + } + break; + case 4 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:28: T__28 + { + mT__28(); + + } + break; + case 5 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:34: T__29 + { + mT__29(); + + } + break; + case 6 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:40: T__30 + { + mT__30(); + + } + break; + case 7 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:46: T__31 + { + mT__31(); + + } + break; + case 8 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:52: T__32 + { + mT__32(); + + } + break; + case 9 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:58: T__33 + { + mT__33(); + + } + break; + case 10 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:64: STRINGS + { + mSTRINGS(); + + } + break; + case 11 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:72: INTEGERS + { + mINTEGERS(); + + } + break; + case 12 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:81: FUNCTION + { + mFUNCTION(); + + } + break; + case 13 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:90: EXECUTE + { + mEXECUTE(); + + } + break; + case 14 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:98: SORT + { + mSORT(); + + } + break; + case 15 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:103: ITERATE + { + mITERATE(); + + } + break; + case 16 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:111: REVERSE + { + mREVERSE(); + + } + break; + case 17 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:119: ENTRY + { + mENTRY(); + + } + break; + case 18 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:125: READ + { + mREAD(); + + } + break; + case 19 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:130: MACRO + { + mMACRO(); + + } + break; + case 20 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:136: QUOTED + { + mQUOTED(); + + } + break; + case 21 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:143: IDENTIFIER + { + mIDENTIFIER(); + + } + break; + case 22 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:154: STRING + { + mSTRING(); + + } + break; + case 23 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:161: INTEGER + { + mINTEGER(); + + } + break; + case 24 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:169: WS + { + mWS(); + + } + break; + case 25 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:172: LINE_COMMENT + { + mLINE_COMMENT(); + + } + break; + + } + } + + + protected DFA8 dfa8 = new DFA8(this); + static final String DFA8_eotS = + "\12\uffff\6\21\6\uffff\24\21\1\64\6\21\1\73\2\21\1\uffff\4\21\1\102\1"+ + "\21\1\uffff\1\104\5\21\1\uffff\1\21\1\uffff\1\113\1\21\1\115\1\21\1\117"+ + "\1\120\1\uffff\1\121\1\uffff\1\122\4\uffff"; + static final String DFA8_eofS = + "\123\uffff"; + static final String DFA8_minS = + "\1\11\11\uffff\1\117\1\116\1\125\1\116\1\105\1\101\6\uffff\2\122\1\124"+ + "\1\105\1\116\1\105\1\124\1\101\1\103\1\111\1\124\1\105\1\122\2\103\1\122"+ + "\1\105\1\104\1\122\1\116\1\44\1\107\1\101\1\124\1\125\1\131\1\122\1\44"+ + "\1\117\1\107\1\uffff\1\105\1\124\1\111\1\124\1\44\1\123\1\uffff\1\44\1"+ + "\123\1\122\1\105\1\117\1\105\1\uffff\1\105\1\uffff\1\44\1\123\1\44\1\116"+ + "\2\44\1\uffff\1\44\1\uffff\1\44\4\uffff"; + static final String DFA8_maxS = + "\1\175\11\uffff\2\124\1\125\1\130\1\105\1\101\6\uffff\2\122\1\124\1\105"+ + "\1\116\1\105\1\124\1\126\1\103\1\111\1\124\1\105\1\122\2\103\1\122\1\105"+ + "\1\104\1\122\1\116\1\172\1\107\1\101\1\124\1\125\1\131\1\122\1\172\1\117"+ + "\1\107\1\uffff\1\105\1\124\1\111\1\124\1\172\1\123\1\uffff\1\172\1\123"+ + "\1\122\1\105\1\117\1\105\1\uffff\1\105\1\uffff\1\172\1\123\1\172\1\116"+ + "\2\172\1\uffff\1\172\1\uffff\1\172\4\uffff"; + static final String DFA8_acceptS = + "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\6\uffff\1\24\1\25\1\26"+ + "\1\27\1\30\1\31\36\uffff\1\16\6\uffff\1\22\6\uffff\1\21\1\uffff\1\23\6"+ + "\uffff\1\12\1\uffff\1\17\1\uffff\1\15\1\20\1\13\1\14"; + static final String DFA8_specialS = + "\123\uffff}>"; + static final String[] DFA8_transitionS = { + "\2\24\2\uffff\1\24\22\uffff\1\24\1\uffff\1\22\1\23\1\21\1\25\1\uffff"+ + "\1\20\2\uffff\1\1\1\2\1\uffff\1\3\1\21\13\uffff\1\4\1\uffff\1\5\1\6\1"+ + "\7\2\uffff\4\21\1\15\1\14\2\21\1\13\3\21\1\17\4\21\1\16\1\12\7\21\6\uffff"+ + "\32\21\1\10\1\uffff\1\11", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "\1\27\4\uffff\1\26", + "\1\30\5\uffff\1\31", + "\1\32", + "\1\34\11\uffff\1\33", + "\1\35", + "\1\36", + "", + "", + "", + "", + "", + "", + "\1\37", + "\1\40", + "\1\41", + "\1\42", + "\1\43", + "\1\44", + "\1\45", + "\1\47\24\uffff\1\46", + "\1\50", + "\1\51", + "\1\52", + "\1\53", + "\1\54", + "\1\55", + "\1\56", + "\1\57", + "\1\60", + "\1\61", + "\1\62", + "\1\63", + "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", + "\1\65", + "\1\66", + "\1\67", + "\1\70", + "\1\71", + "\1\72", + "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", + "\1\74", + "\1\75", + "", + "\1\76", + "\1\77", + "\1\100", + "\1\101", + "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", + "\1\103", + "", + "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", + "\1\105", + "\1\106", + "\1\107", + "\1\110", + "\1\111", + "", + "\1\112", + "", + "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", + "\1\114", + "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", + "\1\116", + "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", + "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", + "", + "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", + "", + "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", + "", + "", + "", + "" + }; + + static final short[] DFA8_eot = DFA.unpackEncodedString(DFA8_eotS); + static final short[] DFA8_eof = DFA.unpackEncodedString(DFA8_eofS); + static final char[] DFA8_min = DFA.unpackEncodedStringToUnsignedChars(DFA8_minS); + static final char[] DFA8_max = DFA.unpackEncodedStringToUnsignedChars(DFA8_maxS); + static final short[] DFA8_accept = DFA.unpackEncodedString(DFA8_acceptS); + static final short[] DFA8_special = DFA.unpackEncodedString(DFA8_specialS); + static final short[][] DFA8_transition; + + static { + int numStates = DFA8_transitionS.length; + DFA8_transition = new short[numStates][]; + for (int i=0; i", "", "", "", "COMMANDS", "ENTRY", "EXECUTE", + "FUNCTION", "IDENTIFIER", "IDLIST", "INTEGER", "INTEGERS", "ITERATE", + "LETTER", "LINE_COMMENT", "MACRO", "NUMERAL", "QUOTED", "READ", "REVERSE", + "SORT", "STACK", "STRING", "STRINGS", "WS", "'*'", "'+'", "'-'", "':='", + "'<'", "'='", "'>'", "'{'", "'}'" + }; + public static final int EOF=-1; + public static final int T__25=25; + public static final int T__26=26; + public static final int T__27=27; + public static final int T__28=28; + public static final int T__29=29; + public static final int T__30=30; + public static final int T__31=31; + public static final int T__32=32; + public static final int T__33=33; + public static final int COMMANDS=4; + public static final int ENTRY=5; + public static final int EXECUTE=6; + public static final int FUNCTION=7; + public static final int IDENTIFIER=8; + public static final int IDLIST=9; + public static final int INTEGER=10; + public static final int INTEGERS=11; + public static final int ITERATE=12; + public static final int LETTER=13; + public static final int LINE_COMMENT=14; + public static final int MACRO=15; + public static final int NUMERAL=16; + public static final int QUOTED=17; + public static final int READ=18; + public static final int REVERSE=19; + public static final int SORT=20; + public static final int STACK=21; + public static final int STRING=22; + public static final int STRINGS=23; + public static final int WS=24; + + // delegates + public Parser[] getDelegates() { + return new Parser[] {}; + } + + // delegators + + + public BstParser(TokenStream input) { + this(input, new RecognizerSharedState()); + } + public BstParser(TokenStream input, RecognizerSharedState state) { + super(input, state); + } + + protected TreeAdaptor adaptor = new CommonTreeAdaptor(); + + public void setTreeAdaptor(TreeAdaptor adaptor) { + this.adaptor = adaptor; + } + public TreeAdaptor getTreeAdaptor() { + return adaptor; + } + @Override public String[] getTokenNames() { return BstParser.tokenNames; } + @Override public String getGrammarFileName() { return "C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g"; } + + + public static class program_return extends ParserRuleReturnScope { + Object tree; + @Override + public Object getTree() { return tree; } + }; + + + // $ANTLR start "program" + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:1: program : ( commands )+ -> ^( COMMANDS ( commands )+ ) ; + public final BstParser.program_return program() throws RecognitionException { + BstParser.program_return retval = new BstParser.program_return(); + retval.start = input.LT(1); + + Object root_0 = null; + + ParserRuleReturnScope commands1 =null; + + RewriteRuleSubtreeStream stream_commands=new RewriteRuleSubtreeStream(adaptor,"rule commands"); + + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:9: ( ( commands )+ -> ^( COMMANDS ( commands )+ ) ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:11: ( commands )+ + { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:11: ( commands )+ + int cnt1=0; + loop1: + while (true) { + int alt1=2; + int LA1_0 = input.LA(1); + if ( ((LA1_0 >= ENTRY && LA1_0 <= FUNCTION)||(LA1_0 >= INTEGERS && LA1_0 <= ITERATE)||LA1_0==MACRO||(LA1_0 >= READ && LA1_0 <= SORT)||LA1_0==STRINGS) ) { + alt1=1; + } + + switch (alt1) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:11: commands + { + pushFollow(FOLLOW_commands_in_program62); + commands1=commands(); + state._fsp--; + + stream_commands.add(commands1.getTree()); + } + break; + + default : + if ( cnt1 >= 1 ) break loop1; + EarlyExitException eee = new EarlyExitException(1, input); + throw eee; + } + cnt1++; + } + + // AST REWRITE + // elements: commands + // token labels: + // rule labels: retval + // token list labels: + // rule list labels: + // wildcard labels: + retval.tree = root_0; + RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null); + + root_0 = (Object)adaptor.nil(); + // 22:21: -> ^( COMMANDS ( commands )+ ) + { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:24: ^( COMMANDS ( commands )+ ) + { + Object root_1 = (Object)adaptor.nil(); + root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COMMANDS, "COMMANDS"), root_1); + if ( !(stream_commands.hasNext()) ) { + throw new RewriteEarlyExitException(); + } + while ( stream_commands.hasNext() ) { + adaptor.addChild(root_1, stream_commands.nextTree()); + } + stream_commands.reset(); + + adaptor.addChild(root_0, root_1); + } + + } + + + retval.tree = root_0; + + } + + retval.stop = input.LT(-1); + + retval.tree = (Object)adaptor.rulePostProcessing(root_0); + adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); + } + finally { + // do for sure before leaving + } + return retval; + } + // $ANTLR end "program" + + + public static class commands_return extends ParserRuleReturnScope { + Object tree; + @Override + public Object getTree() { return tree; } + }; + + + // $ANTLR start "commands" + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:24:1: commands : ( STRINGS ^ idList | INTEGERS ^ idList | FUNCTION ^ id stack | MACRO ^ id '{' ! STRING '}' !| READ ^| EXECUTE ^ '{' ! function '}' !| ITERATE ^ '{' ! function '}' !| REVERSE ^ '{' ! function '}' !| ENTRY ^ idList0 idList0 idList0 | SORT ^); + public final BstParser.commands_return commands() throws RecognitionException { + BstParser.commands_return retval = new BstParser.commands_return(); + retval.start = input.LT(1); + + Object root_0 = null; + + Token STRINGS2=null; + Token INTEGERS4=null; + Token FUNCTION6=null; + Token MACRO9=null; + Token char_literal11=null; + Token STRING12=null; + Token char_literal13=null; + Token READ14=null; + Token EXECUTE15=null; + Token char_literal16=null; + Token char_literal18=null; + Token ITERATE19=null; + Token char_literal20=null; + Token char_literal22=null; + Token REVERSE23=null; + Token char_literal24=null; + Token char_literal26=null; + Token ENTRY27=null; + Token SORT31=null; + ParserRuleReturnScope idList3 =null; + ParserRuleReturnScope idList5 =null; + ParserRuleReturnScope id7 =null; + ParserRuleReturnScope stack8 =null; + ParserRuleReturnScope id10 =null; + ParserRuleReturnScope function17 =null; + ParserRuleReturnScope function21 =null; + ParserRuleReturnScope function25 =null; + ParserRuleReturnScope idList028 =null; + ParserRuleReturnScope idList029 =null; + ParserRuleReturnScope idList030 =null; + + Object STRINGS2_tree=null; + Object INTEGERS4_tree=null; + Object FUNCTION6_tree=null; + Object MACRO9_tree=null; + Object char_literal11_tree=null; + Object STRING12_tree=null; + Object char_literal13_tree=null; + Object READ14_tree=null; + Object EXECUTE15_tree=null; + Object char_literal16_tree=null; + Object char_literal18_tree=null; + Object ITERATE19_tree=null; + Object char_literal20_tree=null; + Object char_literal22_tree=null; + Object REVERSE23_tree=null; + Object char_literal24_tree=null; + Object char_literal26_tree=null; + Object ENTRY27_tree=null; + Object SORT31_tree=null; + + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:25:2: ( STRINGS ^ idList | INTEGERS ^ idList | FUNCTION ^ id stack | MACRO ^ id '{' ! STRING '}' !| READ ^| EXECUTE ^ '{' ! function '}' !| ITERATE ^ '{' ! function '}' !| REVERSE ^ '{' ! function '}' !| ENTRY ^ idList0 idList0 idList0 | SORT ^) + int alt2=10; + switch ( input.LA(1) ) { + case STRINGS: + { + alt2=1; + } + break; + case INTEGERS: + { + alt2=2; + } + break; + case FUNCTION: + { + alt2=3; + } + break; + case MACRO: + { + alt2=4; + } + break; + case READ: + { + alt2=5; + } + break; + case EXECUTE: + { + alt2=6; + } + break; + case ITERATE: + { + alt2=7; + } + break; + case REVERSE: + { + alt2=8; + } + break; + case ENTRY: + { + alt2=9; + } + break; + case SORT: + { + alt2=10; + } + break; + default: + NoViableAltException nvae = + new NoViableAltException("", 2, 0, input); + throw nvae; + } + switch (alt2) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:25:4: STRINGS ^ idList + { + root_0 = (Object)adaptor.nil(); + + + STRINGS2=(Token)match(input,STRINGS,FOLLOW_STRINGS_in_commands81); + STRINGS2_tree = (Object)adaptor.create(STRINGS2); + root_0 = (Object)adaptor.becomeRoot(STRINGS2_tree, root_0); + + pushFollow(FOLLOW_idList_in_commands84); + idList3=idList(); + state._fsp--; + + adaptor.addChild(root_0, idList3.getTree()); + + } + break; + case 2 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:26:4: INTEGERS ^ idList + { + root_0 = (Object)adaptor.nil(); + + + INTEGERS4=(Token)match(input,INTEGERS,FOLLOW_INTEGERS_in_commands89); + INTEGERS4_tree = (Object)adaptor.create(INTEGERS4); + root_0 = (Object)adaptor.becomeRoot(INTEGERS4_tree, root_0); + + pushFollow(FOLLOW_idList_in_commands92); + idList5=idList(); + state._fsp--; + + adaptor.addChild(root_0, idList5.getTree()); + + } + break; + case 3 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:27:4: FUNCTION ^ id stack + { + root_0 = (Object)adaptor.nil(); + + + FUNCTION6=(Token)match(input,FUNCTION,FOLLOW_FUNCTION_in_commands97); + FUNCTION6_tree = (Object)adaptor.create(FUNCTION6); + root_0 = (Object)adaptor.becomeRoot(FUNCTION6_tree, root_0); + + pushFollow(FOLLOW_id_in_commands100); + id7=id(); + state._fsp--; + + adaptor.addChild(root_0, id7.getTree()); + + pushFollow(FOLLOW_stack_in_commands102); + stack8=stack(); + state._fsp--; + + adaptor.addChild(root_0, stack8.getTree()); + + } + break; + case 4 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:28:4: MACRO ^ id '{' ! STRING '}' ! + { + root_0 = (Object)adaptor.nil(); + + + MACRO9=(Token)match(input,MACRO,FOLLOW_MACRO_in_commands107); + MACRO9_tree = (Object)adaptor.create(MACRO9); + root_0 = (Object)adaptor.becomeRoot(MACRO9_tree, root_0); + + pushFollow(FOLLOW_id_in_commands110); + id10=id(); + state._fsp--; + + adaptor.addChild(root_0, id10.getTree()); + + char_literal11=(Token)match(input,32,FOLLOW_32_in_commands112); + STRING12=(Token)match(input,STRING,FOLLOW_STRING_in_commands115); + STRING12_tree = (Object)adaptor.create(STRING12); + adaptor.addChild(root_0, STRING12_tree); + + char_literal13=(Token)match(input,33,FOLLOW_33_in_commands117); + } + break; + case 5 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:29:4: READ ^ + { + root_0 = (Object)adaptor.nil(); + + + READ14=(Token)match(input,READ,FOLLOW_READ_in_commands123); + READ14_tree = (Object)adaptor.create(READ14); + root_0 = (Object)adaptor.becomeRoot(READ14_tree, root_0); + + } + break; + case 6 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:30:4: EXECUTE ^ '{' ! function '}' ! + { + root_0 = (Object)adaptor.nil(); + + + EXECUTE15=(Token)match(input,EXECUTE,FOLLOW_EXECUTE_in_commands129); + EXECUTE15_tree = (Object)adaptor.create(EXECUTE15); + root_0 = (Object)adaptor.becomeRoot(EXECUTE15_tree, root_0); + + char_literal16=(Token)match(input,32,FOLLOW_32_in_commands132); + pushFollow(FOLLOW_function_in_commands135); + function17=function(); + state._fsp--; + + adaptor.addChild(root_0, function17.getTree()); + + char_literal18=(Token)match(input,33,FOLLOW_33_in_commands137); + } + break; + case 7 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:31:4: ITERATE ^ '{' ! function '}' ! + { + root_0 = (Object)adaptor.nil(); + + + ITERATE19=(Token)match(input,ITERATE,FOLLOW_ITERATE_in_commands143); + ITERATE19_tree = (Object)adaptor.create(ITERATE19); + root_0 = (Object)adaptor.becomeRoot(ITERATE19_tree, root_0); + + char_literal20=(Token)match(input,32,FOLLOW_32_in_commands146); + pushFollow(FOLLOW_function_in_commands149); + function21=function(); + state._fsp--; + + adaptor.addChild(root_0, function21.getTree()); + + char_literal22=(Token)match(input,33,FOLLOW_33_in_commands151); + } + break; + case 8 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:32:4: REVERSE ^ '{' ! function '}' ! + { + root_0 = (Object)adaptor.nil(); + + + REVERSE23=(Token)match(input,REVERSE,FOLLOW_REVERSE_in_commands157); + REVERSE23_tree = (Object)adaptor.create(REVERSE23); + root_0 = (Object)adaptor.becomeRoot(REVERSE23_tree, root_0); + + char_literal24=(Token)match(input,32,FOLLOW_32_in_commands160); + pushFollow(FOLLOW_function_in_commands163); + function25=function(); + state._fsp--; + + adaptor.addChild(root_0, function25.getTree()); + + char_literal26=(Token)match(input,33,FOLLOW_33_in_commands165); + } + break; + case 9 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:33:4: ENTRY ^ idList0 idList0 idList0 + { + root_0 = (Object)adaptor.nil(); + + + ENTRY27=(Token)match(input,ENTRY,FOLLOW_ENTRY_in_commands171); + ENTRY27_tree = (Object)adaptor.create(ENTRY27); + root_0 = (Object)adaptor.becomeRoot(ENTRY27_tree, root_0); + + pushFollow(FOLLOW_idList0_in_commands174); + idList028=idList0(); + state._fsp--; + + adaptor.addChild(root_0, idList028.getTree()); + + pushFollow(FOLLOW_idList0_in_commands176); + idList029=idList0(); + state._fsp--; + + adaptor.addChild(root_0, idList029.getTree()); + + pushFollow(FOLLOW_idList0_in_commands178); + idList030=idList0(); + state._fsp--; + + adaptor.addChild(root_0, idList030.getTree()); + + } + break; + case 10 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:34:4: SORT ^ + { + root_0 = (Object)adaptor.nil(); + + + SORT31=(Token)match(input,SORT,FOLLOW_SORT_in_commands183); + SORT31_tree = (Object)adaptor.create(SORT31); + root_0 = (Object)adaptor.becomeRoot(SORT31_tree, root_0); + + } + break; + + } + retval.stop = input.LT(-1); + + retval.tree = (Object)adaptor.rulePostProcessing(root_0); + adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); + } + finally { + // do for sure before leaving + } + return retval; + } + // $ANTLR end "commands" + + + public static class identifier_return extends ParserRuleReturnScope { + Object tree; + @Override + public Object getTree() { return tree; } + }; + + + // $ANTLR start "identifier" + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:36:1: identifier : IDENTIFIER ; + public final BstParser.identifier_return identifier() throws RecognitionException { + BstParser.identifier_return retval = new BstParser.identifier_return(); + retval.start = input.LT(1); + + Object root_0 = null; + + Token IDENTIFIER32=null; + + Object IDENTIFIER32_tree=null; + + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:37:2: ( IDENTIFIER ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:37:4: IDENTIFIER + { + root_0 = (Object)adaptor.nil(); + + + IDENTIFIER32=(Token)match(input,IDENTIFIER,FOLLOW_IDENTIFIER_in_identifier193); + IDENTIFIER32_tree = (Object)adaptor.create(IDENTIFIER32); + adaptor.addChild(root_0, IDENTIFIER32_tree); + + } + + retval.stop = input.LT(-1); + + retval.tree = (Object)adaptor.rulePostProcessing(root_0); + adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); + } + finally { + // do for sure before leaving + } + return retval; + } + // $ANTLR end "identifier" + + + public static class id_return extends ParserRuleReturnScope { + Object tree; + @Override + public Object getTree() { return tree; } + }; + + + // $ANTLR start "id" + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:39:1: id : '{' ! identifier '}' !; + public final BstParser.id_return id() throws RecognitionException { + BstParser.id_return retval = new BstParser.id_return(); + retval.start = input.LT(1); + + Object root_0 = null; + + Token char_literal33=null; + Token char_literal35=null; + ParserRuleReturnScope identifier34 =null; + + Object char_literal33_tree=null; + Object char_literal35_tree=null; + + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:40:2: ( '{' ! identifier '}' !) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:40:4: '{' ! identifier '}' ! + { + root_0 = (Object)adaptor.nil(); + + + char_literal33=(Token)match(input,32,FOLLOW_32_in_id202); + pushFollow(FOLLOW_identifier_in_id205); + identifier34=identifier(); + state._fsp--; + + adaptor.addChild(root_0, identifier34.getTree()); + + char_literal35=(Token)match(input,33,FOLLOW_33_in_id207); + } + + retval.stop = input.LT(-1); + + retval.tree = (Object)adaptor.rulePostProcessing(root_0); + adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); + } + finally { + // do for sure before leaving + } + return retval; + } + // $ANTLR end "id" + + + public static class idList_return extends ParserRuleReturnScope { + Object tree; + @Override + public Object getTree() { return tree; } + }; + + + // $ANTLR start "idList" + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:42:1: idList : '{' ( identifier )+ '}' -> ^( IDLIST ( identifier )+ ) ; + public final BstParser.idList_return idList() throws RecognitionException { + BstParser.idList_return retval = new BstParser.idList_return(); + retval.start = input.LT(1); + + Object root_0 = null; + + Token char_literal36=null; + Token char_literal38=null; + ParserRuleReturnScope identifier37 =null; + + Object char_literal36_tree=null; + Object char_literal38_tree=null; + RewriteRuleTokenStream stream_33=new RewriteRuleTokenStream(adaptor,"token 33"); + RewriteRuleTokenStream stream_32=new RewriteRuleTokenStream(adaptor,"token 32"); + RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier"); + + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:43:2: ( '{' ( identifier )+ '}' -> ^( IDLIST ( identifier )+ ) ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:43:4: '{' ( identifier )+ '}' + { + char_literal36=(Token)match(input,32,FOLLOW_32_in_idList217); + stream_32.add(char_literal36); + + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:43:8: ( identifier )+ + int cnt3=0; + loop3: + while (true) { + int alt3=2; + int LA3_0 = input.LA(1); + if ( (LA3_0==IDENTIFIER) ) { + alt3=1; + } + + switch (alt3) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:43:8: identifier + { + pushFollow(FOLLOW_identifier_in_idList219); + identifier37=identifier(); + state._fsp--; + + stream_identifier.add(identifier37.getTree()); + } + break; + + default : + if ( cnt3 >= 1 ) break loop3; + EarlyExitException eee = new EarlyExitException(3, input); + throw eee; + } + cnt3++; + } + + char_literal38=(Token)match(input,33,FOLLOW_33_in_idList222); + stream_33.add(char_literal38); + + // AST REWRITE + // elements: identifier + // token labels: + // rule labels: retval + // token list labels: + // rule list labels: + // wildcard labels: + retval.tree = root_0; + RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null); + + root_0 = (Object)adaptor.nil(); + // 43:24: -> ^( IDLIST ( identifier )+ ) + { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:43:27: ^( IDLIST ( identifier )+ ) + { + Object root_1 = (Object)adaptor.nil(); + root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(IDLIST, "IDLIST"), root_1); + if ( !(stream_identifier.hasNext()) ) { + throw new RewriteEarlyExitException(); + } + while ( stream_identifier.hasNext() ) { + adaptor.addChild(root_1, stream_identifier.nextTree()); + } + stream_identifier.reset(); + + adaptor.addChild(root_0, root_1); + } + + } + + + retval.tree = root_0; + + } + + retval.stop = input.LT(-1); + + retval.tree = (Object)adaptor.rulePostProcessing(root_0); + adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); + } + finally { + // do for sure before leaving + } + return retval; + } + // $ANTLR end "idList" + + + public static class idList0_return extends ParserRuleReturnScope { + Object tree; + @Override + public Object getTree() { return tree; } + }; + + + // $ANTLR start "idList0" + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:45:1: idList0 : '{' ( identifier )* '}' -> ^( IDLIST ( identifier )* ) ; + public final BstParser.idList0_return idList0() throws RecognitionException { + BstParser.idList0_return retval = new BstParser.idList0_return(); + retval.start = input.LT(1); + + Object root_0 = null; + + Token char_literal39=null; + Token char_literal41=null; + ParserRuleReturnScope identifier40 =null; + + Object char_literal39_tree=null; + Object char_literal41_tree=null; + RewriteRuleTokenStream stream_33=new RewriteRuleTokenStream(adaptor,"token 33"); + RewriteRuleTokenStream stream_32=new RewriteRuleTokenStream(adaptor,"token 32"); + RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier"); + + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:2: ( '{' ( identifier )* '}' -> ^( IDLIST ( identifier )* ) ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:4: '{' ( identifier )* '}' + { + char_literal39=(Token)match(input,32,FOLLOW_32_in_idList0240); + stream_32.add(char_literal39); + + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:8: ( identifier )* + loop4: + while (true) { + int alt4=2; + int LA4_0 = input.LA(1); + if ( (LA4_0==IDENTIFIER) ) { + alt4=1; + } + + switch (alt4) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:8: identifier + { + pushFollow(FOLLOW_identifier_in_idList0242); + identifier40=identifier(); + state._fsp--; + + stream_identifier.add(identifier40.getTree()); + } + break; + + default : + break loop4; + } + } + + char_literal41=(Token)match(input,33,FOLLOW_33_in_idList0245); + stream_33.add(char_literal41); + + // AST REWRITE + // elements: identifier + // token labels: + // rule labels: retval + // token list labels: + // rule list labels: + // wildcard labels: + retval.tree = root_0; + RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null); + + root_0 = (Object)adaptor.nil(); + // 46:24: -> ^( IDLIST ( identifier )* ) + { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:27: ^( IDLIST ( identifier )* ) + { + Object root_1 = (Object)adaptor.nil(); + root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(IDLIST, "IDLIST"), root_1); + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:36: ( identifier )* + while ( stream_identifier.hasNext() ) { + adaptor.addChild(root_1, stream_identifier.nextTree()); + } + stream_identifier.reset(); + + adaptor.addChild(root_0, root_1); + } + + } + + + retval.tree = root_0; + + } + + retval.stop = input.LT(-1); + + retval.tree = (Object)adaptor.rulePostProcessing(root_0); + adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); + } + finally { + // do for sure before leaving + } + return retval; + } + // $ANTLR end "idList0" + + + public static class function_return extends ParserRuleReturnScope { + Object tree; + @Override + public Object getTree() { return tree; } + }; + + + // $ANTLR start "function" + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:48:1: function : ( '<' | '>' | '=' | '+' | '-' | ':=' | '*' | identifier ); + public final BstParser.function_return function() throws RecognitionException { + BstParser.function_return retval = new BstParser.function_return(); + retval.start = input.LT(1); + + Object root_0 = null; + + Token char_literal42=null; + Token char_literal43=null; + Token char_literal44=null; + Token char_literal45=null; + Token char_literal46=null; + Token string_literal47=null; + Token char_literal48=null; + ParserRuleReturnScope identifier49 =null; + + Object char_literal42_tree=null; + Object char_literal43_tree=null; + Object char_literal44_tree=null; + Object char_literal45_tree=null; + Object char_literal46_tree=null; + Object string_literal47_tree=null; + Object char_literal48_tree=null; + + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:2: ( '<' | '>' | '=' | '+' | '-' | ':=' | '*' | identifier ) + int alt5=8; + switch ( input.LA(1) ) { + case 29: + { + alt5=1; + } + break; + case 31: + { + alt5=2; + } + break; + case 30: + { + alt5=3; + } + break; + case 26: + { + alt5=4; + } + break; + case 27: + { + alt5=5; + } + break; + case 28: + { + alt5=6; + } + break; + case 25: + { + alt5=7; + } + break; + case IDENTIFIER: + { + alt5=8; + } + break; + default: + NoViableAltException nvae = + new NoViableAltException("", 5, 0, input); + throw nvae; + } + switch (alt5) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:4: '<' + { + root_0 = (Object)adaptor.nil(); + + + char_literal42=(Token)match(input,29,FOLLOW_29_in_function263); + char_literal42_tree = (Object)adaptor.create(char_literal42); + adaptor.addChild(root_0, char_literal42_tree); + + } + break; + case 2 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:10: '>' + { + root_0 = (Object)adaptor.nil(); + + + char_literal43=(Token)match(input,31,FOLLOW_31_in_function267); + char_literal43_tree = (Object)adaptor.create(char_literal43); + adaptor.addChild(root_0, char_literal43_tree); + + } + break; + case 3 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:16: '=' + { + root_0 = (Object)adaptor.nil(); + + + char_literal44=(Token)match(input,30,FOLLOW_30_in_function271); + char_literal44_tree = (Object)adaptor.create(char_literal44); + adaptor.addChild(root_0, char_literal44_tree); + + } + break; + case 4 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:22: '+' + { + root_0 = (Object)adaptor.nil(); + + + char_literal45=(Token)match(input,26,FOLLOW_26_in_function275); + char_literal45_tree = (Object)adaptor.create(char_literal45); + adaptor.addChild(root_0, char_literal45_tree); + + } + break; + case 5 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:28: '-' + { + root_0 = (Object)adaptor.nil(); + + + char_literal46=(Token)match(input,27,FOLLOW_27_in_function279); + char_literal46_tree = (Object)adaptor.create(char_literal46); + adaptor.addChild(root_0, char_literal46_tree); + + } + break; + case 6 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:34: ':=' + { + root_0 = (Object)adaptor.nil(); + + + string_literal47=(Token)match(input,28,FOLLOW_28_in_function283); + string_literal47_tree = (Object)adaptor.create(string_literal47); + adaptor.addChild(root_0, string_literal47_tree); + + } + break; + case 7 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:41: '*' + { + root_0 = (Object)adaptor.nil(); + + + char_literal48=(Token)match(input,25,FOLLOW_25_in_function287); + char_literal48_tree = (Object)adaptor.create(char_literal48); + adaptor.addChild(root_0, char_literal48_tree); + + } + break; + case 8 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:47: identifier + { + root_0 = (Object)adaptor.nil(); + + + pushFollow(FOLLOW_identifier_in_function291); + identifier49=identifier(); + state._fsp--; + + adaptor.addChild(root_0, identifier49.getTree()); + + } + break; + + } + retval.stop = input.LT(-1); + + retval.tree = (Object)adaptor.rulePostProcessing(root_0); + adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); + } + finally { + // do for sure before leaving + } + return retval; + } + // $ANTLR end "function" + + + public static class stack_return extends ParserRuleReturnScope { + Object tree; + @Override + public Object getTree() { return tree; } + }; + + + // $ANTLR start "stack" + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:51:1: stack : '{' ( stackitem )+ '}' -> ^( STACK ( stackitem )+ ) ; + public final BstParser.stack_return stack() throws RecognitionException { + BstParser.stack_return retval = new BstParser.stack_return(); + retval.start = input.LT(1); + + Object root_0 = null; + + Token char_literal50=null; + Token char_literal52=null; + ParserRuleReturnScope stackitem51 =null; + + Object char_literal50_tree=null; + Object char_literal52_tree=null; + RewriteRuleTokenStream stream_33=new RewriteRuleTokenStream(adaptor,"token 33"); + RewriteRuleTokenStream stream_32=new RewriteRuleTokenStream(adaptor,"token 32"); + RewriteRuleSubtreeStream stream_stackitem=new RewriteRuleSubtreeStream(adaptor,"rule stackitem"); + + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:52:2: ( '{' ( stackitem )+ '}' -> ^( STACK ( stackitem )+ ) ) + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:52:4: '{' ( stackitem )+ '}' + { + char_literal50=(Token)match(input,32,FOLLOW_32_in_stack300); + stream_32.add(char_literal50); + + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:52:8: ( stackitem )+ + int cnt6=0; + loop6: + while (true) { + int alt6=2; + int LA6_0 = input.LA(1); + if ( (LA6_0==IDENTIFIER||LA6_0==INTEGER||LA6_0==QUOTED||LA6_0==STRING||(LA6_0 >= 25 && LA6_0 <= 32)) ) { + alt6=1; + } + + switch (alt6) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:52:8: stackitem + { + pushFollow(FOLLOW_stackitem_in_stack302); + stackitem51=stackitem(); + state._fsp--; + + stream_stackitem.add(stackitem51.getTree()); + } + break; + + default : + if ( cnt6 >= 1 ) break loop6; + EarlyExitException eee = new EarlyExitException(6, input); + throw eee; + } + cnt6++; + } + + char_literal52=(Token)match(input,33,FOLLOW_33_in_stack305); + stream_33.add(char_literal52); + + // AST REWRITE + // elements: stackitem + // token labels: + // rule labels: retval + // token list labels: + // rule list labels: + // wildcard labels: + retval.tree = root_0; + RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null); + + root_0 = (Object)adaptor.nil(); + // 52:23: -> ^( STACK ( stackitem )+ ) + { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:52:26: ^( STACK ( stackitem )+ ) + { + Object root_1 = (Object)adaptor.nil(); + root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(STACK, "STACK"), root_1); + if ( !(stream_stackitem.hasNext()) ) { + throw new RewriteEarlyExitException(); + } + while ( stream_stackitem.hasNext() ) { + adaptor.addChild(root_1, stream_stackitem.nextTree()); + } + stream_stackitem.reset(); + + adaptor.addChild(root_0, root_1); + } + + } + + + retval.tree = root_0; + + } + + retval.stop = input.LT(-1); + + retval.tree = (Object)adaptor.rulePostProcessing(root_0); + adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); + } + finally { + // do for sure before leaving + } + return retval; + } + // $ANTLR end "stack" + + + public static class stackitem_return extends ParserRuleReturnScope { + Object tree; + @Override + public Object getTree() { return tree; } + }; + + + // $ANTLR start "stackitem" + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:54:1: stackitem : ( function | STRING | INTEGER | QUOTED | stack ); + public final BstParser.stackitem_return stackitem() throws RecognitionException { + BstParser.stackitem_return retval = new BstParser.stackitem_return(); + retval.start = input.LT(1); + + Object root_0 = null; + + Token STRING54=null; + Token INTEGER55=null; + Token QUOTED56=null; + ParserRuleReturnScope function53 =null; + ParserRuleReturnScope stack57 =null; + + Object STRING54_tree=null; + Object INTEGER55_tree=null; + Object QUOTED56_tree=null; + + try { + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:55:2: ( function | STRING | INTEGER | QUOTED | stack ) + int alt7=5; + switch ( input.LA(1) ) { + case IDENTIFIER: + case 25: + case 26: + case 27: + case 28: + case 29: + case 30: + case 31: + { + alt7=1; + } + break; + case STRING: + { + alt7=2; + } + break; + case INTEGER: + { + alt7=3; + } + break; + case QUOTED: + { + alt7=4; + } + break; + case 32: + { + alt7=5; + } + break; + default: + NoViableAltException nvae = + new NoViableAltException("", 7, 0, input); + throw nvae; + } + switch (alt7) { + case 1 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:55:4: function + { + root_0 = (Object)adaptor.nil(); + + + pushFollow(FOLLOW_function_in_stackitem323); + function53=function(); + state._fsp--; + + adaptor.addChild(root_0, function53.getTree()); + + } + break; + case 2 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:56:4: STRING + { + root_0 = (Object)adaptor.nil(); + + + STRING54=(Token)match(input,STRING,FOLLOW_STRING_in_stackitem328); + STRING54_tree = (Object)adaptor.create(STRING54); + adaptor.addChild(root_0, STRING54_tree); + + } + break; + case 3 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:57:4: INTEGER + { + root_0 = (Object)adaptor.nil(); + + + INTEGER55=(Token)match(input,INTEGER,FOLLOW_INTEGER_in_stackitem333); + INTEGER55_tree = (Object)adaptor.create(INTEGER55); + adaptor.addChild(root_0, INTEGER55_tree); + + } + break; + case 4 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:58:4: QUOTED + { + root_0 = (Object)adaptor.nil(); + + + QUOTED56=(Token)match(input,QUOTED,FOLLOW_QUOTED_in_stackitem338); + QUOTED56_tree = (Object)adaptor.create(QUOTED56); + adaptor.addChild(root_0, QUOTED56_tree); + + } + break; + case 5 : + // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:59:4: stack + { + root_0 = (Object)adaptor.nil(); + + + pushFollow(FOLLOW_stack_in_stackitem343); + stack57=stack(); + state._fsp--; + + adaptor.addChild(root_0, stack57.getTree()); + + } + break; + + } + retval.stop = input.LT(-1); + + retval.tree = (Object)adaptor.rulePostProcessing(root_0); + adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); + } + finally { + // do for sure before leaving + } + return retval; + } + // $ANTLR end "stackitem" + + // Delegated rules + + + + public static final BitSet FOLLOW_commands_in_program62 = new BitSet(new long[]{0x00000000009C98E2L}); + public static final BitSet FOLLOW_STRINGS_in_commands81 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_idList_in_commands84 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_INTEGERS_in_commands89 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_idList_in_commands92 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_FUNCTION_in_commands97 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_id_in_commands100 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_stack_in_commands102 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_MACRO_in_commands107 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_id_in_commands110 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_32_in_commands112 = new BitSet(new long[]{0x0000000000400000L}); + public static final BitSet FOLLOW_STRING_in_commands115 = new BitSet(new long[]{0x0000000200000000L}); + public static final BitSet FOLLOW_33_in_commands117 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_READ_in_commands123 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_EXECUTE_in_commands129 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_32_in_commands132 = new BitSet(new long[]{0x00000000FE000100L}); + public static final BitSet FOLLOW_function_in_commands135 = new BitSet(new long[]{0x0000000200000000L}); + public static final BitSet FOLLOW_33_in_commands137 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ITERATE_in_commands143 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_32_in_commands146 = new BitSet(new long[]{0x00000000FE000100L}); + public static final BitSet FOLLOW_function_in_commands149 = new BitSet(new long[]{0x0000000200000000L}); + public static final BitSet FOLLOW_33_in_commands151 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_REVERSE_in_commands157 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_32_in_commands160 = new BitSet(new long[]{0x00000000FE000100L}); + public static final BitSet FOLLOW_function_in_commands163 = new BitSet(new long[]{0x0000000200000000L}); + public static final BitSet FOLLOW_33_in_commands165 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ENTRY_in_commands171 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_idList0_in_commands174 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_idList0_in_commands176 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_idList0_in_commands178 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_SORT_in_commands183 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_IDENTIFIER_in_identifier193 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_32_in_id202 = new BitSet(new long[]{0x0000000000000100L}); + public static final BitSet FOLLOW_identifier_in_id205 = new BitSet(new long[]{0x0000000200000000L}); + public static final BitSet FOLLOW_33_in_id207 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_32_in_idList217 = new BitSet(new long[]{0x0000000000000100L}); + public static final BitSet FOLLOW_identifier_in_idList219 = new BitSet(new long[]{0x0000000200000100L}); + public static final BitSet FOLLOW_33_in_idList222 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_32_in_idList0240 = new BitSet(new long[]{0x0000000200000100L}); + public static final BitSet FOLLOW_identifier_in_idList0242 = new BitSet(new long[]{0x0000000200000100L}); + public static final BitSet FOLLOW_33_in_idList0245 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_29_in_function263 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_31_in_function267 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_30_in_function271 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_26_in_function275 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_27_in_function279 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_28_in_function283 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_25_in_function287 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_identifier_in_function291 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_32_in_stack300 = new BitSet(new long[]{0x00000001FE420500L}); + public static final BitSet FOLLOW_stackitem_in_stack302 = new BitSet(new long[]{0x00000003FE420500L}); + public static final BitSet FOLLOW_33_in_stack305 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_function_in_stackitem323 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_STRING_in_stackitem328 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_INTEGER_in_stackitem333 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_QUOTED_in_stackitem338 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_stack_in_stackitem343 = new BitSet(new long[]{0x0000000000000002L}); +} diff --git a/org.jabref.model/src/main/gen/org/jabref/search/Search.interp b/org.jabref.model/src/main/gen/org/jabref/search/Search.interp new file mode 100644 index 00000000000..9a3fb3aacb8 --- /dev/null +++ b/org.jabref.model/src/main/gen/org/jabref/search/Search.interp @@ -0,0 +1,43 @@ +token literal names: +null +null +'(' +')' +'=' +'==' +'!=' +null +null +null +null +null +null +'"' +null + +token symbolic names: +null +WS +LPAREN +RPAREN +EQUAL +EEQUAL +NEQUAL +AND +OR +CONTAINS +MATCHES +NOT +STRING +QUOTE +FIELDTYPE + +rule names: +start +expression +comparison +name + + +atn: +[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 16, 41, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 22, 10, 3, 3, 3, 3, 3, 3, 3, 7, 3, 27, 10, 3, 12, 3, 14, 3, 30, 11, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 5, 4, 37, 10, 4, 3, 5, 3, 5, 3, 5, 2, 3, 4, 6, 2, 4, 6, 8, 2, 5, 3, 2, 9, 10, 4, 2, 6, 8, 11, 12, 4, 2, 14, 14, 16, 16, 2, 40, 2, 10, 3, 2, 2, 2, 4, 21, 3, 2, 2, 2, 6, 36, 3, 2, 2, 2, 8, 38, 3, 2, 2, 2, 10, 11, 5, 4, 3, 2, 11, 12, 7, 2, 2, 3, 12, 3, 3, 2, 2, 2, 13, 14, 8, 3, 1, 2, 14, 15, 7, 4, 2, 2, 15, 16, 5, 4, 3, 2, 16, 17, 7, 5, 2, 2, 17, 22, 3, 2, 2, 2, 18, 19, 7, 13, 2, 2, 19, 22, 5, 4, 3, 4, 20, 22, 5, 6, 4, 2, 21, 13, 3, 2, 2, 2, 21, 18, 3, 2, 2, 2, 21, 20, 3, 2, 2, 2, 22, 28, 3, 2, 2, 2, 23, 24, 12, 5, 2, 2, 24, 25, 9, 2, 2, 2, 25, 27, 5, 4, 3, 6, 26, 23, 3, 2, 2, 2, 27, 30, 3, 2, 2, 2, 28, 26, 3, 2, 2, 2, 28, 29, 3, 2, 2, 2, 29, 5, 3, 2, 2, 2, 30, 28, 3, 2, 2, 2, 31, 32, 5, 8, 5, 2, 32, 33, 9, 3, 2, 2, 33, 34, 5, 8, 5, 2, 34, 37, 3, 2, 2, 2, 35, 37, 5, 8, 5, 2, 36, 31, 3, 2, 2, 2, 36, 35, 3, 2, 2, 2, 37, 7, 3, 2, 2, 2, 38, 39, 9, 4, 2, 2, 39, 9, 3, 2, 2, 2, 5, 21, 28, 36] \ No newline at end of file diff --git a/org.jabref.model/src/main/gen/org/jabref/search/Search.tokens b/org.jabref.model/src/main/gen/org/jabref/search/Search.tokens new file mode 100644 index 00000000000..bbfab1f6ca4 --- /dev/null +++ b/org.jabref.model/src/main/gen/org/jabref/search/Search.tokens @@ -0,0 +1,20 @@ +WS=1 +LPAREN=2 +RPAREN=3 +EQUAL=4 +EEQUAL=5 +NEQUAL=6 +AND=7 +OR=8 +CONTAINS=9 +MATCHES=10 +NOT=11 +STRING=12 +QUOTE=13 +FIELDTYPE=14 +'('=2 +')'=3 +'='=4 +'=='=5 +'!='=6 +'"'=13 diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchBaseVisitor.java b/org.jabref.model/src/main/gen/org/jabref/search/SearchBaseVisitor.java new file mode 100644 index 00000000000..bbbb87aab85 --- /dev/null +++ b/org.jabref.model/src/main/gen/org/jabref/search/SearchBaseVisitor.java @@ -0,0 +1,63 @@ +// Generated from C:\git-repositories\jabref\jabref-multi-module-build\org.jabref.model\src\main\antlr4\org\jabref\search\Search.g4 by ANTLR 4.7.1 +package org.jabref.search; +import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor; + +/** + * This class provides an empty implementation of {@link SearchVisitor}, + * which can be extended to create a visitor which only needs to handle a subset + * of the available methods. + * + * @param The return type of the visit operation. Use {@link Void} for + * operations with no return type. + */ +public class SearchBaseVisitor extends AbstractParseTreeVisitor implements SearchVisitor { + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitStart(SearchParser.StartContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitBinaryExpression(SearchParser.BinaryExpressionContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitAtomExpression(SearchParser.AtomExpressionContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitParenExpression(SearchParser.ParenExpressionContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitUnaryExpression(SearchParser.UnaryExpressionContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitComparison(SearchParser.ComparisonContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitName(SearchParser.NameContext ctx) { return visitChildren(ctx); } +} \ No newline at end of file diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.interp b/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.interp new file mode 100644 index 00000000000..a2fcc8e7b17 --- /dev/null +++ b/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.interp @@ -0,0 +1,60 @@ +token literal names: +null +null +'(' +')' +'=' +'==' +'!=' +null +null +null +null +null +null +'"' +null + +token symbolic names: +null +WS +LPAREN +RPAREN +EQUAL +EEQUAL +NEQUAL +AND +OR +CONTAINS +MATCHES +NOT +STRING +QUOTE +FIELDTYPE + +rule names: +WS +LPAREN +RPAREN +EQUAL +EEQUAL +NEQUAL +AND +OR +CONTAINS +MATCHES +NOT +STRING +QUOTE +FIELDTYPE +LETTER + +channel names: +DEFAULT_TOKEN_CHANNEL +HIDDEN + +mode names: +DEFAULT_MODE + +atn: +[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 16, 95, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 7, 13, 80, 10, 13, 12, 13, 14, 13, 83, 11, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 6, 15, 90, 10, 15, 13, 15, 14, 15, 91, 3, 16, 3, 16, 2, 2, 17, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 2, 3, 2, 17, 4, 2, 11, 11, 34, 34, 4, 2, 67, 67, 99, 99, 4, 2, 80, 80, 112, 112, 4, 2, 70, 70, 102, 102, 4, 2, 81, 81, 113, 113, 4, 2, 84, 84, 116, 116, 4, 2, 69, 69, 101, 101, 4, 2, 86, 86, 118, 118, 4, 2, 75, 75, 107, 107, 4, 2, 85, 85, 117, 117, 4, 2, 79, 79, 111, 111, 4, 2, 74, 74, 106, 106, 4, 2, 71, 71, 103, 103, 3, 2, 36, 36, 6, 2, 11, 11, 34, 36, 42, 43, 63, 63, 2, 95, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 3, 33, 3, 2, 2, 2, 5, 37, 3, 2, 2, 2, 7, 39, 3, 2, 2, 2, 9, 41, 3, 2, 2, 2, 11, 43, 3, 2, 2, 2, 13, 46, 3, 2, 2, 2, 15, 49, 3, 2, 2, 2, 17, 53, 3, 2, 2, 2, 19, 56, 3, 2, 2, 2, 21, 65, 3, 2, 2, 2, 23, 73, 3, 2, 2, 2, 25, 77, 3, 2, 2, 2, 27, 86, 3, 2, 2, 2, 29, 89, 3, 2, 2, 2, 31, 93, 3, 2, 2, 2, 33, 34, 9, 2, 2, 2, 34, 35, 3, 2, 2, 2, 35, 36, 8, 2, 2, 2, 36, 4, 3, 2, 2, 2, 37, 38, 7, 42, 2, 2, 38, 6, 3, 2, 2, 2, 39, 40, 7, 43, 2, 2, 40, 8, 3, 2, 2, 2, 41, 42, 7, 63, 2, 2, 42, 10, 3, 2, 2, 2, 43, 44, 7, 63, 2, 2, 44, 45, 7, 63, 2, 2, 45, 12, 3, 2, 2, 2, 46, 47, 7, 35, 2, 2, 47, 48, 7, 63, 2, 2, 48, 14, 3, 2, 2, 2, 49, 50, 9, 3, 2, 2, 50, 51, 9, 4, 2, 2, 51, 52, 9, 5, 2, 2, 52, 16, 3, 2, 2, 2, 53, 54, 9, 6, 2, 2, 54, 55, 9, 7, 2, 2, 55, 18, 3, 2, 2, 2, 56, 57, 9, 8, 2, 2, 57, 58, 9, 6, 2, 2, 58, 59, 9, 4, 2, 2, 59, 60, 9, 9, 2, 2, 60, 61, 9, 3, 2, 2, 61, 62, 9, 10, 2, 2, 62, 63, 9, 4, 2, 2, 63, 64, 9, 11, 2, 2, 64, 20, 3, 2, 2, 2, 65, 66, 9, 12, 2, 2, 66, 67, 9, 3, 2, 2, 67, 68, 9, 9, 2, 2, 68, 69, 9, 8, 2, 2, 69, 70, 9, 13, 2, 2, 70, 71, 9, 14, 2, 2, 71, 72, 9, 11, 2, 2, 72, 22, 3, 2, 2, 2, 73, 74, 9, 4, 2, 2, 74, 75, 9, 6, 2, 2, 75, 76, 9, 9, 2, 2, 76, 24, 3, 2, 2, 2, 77, 81, 5, 27, 14, 2, 78, 80, 10, 15, 2, 2, 79, 78, 3, 2, 2, 2, 80, 83, 3, 2, 2, 2, 81, 79, 3, 2, 2, 2, 81, 82, 3, 2, 2, 2, 82, 84, 3, 2, 2, 2, 83, 81, 3, 2, 2, 2, 84, 85, 5, 27, 14, 2, 85, 26, 3, 2, 2, 2, 86, 87, 7, 36, 2, 2, 87, 28, 3, 2, 2, 2, 88, 90, 5, 31, 16, 2, 89, 88, 3, 2, 2, 2, 90, 91, 3, 2, 2, 2, 91, 89, 3, 2, 2, 2, 91, 92, 3, 2, 2, 2, 92, 30, 3, 2, 2, 2, 93, 94, 10, 16, 2, 2, 94, 32, 3, 2, 2, 2, 5, 2, 81, 91, 3, 8, 2, 2] \ No newline at end of file diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.java b/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.java new file mode 100644 index 00000000000..c4f28ccbe50 --- /dev/null +++ b/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.java @@ -0,0 +1,135 @@ +// Generated from C:\git-repositories\jabref\jabref-multi-module-build\org.jabref.model\src\main\antlr4\org\jabref\search\Search.g4 by ANTLR 4.7.1 +package org.jabref.search; +import org.antlr.v4.runtime.Lexer; +import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.Token; +import org.antlr.v4.runtime.TokenStream; +import org.antlr.v4.runtime.*; +import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.dfa.DFA; +import org.antlr.v4.runtime.misc.*; + +@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) +public class SearchLexer extends Lexer { + static { RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION); } + + protected static final DFA[] _decisionToDFA; + protected static final PredictionContextCache _sharedContextCache = + new PredictionContextCache(); + public static final int + WS=1, LPAREN=2, RPAREN=3, EQUAL=4, EEQUAL=5, NEQUAL=6, AND=7, OR=8, CONTAINS=9, + MATCHES=10, NOT=11, STRING=12, QUOTE=13, FIELDTYPE=14; + public static String[] channelNames = { + "DEFAULT_TOKEN_CHANNEL", "HIDDEN" + }; + + public static String[] modeNames = { + "DEFAULT_MODE" + }; + + public static final String[] ruleNames = { + "WS", "LPAREN", "RPAREN", "EQUAL", "EEQUAL", "NEQUAL", "AND", "OR", "CONTAINS", + "MATCHES", "NOT", "STRING", "QUOTE", "FIELDTYPE", "LETTER" + }; + + private static final String[] _LITERAL_NAMES = { + null, null, "'('", "')'", "'='", "'=='", "'!='", null, null, null, null, + null, null, "'\"'" + }; + private static final String[] _SYMBOLIC_NAMES = { + null, "WS", "LPAREN", "RPAREN", "EQUAL", "EEQUAL", "NEQUAL", "AND", "OR", + "CONTAINS", "MATCHES", "NOT", "STRING", "QUOTE", "FIELDTYPE" + }; + public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); + + /** + * @deprecated Use {@link #VOCABULARY} instead. + */ + @Deprecated + public static final String[] tokenNames; + static { + tokenNames = new String[_SYMBOLIC_NAMES.length]; + for (int i = 0; i < tokenNames.length; i++) { + tokenNames[i] = VOCABULARY.getLiteralName(i); + if (tokenNames[i] == null) { + tokenNames[i] = VOCABULARY.getSymbolicName(i); + } + + if (tokenNames[i] == null) { + tokenNames[i] = ""; + } + } + } + + @Override + @Deprecated + public String[] getTokenNames() { + return tokenNames; + } + + @Override + + public Vocabulary getVocabulary() { + return VOCABULARY; + } + + + public SearchLexer(CharStream input) { + super(input); + _interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache); + } + + @Override + public String getGrammarFileName() { return "Search.g4"; } + + @Override + public String[] getRuleNames() { return ruleNames; } + + @Override + public String getSerializedATN() { return _serializedATN; } + + @Override + public String[] getChannelNames() { return channelNames; } + + @Override + public String[] getModeNames() { return modeNames; } + + @Override + public ATN getATN() { return _ATN; } + + public static final String _serializedATN = + "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\20_\b\1\4\2\t\2\4"+ + "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+ + "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\3\2\3\2\3\2\3\2\3\3"+ + "\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\6\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\t\3\t\3"+ + "\t\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3"+ + "\13\3\13\3\f\3\f\3\f\3\f\3\r\3\r\7\rP\n\r\f\r\16\rS\13\r\3\r\3\r\3\16"+ + "\3\16\3\17\6\17Z\n\17\r\17\16\17[\3\20\3\20\2\2\21\3\3\5\4\7\5\t\6\13"+ + "\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\2\3\2\21\4\2\13"+ + "\13\"\"\4\2CCcc\4\2PPpp\4\2FFff\4\2QQqq\4\2TTtt\4\2EEee\4\2VVvv\4\2KK"+ + "kk\4\2UUuu\4\2OOoo\4\2JJjj\4\2GGgg\3\2$$\6\2\13\13\"$*+??\2_\2\3\3\2\2"+ + "\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3"+ + "\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2"+ + "\2\2\33\3\2\2\2\2\35\3\2\2\2\3!\3\2\2\2\5%\3\2\2\2\7\'\3\2\2\2\t)\3\2"+ + "\2\2\13+\3\2\2\2\r.\3\2\2\2\17\61\3\2\2\2\21\65\3\2\2\2\238\3\2\2\2\25"+ + "A\3\2\2\2\27I\3\2\2\2\31M\3\2\2\2\33V\3\2\2\2\35Y\3\2\2\2\37]\3\2\2\2"+ + "!\"\t\2\2\2\"#\3\2\2\2#$\b\2\2\2$\4\3\2\2\2%&\7*\2\2&\6\3\2\2\2\'(\7+"+ + "\2\2(\b\3\2\2\2)*\7?\2\2*\n\3\2\2\2+,\7?\2\2,-\7?\2\2-\f\3\2\2\2./\7#"+ + "\2\2/\60\7?\2\2\60\16\3\2\2\2\61\62\t\3\2\2\62\63\t\4\2\2\63\64\t\5\2"+ + "\2\64\20\3\2\2\2\65\66\t\6\2\2\66\67\t\7\2\2\67\22\3\2\2\289\t\b\2\29"+ + ":\t\6\2\2:;\t\4\2\2;<\t\t\2\2<=\t\3\2\2=>\t\n\2\2>?\t\4\2\2?@\t\13\2\2"+ + "@\24\3\2\2\2AB\t\f\2\2BC\t\3\2\2CD\t\t\2\2DE\t\b\2\2EF\t\r\2\2FG\t\16"+ + "\2\2GH\t\13\2\2H\26\3\2\2\2IJ\t\4\2\2JK\t\6\2\2KL\t\t\2\2L\30\3\2\2\2"+ + "MQ\5\33\16\2NP\n\17\2\2ON\3\2\2\2PS\3\2\2\2QO\3\2\2\2QR\3\2\2\2RT\3\2"+ + "\2\2SQ\3\2\2\2TU\5\33\16\2U\32\3\2\2\2VW\7$\2\2W\34\3\2\2\2XZ\5\37\20"+ + "\2YX\3\2\2\2Z[\3\2\2\2[Y\3\2\2\2[\\\3\2\2\2\\\36\3\2\2\2]^\n\20\2\2^ "+ + "\3\2\2\2\5\2Q[\3\b\2\2"; + public static final ATN _ATN = + new ATNDeserializer().deserialize(_serializedATN.toCharArray()); + static { + _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()]; + for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) { + _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i); + } + } +} \ No newline at end of file diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.tokens b/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.tokens new file mode 100644 index 00000000000..bbfab1f6ca4 --- /dev/null +++ b/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.tokens @@ -0,0 +1,20 @@ +WS=1 +LPAREN=2 +RPAREN=3 +EQUAL=4 +EEQUAL=5 +NEQUAL=6 +AND=7 +OR=8 +CONTAINS=9 +MATCHES=10 +NOT=11 +STRING=12 +QUOTE=13 +FIELDTYPE=14 +'('=2 +')'=3 +'='=4 +'=='=5 +'!='=6 +'"'=13 diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchParser.java b/org.jabref.model/src/main/gen/org/jabref/search/SearchParser.java new file mode 100644 index 00000000000..55bdb28e30b --- /dev/null +++ b/org.jabref.model/src/main/gen/org/jabref/search/SearchParser.java @@ -0,0 +1,450 @@ +// Generated from C:\git-repositories\jabref\jabref-multi-module-build\org.jabref.model\src\main\antlr4\org\jabref\search\Search.g4 by ANTLR 4.7.1 +package org.jabref.search; +import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.dfa.DFA; +import org.antlr.v4.runtime.*; +import org.antlr.v4.runtime.misc.*; +import org.antlr.v4.runtime.tree.*; +import java.util.List; +import java.util.Iterator; +import java.util.ArrayList; + +@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) +public class SearchParser extends Parser { + static { RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION); } + + protected static final DFA[] _decisionToDFA; + protected static final PredictionContextCache _sharedContextCache = + new PredictionContextCache(); + public static final int + WS=1, LPAREN=2, RPAREN=3, EQUAL=4, EEQUAL=5, NEQUAL=6, AND=7, OR=8, CONTAINS=9, + MATCHES=10, NOT=11, STRING=12, QUOTE=13, FIELDTYPE=14; + public static final int + RULE_start = 0, RULE_expression = 1, RULE_comparison = 2, RULE_name = 3; + public static final String[] ruleNames = { + "start", "expression", "comparison", "name" + }; + + private static final String[] _LITERAL_NAMES = { + null, null, "'('", "')'", "'='", "'=='", "'!='", null, null, null, null, + null, null, "'\"'" + }; + private static final String[] _SYMBOLIC_NAMES = { + null, "WS", "LPAREN", "RPAREN", "EQUAL", "EEQUAL", "NEQUAL", "AND", "OR", + "CONTAINS", "MATCHES", "NOT", "STRING", "QUOTE", "FIELDTYPE" + }; + public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); + + /** + * @deprecated Use {@link #VOCABULARY} instead. + */ + @Deprecated + public static final String[] tokenNames; + static { + tokenNames = new String[_SYMBOLIC_NAMES.length]; + for (int i = 0; i < tokenNames.length; i++) { + tokenNames[i] = VOCABULARY.getLiteralName(i); + if (tokenNames[i] == null) { + tokenNames[i] = VOCABULARY.getSymbolicName(i); + } + + if (tokenNames[i] == null) { + tokenNames[i] = ""; + } + } + } + + @Override + @Deprecated + public String[] getTokenNames() { + return tokenNames; + } + + @Override + + public Vocabulary getVocabulary() { + return VOCABULARY; + } + + @Override + public String getGrammarFileName() { return "Search.g4"; } + + @Override + public String[] getRuleNames() { return ruleNames; } + + @Override + public String getSerializedATN() { return _serializedATN; } + + @Override + public ATN getATN() { return _ATN; } + + public SearchParser(TokenStream input) { + super(input); + _interp = new ParserATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache); + } + public static class StartContext extends ParserRuleContext { + public ExpressionContext expression() { + return getRuleContext(ExpressionContext.class,0); + } + public TerminalNode EOF() { return getToken(SearchParser.EOF, 0); } + public StartContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_start; } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitStart(this); + else return visitor.visitChildren(this); + } + } + + public final StartContext start() throws RecognitionException { + StartContext _localctx = new StartContext(_ctx, getState()); + enterRule(_localctx, 0, RULE_start); + try { + enterOuterAlt(_localctx, 1); + { + setState(8); + expression(0); + setState(9); + match(EOF); + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + + public static class ExpressionContext extends ParserRuleContext { + public ExpressionContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_expression; } + + public ExpressionContext() { } + public void copyFrom(ExpressionContext ctx) { + super.copyFrom(ctx); + } + } + public static class BinaryExpressionContext extends ExpressionContext { + public ExpressionContext left; + public Token operator; + public ExpressionContext right; + public List expression() { + return getRuleContexts(ExpressionContext.class); + } + public ExpressionContext expression(int i) { + return getRuleContext(ExpressionContext.class,i); + } + public TerminalNode AND() { return getToken(SearchParser.AND, 0); } + public TerminalNode OR() { return getToken(SearchParser.OR, 0); } + public BinaryExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitBinaryExpression(this); + else return visitor.visitChildren(this); + } + } + public static class AtomExpressionContext extends ExpressionContext { + public ComparisonContext comparison() { + return getRuleContext(ComparisonContext.class,0); + } + public AtomExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitAtomExpression(this); + else return visitor.visitChildren(this); + } + } + public static class ParenExpressionContext extends ExpressionContext { + public TerminalNode LPAREN() { return getToken(SearchParser.LPAREN, 0); } + public ExpressionContext expression() { + return getRuleContext(ExpressionContext.class,0); + } + public TerminalNode RPAREN() { return getToken(SearchParser.RPAREN, 0); } + public ParenExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitParenExpression(this); + else return visitor.visitChildren(this); + } + } + public static class UnaryExpressionContext extends ExpressionContext { + public TerminalNode NOT() { return getToken(SearchParser.NOT, 0); } + public ExpressionContext expression() { + return getRuleContext(ExpressionContext.class,0); + } + public UnaryExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitUnaryExpression(this); + else return visitor.visitChildren(this); + } + } + + public final ExpressionContext expression() throws RecognitionException { + return expression(0); + } + + private ExpressionContext expression(int _p) throws RecognitionException { + ParserRuleContext _parentctx = _ctx; + int _parentState = getState(); + ExpressionContext _localctx = new ExpressionContext(_ctx, _parentState); + ExpressionContext _prevctx = _localctx; + int _startState = 2; + enterRecursionRule(_localctx, 2, RULE_expression, _p); + int _la; + try { + int _alt; + enterOuterAlt(_localctx, 1); + { + setState(19); + _errHandler.sync(this); + switch (_input.LA(1)) { + case LPAREN: + { + _localctx = new ParenExpressionContext(_localctx); + _ctx = _localctx; + _prevctx = _localctx; + + setState(12); + match(LPAREN); + setState(13); + expression(0); + setState(14); + match(RPAREN); + } + break; + case NOT: + { + _localctx = new UnaryExpressionContext(_localctx); + _ctx = _localctx; + _prevctx = _localctx; + setState(16); + match(NOT); + setState(17); + expression(2); + } + break; + case STRING: + case FIELDTYPE: + { + _localctx = new AtomExpressionContext(_localctx); + _ctx = _localctx; + _prevctx = _localctx; + setState(18); + comparison(); + } + break; + default: + throw new NoViableAltException(this); + } + _ctx.stop = _input.LT(-1); + setState(26); + _errHandler.sync(this); + _alt = getInterpreter().adaptivePredict(_input,1,_ctx); + while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { + if ( _alt==1 ) { + if ( _parseListeners!=null ) triggerExitRuleEvent(); + _prevctx = _localctx; + { + { + _localctx = new BinaryExpressionContext(new ExpressionContext(_parentctx, _parentState)); + ((BinaryExpressionContext)_localctx).left = _prevctx; + pushNewRecursionContext(_localctx, _startState, RULE_expression); + setState(21); + if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)"); + setState(22); + ((BinaryExpressionContext)_localctx).operator = _input.LT(1); + _la = _input.LA(1); + if ( !(_la==AND || _la==OR) ) { + ((BinaryExpressionContext)_localctx).operator = (Token)_errHandler.recoverInline(this); + } + else { + if ( _input.LA(1)==Token.EOF ) matchedEOF = true; + _errHandler.reportMatch(this); + consume(); + } + setState(23); + ((BinaryExpressionContext)_localctx).right = expression(4); + } + } + } + setState(28); + _errHandler.sync(this); + _alt = getInterpreter().adaptivePredict(_input,1,_ctx); + } + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + unrollRecursionContexts(_parentctx); + } + return _localctx; + } + + public static class ComparisonContext extends ParserRuleContext { + public NameContext left; + public Token operator; + public NameContext right; + public List name() { + return getRuleContexts(NameContext.class); + } + public NameContext name(int i) { + return getRuleContext(NameContext.class,i); + } + public TerminalNode CONTAINS() { return getToken(SearchParser.CONTAINS, 0); } + public TerminalNode MATCHES() { return getToken(SearchParser.MATCHES, 0); } + public TerminalNode EQUAL() { return getToken(SearchParser.EQUAL, 0); } + public TerminalNode EEQUAL() { return getToken(SearchParser.EEQUAL, 0); } + public TerminalNode NEQUAL() { return getToken(SearchParser.NEQUAL, 0); } + public ComparisonContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_comparison; } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitComparison(this); + else return visitor.visitChildren(this); + } + } + + public final ComparisonContext comparison() throws RecognitionException { + ComparisonContext _localctx = new ComparisonContext(_ctx, getState()); + enterRule(_localctx, 4, RULE_comparison); + int _la; + try { + setState(34); + _errHandler.sync(this); + switch ( getInterpreter().adaptivePredict(_input,2,_ctx) ) { + case 1: + enterOuterAlt(_localctx, 1); + { + setState(29); + ((ComparisonContext)_localctx).left = name(); + setState(30); + ((ComparisonContext)_localctx).operator = _input.LT(1); + _la = _input.LA(1); + if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << EQUAL) | (1L << EEQUAL) | (1L << NEQUAL) | (1L << CONTAINS) | (1L << MATCHES))) != 0)) ) { + ((ComparisonContext)_localctx).operator = (Token)_errHandler.recoverInline(this); + } + else { + if ( _input.LA(1)==Token.EOF ) matchedEOF = true; + _errHandler.reportMatch(this); + consume(); + } + setState(31); + ((ComparisonContext)_localctx).right = name(); + } + break; + case 2: + enterOuterAlt(_localctx, 2); + { + setState(33); + ((ComparisonContext)_localctx).right = name(); + } + break; + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + + public static class NameContext extends ParserRuleContext { + public TerminalNode STRING() { return getToken(SearchParser.STRING, 0); } + public TerminalNode FIELDTYPE() { return getToken(SearchParser.FIELDTYPE, 0); } + public NameContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_name; } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitName(this); + else return visitor.visitChildren(this); + } + } + + public final NameContext name() throws RecognitionException { + NameContext _localctx = new NameContext(_ctx, getState()); + enterRule(_localctx, 6, RULE_name); + int _la; + try { + enterOuterAlt(_localctx, 1); + { + setState(36); + _la = _input.LA(1); + if ( !(_la==STRING || _la==FIELDTYPE) ) { + _errHandler.recoverInline(this); + } + else { + if ( _input.LA(1)==Token.EOF ) matchedEOF = true; + _errHandler.reportMatch(this); + consume(); + } + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + + public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) { + switch (ruleIndex) { + case 1: + return expression_sempred((ExpressionContext)_localctx, predIndex); + } + return true; + } + private boolean expression_sempred(ExpressionContext _localctx, int predIndex) { + switch (predIndex) { + case 0: + return precpred(_ctx, 3); + } + return true; + } + + public static final String _serializedATN = + "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3\20)\4\2\t\2\4\3\t"+ + "\3\4\4\t\4\4\5\t\5\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\5\3\26"+ + "\n\3\3\3\3\3\3\3\7\3\33\n\3\f\3\16\3\36\13\3\3\4\3\4\3\4\3\4\3\4\5\4%"+ + "\n\4\3\5\3\5\3\5\2\3\4\6\2\4\6\b\2\5\3\2\t\n\4\2\6\b\13\f\4\2\16\16\20"+ + "\20\2(\2\n\3\2\2\2\4\25\3\2\2\2\6$\3\2\2\2\b&\3\2\2\2\n\13\5\4\3\2\13"+ + "\f\7\2\2\3\f\3\3\2\2\2\r\16\b\3\1\2\16\17\7\4\2\2\17\20\5\4\3\2\20\21"+ + "\7\5\2\2\21\26\3\2\2\2\22\23\7\r\2\2\23\26\5\4\3\4\24\26\5\6\4\2\25\r"+ + "\3\2\2\2\25\22\3\2\2\2\25\24\3\2\2\2\26\34\3\2\2\2\27\30\f\5\2\2\30\31"+ + "\t\2\2\2\31\33\5\4\3\6\32\27\3\2\2\2\33\36\3\2\2\2\34\32\3\2\2\2\34\35"+ + "\3\2\2\2\35\5\3\2\2\2\36\34\3\2\2\2\37 \5\b\5\2 !\t\3\2\2!\"\5\b\5\2\""+ + "%\3\2\2\2#%\5\b\5\2$\37\3\2\2\2$#\3\2\2\2%\7\3\2\2\2&\'\t\4\2\2\'\t\3"+ + "\2\2\2\5\25\34$"; + public static final ATN _ATN = + new ATNDeserializer().deserialize(_serializedATN.toCharArray()); + static { + _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()]; + for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) { + _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i); + } + } +} \ No newline at end of file diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchVisitor.java b/org.jabref.model/src/main/gen/org/jabref/search/SearchVisitor.java new file mode 100644 index 00000000000..e7b5e052171 --- /dev/null +++ b/org.jabref.model/src/main/gen/org/jabref/search/SearchVisitor.java @@ -0,0 +1,59 @@ +// Generated from C:\git-repositories\jabref\jabref-multi-module-build\org.jabref.model\src\main\antlr4\org\jabref\search\Search.g4 by ANTLR 4.7.1 +package org.jabref.search; +import org.antlr.v4.runtime.tree.ParseTreeVisitor; + +/** + * This interface defines a complete generic visitor for a parse tree produced + * by {@link SearchParser}. + * + * @param The return type of the visit operation. Use {@link Void} for + * operations with no return type. + */ +public interface SearchVisitor extends ParseTreeVisitor { + /** + * Visit a parse tree produced by {@link SearchParser#start}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitStart(SearchParser.StartContext ctx); + /** + * Visit a parse tree produced by the {@code binaryExpression} + * labeled alternative in {@link SearchParser#expression}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitBinaryExpression(SearchParser.BinaryExpressionContext ctx); + /** + * Visit a parse tree produced by the {@code atomExpression} + * labeled alternative in {@link SearchParser#expression}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitAtomExpression(SearchParser.AtomExpressionContext ctx); + /** + * Visit a parse tree produced by the {@code parenExpression} + * labeled alternative in {@link SearchParser#expression}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitParenExpression(SearchParser.ParenExpressionContext ctx); + /** + * Visit a parse tree produced by the {@code unaryExpression} + * labeled alternative in {@link SearchParser#expression}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitUnaryExpression(SearchParser.UnaryExpressionContext ctx); + /** + * Visit a parse tree produced by {@link SearchParser#comparison}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitComparison(SearchParser.ComparisonContext ctx); + /** + * Visit a parse tree produced by {@link SearchParser#name}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitName(SearchParser.NameContext ctx); +} \ No newline at end of file diff --git a/src/main/java/org/jabref/architecture/ApacheCommonsLang3Allowed.java b/org.jabref.model/src/main/java/org/jabref/architecture/ApacheCommonsLang3Allowed.java similarity index 100% rename from src/main/java/org/jabref/architecture/ApacheCommonsLang3Allowed.java rename to org.jabref.model/src/main/java/org/jabref/architecture/ApacheCommonsLang3Allowed.java diff --git a/src/main/java/org/jabref/model/ChainNode.java b/org.jabref.model/src/main/java/org/jabref/model/ChainNode.java similarity index 100% rename from src/main/java/org/jabref/model/ChainNode.java rename to org.jabref.model/src/main/java/org/jabref/model/ChainNode.java diff --git a/src/main/java/org/jabref/model/Defaults.java b/org.jabref.model/src/main/java/org/jabref/model/Defaults.java similarity index 100% rename from src/main/java/org/jabref/model/Defaults.java rename to org.jabref.model/src/main/java/org/jabref/model/Defaults.java diff --git a/src/main/java/org/jabref/model/EntryTypes.java b/org.jabref.model/src/main/java/org/jabref/model/EntryTypes.java similarity index 100% rename from src/main/java/org/jabref/model/EntryTypes.java rename to org.jabref.model/src/main/java/org/jabref/model/EntryTypes.java diff --git a/src/main/java/org/jabref/model/FieldChange.java b/org.jabref.model/src/main/java/org/jabref/model/FieldChange.java similarity index 100% rename from src/main/java/org/jabref/model/FieldChange.java rename to org.jabref.model/src/main/java/org/jabref/model/FieldChange.java diff --git a/src/main/java/org/jabref/model/TreeNode.java b/org.jabref.model/src/main/java/org/jabref/model/TreeNode.java similarity index 100% rename from src/main/java/org/jabref/model/TreeNode.java rename to org.jabref.model/src/main/java/org/jabref/model/TreeNode.java diff --git a/src/main/java/org/jabref/model/auxparser/AuxParser.java b/org.jabref.model/src/main/java/org/jabref/model/auxparser/AuxParser.java similarity index 100% rename from src/main/java/org/jabref/model/auxparser/AuxParser.java rename to org.jabref.model/src/main/java/org/jabref/model/auxparser/AuxParser.java diff --git a/src/main/java/org/jabref/model/auxparser/AuxParserResult.java b/org.jabref.model/src/main/java/org/jabref/model/auxparser/AuxParserResult.java similarity index 100% rename from src/main/java/org/jabref/model/auxparser/AuxParserResult.java rename to org.jabref.model/src/main/java/org/jabref/model/auxparser/AuxParserResult.java diff --git a/src/main/java/org/jabref/model/bibtexkeypattern/AbstractBibtexKeyPattern.java b/org.jabref.model/src/main/java/org/jabref/model/bibtexkeypattern/AbstractBibtexKeyPattern.java similarity index 100% rename from src/main/java/org/jabref/model/bibtexkeypattern/AbstractBibtexKeyPattern.java rename to org.jabref.model/src/main/java/org/jabref/model/bibtexkeypattern/AbstractBibtexKeyPattern.java diff --git a/src/main/java/org/jabref/model/bibtexkeypattern/DatabaseBibtexKeyPattern.java b/org.jabref.model/src/main/java/org/jabref/model/bibtexkeypattern/DatabaseBibtexKeyPattern.java similarity index 100% rename from src/main/java/org/jabref/model/bibtexkeypattern/DatabaseBibtexKeyPattern.java rename to org.jabref.model/src/main/java/org/jabref/model/bibtexkeypattern/DatabaseBibtexKeyPattern.java diff --git a/src/main/java/org/jabref/model/bibtexkeypattern/GlobalBibtexKeyPattern.java b/org.jabref.model/src/main/java/org/jabref/model/bibtexkeypattern/GlobalBibtexKeyPattern.java similarity index 100% rename from src/main/java/org/jabref/model/bibtexkeypattern/GlobalBibtexKeyPattern.java rename to org.jabref.model/src/main/java/org/jabref/model/bibtexkeypattern/GlobalBibtexKeyPattern.java diff --git a/src/main/java/org/jabref/model/cleanup/CleanupJob.java b/org.jabref.model/src/main/java/org/jabref/model/cleanup/CleanupJob.java similarity index 100% rename from src/main/java/org/jabref/model/cleanup/CleanupJob.java rename to org.jabref.model/src/main/java/org/jabref/model/cleanup/CleanupJob.java diff --git a/src/main/java/org/jabref/model/cleanup/FieldFormatterCleanup.java b/org.jabref.model/src/main/java/org/jabref/model/cleanup/FieldFormatterCleanup.java similarity index 100% rename from src/main/java/org/jabref/model/cleanup/FieldFormatterCleanup.java rename to org.jabref.model/src/main/java/org/jabref/model/cleanup/FieldFormatterCleanup.java diff --git a/src/main/java/org/jabref/model/cleanup/FieldFormatterCleanups.java b/org.jabref.model/src/main/java/org/jabref/model/cleanup/FieldFormatterCleanups.java similarity index 100% rename from src/main/java/org/jabref/model/cleanup/FieldFormatterCleanups.java rename to org.jabref.model/src/main/java/org/jabref/model/cleanup/FieldFormatterCleanups.java diff --git a/src/main/java/org/jabref/model/cleanup/Formatter.java b/org.jabref.model/src/main/java/org/jabref/model/cleanup/Formatter.java similarity index 100% rename from src/main/java/org/jabref/model/cleanup/Formatter.java rename to org.jabref.model/src/main/java/org/jabref/model/cleanup/Formatter.java diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/org.jabref.model/src/main/java/org/jabref/model/database/BibDatabase.java similarity index 100% rename from src/main/java/org/jabref/model/database/BibDatabase.java rename to org.jabref.model/src/main/java/org/jabref/model/database/BibDatabase.java diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/org.jabref.model/src/main/java/org/jabref/model/database/BibDatabaseContext.java similarity index 100% rename from src/main/java/org/jabref/model/database/BibDatabaseContext.java rename to org.jabref.model/src/main/java/org/jabref/model/database/BibDatabaseContext.java diff --git a/src/main/java/org/jabref/model/database/BibDatabaseMode.java b/org.jabref.model/src/main/java/org/jabref/model/database/BibDatabaseMode.java similarity index 100% rename from src/main/java/org/jabref/model/database/BibDatabaseMode.java rename to org.jabref.model/src/main/java/org/jabref/model/database/BibDatabaseMode.java diff --git a/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java b/org.jabref.model/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java similarity index 100% rename from src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java rename to org.jabref.model/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java diff --git a/src/main/java/org/jabref/model/database/BibDatabases.java b/org.jabref.model/src/main/java/org/jabref/model/database/BibDatabases.java similarity index 100% rename from src/main/java/org/jabref/model/database/BibDatabases.java rename to org.jabref.model/src/main/java/org/jabref/model/database/BibDatabases.java diff --git a/src/main/java/org/jabref/model/database/DuplicationChecker.java b/org.jabref.model/src/main/java/org/jabref/model/database/DuplicationChecker.java similarity index 100% rename from src/main/java/org/jabref/model/database/DuplicationChecker.java rename to org.jabref.model/src/main/java/org/jabref/model/database/DuplicationChecker.java diff --git a/src/main/java/org/jabref/model/database/KeyChangeListener.java b/org.jabref.model/src/main/java/org/jabref/model/database/KeyChangeListener.java similarity index 100% rename from src/main/java/org/jabref/model/database/KeyChangeListener.java rename to org.jabref.model/src/main/java/org/jabref/model/database/KeyChangeListener.java diff --git a/src/main/java/org/jabref/model/database/KeyCollisionException.java b/org.jabref.model/src/main/java/org/jabref/model/database/KeyCollisionException.java similarity index 100% rename from src/main/java/org/jabref/model/database/KeyCollisionException.java rename to org.jabref.model/src/main/java/org/jabref/model/database/KeyCollisionException.java diff --git a/src/main/java/org/jabref/model/database/event/AutosaveEvent.java b/org.jabref.model/src/main/java/org/jabref/model/database/event/AutosaveEvent.java similarity index 100% rename from src/main/java/org/jabref/model/database/event/AutosaveEvent.java rename to org.jabref.model/src/main/java/org/jabref/model/database/event/AutosaveEvent.java diff --git a/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java b/org.jabref.model/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java similarity index 100% rename from src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java rename to org.jabref.model/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java diff --git a/src/main/java/org/jabref/model/database/event/ChangePropagation.java b/org.jabref.model/src/main/java/org/jabref/model/database/event/ChangePropagation.java similarity index 100% rename from src/main/java/org/jabref/model/database/event/ChangePropagation.java rename to org.jabref.model/src/main/java/org/jabref/model/database/event/ChangePropagation.java diff --git a/src/main/java/org/jabref/model/database/event/CoarseChangeFilter.java b/org.jabref.model/src/main/java/org/jabref/model/database/event/CoarseChangeFilter.java similarity index 100% rename from src/main/java/org/jabref/model/database/event/CoarseChangeFilter.java rename to org.jabref.model/src/main/java/org/jabref/model/database/event/CoarseChangeFilter.java diff --git a/src/main/java/org/jabref/model/database/event/EntryAddedEvent.java b/org.jabref.model/src/main/java/org/jabref/model/database/event/EntryAddedEvent.java similarity index 100% rename from src/main/java/org/jabref/model/database/event/EntryAddedEvent.java rename to org.jabref.model/src/main/java/org/jabref/model/database/event/EntryAddedEvent.java diff --git a/src/main/java/org/jabref/model/database/event/EntryRemovedEvent.java b/org.jabref.model/src/main/java/org/jabref/model/database/event/EntryRemovedEvent.java similarity index 100% rename from src/main/java/org/jabref/model/database/event/EntryRemovedEvent.java rename to org.jabref.model/src/main/java/org/jabref/model/database/event/EntryRemovedEvent.java diff --git a/src/main/java/org/jabref/model/database/shared/DBMSType.java b/org.jabref.model/src/main/java/org/jabref/model/database/shared/DBMSType.java similarity index 100% rename from src/main/java/org/jabref/model/database/shared/DBMSType.java rename to org.jabref.model/src/main/java/org/jabref/model/database/shared/DBMSType.java diff --git a/src/main/java/org/jabref/model/database/shared/DatabaseConnection.java b/org.jabref.model/src/main/java/org/jabref/model/database/shared/DatabaseConnection.java similarity index 100% rename from src/main/java/org/jabref/model/database/shared/DatabaseConnection.java rename to org.jabref.model/src/main/java/org/jabref/model/database/shared/DatabaseConnection.java diff --git a/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java b/org.jabref.model/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java similarity index 100% rename from src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java rename to org.jabref.model/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java diff --git a/src/main/java/org/jabref/model/database/shared/DatabaseLocation.java b/org.jabref.model/src/main/java/org/jabref/model/database/shared/DatabaseLocation.java similarity index 100% rename from src/main/java/org/jabref/model/database/shared/DatabaseLocation.java rename to org.jabref.model/src/main/java/org/jabref/model/database/shared/DatabaseLocation.java diff --git a/src/main/java/org/jabref/model/database/shared/DatabaseNotSupportedException.java b/org.jabref.model/src/main/java/org/jabref/model/database/shared/DatabaseNotSupportedException.java similarity index 100% rename from src/main/java/org/jabref/model/database/shared/DatabaseNotSupportedException.java rename to org.jabref.model/src/main/java/org/jabref/model/database/shared/DatabaseNotSupportedException.java diff --git a/src/main/java/org/jabref/model/database/shared/DatabaseSynchronizer.java b/org.jabref.model/src/main/java/org/jabref/model/database/shared/DatabaseSynchronizer.java similarity index 100% rename from src/main/java/org/jabref/model/database/shared/DatabaseSynchronizer.java rename to org.jabref.model/src/main/java/org/jabref/model/database/shared/DatabaseSynchronizer.java diff --git a/src/main/java/org/jabref/model/entry/Author.java b/org.jabref.model/src/main/java/org/jabref/model/entry/Author.java similarity index 100% rename from src/main/java/org/jabref/model/entry/Author.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/Author.java diff --git a/src/main/java/org/jabref/model/entry/AuthorList.java b/org.jabref.model/src/main/java/org/jabref/model/entry/AuthorList.java similarity index 100% rename from src/main/java/org/jabref/model/entry/AuthorList.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/AuthorList.java diff --git a/src/main/java/org/jabref/model/entry/AuthorListParser.java b/org.jabref.model/src/main/java/org/jabref/model/entry/AuthorListParser.java similarity index 100% rename from src/main/java/org/jabref/model/entry/AuthorListParser.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/AuthorListParser.java diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/org.jabref.model/src/main/java/org/jabref/model/entry/BibEntry.java similarity index 100% rename from src/main/java/org/jabref/model/entry/BibEntry.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/BibEntry.java diff --git a/src/main/java/org/jabref/model/entry/BiblatexEntryType.java b/org.jabref.model/src/main/java/org/jabref/model/entry/BiblatexEntryType.java similarity index 100% rename from src/main/java/org/jabref/model/entry/BiblatexEntryType.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/BiblatexEntryType.java diff --git a/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java b/org.jabref.model/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java similarity index 100% rename from src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java diff --git a/src/main/java/org/jabref/model/entry/BibtexEntryType.java b/org.jabref.model/src/main/java/org/jabref/model/entry/BibtexEntryType.java similarity index 100% rename from src/main/java/org/jabref/model/entry/BibtexEntryType.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/BibtexEntryType.java diff --git a/src/main/java/org/jabref/model/entry/BibtexEntryTypes.java b/org.jabref.model/src/main/java/org/jabref/model/entry/BibtexEntryTypes.java similarity index 100% rename from src/main/java/org/jabref/model/entry/BibtexEntryTypes.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/BibtexEntryTypes.java diff --git a/src/main/java/org/jabref/model/entry/BibtexSingleField.java b/org.jabref.model/src/main/java/org/jabref/model/entry/BibtexSingleField.java similarity index 100% rename from src/main/java/org/jabref/model/entry/BibtexSingleField.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/BibtexSingleField.java diff --git a/src/main/java/org/jabref/model/entry/BibtexString.java b/org.jabref.model/src/main/java/org/jabref/model/entry/BibtexString.java similarity index 100% rename from src/main/java/org/jabref/model/entry/BibtexString.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/BibtexString.java diff --git a/src/main/java/org/jabref/model/entry/CanonicalBibtexEntry.java b/org.jabref.model/src/main/java/org/jabref/model/entry/CanonicalBibtexEntry.java similarity index 100% rename from src/main/java/org/jabref/model/entry/CanonicalBibtexEntry.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/CanonicalBibtexEntry.java diff --git a/src/main/java/org/jabref/model/entry/CustomEntryType.java b/org.jabref.model/src/main/java/org/jabref/model/entry/CustomEntryType.java similarity index 100% rename from src/main/java/org/jabref/model/entry/CustomEntryType.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/CustomEntryType.java diff --git a/src/main/java/org/jabref/model/entry/Date.java b/org.jabref.model/src/main/java/org/jabref/model/entry/Date.java similarity index 100% rename from src/main/java/org/jabref/model/entry/Date.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/Date.java diff --git a/src/main/java/org/jabref/model/entry/EntryConverter.java b/org.jabref.model/src/main/java/org/jabref/model/entry/EntryConverter.java similarity index 100% rename from src/main/java/org/jabref/model/entry/EntryConverter.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/EntryConverter.java diff --git a/src/main/java/org/jabref/model/entry/EntryLinkList.java b/org.jabref.model/src/main/java/org/jabref/model/entry/EntryLinkList.java similarity index 100% rename from src/main/java/org/jabref/model/entry/EntryLinkList.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/EntryLinkList.java diff --git a/src/main/java/org/jabref/model/entry/EntryType.java b/org.jabref.model/src/main/java/org/jabref/model/entry/EntryType.java similarity index 100% rename from src/main/java/org/jabref/model/entry/EntryType.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/EntryType.java diff --git a/src/main/java/org/jabref/model/entry/FieldName.java b/org.jabref.model/src/main/java/org/jabref/model/entry/FieldName.java similarity index 100% rename from src/main/java/org/jabref/model/entry/FieldName.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/FieldName.java diff --git a/src/main/java/org/jabref/model/entry/FieldProperty.java b/org.jabref.model/src/main/java/org/jabref/model/entry/FieldProperty.java similarity index 100% rename from src/main/java/org/jabref/model/entry/FieldProperty.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/FieldProperty.java diff --git a/src/main/java/org/jabref/model/entry/FileFieldParser.java b/org.jabref.model/src/main/java/org/jabref/model/entry/FileFieldParser.java similarity index 100% rename from src/main/java/org/jabref/model/entry/FileFieldParser.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/FileFieldParser.java diff --git a/src/main/java/org/jabref/model/entry/FileFieldWriter.java b/org.jabref.model/src/main/java/org/jabref/model/entry/FileFieldWriter.java similarity index 100% rename from src/main/java/org/jabref/model/entry/FileFieldWriter.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/FileFieldWriter.java diff --git a/src/main/java/org/jabref/model/entry/IEEETranEntryTypes.java b/org.jabref.model/src/main/java/org/jabref/model/entry/IEEETranEntryTypes.java similarity index 100% rename from src/main/java/org/jabref/model/entry/IEEETranEntryTypes.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/IEEETranEntryTypes.java diff --git a/src/main/java/org/jabref/model/entry/IdGenerator.java b/org.jabref.model/src/main/java/org/jabref/model/entry/IdGenerator.java similarity index 100% rename from src/main/java/org/jabref/model/entry/IdGenerator.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/IdGenerator.java diff --git a/src/main/java/org/jabref/model/entry/InternalBibtexFields.java b/org.jabref.model/src/main/java/org/jabref/model/entry/InternalBibtexFields.java similarity index 100% rename from src/main/java/org/jabref/model/entry/InternalBibtexFields.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/InternalBibtexFields.java diff --git a/src/main/java/org/jabref/model/entry/Keyword.java b/org.jabref.model/src/main/java/org/jabref/model/entry/Keyword.java similarity index 100% rename from src/main/java/org/jabref/model/entry/Keyword.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/Keyword.java diff --git a/src/main/java/org/jabref/model/entry/KeywordList.java b/org.jabref.model/src/main/java/org/jabref/model/entry/KeywordList.java similarity index 100% rename from src/main/java/org/jabref/model/entry/KeywordList.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/KeywordList.java diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/org.jabref.model/src/main/java/org/jabref/model/entry/LinkedFile.java similarity index 100% rename from src/main/java/org/jabref/model/entry/LinkedFile.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/LinkedFile.java diff --git a/src/main/java/org/jabref/model/entry/Month.java b/org.jabref.model/src/main/java/org/jabref/model/entry/Month.java similarity index 100% rename from src/main/java/org/jabref/model/entry/Month.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/Month.java diff --git a/src/main/java/org/jabref/model/entry/ParsedEntryLink.java b/org.jabref.model/src/main/java/org/jabref/model/entry/ParsedEntryLink.java similarity index 100% rename from src/main/java/org/jabref/model/entry/ParsedEntryLink.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/ParsedEntryLink.java diff --git a/src/main/java/org/jabref/model/entry/SharedBibEntryData.java b/org.jabref.model/src/main/java/org/jabref/model/entry/SharedBibEntryData.java similarity index 100% rename from src/main/java/org/jabref/model/entry/SharedBibEntryData.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/SharedBibEntryData.java diff --git a/src/main/java/org/jabref/model/entry/event/EntryChangedEvent.java b/org.jabref.model/src/main/java/org/jabref/model/entry/event/EntryChangedEvent.java similarity index 100% rename from src/main/java/org/jabref/model/entry/event/EntryChangedEvent.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/event/EntryChangedEvent.java diff --git a/src/main/java/org/jabref/model/entry/event/EntryEvent.java b/org.jabref.model/src/main/java/org/jabref/model/entry/event/EntryEvent.java similarity index 100% rename from src/main/java/org/jabref/model/entry/event/EntryEvent.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/event/EntryEvent.java diff --git a/src/main/java/org/jabref/model/entry/event/EntryEventSource.java b/org.jabref.model/src/main/java/org/jabref/model/entry/event/EntryEventSource.java similarity index 100% rename from src/main/java/org/jabref/model/entry/event/EntryEventSource.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/event/EntryEventSource.java diff --git a/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java b/org.jabref.model/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java similarity index 100% rename from src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java diff --git a/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java b/org.jabref.model/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java similarity index 100% rename from src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java diff --git a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java b/org.jabref.model/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java similarity index 100% rename from src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java diff --git a/src/main/java/org/jabref/model/entry/identifier/DOI.java b/org.jabref.model/src/main/java/org/jabref/model/entry/identifier/DOI.java similarity index 100% rename from src/main/java/org/jabref/model/entry/identifier/DOI.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/identifier/DOI.java diff --git a/src/main/java/org/jabref/model/entry/identifier/Eprint.java b/org.jabref.model/src/main/java/org/jabref/model/entry/identifier/Eprint.java similarity index 100% rename from src/main/java/org/jabref/model/entry/identifier/Eprint.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/identifier/Eprint.java diff --git a/src/main/java/org/jabref/model/entry/identifier/ISBN.java b/org.jabref.model/src/main/java/org/jabref/model/entry/identifier/ISBN.java similarity index 100% rename from src/main/java/org/jabref/model/entry/identifier/ISBN.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/identifier/ISBN.java diff --git a/src/main/java/org/jabref/model/entry/identifier/ISSN.java b/org.jabref.model/src/main/java/org/jabref/model/entry/identifier/ISSN.java similarity index 100% rename from src/main/java/org/jabref/model/entry/identifier/ISSN.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/identifier/ISSN.java diff --git a/src/main/java/org/jabref/model/entry/identifier/Identifier.java b/org.jabref.model/src/main/java/org/jabref/model/entry/identifier/Identifier.java similarity index 100% rename from src/main/java/org/jabref/model/entry/identifier/Identifier.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/identifier/Identifier.java diff --git a/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java b/org.jabref.model/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java similarity index 100% rename from src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java diff --git a/src/main/java/org/jabref/model/entry/specialfields/SpecialField.java b/org.jabref.model/src/main/java/org/jabref/model/entry/specialfields/SpecialField.java similarity index 100% rename from src/main/java/org/jabref/model/entry/specialfields/SpecialField.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/specialfields/SpecialField.java diff --git a/src/main/java/org/jabref/model/entry/specialfields/SpecialFieldValue.java b/org.jabref.model/src/main/java/org/jabref/model/entry/specialfields/SpecialFieldValue.java similarity index 100% rename from src/main/java/org/jabref/model/entry/specialfields/SpecialFieldValue.java rename to org.jabref.model/src/main/java/org/jabref/model/entry/specialfields/SpecialFieldValue.java diff --git a/src/main/java/org/jabref/model/groups/AbstractGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/AbstractGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/AbstractGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/AbstractGroup.java diff --git a/src/main/java/org/jabref/model/groups/AllEntriesGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/AllEntriesGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/AllEntriesGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/AllEntriesGroup.java diff --git a/src/main/java/org/jabref/model/groups/AutomaticGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/AutomaticGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/AutomaticGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/AutomaticGroup.java diff --git a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java diff --git a/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java diff --git a/src/main/java/org/jabref/model/groups/ExplicitGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/ExplicitGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/ExplicitGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/ExplicitGroup.java diff --git a/src/main/java/org/jabref/model/groups/GroupEntryChanger.java b/org.jabref.model/src/main/java/org/jabref/model/groups/GroupEntryChanger.java similarity index 100% rename from src/main/java/org/jabref/model/groups/GroupEntryChanger.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/GroupEntryChanger.java diff --git a/src/main/java/org/jabref/model/groups/GroupHierarchyType.java b/org.jabref.model/src/main/java/org/jabref/model/groups/GroupHierarchyType.java similarity index 100% rename from src/main/java/org/jabref/model/groups/GroupHierarchyType.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/GroupHierarchyType.java diff --git a/src/main/java/org/jabref/model/groups/GroupTreeNode.java b/org.jabref.model/src/main/java/org/jabref/model/groups/GroupTreeNode.java similarity index 100% rename from src/main/java/org/jabref/model/groups/GroupTreeNode.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/GroupTreeNode.java diff --git a/src/main/java/org/jabref/model/groups/KeywordGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/KeywordGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/KeywordGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/KeywordGroup.java diff --git a/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/RegexKeywordGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java diff --git a/src/main/java/org/jabref/model/groups/SearchGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/SearchGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/SearchGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/SearchGroup.java diff --git a/src/main/java/org/jabref/model/groups/TexGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/TexGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/TexGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/TexGroup.java diff --git a/src/main/java/org/jabref/model/groups/WordKeywordGroup.java b/org.jabref.model/src/main/java/org/jabref/model/groups/WordKeywordGroup.java similarity index 100% rename from src/main/java/org/jabref/model/groups/WordKeywordGroup.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/WordKeywordGroup.java diff --git a/src/main/java/org/jabref/model/groups/event/GroupUpdatedEvent.java b/org.jabref.model/src/main/java/org/jabref/model/groups/event/GroupUpdatedEvent.java similarity index 100% rename from src/main/java/org/jabref/model/groups/event/GroupUpdatedEvent.java rename to org.jabref.model/src/main/java/org/jabref/model/groups/event/GroupUpdatedEvent.java diff --git a/src/main/java/org/jabref/model/metadata/ContentSelector.java b/org.jabref.model/src/main/java/org/jabref/model/metadata/ContentSelector.java similarity index 100% rename from src/main/java/org/jabref/model/metadata/ContentSelector.java rename to org.jabref.model/src/main/java/org/jabref/model/metadata/ContentSelector.java diff --git a/src/main/java/org/jabref/model/metadata/ContentSelectors.java b/org.jabref.model/src/main/java/org/jabref/model/metadata/ContentSelectors.java similarity index 100% rename from src/main/java/org/jabref/model/metadata/ContentSelectors.java rename to org.jabref.model/src/main/java/org/jabref/model/metadata/ContentSelectors.java diff --git a/src/main/java/org/jabref/model/metadata/FileDirectoryPreferences.java b/org.jabref.model/src/main/java/org/jabref/model/metadata/FileDirectoryPreferences.java similarity index 100% rename from src/main/java/org/jabref/model/metadata/FileDirectoryPreferences.java rename to org.jabref.model/src/main/java/org/jabref/model/metadata/FileDirectoryPreferences.java diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/org.jabref.model/src/main/java/org/jabref/model/metadata/MetaData.java similarity index 100% rename from src/main/java/org/jabref/model/metadata/MetaData.java rename to org.jabref.model/src/main/java/org/jabref/model/metadata/MetaData.java diff --git a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java b/org.jabref.model/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java similarity index 100% rename from src/main/java/org/jabref/model/metadata/SaveOrderConfig.java rename to org.jabref.model/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java diff --git a/src/main/java/org/jabref/model/metadata/event/MetaDataChangedEvent.java b/org.jabref.model/src/main/java/org/jabref/model/metadata/event/MetaDataChangedEvent.java similarity index 100% rename from src/main/java/org/jabref/model/metadata/event/MetaDataChangedEvent.java rename to org.jabref.model/src/main/java/org/jabref/model/metadata/event/MetaDataChangedEvent.java diff --git a/src/main/java/org/jabref/model/pdf/FileAnnotation.java b/org.jabref.model/src/main/java/org/jabref/model/pdf/FileAnnotation.java similarity index 100% rename from src/main/java/org/jabref/model/pdf/FileAnnotation.java rename to org.jabref.model/src/main/java/org/jabref/model/pdf/FileAnnotation.java diff --git a/src/main/java/org/jabref/model/pdf/FileAnnotationType.java b/org.jabref.model/src/main/java/org/jabref/model/pdf/FileAnnotationType.java similarity index 100% rename from src/main/java/org/jabref/model/pdf/FileAnnotationType.java rename to org.jabref.model/src/main/java/org/jabref/model/pdf/FileAnnotationType.java diff --git a/src/main/java/org/jabref/model/search/GroupSearchQuery.java b/org.jabref.model/src/main/java/org/jabref/model/search/GroupSearchQuery.java similarity index 100% rename from src/main/java/org/jabref/model/search/GroupSearchQuery.java rename to org.jabref.model/src/main/java/org/jabref/model/search/GroupSearchQuery.java diff --git a/src/main/java/org/jabref/model/search/SearchMatcher.java b/org.jabref.model/src/main/java/org/jabref/model/search/SearchMatcher.java similarity index 100% rename from src/main/java/org/jabref/model/search/SearchMatcher.java rename to org.jabref.model/src/main/java/org/jabref/model/search/SearchMatcher.java diff --git a/src/main/java/org/jabref/model/search/matchers/AndMatcher.java b/org.jabref.model/src/main/java/org/jabref/model/search/matchers/AndMatcher.java similarity index 100% rename from src/main/java/org/jabref/model/search/matchers/AndMatcher.java rename to org.jabref.model/src/main/java/org/jabref/model/search/matchers/AndMatcher.java diff --git a/src/main/java/org/jabref/model/search/matchers/MatcherSet.java b/org.jabref.model/src/main/java/org/jabref/model/search/matchers/MatcherSet.java similarity index 100% rename from src/main/java/org/jabref/model/search/matchers/MatcherSet.java rename to org.jabref.model/src/main/java/org/jabref/model/search/matchers/MatcherSet.java diff --git a/src/main/java/org/jabref/model/search/matchers/MatcherSets.java b/org.jabref.model/src/main/java/org/jabref/model/search/matchers/MatcherSets.java similarity index 100% rename from src/main/java/org/jabref/model/search/matchers/MatcherSets.java rename to org.jabref.model/src/main/java/org/jabref/model/search/matchers/MatcherSets.java diff --git a/src/main/java/org/jabref/model/search/matchers/NotMatcher.java b/org.jabref.model/src/main/java/org/jabref/model/search/matchers/NotMatcher.java similarity index 100% rename from src/main/java/org/jabref/model/search/matchers/NotMatcher.java rename to org.jabref.model/src/main/java/org/jabref/model/search/matchers/NotMatcher.java diff --git a/src/main/java/org/jabref/model/search/matchers/OrMatcher.java b/org.jabref.model/src/main/java/org/jabref/model/search/matchers/OrMatcher.java similarity index 100% rename from src/main/java/org/jabref/model/search/matchers/OrMatcher.java rename to org.jabref.model/src/main/java/org/jabref/model/search/matchers/OrMatcher.java diff --git a/src/main/java/org/jabref/model/search/rules/ContainBasedSearchRule.java b/org.jabref.model/src/main/java/org/jabref/model/search/rules/ContainBasedSearchRule.java similarity index 100% rename from src/main/java/org/jabref/model/search/rules/ContainBasedSearchRule.java rename to org.jabref.model/src/main/java/org/jabref/model/search/rules/ContainBasedSearchRule.java diff --git a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java b/org.jabref.model/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java similarity index 100% rename from src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java rename to org.jabref.model/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java diff --git a/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java b/org.jabref.model/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java similarity index 100% rename from src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java rename to org.jabref.model/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java diff --git a/src/main/java/org/jabref/model/search/rules/SearchRule.java b/org.jabref.model/src/main/java/org/jabref/model/search/rules/SearchRule.java similarity index 100% rename from src/main/java/org/jabref/model/search/rules/SearchRule.java rename to org.jabref.model/src/main/java/org/jabref/model/search/rules/SearchRule.java diff --git a/src/main/java/org/jabref/model/search/rules/SearchRules.java b/org.jabref.model/src/main/java/org/jabref/model/search/rules/SearchRules.java similarity index 100% rename from src/main/java/org/jabref/model/search/rules/SearchRules.java rename to org.jabref.model/src/main/java/org/jabref/model/search/rules/SearchRules.java diff --git a/src/main/java/org/jabref/model/search/rules/SentenceAnalyzer.java b/org.jabref.model/src/main/java/org/jabref/model/search/rules/SentenceAnalyzer.java similarity index 100% rename from src/main/java/org/jabref/model/search/rules/SentenceAnalyzer.java rename to org.jabref.model/src/main/java/org/jabref/model/search/rules/SentenceAnalyzer.java diff --git a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java b/org.jabref.model/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java similarity index 100% rename from src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java rename to org.jabref.model/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java diff --git a/src/main/java/org/jabref/model/strings/StringUtil.java b/org.jabref.model/src/main/java/org/jabref/model/strings/StringUtil.java similarity index 100% rename from src/main/java/org/jabref/model/strings/StringUtil.java rename to org.jabref.model/src/main/java/org/jabref/model/strings/StringUtil.java diff --git a/src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java b/org.jabref.model/src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java similarity index 100% rename from src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java rename to org.jabref.model/src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java diff --git a/src/main/java/org/jabref/model/util/DummyFileUpdateMonitor.java b/org.jabref.model/src/main/java/org/jabref/model/util/DummyFileUpdateMonitor.java similarity index 100% rename from src/main/java/org/jabref/model/util/DummyFileUpdateMonitor.java rename to org.jabref.model/src/main/java/org/jabref/model/util/DummyFileUpdateMonitor.java diff --git a/src/main/java/org/jabref/model/util/FileHelper.java b/org.jabref.model/src/main/java/org/jabref/model/util/FileHelper.java similarity index 100% rename from src/main/java/org/jabref/model/util/FileHelper.java rename to org.jabref.model/src/main/java/org/jabref/model/util/FileHelper.java diff --git a/src/main/java/org/jabref/model/util/FileUpdateListener.java b/org.jabref.model/src/main/java/org/jabref/model/util/FileUpdateListener.java similarity index 100% rename from src/main/java/org/jabref/model/util/FileUpdateListener.java rename to org.jabref.model/src/main/java/org/jabref/model/util/FileUpdateListener.java diff --git a/src/main/java/org/jabref/model/util/FileUpdateMonitor.java b/org.jabref.model/src/main/java/org/jabref/model/util/FileUpdateMonitor.java similarity index 100% rename from src/main/java/org/jabref/model/util/FileUpdateMonitor.java rename to org.jabref.model/src/main/java/org/jabref/model/util/FileUpdateMonitor.java diff --git a/src/main/java/org/jabref/model/util/OptionalUtil.java b/org.jabref.model/src/main/java/org/jabref/model/util/OptionalUtil.java similarity index 100% rename from src/main/java/org/jabref/model/util/OptionalUtil.java rename to org.jabref.model/src/main/java/org/jabref/model/util/OptionalUtil.java diff --git a/src/main/java/org/jabref/model/util/TreeCollector.java b/org.jabref.model/src/main/java/org/jabref/model/util/TreeCollector.java similarity index 100% rename from src/main/java/org/jabref/model/util/TreeCollector.java rename to org.jabref.model/src/main/java/org/jabref/model/util/TreeCollector.java diff --git a/settings.gradle b/settings.gradle index ee77a0edcfa..570c419492f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ rootProject.name = "JabRef" +include 'org.jabref.model', 'org.jabref.gui' From a0b13972e6ec2c33359aa38bdb6dcc4dc1e5bcf8 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 00:07:28 +0100 Subject: [PATCH 02/79] Result of linter --- org.jabref.gui/build.gradle | 32 +++++++++++++++++--------- org.jabref.model/build.gradle | 43 +++++++++-------------------------- 2 files changed, 32 insertions(+), 43 deletions(-) diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 6415757adac..f2cafbf75f7 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -54,25 +54,37 @@ sourceSets { } dependencies { + compile 'org.antlr:antlr-runtime:3.5.2' + compile 'org.apache.httpcomponents:httpclient:4.5.3' + compile 'org.json:json:20160212' + compile 'org.reactfx:reactfx:2.0-M5' + compile 'org.antlr:antlr4-runtime:4.7.1' + compile 'commons-io:commons-io:2.4' + compile 'org.apache.xmlgraphics:batik-ext:1.8' + compile 'org.apache.commons:commons-lang3:3.6' + compile 'de.jensd:fontawesomefx-commons:8.15' + compile 'org.jbibtex:jbibtex:1.0.15' + testCompile 'org.assertj:assertj-swing:3.8.0' + testCompile 'org.hamcrest:hamcrest-core:1.3' + testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' + testCompile 'com.tngtech.archunit:archunit:0.5.0' + testCompile 'org.assertj:assertj-core:3.8.0' + testCompile 'junit:junit:4.12' compile project(':org.jabref.model') compile fileTree(dir: 'lib', includes: ['*.jar']) - compile 'com.jgoodies:jgoodies-common:1.8.1' compile 'com.jgoodies:jgoodies-forms:1.9.0' // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 compile 'org.apache.pdfbox:pdfbox:1.8.13' - compile 'org.apache.pdfbox:fontbox:1.8.13' compile 'org.apache.pdfbox:jempbox:1.8.13' // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 - compile 'org.bouncycastle:bcprov-jdk15on:1.59' compile 'commons-cli:commons-cli:1.4' compile "org.libreoffice:juh:5.4.2" - compile "org.libreoffice:jurt:5.4.2" compile "org.libreoffice:ridl:5.4.2" compile "org.libreoffice:unoil:5.4.2" @@ -80,7 +92,7 @@ dependencies { compile 'info.debatty:java-string-similarity:1.0.1' // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release" - compile 'mysql:mysql-connector-java:5.1.45' + runtime 'mysql:mysql-connector-java:5.1.45' compile 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1' @@ -105,17 +117,16 @@ dependencies { // >1.8.0-beta is required for java 9 compatibility compile 'org.slf4j:slf4j-api:1.8.0-beta1' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' - compile 'org.apache.logging.log4j:log4j-jcl:2.10.0' + runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' + runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' compile 'org.apache.logging.log4j:log4j-api:2.10.0' compile 'org.apache.logging.log4j:log4j-core:2.10.0' // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles - compile 'org.citationstyles:styles:1.0.1-SNAPSHOT' - compile 'org.citationstyles:locales:1.0.1-SNAPSHOT' + runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' + runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' compile 'de.undercouch:citeproc-java:1.0.1' - compile 'com.github.tomtung:latex2unicode_2.12:0.2.2' compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9' compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' @@ -124,7 +135,6 @@ dependencies { testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' - testCompile 'org.junit.platform:junit-platform-launcher:1.1.0-M2' testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' testCompile 'org.mockito:mockito-core:2.13.0' diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index 3d03f1aefd5..5f94393c43b 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -32,23 +32,15 @@ configurations { } dependencies { + compile 'commons-logging:commons-logging:1.2' + compile 'org.apache.commons:commons-lang3:3.6' // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 compile 'org.apache.pdfbox:pdfbox:1.8.13' - compile 'org.apache.pdfbox:fontbox:1.8.13' - compile 'org.apache.pdfbox:jempbox:1.8.13' // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 - compile 'org.bouncycastle:bcprov-jdk15on:1.59' - compile 'commons-cli:commons-cli:1.4' - compile "org.libreoffice:juh:5.4.2" - compile "org.libreoffice:jurt:5.4.2" - compile "org.libreoffice:ridl:5.4.2" - compile "org.libreoffice:unoil:5.4.2" - compile 'com.github.bkromhout:java-diff-utils:2.1.1' - compile 'info.debatty:java-string-similarity:1.0.1' antlr3 'org.antlr:antlr:3.5.2' compile 'org.antlr:antlr-runtime:3.5.2' @@ -57,45 +49,32 @@ dependencies { compile 'org.antlr:antlr4-runtime:4.7.1' // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release" - compile 'mysql:mysql-connector-java:5.1.45' + runtime 'mysql:mysql-connector-java:5.1.45' - compile 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1' + runtime 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1' - compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1' compile 'com.google.guava:guava:24.0-jre' // JavaFX stuff - compile 'com.airhacks:afterburner.fx:1.7.0' - compile 'de.codecentric.centerdevice:javafxsvg:1.2.1' - compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' - compile 'de.saxsys:mvvmfx-validation:1.7.0' - compile 'org.fxmisc.easybind:easybind:1.0.3' - compile 'org.fxmisc.flowless:flowless:0.6' - compile 'org.fxmisc.richtext:richtextfx:0.8.2' // Cannot be updated to 9.*.* until Jabref works with Java 9 - compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT' + runtime 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT' - compile 'org.jsoup:jsoup:1.11.2' - compile 'com.mashape.unirest:unirest-java:1.4.9' // >1.8.0-beta is required for java 9 compatibility compile 'org.slf4j:slf4j-api:1.8.0-beta1' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' - compile 'org.apache.logging.log4j:log4j-jcl:2.10.0' - compile 'org.apache.logging.log4j:log4j-api:2.10.0' - compile 'org.apache.logging.log4j:log4j-core:2.10.0' + runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' + runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' + runtime 'org.apache.logging.log4j:log4j-api:2.10.0' + runtime 'org.apache.logging.log4j:log4j-core:2.10.0' // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles - compile 'org.citationstyles:styles:1.0.1-SNAPSHOT' - compile 'org.citationstyles:locales:1.0.1-SNAPSHOT' - compile 'de.undercouch:citeproc-java:1.0.1' + runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' + runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' compile 'com.github.tomtung:latex2unicode_2.12:0.2.2' - compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9' - compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' From 83b74c8fb274d8c3d0990390d15926b8052bf20b Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 01:01:48 +0100 Subject: [PATCH 03/79] Fix linter --- org.jabref.gui/build.gradle | 52 ++++++++++++------------ org.jabref.model/build.gradle | 75 +---------------------------------- 2 files changed, 27 insertions(+), 100 deletions(-) diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index f2cafbf75f7..915d2f4f7b5 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -54,34 +54,22 @@ sourceSets { } dependencies { - compile 'org.antlr:antlr-runtime:3.5.2' - compile 'org.apache.httpcomponents:httpclient:4.5.3' - compile 'org.json:json:20160212' - compile 'org.reactfx:reactfx:2.0-M5' - compile 'org.antlr:antlr4-runtime:4.7.1' - compile 'commons-io:commons-io:2.4' - compile 'org.apache.xmlgraphics:batik-ext:1.8' - compile 'org.apache.commons:commons-lang3:3.6' - compile 'de.jensd:fontawesomefx-commons:8.15' - compile 'org.jbibtex:jbibtex:1.0.15' - testCompile 'org.assertj:assertj-swing:3.8.0' - testCompile 'org.hamcrest:hamcrest-core:1.3' - testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' - testCompile 'com.tngtech.archunit:archunit:0.5.0' - testCompile 'org.assertj:assertj-core:3.8.0' - testCompile 'junit:junit:4.12' compile project(':org.jabref.model') compile fileTree(dir: 'lib', includes: ['*.jar']) + compile 'org.json:json:20160212' + + compile 'org.antlr:antlr-runtime:3.5.2' + compile 'org.antlr:antlr4-runtime:4.7.1' + compile 'com.jgoodies:jgoodies-forms:1.9.0' // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 compile 'org.apache.pdfbox:pdfbox:1.8.13' compile 'org.apache.pdfbox:jempbox:1.8.13' - // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 - + compile 'org.apache.commons:commons-lang3:3.6' compile 'commons-cli:commons-cli:1.4' compile "org.libreoffice:juh:5.4.2" @@ -103,49 +91,59 @@ dependencies { // JavaFX stuff compile 'com.airhacks:afterburner.fx:1.7.0' compile 'de.codecentric.centerdevice:javafxsvg:1.2.1' + compile 'de.jensd:fontawesomefx-commons:8.15' compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' compile 'de.saxsys:mvvmfx-validation:1.7.0' compile 'org.fxmisc.easybind:easybind:1.0.3' compile 'org.fxmisc.flowless:flowless:0.6' compile 'org.fxmisc.richtext:richtextfx:0.8.2' + compile 'org.reactfx:reactfx:2.0-M5' // Cannot be updated to 9.*.* until Jabref works with Java 9 compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT' compile 'org.jsoup:jsoup:1.11.2' compile 'com.mashape.unirest:unirest-java:1.4.9' + compile 'org.apache.httpcomponents:httpclient:4.5.3' + compile 'commons-io:commons-io:2.4' // >1.8.0-beta is required for java 9 compatibility compile 'org.slf4j:slf4j-api:1.8.0-beta1' - runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' - runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' compile 'org.apache.logging.log4j:log4j-api:2.10.0' compile 'org.apache.logging.log4j:log4j-core:2.10.0' + runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' + runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' + compile 'de.undercouch:citeproc-java:1.0.1' + compile 'org.jbibtex:jbibtex:1.0.17' // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' - compile 'de.undercouch:citeproc-java:1.0.1' - compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9' compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' + testCompile 'com.github.tomakehurst:wiremock:2.14.0' + testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' + testCompile 'junit:junit:4.12' + testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.mockito:mockito-core:2.13.0' - testCompile 'com.github.tomakehurst:wiremock:2.14.0' + testCompile 'org.assertj:assertj-core:3.8.0' + testCompile 'org.assertj:assertj-swing:3.8.0' testCompile 'org.assertj:assertj-swing-junit:3.8.0' + testCompile 'org.hamcrest:hamcrest-core:1.3' + testCompile 'org.mockito:mockito-core:2.13.0' testCompile 'org.reflections:reflections:0.9.11' - testCompile 'org.xmlunit:xmlunit-core:2.5.1' - testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' - testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' testCompile "org.testfx:testfx-core:4.0.+" testCompile "org.testfx:testfx-junit:4.0.+" + testCompile 'com.tngtech.archunit:archunit:0.5.0' + testCompile 'org.xmlunit:xmlunit-core:2.5.1' + testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index 5f94393c43b..ea63c4244af 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -34,13 +34,12 @@ configurations { dependencies { compile 'commons-logging:commons-logging:1.2' compile 'org.apache.commons:commons-lang3:3.6' + // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 compile 'org.apache.pdfbox:pdfbox:1.8.13' // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635 - - - + runtime 'org.bouncycastle:bcprov-jdk15on:1.59' antlr3 'org.antlr:antlr:3.5.2' compile 'org.antlr:antlr-runtime:3.5.2' @@ -48,26 +47,10 @@ dependencies { antlr4 'org.antlr:antlr4:4.7.1' compile 'org.antlr:antlr4-runtime:4.7.1' - // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release" - runtime 'mysql:mysql-connector-java:5.1.45' - - runtime 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1' - - compile 'com.google.guava:guava:24.0-jre' - // JavaFX stuff - - // Cannot be updated to 9.*.* until Jabref works with Java 9 - runtime 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT' - - // >1.8.0-beta is required for java 9 compatibility compile 'org.slf4j:slf4j-api:1.8.0-beta1' - runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' - runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' - runtime 'org.apache.logging.log4j:log4j-api:2.10.0' - runtime 'org.apache.logging.log4j:log4j-core:2.10.0' // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' @@ -75,24 +58,6 @@ dependencies { compile 'com.github.tomtung:latex2unicode_2.12:0.2.2' - - testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' - testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' - testCompile 'org.junit.platform:junit-platform-launcher:1.1.0-M2' - testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' - testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.mockito:mockito-core:2.13.0' - testCompile 'com.github.tomakehurst:wiremock:2.14.0' - testCompile 'org.assertj:assertj-swing-junit:3.8.0' - testCompile 'org.reflections:reflections:0.9.11' - testCompile 'org.xmlunit:xmlunit-core:2.5.1' - testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' - testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' - testCompile "org.testfx:testfx-core:4.0.+" - testCompile "org.testfx:testfx-junit:4.0.+" - checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } @@ -103,36 +68,6 @@ dependencyUpdates { // We have some dependencies which cannot be updated due to various reasons. dependencyUpdates.resolutionStrategy = { componentSelection { - withModule("org.controlsfx:controlsfx") { ComponentSelection selection -> - if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher - selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9") - } - } - withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> - if (selection.candidate.version.equals("1.0.10")) { - selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") - } - } - withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> - if (selection.candidate.version.equals("1.0.10")) { - selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") - } - } - withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> - if (selection.candidate.version.equals("2.0.0-BETA")) { - selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") - } - } - withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> - if (selection.candidate.version.equals("2.0.0-BETA")) { - selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") - } - } - withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("Cannot be upgraded to version 2") - } - } withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> if (selection.candidate.version ==~ /2.*/) { selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") @@ -143,12 +78,6 @@ dependencyUpdates.resolutionStrategy = { selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") } } - withModule("mysql:mysql-connector-java") { ComponentSelection selection -> - if (selection.candidate.version ==~ /[6-9].*/) { - selection.reject("http://dev.mysql.com/downloads/connector/j/ lists the version 5.* as last stable version.") - } - } - } } From 86714e9b3d7ad0c390728c1d15f2e79206a35552 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 01:37:11 +0100 Subject: [PATCH 04/79] Create org.jabref.logic package (besides logic.shared and logic.remote) --- .gitignore | 2 +- org.jabref.gui/build.gradle | 19 +- org.jabref.gui/settings.gradle | 2 +- org.jabref.logic/build.gradle | 281 ++++++++++++++++++ org.jabref.logic/settings.gradle | 1 + .../java/org/jabref/logic/TypedBibEntry.java | 0 .../autosaveandbackup/AutosaveManager.java | 0 .../autosaveandbackup/BackupManager.java | 0 .../logic/auxparser/DefaultAuxParser.java | 0 .../jabref/logic/bibtex/BibEntryWriter.java | 0 .../jabref/logic/bibtex/DuplicateCheck.java | 0 .../logic/bibtex/FieldContentParser.java | 0 .../bibtex/FieldContentParserPreferences.java | 0 .../bibtex/InvalidFieldValueException.java | 0 .../logic/bibtex/LatexFieldFormatter.java | 0 .../LatexFieldFormatterPreferences.java | 0 .../bibtex/comparator/BibDatabaseDiff.java | 0 .../logic/bibtex/comparator/BibEntryDiff.java | 0 .../bibtex/comparator/BibStringDiff.java | 0 .../comparator/BibtexStringComparator.java | 0 .../comparator/CrossRefEntryComparator.java | 0 .../bibtex/comparator/EntryComparator.java | 0 .../bibtex/comparator/FieldComparator.java | 0 .../comparator/FieldComparatorStack.java | 0 .../logic/bibtex/comparator/GroupDiff.java | 0 .../logic/bibtex/comparator/IdComparator.java | 0 .../logic/bibtex/comparator/MetaDataDiff.java | 0 .../logic/bibtex/comparator/PreambleDiff.java | 0 .../bibtexkeypattern/BibtexKeyGenerator.java | 0 .../BibtexKeyPatternPreferences.java | 0 .../bibtexkeypattern/BracketedPattern.java | 0 .../jabref/logic/bst/BibtexCaseChanger.java | 0 .../jabref/logic/bst/BibtexNameFormatter.java | 0 .../org/jabref/logic/bst/BibtexPurify.java | 0 .../jabref/logic/bst/BibtexTextPrefix.java | 0 .../org/jabref/logic/bst/BibtexWidth.java | 0 .../jabref/logic/bst/ChangeCaseFunction.java | 0 .../jabref/logic/bst/FormatNameFunction.java | 0 .../org/jabref/logic/bst/PurifyFunction.java | 0 .../jabref/logic/bst/TextPrefixFunction.java | 0 .../main/java/org/jabref/logic/bst/VM.java | 0 .../org/jabref/logic/bst/VMException.java | 0 .../main/java/org/jabref/logic/bst/Warn.java | 0 .../org/jabref/logic/bst/WidthFunction.java | 0 .../logic/citationstyle/CSLAdapter.java | 0 .../logic/citationstyle/CitationStyle.java | 0 .../citationstyle/CitationStyleCache.java | 0 .../citationstyle/CitationStyleGenerator.java | 0 .../CitationStyleOutputFormat.java | 0 .../logic/cleanup/CleanupPreferences.java | 0 .../jabref/logic/cleanup/CleanupPreset.java | 0 .../jabref/logic/cleanup/CleanupWorker.java | 0 .../org/jabref/logic/cleanup/Cleanups.java | 0 .../cleanup/ConvertToBiblatexCleanup.java | 0 .../logic/cleanup/ConvertToBibtexCleanup.java | 0 .../org/jabref/logic/cleanup/DoiCleanup.java | 0 .../logic/cleanup/FileLinksCleanup.java | 0 .../org/jabref/logic/cleanup/ISSNCleanup.java | 0 .../logic/cleanup/MoveFieldCleanup.java | 0 .../logic/cleanup/MoveFilesCleanup.java | 0 .../logic/cleanup/RelativePathsCleanup.java | 0 .../logic/cleanup/RenamePdfCleanup.java | 0 .../cleanup/UpgradePdfPsToFileCleanup.java | 0 .../logic/exporter/BibDatabaseWriter.java | 0 .../logic/exporter/BibTeXMLExporter.java | 0 .../logic/exporter/BibtexDatabaseWriter.java | 0 .../org/jabref/logic/exporter/Exporter.java | 0 .../logic/exporter/ExporterFactory.java | 0 .../logic/exporter/FileSaveSession.java | 0 .../logic/exporter/GroupSerializer.java | 0 .../jabref/logic/exporter/MSBibExporter.java | 0 .../logic/exporter/MetaDataSerializer.java | 0 .../jabref/logic/exporter/ModsExporter.java | 0 .../jabref/logic/exporter/OOCalcDatabase.java | 0 .../exporter/OpenDocumentRepresentation.java | 0 .../OpenDocumentSpreadsheetCreator.java | 0 .../exporter/OpenOfficeDocumentCreator.java | 0 .../jabref/logic/exporter/SaveException.java | 0 .../logic/exporter/SavePreferences.java | 0 .../jabref/logic/exporter/SaveSession.java | 0 .../logic/exporter/StringSaveSession.java | 0 .../logic/exporter/TemplateExporter.java | 0 .../logic/exporter/VerifyingWriter.java | 0 .../jabref/logic/formatter/Formatters.java | 0 .../logic/formatter/IdentityFormatter.java | 0 .../bibtexfields/ClearFormatter.java | 0 .../EscapeUnderscoresFormatter.java | 0 .../bibtexfields/HtmlToLatexFormatter.java | 0 .../bibtexfields/HtmlToUnicodeFormatter.java | 0 .../bibtexfields/LatexCleanupFormatter.java | 0 .../bibtexfields/NormalizeDateFormatter.java | 0 .../bibtexfields/NormalizeMonthFormatter.java | 0 .../bibtexfields/NormalizeNamesFormatter.java | 0 .../bibtexfields/NormalizePagesFormatter.java | 0 .../OrdinalsToSuperscriptFormatter.java | 0 .../bibtexfields/RegexFormatter.java | 0 .../bibtexfields/RemoveBracesFormatter.java | 0 .../RemoveHyphenatedNewlinesFormatter.java | 0 .../bibtexfields/RemoveNewlinesFormatter.java | 0 .../bibtexfields/UnicodeToLatexFormatter.java | 0 .../bibtexfields/UnitsToLatexFormatter.java | 0 .../casechanger/CapitalizeFormatter.java | 0 .../casechanger/LowerCaseFormatter.java | 0 .../casechanger/ProtectTermsFormatter.java | 0 .../casechanger/SentenceCaseFormatter.java | 0 .../logic/formatter/casechanger/Title.java | 0 .../casechanger/TitleCaseFormatter.java | 0 .../formatter/casechanger/TitleParser.java | 0 .../casechanger/UpperCaseFormatter.java | 0 .../logic/formatter/casechanger/Word.java | 0 .../minifier/MinifyNameListFormatter.java | 0 .../logic/groups/DefaultGroupsFactory.java | 0 .../java/org/jabref/logic/help/HelpFile.java | 0 .../logic/importer/EntryBasedFetcher.java | 0 .../importer/EntryBasedParserFetcher.java | 0 .../logic/importer/FetcherException.java | 0 .../logic/importer/FulltextFetcher.java | 0 .../logic/importer/FulltextFetchers.java | 0 .../jabref/logic/importer/IdBasedFetcher.java | 0 .../logic/importer/IdBasedParserFetcher.java | 0 .../org/jabref/logic/importer/IdFetcher.java | 0 .../logic/importer/IdParserFetcher.java | 0 .../logic/importer/ImportException.java | 0 .../importer/ImportFormatPreferences.java | 0 .../logic/importer/ImportFormatReader.java | 0 .../logic/importer/ImportInspector.java | 0 .../org/jabref/logic/importer/Importer.java | 0 .../jabref/logic/importer/OpenDatabase.java | 0 .../jabref/logic/importer/OutputPrinter.java | 0 .../jabref/logic/importer/ParseException.java | 0 .../org/jabref/logic/importer/Parser.java | 0 .../jabref/logic/importer/ParserResult.java | 0 .../logic/importer/SearchBasedFetcher.java | 0 .../importer/SearchBasedParserFetcher.java | 0 .../org/jabref/logic/importer/WebFetcher.java | 0 .../jabref/logic/importer/WebFetchers.java | 0 .../jabref/logic/importer/fetcher/ACS.java | 0 .../importer/fetcher/AbstractIsbnFetcher.java | 0 .../jabref/logic/importer/fetcher/ArXiv.java | 0 .../fetcher/AstrophysicsDataSystem.java | 0 .../importer/fetcher/BibsonomyScraper.java | 0 .../logic/importer/fetcher/CrossRef.java | 0 .../logic/importer/fetcher/DBLPFetcher.java | 0 .../jabref/logic/importer/fetcher/DiVA.java | 0 .../logic/importer/fetcher/DoiFetcher.java | 0 .../logic/importer/fetcher/DoiResolution.java | 0 .../logic/importer/fetcher/GoogleScholar.java | 0 .../logic/importer/fetcher/GvkFetcher.java | 0 .../jabref/logic/importer/fetcher/IEEE.java | 0 .../importer/fetcher/IacrEprintFetcher.java | 0 .../logic/importer/fetcher/IsbnFetcher.java | 0 .../fetcher/IsbnViaChimboriFetcher.java | 0 .../fetcher/IsbnViaEbookDeFetcher.java | 0 .../importer/fetcher/LibraryOfCongress.java | 0 .../logic/importer/fetcher/MathSciNet.java | 0 .../importer/fetcher/MedlineFetcher.java | 0 .../logic/importer/fetcher/MrDLibFetcher.java | 0 .../logic/importer/fetcher/OpenAccessDoi.java | 0 .../logic/importer/fetcher/ScienceDirect.java | 0 .../logic/importer/fetcher/SpringerLink.java | 0 .../logic/importer/fetcher/TitleFetcher.java | 0 .../jabref/logic/importer/fetcher/zbMATH.java | 0 .../importer/fileformat/BibTeXMLImporter.java | 0 .../fileformat/BiblioscapeImporter.java | 0 .../importer/fileformat/BibtexImporter.java | 0 .../importer/fileformat/BibtexParser.java | 0 .../importer/fileformat/CopacImporter.java | 0 .../importer/fileformat/CustomImporter.java | 0 .../importer/fileformat/EndnoteImporter.java | 0 .../importer/fileformat/FreeCiteImporter.java | 0 .../logic/importer/fileformat/GvkParser.java | 0 .../importer/fileformat/InspecImporter.java | 0 .../importer/fileformat/IsiImporter.java | 0 .../importer/fileformat/MedlineImporter.java | 0 .../fileformat/MedlinePlainImporter.java | 0 .../importer/fileformat/ModsImporter.java | 0 .../importer/fileformat/MrDLibImporter.java | 0 .../importer/fileformat/MsBibImporter.java | 0 .../importer/fileformat/OvidImporter.java | 0 .../fileformat/PdfContentImporter.java | 0 .../importer/fileformat/PdfXmpImporter.java | 0 .../importer/fileformat/RepecNepImporter.java | 0 .../importer/fileformat/RisImporter.java | 0 .../fileformat/SilverPlatterImporter.java | 0 .../fileformat/mods/package-info.java | 0 .../util/ConvertLegacyExplicitGroups.java | 0 .../logic/importer/util/GroupsParser.java | 0 .../util/INSPIREBibtexFilterReader.java | 0 .../logic/importer/util/IdentifierParser.java | 0 .../logic/importer/util/JSONEntryParser.java | 0 .../logic/importer/util/JsonReader.java | 0 .../logic/importer/util/MetaDataParser.java | 0 .../logic/importer/util/OAI2Handler.java | 0 .../logic/importer/util/PostOpenAction.java | 0 .../integrity/ASCIICharacterChecker.java | 0 .../logic/integrity/AbbreviationChecker.java | 0 .../logic/integrity/BibStringChecker.java | 0 .../integrity/BibTeXEntryTypeChecker.java | 0 .../logic/integrity/BibtexKeyChecker.java | 0 .../BibtexKeyDuplicationChecker.java | 0 .../integrity/BibtexkeyDeviationChecker.java | 0 .../logic/integrity/BooktitleChecker.java | 0 .../logic/integrity/BracesCorrector.java | 0 .../logic/integrity/BracketChecker.java | 0 .../logic/integrity/DOIValidityChecker.java | 0 .../logic/integrity/EditionChecker.java | 0 .../logic/integrity/EntryLinkChecker.java | 0 .../jabref/logic/integrity/FieldChecker.java | 0 .../jabref/logic/integrity/FieldCheckers.java | 0 .../jabref/logic/integrity/FileChecker.java | 0 .../logic/integrity/HTMLCharacterChecker.java | 0 .../logic/integrity/HowPublishedChecker.java | 0 .../jabref/logic/integrity/ISBNChecker.java | 0 .../jabref/logic/integrity/ISSNChecker.java | 0 .../logic/integrity/IntegrityCheck.java | 0 .../logic/integrity/IntegrityMessage.java | 0 .../JournalInAbbreviationListChecker.java | 0 .../jabref/logic/integrity/MonthChecker.java | 0 .../logic/integrity/NoBibtexFieldChecker.java | 0 .../jabref/logic/integrity/NoteChecker.java | 0 .../jabref/logic/integrity/PagesChecker.java | 0 .../logic/integrity/PersonNamesChecker.java | 0 .../jabref/logic/integrity/TitleChecker.java | 0 .../jabref/logic/integrity/TypeChecker.java | 0 .../jabref/logic/integrity/UrlChecker.java | 0 .../integrity/ValidBibtexKeyChecker.java | 0 .../jabref/logic/integrity/ValueChecker.java | 0 .../jabref/logic/integrity/YearChecker.java | 0 .../jabref/logic/journals/Abbreviation.java | 0 .../logic/journals/AbbreviationParser.java | 0 .../logic/journals/AbbreviationWriter.java | 0 .../journals/JournalAbbreviationLoader.java | 0 .../JournalAbbreviationPreferences.java | 0 .../JournalAbbreviationRepository.java | 0 .../jabref/logic/l10n/EncodingControl.java | 0 .../java/org/jabref/logic/l10n/Encodings.java | 0 .../java/org/jabref/logic/l10n/Languages.java | 0 .../org/jabref/logic/l10n/Localization.java | 0 .../jabref/logic/l10n/LocalizationKey.java | 0 .../logic/l10n/LocalizationKeyParams.java | 0 .../layout/AbstractParamLayoutFormatter.java | 0 .../java/org/jabref/logic/layout/Layout.java | 0 .../org/jabref/logic/layout/LayoutEntry.java | 0 .../jabref/logic/layout/LayoutFormatter.java | 0 .../layout/LayoutFormatterPreferences.java | 0 .../org/jabref/logic/layout/LayoutHelper.java | 0 .../logic/layout/ParamLayoutFormatter.java | 0 .../org/jabref/logic/layout/StringInt.java | 0 .../layout/format/AuthorAbbreviator.java | 0 .../format/AuthorAndToSemicolonReplacer.java | 0 .../format/AuthorAndsCommaReplacer.java | 0 .../layout/format/AuthorAndsReplacer.java | 0 .../format/AuthorFirstAbbrLastCommas.java | 0 .../AuthorFirstAbbrLastOxfordCommas.java | 0 .../logic/layout/format/AuthorFirstFirst.java | 0 .../layout/format/AuthorFirstFirstCommas.java | 0 .../layout/format/AuthorFirstLastCommas.java | 0 .../format/AuthorFirstLastOxfordCommas.java | 0 .../logic/layout/format/AuthorLF_FF.java | 0 .../logic/layout/format/AuthorLF_FFAbbr.java | 0 .../logic/layout/format/AuthorLastFirst.java | 0 .../format/AuthorLastFirstAbbrCommas.java | 0 .../AuthorLastFirstAbbrOxfordCommas.java | 0 .../format/AuthorLastFirstAbbreviator.java | 0 .../layout/format/AuthorLastFirstCommas.java | 0 .../format/AuthorLastFirstOxfordCommas.java | 0 .../logic/layout/format/AuthorNatBib.java | 0 .../logic/layout/format/AuthorOrgSci.java | 0 .../jabref/logic/layout/format/Authors.java | 0 .../logic/layout/format/CompositeFormat.java | 0 .../layout/format/CreateBibORDFAuthors.java | 0 .../layout/format/CreateDocBookAuthors.java | 0 .../layout/format/CreateDocBookEditors.java | 0 .../logic/layout/format/CurrentDate.java | 0 .../jabref/logic/layout/format/DOICheck.java | 0 .../jabref/logic/layout/format/DOIStrip.java | 0 .../logic/layout/format/DateFormatter.java | 0 .../jabref/logic/layout/format/Default.java | 0 .../layout/format/EntryTypeFormatter.java | 0 .../jabref/logic/layout/format/FileLink.java | 0 .../layout/format/FileLinkPreferences.java | 0 .../jabref/logic/layout/format/FirstPage.java | 0 .../layout/format/FormatPagesForHTML.java | 0 .../layout/format/FormatPagesForXML.java | 0 .../layout/format/GetOpenOfficeType.java | 0 .../jabref/logic/layout/format/HTMLChars.java | 0 .../logic/layout/format/HTMLParagraphs.java | 0 .../jabref/logic/layout/format/IfPlural.java | 0 .../logic/layout/format/Iso690FormatDate.java | 0 .../layout/format/Iso690NamesAuthors.java | 0 .../layout/format/JournalAbbreviator.java | 0 .../jabref/logic/layout/format/LastPage.java | 0 .../format/LatexToUnicodeFormatter.java | 0 .../logic/layout/format/NameFormatter.java | 0 .../format/NameFormatterPreferences.java | 0 .../format/NoSpaceBetweenAbbreviations.java | 0 .../layout/format/NotFoundFormatter.java | 0 .../jabref/logic/layout/format/Number.java | 0 .../jabref/logic/layout/format/Ordinal.java | 0 .../jabref/logic/layout/format/RTFChars.java | 0 .../logic/layout/format/RemoveBrackets.java | 0 .../layout/format/RemoveBracketsAddComma.java | 0 .../format/RemoveLatexCommandsFormatter.java | 0 .../logic/layout/format/RemoveTilde.java | 0 .../logic/layout/format/RemoveWhitespace.java | 0 .../jabref/logic/layout/format/Replace.java | 0 .../logic/layout/format/RisAuthors.java | 0 .../logic/layout/format/RisKeywords.java | 0 .../jabref/logic/layout/format/RisMonth.java | 0 .../logic/layout/format/ToLowerCase.java | 0 .../logic/layout/format/ToUpperCase.java | 0 .../logic/layout/format/WrapContent.java | 0 .../logic/layout/format/WrapFileLinks.java | 0 .../jabref/logic/layout/format/XMLChars.java | 0 .../jabref/logic/logging/JabRefLogger.java | 0 .../org/jabref/logic/logging/LogMessages.java | 0 .../jabref/logic/msbib/BibTeXConverter.java | 0 .../jabref/logic/msbib/MSBibConverter.java | 0 .../org/jabref/logic/msbib/MSBibDatabase.java | 0 .../org/jabref/logic/msbib/MSBibEntry.java | 0 .../jabref/logic/msbib/MSBibEntryType.java | 0 .../org/jabref/logic/msbib/MSBibMapping.java | 0 .../org/jabref/logic/msbib/MsBibAuthor.java | 0 .../org/jabref/logic/msbib/PageNumbers.java | 0 .../jabref/logic/net/ProgressInputStream.java | 0 .../jabref/logic/net/ProxyAuthenticator.java | 0 .../jabref/logic/net/ProxyPreferences.java | 0 .../org/jabref/logic/net/ProxyRegisterer.java | 0 .../org/jabref/logic/net/URLDownload.java | 0 .../java/org/jabref/logic/net/URLUtil.java | 0 .../logic/openoffice/CitationEntry.java | 0 .../jabref/logic/openoffice/OOBibStyle.java | 0 .../logic/openoffice/OOPreFormatter.java | 0 .../org/jabref/logic/openoffice/OOUtil.java | 0 .../openoffice/OpenOfficeFileSearch.java | 0 .../openoffice/OpenOfficePreferences.java | 0 .../jabref/logic/openoffice/StyleLoader.java | 0 .../openoffice/UndefinedBibtexEntry.java | 0 .../UndefinedParagraphFormatException.java | 0 .../jabref/logic/pdf/AnnotationImporter.java | 0 .../logic/pdf/EntryAnnotationImporter.java | 0 .../jabref/logic/pdf/FileAnnotationCache.java | 0 .../logic/pdf/PdfAnnotationImporter.java | 0 .../org/jabref/logic/pdf/TextExtractor.java | 0 .../preferences/TimestampPreferences.java | 0 .../protectedterms/ProtectedTermsList.java | 0 .../protectedterms/ProtectedTermsLoader.java | 0 .../protectedterms/ProtectedTermsParser.java | 0 .../ProtectedTermsPreferences.java | 0 .../jabref/logic/search/DatabaseSearcher.java | 0 .../org/jabref/logic/search/SearchQuery.java | 0 .../search/SearchQueryHighlightListener.java | 0 .../SearchQueryHighlightObservable.java | 0 .../specialfields/SpecialFieldsUtils.java | 0 .../logic/undo/AddUndoableActionEvent.java | 0 .../jabref/logic/undo/UndoChangeEvent.java | 0 .../org/jabref/logic/undo/UndoRedoEvent.java | 0 .../java/org/jabref/logic/util/BuildInfo.java | 0 .../java/org/jabref/logic/util/FileType.java | 0 .../org/jabref/logic/util/JavaVersion.java | 0 .../MetadataSerializationConfiguration.java | 0 .../main/java/org/jabref/logic/util/OS.java | 0 .../java/org/jabref/logic/util/TestEntry.java | 0 .../org/jabref/logic/util/UpdateField.java | 0 .../logic/util/UpdateFieldPreferences.java | 0 .../java/org/jabref/logic/util/Version.java | 0 .../logic/util/io/AutoLinkPreferences.java | 0 .../logic/util/io/CiteKeyBasedFileFinder.java | 0 .../logic/util/io/DatabaseFileLookup.java | 0 .../jabref/logic/util/io/FileBasedLock.java | 0 .../org/jabref/logic/util/io/FileFinder.java | 0 .../org/jabref/logic/util/io/FileFinders.java | 0 .../org/jabref/logic/util/io/FileHistory.java | 0 .../jabref/logic/util/io/FileNameCleaner.java | 0 .../org/jabref/logic/util/io/FileUtil.java | 0 .../logic/util/io/RegExpBasedFileFinder.java | 0 .../org/jabref/logic/util/io/XMLUtil.java | 0 .../logic/util/strings/DiffHighlighting.java | 0 .../strings/HTMLUnicodeConversionMaps.java | 0 .../util/strings/QuotedStringTokenizer.java | 0 .../jabref/logic/util/strings/RtfCharMap.java | 0 .../util/strings/StringLengthComparator.java | 0 .../logic/util/strings/StringSimilarity.java | 0 .../logic/util/strings/XmlCharsMap.java | 0 .../EncryptedPdfsNotSupportedException.java | 0 .../org/jabref/logic/xmp/XMPPreferences.java | 0 .../org/jabref/logic/xmp/XMPSchemaBibtex.java | 0 .../java/org/jabref/logic/xmp/XMPUtil.java | 0 .../main/resources/xjc/bibtexml/bibtexml.xsd | 0 .../resources/xjc/medline/bookdoc_160101.xsd | 0 .../main/resources/xjc/medline/medline.xsd | 0 .../medline/nlmmedlinecitationset_160101.xsd | 0 .../src/main/resources/xjc/mods/mods-3-6.xsd | 0 .../main/resources/xjc/mods/mods-binding.xjb | 0 .../xjc.gradle | 0 settings.gradle | 2 +- 396 files changed, 286 insertions(+), 21 deletions(-) create mode 100644 org.jabref.logic/build.gradle create mode 100644 org.jabref.logic/settings.gradle rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/TypedBibEntry.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/FieldContentParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/FieldContentParserPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/InvalidFieldValueException.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatterPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/BibtexPurify.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/BibtexWidth.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/FormatNameFunction.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/PurifyFunction.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/VM.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/VMException.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/Warn.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/bst/WidthFunction.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/Cleanups.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/Exporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/ExporterFactory.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/FileSaveSession.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/GroupSerializer.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/MSBibExporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/ModsExporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/SaveException.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/SavePreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/SaveSession.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/StringSaveSession.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/TemplateExporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/Formatters.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/casechanger/Title.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/casechanger/Word.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/help/HelpFile.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/FetcherException.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/FulltextFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/FulltextFetchers.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/IdFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/IdParserFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/ImportException.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/ImportFormatReader.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/ImportInspector.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/Importer.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/OpenDatabase.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/OutputPrinter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/ParseException.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/Parser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/ParserResult.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/WebFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/WebFetchers.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/ACS.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroups.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/util/GroupsParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/util/INSPIREBibtexFilterReader.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/util/JsonReader.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/util/OAI2Handler.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/importer/util/PostOpenAction.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/BibStringChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/BibtexKeyChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/BibtexKeyDuplicationChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/BibtexkeyDeviationChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/BracesCorrector.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/BracketChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/DOIValidityChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/EditionChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/FieldChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/FieldCheckers.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/FileChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/ISBNChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/ISSNChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/MonthChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/NoteChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/PagesChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/TitleChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/TypeChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/UrlChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/ValidBibtexKeyChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/ValueChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/integrity/YearChecker.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/journals/Abbreviation.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/journals/AbbreviationParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/l10n/EncodingControl.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/l10n/Encodings.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/l10n/Languages.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/l10n/Localization.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/l10n/LocalizationKey.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/Layout.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/LayoutEntry.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/LayoutFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/LayoutHelper.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/StringInt.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorAbbreviator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommas.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommas.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirst.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommas.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorLF_FF.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorLF_FFAbbr.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorLastFirst.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommas.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommas.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstCommas.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommas.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorNatBib.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/AuthorOrgSci.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/Authors.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/CurrentDate.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/DOICheck.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/DOIStrip.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/DateFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/Default.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/FileLink.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/FileLinkPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/FirstPage.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/FormatPagesForHTML.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/FormatPagesForXML.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/GetOpenOfficeType.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/HTMLChars.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/IfPlural.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/LastPage.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/NameFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviations.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/Number.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/Ordinal.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/RTFChars.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/Replace.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/RisAuthors.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/RisKeywords.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/RisMonth.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/WrapContent.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/layout/format/XMLChars.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/logging/JabRefLogger.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/logging/LogMessages.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/msbib/MSBibConverter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/msbib/MSBibEntry.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/msbib/MSBibMapping.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/msbib/PageNumbers.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/net/ProgressInputStream.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/net/ProxyPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/net/ProxyRegisterer.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/net/URLDownload.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/net/URLUtil.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/openoffice/CitationEntry.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/openoffice/OOPreFormatter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/openoffice/OOUtil.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/openoffice/StyleLoader.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/pdf/TextExtractor.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/search/DatabaseSearcher.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/search/SearchQuery.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/search/SearchQueryHighlightListener.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/search/SearchQueryHighlightObservable.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/BuildInfo.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/FileType.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/JavaVersion.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/OS.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/TestEntry.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/UpdateField.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/UpdateFieldPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/Version.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/FileBasedLock.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/FileFinder.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/FileFinders.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/FileHistory.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/FileUtil.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/io/XMLUtil.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/strings/RtfCharMap.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/strings/StringLengthComparator.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/xmp/EncryptedPdfsNotSupportedException.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/xmp/XMPPreferences.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/java/org/jabref/logic/xmp/XMPUtil.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/resources/xjc/bibtexml/bibtexml.xsd (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/resources/xjc/medline/bookdoc_160101.xsd (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/resources/xjc/medline/medline.xsd (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/resources/xjc/mods/mods-3-6.xsd (100%) rename {org.jabref.gui => org.jabref.logic}/src/main/resources/xjc/mods/mods-binding.xjb (100%) rename {org.jabref.gui => org.jabref.logic}/xjc.gradle (100%) diff --git a/.gitignore b/.gitignore index eef074f6e45..71a39acbb6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # no generated files in version control -src/main/gen/ +**/src/main/gen/ # private data /buildres/jabref-cert-2016.p12 diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 915d2f4f7b5..5493e1228aa 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -31,8 +31,6 @@ apply plugin: 'install4j' apply plugin: 'me.champeau.gradle.jmh' apply plugin: 'org.junit.platform.gradle.plugin' -apply from: 'xjc.gradle' - project.ext.threeDotVersion = "4.1.0.1" project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j6' : 'install4j6') mainClassName = "org.jabref.JabRefMain" @@ -41,20 +39,9 @@ mainClassName = "org.jabref.JabRefMain" ext.minRequiredJavaVersion = "1.8.0_144" ext.allowJava9 = false -sourceSets { - main { - java { - srcDirs = ["src/main/java", "src/main/gen"] - } - - resources { - srcDirs = ["src/main/java", "src/main/resources"] - } - } -} - dependencies { compile project(':org.jabref.model') + compile project(':org.jabref.logic') compile fileTree(dir: 'lib', includes: ['*.jar']) @@ -211,10 +198,6 @@ task checkOutdatedDependencies(dependsOn: dependencyUpdates) { } } -clean { - delete "src/main/gen" -} - processResources { filteringCharset = 'UTF-8' diff --git a/org.jabref.gui/settings.gradle b/org.jabref.gui/settings.gradle index 08cd0c3de41..1b2e190cd6a 100644 --- a/org.jabref.gui/settings.gradle +++ b/org.jabref.gui/settings.gradle @@ -1 +1 @@ -include 'org.jabref.model' +include 'org.jabref.model', 'org.jabref.logic' diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle new file mode 100644 index 00000000000..552193027e0 --- /dev/null +++ b/org.jabref.logic/build.gradle @@ -0,0 +1,281 @@ +import groovy.json.JsonSlurper +import org.gradle.internal.os.OperatingSystem + +plugins { + id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" + id "com.simonharrer.modernizer" version '1.5.0-1' + id 'me.champeau.gradle.jmh' version '0.4.3' + id 'net.ltgt.errorprone' version '0.0.13' + id 'com.github.ben-manes.versions' version '0.17.0' +} + +apply plugin: 'project-report' +apply plugin: 'jacoco' +apply plugin: 'me.champeau.gradle.jmh' +apply plugin: 'org.junit.platform.gradle.plugin' +apply from: 'xjc.gradle' + +sourceSets { + main { + java { + srcDirs = ["src/main/java", "src/main/gen"] + } + + resources { + srcDirs = ["src/main/java", "src/main/resources"] + } + } +} + +dependencies { + compile project(':org.jabref.model') + + compile 'org.json:json:20160212' + + compile 'org.antlr:antlr-runtime:3.5.2' + compile 'org.antlr:antlr4-runtime:4.7.1' + + compile 'com.jgoodies:jgoodies-forms:1.9.0' + + // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 + compile 'org.apache.pdfbox:pdfbox:1.8.13' + compile 'org.apache.pdfbox:jempbox:1.8.13' + + compile 'org.apache.commons:commons-lang3:3.6' + compile 'commons-cli:commons-cli:1.4' + + compile "org.libreoffice:juh:5.4.2" + compile "org.libreoffice:ridl:5.4.2" + compile "org.libreoffice:unoil:5.4.2" + + compile 'com.github.bkromhout:java-diff-utils:2.1.1' + compile 'info.debatty:java-string-similarity:1.0.1' + + // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release" + runtime 'mysql:mysql-connector-java:5.1.45' + + compile 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1' + + compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1' + + compile 'com.google.guava:guava:24.0-jre' + + // JavaFX stuff + compile 'com.airhacks:afterburner.fx:1.7.0' + compile 'de.codecentric.centerdevice:javafxsvg:1.2.1' + compile 'de.jensd:fontawesomefx-commons:8.15' + compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' + compile 'de.saxsys:mvvmfx-validation:1.7.0' + compile 'org.fxmisc.easybind:easybind:1.0.3' + compile 'org.fxmisc.flowless:flowless:0.6' + compile 'org.fxmisc.richtext:richtextfx:0.8.2' + compile 'org.reactfx:reactfx:2.0-M5' + + // Cannot be updated to 9.*.* until Jabref works with Java 9 + compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT' + + compile 'org.jsoup:jsoup:1.11.2' + compile 'com.mashape.unirest:unirest-java:1.4.9' + compile 'org.apache.httpcomponents:httpclient:4.5.3' + compile 'commons-io:commons-io:2.4' + + // >1.8.0-beta is required for java 9 compatibility + compile 'org.slf4j:slf4j-api:1.8.0-beta1' + compile 'org.apache.logging.log4j:log4j-api:2.10.0' + compile 'org.apache.logging.log4j:log4j-core:2.10.0' + runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' + runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' + + compile 'de.undercouch:citeproc-java:1.0.1' + compile 'org.jbibtex:jbibtex:1.0.17' + // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles + runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' + runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' + + compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9' + compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' + + testCompile 'com.github.tomakehurst:wiremock:2.14.0' + testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' + testCompile 'junit:junit:4.12' + testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' + testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' + testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' + testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' + testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' + testCompile 'org.assertj:assertj-core:3.8.0' + testCompile 'org.assertj:assertj-swing:3.8.0' + testCompile 'org.assertj:assertj-swing-junit:3.8.0' + testCompile 'org.hamcrest:hamcrest-core:1.3' + testCompile 'org.mockito:mockito-core:2.13.0' + testCompile 'org.reflections:reflections:0.9.11' + testCompile "org.testfx:testfx-core:4.0.+" + testCompile "org.testfx:testfx-junit:4.0.+" + testCompile 'com.tngtech.archunit:archunit:0.5.0' + testCompile 'org.xmlunit:xmlunit-core:2.5.1' + testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' + + checkstyle 'com.puppycrawl.tools:checkstyle:8.8' +} + +dependencyUpdates { + outputFormatter = "json" +} + +// We have some dependencies which cannot be updated due to various reasons. +dependencyUpdates.resolutionStrategy = { + componentSelection { + withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") + } + } + withModule("org.apache.pdfbox:pdfbox") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") + } + } + } +} + +task checkOutdatedDependencies(dependsOn: dependencyUpdates) { + doLast { + def dependencyReport = new JsonSlurper().parseText(new File("build/dependencyUpdates/report.json").text) + assert dependencyReport.outdated.count == 0: "There are outdated dependencies in build.gradle!\n Run ./gradlew dependencyUpdates to see which" + } +} + +clean { + delete "src/main/gen" +} + +compileJava { + options.encoding = 'UTF-8' + options.compilerArgs << "-Xlint:none" +} + +compileTestJava { + options.encoding = 'UTF-8' +} + +javadoc { + options { + encoding = 'UTF-8' + version = true + author = true + } +} + +// Test tasks +junitPlatform { + logManager 'org.apache.logging.log4j.jul.LogManager' +} + +// Test result tasks +task copyTestResources(type: Copy) { + from "${projectDir}/src/test/resources" + into "${buildDir}/classes/test" +} +processTestResources.dependsOn copyTestResources + +tasks.withType(Test) { + reports.html.destination = file("${reporting.baseDir}/${name}") + + jacoco { + append = true + } +} + +task jacocoMerge(type: JacocoMerge) { + executionData file("$buildDir/jacoco/junitPlatformTest.exec") + dependsOn junitPlatformTest +} + +jacocoTestReport { + executionData jacocoMerge.destinationFile + dependsOn jacocoMerge + + reports { + xml.enabled = true // coveralls plugin depends on xml format report + html.enabled = true + } +} + +afterEvaluate { + def junitPlatformTest = tasks.junitPlatformTest + + jacoco { + toolVersion = '0.8.0' + applyTo(junitPlatformTest) + } + + task jacocoJunit5TestReport(type: JacocoReport) { + executionData jacocoMerge.destinationFile + dependsOn jacocoMerge + sourceSets sourceSets.main + sourceDirectories = files(sourceSets.main.allSource.srcDirs) + classDirectories = files(sourceSets.main.output) + + reports { + xml.enabled true + html.enabled true + } + } +} + +// Code quality tasks +checkstyle { + // do not use other packages for checkstyle, excluding gen(erated) sources + checkstyleMain.source = "src/main/java" + toolVersion = '8.5' +} + +checkstyleMain.shouldRunAfter test +checkstyleTest.shouldRunAfter test + +modernizer { + // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. + // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer + failOnViolations = false +} + +/* + * Changes project.version to VERSION--snapshot--DATE--GIT_HASH + */ +if (hasProperty('dev')) { + String command = "git log --pretty=format:%cd--%h -n 1 --date=short" + String commitInfo = "" + if (OperatingSystem.current().isWindows()) { + commitInfo = "cmd /c $command".execute().in.text + } else { + commitInfo = command.execute().in.text + } + + // determine branch + command = "git symbolic-ref -q --short HEAD" + String branchName = "" + if (OperatingSystem.current().isWindows()) { + branchName = "cmd /c $command".execute().in.text + } else { + branchName = command.execute().in.text + } + // A newline is returned. Remove it. (trim()) + // In the context of github, the branch name could be something like "pull/277" + // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" + // http://stackoverflow.com/a/15075907/873282 describes the used pattern. + branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") + + // hack string + // first the date (%cd), then the branch name, and finally the commit id (%h) + String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) + + project.version += "--snapshot--" + infoString +} + +jmh { + warmupIterations = 5 + iterations = 10 + fork = 2 +} diff --git a/org.jabref.logic/settings.gradle b/org.jabref.logic/settings.gradle new file mode 100644 index 00000000000..08cd0c3de41 --- /dev/null +++ b/org.jabref.logic/settings.gradle @@ -0,0 +1 @@ +include 'org.jabref.model' diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/TypedBibEntry.java b/org.jabref.logic/src/main/java/org/jabref/logic/TypedBibEntry.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/TypedBibEntry.java rename to org.jabref.logic/src/main/java/org/jabref/logic/TypedBibEntry.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java b/org.jabref.logic/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java rename to org.jabref.logic/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/org.jabref.logic/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java rename to org.jabref.logic/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/FieldContentParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/FieldContentParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/FieldContentParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/FieldContentParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/FieldContentParserPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/FieldContentParserPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/FieldContentParserPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/FieldContentParserPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/InvalidFieldValueException.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/InvalidFieldValueException.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/InvalidFieldValueException.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/InvalidFieldValueException.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatterPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatterPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatterPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatterPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java b/org.jabref.logic/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexPurify.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/BibtexPurify.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexPurify.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/BibtexPurify.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexWidth.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/BibtexWidth.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/BibtexWidth.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/BibtexWidth.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/FormatNameFunction.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/FormatNameFunction.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/FormatNameFunction.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/FormatNameFunction.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/PurifyFunction.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/PurifyFunction.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/PurifyFunction.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/PurifyFunction.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/VM.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/VM.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/VM.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/VM.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/VMException.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/VMException.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/VMException.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/VMException.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/Warn.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/Warn.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/Warn.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/Warn.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/bst/WidthFunction.java b/org.jabref.logic/src/main/java/org/jabref/logic/bst/WidthFunction.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/bst/WidthFunction.java rename to org.jabref.logic/src/main/java/org/jabref/logic/bst/WidthFunction.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java b/org.jabref.logic/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java b/org.jabref.logic/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java rename to org.jabref.logic/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java b/org.jabref.logic/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java rename to org.jabref.logic/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java b/org.jabref.logic/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java b/org.jabref.logic/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java rename to org.jabref.logic/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/Cleanups.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/Cleanups.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/Cleanups.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/Cleanups.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/Exporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/Exporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/Exporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/Exporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/ExporterFactory.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/ExporterFactory.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/ExporterFactory.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/FileSaveSession.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/FileSaveSession.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/FileSaveSession.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/FileSaveSession.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/GroupSerializer.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/GroupSerializer.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/GroupSerializer.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/GroupSerializer.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/MSBibExporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/MSBibExporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/MSBibExporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/MSBibExporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/ModsExporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/ModsExporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/ModsExporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/ModsExporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/SaveException.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/SaveException.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/SaveException.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/SaveException.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/SavePreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/SavePreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/SavePreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/SavePreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/SaveSession.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/SaveSession.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/SaveSession.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/SaveSession.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/StringSaveSession.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/StringSaveSession.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/StringSaveSession.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/StringSaveSession.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/TemplateExporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/TemplateExporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/TemplateExporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/Formatters.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/Formatters.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/Formatters.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/Formatters.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/Title.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/Title.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/Title.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/Title.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/Word.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/Word.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/casechanger/Word.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/casechanger/Word.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java b/org.jabref.logic/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java rename to org.jabref.logic/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/help/HelpFile.java b/org.jabref.logic/src/main/java/org/jabref/logic/help/HelpFile.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/help/HelpFile.java rename to org.jabref.logic/src/main/java/org/jabref/logic/help/HelpFile.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/FetcherException.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/FetcherException.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/FetcherException.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/FetcherException.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/FulltextFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/FulltextFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/FulltextFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/FulltextFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/FulltextFetchers.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/FulltextFetchers.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/FulltextFetchers.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/FulltextFetchers.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/IdFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/IdFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/IdFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/IdFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/IdParserFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/IdParserFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/IdParserFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/IdParserFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportException.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportException.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportException.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportException.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportFormatReader.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportFormatReader.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportFormatReader.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportFormatReader.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportInspector.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportInspector.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/ImportInspector.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportInspector.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/Importer.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/Importer.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/Importer.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/Importer.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/OpenDatabase.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/OpenDatabase.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/OpenDatabase.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/OpenDatabase.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/OutputPrinter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/OutputPrinter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/OutputPrinter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/OutputPrinter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/ParseException.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/ParseException.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/ParseException.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/ParseException.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/Parser.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/Parser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/Parser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/Parser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/ParserResult.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/ParserResult.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/ParserResult.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/ParserResult.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/WebFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/WebFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/WebFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/WebFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/WebFetchers.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/WebFetchers.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/WebFetchers.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/WebFetchers.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ACS.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/ACS.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ACS.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/ACS.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroups.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroups.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroups.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroups.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/GroupsParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/util/GroupsParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/util/GroupsParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/util/GroupsParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/INSPIREBibtexFilterReader.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/util/INSPIREBibtexFilterReader.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/util/INSPIREBibtexFilterReader.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/util/INSPIREBibtexFilterReader.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/JsonReader.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/util/JsonReader.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/util/JsonReader.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/util/JsonReader.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/OAI2Handler.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/util/OAI2Handler.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/util/OAI2Handler.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/util/OAI2Handler.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/importer/util/PostOpenAction.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/util/PostOpenAction.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/importer/util/PostOpenAction.java rename to org.jabref.logic/src/main/java/org/jabref/logic/importer/util/PostOpenAction.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibStringChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/BibStringChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibStringChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/BibStringChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexKeyChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/BibtexKeyChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexKeyChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/BibtexKeyChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexKeyDuplicationChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/BibtexKeyDuplicationChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexKeyDuplicationChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/BibtexKeyDuplicationChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexkeyDeviationChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/BibtexkeyDeviationChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/BibtexkeyDeviationChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/BibtexkeyDeviationChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BracesCorrector.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/BracesCorrector.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/BracesCorrector.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/BracesCorrector.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/BracketChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/BracketChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/BracketChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/BracketChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/DOIValidityChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/DOIValidityChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/DOIValidityChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/DOIValidityChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/EditionChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/EditionChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/EditionChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/EditionChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/FieldChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/FieldChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/FieldChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/FieldChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/FieldCheckers.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/FieldCheckers.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/FieldCheckers.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/FieldCheckers.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/FileChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/FileChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/FileChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/FileChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/ISBNChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/ISBNChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/ISBNChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/ISBNChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/ISSNChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/ISSNChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/ISSNChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/ISSNChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/MonthChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/MonthChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/MonthChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/MonthChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/NoteChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/NoteChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/NoteChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/NoteChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/PagesChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/PagesChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/PagesChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/TitleChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/TitleChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/TitleChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/TitleChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/TypeChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/TypeChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/TypeChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/TypeChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/UrlChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/UrlChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/UrlChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/UrlChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/ValidBibtexKeyChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/ValidBibtexKeyChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/ValidBibtexKeyChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/ValidBibtexKeyChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/ValueChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/ValueChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/ValueChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/ValueChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/integrity/YearChecker.java b/org.jabref.logic/src/main/java/org/jabref/logic/integrity/YearChecker.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/integrity/YearChecker.java rename to org.jabref.logic/src/main/java/org/jabref/logic/integrity/YearChecker.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/journals/Abbreviation.java b/org.jabref.logic/src/main/java/org/jabref/logic/journals/Abbreviation.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/journals/Abbreviation.java rename to org.jabref.logic/src/main/java/org/jabref/logic/journals/Abbreviation.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/journals/AbbreviationParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/journals/AbbreviationParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/journals/AbbreviationParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/journals/AbbreviationParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java b/org.jabref.logic/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java b/org.jabref.logic/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java rename to org.jabref.logic/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java b/org.jabref.logic/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java rename to org.jabref.logic/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/l10n/EncodingControl.java b/org.jabref.logic/src/main/java/org/jabref/logic/l10n/EncodingControl.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/l10n/EncodingControl.java rename to org.jabref.logic/src/main/java/org/jabref/logic/l10n/EncodingControl.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/l10n/Encodings.java b/org.jabref.logic/src/main/java/org/jabref/logic/l10n/Encodings.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/l10n/Encodings.java rename to org.jabref.logic/src/main/java/org/jabref/logic/l10n/Encodings.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/l10n/Languages.java b/org.jabref.logic/src/main/java/org/jabref/logic/l10n/Languages.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/l10n/Languages.java rename to org.jabref.logic/src/main/java/org/jabref/logic/l10n/Languages.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/l10n/Localization.java b/org.jabref.logic/src/main/java/org/jabref/logic/l10n/Localization.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/l10n/Localization.java rename to org.jabref.logic/src/main/java/org/jabref/logic/l10n/Localization.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/l10n/LocalizationKey.java b/org.jabref.logic/src/main/java/org/jabref/logic/l10n/LocalizationKey.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/l10n/LocalizationKey.java rename to org.jabref.logic/src/main/java/org/jabref/logic/l10n/LocalizationKey.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java b/org.jabref.logic/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java rename to org.jabref.logic/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/Layout.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/Layout.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/Layout.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/Layout.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/LayoutEntry.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutEntry.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/LayoutEntry.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/LayoutFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/LayoutFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutHelper.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/LayoutHelper.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/LayoutHelper.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/LayoutHelper.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/StringInt.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/StringInt.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/StringInt.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/StringInt.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAbbreviator.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorAbbreviator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAbbreviator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorAbbreviator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommas.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommas.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommas.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommas.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommas.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommas.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommas.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommas.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirst.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirst.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirst.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirst.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommas.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommas.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommas.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommas.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLF_FF.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLF_FF.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLF_FF.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLF_FF.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLF_FFAbbr.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLF_FFAbbr.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLF_FFAbbr.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLF_FFAbbr.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirst.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirst.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirst.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirst.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommas.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommas.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommas.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommas.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommas.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommas.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommas.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommas.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviator.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstCommas.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstCommas.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstCommas.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstCommas.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommas.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommas.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommas.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommas.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorNatBib.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorNatBib.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorNatBib.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorNatBib.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorOrgSci.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorOrgSci.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/AuthorOrgSci.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/AuthorOrgSci.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Authors.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Authors.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Authors.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Authors.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CurrentDate.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/CurrentDate.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/CurrentDate.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/CurrentDate.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DOICheck.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/DOICheck.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DOICheck.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/DOICheck.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DOIStrip.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/DOIStrip.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DOIStrip.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/DOIStrip.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DateFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/DateFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/DateFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/DateFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Default.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Default.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Default.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Default.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FileLink.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/FileLink.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FileLink.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/FileLink.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FileLinkPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/FileLinkPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FileLinkPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/FileLinkPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FirstPage.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/FirstPage.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FirstPage.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/FirstPage.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FormatPagesForHTML.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/FormatPagesForHTML.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FormatPagesForHTML.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/FormatPagesForHTML.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FormatPagesForXML.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/FormatPagesForXML.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/FormatPagesForXML.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/FormatPagesForXML.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/GetOpenOfficeType.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/GetOpenOfficeType.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/GetOpenOfficeType.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/GetOpenOfficeType.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/HTMLChars.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/HTMLChars.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/HTMLChars.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/HTMLChars.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/IfPlural.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/IfPlural.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/IfPlural.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/IfPlural.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/LastPage.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/LastPage.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/LastPage.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/LastPage.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NameFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/NameFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NameFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/NameFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviations.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviations.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviations.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviations.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Number.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Number.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Number.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Number.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Ordinal.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Ordinal.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Ordinal.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Ordinal.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RTFChars.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RTFChars.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RTFChars.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RTFChars.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Replace.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Replace.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/Replace.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/Replace.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisAuthors.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RisAuthors.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisAuthors.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RisAuthors.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisKeywords.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RisKeywords.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisKeywords.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RisKeywords.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisMonth.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RisMonth.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/RisMonth.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/RisMonth.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/WrapContent.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/WrapContent.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/WrapContent.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/WrapContent.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/layout/format/XMLChars.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/XMLChars.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/layout/format/XMLChars.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/XMLChars.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/logging/JabRefLogger.java b/org.jabref.logic/src/main/java/org/jabref/logic/logging/JabRefLogger.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/logging/JabRefLogger.java rename to org.jabref.logic/src/main/java/org/jabref/logic/logging/JabRefLogger.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/logging/LogMessages.java b/org.jabref.logic/src/main/java/org/jabref/logic/logging/LogMessages.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/logging/LogMessages.java rename to org.jabref.logic/src/main/java/org/jabref/logic/logging/LogMessages.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java b/org.jabref.logic/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibConverter.java b/org.jabref.logic/src/main/java/org/jabref/logic/msbib/MSBibConverter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibConverter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/msbib/MSBibConverter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java b/org.jabref.logic/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java rename to org.jabref.logic/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibEntry.java b/org.jabref.logic/src/main/java/org/jabref/logic/msbib/MSBibEntry.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibEntry.java rename to org.jabref.logic/src/main/java/org/jabref/logic/msbib/MSBibEntry.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java b/org.jabref.logic/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java rename to org.jabref.logic/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibMapping.java b/org.jabref.logic/src/main/java/org/jabref/logic/msbib/MSBibMapping.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/msbib/MSBibMapping.java rename to org.jabref.logic/src/main/java/org/jabref/logic/msbib/MSBibMapping.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java b/org.jabref.logic/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java rename to org.jabref.logic/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/msbib/PageNumbers.java b/org.jabref.logic/src/main/java/org/jabref/logic/msbib/PageNumbers.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/msbib/PageNumbers.java rename to org.jabref.logic/src/main/java/org/jabref/logic/msbib/PageNumbers.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/net/ProgressInputStream.java b/org.jabref.logic/src/main/java/org/jabref/logic/net/ProgressInputStream.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/net/ProgressInputStream.java rename to org.jabref.logic/src/main/java/org/jabref/logic/net/ProgressInputStream.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java b/org.jabref.logic/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/net/ProxyPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/net/ProxyPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyRegisterer.java b/org.jabref.logic/src/main/java/org/jabref/logic/net/ProxyRegisterer.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/net/ProxyRegisterer.java rename to org.jabref.logic/src/main/java/org/jabref/logic/net/ProxyRegisterer.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/net/URLDownload.java b/org.jabref.logic/src/main/java/org/jabref/logic/net/URLDownload.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/net/URLDownload.java rename to org.jabref.logic/src/main/java/org/jabref/logic/net/URLDownload.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/net/URLUtil.java b/org.jabref.logic/src/main/java/org/jabref/logic/net/URLUtil.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/net/URLUtil.java rename to org.jabref.logic/src/main/java/org/jabref/logic/net/URLUtil.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/CitationEntry.java b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/CitationEntry.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/openoffice/CitationEntry.java rename to org.jabref.logic/src/main/java/org/jabref/logic/openoffice/CitationEntry.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java rename to org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOPreFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OOPreFormatter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOPreFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OOPreFormatter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOUtil.java b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OOUtil.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OOUtil.java rename to org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OOUtil.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java rename to org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/StyleLoader.java b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/StyleLoader.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/openoffice/StyleLoader.java rename to org.jabref.logic/src/main/java/org/jabref/logic/openoffice/StyleLoader.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java rename to org.jabref.logic/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java rename to org.jabref.logic/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java b/org.jabref.logic/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java rename to org.jabref.logic/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/pdf/TextExtractor.java b/org.jabref.logic/src/main/java/org/jabref/logic/pdf/TextExtractor.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/pdf/TextExtractor.java rename to org.jabref.logic/src/main/java/org/jabref/logic/pdf/TextExtractor.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java b/org.jabref.logic/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java rename to org.jabref.logic/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java b/org.jabref.logic/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java rename to org.jabref.logic/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java b/org.jabref.logic/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java rename to org.jabref.logic/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/search/DatabaseSearcher.java b/org.jabref.logic/src/main/java/org/jabref/logic/search/DatabaseSearcher.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/search/DatabaseSearcher.java rename to org.jabref.logic/src/main/java/org/jabref/logic/search/DatabaseSearcher.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQuery.java b/org.jabref.logic/src/main/java/org/jabref/logic/search/SearchQuery.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQuery.java rename to org.jabref.logic/src/main/java/org/jabref/logic/search/SearchQuery.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQueryHighlightListener.java b/org.jabref.logic/src/main/java/org/jabref/logic/search/SearchQueryHighlightListener.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQueryHighlightListener.java rename to org.jabref.logic/src/main/java/org/jabref/logic/search/SearchQueryHighlightListener.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQueryHighlightObservable.java b/org.jabref.logic/src/main/java/org/jabref/logic/search/SearchQueryHighlightObservable.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/search/SearchQueryHighlightObservable.java rename to org.jabref.logic/src/main/java/org/jabref/logic/search/SearchQueryHighlightObservable.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java b/org.jabref.logic/src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java rename to org.jabref.logic/src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java b/org.jabref.logic/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java rename to org.jabref.logic/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java b/org.jabref.logic/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java rename to org.jabref.logic/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java b/org.jabref.logic/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java rename to org.jabref.logic/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/BuildInfo.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/BuildInfo.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/BuildInfo.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/BuildInfo.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/FileType.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/FileType.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/FileType.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/FileType.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/JavaVersion.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/JavaVersion.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/JavaVersion.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/JavaVersion.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/OS.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/OS.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/OS.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/OS.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/TestEntry.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/TestEntry.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/TestEntry.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/TestEntry.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/UpdateField.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/UpdateField.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/UpdateField.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/UpdateField.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/UpdateFieldPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/UpdateFieldPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/UpdateFieldPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/UpdateFieldPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/Version.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/Version.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/Version.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/Version.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileBasedLock.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileBasedLock.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileBasedLock.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileBasedLock.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileFinder.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileFinder.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileFinder.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileFinder.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileFinders.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileFinders.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileFinders.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileFinders.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileHistory.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileHistory.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileHistory.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileHistory.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileUtil.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileUtil.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/FileUtil.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/FileUtil.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/io/XMLUtil.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/io/XMLUtil.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/io/XMLUtil.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/io/XMLUtil.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/RtfCharMap.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/strings/RtfCharMap.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/strings/RtfCharMap.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/strings/RtfCharMap.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/StringLengthComparator.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/strings/StringLengthComparator.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/strings/StringLengthComparator.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/strings/StringLengthComparator.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/xmp/EncryptedPdfsNotSupportedException.java b/org.jabref.logic/src/main/java/org/jabref/logic/xmp/EncryptedPdfsNotSupportedException.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/xmp/EncryptedPdfsNotSupportedException.java rename to org.jabref.logic/src/main/java/org/jabref/logic/xmp/EncryptedPdfsNotSupportedException.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPPreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/xmp/XMPPreferences.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPPreferences.java rename to org.jabref.logic/src/main/java/org/jabref/logic/xmp/XMPPreferences.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java b/org.jabref.logic/src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java rename to org.jabref.logic/src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPUtil.java b/org.jabref.logic/src/main/java/org/jabref/logic/xmp/XMPUtil.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/logic/xmp/XMPUtil.java rename to org.jabref.logic/src/main/java/org/jabref/logic/xmp/XMPUtil.java diff --git a/org.jabref.gui/src/main/resources/xjc/bibtexml/bibtexml.xsd b/org.jabref.logic/src/main/resources/xjc/bibtexml/bibtexml.xsd similarity index 100% rename from org.jabref.gui/src/main/resources/xjc/bibtexml/bibtexml.xsd rename to org.jabref.logic/src/main/resources/xjc/bibtexml/bibtexml.xsd diff --git a/org.jabref.gui/src/main/resources/xjc/medline/bookdoc_160101.xsd b/org.jabref.logic/src/main/resources/xjc/medline/bookdoc_160101.xsd similarity index 100% rename from org.jabref.gui/src/main/resources/xjc/medline/bookdoc_160101.xsd rename to org.jabref.logic/src/main/resources/xjc/medline/bookdoc_160101.xsd diff --git a/org.jabref.gui/src/main/resources/xjc/medline/medline.xsd b/org.jabref.logic/src/main/resources/xjc/medline/medline.xsd similarity index 100% rename from org.jabref.gui/src/main/resources/xjc/medline/medline.xsd rename to org.jabref.logic/src/main/resources/xjc/medline/medline.xsd diff --git a/org.jabref.gui/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd b/org.jabref.logic/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd similarity index 100% rename from org.jabref.gui/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd rename to org.jabref.logic/src/main/resources/xjc/medline/nlmmedlinecitationset_160101.xsd diff --git a/org.jabref.gui/src/main/resources/xjc/mods/mods-3-6.xsd b/org.jabref.logic/src/main/resources/xjc/mods/mods-3-6.xsd similarity index 100% rename from org.jabref.gui/src/main/resources/xjc/mods/mods-3-6.xsd rename to org.jabref.logic/src/main/resources/xjc/mods/mods-3-6.xsd diff --git a/org.jabref.gui/src/main/resources/xjc/mods/mods-binding.xjb b/org.jabref.logic/src/main/resources/xjc/mods/mods-binding.xjb similarity index 100% rename from org.jabref.gui/src/main/resources/xjc/mods/mods-binding.xjb rename to org.jabref.logic/src/main/resources/xjc/mods/mods-binding.xjb diff --git a/org.jabref.gui/xjc.gradle b/org.jabref.logic/xjc.gradle similarity index 100% rename from org.jabref.gui/xjc.gradle rename to org.jabref.logic/xjc.gradle diff --git a/settings.gradle b/settings.gradle index 570c419492f..72b6bad3ad5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = "JabRef" -include 'org.jabref.model', 'org.jabref.gui' +include 'org.jabref.model', 'org.jabref.logic', 'org.jabref.gui' From f23e5794f468a1598d7345b213aee6b9558614d9 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 02:13:53 +0100 Subject: [PATCH 05/79] Ignoure out directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 71a39acbb6b..9f856998d15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # no generated files in version control **/src/main/gen/ +**/out/ # private data /buildres/jabref-cert-2016.p12 From ae1102bf3d34d52b3c251645d061f4e5e45522e3 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 02:29:10 +0100 Subject: [PATCH 06/79] Three more classes for logic --- .../src/main/java/org/jabref/logic}/FallbackExceptionHandler.java | 0 .../src/main/java/org/jabref/logic}/JabRefException.java | 0 .../src/main/java/org/jabref/logic}/JabRefExecutorService.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {org.jabref.gui/src/main/java/org/jabref => org.jabref.logic/src/main/java/org/jabref/logic}/FallbackExceptionHandler.java (100%) rename {org.jabref.gui/src/main/java/org/jabref => org.jabref.logic/src/main/java/org/jabref/logic}/JabRefException.java (100%) rename {org.jabref.gui/src/main/java/org/jabref => org.jabref.logic/src/main/java/org/jabref/logic}/JabRefExecutorService.java (100%) diff --git a/org.jabref.gui/src/main/java/org/jabref/FallbackExceptionHandler.java b/org.jabref.logic/src/main/java/org/jabref/logic/FallbackExceptionHandler.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/FallbackExceptionHandler.java rename to org.jabref.logic/src/main/java/org/jabref/logic/FallbackExceptionHandler.java diff --git a/org.jabref.gui/src/main/java/org/jabref/JabRefException.java b/org.jabref.logic/src/main/java/org/jabref/logic/JabRefException.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/JabRefException.java rename to org.jabref.logic/src/main/java/org/jabref/logic/JabRefException.java diff --git a/org.jabref.gui/src/main/java/org/jabref/JabRefExecutorService.java b/org.jabref.logic/src/main/java/org/jabref/logic/JabRefExecutorService.java similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/JabRefExecutorService.java rename to org.jabref.logic/src/main/java/org/jabref/logic/JabRefExecutorService.java From fd3ffa24af1fdbd80b2ab2f8e660083af8b61f0a Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 02:43:02 +0100 Subject: [PATCH 07/79] Seperate logic from GUI - FreeCite does not generate a non-used BibtexKeyGenerator anymore - Introduce ExporterFactoryFactory - Introduce SavePreferenceFactory --- .../org/jabref/cli/ArgumentProcessor.java | 7 +-- .../org/jabref/gui/exporter/ExportAction.java | 3 +- .../exporter/ExportCustomizationDialog.java | 6 ++- .../jabref/preferences/CustomExportList.java | 2 +- .../preferences/ExporterFactoryFactory.java | 20 ++++++++ .../preferences/SavePreferencesFactory.java | 47 +++++++++++++++++++ .../logic/exporter/ExporterFactory.java | 9 ---- .../logic/exporter/SavePreferences.java | 36 -------------- .../logic/exporter/TemplateExporter.java | 5 +- .../importer/fileformat/FreeCiteImporter.java | 9 ---- 10 files changed, 80 insertions(+), 64 deletions(-) create mode 100644 org.jabref.gui/src/main/java/org/jabref/preferences/ExporterFactoryFactory.java create mode 100644 org.jabref.gui/src/main/java/org/jabref/preferences/SavePreferencesFactory.java diff --git a/org.jabref.gui/src/main/java/org/jabref/cli/ArgumentProcessor.java b/org.jabref.gui/src/main/java/org/jabref/cli/ArgumentProcessor.java index b5579040cbe..4fa878210be 100644 --- a/org.jabref.gui/src/main/java/org/jabref/cli/ArgumentProcessor.java +++ b/org.jabref.gui/src/main/java/org/jabref/cli/ArgumentProcessor.java @@ -48,6 +48,7 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.jabref.model.strings.StringUtil; +import org.jabref.preferences.SavePreferencesFactory; import org.jabref.preferences.SearchPreferences; import com.google.common.base.Throwables; @@ -358,7 +359,7 @@ private boolean generateAux(List loaded, String[] data) { try { System.out.println(Localization.lang("Saving") + ": " + subName); - SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs); + SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs); BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new); Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode()); SaveSession session = databaseWriter.saveDatabase(new BibDatabaseContext(newBase, defaults), prefs); @@ -397,7 +398,7 @@ private void exportFile(List loaded, String[] data) { if (!pr.isInvalid()) { try { System.out.println(Localization.lang("Saving") + ": " + data[0]); - SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs); + SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs); Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode()); BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>( FileSaveSession::new); @@ -465,7 +466,7 @@ private void importPreferences() { Globals.journalAbbreviationLoader); LayoutFormatterPreferences layoutPreferences = Globals.prefs .getLayoutFormatterPreferences(Globals.journalAbbreviationLoader); - SavePreferences savePreferences = SavePreferences.loadForExportFromPreferences(Globals.prefs); + SavePreferences savePreferences = SavePreferencesFactory.loadForExportFromPreferences(Globals.prefs); Globals.exportFactory = ExporterFactory.create(customExporters, layoutPreferences, savePreferences); } catch (JabRefException ex) { LOGGER.error("Cannot import preferences", ex); diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportAction.java index 3856520a45a..19a43c4c6cd 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportAction.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportAction.java @@ -27,6 +27,7 @@ import org.jabref.logic.util.FileType; import org.jabref.logic.util.io.FileUtil; import org.jabref.model.entry.BibEntry; +import org.jabref.preferences.ExporterFactoryFactory; import org.jabref.preferences.JabRefPreferences; import org.slf4j.Logger; @@ -67,7 +68,7 @@ public InternalExportAction(JabRefFrame frame, boolean selectedOnly) { @Override public void actionPerformed(ActionEvent e) { - Globals.exportFactory = ExporterFactory.create(Globals.prefs, Globals.journalAbbreviationLoader); + Globals.exportFactory = ExporterFactoryFactory.create(Globals.prefs, Globals.journalAbbreviationLoader); FileDialogConfiguration fileDialogConfiguration = ExportAction.createExportFileChooser(Globals.exportFactory, Globals.prefs.get(JabRefPreferences.EXPORT_WORKING_DIRECTORY)); DialogService dialogService = new FXDialogService(); DefaultTaskExecutor.runInJavaFXThread(() -> diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java index 148866ffc8a..591c6bdd2f3 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java @@ -34,6 +34,8 @@ import ca.odell.glazedlists.swing.DefaultEventTableModel; import com.jgoodies.forms.builder.ButtonBarBuilder; +import static org.jabref.preferences.SavePreferencesFactory.loadForExportFromPreferences; + /** *

Title:

*

Description:

@@ -75,7 +77,7 @@ public ExportCustomizationDialog(final JabRefFrame frame) { if (ecd.okPressed()) { Globals.prefs.customExports.addFormat(ecd.name(), ecd.layoutFile(), ecd.extension(), Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader), - SavePreferences.loadForExportFromPreferences(Globals.prefs)); + loadForExportFromPreferences(Globals.prefs)); Globals.prefs.customExports.store(Globals.prefs); } }); @@ -111,7 +113,7 @@ public ExportCustomizationDialog(final JabRefFrame frame) { } LayoutFormatterPreferences layoutPreferences = Globals.prefs .getLayoutFormatterPreferences(Globals.journalAbbreviationLoader); - SavePreferences savePreferences = SavePreferences.loadForExportFromPreferences(Globals.prefs); + SavePreferences savePreferences = loadForExportFromPreferences(Globals.prefs); for (List list : entries) { Globals.prefs.customExports.remove(list, layoutPreferences, savePreferences); } diff --git a/org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java b/org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java index d42409763f2..238332694bf 100644 --- a/org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java +++ b/org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java @@ -70,7 +70,7 @@ private void readPrefs(JabRefPreferences prefs, JournalAbbreviationLoader loader int i = 0; List s; LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(loader); - SavePreferences savePreferences = SavePreferences.loadForExportFromPreferences(prefs); + SavePreferences savePreferences = SavePreferencesFactory.loadForExportFromPreferences(prefs); while (!((s = prefs.getStringList(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i)).isEmpty())) { Optional format = createFormat(s.get(EXPORTER_NAME_INDEX), s.get(EXPORTER_FILENAME_INDEX), s.get(EXPORTER_EXTENSION_INDEX), layoutPreferences, savePreferences); if (format.isPresent()) { diff --git a/org.jabref.gui/src/main/java/org/jabref/preferences/ExporterFactoryFactory.java b/org.jabref.gui/src/main/java/org/jabref/preferences/ExporterFactoryFactory.java new file mode 100644 index 00000000000..43561c8880e --- /dev/null +++ b/org.jabref.gui/src/main/java/org/jabref/preferences/ExporterFactoryFactory.java @@ -0,0 +1,20 @@ +package org.jabref.preferences; + +import org.jabref.logic.exporter.ExporterFactory; +import org.jabref.logic.exporter.SavePreferences; +import org.jabref.logic.exporter.TemplateExporter; +import org.jabref.logic.journals.JournalAbbreviationLoader; +import org.jabref.logic.layout.LayoutFormatterPreferences; + +import java.util.Map; + +public class ExporterFactoryFactory { + + public static ExporterFactory create(JabRefPreferences preferences, JournalAbbreviationLoader abbreviationLoader) { + Map customFormats = preferences.customExports.getCustomExportFormats(preferences, abbreviationLoader); + LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(abbreviationLoader); + SavePreferences savePreferences = SavePreferencesFactory.loadForExportFromPreferences(preferences); + return ExporterFactory.create(customFormats, layoutPreferences, savePreferences); + } + +} diff --git a/org.jabref.gui/src/main/java/org/jabref/preferences/SavePreferencesFactory.java b/org.jabref.gui/src/main/java/org/jabref/preferences/SavePreferencesFactory.java new file mode 100644 index 00000000000..f87bb961ff9 --- /dev/null +++ b/org.jabref.gui/src/main/java/org/jabref/preferences/SavePreferencesFactory.java @@ -0,0 +1,47 @@ +package org.jabref.preferences; + +import org.jabref.logic.bibtex.LatexFieldFormatterPreferences; +import org.jabref.logic.exporter.SavePreferences; +import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern; +import org.jabref.model.metadata.SaveOrderConfig; + +import java.nio.charset.Charset; + +public class SavePreferencesFactory { + + public static SavePreferences loadForExportFromPreferences(JabRefPreferences preferences) { + Boolean saveInOriginalOrder = preferences.getBoolean(JabRefPreferences.EXPORT_IN_ORIGINAL_ORDER); + SaveOrderConfig saveOrder = null; + if (!saveInOriginalOrder) { + if (preferences.getBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER)) { + saveOrder = preferences.loadExportSaveOrder(); + } else { + saveOrder = preferences.loadTableSaveOrder(); + } + } + Charset encoding = preferences.getDefaultEncoding(); + Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP); + SavePreferences.DatabaseSaveType saveType = SavePreferences.DatabaseSaveType.ALL; + Boolean takeMetadataSaveOrderInAccount = false; + Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT); + LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences(); + GlobalBibtexKeyPattern globalCiteKeyPattern = preferences.getKeyPattern(); + return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType, + takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern); + } + + public static SavePreferences loadForSaveFromPreferences(JabRefPreferences preferences) { + Boolean saveInOriginalOrder = false; + SaveOrderConfig saveOrder = null; + Charset encoding = preferences.getDefaultEncoding(); + Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP); + SavePreferences.DatabaseSaveType saveType = SavePreferences.DatabaseSaveType.ALL; + Boolean takeMetadataSaveOrderInAccount = true; + Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT); + LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences(); + GlobalBibtexKeyPattern globalCiteKeyPattern = preferences.getKeyPattern(); + return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType, + takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern); + } + +} diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/ExporterFactory.java index 5eb9145f6c5..69289612fd1 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/exporter/ExporterFactory.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/ExporterFactory.java @@ -8,10 +8,8 @@ import java.util.Objects; import java.util.Optional; -import org.jabref.logic.journals.JournalAbbreviationLoader; import org.jabref.logic.layout.LayoutFormatterPreferences; import org.jabref.logic.util.FileType; -import org.jabref.preferences.JabRefPreferences; public class ExporterFactory { @@ -61,13 +59,6 @@ public static ExporterFactory create(Map customFormats return new ExporterFactory(exporters); } - public static ExporterFactory create(JabRefPreferences preferences, JournalAbbreviationLoader abbreviationLoader) { - Map customFormats = preferences.customExports.getCustomExportFormats(preferences, abbreviationLoader); - LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(abbreviationLoader); - SavePreferences savePreferences = SavePreferences.loadForExportFromPreferences(preferences); - return create(customFormats, layoutPreferences, savePreferences); - } - /** * Build a string listing of all available exporters. * diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/exporter/SavePreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/SavePreferences.java index 817868a1a64..c9d68b0c7b6 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/exporter/SavePreferences.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/SavePreferences.java @@ -6,7 +6,6 @@ import org.jabref.logic.bibtex.LatexFieldFormatterPreferences; import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern; import org.jabref.model.metadata.SaveOrderConfig; -import org.jabref.preferences.JabRefPreferences; public class SavePreferences { @@ -42,41 +41,6 @@ public SavePreferences(Boolean saveInOriginalOrder, SaveOrderConfig saveOrder, C this.globalCiteKeyPattern = globalCiteKeyPattern; } - public static SavePreferences loadForExportFromPreferences(JabRefPreferences preferences) { - Boolean saveInOriginalOrder = preferences.getBoolean(JabRefPreferences.EXPORT_IN_ORIGINAL_ORDER); - SaveOrderConfig saveOrder = null; - if (!saveInOriginalOrder) { - if (preferences.getBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER)) { - saveOrder = preferences.loadExportSaveOrder(); - } else { - saveOrder = preferences.loadTableSaveOrder(); - } - } - Charset encoding = preferences.getDefaultEncoding(); - Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP); - DatabaseSaveType saveType = DatabaseSaveType.ALL; - Boolean takeMetadataSaveOrderInAccount = false; - Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT); - LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences(); - GlobalBibtexKeyPattern globalCiteKeyPattern = preferences.getKeyPattern(); - return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType, - takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern); - } - - public static SavePreferences loadForSaveFromPreferences(JabRefPreferences preferences) { - Boolean saveInOriginalOrder = false; - SaveOrderConfig saveOrder = null; - Charset encoding = preferences.getDefaultEncoding(); - Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP); - DatabaseSaveType saveType = DatabaseSaveType.ALL; - Boolean takeMetadataSaveOrderInAccount = true; - Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT); - LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences(); - GlobalBibtexKeyPattern globalCiteKeyPattern = preferences.getKeyPattern(); - return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType, - takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern); - } - public Boolean getTakeMetadataSaveOrderInAccount() { return takeMetadataSaveOrderInAccount; } diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/TemplateExporter.java index a37044ed1f3..ac576979dd8 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/exporter/TemplateExporter.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/exporter/TemplateExporter.java @@ -16,7 +16,6 @@ import java.util.Objects; import java.util.regex.Pattern; -import org.jabref.JabRefMain; import org.jabref.logic.layout.Layout; import org.jabref.logic.layout.LayoutFormatterPreferences; import org.jabref.logic.layout.LayoutHelper; @@ -43,7 +42,7 @@ public class TemplateExporter extends Exporter { private static final Pattern BLANK_LINE_MATCHER = Pattern.compile("(?m)^\\s"); private static final Logger LOGGER = LoggerFactory.getLogger(TemplateExporter.class); - + private final String lfFileName; private final String directory; private final LayoutFormatterPreferences layoutPreferences; @@ -172,7 +171,7 @@ private Reader getReader(String filename) throws IOException { String name = dir + filename; Reader reader; // Try loading as a resource first. This works for files inside the JAR: - URL reso = JabRefMain.class.getResource(name); + URL reso = TemplateExporter.class.getResource(name); // If that did not work, try loading as a normal file URL: try { diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java index 0beeb312251..97411b53cf9 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java @@ -19,8 +19,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.jabref.JabRefGUI; -import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.importer.Importer; import org.jabref.logic.importer.ParserResult; @@ -202,13 +200,6 @@ public ParserResult importEntries(String text) { // has to be done before label generation as label generation is dependent on entry type e.setType(type); - // autogenerate label (BibTeX key) - if (JabRefGUI.getMainFrame() != null) { - // only possible in GUI mode - new BibtexKeyGenerator(JabRefGUI.getMainFrame().getCurrentBasePanel().getBibDatabaseContext(), importFormatPreferences.getBibtexKeyPatternPreferences()) - .generateAndSetKey(e); - } - res.add(e); } parser.next(); From fa1536fa3caa109005cf00759dc96223a42a41cc Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 02:54:13 +0100 Subject: [PATCH 08/79] Refactor OpenOffice preferences --- .../gui/openoffice/OpenOfficePanel.java | 21 ++- .../jabref/preferences/JabRefPreferences.java | 14 ++ .../openoffice/OpenOfficePreferences.java | 166 +++++++++++------- 3 files changed, 127 insertions(+), 74 deletions(-) diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java index cb148c7df4d..3546a712e5b 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java @@ -129,7 +129,7 @@ public OpenOfficePanel(JabRefFrame jabRefFrame, SidePaneManager spManager) { update = new JButton(IconTheme.JabRefIcon.REFRESH.getSmallIcon()); update.setToolTipText(Localization.lang("Sync OpenOffice/LibreOffice bibliography")); update.setPreferredSize(new Dimension(24, 24)); - preferences = new OpenOfficePreferences(Globals.prefs); + preferences = Globals.prefs.getOpenOfficePreferences(); loader = new StyleLoader(preferences, Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader), Globals.prefs.getDefaultEncoding()); @@ -353,7 +353,7 @@ private void exportEntries() { private List getBaseList() { List databases = new ArrayList<>(); - if (preferences.useAllDatabases()) { + if (preferences.getUseAllDatabases()) { for (BasePanel basePanel : frame.getBasePanelList()) { databases.add(basePanel.getDatabase()); } @@ -599,7 +599,7 @@ private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addP style = loader.getUsedStyle(); } ooBase.insertEntry(entries, database, getBaseList(), style, inParenthesis, withText, pageInfo, - preferences.syncWhenCiting()); + preferences.getSyncWhenCiting()); } catch (FileNotFoundException ex) { JOptionPane.showMessageDialog(frame, Localization @@ -717,7 +717,7 @@ private void showSettingsPopup() { JPopupMenu menu = new JPopupMenu(); final JCheckBoxMenuItem autoSync = new JCheckBoxMenuItem( Localization.lang("Automatically sync bibliography when inserting citations"), - preferences.syncWhenCiting()); + preferences.getSyncWhenCiting()); final JRadioButtonMenuItem useActiveBase = new JRadioButtonMenuItem( Localization.lang("Look up BibTeX entries in the active tab only")); final JRadioButtonMenuItem useAllBases = new JRadioButtonMenuItem( @@ -726,7 +726,7 @@ private void showSettingsPopup() { ButtonGroup bg = new ButtonGroup(); bg.add(useActiveBase); bg.add(useAllBases); - if (preferences.useAllDatabases()) { + if (preferences.getUseAllDatabases()) { useAllBases.setSelected(true); } else { useActiveBase.setSelected(true); @@ -738,7 +738,16 @@ private void showSettingsPopup() { useActiveBase.addActionListener(e -> preferences.setUseAllDatabases(!useActiveBase.isSelected())); - clearConnectionSettings.addActionListener(e -> frame.output(preferences.clearConnectionSettings())); + // TODO: implement this again + /* + public String clearConnectionSettings() { + preferences.clear(JabRefPreferences.OO_PATH); + preferences.clear(JabRefPreferences.OO_EXECUTABLE_PATH); + preferences.clear(JabRefPreferences.OO_JARS_PATH); + return Localization.lang("Cleared connection settings."); + } + */ + // clearConnectionSettings.addActionListener(e -> frame.output(preferences.clearConnectionSettings())); menu.add(autoSync); menu.addSeparator(); diff --git a/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java b/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java index 11227390b10..4a7bedd4254 100644 --- a/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -324,6 +324,7 @@ public class JabRefPreferences implements PreferencesService { // Remote public static final String USE_REMOTE_SERVER = "useRemoteServer"; public static final String REMOTE_SERVER_PORT = "remoteServerPort"; + /** * The OpenOffice/LibreOffice connection preferences are: * OO_PATH main directory for OO/LO installation, used to detect location on Win/OS X when using manual connect @@ -344,6 +345,7 @@ public class JabRefPreferences implements PreferencesService { public static final String OO_USE_ALL_OPEN_BASES = "useAllOpenBases"; public static final String OO_BIBLIOGRAPHY_STYLE_FILE = "ooBibliographyStyleFile"; public static final String OO_EXTERNAL_STYLE_FILES = "ooExternalStyleFiles"; + public static final String STYLES_SIZE_Y = "stylesSizeY"; public static final String STYLES_SIZE_X = "stylesSizeX"; public static final String STYLES_POS_Y = "stylesPosY"; @@ -1430,6 +1432,18 @@ public LayoutFormatterPreferences getLayoutFormatterPreferences( getFileLinkPreferences(), journalAbbreviationLoader); } + public OpenOfficePreferences getOpenOfficePreferences() { + return new OpenOfficePreferences( + this.get(JabRefPreferences.OO_JARS_PATH), + this.get(JabRefPreferences.OO_EXECUTABLE_PATH), + this.get(JabRefPreferences.OO_PATH), + this.getBoolean(JabRefPreferences.OO_USE_ALL_OPEN_BASES), + this.getBoolean(JabRefPreferences.OO_SYNC_WHEN_CITING), + this.getBoolean(JabRefPreferences.OO_SHOW_PANEL), + this.getStringList(JabRefPreferences.OO_EXTERNAL_STYLE_FILES), + this.get(JabRefPreferences.OO_BIBLIOGRAPHY_STYLE_FILE)); + } + public XMPPreferences getXMPPreferences() { return new XMPPreferences(getBoolean(USE_XMP_PRIVACY_FILTER), getStringList(XMP_PRIVACY_FILTERS), getKeywordDelimiter()); diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java index 208c7ee6be2..1732a53c409 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java @@ -4,20 +4,6 @@ import java.util.Arrays; import java.util.List; -import org.jabref.logic.l10n.Localization; -import org.jabref.preferences.JabRefPreferences; - -/** - * The OpenOffice connection preferences are: - * OO_PATH main directory for OO/LO installation, used to detect location on Win/OS X when using manual connect - * OO_EXECUTABLE_PATH path to soffice-file - * OO_JARS_PATH directory that contains juh.jar, jurt.jar, ridl.jar, unoil.jar - * OO_SYNC_WHEN_CITING true if the reference list is updated when adding a new citation - * OO_SHOW_PANEL true if the OO panel is shown on startup - * OO_USE_ALL_OPEN_DATABASES true if all databases should be used when citing - * OO_BIBLIOGRAPHY_STYLE_FILE path to the used style file - * OO_EXTERNAL_STYLE_FILES list with paths to external style files - */ public class OpenOfficePreferences { public static final String DEFAULT_WINDOWS_PATH = "C:\\Program Files\\LibreOffice 5"; @@ -34,98 +20,142 @@ public class OpenOfficePreferences { public static final List OO_JARS = Arrays.asList("unoil.jar", "jurt.jar", "juh.jar", "ridl.jar"); - private final JabRefPreferences preferences; - - public OpenOfficePreferences(JabRefPreferences preferences) { - this.preferences = preferences; + private String executablePath; + private String installationPath; + private Boolean useAllDatabases; + private Boolean syncWhenCiting; + private Boolean showPanel; + private List externalStyles; + private String currentStyle; + private String jarsPath; + + public OpenOfficePreferences( + String jarsPath, + String executablePath, + String installationPath, + Boolean useAllDatabases, + Boolean syncWhenCiting, + Boolean showPanel, + List externalStyles, + String currentStyle + ) { + this.jarsPath = jarsPath; + this.executablePath = executablePath; + this.installationPath = installationPath; + this.useAllDatabases = useAllDatabases; + this.syncWhenCiting = syncWhenCiting; + this.showPanel = showPanel; + this.externalStyles = externalStyles; + this.currentStyle = currentStyle; } - public void updateConnectionParams(String ooPath, String execPath, String jarsPath) { - setOOPath(ooPath); - setExecutablePath(execPath); - setJarsPath(jarsPath); + public void clearCurrentStyle() { + this.currentStyle = null; + // TODO: sync to prefs } - public boolean checkAutoDetectedPaths() { - if (preferences.hasKey(JabRefPreferences.OO_PATH)) { - return new File(getExecutablePath()).exists(); - } else { - return false; - } + /** + * path to soffice-file + */ + public String getExecutablePath() { + return executablePath; } - public String clearConnectionSettings() { - preferences.clear(JabRefPreferences.OO_PATH); - preferences.clear(JabRefPreferences.OO_EXECUTABLE_PATH); - preferences.clear(JabRefPreferences.OO_JARS_PATH); - return Localization.lang("Cleared connection settings."); + public void setExecutablePath(String executablePath) { + this.executablePath = executablePath; } - public String getJarsPath() { - return preferences.get(JabRefPreferences.OO_JARS_PATH); + /** + * main directory for OO/LO installation, used to detect location on Win/OS X when using manual connect + */ + public String getInstallationPath() { + return installationPath; } - public void setJarsPath(String path) { - preferences.put(JabRefPreferences.OO_JARS_PATH, path); + public void setInstallationPath(String installationPath) { + this.installationPath = installationPath; } - public String getExecutablePath() { - return preferences.get(JabRefPreferences.OO_EXECUTABLE_PATH); + /** + * true if all databases should be used when citing + */ + public Boolean getUseAllDatabases() { + return useAllDatabases; } - public void setExecutablePath(String path) { - preferences.put(JabRefPreferences.OO_EXECUTABLE_PATH, path); + public void setUseAllDatabases(Boolean useAllDatabases) { + this.useAllDatabases = useAllDatabases; } - public String getInstallationPath() { - return preferences.get(JabRefPreferences.OO_PATH); + /** + * true if the reference list is updated when adding a new citation + */ + public Boolean getSyncWhenCiting() { + return syncWhenCiting; } - public void setOOPath(String path) { - preferences.put(JabRefPreferences.OO_PATH, path); + public void setSyncWhenCiting(Boolean syncWhenCiting) { + this.syncWhenCiting = syncWhenCiting; } - public boolean useAllDatabases() { - return preferences.getBoolean(JabRefPreferences.OO_USE_ALL_OPEN_BASES); + /** + * true if the OO panel is shown on startup + */ + public Boolean getShowPanel() { + return showPanel; } - public void setUseAllDatabases(boolean use) { - preferences.putBoolean(JabRefPreferences.OO_USE_ALL_OPEN_BASES, use); + public void setShowPanel(Boolean showPanel) { + this.showPanel = showPanel; } - public boolean syncWhenCiting() { - return preferences.getBoolean(JabRefPreferences.OO_SYNC_WHEN_CITING); + /** + * list with paths to external style files + */ + public List getExternalStyles() { + return externalStyles; } - public void setSyncWhenCiting(boolean sync) { - preferences.putBoolean(JabRefPreferences.OO_SYNC_WHEN_CITING, sync); + public void setExternalStyles(List externalStyles) { + this.externalStyles = externalStyles; } - public boolean showPanel() { - return preferences.getBoolean(JabRefPreferences.OO_SHOW_PANEL); + /** + * path to the used style file + */ + public String getCurrentStyle() { + return currentStyle; } - public void setShowPanel(boolean show) { - preferences.putBoolean(JabRefPreferences.OO_SHOW_PANEL, show); + public void setCurrentStyle(String currentStyle) { + this.currentStyle = currentStyle; } - public List getExternalStyles() { - return preferences.getStringList(JabRefPreferences.OO_EXTERNAL_STYLE_FILES); + /** + * directory that contains juh.jar, jurt.jar, ridl.jar, unoil.jar + */ + public String getJarsPath() { + return jarsPath; } - public void setExternalStyles(List filenames) { - preferences.putStringList(JabRefPreferences.OO_EXTERNAL_STYLE_FILES, filenames); + public void setJarsPath(String jarsPath) { + this.jarsPath = jarsPath; } - public String getCurrentStyle() { - return preferences.get(JabRefPreferences.OO_BIBLIOGRAPHY_STYLE_FILE); + public void updateConnectionParams(String ooPath, String execPath, String jarsPath) { + setInstallationPath(ooPath); + setExecutablePath(execPath); + setJarsPath(jarsPath); + // TODO: caller should store that in the real preferences again } - public void clearCurrentStyle() { - preferences.remove(JabRefPreferences.OO_BIBLIOGRAPHY_STYLE_FILE); + /** + * Checks whether the executablePath exists + * + * TODO this should go elsewhere - no preference! + */ + public boolean checkAutoDetectedPaths() { + return ((executablePath != null) && new File(getExecutablePath()).exists()); } - public void setCurrentStyle(String path) { - preferences.put(JabRefPreferences.OO_BIBLIOGRAPHY_STYLE_FILE, path); - } } From 68335c99ca9f8d1ba68551539112ecc48738fca9 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 02:59:34 +0100 Subject: [PATCH 09/79] autosave and backup read config from preferences at each event -> keep in gui --- .../org/jabref/logic/autosaveandbackup/AutosaveManager.java | 0 .../java/org/jabref/logic/autosaveandbackup/BackupManager.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename {org.jabref.logic => org.jabref.gui}/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java (100%) rename {org.jabref.logic => org.jabref.gui}/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java (98%) diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java b/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java similarity index 100% rename from org.jabref.logic/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java rename to org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java similarity index 98% rename from org.jabref.logic/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java rename to org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java index f3e7e813352..2e5bf5f8f95 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java +++ b/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java @@ -118,7 +118,7 @@ private Optional determineBackupPath() { private void performBackup(Path backupPath) { try { Charset charset = bibDatabaseContext.getMetaData().getEncoding().orElse(preferences.getDefaultEncoding()); - SavePreferences savePreferences = SavePreferences.loadForSaveFromPreferences(preferences).withEncoding + SavePreferences savePreferences = SavePreferencesFactory.loadForSaveFromPreferences(preferences).withEncoding (charset).withMakeBackup(false); new BibtexDatabaseWriter<>(FileSaveSession::new).saveDatabase(bibDatabaseContext, savePreferences).commit (backupPath); From 1ee315a9c2bbd6d860dc81efdf886368eb314cd1 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 03:04:34 +0100 Subject: [PATCH 10/79] Refactor CleanupPreset --- .../org/jabref/gui/actions/CleanupAction.java | 4 +- .../jabref/preferences/JabRefPreferences.java | 57 +++++++++++++++++ .../jabref/logic/cleanup/CleanupPreset.java | 62 +------------------ 3 files changed, 60 insertions(+), 63 deletions(-) diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/actions/CleanupAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/actions/CleanupAction.java index 89e8d94ab90..b2d4ac7c995 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/actions/CleanupAction.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/actions/CleanupAction.java @@ -62,14 +62,14 @@ public void run() { return; } CleanupPresetPanel presetPanel = new CleanupPresetPanel(panel.getBibDatabaseContext(), - CleanupPreset.loadFromPreferences(preferences)); + preferences.getCleanupPreset()); int choice = showDialog(presetPanel); if (choice != JOptionPane.OK_OPTION) { canceled = true; return; } CleanupPreset cleanupPreset = presetPanel.getCleanupPreset(); - cleanupPreset.storeInPreferences(preferences); + preferences.setCleanupPreset(cleanupPreset); if (cleanupPreset.isRenamePDF() && Globals.prefs.getBoolean(JabRefPreferences.ASK_AUTO_NAMING_PDFS_AGAIN)) { CheckBoxMessage cbm = new CheckBoxMessage( diff --git a/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java b/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java index 4a7bedd4254..f0f03dd8412 100644 --- a/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -71,6 +71,7 @@ import org.jabref.logic.util.io.FileHistory; import org.jabref.logic.xmp.XMPPreferences; import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern; +import org.jabref.model.cleanup.FieldFormatterCleanups; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.CustomEntryType; @@ -1553,6 +1554,62 @@ public CleanupPreferences getCleanupPreferences(JournalAbbreviationLoader journa getLayoutFormatterPreferences(journalAbbreviationLoader), getFileDirectoryPreferences()); } + public CleanupPreset getCleanupPreset() { + Set activeJobs = EnumSet.noneOf(CleanupPreset.CleanupStep.class); + + if (this.getBoolean(JabRefPreferences.CLEANUP_DOI)) { + activeJobs.add(CleanupPreset.CleanupStep.CLEAN_UP_DOI); + } + if (this.getBoolean(JabRefPreferences.CLEANUP_ISSN)) { + activeJobs.add(CleanupPreset.CleanupStep.CLEAN_UP_ISSN); + } + if (this.getBoolean(JabRefPreferences.CLEANUP_MOVE_PDF)) { + activeJobs.add(CleanupPreset.CleanupStep.MOVE_PDF); + } + if (this.getBoolean(JabRefPreferences.CLEANUP_MAKE_PATHS_RELATIVE)) { + activeJobs.add(CleanupPreset.CleanupStep.MAKE_PATHS_RELATIVE); + } + if (this.getBoolean(JabRefPreferences.CLEANUP_RENAME_PDF)) { + activeJobs.add(CleanupPreset.CleanupStep.RENAME_PDF); + } + if (this.getBoolean(JabRefPreferences.CLEANUP_RENAME_PDF_ONLY_RELATIVE_PATHS)) { + activeJobs.add(CleanupPreset.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS); + } + if (this.getBoolean(JabRefPreferences.CLEANUP_UPGRADE_EXTERNAL_LINKS)) { + activeJobs.add(CleanupPreset.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS); + } + if (this.getBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBLATEX)) { + activeJobs.add(CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX); + } + if (this.getBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBTEX)) { + activeJobs.add(CleanupPreset.CleanupStep.CONVERT_TO_BIBTEX); + } + if (this.getBoolean(JabRefPreferences.CLEANUP_FIX_FILE_LINKS)) { + activeJobs.add(CleanupPreset.CleanupStep.FIX_FILE_LINKS); + } + + FieldFormatterCleanups formatterCleanups = Cleanups.parse( + this.getStringList(JabRefPreferences.CLEANUP_FORMATTERS)); + + return new CleanupPreset(activeJobs, formatterCleanups); + } + + public void setCleanupPreset(CleanupPreset cleanupPreset) { + this.putBoolean(JabRefPreferences.CLEANUP_DOI, cleanupPreset.isActive(CleanupPreset.CleanupStep.CLEAN_UP_DOI)); + this.putBoolean(JabRefPreferences.CLEANUP_ISSN, cleanupPreset.isActive(CleanupPreset.CleanupStep.CLEAN_UP_ISSN)); + this.putBoolean(JabRefPreferences.CLEANUP_MOVE_PDF, cleanupPreset.isActive(CleanupPreset.CleanupStep.MOVE_PDF)); + this.putBoolean(JabRefPreferences.CLEANUP_MAKE_PATHS_RELATIVE, cleanupPreset.isActive(CleanupPreset.CleanupStep.MAKE_PATHS_RELATIVE)); + this.putBoolean(JabRefPreferences.CLEANUP_RENAME_PDF, cleanupPreset.isActive(CleanupPreset.CleanupStep.RENAME_PDF)); + this.putBoolean(JabRefPreferences.CLEANUP_RENAME_PDF_ONLY_RELATIVE_PATHS, + cleanupPreset.isActive(CleanupPreset.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS)); + this.putBoolean(JabRefPreferences.CLEANUP_UPGRADE_EXTERNAL_LINKS, + cleanupPreset.isActive(CleanupPreset.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS)); + this.putBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBLATEX, cleanupPreset.isActive(CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX)); + this.putBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBTEX, cleanupPreset.isActive(CleanupPreset.CleanupStep.CONVERT_TO_BIBTEX)); + this.putBoolean(JabRefPreferences.CLEANUP_FIX_FILE_LINKS, cleanupPreset.isActive(CleanupPreset.CleanupStep.FIX_FILE_LINKS)); + this.putStringList(JabRefPreferences.CLEANUP_FORMATTERS, cleanupPreset.getFormatterCleanups().getAsStringList(OS.NEWLINE)); + } + public RemotePreferences getRemotePreferences() { return new RemotePreferences(getInt(REMOTE_SERVER_PORT), getBoolean(USE_REMOTE_SERVER)); } diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java index ca109ba5782..06db606b591 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java @@ -5,9 +5,7 @@ import java.util.Objects; import java.util.Set; -import org.jabref.logic.util.OS; import org.jabref.model.cleanup.FieldFormatterCleanups; -import org.jabref.preferences.JabRefPreferences; public class CleanupPreset { @@ -32,47 +30,6 @@ public CleanupPreset(Set activeJobs, FieldFormatterCleanups formatt this.formatterCleanups = Objects.requireNonNull(formatterCleanups); } - public static CleanupPreset loadFromPreferences(JabRefPreferences preferences) { - - Set activeJobs = EnumSet.noneOf(CleanupStep.class); - - if (preferences.getBoolean(JabRefPreferences.CLEANUP_DOI)) { - activeJobs.add(CleanupStep.CLEAN_UP_DOI); - } - if (preferences.getBoolean(JabRefPreferences.CLEANUP_ISSN)) { - activeJobs.add(CleanupStep.CLEAN_UP_ISSN); - } - if (preferences.getBoolean(JabRefPreferences.CLEANUP_MOVE_PDF)) { - activeJobs.add(CleanupStep.MOVE_PDF); - } - if (preferences.getBoolean(JabRefPreferences.CLEANUP_MAKE_PATHS_RELATIVE)) { - activeJobs.add(CleanupStep.MAKE_PATHS_RELATIVE); - } - if (preferences.getBoolean(JabRefPreferences.CLEANUP_RENAME_PDF)) { - activeJobs.add(CleanupStep.RENAME_PDF); - } - if (preferences.getBoolean(JabRefPreferences.CLEANUP_RENAME_PDF_ONLY_RELATIVE_PATHS)) { - activeJobs.add(CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS); - } - if (preferences.getBoolean(JabRefPreferences.CLEANUP_UPGRADE_EXTERNAL_LINKS)) { - activeJobs.add(CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS); - } - if (preferences.getBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBLATEX)) { - activeJobs.add(CleanupStep.CONVERT_TO_BIBLATEX); - } - if (preferences.getBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBTEX)) { - activeJobs.add(CleanupStep.CONVERT_TO_BIBTEX); - } - if (preferences.getBoolean(JabRefPreferences.CLEANUP_FIX_FILE_LINKS)) { - activeJobs.add(CleanupStep.FIX_FILE_LINKS); - } - - FieldFormatterCleanups formatterCleanups = Cleanups.parse( - preferences.getStringList(JabRefPreferences.CLEANUP_FORMATTERS)); - - return new CleanupPreset(activeJobs, formatterCleanups); - } - public boolean isCleanUpUpgradeExternalLinks() { return isActive(CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS); } @@ -113,24 +70,7 @@ public boolean isRenamePdfOnlyRelativePaths() { return isActive(CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS); } - public void storeInPreferences(JabRefPreferences preferences) { - preferences.putBoolean(JabRefPreferences.CLEANUP_DOI, isActive(CleanupStep.CLEAN_UP_DOI)); - preferences.putBoolean(JabRefPreferences.CLEANUP_ISSN, isActive(CleanupStep.CLEAN_UP_ISSN)); - preferences.putBoolean(JabRefPreferences.CLEANUP_MOVE_PDF, isActive(CleanupStep.MOVE_PDF)); - preferences.putBoolean(JabRefPreferences.CLEANUP_MAKE_PATHS_RELATIVE, isActive(CleanupStep.MAKE_PATHS_RELATIVE)); - preferences.putBoolean(JabRefPreferences.CLEANUP_RENAME_PDF, isActive(CleanupStep.RENAME_PDF)); - preferences.putBoolean(JabRefPreferences.CLEANUP_RENAME_PDF_ONLY_RELATIVE_PATHS, - isActive(CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS)); - preferences.putBoolean(JabRefPreferences.CLEANUP_UPGRADE_EXTERNAL_LINKS, - isActive(CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS)); - preferences.putBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBLATEX, isActive(CleanupStep.CONVERT_TO_BIBLATEX)); - preferences.putBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBTEX, isActive(CleanupStep.CONVERT_TO_BIBTEX)); - preferences.putBoolean(JabRefPreferences.CLEANUP_FIX_FILE_LINKS, isActive(CleanupStep.FIX_FILE_LINKS)); - - preferences.putStringList(JabRefPreferences.CLEANUP_FORMATTERS, formatterCleanups.getAsStringList(OS.NEWLINE)); - } - - private Boolean isActive(CleanupStep step) { + public Boolean isActive(CleanupStep step) { return activeJobs.contains(step); } From 4b7ea7dd9a507f33190e4204a6dd7dc9a28b16ea Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 03:11:33 +0100 Subject: [PATCH 11/79] Make ModsImporter independent from JabRefPreferences --- .../importer/fetcher/LibraryOfCongressTest.java | 5 ++++- .../jabref/logic/importer/ImportFormatReader.java | 2 +- .../org/jabref/logic/importer/WebFetchers.java | 2 +- .../logic/importer/fetcher/LibraryOfCongress.java | 9 ++++++++- .../logic/importer/fileformat/ModsImporter.java | 14 +++++++++----- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java index fe5b4b1946d..ecbdf9bfb49 100644 --- a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java @@ -2,17 +2,20 @@ import java.util.Optional; +import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.Test; +import org.mockito.Answers; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; @FetcherTest public class LibraryOfCongressTest { - private final LibraryOfCongress fetcher = new LibraryOfCongress(); + private final LibraryOfCongress fetcher = new LibraryOfCongress(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)); @Test public void performSearchById() throws Exception { diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportFormatReader.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportFormatReader.java index 6e7c31415b8..05564b7cc4d 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportFormatReader.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/importer/ImportFormatReader.java @@ -61,7 +61,7 @@ public void resetImportFormats(ImportFormatPreferences newImportFormatPreference formats.add(new IsiImporter()); formats.add(new MedlineImporter()); formats.add(new MedlinePlainImporter()); - formats.add(new ModsImporter()); + formats.add(new ModsImporter(importFormatPreferences)); formats.add(new MsBibImporter()); formats.add(new OvidImporter()); formats.add(new PdfContentImporter(importFormatPreferences)); diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/importer/WebFetchers.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/WebFetchers.java index 6dbafe67896..07ecf3b54a9 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/importer/WebFetchers.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/importer/WebFetchers.java @@ -96,7 +96,7 @@ public static List getIdBasedFetchers(ImportFormatPreferences im list.add(new TitleFetcher(importFormatPreferences)); list.add(new MathSciNet(importFormatPreferences)); list.add(new CrossRef()); - list.add(new LibraryOfCongress()); + list.add(new LibraryOfCongress(importFormatPreferences)); list.add(new IacrEprintFetcher(importFormatPreferences)); list.sort(Comparator.comparing(WebFetcher::getName)); return list; diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java index 60ca3bc13d8..2db7bce827e 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java @@ -6,6 +6,7 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.IdBasedParserFetcher; +import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.importer.Parser; import org.jabref.logic.importer.fileformat.ModsImporter; @@ -16,6 +17,12 @@ */ public class LibraryOfCongress implements IdBasedParserFetcher { + private final ImportFormatPreferences importFormatPreferences; + + public LibraryOfCongress(ImportFormatPreferences importFormatPreferences) { + this.importFormatPreferences = importFormatPreferences; + } + @Override public String getName() { return "Library of Congress"; @@ -29,6 +36,6 @@ public URL getURLForID(String identifier) throws URISyntaxException, MalformedUR @Override public Parser getParser() { - return new ModsImporter(); + return new ModsImporter(this.importFormatPreferences); } } diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java index 1a4c3b940c3..81d3b45d55e 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java @@ -20,6 +20,7 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; +import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.importer.Importer; import org.jabref.logic.importer.ParseException; import org.jabref.logic.importer.Parser; @@ -56,7 +57,6 @@ import org.jabref.logic.util.FileType; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.FieldName; -import org.jabref.preferences.JabRefPreferences; import com.google.common.base.Joiner; import org.slf4j.Logger; @@ -70,12 +70,16 @@ public class ModsImporter extends Importer implements Parser { private static final Logger LOGGER = LoggerFactory.getLogger(ModsImporter.class); - private static final String KEYWORD_SEPARATOR = JabRefPreferences.getInstance().getImportFormatPreferences() - .getKeywordSeparator() + " "; - private static final Pattern MODS_PATTERN = Pattern.compile(""); + + private final String keywordSeparator; + private JAXBContext context; + public ModsImporter(ImportFormatPreferences importFormatPreferences) { + keywordSeparator = importFormatPreferences.getKeywordSeparator() + " "; + } + @Override public boolean isRecognizedFormat(BufferedReader input) throws IOException { return input.lines().anyMatch(line -> MODS_PATTERN.matcher(line).find()); @@ -191,7 +195,7 @@ private void parseModsGroup(Map fields, List modsGroup, } //The element subject can appear more than one time, that's why the keywords has to be put out of the for loop - putIfListIsNotEmpty(fields, keywords, FieldName.KEYWORDS, KEYWORD_SEPARATOR); + putIfListIsNotEmpty(fields, keywords, FieldName.KEYWORDS, this.keywordSeparator); //same goes for authors and notes putIfListIsNotEmpty(fields, authors, FieldName.AUTHOR, " and "); putIfListIsNotEmpty(fields, notes, FieldName.NOTE, ", "); From 2ba26da004afd80984f792702745fcb2f209b134 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 03:15:45 +0100 Subject: [PATCH 12/79] FileAnnotationCache needs fileDirectoryPreferences --- org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java | 2 +- .../java/org/jabref/logic/pdf/EntryAnnotationImporter.java | 6 +++--- .../main/java/org/jabref/logic/pdf/FileAnnotationCache.java | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java index dc098bb6d13..d23d37c7edc 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java @@ -219,7 +219,7 @@ public BasePanel(JabRefFrame frame, BibDatabaseContext bibDatabaseContext) { this.tableModel = new MainTableDataModel(getBibDatabaseContext()); citationStyleCache = new CitationStyleCache(bibDatabaseContext); - annotationCache = new FileAnnotationCache(bibDatabaseContext); + annotationCache = new FileAnnotationCache(bibDatabaseContext, Globals.prefs.getFileDirectoryPreferences()); this.preview = new PreviewPanel(this, getBibDatabaseContext()); DefaultTaskExecutor.runInJavaFXThread(() -> frame().getGlobalSearchBar().getSearchQueryHighlightObservable().addSearchListener(preview)); diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java b/org.jabref.logic/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java index b2e8c1557bc..8953c139e11 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java @@ -9,8 +9,8 @@ import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; +import org.jabref.model.metadata.FileDirectoryPreferences; import org.jabref.model.pdf.FileAnnotation; -import org.jabref.preferences.JabRefPreferences; /** @@ -44,13 +44,13 @@ private List getFilteredFileList() { * @param databaseContext The context is needed for the importer. * @return Map from each PDF to a list of file annotations */ - public Map> importAnnotationsFromFiles(BibDatabaseContext databaseContext) { + public Map> importAnnotationsFromFiles(BibDatabaseContext databaseContext, FileDirectoryPreferences fileDirectoryPreferences) { Map> annotations = new HashMap<>(); AnnotationImporter importer = new PdfAnnotationImporter(); //import annotationsOfFiles if the selected files are valid which is checked in getFilteredFileList() for (LinkedFile linkedFile : this.getFilteredFileList()) { - linkedFile.findIn(databaseContext, JabRefPreferences.getInstance().getFileDirectoryPreferences()) + linkedFile.findIn(databaseContext, fileDirectoryPreferences) .ifPresent(file -> annotations.put(file, importer.importAnnotations(file))); } return annotations; diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java b/org.jabref.logic/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java index 46a3209eb01..fd59cfde876 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java @@ -6,6 +6,7 @@ import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; +import org.jabref.model.metadata.FileDirectoryPreferences; import org.jabref.model.pdf.FileAnnotation; import com.google.common.cache.CacheBuilder; @@ -31,11 +32,11 @@ public FileAnnotationCache() { } - public FileAnnotationCache(BibDatabaseContext context) { + public FileAnnotationCache(BibDatabaseContext context, FileDirectoryPreferences fileDirectoryPreferences) { annotationCache = CacheBuilder.newBuilder().maximumSize(CACHE_SIZE).build(new CacheLoader>>() { @Override public Map> load(BibEntry entry) throws Exception { - return new EntryAnnotationImporter(entry).importAnnotationsFromFiles(context); + return new EntryAnnotationImporter(entry).importAnnotationsFromFiles(context, fileDirectoryPreferences); } }); } From 7dfe2ed39ad7e185309c538ae2fe2d86ce94b6cd Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 03:16:43 +0100 Subject: [PATCH 13/79] Some compile fixes --- org.jabref.gui/src/main/java/org/jabref/JabRefMain.java | 4 ++-- .../src/main/java/org/jabref/gui/BasePanel.java | 3 ++- .../main/java/org/jabref/gui/collab/ChangeScanner.java | 3 ++- .../java/org/jabref/gui/exporter/SaveDatabaseAction.java | 3 ++- .../gui/openoffice/DetectOpenOfficeInstallation.java | 2 +- .../org/jabref/gui/openoffice/OpenOfficeSidePanel.java | 2 +- .../java/org/jabref/gui/preftabs/PreferencesDialog.java | 4 ++-- .../jabref/logic/autosaveandbackup/BackupManager.java | 1 + .../jabref/logic/exporter/ModsExportFormatTestFiles.java | 2 +- .../java/org/jabref/logic/importer/ImporterTest.java | 2 +- .../logic/importer/fileformat/ModsImporterTestFiles.java | 9 +++++++-- .../jabref/logic/pdf/EntryAnnotationImporterTest.java | 4 ++-- 12 files changed, 24 insertions(+), 15 deletions(-) diff --git a/org.jabref.gui/src/main/java/org/jabref/JabRefMain.java b/org.jabref.gui/src/main/java/org/jabref/JabRefMain.java index f16e4dccf43..d8305af533f 100644 --- a/org.jabref.gui/src/main/java/org/jabref/JabRefMain.java +++ b/org.jabref.gui/src/main/java/org/jabref/JabRefMain.java @@ -12,7 +12,6 @@ import org.jabref.cli.ArgumentProcessor; import org.jabref.gui.remote.JabRefMessageHandler; -import org.jabref.logic.exporter.ExporterFactory; import org.jabref.logic.formatter.casechanger.ProtectTermsFormatter; import org.jabref.logic.journals.JournalAbbreviationLoader; import org.jabref.logic.l10n.Localization; @@ -29,6 +28,7 @@ import org.jabref.model.EntryTypes; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.InternalBibtexFields; +import org.jabref.preferences.ExporterFactoryFactory; import org.jabref.preferences.JabRefPreferences; import org.slf4j.Logger; @@ -147,7 +147,7 @@ private static void start(String[] args) { Globals.prefs.getXMPPreferences(), Globals.getFileUpdateMonitor()); EntryTypes.loadCustomEntryTypes(preferences.loadCustomEntryTypes(BibDatabaseMode.BIBTEX), preferences.loadCustomEntryTypes(BibDatabaseMode.BIBLATEX)); - Globals.exportFactory = ExporterFactory.create(Globals.prefs, Globals.journalAbbreviationLoader); + Globals.exportFactory = ExporterFactoryFactory.create(Globals.prefs, Globals.journalAbbreviationLoader); // Initialize protected terms loader Globals.protectedTermsLoader = new ProtectedTermsLoader(Globals.prefs.getProtectedTermsPreferences()); diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java index d23d37c7edc..114be1358ce 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java @@ -142,6 +142,7 @@ import org.jabref.model.strings.StringUtil; import org.jabref.preferences.JabRefPreferences; import org.jabref.preferences.PreviewPreferences; +import org.jabref.preferences.SavePreferencesFactory; import com.google.common.eventbus.Subscribe; import com.jgoodies.forms.builder.FormBuilder; @@ -1092,7 +1093,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset enc, frame.block(); final String SAVE_DATABASE = Localization.lang("Save library"); try { - SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs).withEncoding(enc) + SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs).withEncoding(enc) .withSaveType(saveType); BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>( FileSaveSession::new); diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeScanner.java index 0353f50ef1e..35b3510d546 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeScanner.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeScanner.java @@ -33,6 +33,7 @@ import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibtexString; import org.jabref.model.metadata.MetaData; +import org.jabref.preferences.SavePreferencesFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -104,7 +105,7 @@ public void displayResult(final DisplayResultCallback fup) { private void storeTempDatabase() { JabRefExecutorService.INSTANCE.execute(() -> { try { - SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs).withMakeBackup(false) + SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs).withMakeBackup(false) .withEncoding(panel.getBibDatabaseContext().getMetaData().getEncoding() .orElse(Globals.prefs.getDefaultEncoding())); diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java index 720422289f4..51f8f6ffb68 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java @@ -39,6 +39,7 @@ import org.jabref.model.database.shared.DatabaseLocation; import org.jabref.model.entry.BibEntry; import org.jabref.preferences.JabRefPreferences; +import org.jabref.preferences.SavePreferencesFactory; import com.jgoodies.forms.builder.FormBuilder; import com.jgoodies.forms.layout.FormLayout; @@ -178,7 +179,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding) frame.block(); try { - SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs).withEncoding(encoding); + SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs).withEncoding(encoding); BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new); if (selectedOnly) { diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java index 14501f74f0a..b20c2ad5355 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java @@ -124,7 +124,7 @@ private boolean setOpenOfficePreferences(Path installDir) { Optional jarFilePath = FileUtil.find(OpenOfficePreferences.OO_JARS.get(0), installDir); if (execPath.isPresent() && jarFilePath.isPresent()) { - preferences.setOOPath(installDir.toString()); + preferences.setInstallationPath(installDir.toString()); preferences.setExecutablePath(execPath.get().toString()); preferences.setJarsPath(jarFilePath.get().getParent().toString()); return true; diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java index a7dd9257707..7c93b857973 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java @@ -19,7 +19,7 @@ public OpenOfficeSidePanel(SidePaneManager sidePaneManager, Icon icon, String ti super(sidePaneManager, icon, title); this.preferences = preferences; sidePaneManager.register(this); - if (preferences.showPanel()) { + if (preferences.getShowPanel()) { manager.show(OpenOfficeSidePanel.class); } diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java index 4c882105e00..4dfcf53ac30 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java @@ -31,10 +31,10 @@ import org.jabref.gui.maintable.MainTable; import org.jabref.gui.util.DefaultTaskExecutor; import org.jabref.gui.util.FileDialogConfiguration; -import org.jabref.logic.exporter.ExporterFactory; import org.jabref.logic.l10n.Localization; import org.jabref.logic.shared.prefs.SharedDatabasePreferences; import org.jabref.logic.util.FileType; +import org.jabref.preferences.ExporterFactoryFactory; import org.jabref.preferences.JabRefPreferences; import org.jabref.preferences.JabRefPreferencesFilter; @@ -225,7 +225,7 @@ private String getPrefsExportPath() { private void updateAfterPreferenceChanges() { setValues(); - Globals.exportFactory = ExporterFactory.create(Globals.prefs, Globals.journalAbbreviationLoader); + Globals.exportFactory = ExporterFactoryFactory.create(Globals.prefs, Globals.journalAbbreviationLoader); Globals.prefs.updateEntryEditorTabList(); } diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java index 2e5bf5f8f95..0e48352e938 100644 --- a/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java +++ b/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java @@ -24,6 +24,7 @@ import org.jabref.model.database.event.BibDatabaseContextChangedEvent; import org.jabref.model.database.event.CoarseChangeFilter; import org.jabref.preferences.JabRefPreferences; +import org.jabref.preferences.SavePreferencesFactory; import com.google.common.eventbus.Subscribe; import org.slf4j.Logger; diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java index 9a15c013765..3faf73dd291 100644 --- a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java +++ b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java @@ -73,7 +73,7 @@ public void setUp() throws Exception { modsExportFormat = new ModsExporter(); tempFile = testFolder.newFile(); bibtexImporter = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor()); - modsImporter = new ModsImporter(); + modsImporter = new ModsImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)); } @Test diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImporterTest.java index e797e21ec2d..d39397085b2 100644 --- a/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImporterTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImporterTest.java @@ -115,7 +115,7 @@ public static Collection instancesToTest() { new Object[]{new IsiImporter()}, new Object[]{new MedlineImporter()}, new Object[]{new MedlinePlainImporter()}, - new Object[]{new ModsImporter()}, + new Object[]{new ModsImporter(importFormatPreferences)}, new Object[]{new MsBibImporter()}, new Object[]{new OvidImporter()}, new Object[]{new PdfContentImporter(importFormatPreferences)}, diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java index caceb0b1b97..701936a7724 100644 --- a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java +++ b/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java @@ -4,9 +4,13 @@ import java.util.function.Predicate; import java.util.stream.Stream; +import org.jabref.logic.importer.ImportFormatPreferences; + import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.Answers; +import static org.mockito.Mockito.mock; public class ModsImporterTestFiles { @@ -21,12 +25,13 @@ private static Stream fileNames() throws IOException { @ParameterizedTest @MethodSource("fileNames") public void testIsRecognizedFormat(String fileName) throws IOException { - ImporterTestEngine.testIsRecognizedFormat(new ModsImporter(), fileName); + ImporterTestEngine.testIsRecognizedFormat(new ModsImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)), fileName); } @ParameterizedTest @MethodSource("fileNames") public void testImportEntries(String fileName) throws Exception { - ImporterTestEngine.testImportEntries(new ModsImporter(), fileName, FILE_ENDING); + ImporterTestEngine.testImportEntries(new ModsImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS) + ), fileName, FILE_ENDING); } } diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java index 99689673e30..ed15966aa86 100644 --- a/org.jabref.gui/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java @@ -1,6 +1,5 @@ package org.jabref.logic.pdf; - import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; @@ -10,6 +9,7 @@ import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.FieldName; +import org.jabref.model.metadata.FileDirectoryPreferences; import org.jabref.model.pdf.FileAnnotation; import org.junit.Before; @@ -37,7 +37,7 @@ public void readEntryExampleThesis() { EntryAnnotationImporter entryAnnotationImporter = new EntryAnnotationImporter(entry); //when - Map> annotations = entryAnnotationImporter.importAnnotationsFromFiles(databaseContext); + Map> annotations = entryAnnotationImporter.importAnnotationsFromFiles(databaseContext, mock(FileDirectoryPreferences.class)); //then int fileCounter = 0; From b889fed053a93cc0e82e2f3887fe40880010641b Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 03:38:06 +0100 Subject: [PATCH 14/79] lint build.gradle --- org.jabref.gui/build.gradle | 9 +-------- org.jabref.logic/build.gradle | 27 --------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 5493e1228aa..fdc16da1e23 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -47,7 +47,6 @@ dependencies { compile 'org.json:json:20160212' - compile 'org.antlr:antlr-runtime:3.5.2' compile 'org.antlr:antlr4-runtime:4.7.1' compile 'com.jgoodies:jgoodies-forms:1.9.0' @@ -56,15 +55,12 @@ dependencies { compile 'org.apache.pdfbox:pdfbox:1.8.13' compile 'org.apache.pdfbox:jempbox:1.8.13' - compile 'org.apache.commons:commons-lang3:3.6' compile 'commons-cli:commons-cli:1.4' compile "org.libreoffice:juh:5.4.2" compile "org.libreoffice:ridl:5.4.2" compile "org.libreoffice:unoil:5.4.2" - compile 'com.github.bkromhout:java-diff-utils:2.1.1' - compile 'info.debatty:java-string-similarity:1.0.1' // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release" runtime 'mysql:mysql-connector-java:5.1.45' @@ -89,10 +85,8 @@ dependencies { // Cannot be updated to 9.*.* until Jabref works with Java 9 compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT' - compile 'org.jsoup:jsoup:1.11.2' compile 'com.mashape.unirest:unirest-java:1.4.9' compile 'org.apache.httpcomponents:httpclient:4.5.3' - compile 'commons-io:commons-io:2.4' // >1.8.0-beta is required for java 9 compatibility compile 'org.slf4j:slf4j-api:1.8.0-beta1' @@ -101,8 +95,6 @@ dependencies { runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' - compile 'de.undercouch:citeproc-java:1.0.1' - compile 'org.jbibtex:jbibtex:1.0.17' // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' @@ -110,6 +102,7 @@ dependencies { compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9' compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' + testCompile 'org.antlr:antlr-runtime:3.5.2' testCompile 'com.github.tomakehurst:wiremock:2.14.0' testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' testCompile 'junit:junit:4.12' diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index 552193027e0..150d66f9bf4 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -33,46 +33,22 @@ dependencies { compile 'org.json:json:20160212' compile 'org.antlr:antlr-runtime:3.5.2' - compile 'org.antlr:antlr4-runtime:4.7.1' - - compile 'com.jgoodies:jgoodies-forms:1.9.0' // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 compile 'org.apache.pdfbox:pdfbox:1.8.13' compile 'org.apache.pdfbox:jempbox:1.8.13' compile 'org.apache.commons:commons-lang3:3.6' - compile 'commons-cli:commons-cli:1.4' - compile "org.libreoffice:juh:5.4.2" compile "org.libreoffice:ridl:5.4.2" compile "org.libreoffice:unoil:5.4.2" compile 'com.github.bkromhout:java-diff-utils:2.1.1' compile 'info.debatty:java-string-similarity:1.0.1' - // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release" - runtime 'mysql:mysql-connector-java:5.1.45' - - compile 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1' - - compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1' - compile 'com.google.guava:guava:24.0-jre' - // JavaFX stuff - compile 'com.airhacks:afterburner.fx:1.7.0' - compile 'de.codecentric.centerdevice:javafxsvg:1.2.1' - compile 'de.jensd:fontawesomefx-commons:8.15' compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' - compile 'de.saxsys:mvvmfx-validation:1.7.0' - compile 'org.fxmisc.easybind:easybind:1.0.3' - compile 'org.fxmisc.flowless:flowless:0.6' - compile 'org.fxmisc.richtext:richtextfx:0.8.2' - compile 'org.reactfx:reactfx:2.0-M5' - - // Cannot be updated to 9.*.* until Jabref works with Java 9 - compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT' compile 'org.jsoup:jsoup:1.11.2' compile 'com.mashape.unirest:unirest-java:1.4.9' @@ -92,9 +68,6 @@ dependencies { runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' - compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9' - compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' - testCompile 'com.github.tomakehurst:wiremock:2.14.0' testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' testCompile 'junit:junit:4.12' From df4ef0df7af24af983e203c122243197351a0309 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 09:47:52 +0100 Subject: [PATCH 15/79] Fix install4j location --- circle.yml | 4 +--- scripts/prepare-install4j.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 9ee9a6fa11d..3dfc7c5ec42 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,7 @@ dependencies: # openssl aes-256-cbc -e -in ./buildres/jabref-cert-2016.p12 -out jabref-cert-2016.p12.enc -k {PASSWORD} #- openssl aes-256-cbc -d -in ./buildres/jabref-cert-2016.p12.enc -out ./buildres/jabref-cert-2016.p12 -k $CERTIFICATE - scripts/prepare-install4j.sh - - install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY + - cd org.jabref.gui && install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY #--win-keystore-password $CERTIFICATE_PW --mac-keystore-password $CERTIFICATE_PW override: # We do this to decrease build time by using CircleCI's cache. See https://discuss.circleci.com/t/effective-caching-for-gradle/540 for a longer motivation. @@ -44,8 +44,6 @@ deployment: # if upload fails, it is accepted; CircleCI provides deep links to the binaries as fallback - timeout 580 scripts/upload-to-builds.jabref.org.sh || exit 0 - - general: artifacts: - "build/releases" diff --git a/scripts/prepare-install4j.sh b/scripts/prepare-install4j.sh index 3718b432a98..acfb562c172 100755 --- a/scripts/prepare-install4j.sh +++ b/scripts/prepare-install4j.sh @@ -14,7 +14,7 @@ cd ~/jabref # version 7.0.1 is NOT zipped any more - old command line: "-xzf" tar -xf ~/downloads/install4j_unix_7_0_3.tar.gz # fix directory name (until install4j 6.1.5 it was install4j6 -mv install4j7.0.3 install4j7 +mv install4j7.0.3 org.jabref.gui/install4j7 # fetch JREs if [ ! -d ~/.install4j7/jres/ ]; then From a46d56932e545821b9e2fc1b99feb3e78fde43f8 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 16:03:48 +0100 Subject: [PATCH 16/79] Move jabref.install4j to right folder --- jabref.install4j => org.jabref.gui/jabref.install4j | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jabref.install4j => org.jabref.gui/jabref.install4j (100%) diff --git a/jabref.install4j b/org.jabref.gui/jabref.install4j similarity index 100% rename from jabref.install4j rename to org.jabref.gui/jabref.install4j From 9646887e32c830eba19b26b61143a1a1f1ab7aa8 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 16:35:32 +0100 Subject: [PATCH 17/79] Move model tests from gui to model/logic --- .../model/entry/FileFieldBibEntryTest.java | 0 .../org/jabref/model/groups/TexGroupTest.java | 5 ++-- .../org/jabref/model/groups/paper.aux | 8 +++++++ org.jabref.model/build.gradle | 24 +++++++++++++++++++ .../jabref/model/BibDatabaseContextTest.java | 0 .../java/org/jabref/model/EntryTypesTest.java | 0 .../java/org/jabref/model/TreeNodeTest.java | 0 .../org/jabref/model/TreeNodeTestData.java | 0 .../database/BibDatabaseContextTest.java | 0 .../BibDatabaseModeDetectionTest.java | 0 .../model/database/BibDatabaseTest.java | 0 .../database/DuplicationCheckerTest.java | 0 .../model/database/KeyChangeListenerTest.java | 0 .../database/event/AutosaveEventTest.java | 0 .../model/entry/AuthorListParameterTest.java | 0 .../jabref/model/entry/AuthorListTest.java | 0 .../org/jabref/model/entry/AuthorTest.java | 0 .../model/entry/BibEntryEqualityTest.java | 0 .../org/jabref/model/entry/BibEntryTest.java | 0 .../org/jabref/model/entry/BibEntryTests.java | 0 .../jabref/model/entry/BibtexStringTest.java | 0 .../model/entry/CanonicalBibEntryTest.java | 0 .../java/org/jabref/model/entry/DateTest.java | 0 .../jabref/model/entry/EntryLinkListTest.java | 0 .../org/jabref/model/entry/FieldNameTest.java | 0 .../model/entry/FileFieldWriterTest.java | 0 .../model/entry/IEEETranEntryTypesTest.java | 0 .../jabref/model/entry/IdGeneratorTest.java | 0 .../jabref/model/entry/KeywordListTest.java | 0 .../org/jabref/model/entry/KeywordTest.java | 0 .../org/jabref/model/entry/MonthTest.java | 0 .../entry/identifier/ArXivIdentifierTest.java | 0 .../model/entry/identifier/DOITest.java | 0 .../model/entry/identifier/EprintTest.java | 0 .../model/entry/identifier/ISBNTest.java | 0 .../model/entry/identifier/ISSNTest.java | 0 .../entry/identifier/MathSciNetIdTest.java | 0 .../entry/specialfields/SpecialFieldTest.java | 0 .../jabref/model/event/TestEventListener.java | 0 .../groups/AutomaticKeywordGroupTest.java | 0 .../model/groups/ExplicitGroupTest.java | 0 .../model/groups/GroupTreeNodeTest.java | 0 .../jabref/model/groups/SearchGroupTest.java | 0 .../model/groups/WordKeywordGroupTest.java | 0 .../jabref/model/metadata/MetaDataTest.java | 0 .../jabref/model/pdf/FileAnnotationTest.java | 0 .../search/matchers/MatcherSetsTest.java | 0 .../rules/ContainBasedSearchRuleTest.java | 0 .../model/search/rules/MockSearchMatcher.java | 0 .../search/rules/SentenceAnalyzerTest.java | 0 .../jabref/model/strings/StringUtilTest.java | 0 51 files changed, 34 insertions(+), 3 deletions(-) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/model/groups/TexGroupTest.java (84%) create mode 100644 org.jabref.logic/src/test/resources/org/jabref/model/groups/paper.aux rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/BibDatabaseContextTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/EntryTypesTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/TreeNodeTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/TreeNodeTestData.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/database/BibDatabaseTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/AuthorListTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/AuthorTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/BibEntryTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/BibEntryTests.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/BibtexStringTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/DateTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/EntryLinkListTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/FieldNameTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/IdGeneratorTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/KeywordListTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/KeywordTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/MonthTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/identifier/DOITest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/identifier/EprintTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/event/TestEventListener.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/groups/SearchGroupTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/metadata/MetaDataTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/search/rules/MockSearchMatcher.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java (100%) rename {org.jabref.gui => org.jabref.model}/src/test/java/org/jabref/model/strings/StringUtilTest.java (100%) diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java b/org.jabref.logic/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java rename to org.jabref.logic/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/groups/TexGroupTest.java b/org.jabref.logic/src/test/java/org/jabref/model/groups/TexGroupTest.java similarity index 84% rename from org.jabref.gui/src/test/java/org/jabref/model/groups/TexGroupTest.java rename to org.jabref.logic/src/test/java/org/jabref/model/groups/TexGroupTest.java index 7c09efa3915..bf632b4ade9 100644 --- a/org.jabref.gui/src/test/java/org/jabref/model/groups/TexGroupTest.java +++ b/org.jabref.logic/src/test/java/org/jabref/model/groups/TexGroupTest.java @@ -3,7 +3,6 @@ import java.nio.file.Path; import java.nio.file.Paths; -import org.jabref.logic.auxparser.AuxParserTest; import org.jabref.logic.auxparser.DefaultAuxParser; import org.jabref.model.database.BibDatabase; import org.jabref.model.entry.BibEntry; @@ -18,7 +17,7 @@ public class TexGroupTest { @Test public void containsReturnsTrueForEntryInAux() throws Exception { - Path auxFile = Paths.get(AuxParserTest.class.getResource("paper.aux").toURI()); + Path auxFile = Paths.get(TexGroupTest.class.getResource("paper.aux").toURI()); TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor()); BibEntry inAux = new BibEntry(); inAux.setCiteKey("Darwin1888"); @@ -28,7 +27,7 @@ public void containsReturnsTrueForEntryInAux() throws Exception { @Test public void containsReturnsTrueForEntryNotInAux() throws Exception { - Path auxFile = Paths.get(AuxParserTest.class.getResource("paper.aux").toURI()); + Path auxFile = Paths.get(TexGroupTest.class.getResource("paper.aux").toURI()); TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor()); BibEntry notInAux = new BibEntry(); notInAux.setCiteKey("NotInAux2017"); diff --git a/org.jabref.logic/src/test/resources/org/jabref/model/groups/paper.aux b/org.jabref.logic/src/test/resources/org/jabref/model/groups/paper.aux new file mode 100644 index 00000000000..2d3e47c107c --- /dev/null +++ b/org.jabref.logic/src/test/resources/org/jabref/model/groups/paper.aux @@ -0,0 +1,8 @@ +\relax +\citation{Darwin1888} +\citation{Einstein1920} +\bibstyle{plain} +\bibdata{origin} +\bibcite{Darwin1888}{1} +\bibcite{Einstein1920}{2} +\@writefile{toc}{\contentsline {section}{\numberline {1}}{1}} diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index ea63c4244af..84fbec905e3 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -51,6 +51,7 @@ dependencies { // >1.8.0-beta is required for java 9 compatibility compile 'org.slf4j:slf4j-api:1.8.0-beta1' + testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' @@ -58,6 +59,29 @@ dependencies { compile 'com.github.tomtung:latex2unicode_2.12:0.2.2' + testCompile 'org.antlr:antlr-runtime:3.5.2' + testCompile 'com.github.tomakehurst:wiremock:2.14.0' + testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' + testCompile 'junit:junit:4.12' + testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' + testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' + testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' + testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' + testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' + testCompile 'org.assertj:assertj-core:3.8.0' + testCompile 'org.assertj:assertj-swing:3.8.0' + testCompile 'org.assertj:assertj-swing-junit:3.8.0' + testCompile 'org.hamcrest:hamcrest-core:1.3' + testCompile 'org.mockito:mockito-core:2.13.0' + testCompile 'org.reflections:reflections:0.9.11' + testCompile "org.testfx:testfx-core:4.0.+" + testCompile "org.testfx:testfx-junit:4.0.+" + testCompile 'com.tngtech.archunit:archunit:0.5.0' + testCompile 'org.xmlunit:xmlunit-core:2.5.1' + testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' + checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } diff --git a/org.jabref.gui/src/test/java/org/jabref/model/BibDatabaseContextTest.java b/org.jabref.model/src/test/java/org/jabref/model/BibDatabaseContextTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/BibDatabaseContextTest.java rename to org.jabref.model/src/test/java/org/jabref/model/BibDatabaseContextTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/EntryTypesTest.java b/org.jabref.model/src/test/java/org/jabref/model/EntryTypesTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/EntryTypesTest.java rename to org.jabref.model/src/test/java/org/jabref/model/EntryTypesTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/TreeNodeTest.java b/org.jabref.model/src/test/java/org/jabref/model/TreeNodeTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/TreeNodeTest.java rename to org.jabref.model/src/test/java/org/jabref/model/TreeNodeTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/TreeNodeTestData.java b/org.jabref.model/src/test/java/org/jabref/model/TreeNodeTestData.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/TreeNodeTestData.java rename to org.jabref.model/src/test/java/org/jabref/model/TreeNodeTestData.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java b/org.jabref.model/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java rename to org.jabref.model/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java b/org.jabref.model/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java rename to org.jabref.model/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseTest.java b/org.jabref.model/src/test/java/org/jabref/model/database/BibDatabaseTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/database/BibDatabaseTest.java rename to org.jabref.model/src/test/java/org/jabref/model/database/BibDatabaseTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java b/org.jabref.model/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java rename to org.jabref.model/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java b/org.jabref.model/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java rename to org.jabref.model/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java b/org.jabref.model/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java rename to org.jabref.model/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorListTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/AuthorListTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorListTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/AuthorListTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/AuthorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/AuthorTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/AuthorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/BibEntryTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/BibEntryTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryTests.java b/org.jabref.model/src/test/java/org/jabref/model/entry/BibEntryTests.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/BibEntryTests.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/BibEntryTests.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/BibtexStringTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/BibtexStringTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/BibtexStringTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/BibtexStringTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/DateTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/DateTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/DateTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/DateTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/EntryLinkListTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/EntryLinkListTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/EntryLinkListTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/EntryLinkListTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/FieldNameTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/FieldNameTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/FieldNameTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/FieldNameTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/IdGeneratorTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/IdGeneratorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/IdGeneratorTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/IdGeneratorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/KeywordListTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/KeywordListTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/KeywordListTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/KeywordListTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/KeywordTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/KeywordTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/KeywordTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/KeywordTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/MonthTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/MonthTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/MonthTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/MonthTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/DOITest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/identifier/DOITest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/DOITest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/identifier/DOITest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/EprintTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/identifier/EprintTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/EprintTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/identifier/EprintTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java b/org.jabref.model/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java rename to org.jabref.model/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/event/TestEventListener.java b/org.jabref.model/src/test/java/org/jabref/model/event/TestEventListener.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/event/TestEventListener.java rename to org.jabref.model/src/test/java/org/jabref/model/event/TestEventListener.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java b/org.jabref.model/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java rename to org.jabref.model/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java b/org.jabref.model/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java rename to org.jabref.model/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java b/org.jabref.model/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java rename to org.jabref.model/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/groups/SearchGroupTest.java b/org.jabref.model/src/test/java/org/jabref/model/groups/SearchGroupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/groups/SearchGroupTest.java rename to org.jabref.model/src/test/java/org/jabref/model/groups/SearchGroupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java b/org.jabref.model/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java rename to org.jabref.model/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/metadata/MetaDataTest.java b/org.jabref.model/src/test/java/org/jabref/model/metadata/MetaDataTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/metadata/MetaDataTest.java rename to org.jabref.model/src/test/java/org/jabref/model/metadata/MetaDataTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java b/org.jabref.model/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java rename to org.jabref.model/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java b/org.jabref.model/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java rename to org.jabref.model/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java b/org.jabref.model/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java rename to org.jabref.model/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/search/rules/MockSearchMatcher.java b/org.jabref.model/src/test/java/org/jabref/model/search/rules/MockSearchMatcher.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/search/rules/MockSearchMatcher.java rename to org.jabref.model/src/test/java/org/jabref/model/search/rules/MockSearchMatcher.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java b/org.jabref.model/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java rename to org.jabref.model/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/model/strings/StringUtilTest.java b/org.jabref.model/src/test/java/org/jabref/model/strings/StringUtilTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/model/strings/StringUtilTest.java rename to org.jabref.model/src/test/java/org/jabref/model/strings/StringUtilTest.java From 76c1d2959ba26097b2f91897d3717b9a796b3b26 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 16:43:11 +0100 Subject: [PATCH 18/79] Duplicate TreeNodeTestData, because test data is not shared across modules --- .../gui/util/RecursiveTreeItemTest.java | 2 +- .../org/jabref/gui/util/TreeNodeTestData.java | 123 ++++++++++++++++++ 2 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 org.jabref.gui/src/test/java/org/jabref/gui/util/TreeNodeTestData.java diff --git a/org.jabref.gui/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java index 6f06b4012db..33b832e3492 100644 --- a/org.jabref.gui/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java @@ -9,7 +9,7 @@ import javafx.scene.control.TreeItem; import org.jabref.model.TreeNode; -import org.jabref.model.TreeNodeTestData; +import org.jabref.gui.util.TreeNodeTestData; import org.junit.Before; import org.junit.Test; diff --git a/org.jabref.gui/src/test/java/org/jabref/gui/util/TreeNodeTestData.java b/org.jabref.gui/src/test/java/org/jabref/gui/util/TreeNodeTestData.java new file mode 100644 index 00000000000..a0245522dd8 --- /dev/null +++ b/org.jabref.gui/src/test/java/org/jabref/gui/util/TreeNodeTestData.java @@ -0,0 +1,123 @@ +package org.jabref.gui.util; + +import org.jabref.model.TreeNode; + +public class TreeNodeTestData { + /** + * Gets the marked node in the following tree: + * Root + * A + * A (= parent) + * B (<-- this) + */ + public static TreeNodeMock getNodeInSimpleTree(TreeNodeMock root) { + root.addChild(new TreeNodeMock()); + TreeNodeMock parent = new TreeNodeMock(); + root.addChild(parent); + TreeNodeMock node = new TreeNodeMock(); + parent.addChild(node); + return node; + } + + public static TreeNodeMock getNodeInSimpleTree() { + return getNodeInSimpleTree(new TreeNodeMock()); + } + + /** + * Gets the marked node in the following tree: + * Root + * A + * A + * A (= grand parent) + * B + * B (= parent) + * C (<-- this) + * D (= child) + * C + * C + * C + * B + * B + * A + */ + public static TreeNodeMock getNodeInComplexTree(TreeNodeMock root) { + root.addChild(new TreeNodeMock()); + root.addChild(new TreeNodeMock()); + TreeNodeMock grandParent = new TreeNodeMock(); + root.addChild(grandParent); + root.addChild(new TreeNodeMock()); + + grandParent.addChild(new TreeNodeMock()); + TreeNodeMock parent = new TreeNodeMock(); + grandParent.addChild(parent); + grandParent.addChild(new TreeNodeMock()); + grandParent.addChild(new TreeNodeMock()); + + TreeNodeMock node = new TreeNodeMock(); + parent.addChild(node); + parent.addChild(new TreeNodeMock()); + parent.addChild(new TreeNodeMock()); + parent.addChild(new TreeNodeMock()); + + node.addChild(new TreeNodeMock()); + return node; + } + + public static TreeNodeMock getNodeInComplexTree() { + return getNodeInComplexTree(new TreeNodeMock()); + } + + /** + * Gets the marked in the following tree: + * Root + * A + * A + * A (<- this) + * A + */ + public static TreeNodeMock getNodeAsChild(TreeNodeMock root) { + root.addChild(new TreeNodeMock()); + root.addChild(new TreeNodeMock()); + TreeNodeMock node = new TreeNodeMock(); + root.addChild(node); + root.addChild(new TreeNodeMock()); + return node; + } + + /** + * This is just a dummy class deriving from TreeNode so that we can test the generic class + */ + public static class TreeNodeMock extends TreeNode { + + private String name; + + public TreeNodeMock() { + this(""); + } + + public TreeNodeMock(String name) { + super(TreeNodeMock.class); + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String toString() { + return "TreeNodeMock{" + + "name='" + name + '\'' + + '}'; + } + + @Override + public TreeNodeMock copyNode() { + return new TreeNodeMock(name); + } + } +} From 8903b267078e2512be36151ce9d50e106a6b2518 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 16:59:43 +0100 Subject: [PATCH 19/79] lint build.gradle files --- .../logic/exporter/GroupTreeNodeTest.java | 286 ++++++++++++++++++ org.jabref.logic/build.gradle | 16 - org.jabref.model/build.gradle | 16 - 3 files changed, 286 insertions(+), 32 deletions(-) create mode 100644 org.jabref.gui/src/test/java/org/jabref/logic/exporter/GroupTreeNodeTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/GroupTreeNodeTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/GroupTreeNodeTest.java new file mode 100644 index 00000000000..d102c65df05 --- /dev/null +++ b/org.jabref.gui/src/test/java/org/jabref/logic/exporter/GroupTreeNodeTest.java @@ -0,0 +1,286 @@ +package org.jabref.model.groups; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +import org.jabref.model.entry.BibEntry; +import org.jabref.model.search.matchers.AndMatcher; +import org.jabref.model.search.matchers.OrMatcher; + +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +public class GroupTreeNodeTest { + + private final List entries = new ArrayList<>(); + private BibEntry entry; + + /** + * Gets the marked node in the following tree of explicit groups: + * Root + * A ExplicitA, Including + * A ExplicitParent, Independent (= parent) + * B ExplicitNode, Refining (<-- this) + */ + public static GroupTreeNode getNodeInSimpleTree(GroupTreeNode root) { + root.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')); + GroupTreeNode parent = root + .addSubgroup(new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ',')); + return parent.addSubgroup(new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ',')); + } + + /** + * Gets the marked node in the following tree: + * Root + * A SearchA + * A ExplicitA, Including + * A ExplicitGrandParent (= grand parent) + * B ExplicitB + * B KeywordParent (= parent) + * C KeywordNode (<-- this) + * D ExplicitChild (= child) + * C SearchC + * C ExplicitC + * C KeywordC + * B SearchB + * B KeywordB + * A KeywordA + */ + public static GroupTreeNode getNodeInComplexTree(GroupTreeNode root) { + root.addSubgroup(getSearchGroup("SearchA")); + root.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')); + GroupTreeNode grandParent = root + .addSubgroup(new ExplicitGroup("ExplicitGrandParent", GroupHierarchyType.INDEPENDENT, ',')); + root.addSubgroup(getKeywordGroup("KeywordA")); + + grandParent.addSubgroup(getExplict("ExplicitB")); + GroupTreeNode parent = grandParent.addSubgroup(getKeywordGroup("KeywordParent")); + grandParent.addSubgroup(getSearchGroup("SearchB")); + grandParent.addSubgroup(getKeywordGroup("KeywordB")); + + GroupTreeNode node = parent.addSubgroup(getKeywordGroup("KeywordNode")); + parent.addSubgroup(getSearchGroup("SearchC")); + parent.addSubgroup(getExplict("ExplicitC")); + parent.addSubgroup(getKeywordGroup("KeywordC")); + + node.addSubgroup(getExplict("ExplicitChild")); + return node; + } + + private static AbstractGroup getKeywordGroup(String name) { + return new WordKeywordGroup(name, GroupHierarchyType.INDEPENDENT, "searchField", "searchExpression", true,',', false); + } + + private static AbstractGroup getSearchGroup(String name) { + return new SearchGroup(name, GroupHierarchyType.INCLUDING, "searchExpression", true, false); + } + + private static AbstractGroup getExplict(String name) { + return new ExplicitGroup(name, GroupHierarchyType.REFINING, ','); + } + + /** + * Gets the marked in the following tree: + * Root + * A + * A + * A (<- this) + * A + */ + /* + public GroupTreeNode getNodeAsChild(TreeNodeMock root) { + root.addChild(new TreeNodeMock()); + root.addChild(new TreeNodeMock()); + TreeNodeMock node = new TreeNodeMock(); + root.addChild(node); + root.addChild(new TreeNodeMock()); + return node; + } + */ + public static GroupTreeNode getRoot() { + return GroupTreeNode.fromGroup(new AllEntriesGroup("All entries")); + } + + @Before + public void setUp() throws Exception { + entries.clear(); + entry = new BibEntry(); + entries.add(entry); + entries.add(new BibEntry().withField("author", "author1 and author2")); + entries.add(new BibEntry().withField("author", "author1")); + } + + /* + public GroupTreeNode getNodeInComplexTree() { + return getNodeInComplexTree(new TreeNodeMock()); + } + */ + + private GroupTreeNode getNodeInSimpleTree() { + return getNodeInSimpleTree(getRoot()); + } + + @Test + public void getSearchRuleForIndependentGroupReturnsGroupAsMatcher() { + GroupTreeNode node = GroupTreeNode + .fromGroup(new ExplicitGroup("node", GroupHierarchyType.INDEPENDENT, ',')); + assertEquals(node.getGroup(), node.getSearchMatcher()); + } + + @Test + public void getSearchRuleForRefiningGroupReturnsParentAndGroupAsMatcher() { + GroupTreeNode parent = GroupTreeNode + .fromGroup( + new ExplicitGroup("parent", GroupHierarchyType.INDEPENDENT, ',')); + GroupTreeNode node = parent + .addSubgroup(new ExplicitGroup("node", GroupHierarchyType.REFINING, ',')); + + AndMatcher matcher = new AndMatcher(); + matcher.addRule(node.getGroup()); + matcher.addRule(parent.getGroup()); + assertEquals(matcher, node.getSearchMatcher()); + } + + @Test + public void getSearchRuleForIncludingGroupReturnsGroupOrSubgroupAsMatcher() { + GroupTreeNode node = GroupTreeNode.fromGroup(new ExplicitGroup("node", GroupHierarchyType.INCLUDING, ',')); + GroupTreeNode child = node.addSubgroup(new ExplicitGroup("child", GroupHierarchyType.INDEPENDENT, ',')); + + OrMatcher matcher = new OrMatcher(); + matcher.addRule(node.getGroup()); + matcher.addRule(child.getGroup()); + assertEquals(matcher, node.getSearchMatcher()); + } + + @Test + public void numberOfHitsReturnsZeroForEmptyList() throws Exception { + assertEquals(0, getNodeInSimpleTree().calculateNumberOfMatches(Collections.emptyList())); + } + + @Test + public void numberOfHitsMatchesOneEntry() throws Exception { + GroupTreeNode parent = getNodeInSimpleTree(); + GroupTreeNode node = parent.addSubgroup( + new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, "author", "author2", true, ',', false)); + assertEquals(1, node.calculateNumberOfMatches(entries)); + } + + @Test + public void numberOfHitsMatchesMultipleEntries() throws Exception { + GroupTreeNode parent = getNodeInSimpleTree(); + GroupTreeNode node = parent.addSubgroup( + new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, "author", "author1", true, ',', false)); + assertEquals(2, node.calculateNumberOfMatches(entries)); + } + + @Test + public void numberOfHitsWorksForRefiningGroups() throws Exception { + GroupTreeNode grandParent = getNodeInSimpleTree(); + GroupTreeNode parent = grandParent.addSubgroup( + new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, "author", "author2", true, ',', false)); + GroupTreeNode node = parent.addSubgroup( + new WordKeywordGroup("node", GroupHierarchyType.REFINING, "author", "author1", true, ',', false)); + assertEquals(1, node.calculateNumberOfMatches(entries)); + } + + @Test + public void numberOfHitsWorksForHierarchyOfIndependentGroups() throws Exception { + GroupTreeNode grandParent = getNodeInSimpleTree(); + GroupTreeNode parent = grandParent.addSubgroup( + new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, "author", "author2", true, ',', false)); + GroupTreeNode node = parent.addSubgroup( + new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, "author", "author1", true, ',', false)); + assertEquals(2, node.calculateNumberOfMatches(entries)); + } + + @Test + public void setGroupChangesUnderlyingGroup() throws Exception { + GroupTreeNode node = getNodeInSimpleTree(); + AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ','); + + node.setGroup(newGroup, true, true, entries); + + assertEquals(newGroup, node.getGroup()); + } + + @Test + public void setGroupAddsPreviousAssignmentsExplicitToExplicit() throws Exception { + ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ','); + oldGroup.add(entry); + GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup); + AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ','); + + node.setGroup(newGroup, true, true, entries); + + assertTrue(newGroup.isMatch(entry)); + } + + @Test + public void setGroupWithFalseDoesNotAddsPreviousAssignments() throws Exception { + ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ','); + oldGroup.add(entry); + GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup); + AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ','); + + node.setGroup(newGroup, false, false, entries); + + assertFalse(newGroup.isMatch(entry)); + } + + @Test + public void setGroupAddsOnlyPreviousAssignments() throws Exception { + ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ','); + assertFalse(oldGroup.isMatch(entry)); + GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup); + AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ','); + + node.setGroup(newGroup, true, true, entries); + + assertFalse(newGroup.isMatch(entry)); + } + + @Test + public void setGroupExplicitToSearchDoesNotKeepPreviousAssignments() throws Exception { + ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ','); + oldGroup.add(entry); + GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup); + AbstractGroup newGroup = new SearchGroup("NewGroup", GroupHierarchyType.INDEPENDENT, "test", false, false); + + node.setGroup(newGroup, true, true, entries); + + assertFalse(newGroup.isMatch(entry)); + } + + @Test + public void setGroupExplicitToExplicitIsRenameAndSoRemovesPreviousAssignment() throws Exception { + ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ','); + oldGroup.add(entry); + GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup); + AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ','); + + node.setGroup(newGroup, true, true, entries); + + assertFalse(oldGroup.isMatch(entry)); + } + + @Test + public void getChildByPathFindsCorrectChildInSecondLevel() throws Exception { + GroupTreeNode root = getRoot(); + GroupTreeNode child = getNodeInSimpleTree(root); + + assertEquals(Optional.of(child), root.getChildByPath("ExplicitParent > ExplicitNode")); + } + + @Test + public void getPathSimpleTree() throws Exception { + GroupTreeNode node = getNodeInSimpleTree(); + + assertEquals("ExplicitParent > ExplicitNode", node.getPath()); + } +} diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index 150d66f9bf4..6b5fdd2c3d3 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -68,27 +68,11 @@ dependencies { runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' - testCompile 'com.github.tomakehurst:wiremock:2.14.0' - testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' testCompile 'junit:junit:4.12' - testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.assertj:assertj-core:3.8.0' - testCompile 'org.assertj:assertj-swing:3.8.0' - testCompile 'org.assertj:assertj-swing-junit:3.8.0' - testCompile 'org.hamcrest:hamcrest-core:1.3' - testCompile 'org.mockito:mockito-core:2.13.0' - testCompile 'org.reflections:reflections:0.9.11' - testCompile "org.testfx:testfx-core:4.0.+" - testCompile "org.testfx:testfx-junit:4.0.+" - testCompile 'com.tngtech.archunit:archunit:0.5.0' - testCompile 'org.xmlunit:xmlunit-core:2.5.1' - testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index 84fbec905e3..9964159c071 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -59,28 +59,12 @@ dependencies { compile 'com.github.tomtung:latex2unicode_2.12:0.2.2' - testCompile 'org.antlr:antlr-runtime:3.5.2' - testCompile 'com.github.tomakehurst:wiremock:2.14.0' - testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' testCompile 'junit:junit:4.12' - testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.assertj:assertj-core:3.8.0' - testCompile 'org.assertj:assertj-swing:3.8.0' - testCompile 'org.assertj:assertj-swing-junit:3.8.0' - testCompile 'org.hamcrest:hamcrest-core:1.3' testCompile 'org.mockito:mockito-core:2.13.0' - testCompile 'org.reflections:reflections:0.9.11' - testCompile "org.testfx:testfx-core:4.0.+" - testCompile "org.testfx:testfx-junit:4.0.+" - testCompile 'com.tngtech.archunit:archunit:0.5.0' - testCompile 'org.xmlunit:xmlunit-core:2.5.1' - testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } From 2f2e81ebbe9f486725ff26309da1052b00778c85 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 17:29:59 +0100 Subject: [PATCH 20/79] Move logic tests from org.jabref.gui org.jabref.logic --- org.jabref.logic/build.gradle | 17 +++++++++++++++++ .../org/jabref/logic/TypedBibEntryTest.java | 0 .../autosaveandbackup/BackupManagerTest.java | 0 .../jabref/logic/auxparser/AuxParserTest.java | 0 .../org/jabref/logic/bibtex/BibEntryAssert.java | 0 .../jabref/logic/bibtex/BibEntryWriterTest.java | 0 .../jabref/logic/bibtex/DuplicateCheckTest.java | 0 .../logic/bibtex/FieldContentParserTest.java | 0 .../logic/bibtex/LatexFieldFormatterTests.java | 0 .../bibtex/comparator/BibDatabaseDiffTest.java | 0 .../comparator/BibtexStringComparatorTest.java | 0 .../comparator/CrossRefEntryComparatorTest.java | 0 .../bibtex/comparator/EntryComparatorTest.java | 0 .../bibtex/comparator/FieldComparatorTest.java | 0 .../bibtex/comparator/MetaDataDiffTest.java | 0 .../BibtexKeyGeneratorTest.java | 0 .../MakeLabelWithDatabaseTest.java | 0 .../MakeLabelWithoutDatabaseTest.java | 0 .../logic/bst/BibtexCaseChangersTest.java | 0 .../logic/bst/BibtexNameFormatterTest.java | 0 .../org/jabref/logic/bst/BibtexPurifyTest.java | 0 .../org/jabref/logic/bst/BibtexWidthTest.java | 0 .../test/java/org/jabref/logic/bst/TestVM.java | 0 .../logic/bst/TextPrefixFunctionTest.java | 0 .../CitationStyleGeneratorTest.java | 0 .../logic/citationstyle/CitationStyleTest.java | 0 .../cleanup/BibtexBiblatexRoundtripTest.java | 0 .../jabref/logic/cleanup/CleanupWorkerTest.java | 0 .../cleanup/ConvertToBiblatexCleanupTest.java | 0 .../cleanup/ConvertToBibtexCleanupTest.java | 0 .../cleanup/FieldFormatterCleanupTest.java | 0 .../jabref/logic/cleanup/ISSNCleanupTest.java | 0 .../logic/cleanup/MoveFilesCleanupTest.java | 0 .../logic/cleanup/RenamePdfCleanupTest.java | 0 .../exporter/BibTeXMLExporterTestFiles.java | 0 .../exporter/BibtexDatabaseWriterTest.java | 0 .../logic/exporter/CsvExportFormatTest.java | 0 .../org/jabref/logic/exporter/ExporterTest.java | 0 .../exporter/FieldFormatterCleanupsTest.java | 0 .../logic/exporter/GroupSerializerTest.java | 0 .../logic/exporter/GroupTreeNodeTest.java | 0 .../logic/exporter/HtmlExportFormatTest.java | 0 .../exporter/MSBibExportFormatTestFiles.java | 0 .../logic/exporter/MetaDataSerializerTest.java | 0 .../logic/exporter/ModsExportFormatTest.java | 0 .../exporter/ModsExportFormatTestFiles.java | 0 .../logic/exporter/MsBibExportFormatTest.java | 0 .../jabref/logic/formatter/FormatterTest.java | 0 .../logic/formatter/IdentityFormatterTest.java | 0 .../bibtexfields/ClearFormatterTest.java | 0 .../EscapeUnderscoresFormatterTest.java | 0 .../bibtexfields/HtmlToLatexFormatterTest.java | 0 .../HtmlToUnicodeFormatterTest.java | 0 .../bibtexfields/LatexCleanupFormatterTest.java | 0 .../NormalizeDateFormatterTest.java | 0 .../NormalizeMonthFormatterTest.java | 0 .../NormalizeNamesFormatterTest.java | 0 .../NormalizePagesFormatterTest.java | 0 .../OrdinalsToSuperscriptFormatterTest.java | 0 .../bibtexfields/RegexFormatterTest.java | 0 .../bibtexfields/RemoveBracesFormatterTest.java | 0 .../RemoveHyphenatedNewlinesFormatterTest.java | 0 .../RemoveNewlinesFormatterTest.java | 0 .../bibtexfields/UnicodeConverterTest.java | 0 .../UnicodeToLatexFormatterTest.java | 0 .../bibtexfields/UnitsToLatexFormatterTest.java | 0 .../casechanger/CapitalizeFormatterTest.java | 0 .../casechanger/LowerCaseFormatterTest.java | 0 .../casechanger/ProtectTermsFormatterTest.java | 0 .../casechanger/SentenceCaseFormatterTest.java | 0 .../casechanger/TitleCaseFormatterTest.java | 0 .../casechanger/UpperCaseFormatterTest.java | 0 .../minifier/MinifyNameListFormatterTest.java | 0 .../org/jabref/logic/help/HelpFileTest.java | 0 .../importer/BibDatabaseTestsWithFiles.java | 0 .../logic/importer/DatabaseFileLookupTest.java | 0 .../logic/importer/FulltextFetchersTest.java | 0 .../jabref/logic/importer/ImportDataTest.java | 0 .../ImportFormatReaderIntegrationTest.java | 0 .../ImportFormatReaderTestParameterless.java | 0 .../org/jabref/logic/importer/ImporterTest.java | 0 .../jabref/logic/importer/OpenDatabaseTest.java | 0 .../jabref/logic/importer/WebFetchersTest.java | 0 .../jabref/logic/importer/fetcher/ACSTest.java | 0 .../fetcher/AbstractIsbnFetcherTest.java | 0 .../logic/importer/fetcher/ArXivTest.java | 0 .../fetcher/AstrophysicsDataSystemTest.java | 0 .../logic/importer/fetcher/CrossRefTest.java | 0 .../logic/importer/fetcher/DBLPFetcherTest.java | 0 .../jabref/logic/importer/fetcher/DiVATest.java | 0 .../logic/importer/fetcher/DoiFetcherTest.java | 0 .../importer/fetcher/DoiResolutionTest.java | 0 .../importer/fetcher/FulltextFetcherTest.java | 0 .../importer/fetcher/GoogleScholarTest.java | 0 .../logic/importer/fetcher/GvkFetcherTest.java | 0 .../logic/importer/fetcher/GvkParserTest.java | 0 .../jabref/logic/importer/fetcher/IEEETest.java | 0 .../importer/fetcher/IacrEprintFetcherTest.java | 0 .../logic/importer/fetcher/IsbnFetcherTest.java | 0 .../fetcher/IsbnViaChimboriFetcherTest.java | 0 .../fetcher/IsbnViaEbookDeFetcherTest.java | 0 .../importer/fetcher/LibraryOfCongressTest.java | 0 .../logic/importer/fetcher/MathSciNetTest.java | 0 .../importer/fetcher/MedlineFetcherTest.java | 0 .../importer/fetcher/MrDLibFetcherTest.java | 0 .../importer/fetcher/OpenAccessDoiTest.java | 0 .../importer/fetcher/ScienceDirectTest.java | 0 .../importer/fetcher/SpringerLinkTest.java | 0 .../importer/fetcher/TitleFetcherTest.java | 0 .../logic/importer/fetcher/zbMATHTest.java | 0 .../fileformat/BibTeXMLImporterTest.java | 0 .../fileformat/BibTeXMLImporterTestFiles.java | 0 .../fileformat/BibTeXMLImporterTestTypes.java | 0 .../fileformat/BiblioscapeImporterTest.java | 0 .../BiblioscapeImporterTestFiles.java | 0 .../BiblioscapeImporterTestTypes.java | 0 .../importer/fileformat/BibtexImporterTest.java | 0 .../importer/fileformat/BibtexParserTest.java | 0 .../importer/fileformat/CopacImporterTest.java | 0 .../fileformat/CopacImporterTestFiles.java | 0 .../importer/fileformat/CustomImporterTest.java | 0 .../fileformat/EndnoteImporterTest.java | 0 .../fileformat/FreeCiteImporterTest.java | 0 .../importer/fileformat/ImporterTestEngine.java | 0 .../importer/fileformat/InspecImporterTest.java | 0 .../importer/fileformat/IsiImporterTest.java | 0 .../fileformat/MedlineImporterTest.java | 0 .../fileformat/MedlineImporterTestFiles.java | 0 .../fileformat/MedlinePlainImporterTest.java | 0 .../fileformat/ModsImporterTestFiles.java | 0 .../importer/fileformat/MrDLibImporterTest.java | 0 .../importer/fileformat/MsBibImporterTest.java | 0 .../fileformat/MsBibImporterTestFiles.java | 0 .../importer/fileformat/OvidImporterTest.java | 0 .../fileformat/PdfContentImporterTest.java | 0 .../fileformat/PdfContentImporterTestFiles.java | 0 .../importer/fileformat/PdfXmpImporterTest.java | 0 .../importer/fileformat/RISImporterTest.java | 0 .../fileformat/RISImporterTestFiles.java | 0 .../fileformat/RepecNepImporterTest.java | 0 .../fileformat/SilverPlatterImporterTest.java | 0 .../util/ConvertLegacyExplicitGroupsTest.java | 0 .../logic/importer/util/GroupsParserTest.java | 0 .../importer/util/JSONEntryParserTest.java | 0 .../logic/integrity/BracesCorrectorTest.java | 0 .../logic/integrity/EntryLinkCheckerTest.java | 0 .../logic/integrity/IntegrityCheckTest.java | 0 .../integrity/NoBibTexFieldCheckerTest.java | 0 .../logic/integrity/PersonNamesCheckerTest.java | 0 .../logic/journals/AbbreviationParserTest.java | 0 .../jabref/logic/journals/AbbreviationTest.java | 0 .../logic/journals/AbbreviationsTest.java | 0 .../JournalAbbreviationRepositoryTest.java | 0 ...ShippedJournalAbbreviationDuplicateTest.java | 0 .../org/jabref/logic/l10n/EncodingsTest.java | 0 .../org/jabref/logic/l10n/LanguagesTest.java | 0 .../logic/l10n/LocalizationBundleForTEst.java | 0 .../logic/l10n/LocalizationConsistencyTest.java | 0 .../jabref/logic/l10n/LocalizationEntry.java | 0 .../logic/l10n/LocalizationKeyParamsTest.java | 0 .../jabref/logic/l10n/LocalizationKeyTest.java | 0 .../jabref/logic/l10n/LocalizationParser.java | 0 .../logic/l10n/LocalizationParserTest.java | 0 .../org/jabref/logic/l10n/LocalizationTest.java | 0 .../l10n/PropertiesLocaleCompletenessTest.java | 0 .../jabref/logic/layout/LayoutEntryTest.java | 0 .../org/jabref/logic/layout/LayoutTest.java | 0 .../layout/format/AuthorAbbreviatorTest.java | 0 .../AuthorAndToSemicolonReplacerTest.java | 0 .../format/AuthorAndsCommaReplacerTest.java | 0 .../layout/format/AuthorAndsReplacerTest.java | 0 .../format/AuthorFirstAbbrLastCommasTest.java | 0 .../AuthorFirstAbbrLastOxfordCommasTest.java | 0 .../format/AuthorFirstFirstCommasTest.java | 0 .../layout/format/AuthorFirstFirstTest.java | 0 .../format/AuthorFirstLastCommasTest.java | 0 .../format/AuthorFirstLastOxfordCommasTest.java | 0 .../layout/format/AuthorLF_FFAbbrTest.java | 0 .../logic/layout/format/AuthorLF_FFTest.java | 0 .../format/AuthorLastFirstAbbrCommasTest.java | 0 .../AuthorLastFirstAbbrOxfordCommasTest.java | 0 .../AuthorLastFirstAbbreviatorTester.java | 0 .../format/AuthorLastFirstCommasTest.java | 0 .../format/AuthorLastFirstOxfordCommasTest.java | 0 .../layout/format/AuthorLastFirstTest.java | 0 .../logic/layout/format/AuthorNatBibTest.java | 0 .../logic/layout/format/AuthorOrgSciTest.java | 0 .../jabref/logic/layout/format/AuthorsTest.java | 0 .../layout/format/CompositeFormatTest.java | 0 .../logic/layout/format/DOICheckTest.java | 0 .../logic/layout/format/DOIStripTest.java | 0 .../logic/layout/format/DateFormatterTest.java | 0 .../jabref/logic/layout/format/DefaultTest.java | 0 .../layout/format/EntryTypeFormatterTest.java | 0 .../logic/layout/format/FileLinkTest.java | 0 .../logic/layout/format/FirstPageTest.java | 0 .../logic/layout/format/HTMLCharsTest.java | 0 .../logic/layout/format/HTMLParagraphsTest.java | 0 .../logic/layout/format/IfPluralTest.java | 0 .../logic/layout/format/LastPageTest.java | 0 .../format/LatexToUnicodeFormatterTest.java | 0 .../logic/layout/format/NameFormatterTest.java | 0 .../format/NoSpaceBetweenAbbreviationsTest.java | 0 .../jabref/logic/layout/format/OrdinalTest.java | 0 .../logic/layout/format/RTFCharsTest.java | 0 .../format/RemoveBracketsAddCommaTest.java | 0 .../logic/layout/format/RemoveBracketsTest.java | 0 .../logic/layout/format/RemoveTildeTest.java | 0 .../layout/format/RemoveWhitespaceTest.java | 0 .../jabref/logic/layout/format/ReplaceTest.java | 0 .../logic/layout/format/RisKeywordsTest.java | 0 .../logic/layout/format/RisMonthTest.java | 0 .../logic/layout/format/ToLowerCaseTest.java | 0 .../logic/layout/format/ToUpperCaseTest.java | 0 .../logic/layout/format/WrapContentTest.java | 0 .../logic/layout/format/WrapFileLinksTest.java | 0 .../org/jabref/logic/msbib/MsBibAuthorTest.java | 0 .../jabref/logic/net/MimeTypeDetectorTest.java | 0 .../org/jabref/logic/net/URLDownloadTest.java | 0 .../java/org/jabref/logic/net/URLUtilTest.java | 0 .../logic/openoffice/CitationEntryTest.java | 0 .../jabref/logic/openoffice/OOBibStyleTest.java | 0 .../logic/openoffice/OOPreFormatterTest.java | 0 .../logic/openoffice/StyleLoaderTest.java | 0 .../logic/pdf/EntryAnnotationImporterTest.java | 0 .../logic/pdf/PdfAnnotationImporterTest.java | 0 .../protectedterms/ProtectedTermsListTest.java | 0 .../ProtectedTermsLoaderTest.java | 0 .../logic/search/DatabaseSearcherTest.java | 0 .../SearchQueryHighlightObservableTest.java | 0 .../jabref/logic/search/SearchQueryTest.java | 0 .../specialfields/SpecialFieldsUtilsTest.java | 0 .../jabref/logic/util/BracketedPatternTest.java | 0 .../org/jabref/logic/util/BuildInfoTest.java | 0 .../jabref/logic/util/DevelopmentStageTest.java | 0 .../org/jabref/logic/util/FileTypeTest.java | 0 .../org/jabref/logic/util/JavaVersionTest.java | 0 .../org/jabref/logic/util/UpdateFieldTest.java | 0 .../java/org/jabref/logic/util/VersionTest.java | 0 .../util/io/CiteKeyBasedFileFinderTest.java | 0 .../jabref/logic/util/io/FileHistoryTest.java | 0 .../logic/util/io/FileNameCleanerTest.java | 0 .../org/jabref/logic/util/io/FileUtilTest.java | 0 .../util/io/RegExpBasedFileFinderTests.java | 0 .../util/strings/DiffHighlightingTest.java | 0 .../strings/StringLengthComparatorTest.java | 0 .../jabref/logic/xmp/XMPSchemaBibtexTest.java | 0 .../java/org/jabref/logic/xmp/XMPUtilTest.java | 0 .../org/jabref/support/CIServerCondition.java | 0 .../org/jabref/support/DisabledOnCIServer.java | 0 .../jabref/testutils/category/DatabaseTest.java | 0 .../jabref/testutils/category/FetcherTest.java | 0 252 files changed, 17 insertions(+) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/TypedBibEntryTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bst/TestVM.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/ExporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/GroupTreeNodeTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/FormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/help/HelpFileTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/ImportDataTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/ImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/WebFetchersTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/GvkParserTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fetcher/zbMATHTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTestFiles.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroupsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/importer/util/JSONEntryParserTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/journals/AbbreviationTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/EncodingsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/LanguagesTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTEst.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/LocalizationParser.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/LocalizationTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/LayoutTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/DefaultTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/LastPageTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/net/URLDownloadTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/net/URLUtilTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/search/SearchQueryTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/BracketedPatternTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/BuildInfoTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/FileTypeTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/JavaVersionTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/UpdateFieldTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/VersionTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/io/FileNameCleanerTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/io/FileUtilTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/support/CIServerCondition.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/support/DisabledOnCIServer.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/testutils/category/DatabaseTest.java (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/java/org/jabref/testutils/category/FetcherTest.java (100%) diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index 6b5fdd2c3d3..cad5111b91a 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -68,11 +68,28 @@ dependencies { runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' + testCompile 'org.antlr:antlr-runtime:3.5.2' + testCompile 'com.github.tomakehurst:wiremock:2.14.0' + testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' testCompile 'junit:junit:4.12' + testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' + testCompile 'org.assertj:assertj-core:3.8.0' + testCompile 'org.assertj:assertj-swing:3.8.0' + testCompile 'org.assertj:assertj-swing-junit:3.8.0' + testCompile 'org.hamcrest:hamcrest-core:1.3' + testCompile 'org.mockito:mockito-core:2.13.0' + testCompile 'org.reflections:reflections:0.9.11' + testCompile "org.testfx:testfx-core:4.0.+" + testCompile "org.testfx:testfx-junit:4.0.+" + testCompile 'com.tngtech.archunit:archunit:0.5.0' + testCompile 'org.xmlunit:xmlunit-core:2.5.1' + testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/TypedBibEntryTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/TypedBibEntryTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/TypedBibEntryTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/TypedBibEntryTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bst/TestVM.java b/org.jabref.logic/src/test/java/org/jabref/logic/bst/TestVM.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bst/TestVM.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bst/TestVM.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/ExporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/ExporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/ExporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/ExporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/GroupTreeNodeTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/GroupTreeNodeTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/GroupTreeNodeTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/GroupTreeNodeTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/FormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/FormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/FormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/FormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/help/HelpFileTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/help/HelpFileTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/help/HelpFileTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/help/HelpFileTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportDataTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportDataTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportDataTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportDataTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/ImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/ImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/ImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/ImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/WebFetchersTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/WebFetchersTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/WebFetchersTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GvkParserTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/GvkParserTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/GvkParserTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/GvkParserTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/zbMATHTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/zbMATHTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fetcher/zbMATHTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fetcher/zbMATHTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTestFiles.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTestFiles.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTestFiles.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTestFiles.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroupsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroupsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroupsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/util/ConvertLegacyExplicitGroupsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/importer/util/JSONEntryParserTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/util/JSONEntryParserTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/importer/util/JSONEntryParserTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/importer/util/JSONEntryParserTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/journals/AbbreviationTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/journals/AbbreviationTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/EncodingsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/EncodingsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/EncodingsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/EncodingsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LanguagesTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/LanguagesTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/LanguagesTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/LanguagesTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTEst.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTEst.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTEst.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTEst.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationParser.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationParser.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationParser.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationParser.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/LocalizationTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/LocalizationTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/LayoutTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/LayoutTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/LayoutTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/LayoutTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DefaultTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/DefaultTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/DefaultTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/DefaultTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/LastPageTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/LastPageTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/LastPageTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/LastPageTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/net/URLDownloadTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/net/URLDownloadTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/net/URLDownloadTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/net/URLDownloadTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/net/URLUtilTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/net/URLUtilTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/net/URLUtilTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/net/URLUtilTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/search/SearchQueryTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/search/SearchQueryTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/search/SearchQueryTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/search/SearchQueryTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/BracketedPatternTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/BracketedPatternTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/BracketedPatternTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/BracketedPatternTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/BuildInfoTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/BuildInfoTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/BuildInfoTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/BuildInfoTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/FileTypeTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/FileTypeTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/FileTypeTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/FileTypeTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/JavaVersionTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/JavaVersionTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/JavaVersionTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/JavaVersionTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/UpdateFieldTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/UpdateFieldTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/UpdateFieldTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/UpdateFieldTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/VersionTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/VersionTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/VersionTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/VersionTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileNameCleanerTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/io/FileNameCleanerTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileNameCleanerTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/io/FileNameCleanerTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/io/FileUtilTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/io/FileUtilTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/io/FileUtilTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/support/CIServerCondition.java b/org.jabref.logic/src/test/java/org/jabref/support/CIServerCondition.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/support/CIServerCondition.java rename to org.jabref.logic/src/test/java/org/jabref/support/CIServerCondition.java diff --git a/org.jabref.gui/src/test/java/org/jabref/support/DisabledOnCIServer.java b/org.jabref.logic/src/test/java/org/jabref/support/DisabledOnCIServer.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/support/DisabledOnCIServer.java rename to org.jabref.logic/src/test/java/org/jabref/support/DisabledOnCIServer.java diff --git a/org.jabref.gui/src/test/java/org/jabref/testutils/category/DatabaseTest.java b/org.jabref.logic/src/test/java/org/jabref/testutils/category/DatabaseTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/testutils/category/DatabaseTest.java rename to org.jabref.logic/src/test/java/org/jabref/testutils/category/DatabaseTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/testutils/category/FetcherTest.java b/org.jabref.logic/src/test/java/org/jabref/testutils/category/FetcherTest.java similarity index 100% rename from org.jabref.gui/src/test/java/org/jabref/testutils/category/FetcherTest.java rename to org.jabref.logic/src/test/java/org/jabref/testutils/category/FetcherTest.java From 4afbb8b618406822cdbf61058bdf1fa997672fe6 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 17:30:09 +0100 Subject: [PATCH 21/79] Fix bibtexTestData location --- .../src/test/java/org/jabref/logic/xmp}/BibtexTestData.java | 2 +- .../src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename {org.jabref.gui/src/test/java/org/jabref => org.jabref.logic/src/test/java/org/jabref/logic/xmp}/BibtexTestData.java (98%) diff --git a/org.jabref.gui/src/test/java/org/jabref/BibtexTestData.java b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/BibtexTestData.java similarity index 98% rename from org.jabref.gui/src/test/java/org/jabref/BibtexTestData.java rename to org.jabref.logic/src/test/java/org/jabref/logic/xmp/BibtexTestData.java index e166a076c98..4aeed93e904 100644 --- a/org.jabref.gui/src/test/java/org/jabref/BibtexTestData.java +++ b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/BibtexTestData.java @@ -1,4 +1,4 @@ -package org.jabref; +package org.jabref.logic.xmp; import java.io.IOException; import java.io.StringReader; diff --git a/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java index 45413a0aa57..d980950fbda 100644 --- a/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java +++ b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java @@ -10,7 +10,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.jabref.BibtexTestData; import org.jabref.logic.bibtex.FieldContentParserPreferences; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; From 9b5e1f8f818065a03e1781e1d06ef46a7270d20f Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 17:46:12 +0100 Subject: [PATCH 22/79] Remove GenerateCharacterTable - it was never published officially --- .../jabref/cli/GenerateCharacterTable.java | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 org.jabref.gui/src/main/java/org/jabref/cli/GenerateCharacterTable.java diff --git a/org.jabref.gui/src/main/java/org/jabref/cli/GenerateCharacterTable.java b/org.jabref.gui/src/main/java/org/jabref/cli/GenerateCharacterTable.java deleted file mode 100644 index babd5bbca00..00000000000 --- a/org.jabref.gui/src/main/java/org/jabref/cli/GenerateCharacterTable.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.jabref.cli; - -import java.util.Map; -import java.util.TreeMap; - -import org.jabref.logic.util.strings.HTMLUnicodeConversionMaps; - -public class GenerateCharacterTable { - - private GenerateCharacterTable() { - } - - public static void main(String[] args) { - Map characterMap = new TreeMap<>(HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP); - System.out.println("\\documentclass[10pt, a4paper]{article}"); - System.out.println("\\usepackage[T5,T1]{fontenc}"); - System.out.println("\\usepackage{amssymb}"); - System.out.println("\\usepackage{amsmath}"); - System.out.println("\\usepackage{txfonts}"); - System.out.println("\\usepackage{xfrac}"); - System.out.println("\\usepackage{combelow}"); - System.out.println("\\usepackage{textcomp}"); - System.out.println("\\usepackage{mathspec}"); - System.out.println("\\usepackage{fontspec}"); - System.out.println("\\usepackage[a4paper,margin=1cm]{geometry}"); - System.out.println("\\usepackage{supertabular}"); - System.out.println("\\usepackage{mathabx}"); - System.out.println("\\fontspec{Cambria}"); - System.out.println("\\DeclareTextSymbolDefault{\\OHORN}{T5}"); - System.out.println("\\DeclareTextSymbolDefault{\\UHORN}{T5}"); - System.out.println("\\DeclareTextSymbolDefault{\\ohorn}{T5}"); - System.out.println("\\DeclareTextSymbolDefault{\\uhorn}{T5}"); - System.out.println("\\begin{document}"); - System.out.println("\\twocolumn"); - System.out.println("\\begin{supertabular}{c|c|c|c|c}"); - System.out.println("No. & Uni & Symb & \\LaTeX & Code \\\\ \n \\hline"); - - for (Map.Entry character : characterMap.entrySet()) { - System.out - .println( - character.getKey() + " & " - + ((character.getKey() > 128) ? String - .valueOf(Character.toChars(character.getKey())) : "") - + " & \\symbol{" + Integer.toString(character.getKey()) + "} & " - + character.getValue() + " & \\verb¤" + character.getValue() + "¤ \\\\"); - } - System.out.println("\\end{supertabular}"); - System.out.println("\\end{document}"); - - } - -} From 4fec00074d0d59945da2aecba5e204912343fbab Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 21:05:48 +0100 Subject: [PATCH 23/79] Create org.jabref.cli.xmp project --- org.jabref.cli.xmp/build.gradle | 239 ++++++++++++++++++ org.jabref.cli.xmp/settings.gradle | 1 + .../main/java/org/jabref/cli/XmpUtilMain.java | 40 +-- settings.gradle | 2 +- 4 files changed, 262 insertions(+), 20 deletions(-) create mode 100644 org.jabref.cli.xmp/build.gradle create mode 100644 org.jabref.cli.xmp/settings.gradle rename org.jabref.gui/src/main/java/org/jabref/cli/XMPUtilMain.java => org.jabref.cli.xmp/src/main/java/org/jabref/cli/XmpUtilMain.java (80%) diff --git a/org.jabref.cli.xmp/build.gradle b/org.jabref.cli.xmp/build.gradle new file mode 100644 index 00000000000..194742daae2 --- /dev/null +++ b/org.jabref.cli.xmp/build.gradle @@ -0,0 +1,239 @@ +import groovy.json.JsonSlurper +import org.gradle.internal.os.OperatingSystem + +plugins { + id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" + id "com.simonharrer.modernizer" version '1.5.0-1' + id 'me.champeau.gradle.jmh' version '0.4.3' + id 'net.ltgt.errorprone' version '0.0.13' + id 'com.github.ben-manes.versions' version '0.17.0' +} + +apply plugin: 'project-report' +apply plugin: 'jacoco' +apply plugin: 'me.champeau.gradle.jmh' +apply plugin: 'org.junit.platform.gradle.plugin' + +dependencies { + compile project(':org.jabref.model') + compile project(':org.jabref.logic') + + compile 'org.json:json:20160212' + + compile 'org.antlr:antlr-runtime:3.5.2' + + // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 + compile 'org.apache.pdfbox:pdfbox:1.8.13' + compile 'org.apache.pdfbox:jempbox:1.8.13' + + compile 'org.apache.commons:commons-lang3:3.6' + + compile "org.libreoffice:ridl:5.4.2" + compile "org.libreoffice:unoil:5.4.2" + + compile 'com.github.bkromhout:java-diff-utils:2.1.1' + compile 'info.debatty:java-string-similarity:1.0.1' + + compile 'com.google.guava:guava:24.0-jre' + + compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' + + compile 'org.jsoup:jsoup:1.11.2' + compile 'com.mashape.unirest:unirest-java:1.4.9' + compile 'org.apache.httpcomponents:httpclient:4.5.3' + compile 'commons-io:commons-io:2.4' + + // >1.8.0-beta is required for java 9 compatibility + compile 'org.slf4j:slf4j-api:1.8.0-beta1' + compile 'org.apache.logging.log4j:log4j-api:2.10.0' + compile 'org.apache.logging.log4j:log4j-core:2.10.0' + runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' + runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' + + compile 'de.undercouch:citeproc-java:1.0.1' + compile 'org.jbibtex:jbibtex:1.0.17' + // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles + runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' + runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' + + testCompile 'org.antlr:antlr-runtime:3.5.2' + testCompile 'com.github.tomakehurst:wiremock:2.14.0' + testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' + testCompile 'junit:junit:4.12' + testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' + testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' + testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' + testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' + testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' + testCompile 'org.assertj:assertj-core:3.8.0' + testCompile 'org.assertj:assertj-swing:3.8.0' + testCompile 'org.assertj:assertj-swing-junit:3.8.0' + testCompile 'org.hamcrest:hamcrest-core:1.3' + testCompile 'org.mockito:mockito-core:2.13.0' + testCompile 'org.reflections:reflections:0.9.11' + testCompile "org.testfx:testfx-core:4.0.+" + testCompile "org.testfx:testfx-junit:4.0.+" + testCompile 'com.tngtech.archunit:archunit:0.5.0' + testCompile 'org.xmlunit:xmlunit-core:2.5.1' + testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' + + checkstyle 'com.puppycrawl.tools:checkstyle:8.8' +} + +dependencyUpdates { + outputFormatter = "json" +} + +// We have some dependencies which cannot be updated due to various reasons. +dependencyUpdates.resolutionStrategy = { + componentSelection { + withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") + } + } + withModule("org.apache.pdfbox:pdfbox") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") + } + } + } +} + +task checkOutdatedDependencies(dependsOn: dependencyUpdates) { + doLast { + def dependencyReport = new JsonSlurper().parseText(new File("build/dependencyUpdates/report.json").text) + assert dependencyReport.outdated.count == 0: "There are outdated dependencies in build.gradle!\n Run ./gradlew dependencyUpdates to see which" + } +} + +compileJava { + options.encoding = 'UTF-8' + options.compilerArgs << "-Xlint:none" +} + +compileTestJava { + options.encoding = 'UTF-8' +} + +javadoc { + options { + encoding = 'UTF-8' + version = true + author = true + } +} + +// Test tasks +junitPlatform { + logManager 'org.apache.logging.log4j.jul.LogManager' +} + +// Test result tasks +task copyTestResources(type: Copy) { + from "${projectDir}/src/test/resources" + into "${buildDir}/classes/test" +} +processTestResources.dependsOn copyTestResources + +tasks.withType(Test) { + reports.html.destination = file("${reporting.baseDir}/${name}") + + jacoco { + append = true + } +} + +task jacocoMerge(type: JacocoMerge) { + executionData file("$buildDir/jacoco/junitPlatformTest.exec") + dependsOn junitPlatformTest +} + +jacocoTestReport { + executionData jacocoMerge.destinationFile + dependsOn jacocoMerge + + reports { + xml.enabled = true // coveralls plugin depends on xml format report + html.enabled = true + } +} + +afterEvaluate { + def junitPlatformTest = tasks.junitPlatformTest + + jacoco { + toolVersion = '0.8.0' + applyTo(junitPlatformTest) + } + + task jacocoJunit5TestReport(type: JacocoReport) { + executionData jacocoMerge.destinationFile + dependsOn jacocoMerge + sourceSets sourceSets.main + sourceDirectories = files(sourceSets.main.allSource.srcDirs) + classDirectories = files(sourceSets.main.output) + + reports { + xml.enabled true + html.enabled true + } + } +} + +// Code quality tasks +checkstyle { + // do not use other packages for checkstyle, excluding gen(erated) sources + checkstyleMain.source = "src/main/java" + toolVersion = '8.5' +} + +checkstyleMain.shouldRunAfter test +checkstyleTest.shouldRunAfter test + +modernizer { + // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. + // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer + failOnViolations = false +} + +/* + * Changes project.version to VERSION--snapshot--DATE--GIT_HASH + */ +if (hasProperty('dev')) { + String command = "git log --pretty=format:%cd--%h -n 1 --date=short" + String commitInfo = "" + if (OperatingSystem.current().isWindows()) { + commitInfo = "cmd /c $command".execute().in.text + } else { + commitInfo = command.execute().in.text + } + + // determine branch + command = "git symbolic-ref -q --short HEAD" + String branchName = "" + if (OperatingSystem.current().isWindows()) { + branchName = "cmd /c $command".execute().in.text + } else { + branchName = command.execute().in.text + } + // A newline is returned. Remove it. (trim()) + // In the context of github, the branch name could be something like "pull/277" + // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" + // http://stackoverflow.com/a/15075907/873282 describes the used pattern. + branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") + + // hack string + // first the date (%cd), then the branch name, and finally the commit id (%h) + String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) + + project.version += "--snapshot--" + infoString +} + +jmh { + warmupIterations = 5 + iterations = 10 + fork = 2 +} diff --git a/org.jabref.cli.xmp/settings.gradle b/org.jabref.cli.xmp/settings.gradle new file mode 100644 index 00000000000..1b2e190cd6a --- /dev/null +++ b/org.jabref.cli.xmp/settings.gradle @@ -0,0 +1 @@ +include 'org.jabref.model', 'org.jabref.logic' diff --git a/org.jabref.gui/src/main/java/org/jabref/cli/XMPUtilMain.java b/org.jabref.cli.xmp/src/main/java/org/jabref/cli/XmpUtilMain.java similarity index 80% rename from org.jabref.gui/src/main/java/org/jabref/cli/XMPUtilMain.java rename to org.jabref.cli.xmp/src/main/java/org/jabref/cli/XmpUtilMain.java index 517f572017c..918d11470b0 100644 --- a/org.jabref.gui/src/main/java/org/jabref/cli/XMPUtilMain.java +++ b/org.jabref.cli.xmp/src/main/java/org/jabref/cli/XmpUtilMain.java @@ -6,29 +6,33 @@ import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Optional; import javax.xml.transform.TransformerException; -import org.jabref.Globals; import org.jabref.logic.bibtex.BibEntryWriter; +import org.jabref.logic.bibtex.FieldContentParserPreferences; import org.jabref.logic.bibtex.LatexFieldFormatter; +import org.jabref.logic.bibtex.LatexFieldFormatterPreferences; +import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.importer.ParserResult; import org.jabref.logic.importer.fileformat.BibtexParser; import org.jabref.logic.xmp.XMPPreferences; import org.jabref.logic.xmp.XMPUtil; +import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; -import org.jabref.preferences.JabRefPreferences; +import org.jabref.model.util.DummyFileUpdateMonitor; import org.apache.jempbox.impl.XMLUtil; import org.apache.jempbox.xmp.XMPMetadata; -public class XMPUtilMain { +public class XmpUtilMain { - private XMPUtilMain() { + private XmpUtilMain() { } /** @@ -56,27 +60,27 @@ private XMPUtilMain() { * If the given BibEntry is malformed. */ public static void main(String[] args) throws IOException, TransformerException { - - // Don't forget to initialize the preferences - if (Globals.prefs == null) { - Globals.prefs = JabRefPreferences.getInstance(); - } - - XMPPreferences xmpPreferences = Globals.prefs.getXMPPreferences(); - ImportFormatPreferences importFormatPreferences = Globals.prefs.getImportFormatPreferences(); + final ImportFormatPreferences importFormatPreferences = new ImportFormatPreferences( + Collections.emptySet(), + StandardCharsets.UTF_8, + ',', + new BibtexKeyPatternPreferences("", "", false, true, true, GlobalBibtexKeyPattern.fromPattern("[auth][year]"), ','), + new FieldContentParserPreferences(), + false); + final BibtexParser bibtexParser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()); + final XMPPreferences xmpPreferences = new XMPPreferences(false, Collections.emptyList(), ';'); switch (args.length) { case 0: usage(); break; case 1: - if (args[0].endsWith(".pdf")) { // Read from pdf and write as BibTex List l = XMPUtil.readXMP(new File(args[0]), xmpPreferences); BibEntryWriter bibtexEntryWriter = new BibEntryWriter( - new LatexFieldFormatter(Globals.prefs.getLatexFieldFormatterPreferences()), false); + new LatexFieldFormatter(new LatexFieldFormatterPreferences()), false); for (BibEntry entry : l) { StringWriter sw = new StringWriter(); @@ -87,7 +91,7 @@ public static void main(String[] args) throws IOException, TransformerException } else if (args[0].endsWith(".bib")) { // Read from BIB and write as XMP try (FileReader fr = new FileReader(args[0])) { - ParserResult result = new BibtexParser(importFormatPreferences, Globals.getFileUpdateMonitor()).parse(fr); + ParserResult result = bibtexParser.parse(fr); Collection entries = result.getDatabase().getEntries(); if (entries.isEmpty()) { @@ -114,7 +118,7 @@ public static void main(String[] args) throws IOException, TransformerException } if (args[0].endsWith(".bib") && args[1].endsWith(".pdf")) { - ParserResult result = new BibtexParser(importFormatPreferences, Globals.getFileUpdateMonitor()).parse(new FileReader(args[0])); + ParserResult result = bibtexParser.parse(new FileReader(args[0])); Collection entries = result.getDatabase().getEntries(); @@ -135,7 +139,7 @@ public static void main(String[] args) throws IOException, TransformerException break; } - ParserResult result = new BibtexParser(importFormatPreferences, Globals.getFileUpdateMonitor()).parse(new FileReader(args[1])); + ParserResult result = bibtexParser.parse(new FileReader(args[1])); Optional bibEntry = result.getDatabase().getEntryByKey(args[0]); @@ -155,8 +159,6 @@ public static void main(String[] args) throws IOException, TransformerException /** * Print usage information for the command line tool xmpUtil. - * - * @see XMPUtilMain#main(String[]) */ private static void usage() { System.out.println("Read or write XMP-metadata from or to pdf file."); diff --git a/settings.gradle b/settings.gradle index 72b6bad3ad5..80d3f509605 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = "JabRef" -include 'org.jabref.model', 'org.jabref.logic', 'org.jabref.gui' +include 'org.jabref.model', 'org.jabref.logic', 'org.jabref.gui', 'org.jabref.cli.xmp' From abbe77726e3e261df9220df8e162a4ab9aed20a3 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 21:11:39 +0100 Subject: [PATCH 24/79] Fix location of test resources --- .../logic/importer/DatabaseFileLookupTest.java | 12 +++++++----- .../org/jabref/logic/importer/ImportDataTest.java | 7 ------- .../org/jabref/logic/auxparser/badpaper.aux | 0 .../resources/org/jabref/logic/auxparser/config.bib | 0 .../org/jabref/logic/auxparser/crossref.aux | 0 .../resources/org/jabref/logic/auxparser/nested.aux | 0 .../resources/org/jabref/logic/auxparser/origin.bib | 0 .../resources/org/jabref/logic/auxparser/paper.aux | 0 .../resources/org/jabref/logic/auxparser/result.bib | 0 .../test/resources/org/jabref/logic/bst/abbrv.bst | 0 .../logic/exporter/BibTeXMLExporterTestArticle.bib | 0 .../logic/exporter/BibTeXMLExporterTestArticle.xml | 0 .../BibTeXMLExporterTestArticleWithoutID.bib | 0 .../BibTeXMLExporterTestArticleWithoutID.xml | 0 .../logic/exporter/BibTeXMLExporterTestAuthor.bib | 0 .../logic/exporter/BibTeXMLExporterTestAuthor.xml | 0 .../logic/exporter/BibTeXMLExporterTestBook.bib | 0 .../logic/exporter/BibTeXMLExporterTestBook.xml | 0 .../logic/exporter/BibTeXMLExporterTestBooklet.bib | 0 .../logic/exporter/BibTeXMLExporterTestBooklet.xml | 0 .../exporter/BibTeXMLExporterTestConference.bib | 0 .../exporter/BibTeXMLExporterTestConference.xml | 0 .../logic/exporter/BibTeXMLExporterTestInBook.bib | 0 .../logic/exporter/BibTeXMLExporterTestInBook.xml | 0 .../exporter/BibTeXMLExporterTestInCollection.bib | 0 .../exporter/BibTeXMLExporterTestInCollection.xml | 0 .../exporter/BibTeXMLExporterTestInProceedings.bib | 0 .../exporter/BibTeXMLExporterTestInProceedings.xml | 0 .../BibTeXMLExporterTestInbookLessFields.bib | 0 .../BibTeXMLExporterTestInbookLessFields.xml | 0 .../exporter/BibTeXMLExporterTestInvalidInbook.bib | 0 .../exporter/BibTeXMLExporterTestInvalidInbook.xml | 0 .../logic/exporter/BibTeXMLExporterTestManual.bib | 0 .../logic/exporter/BibTeXMLExporterTestManual.xml | 0 .../exporter/BibTeXMLExporterTestMasterThesis.bib | 0 .../exporter/BibTeXMLExporterTestMasterThesis.xml | 0 .../logic/exporter/BibTeXMLExporterTestMisc.bib | 0 .../logic/exporter/BibTeXMLExporterTestMisc.xml | 0 .../exporter/BibTeXMLExporterTestPhdThesis.bib | 0 .../exporter/BibTeXMLExporterTestPhdThesis.xml | 0 .../exporter/BibTeXMLExporterTestProceedings.bib | 0 .../exporter/BibTeXMLExporterTestProceedings.xml | 0 .../exporter/BibTeXMLExporterTestTechReport.bib | 0 .../exporter/BibTeXMLExporterTestTechReport.xml | 0 .../exporter/BibTeXMLExporterTestUnpublished.bib | 0 .../exporter/BibTeXMLExporterTestUnpublished.xml | 0 .../exporter/ModsExportFormatTestAllFields.bib | 0 .../exporter/ModsExportFormatTestAllFields.xml | 0 .../logic/exporter/ModsExportFormatTestBook.bib | 0 .../logic/exporter/ModsExportFormatTestBook.xml | 0 .../ModsExportFormatTestMultipleEntries.bib | 0 .../ModsExportFormatTestMultipleEntries.xml | 0 .../ModsExportFormatTestOnlyRequiredFields.bib | 0 .../ModsExportFormatTestOnlyRequiredFields.xml | 0 .../exporter/ModsExportFormatTestTotalPages.bib | 0 .../exporter/ModsExportFormatTestTotalPages.xml | 0 .../logic/exporter/MsBibExportFormatTest1.bib | 0 .../logic/exporter/MsBibExportFormatTest1.xml | 0 .../logic/exporter/MsBibExportFormatTest2.bib | 0 .../logic/exporter/MsBibExportFormatTest2.xml | 0 .../logic/exporter/MsBibExportFormatTest3.bib | 0 .../logic/exporter/MsBibExportFormatTest3.xml | 0 .../logic/exporter/MsBibExportFormatTest4.bib | 0 .../logic/exporter/MsBibExportFormatTest4.xml | 0 .../logic/exporter/MsBibExportFormatTest5.bib | 0 .../logic/exporter/MsBibExportFormatTest5.xml | 0 .../logic/exporter/MsBibExportFormatTest6.bib | 0 .../logic/exporter/MsBibExportFormatTest6.xml | 0 .../logic/exporter/MsBibExportFormatTest7.bib | 0 .../logic/exporter/MsBibExportFormatTest7.xml | 0 .../MsBibExportFormatTestAddressWithoutComma.bib | 0 .../MsBibExportFormatTestAddressWithoutComma.xml | 0 .../MsBibExportFormatTestCorporateAuthor.bib | 0 .../MsBibExportFormatTestCorporateAuthor.xml | 0 .../exporter/MsBibExportFormatTestDateAcessed.bib | 0 .../exporter/MsBibExportFormatTestDateAcessed.xml | 0 .../logic/exporter/MsBibExportFormatTestDay.bib | 0 .../logic/exporter/MsBibExportFormatTestDay.xml | 0 .../exporter/MsBibExportFormatTestLatexFree.bib | 0 .../exporter/MsBibExportFormatTestLatexFree.xml | 0 .../logic/exporter/MsBibExportFormatUmlauts.bib | 0 .../logic/exporter/MsBibExportFormatUmlauts.xml | 0 .../org/jabref/logic/exporter/MsBibKeyTest.bib | 0 .../org/jabref/logic/exporter/MsBibKeyTest.xml | 0 .../org/jabref/logic/exporter/MsBibLCID.bib | 0 .../org/jabref/logic/exporter/MsBibLCID.xml | 0 .../org/jabref/logic/exporter/MsBibLocationTest.bib | 0 .../org/jabref/logic/exporter/MsBibLocationTest.xml | 0 .../jabref/logic/exporter/MsBibMultiAddressTest.bib | 0 .../jabref/logic/exporter/MsBibMultiAddressTest.xml | 0 .../org/jabref/logic/exporter/MsBibPatent.bib | 0 .../org/jabref/logic/exporter/MsBibPatent.xml | 0 .../org/jabref/logic/exporter/MsBibShorttitle.bib | 0 .../org/jabref/logic/exporter/MsBibShorttitle.xml | 0 .../org/jabref/logic/importer/encoding-header.bib | 0 .../logic/importer/encodingWithoutNewline.bib | 0 .../fetcher/gvk_artificial_subtitle_test.xml | 0 .../gvk_empty_result_because_of_bad_query.xml | 0 .../org/jabref/logic/importer/fetcher/gvk_gmp.1.bib | 0 .../org/jabref/logic/importer/fetcher/gvk_gmp.2.bib | 0 .../org/jabref/logic/importer/fetcher/gvk_gmp.xml | 0 .../importer/fetcher/gvk_result_for_797485368.bib | 0 .../importer/fetcher/gvk_result_for_797485368.xml | 0 .../importer/fileformat/AutosavedSharedDatabase.bib | 0 .../fileformat/BibTeXMLImporterTestArticle.bib | 0 .../fileformat/BibTeXMLImporterTestArticle.xml | 0 .../fileformat/BibTeXMLImporterTestArticle2.bib | 0 .../fileformat/BibTeXMLImporterTestArticle2.xml | 0 .../BibTeXMLImporterTestArticleWithoutID.bib | 0 .../BibTeXMLImporterTestArticleWithoutID.xml | 0 .../fileformat/BibTeXMLImporterTestBook.bib | 0 .../fileformat/BibTeXMLImporterTestBook.xml | 0 .../fileformat/BibTeXMLImporterTestBooklet.bib | 0 .../fileformat/BibTeXMLImporterTestBooklet.xml | 0 .../fileformat/BibTeXMLImporterTestConference.bib | 0 .../fileformat/BibTeXMLImporterTestConference.xml | 0 .../fileformat/BibTeXMLImporterTestEmpty.bib | 0 .../fileformat/BibTeXMLImporterTestEmpty.xml | 0 .../fileformat/BibTeXMLImporterTestInBook.bib | 0 .../fileformat/BibTeXMLImporterTestInBook.xml | 0 .../fileformat/BibTeXMLImporterTestInCollection.bib | 0 .../fileformat/BibTeXMLImporterTestInCollection.xml | 0 .../BibTeXMLImporterTestInProceedings.bib | 0 .../BibTeXMLImporterTestInProceedings.xml | 0 .../BibTeXMLImporterTestInbookLessFields.bib | 0 .../BibTeXMLImporterTestInbookLessFields.xml | 0 ...bTeXMLImporterTestIncollectionWithoutChapter.bib | 0 ...bTeXMLImporterTestIncollectionWithoutChapter.xml | 0 .../BibTeXMLImporterTestInvalidInbook.bib | 0 .../BibTeXMLImporterTestInvalidInbook.xml | 0 .../fileformat/BibTeXMLImporterTestManual.bib | 0 .../fileformat/BibTeXMLImporterTestManual.xml | 0 .../fileformat/BibTeXMLImporterTestMasterThesis.bib | 0 .../fileformat/BibTeXMLImporterTestMasterThesis.xml | 0 .../fileformat/BibTeXMLImporterTestMisc.bib | 0 .../fileformat/BibTeXMLImporterTestMisc.xml | 0 .../fileformat/BibTeXMLImporterTestPhdThesis.bib | 0 .../fileformat/BibTeXMLImporterTestPhdThesis.xml | 0 .../fileformat/BibTeXMLImporterTestProceedings.bib | 0 .../fileformat/BibTeXMLImporterTestProceedings.xml | 0 .../fileformat/BibTeXMLImporterTestTechReport.bib | 0 .../fileformat/BibTeXMLImporterTestTechReport.xml | 0 .../fileformat/BibTeXMLImporterTestUnpublished.bib | 0 .../fileformat/BibTeXMLImporterTestUnpublished.xml | 0 .../fileformat/BiblioscapeImporterTestArticleST.bib | 0 .../fileformat/BiblioscapeImporterTestArticleST.txt | 0 .../fileformat/BiblioscapeImporterTestComments.bib | 0 .../fileformat/BiblioscapeImporterTestComments.txt | 0 .../fileformat/BiblioscapeImporterTestCorrupt.txt | 0 .../fileformat/BiblioscapeImporterTestInbook.bib | 0 .../fileformat/BiblioscapeImporterTestInbook.txt | 0 .../BiblioscapeImporterTestJournalArticle.bib | 0 .../BiblioscapeImporterTestJournalArticle.txt | 0 .../fileformat/BiblioscapeImporterTestKeywords.bib | 0 .../fileformat/BiblioscapeImporterTestKeywords.txt | 0 .../BiblioscapeImporterTestOptionalFields.bib | 0 .../BiblioscapeImporterTestOptionalFields.txt | 0 .../BiblioscapeImporterTestUnknownFields.bib | 0 .../BiblioscapeImporterTestUnknownFields.txt | 0 .../BiblioscapeImporterTestUnknownType.bib | 0 .../BiblioscapeImporterTestUnknownType.txt | 0 .../importer/fileformat/BibtexImporter.examples.bib | 0 .../importer/fileformat/CopacImporterTest1.bib | 0 .../importer/fileformat/CopacImporterTest1.txt | 0 .../importer/fileformat/CopacImporterTest2.bib | 0 .../importer/fileformat/CopacImporterTest2.txt | 0 .../org/jabref/logic/importer/fileformat/Empty.txt | 0 .../logic/importer/fileformat/EmptyMsBib_Test.xml | 0 .../importer/fileformat/Endnote.book.example.enw | 0 .../logic/importer/fileformat/Endnote.entries.enw | 0 .../logic/importer/fileformat/Endnote.pattern.A.enw | 0 .../logic/importer/fileformat/Endnote.pattern.E.enw | 0 .../importer/fileformat/Endnote.pattern.no_enw | 0 .../logic/importer/fileformat/IEEEImport1.txt | 0 .../logic/importer/fileformat/InspecImportTest.txt | 0 .../logic/importer/fileformat/InspecImportTest2.txt | 0 .../importer/fileformat/InspecImportTestFalse.txt | 0 .../logic/importer/fileformat/IsiImporterTest1.isi | 0 .../logic/importer/fileformat/IsiImporterTest2.isi | 0 .../importer/fileformat/IsiImporterTestEmpty.isi | 0 .../importer/fileformat/IsiImporterTestInspec.isi | 0 .../importer/fileformat/IsiImporterTestMedline.isi | 0 .../importer/fileformat/IsiImporterTestWOS.isi | 0 .../importer/fileformat/LNCS-minimal-protected.bib | 0 .../importer/fileformat/LNCS-minimal-protected.pdf | Bin .../logic/importer/fileformat/LNCS-minimal.bib | 0 .../logic/importer/fileformat/LNCS-minimal.pdf | Bin .../fileformat/MODSImporterTestAllFields.bib | 0 .../fileformat/MODSImporterTestAllFields.xml | 0 .../importer/fileformat/MODSImporterTestMinimal.bib | 0 .../importer/fileformat/MODSImporterTestMinimal.xml | 0 .../importer/fileformat/MODSImporterTestMods.bib | 0 .../importer/fileformat/MODSImporterTestMods.xml | 0 .../fileformat/MODSImporterTestModsCollection.bib | 0 .../fileformat/MODSImporterTestModsCollection.xml | 0 .../fileformat/MedlineImporterTestArticleID.bib | 0 .../fileformat/MedlineImporterTestArticleID.xml | 0 .../fileformat/MedlineImporterTestArticleNoISSN.bib | 0 .../fileformat/MedlineImporterTestArticleNoISSN.xml | 0 .../MedlineImporterTestBookArticleSet.bib | 0 .../MedlineImporterTestBookArticleSet.xml | 0 .../MedlineImporterTestKeywordSingleEntry.bib | 0 .../MedlineImporterTestKeywordSingleEntry.xml | 0 .../MedlineImporterTestMalformedEntry.xml | 0 .../fileformat/MedlineImporterTestMinimalEntry.bib | 0 .../fileformat/MedlineImporterTestMinimalEntry.xml | 0 .../importer/fileformat/MedlineImporterTestNbib.bib | 0 .../importer/fileformat/MedlineImporterTestNbib.xml | 0 .../fileformat/MedlineImporterTestPubmedBook.bib | 0 .../fileformat/MedlineImporterTestPubmedBook.xml | 0 .../MedlinePlainImporterStringOutOfBounds.bib | 0 .../MedlinePlainImporterStringOutOfBounds.txt | 0 .../MedlinePlainImporterTestCompleteEntry.bib | 0 .../MedlinePlainImporterTestCompleteEntry.txt | 0 .../fileformat/MedlinePlainImporterTestDOI.bib | 0 .../fileformat/MedlinePlainImporterTestDOI.txt | 0 .../MedlinePlainImporterTestInproceeding.bib | 0 .../MedlinePlainImporterTestInproceeding.txt | 0 .../MedlinePlainImporterTestInvalidFormat.xml | 0 .../MedlinePlainImporterTestMultiAbstract.bib | 0 .../MedlinePlainImporterTestMultiAbstract.txt | 0 .../MedlinePlainImporterTestMultiTitle.bib | 0 .../MedlinePlainImporterTestMultiTitle.txt | 0 .../MedlinePlainImporterTestMultipleEntries.txt | 0 .../fileformat/MsBibExportFormatUmlauts.bib | 0 .../fileformat/MsBibExportFormatUmlauts.xml | 0 .../fileformat/MsBibImporterInvalidMonth.bib | 0 .../fileformat/MsBibImporterInvalidMonth.xml | 0 .../fileformat/MsBibImporterMsBibFieldsTest.bib | 0 .../fileformat/MsBibImporterMsBibFieldsTest.xml | 0 .../importer/fileformat/MsBibImporterTest3.bib | 0 .../importer/fileformat/MsBibImporterTest3.xml | 0 .../importer/fileformat/MsBibImporterTest4.bib | 0 .../importer/fileformat/MsBibImporterTest4.xml | 0 .../importer/fileformat/MsBibImporterTest5.bib | 0 .../importer/fileformat/MsBibImporterTest5.xml | 0 .../importer/fileformat/MsBibImporterTest6.bib | 0 .../importer/fileformat/MsBibImporterTest6.xml | 0 .../importer/fileformat/MsBibImporterTest7.bib | 0 .../importer/fileformat/MsBibImporterTest7.xml | 0 .../fileformat/MsBibImporterTestTranslator.bib | 0 .../fileformat/MsBibImporterTestTranslator.xml | 0 .../importer/fileformat/MsBibImporterTitleTest.bib | 0 .../importer/fileformat/MsBibImporterTitleTest.xml | 0 .../jabref/logic/importer/fileformat/MsBibLCID.bib | 0 .../jabref/logic/importer/fileformat/MsBibLCID.xml | 0 .../logic/importer/fileformat/MsBibLocationTest.bib | 0 .../logic/importer/fileformat/MsBibLocationTest.xml | 0 .../fileformat/MsBibMultiLocationAddressTest.bib | 0 .../fileformat/MsBibMultiLocationAddressTest.xml | 0 .../logic/importer/fileformat/MsBibPatent.bib | 0 .../logic/importer/fileformat/MsBibPatent.xml | 0 .../logic/importer/fileformat/MsBibShorttitle.bib | 0 .../logic/importer/fileformat/MsBibShorttitle.xml | 0 .../logic/importer/fileformat/NbibImporterTest.bib | 0 .../logic/importer/fileformat/NbibImporterTest.nbib | 0 .../logic/importer/fileformat/OvidImporterTest1.txt | 0 .../fileformat/OvidImporterTest2Invalid.txt | 0 .../logic/importer/fileformat/OvidImporterTest3.txt | 0 .../logic/importer/fileformat/OvidImporterTest4.txt | 0 .../logic/importer/fileformat/OvidImporterTest5.txt | 0 .../logic/importer/fileformat/OvidImporterTest6.txt | 0 .../logic/importer/fileformat/OvidImporterTest7.txt | 0 .../importer/fileformat/OvidImporterTestBib3.bib | 0 .../importer/fileformat/OvidImporterTestBib4.bib | 0 .../importer/fileformat/OvidImporterTestBib5.bib | 0 .../importer/fileformat/OvidImporterTestBib6.bib | 0 .../importer/fileformat/OvidImporterTestBib7.bib | 0 .../importer/fileformat/RepecNepImporterTest1.bib | 0 .../importer/fileformat/RepecNepImporterTest1.txt | 0 .../importer/fileformat/RepecNepImporterTest2.bib | 0 .../importer/fileformat/RepecNepImporterTest2.txt | 0 .../importer/fileformat/RepecNepImporterTest3.bib | 0 .../importer/fileformat/RepecNepImporterTest3.txt | 0 .../importer/fileformat/RisImporterCorrupted.ris | 0 .../logic/importer/fileformat/RisImporterTest1.bib | 0 .../logic/importer/fileformat/RisImporterTest1.ris | 0 .../logic/importer/fileformat/RisImporterTest3.bib | 0 .../logic/importer/fileformat/RisImporterTest3.ris | 0 .../logic/importer/fileformat/RisImporterTest4a.bib | 0 .../logic/importer/fileformat/RisImporterTest4a.ris | 0 .../logic/importer/fileformat/RisImporterTest4b.bib | 0 .../logic/importer/fileformat/RisImporterTest4b.ris | 0 .../logic/importer/fileformat/RisImporterTest4c.bib | 0 .../logic/importer/fileformat/RisImporterTest4c.ris | 0 .../logic/importer/fileformat/RisImporterTest5a.bib | 0 .../logic/importer/fileformat/RisImporterTest5a.ris | 0 .../logic/importer/fileformat/RisImporterTest5b.bib | 0 .../logic/importer/fileformat/RisImporterTest5b.ris | 0 .../logic/importer/fileformat/RisImporterTest6.bib | 0 .../logic/importer/fileformat/RisImporterTest6.ris | 0 .../logic/importer/fileformat/RisImporterTest7.bib | 0 .../logic/importer/fileformat/RisImporterTest7.ris | 0 .../RisImporterTestDoiAndJournalTitle.bib | 0 .../RisImporterTestDoiAndJournalTitle.ris | 0 .../importer/fileformat/RisImporterTestScience.bib | 0 .../importer/fileformat/RisImporterTestScience.ris | 0 .../importer/fileformat/RisImporterTestScopus.bib | 0 .../importer/fileformat/RisImporterTestScopus.ris | 0 .../fileformat/SilverPlatterImporterTest1.bib | 0 .../fileformat/SilverPlatterImporterTest1.txt | 0 .../fileformat/SilverPlatterImporterTest2.bib | 0 .../fileformat/SilverPlatterImporterTest2.txt | 0 .../jabref/logic/importer/fileformat/annotated.pdf | Bin .../org/jabref/logic/importer/fileformat/empty.pdf | Bin .../jabref/logic/importer/fileformat/emptyFile.xml | 0 .../jabref/logic/importer/fileformat/encrypted.pdf | Bin .../org/jabref/logic/importer/headerless.bib | 0 .../org/jabref/logic/importer/jabref-header.bib | 0 .../jabref/logic/importer}/unlinkedFilesTestBib.bib | 0 .../directory/subdirectory/2003_Hippel_209.pdf | Bin .../subdirectory/2017_Gra\305\276ulis_726.pdf" | Bin .../directory/subdirectory/pdfInSubdirectory.pdf | Bin .../unlinkedFilesTestFolder/pdfInDatabase.pdf | Bin .../unlinkedFilesTestFolder/pdfNotInDatabase.pdf | Bin .../importer/unlinkedFilesTestFolder/testFile.txt | 0 .../org/jabref/logic/importer/wrong-header.bib | 0 .../test/resources/org/jabref/logic/net/empty.pdf | Bin .../org/jabref/logic/openoffice/test.jstyle | 0 .../jabref/logic/protectedterms/namedterms.terms | 0 .../jabref/logic/protectedterms/unnamedterms.terms | 0 .../model/entry/entryWithMultilineAbstract.bib | 0 322 files changed, 7 insertions(+), 12 deletions(-) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/auxparser/badpaper.aux (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/auxparser/config.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/auxparser/crossref.aux (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/auxparser/nested.aux (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/auxparser/origin.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/auxparser/paper.aux (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/auxparser/result.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/bst/abbrv.bst (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibLCID.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibPatent.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibPatent.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/encoding-header.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/encodingWithoutNewline.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fetcher/gvk_artificial_subtitle_test.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fetcher/gvk_empty_result_because_of_bad_query.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.1.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.2.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/AutosavedSharedDatabase.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestCorrupt.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/BibtexImporter.examples.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/Empty.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/EmptyMsBib_Test.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.book.example.enw (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.entries.enw (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.A.enw (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.E.enw (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.no_enw (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/IEEEImport1.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest2.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTestFalse.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest1.isi (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest2.isi (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestEmpty.isi (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestInspec.isi (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestMedline.isi (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestWOS.isi (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.pdf (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.pdf (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMalformedEntry.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInvalidFormat.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultipleEntries.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.nbib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest1.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest2Invalid.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest3.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest4.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest5.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest6.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest7.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib3.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib4.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib5.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib6.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib7.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterCorrupted.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.ris (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/annotated.pdf (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/empty.pdf (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/emptyFile.xml (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/fileformat/encrypted.pdf (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/headerless.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/jabref-header.bib (100%) rename {org.jabref.gui/src/test/resources/org/jabref/util => org.jabref.logic/src/test/resources/org/jabref/logic/importer}/unlinkedFilesTestBib.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf (100%) rename "org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" => "org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/importer/wrong-header.bib (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/net/empty.pdf (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/openoffice/test.jstyle (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/protectedterms/namedterms.terms (100%) rename {org.jabref.gui => org.jabref.logic}/src/test/resources/org/jabref/logic/protectedterms/unnamedterms.terms (100%) rename {org.jabref.gui/src/test/resources/org/jabref => org.jabref.model/src/test/resources}/model/entry/entryWithMultilineAbstract.bib (100%) diff --git a/org.jabref.logic/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java index f7ac12347f3..a2ac363564e 100644 --- a/org.jabref.logic/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java +++ b/org.jabref.logic/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java @@ -1,8 +1,10 @@ package org.jabref.logic.importer; +import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import java.nio.file.Paths; import java.util.Collection; import org.jabref.logic.importer.fileformat.BibtexParser; @@ -17,12 +19,12 @@ import static org.mockito.Mockito.mock; -/** - * @author Nosh&Dan - * @version 09.11.2008 | 21:06:17 - */ public class DatabaseFileLookupTest { + private static final File UNLINKED_FILES_TEST_BIB = Paths + .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestBib.bib").toFile(); + + private BibDatabase database; private Collection entries; @@ -32,7 +34,7 @@ public class DatabaseFileLookupTest { @Before public void setUp() throws Exception { - try (FileInputStream stream = new FileInputStream(ImportDataTest.UNLINKED_FILES_TEST_BIB); + try (FileInputStream stream = new FileInputStream(UNLINKED_FILES_TEST_BIB); InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { ParserResult result = new BibtexParser(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor()).parse(reader); database = result.getDatabase(); diff --git a/org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportDataTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportDataTest.java index 53cbda75a65..3205aa26b3a 100644 --- a/org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportDataTest.java +++ b/org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportDataTest.java @@ -6,10 +6,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author Nosh&Dan - * @version 09.11.2008 | 19:41:40 - */ public class ImportDataTest { public static final File FILE_IN_DATABASE = Paths @@ -22,9 +18,6 @@ public class ImportDataTest { public static final File NOT_EXISTING_FOLDER = Paths.get("notexistingfolder").toFile(); public static final File NOT_EXISTING_PDF = Paths .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/null.pdf").toFile(); - public static final File UNLINKED_FILES_TEST_BIB = Paths - .get("src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib").toFile(); - /** * Tests the testing environment. diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/badpaper.aux b/org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/badpaper.aux similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/badpaper.aux rename to org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/badpaper.aux diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/config.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/config.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/config.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/config.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/crossref.aux b/org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/crossref.aux similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/crossref.aux rename to org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/crossref.aux diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/nested.aux b/org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/nested.aux similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/nested.aux rename to org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/nested.aux diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/origin.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/origin.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/origin.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/origin.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/paper.aux b/org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/paper.aux similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/paper.aux rename to org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/paper.aux diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/result.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/result.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/auxparser/result.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/auxparser/result.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/bst/abbrv.bst b/org.jabref.logic/src/test/resources/org/jabref/logic/bst/abbrv.bst similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/bst/abbrv.bst rename to org.jabref.logic/src/test/resources/org/jabref/logic/bst/abbrv.bst diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestAuthor.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInvalidInbook.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestBook.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestMultipleEntries.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestOnlyRequiredFields.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestTotalPages.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest1.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest7.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestAddressWithoutComma.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestCorporateAuthor.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDateAcessed.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestDay.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTestLatexFree.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatUmlauts.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibKeyTest.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLCID.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibLCID.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLCID.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibLCID.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibMultiAddressTest.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibPatent.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibPatent.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibPatent.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibPatent.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibPatent.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibPatent.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibPatent.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibPatent.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/exporter/MsBibShorttitle.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/encoding-header.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/encoding-header.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/encoding-header.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/encoding-header.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/encodingWithoutNewline.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/encodingWithoutNewline.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/encodingWithoutNewline.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/encodingWithoutNewline.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_artificial_subtitle_test.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_artificial_subtitle_test.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_artificial_subtitle_test.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_artificial_subtitle_test.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_empty_result_because_of_bad_query.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_empty_result_because_of_bad_query.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_empty_result_because_of_bad_query.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_empty_result_because_of_bad_query.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.1.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.1.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.1.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.1.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.2.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.2.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.2.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.2.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_gmp.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fetcher/gvk_result_for_797485368.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/AutosavedSharedDatabase.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/AutosavedSharedDatabase.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/AutosavedSharedDatabase.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/AutosavedSharedDatabase.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestEmpty.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInvalidInbook.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestArticleST.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestComments.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestCorrupt.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestCorrupt.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestCorrupt.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestCorrupt.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestInbook.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestJournalArticle.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestKeywords.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestOptionalFields.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownFields.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestUnknownType.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibtexImporter.examples.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibtexImporter.examples.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/BibtexImporter.examples.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/BibtexImporter.examples.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest1.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/CopacImporterTest2.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Empty.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Empty.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Empty.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Empty.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/EmptyMsBib_Test.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/EmptyMsBib_Test.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/EmptyMsBib_Test.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/EmptyMsBib_Test.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.book.example.enw b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.book.example.enw similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.book.example.enw rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.book.example.enw diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.entries.enw b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.entries.enw similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.entries.enw rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.entries.enw diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.A.enw b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.A.enw similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.A.enw rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.A.enw diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.E.enw b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.E.enw similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.E.enw rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.E.enw diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.no_enw b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.no_enw similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.no_enw rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/Endnote.pattern.no_enw diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IEEEImport1.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IEEEImport1.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IEEEImport1.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IEEEImport1.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest2.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest2.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest2.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTest2.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTestFalse.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTestFalse.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTestFalse.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/InspecImportTestFalse.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest1.isi b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest1.isi similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest1.isi rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest1.isi diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest2.isi b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest2.isi similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest2.isi rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTest2.isi diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestEmpty.isi b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestEmpty.isi similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestEmpty.isi rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestEmpty.isi diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestInspec.isi b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestInspec.isi similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestInspec.isi rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestInspec.isi diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestMedline.isi b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestMedline.isi similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestMedline.isi rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestMedline.isi diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestWOS.isi b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestWOS.isi similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestWOS.isi rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/IsiImporterTestWOS.isi diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.pdf b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.pdf similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.pdf rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal-protected.pdf diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.pdf b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.pdf similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.pdf rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/LNCS-minimal.pdf diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestAllFields.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMinimal.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestMods.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestModsCollection.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestKeywordSingleEntry.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMalformedEntry.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMalformedEntry.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMalformedEntry.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMalformedEntry.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMinimalEntry.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterStringOutOfBounds.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestCompleteEntry.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestDOI.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInproceeding.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInvalidFormat.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInvalidFormat.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInvalidFormat.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestInvalidFormat.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiAbstract.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultiTitle.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultipleEntries.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultipleEntries.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultipleEntries.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MedlinePlainImporterTestMultipleEntries.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibExportFormatUmlauts.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterInvalidMonth.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterMsBibFieldsTest.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest3.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest4.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest5.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest6.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTest7.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTestTranslator.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibImporterTitleTest.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLCID.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibLocationTest.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibMultiLocationAddressTest.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibPatent.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/MsBibShorttitle.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.nbib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.nbib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.nbib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/NbibImporterTest.nbib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest1.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest1.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest1.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest1.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest2Invalid.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest2Invalid.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest2Invalid.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest2Invalid.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest3.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest3.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest3.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest3.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest4.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest4.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest4.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest4.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest5.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest5.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest5.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest5.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest6.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest6.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest6.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest6.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest7.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest7.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest7.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTest7.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib3.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib3.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib3.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib3.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib4.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib4.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib4.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib4.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib5.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib5.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib5.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib5.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib6.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib6.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib6.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib6.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib7.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib7.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib7.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/OvidImporterTestBib7.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest1.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest2.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RepecNepImporterTest3.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterCorrupted.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterCorrupted.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterCorrupted.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterCorrupted.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest1.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4a.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4b.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest4c.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5a.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest5b.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest6.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest7.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDoiAndJournalTitle.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScience.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.ris b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.ris similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.ris rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestScopus.ris diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest1.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest2.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/annotated.pdf b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/annotated.pdf similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/annotated.pdf rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/annotated.pdf diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/empty.pdf b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/empty.pdf similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/empty.pdf rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/empty.pdf diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/emptyFile.xml b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/emptyFile.xml similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/emptyFile.xml rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/emptyFile.xml diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/encrypted.pdf b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/encrypted.pdf similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/fileformat/encrypted.pdf rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/fileformat/encrypted.pdf diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/headerless.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/headerless.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/headerless.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/headerless.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/jabref-header.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/jabref-header.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/jabref-header.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/jabref-header.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestBib.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestBib.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf diff --git "a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" "b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" similarity index 100% rename from "org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" rename to "org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/importer/wrong-header.bib b/org.jabref.logic/src/test/resources/org/jabref/logic/importer/wrong-header.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/importer/wrong-header.bib rename to org.jabref.logic/src/test/resources/org/jabref/logic/importer/wrong-header.bib diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/net/empty.pdf b/org.jabref.logic/src/test/resources/org/jabref/logic/net/empty.pdf similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/net/empty.pdf rename to org.jabref.logic/src/test/resources/org/jabref/logic/net/empty.pdf diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/openoffice/test.jstyle b/org.jabref.logic/src/test/resources/org/jabref/logic/openoffice/test.jstyle similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/openoffice/test.jstyle rename to org.jabref.logic/src/test/resources/org/jabref/logic/openoffice/test.jstyle diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/protectedterms/namedterms.terms b/org.jabref.logic/src/test/resources/org/jabref/logic/protectedterms/namedterms.terms similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/protectedterms/namedterms.terms rename to org.jabref.logic/src/test/resources/org/jabref/logic/protectedterms/namedterms.terms diff --git a/org.jabref.gui/src/test/resources/org/jabref/logic/protectedterms/unnamedterms.terms b/org.jabref.logic/src/test/resources/org/jabref/logic/protectedterms/unnamedterms.terms similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/logic/protectedterms/unnamedterms.terms rename to org.jabref.logic/src/test/resources/org/jabref/logic/protectedterms/unnamedterms.terms diff --git a/org.jabref.gui/src/test/resources/org/jabref/model/entry/entryWithMultilineAbstract.bib b/org.jabref.model/src/test/resources/model/entry/entryWithMultilineAbstract.bib similarity index 100% rename from org.jabref.gui/src/test/resources/org/jabref/model/entry/entryWithMultilineAbstract.bib rename to org.jabref.model/src/test/resources/model/entry/entryWithMultilineAbstract.bib From ab374719ff1dad4c1a833cb639ca8323806fba96 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 21:15:11 +0100 Subject: [PATCH 25/79] Fix locations of DatabaseTest --- .../src/test/java/org/jabref/testutils/category/DatabaseTest.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {org.jabref.logic => org.jabref.gui}/src/test/java/org/jabref/testutils/category/DatabaseTest.java (100%) diff --git a/org.jabref.logic/src/test/java/org/jabref/testutils/category/DatabaseTest.java b/org.jabref.gui/src/test/java/org/jabref/testutils/category/DatabaseTest.java similarity index 100% rename from org.jabref.logic/src/test/java/org/jabref/testutils/category/DatabaseTest.java rename to org.jabref.gui/src/test/java/org/jabref/testutils/category/DatabaseTest.java From 7e620f7da93b8d8fef084d3c19adfe65fbdda3b3 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 21:26:34 +0100 Subject: [PATCH 26/79] Fix location of ImportDataTest --- .../jabref/gui/importer/EntryFromFileCreatorManagerTest.java | 1 - .../java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java | 1 - .../src/test/java/org/jabref/gui}/importer/ImportDataTest.java | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) rename {org.jabref.logic/src/test/java/org/jabref/logic => org.jabref.gui/src/test/java/org/jabref/gui}/importer/ImportDataTest.java (97%) diff --git a/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java index 7523d3f79b6..d43d0989596 100644 --- a/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java @@ -8,7 +8,6 @@ import java.util.ArrayList; import java.util.List; -import org.jabref.logic.importer.ImportDataTest; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.importer.ParserResult; import org.jabref.logic.importer.fileformat.BibtexParser; diff --git a/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java index 10b44f11b9d..fb6c0b3df24 100644 --- a/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java @@ -5,7 +5,6 @@ import org.jabref.JabRefGUI; import org.jabref.gui.JabRefFrame; -import org.jabref.logic.importer.ImportDataTest; import org.jabref.model.entry.BibEntry; import org.jabref.testutils.category.GUITest; diff --git a/org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportDataTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/ImportDataTest.java similarity index 97% rename from org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportDataTest.java rename to org.jabref.gui/src/test/java/org/jabref/gui/importer/ImportDataTest.java index 3205aa26b3a..6a0d8e461fd 100644 --- a/org.jabref.logic/src/test/java/org/jabref/logic/importer/ImportDataTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/gui/importer/ImportDataTest.java @@ -1,4 +1,4 @@ -package org.jabref.logic.importer; +package org.jabref.gui.importer; import java.io.File; import java.nio.file.Paths; From 40c6bf77c383218c4493ba348440952bb94b3d10 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 21:43:53 +0100 Subject: [PATCH 27/79] Remove strange CLI tests also testing logic --- .../org/jabref/logic/xmp/XMPUtilTest.java | 189 ------------------ 1 file changed, 189 deletions(-) diff --git a/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java index 3d934e5741f..392f232296b 100644 --- a/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java +++ b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPUtilTest.java @@ -28,7 +28,6 @@ import javax.xml.transform.TransformerException; -import org.jabref.cli.XMPUtilMain; import org.jabref.logic.bibtex.BibEntryWriter; import org.jabref.logic.bibtex.LatexFieldFormatter; import org.jabref.logic.bibtex.LatexFieldFormatterPreferences; @@ -1087,194 +1086,6 @@ public void testReadRawXMP() throws IOException, TransformerException { } - /** - * Test whether the command-line client works correctly with writing a single entry - * @throws IOException - * @throws TransformerException - * @throws COSVisitorException - * - - */ - @Test - public void testCommandLineSingleBib() throws IOException, TransformerException, COSVisitorException { - - // First check conversion from .bib to .xmp - File tempBib = tempFolder.newFile("JabRef.bib"); - try (BufferedWriter fileWriter = Files.newBufferedWriter(tempBib.toPath(), StandardCharsets.UTF_8)) { - fileWriter.write(t1BibtexString()); - fileWriter.close(); - - try (ByteArrayOutputStream s = new ByteArrayOutputStream()) { - PrintStream oldOut = System.out; - System.setOut(new PrintStream(s)); - XMPUtilMain.main(new String[] {tempBib.getAbsolutePath()}); - System.setOut(oldOut); - String xmp = s.toString(); - - writeManually(pdfFile, xmp); - } - List l = XMPUtil.readXMP(pdfFile, xmpPreferences); - Assert.assertEquals(1, l.size()); - assertEqualsBibtexEntry(t1BibtexEntry(), l.get(0)); - - } - } - - /** - * @throws IOException - * @throws TransformerException - * @throws COSVisitorException - * @depends XMPUtil.writeXMP - */ - @Test - public void testCommandLineSinglePdf() throws IOException, TransformerException, COSVisitorException { - { - // Write XMP to file - - BibEntry e = t1BibtexEntry(); - - XMPUtil.writeXMP(pdfFile, e, null, xmpPreferences); - - try (ByteArrayOutputStream s = new ByteArrayOutputStream()) { - PrintStream oldOut = System.out; - System.setOut(new PrintStream(s)); - XMPUtilMain.main(new String[] {pdfFile.getAbsolutePath()}); - System.setOut(oldOut); - String bibtex = s.toString(); - - ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtex)); - Collection c = result.getDatabase().getEntries(); - Assert.assertEquals(1, c.size()); - BibEntry x = c.iterator().next(); - - assertEqualsBibtexEntry(e, x); - } - } - // Write XMP to file - BibEntry e = t1BibtexEntry(); - - XMPUtil.writeXMP(pdfFile, e, null, xmpPreferences); - - try (ByteArrayOutputStream s = new ByteArrayOutputStream()) { - PrintStream oldOut = System.out; - System.setOut(new PrintStream(s)); - XMPUtilMain.main(new String[] {"-x", pdfFile.getAbsolutePath()}); - System.setOut(oldOut); - s.close(); - String xmp = s.toString(); - - /* Test minimal syntaxical completeness */ - Assert.assertTrue(xmp.indexOf("xpacket") > 0); - Assert.assertTrue(xmp.indexOf("adobe:ns:meta") > 0); - Assert.assertTrue((xmp.indexOf("canh05") > 0) - || (xmp.indexOf("bibtex:bibtexkey=") > 0)); - Assert.assertTrue(xmp.indexOf("K. Crowston") > 0); - Assert.assertTrue((xmp.indexOf("id='W5M0MpCehiHzreSzNTczkc9d'?>") > 0) - || (xmp.indexOf("id=\"W5M0MpCehiHzreSzNTczkc9d\"?>") > 0)); - Assert.assertTrue((xmp.indexOf("xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'") > 0) - || (xmp.indexOf("xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"") > 0)); - Assert.assertTrue(xmp.indexOf(" 0); - Assert.assertTrue((xmp.indexOf("") > 0) || (xmp.indexOf("") > 0)); - - /* Test contents of string */ - writeManually(pdfFile, xmp); - List l = XMPUtil.readXMP(pdfFile, xmpPreferences); - Assert.assertEquals(1, l.size()); - - assertEqualsBibtexEntry(t1BibtexEntry(), l.get(0)); - } - } - - /** - * Test whether the command-line client can pick one of several entries from a bibtex file - * @throws IOException - * @throws TransformerException - */ - @Test - public void testCommandLineByKey() throws IOException, TransformerException { - File tempBib = tempFolder.newFile("JabRef.bib"); - try (BufferedWriter fileWriter = Files.newBufferedWriter(tempBib.toPath(), StandardCharsets.UTF_8)) { - fileWriter.write(t1BibtexString()); - fileWriter.write(t2BibtexString()); - } - - PrintStream sysOut = System.out; - - // First try canh05 - try (ByteArrayOutputStream s = new ByteArrayOutputStream()) { - System.setOut(new PrintStream(s)); - XMPUtilMain.main(new String[]{"canh05", tempBib.getAbsolutePath(), pdfFile.getAbsolutePath()}); - } finally { - System.setOut(sysOut); - } - - // PDF should be annotated: - List l = XMPUtil.readXMP(pdfFile, xmpPreferences); - Assert.assertEquals(1, l.size()); - assertEqualsBibtexEntry(t1BibtexEntry(), l.get(0)); - - // Now try OezbekC06 - try (ByteArrayOutputStream s = new ByteArrayOutputStream()) { - System.setOut(new PrintStream(s)); - try { - XMPUtilMain.main(new String[]{"OezbekC06", tempBib.getAbsolutePath(), pdfFile.getAbsolutePath()}); - } finally { - System.setOut(sysOut); - } - } - - // PDF should be annotated: - l = XMPUtil.readXMP(pdfFile, xmpPreferences); - Assert.assertEquals(1, l.size()); - assertEqualsBibtexEntry(t2BibtexEntry(), l.get(0)); - } - - /** - * Test whether the command-line client can deal with several bibtex entries. - * @throws IOException - * @throws TransformerException - */ - @Test - public void testCommandLineSeveral() throws IOException, TransformerException { - - File tempBib = tempFolder.newFile("JabRef.bib"); - - try (BufferedWriter fileWriter = Files.newBufferedWriter(tempBib.toPath(), StandardCharsets.UTF_8)) { - - fileWriter.write(t1BibtexString()); - fileWriter.write(t3BibtexString()); - fileWriter.close(); - - try (ByteArrayOutputStream s = new ByteArrayOutputStream()) { - PrintStream oldOut = System.out; - System.setOut(new PrintStream(s)); - XMPUtilMain.main(new String[] {tempBib.getAbsolutePath(), pdfFile.getAbsolutePath()}); - System.setOut(oldOut); - } - List l = XMPUtil.readXMP(pdfFile, xmpPreferences); - - Assert.assertEquals(2, l.size()); - - BibEntry a = l.get(0); - BibEntry b = l.get(1); - - if (a.getCiteKeyOptional().get().equals("Clarkson06")) { - BibEntry tmp = a; - a = b; - b = tmp; - } - - BibEntry t1 = t1BibtexEntry(); - BibEntry t3 = t3BibtexEntry(); - - // Writing and reading will resolve strings! - t3.setField("month", "July"); - - assertEqualsBibtexEntry(t1, a); - assertEqualsBibtexEntry(t3, b); - } - } - /** * Test that readXMP and writeXMP work together. * @throws IOException From e88de4fa11a98a9555c462c8a260c97524a5fdbe Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 21:45:41 +0100 Subject: [PATCH 28/79] Replace one straight-forward assertEqualsBibtexEntry --- .../org/jabref/logic/xmp/XMPSchemaBibtexTest.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java index d980950fbda..b26d657efc4 100644 --- a/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java +++ b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java @@ -33,19 +33,6 @@ public class XMPSchemaBibtexTest { @Mock private ImportFormatPreferences prefs; - public void assertEqualsBibtexEntry(BibEntry e, BibEntry x) { - Assert.assertNotNull(e); - Assert.assertNotNull(x); - Assert.assertEquals(e.getCiteKeyOptional(), x.getCiteKeyOptional()); - Assert.assertEquals(e.getType(), x.getType()); - - Assert.assertEquals(e.getFieldNames().size(), x.getFieldNames().size()); - - for (String name : e.getFieldNames()) { - Assert.assertEquals(e.getField(name), x.getField(name)); - } - } - @Test public void testXMPSchemaBibtexXMPMetadata() throws IOException { @@ -254,7 +241,7 @@ public void testSetBibtexEntry() throws IOException { BibEntry e2 = bibtex.getBibtexEntry(); - assertEqualsBibtexEntry(e, e2); + Assert.assertEquals(e, e2); } @Test From 2435aff5afee12704a945c16f8396353913bc8d1 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 21:48:22 +0100 Subject: [PATCH 29/79] Fix module of BackupManagerTest --- .../org/jabref/logic/autosaveandbackup/BackupManagerTest.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {org.jabref.logic => org.jabref.gui}/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java (100%) diff --git a/org.jabref.logic/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java b/org.jabref.gui/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java similarity index 100% rename from org.jabref.logic/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java rename to org.jabref.gui/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java From 6594f68050134ff5af52cd9512d5f9538ab04fca Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 21:48:34 +0100 Subject: [PATCH 30/79] Remove dependency to JabRefMain --- .../java/org/jabref/logic/openoffice/OOBibStyleTest.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/org.jabref.logic/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java index e133e916180..ba80e0029a2 100644 --- a/org.jabref.logic/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java +++ b/org.jabref.logic/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java @@ -1,6 +1,5 @@ package org.jabref.logic.openoffice; -import java.io.File; import java.io.IOException; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; @@ -13,7 +12,6 @@ import java.util.Map; import java.util.Set; -import org.jabref.JabRefMain; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.importer.Importer; import org.jabref.logic.importer.ParserResult; @@ -59,11 +57,8 @@ public void testAuthorYear() throws IOException { @Test public void testAuthorYearAsFile() throws URISyntaxException, IOException { - - File defFile = Paths.get(JabRefMain.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI()) - .toFile(); - - OOBibStyle style = new OOBibStyle(defFile, layoutFormatterPreferences, StandardCharsets.UTF_8); + OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH, + layoutFormatterPreferences); assertTrue(style.isValid()); assertFalse(style.isFromResource()); assertFalse(style.isBibtexKeyCiteMarkers()); From dce1afde249e128104051717cede513a697ac3d5 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 21:55:55 +0100 Subject: [PATCH 31/79] Fix location of test files --- .../EntryFromFileCreatorManagerTest.java | 39 +++++++++--- .../gui}/importer/unlinkedFilesTestBib.bib | 0 .../subdirectory/2003_Hippel_209.pdf | Bin .../2017_Gra\305\276ulis_726.pdf" | Bin .../subdirectory/pdfInSubdirectory.pdf | Bin .../unlinkedFilesTestFolder/pdfInDatabase.pdf | Bin .../pdfNotInDatabase.pdf | Bin .../unlinkedFilesTestFolder/testFile.txt | 0 .../importer/DatabaseFileLookupTest.java | 59 ------------------ 9 files changed, 32 insertions(+), 66 deletions(-) rename {org.jabref.logic/src/test/resources/org/jabref/logic => org.jabref.gui/src/test/resources/org/jabref/gui}/importer/unlinkedFilesTestBib.bib (100%) rename {org.jabref.logic/src/test/resources/org/jabref/logic => org.jabref.gui/src/test/resources/org/jabref/gui}/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf (100%) rename "org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" => "org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" (100%) rename {org.jabref.logic/src/test/resources/org/jabref/logic => org.jabref.gui/src/test/resources/org/jabref/gui}/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf (100%) rename {org.jabref.logic/src/test/resources/org/jabref/logic => org.jabref.gui/src/test/resources/org/jabref/gui}/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf (100%) rename {org.jabref.logic/src/test/resources/org/jabref/logic => org.jabref.gui/src/test/resources/org/jabref/gui}/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf (100%) rename {org.jabref.logic/src/test/resources/org/jabref/logic => org.jabref.gui/src/test/resources/org/jabref/gui}/importer/unlinkedFilesTestFolder/testFile.txt (100%) delete mode 100644 org.jabref.logic/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java diff --git a/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java index d43d0989596..820c4bf9e8d 100644 --- a/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java @@ -5,7 +5,9 @@ import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.jabref.logic.importer.ImportFormatPreferences; @@ -17,20 +19,44 @@ import org.jabref.testutils.category.GUITest; import org.junit.Assert; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.mockito.Answers; import static org.mockito.Mockito.mock; @Category(GUITest.class) public class EntryFromFileCreatorManagerTest { - // Needed to initialize ExternalFileTypes - @Before - public void setUp() { + private static final File UNLINKED_FILES_TEST_BIB = Paths + .get("src/test/resources/org/jabref/gui/importer/unlinkedFilesTestBib.bib").toFile(); + private BibDatabase database; + private Collection entries; + + private BibEntry entry1; + private BibEntry entry2; + + /** + * Tests the prerequisites of this test-class itself. + */ + @Test + public void testTestDatabase() throws IOException { + try (FileInputStream stream = new FileInputStream(UNLINKED_FILES_TEST_BIB); + InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { + ParserResult result = new BibtexParser(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor()).parse(reader); + database = result.getDatabase(); + entries = database.getEntries(); + + entry1 = database.getEntryByKey("entry1").get(); + entry2 = database.getEntryByKey("entry2").get(); + } + + Assert.assertEquals(2, database.getEntryCount()); + Assert.assertEquals(2, entries.size()); + Assert.assertNotNull(entry1); + Assert.assertNotNull(entry2); } @Test @@ -47,8 +73,8 @@ public void testGetCreator() { @Test @Ignore public void testAddEntrysFromFiles() throws IOException { - try (FileInputStream stream = new FileInputStream(ImportDataTest.UNLINKED_FILES_TEST_BIB); - InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { + try (FileInputStream stream = new FileInputStream(UNLINKED_FILES_TEST_BIB); + InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { ParserResult result = new BibtexParser(mock(ImportFormatPreferences.class), new DummyFileUpdateMonitor()).parse(reader); BibDatabase database = result.getDatabase(); @@ -81,5 +107,4 @@ public void testAddEntrysFromFiles() throws IOException { Assert.assertFalse(file2Found); } } - } diff --git a/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestBib.bib b/org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestBib.bib similarity index 100% rename from org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestBib.bib rename to org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestBib.bib diff --git a/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf b/org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf similarity index 100% rename from org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf rename to org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/directory/subdirectory/2003_Hippel_209.pdf diff --git "a/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" "b/org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" similarity index 100% rename from "org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" rename to "org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/directory/subdirectory/2017_Gra\305\276ulis_726.pdf" diff --git a/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf b/org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf similarity index 100% rename from org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf rename to org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/directory/subdirectory/pdfInSubdirectory.pdf diff --git a/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf b/org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf similarity index 100% rename from org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf rename to org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf diff --git a/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf b/org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf similarity index 100% rename from org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf rename to org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf diff --git a/org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt b/org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/testFile.txt similarity index 100% rename from org.jabref.logic/src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/testFile.txt rename to org.jabref.gui/src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/testFile.txt diff --git a/org.jabref.logic/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java deleted file mode 100644 index a2ac363564e..00000000000 --- a/org.jabref.logic/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.jabref.logic.importer; - -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.nio.file.Paths; -import java.util.Collection; - -import org.jabref.logic.importer.fileformat.BibtexParser; -import org.jabref.model.database.BibDatabase; -import org.jabref.model.entry.BibEntry; -import org.jabref.model.util.DummyFileUpdateMonitor; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Answers; - -import static org.mockito.Mockito.mock; - -public class DatabaseFileLookupTest { - - private static final File UNLINKED_FILES_TEST_BIB = Paths - .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestBib.bib").toFile(); - - - private BibDatabase database; - private Collection entries; - - private BibEntry entry1; - private BibEntry entry2; - - - @Before - public void setUp() throws Exception { - try (FileInputStream stream = new FileInputStream(UNLINKED_FILES_TEST_BIB); - InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { - ParserResult result = new BibtexParser(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor()).parse(reader); - database = result.getDatabase(); - entries = database.getEntries(); - - entry1 = database.getEntryByKey("entry1").get(); - entry2 = database.getEntryByKey("entry2").get(); - } - } - - /** - * Tests the prerequisites of this test-class itself. - */ - @Test - public void testTestDatabase() { - Assert.assertEquals(2, database.getEntryCount()); - Assert.assertEquals(2, entries.size()); - Assert.assertNotNull(entry1); - Assert.assertNotNull(entry2); - } - -} From c6890d8cf12258a01483b7fd27f9b75ac08a6cb0 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 21:58:51 +0100 Subject: [PATCH 32/79] lint build.gradle --- org.jabref.cli.xmp/build.gradle | 22 +++------------------- org.jabref.gui/build.gradle | 8 -------- org.jabref.logic/build.gradle | 7 ------- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/org.jabref.cli.xmp/build.gradle b/org.jabref.cli.xmp/build.gradle index 194742daae2..6cab370f1f5 100644 --- a/org.jabref.cli.xmp/build.gradle +++ b/org.jabref.cli.xmp/build.gradle @@ -18,40 +18,24 @@ dependencies { compile project(':org.jabref.model') compile project(':org.jabref.logic') - compile 'org.json:json:20160212' - compile 'org.antlr:antlr-runtime:3.5.2' // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 - compile 'org.apache.pdfbox:pdfbox:1.8.13' + runtime 'org.apache.pdfbox:pdfbox:1.8.13' compile 'org.apache.pdfbox:jempbox:1.8.13' - compile 'org.apache.commons:commons-lang3:3.6' - compile "org.libreoffice:ridl:5.4.2" - compile "org.libreoffice:unoil:5.4.2" - compile 'com.github.bkromhout:java-diff-utils:2.1.1' - compile 'info.debatty:java-string-similarity:1.0.1' - compile 'com.google.guava:guava:24.0-jre' - compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' - compile 'org.jsoup:jsoup:1.11.2' - compile 'com.mashape.unirest:unirest-java:1.4.9' - compile 'org.apache.httpcomponents:httpclient:4.5.3' - compile 'commons-io:commons-io:2.4' // >1.8.0-beta is required for java 9 compatibility - compile 'org.slf4j:slf4j-api:1.8.0-beta1' - compile 'org.apache.logging.log4j:log4j-api:2.10.0' - compile 'org.apache.logging.log4j:log4j-core:2.10.0' + runtime 'org.apache.logging.log4j:log4j-api:2.10.0' + runtime 'org.apache.logging.log4j:log4j-core:2.10.0' runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' - compile 'de.undercouch:citeproc-java:1.0.1' - compile 'org.jbibtex:jbibtex:1.0.17' // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index fdc16da1e23..003eea90536 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -53,7 +53,6 @@ dependencies { // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 compile 'org.apache.pdfbox:pdfbox:1.8.13' - compile 'org.apache.pdfbox:jempbox:1.8.13' compile 'commons-cli:commons-cli:1.4' @@ -102,11 +101,8 @@ dependencies { compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9' compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' - testCompile 'org.antlr:antlr-runtime:3.5.2' - testCompile 'com.github.tomakehurst:wiremock:2.14.0' testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' testCompile 'junit:junit:4.12' - testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' @@ -116,14 +112,10 @@ dependencies { testCompile 'org.assertj:assertj-core:3.8.0' testCompile 'org.assertj:assertj-swing:3.8.0' testCompile 'org.assertj:assertj-swing-junit:3.8.0' - testCompile 'org.hamcrest:hamcrest-core:1.3' testCompile 'org.mockito:mockito-core:2.13.0' - testCompile 'org.reflections:reflections:0.9.11' testCompile "org.testfx:testfx-core:4.0.+" testCompile "org.testfx:testfx-junit:4.0.+" testCompile 'com.tngtech.archunit:archunit:0.5.0' - testCompile 'org.xmlunit:xmlunit-core:2.5.1' - testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index cad5111b91a..85a6c0a9585 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -70,7 +70,6 @@ dependencies { testCompile 'org.antlr:antlr-runtime:3.5.2' testCompile 'com.github.tomakehurst:wiremock:2.14.0' - testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' testCompile 'junit:junit:4.12' testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' @@ -79,15 +78,9 @@ dependencies { testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.assertj:assertj-core:3.8.0' - testCompile 'org.assertj:assertj-swing:3.8.0' - testCompile 'org.assertj:assertj-swing-junit:3.8.0' testCompile 'org.hamcrest:hamcrest-core:1.3' testCompile 'org.mockito:mockito-core:2.13.0' testCompile 'org.reflections:reflections:0.9.11' - testCompile "org.testfx:testfx-core:4.0.+" - testCompile "org.testfx:testfx-junit:4.0.+" - testCompile 'com.tngtech.archunit:archunit:0.5.0' testCompile 'org.xmlunit:xmlunit-core:2.5.1' testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' From 7481fb60efc205222ae568310cea34520f9a4a40 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 22:07:10 +0100 Subject: [PATCH 33/79] Inline SavePreferencesFactory to JabRefPreferences --- .../org/jabref/cli/ArgumentProcessor.java | 8 ++-- .../main/java/org/jabref/gui/BasePanel.java | 3 +- .../org/jabref/gui/collab/ChangeScanner.java | 4 +- .../exporter/ExportCustomizationDialog.java | 2 +- .../gui/exporter/SaveDatabaseAction.java | 3 +- .../autosaveandbackup/BackupManager.java | 3 +- .../jabref/preferences/CustomExportList.java | 2 +- .../preferences/ExporterFactoryFactory.java | 6 +-- .../jabref/preferences/JabRefPreferences.java | 36 ++++++++++++++ .../preferences/SavePreferencesFactory.java | 47 ------------------- 10 files changed, 50 insertions(+), 64 deletions(-) delete mode 100644 org.jabref.gui/src/main/java/org/jabref/preferences/SavePreferencesFactory.java diff --git a/org.jabref.gui/src/main/java/org/jabref/cli/ArgumentProcessor.java b/org.jabref.gui/src/main/java/org/jabref/cli/ArgumentProcessor.java index 4fa878210be..3110a13eb94 100644 --- a/org.jabref.gui/src/main/java/org/jabref/cli/ArgumentProcessor.java +++ b/org.jabref.gui/src/main/java/org/jabref/cli/ArgumentProcessor.java @@ -48,7 +48,7 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.jabref.model.strings.StringUtil; -import org.jabref.preferences.SavePreferencesFactory; +import org.jabref.preferences.JabRefPreferences; import org.jabref.preferences.SearchPreferences; import com.google.common.base.Throwables; @@ -359,7 +359,7 @@ private boolean generateAux(List loaded, String[] data) { try { System.out.println(Localization.lang("Saving") + ": " + subName); - SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs); + SavePreferences prefs = JabRefPreferences.loadForSaveFromPreferences(Globals.prefs); BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new); Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode()); SaveSession session = databaseWriter.saveDatabase(new BibDatabaseContext(newBase, defaults), prefs); @@ -398,7 +398,7 @@ private void exportFile(List loaded, String[] data) { if (!pr.isInvalid()) { try { System.out.println(Localization.lang("Saving") + ": " + data[0]); - SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs); + SavePreferences prefs = JabRefPreferences.loadForSaveFromPreferences(Globals.prefs); Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode()); BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>( FileSaveSession::new); @@ -466,7 +466,7 @@ private void importPreferences() { Globals.journalAbbreviationLoader); LayoutFormatterPreferences layoutPreferences = Globals.prefs .getLayoutFormatterPreferences(Globals.journalAbbreviationLoader); - SavePreferences savePreferences = SavePreferencesFactory.loadForExportFromPreferences(Globals.prefs); + SavePreferences savePreferences = JabRefPreferences.loadForExportFromPreferences(Globals.prefs); Globals.exportFactory = ExporterFactory.create(customExporters, layoutPreferences, savePreferences); } catch (JabRefException ex) { LOGGER.error("Cannot import preferences", ex); diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java b/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java index 114be1358ce..c19e3e0f505 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/BasePanel.java @@ -142,7 +142,6 @@ import org.jabref.model.strings.StringUtil; import org.jabref.preferences.JabRefPreferences; import org.jabref.preferences.PreviewPreferences; -import org.jabref.preferences.SavePreferencesFactory; import com.google.common.eventbus.Subscribe; import com.jgoodies.forms.builder.FormBuilder; @@ -1093,7 +1092,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset enc, frame.block(); final String SAVE_DATABASE = Localization.lang("Save library"); try { - SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs).withEncoding(enc) + SavePreferences prefs = JabRefPreferences.loadForSaveFromPreferences(Globals.prefs).withEncoding(enc) .withSaveType(saveType); BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>( FileSaveSession::new); diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeScanner.java index 35b3510d546..1ce69aa3d7d 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeScanner.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/collab/ChangeScanner.java @@ -33,7 +33,7 @@ import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibtexString; import org.jabref.model.metadata.MetaData; -import org.jabref.preferences.SavePreferencesFactory; +import org.jabref.preferences.JabRefPreferences; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -105,7 +105,7 @@ public void displayResult(final DisplayResultCallback fup) { private void storeTempDatabase() { JabRefExecutorService.INSTANCE.execute(() -> { try { - SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs).withMakeBackup(false) + SavePreferences prefs = JabRefPreferences.loadForSaveFromPreferences(Globals.prefs).withMakeBackup(false) .withEncoding(panel.getBibDatabaseContext().getMetaData().getEncoding() .orElse(Globals.prefs.getDefaultEncoding())); diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java index 591c6bdd2f3..639b757677e 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java @@ -34,7 +34,7 @@ import ca.odell.glazedlists.swing.DefaultEventTableModel; import com.jgoodies.forms.builder.ButtonBarBuilder; -import static org.jabref.preferences.SavePreferencesFactory.loadForExportFromPreferences; +import static org.jabref.preferences.JabRefPreferences.loadForExportFromPreferences; /** *

Title:

diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java index 51f8f6ffb68..967dc5463d4 100644 --- a/org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java +++ b/org.jabref.gui/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java @@ -39,7 +39,6 @@ import org.jabref.model.database.shared.DatabaseLocation; import org.jabref.model.entry.BibEntry; import org.jabref.preferences.JabRefPreferences; -import org.jabref.preferences.SavePreferencesFactory; import com.jgoodies.forms.builder.FormBuilder; import com.jgoodies.forms.layout.FormLayout; @@ -179,7 +178,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding) frame.block(); try { - SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs).withEncoding(encoding); + SavePreferences prefs = JabRefPreferences.loadForSaveFromPreferences(Globals.prefs).withEncoding(encoding); BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new); if (selectedOnly) { diff --git a/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java index 0e48352e938..ca3af773ac5 100644 --- a/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java +++ b/org.jabref.gui/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java @@ -24,7 +24,6 @@ import org.jabref.model.database.event.BibDatabaseContextChangedEvent; import org.jabref.model.database.event.CoarseChangeFilter; import org.jabref.preferences.JabRefPreferences; -import org.jabref.preferences.SavePreferencesFactory; import com.google.common.eventbus.Subscribe; import org.slf4j.Logger; @@ -119,7 +118,7 @@ private Optional determineBackupPath() { private void performBackup(Path backupPath) { try { Charset charset = bibDatabaseContext.getMetaData().getEncoding().orElse(preferences.getDefaultEncoding()); - SavePreferences savePreferences = SavePreferencesFactory.loadForSaveFromPreferences(preferences).withEncoding + SavePreferences savePreferences = JabRefPreferences.loadForSaveFromPreferences(preferences).withEncoding (charset).withMakeBackup(false); new BibtexDatabaseWriter<>(FileSaveSession::new).saveDatabase(bibDatabaseContext, savePreferences).commit (backupPath); diff --git a/org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java b/org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java index 238332694bf..b2f5dfb511f 100644 --- a/org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java +++ b/org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java @@ -70,7 +70,7 @@ private void readPrefs(JabRefPreferences prefs, JournalAbbreviationLoader loader int i = 0; List s; LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(loader); - SavePreferences savePreferences = SavePreferencesFactory.loadForExportFromPreferences(prefs); + SavePreferences savePreferences = JabRefPreferences.loadForExportFromPreferences(prefs); while (!((s = prefs.getStringList(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i)).isEmpty())) { Optional format = createFormat(s.get(EXPORTER_NAME_INDEX), s.get(EXPORTER_FILENAME_INDEX), s.get(EXPORTER_EXTENSION_INDEX), layoutPreferences, savePreferences); if (format.isPresent()) { diff --git a/org.jabref.gui/src/main/java/org/jabref/preferences/ExporterFactoryFactory.java b/org.jabref.gui/src/main/java/org/jabref/preferences/ExporterFactoryFactory.java index 43561c8880e..f8928015c44 100644 --- a/org.jabref.gui/src/main/java/org/jabref/preferences/ExporterFactoryFactory.java +++ b/org.jabref.gui/src/main/java/org/jabref/preferences/ExporterFactoryFactory.java @@ -1,19 +1,19 @@ package org.jabref.preferences; +import java.util.Map; + import org.jabref.logic.exporter.ExporterFactory; import org.jabref.logic.exporter.SavePreferences; import org.jabref.logic.exporter.TemplateExporter; import org.jabref.logic.journals.JournalAbbreviationLoader; import org.jabref.logic.layout.LayoutFormatterPreferences; -import java.util.Map; - public class ExporterFactoryFactory { public static ExporterFactory create(JabRefPreferences preferences, JournalAbbreviationLoader abbreviationLoader) { Map customFormats = preferences.customExports.getCustomExportFormats(preferences, abbreviationLoader); LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(abbreviationLoader); - SavePreferences savePreferences = SavePreferencesFactory.loadForExportFromPreferences(preferences); + SavePreferences savePreferences = JabRefPreferences.loadForExportFromPreferences(preferences); return ExporterFactory.create(customFormats, layoutPreferences, savePreferences); } diff --git a/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java b/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java index f0f03dd8412..e629a5f12b8 100644 --- a/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/org.jabref.gui/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -49,6 +49,7 @@ import org.jabref.logic.cleanup.CleanupPreferences; import org.jabref.logic.cleanup.CleanupPreset; import org.jabref.logic.cleanup.Cleanups; +import org.jabref.logic.exporter.SavePreferences; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.journals.JournalAbbreviationLoader; import org.jabref.logic.journals.JournalAbbreviationPreferences; @@ -1416,6 +1417,41 @@ public ImportFormatPreferences getImportFormatPreferences() { isKeywordSyncEnabled()); } + public static SavePreferences loadForExportFromPreferences(JabRefPreferences preferences) { + Boolean saveInOriginalOrder = preferences.getBoolean(JabRefPreferences.EXPORT_IN_ORIGINAL_ORDER); + SaveOrderConfig saveOrder = null; + if (!saveInOriginalOrder) { + if (preferences.getBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER)) { + saveOrder = preferences.loadExportSaveOrder(); + } else { + saveOrder = preferences.loadTableSaveOrder(); + } + } + Charset encoding = preferences.getDefaultEncoding(); + Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP); + SavePreferences.DatabaseSaveType saveType = SavePreferences.DatabaseSaveType.ALL; + Boolean takeMetadataSaveOrderInAccount = false; + Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT); + LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences(); + GlobalBibtexKeyPattern globalCiteKeyPattern = preferences.getKeyPattern(); + return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType, + takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern); + } + + public static SavePreferences loadForSaveFromPreferences(JabRefPreferences preferences) { + Boolean saveInOriginalOrder = false; + SaveOrderConfig saveOrder = null; + Charset encoding = preferences.getDefaultEncoding(); + Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP); + SavePreferences.DatabaseSaveType saveType = SavePreferences.DatabaseSaveType.ALL; + Boolean takeMetadataSaveOrderInAccount = true; + Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT); + LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences(); + GlobalBibtexKeyPattern globalCiteKeyPattern = preferences.getKeyPattern(); + return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType, + takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern); + } + public BibtexKeyPatternPreferences getBibtexKeyPatternPreferences() { return new BibtexKeyPatternPreferences(get(KEY_PATTERN_REGEX), get(KEY_PATTERN_REPLACEMENT), getBoolean(KEY_GEN_ALWAYS_ADD_LETTER), getBoolean(KEY_GEN_FIRST_LETTER_A), diff --git a/org.jabref.gui/src/main/java/org/jabref/preferences/SavePreferencesFactory.java b/org.jabref.gui/src/main/java/org/jabref/preferences/SavePreferencesFactory.java deleted file mode 100644 index f87bb961ff9..00000000000 --- a/org.jabref.gui/src/main/java/org/jabref/preferences/SavePreferencesFactory.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.jabref.preferences; - -import org.jabref.logic.bibtex.LatexFieldFormatterPreferences; -import org.jabref.logic.exporter.SavePreferences; -import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern; -import org.jabref.model.metadata.SaveOrderConfig; - -import java.nio.charset.Charset; - -public class SavePreferencesFactory { - - public static SavePreferences loadForExportFromPreferences(JabRefPreferences preferences) { - Boolean saveInOriginalOrder = preferences.getBoolean(JabRefPreferences.EXPORT_IN_ORIGINAL_ORDER); - SaveOrderConfig saveOrder = null; - if (!saveInOriginalOrder) { - if (preferences.getBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER)) { - saveOrder = preferences.loadExportSaveOrder(); - } else { - saveOrder = preferences.loadTableSaveOrder(); - } - } - Charset encoding = preferences.getDefaultEncoding(); - Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP); - SavePreferences.DatabaseSaveType saveType = SavePreferences.DatabaseSaveType.ALL; - Boolean takeMetadataSaveOrderInAccount = false; - Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT); - LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences(); - GlobalBibtexKeyPattern globalCiteKeyPattern = preferences.getKeyPattern(); - return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType, - takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern); - } - - public static SavePreferences loadForSaveFromPreferences(JabRefPreferences preferences) { - Boolean saveInOriginalOrder = false; - SaveOrderConfig saveOrder = null; - Charset encoding = preferences.getDefaultEncoding(); - Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP); - SavePreferences.DatabaseSaveType saveType = SavePreferences.DatabaseSaveType.ALL; - Boolean takeMetadataSaveOrderInAccount = true; - Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT); - LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences(); - GlobalBibtexKeyPattern globalCiteKeyPattern = preferences.getKeyPattern(); - return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType, - takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern); - } - -} From d4b2e9a494869666342a283df2efe5ec4503bf4f Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 22:09:36 +0100 Subject: [PATCH 34/79] Fix package of FallbackExceptionHandler --- org.jabref.gui/src/main/java/org/jabref/JabRefMain.java | 1 + .../main/java/org/jabref/logic/FallbackExceptionHandler.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/org.jabref.gui/src/main/java/org/jabref/JabRefMain.java b/org.jabref.gui/src/main/java/org/jabref/JabRefMain.java index d8305af533f..3a855d97b0f 100644 --- a/org.jabref.gui/src/main/java/org/jabref/JabRefMain.java +++ b/org.jabref.gui/src/main/java/org/jabref/JabRefMain.java @@ -12,6 +12,7 @@ import org.jabref.cli.ArgumentProcessor; import org.jabref.gui.remote.JabRefMessageHandler; +import org.jabref.logic.FallbackExceptionHandler; import org.jabref.logic.formatter.casechanger.ProtectTermsFormatter; import org.jabref.logic.journals.JournalAbbreviationLoader; import org.jabref.logic.l10n.Localization; diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/FallbackExceptionHandler.java b/org.jabref.logic/src/main/java/org/jabref/logic/FallbackExceptionHandler.java index ef65037ee54..a588c956bdf 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/FallbackExceptionHandler.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/FallbackExceptionHandler.java @@ -1,4 +1,4 @@ -package org.jabref; +package org.jabref.logic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From 211caadb8565b40176647e5423cdd032ecba7693 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 22:12:08 +0100 Subject: [PATCH 35/79] Compilefix --- .../src/main/java/org/jabref/logic/JabRefExecutorService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.jabref.logic/src/main/java/org/jabref/logic/JabRefExecutorService.java b/org.jabref.logic/src/main/java/org/jabref/logic/JabRefExecutorService.java index c3f3d9854e8..3b81bd350a0 100644 --- a/org.jabref.logic/src/main/java/org/jabref/logic/JabRefExecutorService.java +++ b/org.jabref.logic/src/main/java/org/jabref/logic/JabRefExecutorService.java @@ -9,6 +9,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; +import org.jabref.logic.FallbackExceptionHandler; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; From e963a6f59abb94059dd8f885664a171d69ba7148 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 22:17:51 +0100 Subject: [PATCH 36/79] Switch from com.airhacks:afterburner.fx to jabref's afterburner.fx --- org.jabref.gui/build.gradle | 5 ++++- org.jabref.gui/lib/afterburner.fx-1.0.0.jar | Bin 0 -> 14071 bytes 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 org.jabref.gui/lib/afterburner.fx-1.0.0.jar diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 003eea90536..8ca603498cc 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -71,7 +71,10 @@ dependencies { compile 'com.google.guava:guava:24.0-jre' // JavaFX stuff - compile 'com.airhacks:afterburner.fx:1.7.0' + + // compile 'com.airhacks:afterburner.fx:1.7.0' -- currently JabRef's fork - therefore, we have to include the indirect dependency: + compile group: 'javax.inject', name: 'javax.inject', version:'1' + compile 'de.codecentric.centerdevice:javafxsvg:1.2.1' compile 'de.jensd:fontawesomefx-commons:8.15' compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4' diff --git a/org.jabref.gui/lib/afterburner.fx-1.0.0.jar b/org.jabref.gui/lib/afterburner.fx-1.0.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..d9363e6d88b56aea7ea9b6f5fc344b19a1acdcb0 GIT binary patch literal 14071 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 literal 0 HcmV?d00001 From 1013a36d87e357afb9add6066076a4bbef9433a3 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 22:25:25 +0100 Subject: [PATCH 37/79] Fix import --- .../src/test/java/org/jabref/CatchExceptionsFromThread.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.jabref.gui/src/test/java/org/jabref/CatchExceptionsFromThread.java b/org.jabref.gui/src/test/java/org/jabref/CatchExceptionsFromThread.java index 16cb2c6845c..ddac8697f96 100644 --- a/org.jabref.gui/src/test/java/org/jabref/CatchExceptionsFromThread.java +++ b/org.jabref.gui/src/test/java/org/jabref/CatchExceptionsFromThread.java @@ -1,5 +1,7 @@ package org.jabref; +import org.jabref.logic.FallbackExceptionHandler; + import org.junit.rules.ExternalResource; /** From 14548e8f7cca3b5dc302ddc771e98af431a04536 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 22:28:21 +0100 Subject: [PATCH 38/79] Add missing checkstyle files --- .../config/checkstyle/checkstyle.xml | 57 +++++++++++++++++++ .../config/checkstyle/suppressions.xml | 10 ++++ 2 files changed, 67 insertions(+) create mode 100644 org.jabref.cli.xmp/config/checkstyle/checkstyle.xml create mode 100644 org.jabref.cli.xmp/config/checkstyle/suppressions.xml diff --git a/org.jabref.cli.xmp/config/checkstyle/checkstyle.xml b/org.jabref.cli.xmp/config/checkstyle/checkstyle.xml new file mode 100644 index 00000000000..20cbcee3f60 --- /dev/null +++ b/org.jabref.cli.xmp/config/checkstyle/checkstyle.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.jabref.cli.xmp/config/checkstyle/suppressions.xml b/org.jabref.cli.xmp/config/checkstyle/suppressions.xml new file mode 100644 index 00000000000..7e853704d9d --- /dev/null +++ b/org.jabref.cli.xmp/config/checkstyle/suppressions.xml @@ -0,0 +1,10 @@ + + + + + + + + From d7abe228d244d19a920c9f51366fd510b458206b Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 23:02:06 +0100 Subject: [PATCH 39/79] Fix location of *.css *.fxml --> resource is the key --- .../src/main/{java => resources}/org/jabref/gui/Main.css | 0 .../org/jabref/gui/documentviewer/DocumentViewer.css | 0 .../org/jabref/gui/documentviewer/DocumentViewer.fxml | 0 .../org/jabref/gui/entryeditor/EntryEditor.css | 0 .../org/jabref/gui/entryeditor/EntryEditor.fxml | 0 .../gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml | 0 .../org/jabref/gui/errorconsole/ErrorConsole.css | 0 .../org/jabref/gui/errorconsole/ErrorConsole.fxml | 0 .../org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml | 0 .../org/jabref/gui/fieldeditors/DateEditor.fxml | 0 .../org/jabref/gui/fieldeditors/IdentifierEditor.fxml | 0 .../org/jabref/gui/fieldeditors/JournalEditor.fxml | 0 .../org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml | 0 .../org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml | 0 .../org/jabref/gui/fieldeditors/OptionEditor.fxml | 0 .../org/jabref/gui/fieldeditors/OwnerEditor.fxml | 0 .../org/jabref/gui/fieldeditors/UrlEditor.fxml | 0 .../main/{java => resources}/org/jabref/gui/groups/GroupTree.css | 0 .../main/{java => resources}/org/jabref/gui/groups/GroupTree.fxml | 0 .../{java => resources}/org/jabref/gui/util/component/Tag.fxml | 0 .../{java => resources}/org/jabref/gui/util/component/TagBar.css | 0 .../{java => resources}/org/jabref/gui/util/component/TagBar.fxml | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/Main.css (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/documentviewer/DocumentViewer.css (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/documentviewer/DocumentViewer.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/entryeditor/EntryEditor.css (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/entryeditor/EntryEditor.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/errorconsole/ErrorConsole.css (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/errorconsole/ErrorConsole.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/fieldeditors/DateEditor.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/fieldeditors/IdentifierEditor.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/fieldeditors/JournalEditor.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/fieldeditors/OptionEditor.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/fieldeditors/OwnerEditor.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/fieldeditors/UrlEditor.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/groups/GroupTree.css (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/groups/GroupTree.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/util/component/Tag.fxml (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/util/component/TagBar.css (100%) rename org.jabref.gui/src/main/{java => resources}/org/jabref/gui/util/component/TagBar.fxml (100%) diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/Main.css b/org.jabref.gui/src/main/resources/org/jabref/gui/Main.css similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/Main.css rename to org.jabref.gui/src/main/resources/org/jabref/gui/Main.css diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css b/org.jabref.gui/src/main/resources/org/jabref/gui/documentviewer/DocumentViewer.css similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css rename to org.jabref.gui/src/main/resources/org/jabref/gui/documentviewer/DocumentViewer.css diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/documentviewer/DocumentViewer.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/documentviewer/DocumentViewer.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css b/org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/EntryEditor.css similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css rename to org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/EntryEditor.css diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/EntryEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/EntryEditor.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css b/org.jabref.gui/src/main/resources/org/jabref/gui/errorconsole/ErrorConsole.css similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css rename to org.jabref.gui/src/main/resources/org/jabref/gui/errorconsole/ErrorConsole.css diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/errorconsole/ErrorConsole.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/errorconsole/ErrorConsole.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/DateEditor.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/DateEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/DateEditor.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/DateEditor.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/IdentifierEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/IdentifierEditor.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/JournalEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/JournalEditor.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/OptionEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/OptionEditor.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/OwnerEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/OwnerEditor.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/UrlEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/UrlEditor.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.css b/org.jabref.gui/src/main/resources/org/jabref/gui/groups/GroupTree.css similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.css rename to org.jabref.gui/src/main/resources/org/jabref/gui/groups/GroupTree.css diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/groups/GroupTree.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/groups/GroupTree.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/util/component/Tag.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/util/component/Tag.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/util/component/Tag.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/util/component/Tag.fxml diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.css b/org.jabref.gui/src/main/resources/org/jabref/gui/util/component/TagBar.css similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.css rename to org.jabref.gui/src/main/resources/org/jabref/gui/util/component/TagBar.css diff --git a/org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.fxml b/org.jabref.gui/src/main/resources/org/jabref/gui/util/component/TagBar.fxml similarity index 100% rename from org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.fxml rename to org.jabref.gui/src/main/resources/org/jabref/gui/util/component/TagBar.fxml From f8215612c726473c74457db5599f69a52a36284c Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 23:10:34 +0100 Subject: [PATCH 40/79] Integrate CodeStyleTest into StringUtilTest --- .../test/java/org/jabref/CodeStyleTests.java | 24 ------------------- .../jabref/model/strings/StringUtilTest.java | 15 ++++++++++++ 2 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 org.jabref.gui/src/test/java/org/jabref/CodeStyleTests.java diff --git a/org.jabref.gui/src/test/java/org/jabref/CodeStyleTests.java b/org.jabref.gui/src/test/java/org/jabref/CodeStyleTests.java deleted file mode 100644 index ec6a5641437..00000000000 --- a/org.jabref.gui/src/test/java/org/jabref/CodeStyleTests.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.jabref; - -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import org.jabref.model.strings.StringUtil; - -import org.junit.Assert; -import org.junit.Test; - -public class CodeStyleTests { - - @Test - public void StringUtilClassIsSmall() throws Exception { - Path path = Paths.get("src", "main", "java", StringUtil.class.getName().replace('.', '/') + ".java"); - int lineCount = Files.readAllLines(path, StandardCharsets.UTF_8).size(); - - Assert.assertTrue("StringUtil increased in size. " - + "We try to keep this class as small as possible. " - + "Thus think twice if you add something to StringUtil.", lineCount <= 722); - } -} diff --git a/org.jabref.model/src/test/java/org/jabref/model/strings/StringUtilTest.java b/org.jabref.model/src/test/java/org/jabref/model/strings/StringUtilTest.java index 4a870394242..d83461050f2 100644 --- a/org.jabref.model/src/test/java/org/jabref/model/strings/StringUtilTest.java +++ b/org.jabref.model/src/test/java/org/jabref/model/strings/StringUtilTest.java @@ -1,7 +1,12 @@ package org.jabref.model.strings; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Optional; +import org.junit.Assert; import org.junit.Test; import static org.junit.Assert.assertArrayEquals; @@ -11,6 +16,16 @@ public class StringUtilTest { + @Test + public void StringUtilClassIsSmall() throws Exception { + Path path = Paths.get("src", "main", "java", StringUtil.class.getName().replace('.', '/') + ".java"); + int lineCount = Files.readAllLines(path, StandardCharsets.UTF_8).size(); + + Assert.assertTrue("StringUtil increased in size. " + + "We try to keep this class as small as possible. " + + "Thus think twice if you add something to StringUtil.", lineCount <= 722); + } + @Test public void testBooleanToBinaryString() { assertEquals("0", StringUtil.booleanToBinaryString(false)); From 20d17cefc16b9c78e4db70cba7dadfbfe299d0b5 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Feb 2018 23:30:57 +0100 Subject: [PATCH 41/79] Add required mock to LinkedfileViewModelTest --- .../jabref/gui/fieldeditors/LinkedFileViewModelTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/org.jabref.gui/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java index b1bfa49ce90..9ff62e374ba 100644 --- a/org.jabref.gui/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java @@ -2,17 +2,20 @@ import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Optional; import javafx.scene.control.Alert.AlertType; import javafx.scene.control.ButtonType; +import org.jabref.Globals; import org.jabref.gui.DialogService; import org.jabref.gui.util.TaskExecutor; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; import org.jabref.model.metadata.FileDirectoryPreferences; +import org.jabref.preferences.JabRefPreferences; import org.junit.Before; import org.junit.Rule; @@ -45,6 +48,10 @@ public void setUp() { databaseContext = new BibDatabaseContext(); taskExecutor = mock(TaskExecutor.class); dialogService = mock(DialogService.class); + Globals.prefs = mock(JabRefPreferences.class); + when(Globals.prefs.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8); + FileDirectoryPreferences fileDirectoryPreferences = mock(FileDirectoryPreferences.class); + when(Globals.prefs.getFileDirectoryPreferences()).thenReturn(fileDirectoryPreferences); } @Test From cf5ad672eeac41d18d0b92b906bf0d4d31d54ea8 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 00:09:23 +0100 Subject: [PATCH 42/79] Remove generated files --- .../main/gen/org/jabref/logic/bst/Bst.tokens | 39 - .../gen/org/jabref/logic/bst/BstLexer.java | 1151 -------------- .../gen/org/jabref/logic/bst/BstParser.java | 1406 ----------------- .../main/gen/org/jabref/search/Search.interp | 43 - .../main/gen/org/jabref/search/Search.tokens | 20 - .../org/jabref/search/SearchBaseVisitor.java | 63 - .../gen/org/jabref/search/SearchLexer.interp | 60 - .../gen/org/jabref/search/SearchLexer.java | 135 -- .../gen/org/jabref/search/SearchLexer.tokens | 20 - .../gen/org/jabref/search/SearchParser.java | 450 ------ .../gen/org/jabref/search/SearchVisitor.java | 59 - 11 files changed, 3446 deletions(-) delete mode 100644 org.jabref.model/src/main/gen/org/jabref/logic/bst/Bst.tokens delete mode 100644 org.jabref.model/src/main/gen/org/jabref/logic/bst/BstLexer.java delete mode 100644 org.jabref.model/src/main/gen/org/jabref/logic/bst/BstParser.java delete mode 100644 org.jabref.model/src/main/gen/org/jabref/search/Search.interp delete mode 100644 org.jabref.model/src/main/gen/org/jabref/search/Search.tokens delete mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchBaseVisitor.java delete mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.interp delete mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.java delete mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.tokens delete mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchParser.java delete mode 100644 org.jabref.model/src/main/gen/org/jabref/search/SearchVisitor.java diff --git a/org.jabref.model/src/main/gen/org/jabref/logic/bst/Bst.tokens b/org.jabref.model/src/main/gen/org/jabref/logic/bst/Bst.tokens deleted file mode 100644 index b17e7fce7e6..00000000000 --- a/org.jabref.model/src/main/gen/org/jabref/logic/bst/Bst.tokens +++ /dev/null @@ -1,39 +0,0 @@ -T__25=25 -T__26=26 -T__27=27 -T__28=28 -T__29=29 -T__30=30 -T__31=31 -T__32=32 -T__33=33 -COMMANDS=4 -ENTRY=5 -EXECUTE=6 -FUNCTION=7 -IDENTIFIER=8 -IDLIST=9 -INTEGER=10 -INTEGERS=11 -ITERATE=12 -LETTER=13 -LINE_COMMENT=14 -MACRO=15 -NUMERAL=16 -QUOTED=17 -READ=18 -REVERSE=19 -SORT=20 -STACK=21 -STRING=22 -STRINGS=23 -WS=24 -'*'=25 -'+'=26 -'-'=27 -':='=28 -'<'=29 -'='=30 -'>'=31 -'{'=32 -'}'=33 diff --git a/org.jabref.model/src/main/gen/org/jabref/logic/bst/BstLexer.java b/org.jabref.model/src/main/gen/org/jabref/logic/bst/BstLexer.java deleted file mode 100644 index 9a4452f4822..00000000000 --- a/org.jabref.model/src/main/gen/org/jabref/logic/bst/BstLexer.java +++ /dev/null @@ -1,1151 +0,0 @@ -// $ANTLR 3.5.2 C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g 2018-02-06 20:44:31 -// Generated by ANTLR -package org.jabref.logic.bst; - -import org.antlr.runtime.*; -import java.util.Stack; -import java.util.List; -import java.util.ArrayList; - -@SuppressWarnings("all") -public class BstLexer extends Lexer { - public static final int EOF=-1; - public static final int T__25=25; - public static final int T__26=26; - public static final int T__27=27; - public static final int T__28=28; - public static final int T__29=29; - public static final int T__30=30; - public static final int T__31=31; - public static final int T__32=32; - public static final int T__33=33; - public static final int COMMANDS=4; - public static final int ENTRY=5; - public static final int EXECUTE=6; - public static final int FUNCTION=7; - public static final int IDENTIFIER=8; - public static final int IDLIST=9; - public static final int INTEGER=10; - public static final int INTEGERS=11; - public static final int ITERATE=12; - public static final int LETTER=13; - public static final int LINE_COMMENT=14; - public static final int MACRO=15; - public static final int NUMERAL=16; - public static final int QUOTED=17; - public static final int READ=18; - public static final int REVERSE=19; - public static final int SORT=20; - public static final int STACK=21; - public static final int STRING=22; - public static final int STRINGS=23; - public static final int WS=24; - - // delegates - // delegators - public Lexer[] getDelegates() { - return new Lexer[] {}; - } - - public BstLexer() {} - public BstLexer(CharStream input) { - this(input, new RecognizerSharedState()); - } - public BstLexer(CharStream input, RecognizerSharedState state) { - super(input,state); - } - @Override public String getGrammarFileName() { return "C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g"; } - - // $ANTLR start "T__25" - public final void mT__25() throws RecognitionException { - try { - int _type = T__25; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:5:7: ( '*' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:5:9: '*' - { - match('*'); - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "T__25" - - // $ANTLR start "T__26" - public final void mT__26() throws RecognitionException { - try { - int _type = T__26; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:6:7: ( '+' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:6:9: '+' - { - match('+'); - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "T__26" - - // $ANTLR start "T__27" - public final void mT__27() throws RecognitionException { - try { - int _type = T__27; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:7:7: ( '-' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:7:9: '-' - { - match('-'); - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "T__27" - - // $ANTLR start "T__28" - public final void mT__28() throws RecognitionException { - try { - int _type = T__28; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:8:7: ( ':=' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:8:9: ':=' - { - match(":="); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "T__28" - - // $ANTLR start "T__29" - public final void mT__29() throws RecognitionException { - try { - int _type = T__29; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:9:7: ( '<' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:9:9: '<' - { - match('<'); - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "T__29" - - // $ANTLR start "T__30" - public final void mT__30() throws RecognitionException { - try { - int _type = T__30; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:10:7: ( '=' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:10:9: '=' - { - match('='); - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "T__30" - - // $ANTLR start "T__31" - public final void mT__31() throws RecognitionException { - try { - int _type = T__31; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:11:7: ( '>' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:11:9: '>' - { - match('>'); - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "T__31" - - // $ANTLR start "T__32" - public final void mT__32() throws RecognitionException { - try { - int _type = T__32; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:12:7: ( '{' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:12:9: '{' - { - match('{'); - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "T__32" - - // $ANTLR start "T__33" - public final void mT__33() throws RecognitionException { - try { - int _type = T__33; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:13:7: ( '}' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:13:9: '}' - { - match('}'); - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "T__33" - - // $ANTLR start "STRINGS" - public final void mSTRINGS() throws RecognitionException { - try { - int _type = STRINGS; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:61:9: ( 'STRINGS' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:61:11: 'STRINGS' - { - match("STRINGS"); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "STRINGS" - - // $ANTLR start "INTEGERS" - public final void mINTEGERS() throws RecognitionException { - try { - int _type = INTEGERS; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:62:10: ( 'INTEGERS' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:62:12: 'INTEGERS' - { - match("INTEGERS"); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "INTEGERS" - - // $ANTLR start "FUNCTION" - public final void mFUNCTION() throws RecognitionException { - try { - int _type = FUNCTION; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:63:10: ( 'FUNCTION' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:63:12: 'FUNCTION' - { - match("FUNCTION"); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "FUNCTION" - - // $ANTLR start "EXECUTE" - public final void mEXECUTE() throws RecognitionException { - try { - int _type = EXECUTE; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:64:9: ( 'EXECUTE' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:64:11: 'EXECUTE' - { - match("EXECUTE"); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "EXECUTE" - - // $ANTLR start "SORT" - public final void mSORT() throws RecognitionException { - try { - int _type = SORT; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:65:6: ( 'SORT' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:65:8: 'SORT' - { - match("SORT"); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "SORT" - - // $ANTLR start "ITERATE" - public final void mITERATE() throws RecognitionException { - try { - int _type = ITERATE; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:66:9: ( 'ITERATE' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:66:11: 'ITERATE' - { - match("ITERATE"); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "ITERATE" - - // $ANTLR start "REVERSE" - public final void mREVERSE() throws RecognitionException { - try { - int _type = REVERSE; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:67:9: ( 'REVERSE' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:67:11: 'REVERSE' - { - match("REVERSE"); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "REVERSE" - - // $ANTLR start "ENTRY" - public final void mENTRY() throws RecognitionException { - try { - int _type = ENTRY; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:68:7: ( 'ENTRY' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:68:9: 'ENTRY' - { - match("ENTRY"); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "ENTRY" - - // $ANTLR start "READ" - public final void mREAD() throws RecognitionException { - try { - int _type = READ; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:69:6: ( 'READ' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:69:8: 'READ' - { - match("READ"); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "READ" - - // $ANTLR start "MACRO" - public final void mMACRO() throws RecognitionException { - try { - int _type = MACRO; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:70:7: ( 'MACRO' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:70:9: 'MACRO' - { - match("MACRO"); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "MACRO" - - // $ANTLR start "QUOTED" - public final void mQUOTED() throws RecognitionException { - try { - int _type = QUOTED; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:73:2: ( '\\'' IDENTIFIER ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:73:4: '\\'' IDENTIFIER - { - match('\''); - mIDENTIFIER(); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "QUOTED" - - // $ANTLR start "IDENTIFIER" - public final void mIDENTIFIER() throws RecognitionException { - try { - int _type = IDENTIFIER; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:76:2: ( LETTER ( LETTER | NUMERAL )* ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:76:4: LETTER ( LETTER | NUMERAL )* - { - mLETTER(); - - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:76:11: ( LETTER | NUMERAL )* - loop1: - while (true) { - int alt1=2; - int LA1_0 = input.LA(1); - if ( (LA1_0=='$'||LA1_0=='.'||(LA1_0 >= '0' && LA1_0 <= '9')||(LA1_0 >= 'A' && LA1_0 <= 'Z')||(LA1_0 >= 'a' && LA1_0 <= 'z')) ) { - alt1=1; - } - - switch (alt1) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: - { - if ( input.LA(1)=='$'||input.LA(1)=='.'||(input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||(input.LA(1) >= 'a' && input.LA(1) <= 'z') ) { - input.consume(); - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse; - } - } - break; - - default : - break loop1; - } - } - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "IDENTIFIER" - - // $ANTLR start "LETTER" - public final void mLETTER() throws RecognitionException { - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:79:2: ( ( 'a' .. 'z' | 'A' .. 'Z' | '.' | '$' ) ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: - { - if ( input.LA(1)=='$'||input.LA(1)=='.'||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||(input.LA(1) >= 'a' && input.LA(1) <= 'z') ) { - input.consume(); - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse; - } - } - - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "LETTER" - - // $ANTLR start "STRING" - public final void mSTRING() throws RecognitionException { - try { - int _type = STRING; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:82:2: ( '\"' (~ ( '\"' ) )* '\"' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:82:4: '\"' (~ ( '\"' ) )* '\"' - { - match('\"'); - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:82:8: (~ ( '\"' ) )* - loop2: - while (true) { - int alt2=2; - int LA2_0 = input.LA(1); - if ( ((LA2_0 >= '\u0000' && LA2_0 <= '!')||(LA2_0 >= '#' && LA2_0 <= '\uFFFF')) ) { - alt2=1; - } - - switch (alt2) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: - { - if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '!')||(input.LA(1) >= '#' && input.LA(1) <= '\uFFFF') ) { - input.consume(); - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse; - } - } - break; - - default : - break loop2; - } - } - - match('\"'); - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "STRING" - - // $ANTLR start "INTEGER" - public final void mINTEGER() throws RecognitionException { - try { - int _type = INTEGER; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:85:2: ( '#' ( '+' | '-' )? ( NUMERAL )+ ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:85:4: '#' ( '+' | '-' )? ( NUMERAL )+ - { - match('#'); - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:85:8: ( '+' | '-' )? - int alt3=2; - int LA3_0 = input.LA(1); - if ( (LA3_0=='+'||LA3_0=='-') ) { - alt3=1; - } - switch (alt3) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: - { - if ( input.LA(1)=='+'||input.LA(1)=='-' ) { - input.consume(); - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse; - } - } - break; - - } - - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:85:19: ( NUMERAL )+ - int cnt4=0; - loop4: - while (true) { - int alt4=2; - int LA4_0 = input.LA(1); - if ( ((LA4_0 >= '0' && LA4_0 <= '9')) ) { - alt4=1; - } - - switch (alt4) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: - { - if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) { - input.consume(); - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse; - } - } - break; - - default : - if ( cnt4 >= 1 ) break loop4; - EarlyExitException eee = new EarlyExitException(4, input); - throw eee; - } - cnt4++; - } - - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "INTEGER" - - // $ANTLR start "NUMERAL" - public final void mNUMERAL() throws RecognitionException { - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:88:2: ( ( '0' .. '9' ) ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: - { - if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) { - input.consume(); - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse; - } - } - - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "NUMERAL" - - // $ANTLR start "WS" - public final void mWS() throws RecognitionException { - try { - int _type = WS; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:91:2: ( ( ' ' | '\\t' | '\\n' | '\\r' )+ ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:91:4: ( ' ' | '\\t' | '\\n' | '\\r' )+ - { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:91:4: ( ' ' | '\\t' | '\\n' | '\\r' )+ - int cnt5=0; - loop5: - while (true) { - int alt5=2; - int LA5_0 = input.LA(1); - if ( ((LA5_0 >= '\t' && LA5_0 <= '\n')||LA5_0=='\r'||LA5_0==' ') ) { - alt5=1; - } - - switch (alt5) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: - { - if ( (input.LA(1) >= '\t' && input.LA(1) <= '\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) { - input.consume(); - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse; - } - } - break; - - default : - if ( cnt5 >= 1 ) break loop5; - EarlyExitException eee = new EarlyExitException(5, input); - throw eee; - } - cnt5++; - } - - _channel=99; - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "WS" - - // $ANTLR start "LINE_COMMENT" - public final void mLINE_COMMENT() throws RecognitionException { - try { - int _type = LINE_COMMENT; - int _channel = DEFAULT_TOKEN_CHANNEL; - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:94:5: ( '%' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:94:7: '%' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' - { - match('%'); - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:94:11: (~ ( '\\n' | '\\r' ) )* - loop6: - while (true) { - int alt6=2; - int LA6_0 = input.LA(1); - if ( ((LA6_0 >= '\u0000' && LA6_0 <= '\t')||(LA6_0 >= '\u000B' && LA6_0 <= '\f')||(LA6_0 >= '\u000E' && LA6_0 <= '\uFFFF')) ) { - alt6=1; - } - - switch (alt6) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g: - { - if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '\t')||(input.LA(1) >= '\u000B' && input.LA(1) <= '\f')||(input.LA(1) >= '\u000E' && input.LA(1) <= '\uFFFF') ) { - input.consume(); - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse; - } - } - break; - - default : - break loop6; - } - } - - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:94:25: ( '\\r' )? - int alt7=2; - int LA7_0 = input.LA(1); - if ( (LA7_0=='\r') ) { - alt7=1; - } - switch (alt7) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:94:25: '\\r' - { - match('\r'); - } - break; - - } - - match('\n'); - _channel=99; - } - - state.type = _type; - state.channel = _channel; - } - finally { - // do for sure before leaving - } - } - // $ANTLR end "LINE_COMMENT" - - @Override - public void mTokens() throws RecognitionException { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:8: ( T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | STRINGS | INTEGERS | FUNCTION | EXECUTE | SORT | ITERATE | REVERSE | ENTRY | READ | MACRO | QUOTED | IDENTIFIER | STRING | INTEGER | WS | LINE_COMMENT ) - int alt8=25; - alt8 = dfa8.predict(input); - switch (alt8) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:10: T__25 - { - mT__25(); - - } - break; - case 2 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:16: T__26 - { - mT__26(); - - } - break; - case 3 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:22: T__27 - { - mT__27(); - - } - break; - case 4 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:28: T__28 - { - mT__28(); - - } - break; - case 5 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:34: T__29 - { - mT__29(); - - } - break; - case 6 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:40: T__30 - { - mT__30(); - - } - break; - case 7 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:46: T__31 - { - mT__31(); - - } - break; - case 8 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:52: T__32 - { - mT__32(); - - } - break; - case 9 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:58: T__33 - { - mT__33(); - - } - break; - case 10 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:64: STRINGS - { - mSTRINGS(); - - } - break; - case 11 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:72: INTEGERS - { - mINTEGERS(); - - } - break; - case 12 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:81: FUNCTION - { - mFUNCTION(); - - } - break; - case 13 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:90: EXECUTE - { - mEXECUTE(); - - } - break; - case 14 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:98: SORT - { - mSORT(); - - } - break; - case 15 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:103: ITERATE - { - mITERATE(); - - } - break; - case 16 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:111: REVERSE - { - mREVERSE(); - - } - break; - case 17 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:119: ENTRY - { - mENTRY(); - - } - break; - case 18 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:125: READ - { - mREAD(); - - } - break; - case 19 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:130: MACRO - { - mMACRO(); - - } - break; - case 20 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:136: QUOTED - { - mQUOTED(); - - } - break; - case 21 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:143: IDENTIFIER - { - mIDENTIFIER(); - - } - break; - case 22 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:154: STRING - { - mSTRING(); - - } - break; - case 23 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:161: INTEGER - { - mINTEGER(); - - } - break; - case 24 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:169: WS - { - mWS(); - - } - break; - case 25 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:1:172: LINE_COMMENT - { - mLINE_COMMENT(); - - } - break; - - } - } - - - protected DFA8 dfa8 = new DFA8(this); - static final String DFA8_eotS = - "\12\uffff\6\21\6\uffff\24\21\1\64\6\21\1\73\2\21\1\uffff\4\21\1\102\1"+ - "\21\1\uffff\1\104\5\21\1\uffff\1\21\1\uffff\1\113\1\21\1\115\1\21\1\117"+ - "\1\120\1\uffff\1\121\1\uffff\1\122\4\uffff"; - static final String DFA8_eofS = - "\123\uffff"; - static final String DFA8_minS = - "\1\11\11\uffff\1\117\1\116\1\125\1\116\1\105\1\101\6\uffff\2\122\1\124"+ - "\1\105\1\116\1\105\1\124\1\101\1\103\1\111\1\124\1\105\1\122\2\103\1\122"+ - "\1\105\1\104\1\122\1\116\1\44\1\107\1\101\1\124\1\125\1\131\1\122\1\44"+ - "\1\117\1\107\1\uffff\1\105\1\124\1\111\1\124\1\44\1\123\1\uffff\1\44\1"+ - "\123\1\122\1\105\1\117\1\105\1\uffff\1\105\1\uffff\1\44\1\123\1\44\1\116"+ - "\2\44\1\uffff\1\44\1\uffff\1\44\4\uffff"; - static final String DFA8_maxS = - "\1\175\11\uffff\2\124\1\125\1\130\1\105\1\101\6\uffff\2\122\1\124\1\105"+ - "\1\116\1\105\1\124\1\126\1\103\1\111\1\124\1\105\1\122\2\103\1\122\1\105"+ - "\1\104\1\122\1\116\1\172\1\107\1\101\1\124\1\125\1\131\1\122\1\172\1\117"+ - "\1\107\1\uffff\1\105\1\124\1\111\1\124\1\172\1\123\1\uffff\1\172\1\123"+ - "\1\122\1\105\1\117\1\105\1\uffff\1\105\1\uffff\1\172\1\123\1\172\1\116"+ - "\2\172\1\uffff\1\172\1\uffff\1\172\4\uffff"; - static final String DFA8_acceptS = - "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\6\uffff\1\24\1\25\1\26"+ - "\1\27\1\30\1\31\36\uffff\1\16\6\uffff\1\22\6\uffff\1\21\1\uffff\1\23\6"+ - "\uffff\1\12\1\uffff\1\17\1\uffff\1\15\1\20\1\13\1\14"; - static final String DFA8_specialS = - "\123\uffff}>"; - static final String[] DFA8_transitionS = { - "\2\24\2\uffff\1\24\22\uffff\1\24\1\uffff\1\22\1\23\1\21\1\25\1\uffff"+ - "\1\20\2\uffff\1\1\1\2\1\uffff\1\3\1\21\13\uffff\1\4\1\uffff\1\5\1\6\1"+ - "\7\2\uffff\4\21\1\15\1\14\2\21\1\13\3\21\1\17\4\21\1\16\1\12\7\21\6\uffff"+ - "\32\21\1\10\1\uffff\1\11", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "\1\27\4\uffff\1\26", - "\1\30\5\uffff\1\31", - "\1\32", - "\1\34\11\uffff\1\33", - "\1\35", - "\1\36", - "", - "", - "", - "", - "", - "", - "\1\37", - "\1\40", - "\1\41", - "\1\42", - "\1\43", - "\1\44", - "\1\45", - "\1\47\24\uffff\1\46", - "\1\50", - "\1\51", - "\1\52", - "\1\53", - "\1\54", - "\1\55", - "\1\56", - "\1\57", - "\1\60", - "\1\61", - "\1\62", - "\1\63", - "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", - "\1\65", - "\1\66", - "\1\67", - "\1\70", - "\1\71", - "\1\72", - "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", - "\1\74", - "\1\75", - "", - "\1\76", - "\1\77", - "\1\100", - "\1\101", - "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", - "\1\103", - "", - "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", - "\1\105", - "\1\106", - "\1\107", - "\1\110", - "\1\111", - "", - "\1\112", - "", - "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", - "\1\114", - "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", - "\1\116", - "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", - "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", - "", - "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", - "", - "\1\21\11\uffff\1\21\1\uffff\12\21\7\uffff\32\21\6\uffff\32\21", - "", - "", - "", - "" - }; - - static final short[] DFA8_eot = DFA.unpackEncodedString(DFA8_eotS); - static final short[] DFA8_eof = DFA.unpackEncodedString(DFA8_eofS); - static final char[] DFA8_min = DFA.unpackEncodedStringToUnsignedChars(DFA8_minS); - static final char[] DFA8_max = DFA.unpackEncodedStringToUnsignedChars(DFA8_maxS); - static final short[] DFA8_accept = DFA.unpackEncodedString(DFA8_acceptS); - static final short[] DFA8_special = DFA.unpackEncodedString(DFA8_specialS); - static final short[][] DFA8_transition; - - static { - int numStates = DFA8_transitionS.length; - DFA8_transition = new short[numStates][]; - for (int i=0; i", "", "", "", "COMMANDS", "ENTRY", "EXECUTE", - "FUNCTION", "IDENTIFIER", "IDLIST", "INTEGER", "INTEGERS", "ITERATE", - "LETTER", "LINE_COMMENT", "MACRO", "NUMERAL", "QUOTED", "READ", "REVERSE", - "SORT", "STACK", "STRING", "STRINGS", "WS", "'*'", "'+'", "'-'", "':='", - "'<'", "'='", "'>'", "'{'", "'}'" - }; - public static final int EOF=-1; - public static final int T__25=25; - public static final int T__26=26; - public static final int T__27=27; - public static final int T__28=28; - public static final int T__29=29; - public static final int T__30=30; - public static final int T__31=31; - public static final int T__32=32; - public static final int T__33=33; - public static final int COMMANDS=4; - public static final int ENTRY=5; - public static final int EXECUTE=6; - public static final int FUNCTION=7; - public static final int IDENTIFIER=8; - public static final int IDLIST=9; - public static final int INTEGER=10; - public static final int INTEGERS=11; - public static final int ITERATE=12; - public static final int LETTER=13; - public static final int LINE_COMMENT=14; - public static final int MACRO=15; - public static final int NUMERAL=16; - public static final int QUOTED=17; - public static final int READ=18; - public static final int REVERSE=19; - public static final int SORT=20; - public static final int STACK=21; - public static final int STRING=22; - public static final int STRINGS=23; - public static final int WS=24; - - // delegates - public Parser[] getDelegates() { - return new Parser[] {}; - } - - // delegators - - - public BstParser(TokenStream input) { - this(input, new RecognizerSharedState()); - } - public BstParser(TokenStream input, RecognizerSharedState state) { - super(input, state); - } - - protected TreeAdaptor adaptor = new CommonTreeAdaptor(); - - public void setTreeAdaptor(TreeAdaptor adaptor) { - this.adaptor = adaptor; - } - public TreeAdaptor getTreeAdaptor() { - return adaptor; - } - @Override public String[] getTokenNames() { return BstParser.tokenNames; } - @Override public String getGrammarFileName() { return "C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g"; } - - - public static class program_return extends ParserRuleReturnScope { - Object tree; - @Override - public Object getTree() { return tree; } - }; - - - // $ANTLR start "program" - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:1: program : ( commands )+ -> ^( COMMANDS ( commands )+ ) ; - public final BstParser.program_return program() throws RecognitionException { - BstParser.program_return retval = new BstParser.program_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - ParserRuleReturnScope commands1 =null; - - RewriteRuleSubtreeStream stream_commands=new RewriteRuleSubtreeStream(adaptor,"rule commands"); - - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:9: ( ( commands )+ -> ^( COMMANDS ( commands )+ ) ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:11: ( commands )+ - { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:11: ( commands )+ - int cnt1=0; - loop1: - while (true) { - int alt1=2; - int LA1_0 = input.LA(1); - if ( ((LA1_0 >= ENTRY && LA1_0 <= FUNCTION)||(LA1_0 >= INTEGERS && LA1_0 <= ITERATE)||LA1_0==MACRO||(LA1_0 >= READ && LA1_0 <= SORT)||LA1_0==STRINGS) ) { - alt1=1; - } - - switch (alt1) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:11: commands - { - pushFollow(FOLLOW_commands_in_program62); - commands1=commands(); - state._fsp--; - - stream_commands.add(commands1.getTree()); - } - break; - - default : - if ( cnt1 >= 1 ) break loop1; - EarlyExitException eee = new EarlyExitException(1, input); - throw eee; - } - cnt1++; - } - - // AST REWRITE - // elements: commands - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null); - - root_0 = (Object)adaptor.nil(); - // 22:21: -> ^( COMMANDS ( commands )+ ) - { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:22:24: ^( COMMANDS ( commands )+ ) - { - Object root_1 = (Object)adaptor.nil(); - root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COMMANDS, "COMMANDS"), root_1); - if ( !(stream_commands.hasNext()) ) { - throw new RewriteEarlyExitException(); - } - while ( stream_commands.hasNext() ) { - adaptor.addChild(root_1, stream_commands.nextTree()); - } - stream_commands.reset(); - - adaptor.addChild(root_0, root_1); - } - - } - - - retval.tree = root_0; - - } - - retval.stop = input.LT(-1); - - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); - } - finally { - // do for sure before leaving - } - return retval; - } - // $ANTLR end "program" - - - public static class commands_return extends ParserRuleReturnScope { - Object tree; - @Override - public Object getTree() { return tree; } - }; - - - // $ANTLR start "commands" - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:24:1: commands : ( STRINGS ^ idList | INTEGERS ^ idList | FUNCTION ^ id stack | MACRO ^ id '{' ! STRING '}' !| READ ^| EXECUTE ^ '{' ! function '}' !| ITERATE ^ '{' ! function '}' !| REVERSE ^ '{' ! function '}' !| ENTRY ^ idList0 idList0 idList0 | SORT ^); - public final BstParser.commands_return commands() throws RecognitionException { - BstParser.commands_return retval = new BstParser.commands_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token STRINGS2=null; - Token INTEGERS4=null; - Token FUNCTION6=null; - Token MACRO9=null; - Token char_literal11=null; - Token STRING12=null; - Token char_literal13=null; - Token READ14=null; - Token EXECUTE15=null; - Token char_literal16=null; - Token char_literal18=null; - Token ITERATE19=null; - Token char_literal20=null; - Token char_literal22=null; - Token REVERSE23=null; - Token char_literal24=null; - Token char_literal26=null; - Token ENTRY27=null; - Token SORT31=null; - ParserRuleReturnScope idList3 =null; - ParserRuleReturnScope idList5 =null; - ParserRuleReturnScope id7 =null; - ParserRuleReturnScope stack8 =null; - ParserRuleReturnScope id10 =null; - ParserRuleReturnScope function17 =null; - ParserRuleReturnScope function21 =null; - ParserRuleReturnScope function25 =null; - ParserRuleReturnScope idList028 =null; - ParserRuleReturnScope idList029 =null; - ParserRuleReturnScope idList030 =null; - - Object STRINGS2_tree=null; - Object INTEGERS4_tree=null; - Object FUNCTION6_tree=null; - Object MACRO9_tree=null; - Object char_literal11_tree=null; - Object STRING12_tree=null; - Object char_literal13_tree=null; - Object READ14_tree=null; - Object EXECUTE15_tree=null; - Object char_literal16_tree=null; - Object char_literal18_tree=null; - Object ITERATE19_tree=null; - Object char_literal20_tree=null; - Object char_literal22_tree=null; - Object REVERSE23_tree=null; - Object char_literal24_tree=null; - Object char_literal26_tree=null; - Object ENTRY27_tree=null; - Object SORT31_tree=null; - - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:25:2: ( STRINGS ^ idList | INTEGERS ^ idList | FUNCTION ^ id stack | MACRO ^ id '{' ! STRING '}' !| READ ^| EXECUTE ^ '{' ! function '}' !| ITERATE ^ '{' ! function '}' !| REVERSE ^ '{' ! function '}' !| ENTRY ^ idList0 idList0 idList0 | SORT ^) - int alt2=10; - switch ( input.LA(1) ) { - case STRINGS: - { - alt2=1; - } - break; - case INTEGERS: - { - alt2=2; - } - break; - case FUNCTION: - { - alt2=3; - } - break; - case MACRO: - { - alt2=4; - } - break; - case READ: - { - alt2=5; - } - break; - case EXECUTE: - { - alt2=6; - } - break; - case ITERATE: - { - alt2=7; - } - break; - case REVERSE: - { - alt2=8; - } - break; - case ENTRY: - { - alt2=9; - } - break; - case SORT: - { - alt2=10; - } - break; - default: - NoViableAltException nvae = - new NoViableAltException("", 2, 0, input); - throw nvae; - } - switch (alt2) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:25:4: STRINGS ^ idList - { - root_0 = (Object)adaptor.nil(); - - - STRINGS2=(Token)match(input,STRINGS,FOLLOW_STRINGS_in_commands81); - STRINGS2_tree = (Object)adaptor.create(STRINGS2); - root_0 = (Object)adaptor.becomeRoot(STRINGS2_tree, root_0); - - pushFollow(FOLLOW_idList_in_commands84); - idList3=idList(); - state._fsp--; - - adaptor.addChild(root_0, idList3.getTree()); - - } - break; - case 2 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:26:4: INTEGERS ^ idList - { - root_0 = (Object)adaptor.nil(); - - - INTEGERS4=(Token)match(input,INTEGERS,FOLLOW_INTEGERS_in_commands89); - INTEGERS4_tree = (Object)adaptor.create(INTEGERS4); - root_0 = (Object)adaptor.becomeRoot(INTEGERS4_tree, root_0); - - pushFollow(FOLLOW_idList_in_commands92); - idList5=idList(); - state._fsp--; - - adaptor.addChild(root_0, idList5.getTree()); - - } - break; - case 3 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:27:4: FUNCTION ^ id stack - { - root_0 = (Object)adaptor.nil(); - - - FUNCTION6=(Token)match(input,FUNCTION,FOLLOW_FUNCTION_in_commands97); - FUNCTION6_tree = (Object)adaptor.create(FUNCTION6); - root_0 = (Object)adaptor.becomeRoot(FUNCTION6_tree, root_0); - - pushFollow(FOLLOW_id_in_commands100); - id7=id(); - state._fsp--; - - adaptor.addChild(root_0, id7.getTree()); - - pushFollow(FOLLOW_stack_in_commands102); - stack8=stack(); - state._fsp--; - - adaptor.addChild(root_0, stack8.getTree()); - - } - break; - case 4 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:28:4: MACRO ^ id '{' ! STRING '}' ! - { - root_0 = (Object)adaptor.nil(); - - - MACRO9=(Token)match(input,MACRO,FOLLOW_MACRO_in_commands107); - MACRO9_tree = (Object)adaptor.create(MACRO9); - root_0 = (Object)adaptor.becomeRoot(MACRO9_tree, root_0); - - pushFollow(FOLLOW_id_in_commands110); - id10=id(); - state._fsp--; - - adaptor.addChild(root_0, id10.getTree()); - - char_literal11=(Token)match(input,32,FOLLOW_32_in_commands112); - STRING12=(Token)match(input,STRING,FOLLOW_STRING_in_commands115); - STRING12_tree = (Object)adaptor.create(STRING12); - adaptor.addChild(root_0, STRING12_tree); - - char_literal13=(Token)match(input,33,FOLLOW_33_in_commands117); - } - break; - case 5 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:29:4: READ ^ - { - root_0 = (Object)adaptor.nil(); - - - READ14=(Token)match(input,READ,FOLLOW_READ_in_commands123); - READ14_tree = (Object)adaptor.create(READ14); - root_0 = (Object)adaptor.becomeRoot(READ14_tree, root_0); - - } - break; - case 6 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:30:4: EXECUTE ^ '{' ! function '}' ! - { - root_0 = (Object)adaptor.nil(); - - - EXECUTE15=(Token)match(input,EXECUTE,FOLLOW_EXECUTE_in_commands129); - EXECUTE15_tree = (Object)adaptor.create(EXECUTE15); - root_0 = (Object)adaptor.becomeRoot(EXECUTE15_tree, root_0); - - char_literal16=(Token)match(input,32,FOLLOW_32_in_commands132); - pushFollow(FOLLOW_function_in_commands135); - function17=function(); - state._fsp--; - - adaptor.addChild(root_0, function17.getTree()); - - char_literal18=(Token)match(input,33,FOLLOW_33_in_commands137); - } - break; - case 7 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:31:4: ITERATE ^ '{' ! function '}' ! - { - root_0 = (Object)adaptor.nil(); - - - ITERATE19=(Token)match(input,ITERATE,FOLLOW_ITERATE_in_commands143); - ITERATE19_tree = (Object)adaptor.create(ITERATE19); - root_0 = (Object)adaptor.becomeRoot(ITERATE19_tree, root_0); - - char_literal20=(Token)match(input,32,FOLLOW_32_in_commands146); - pushFollow(FOLLOW_function_in_commands149); - function21=function(); - state._fsp--; - - adaptor.addChild(root_0, function21.getTree()); - - char_literal22=(Token)match(input,33,FOLLOW_33_in_commands151); - } - break; - case 8 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:32:4: REVERSE ^ '{' ! function '}' ! - { - root_0 = (Object)adaptor.nil(); - - - REVERSE23=(Token)match(input,REVERSE,FOLLOW_REVERSE_in_commands157); - REVERSE23_tree = (Object)adaptor.create(REVERSE23); - root_0 = (Object)adaptor.becomeRoot(REVERSE23_tree, root_0); - - char_literal24=(Token)match(input,32,FOLLOW_32_in_commands160); - pushFollow(FOLLOW_function_in_commands163); - function25=function(); - state._fsp--; - - adaptor.addChild(root_0, function25.getTree()); - - char_literal26=(Token)match(input,33,FOLLOW_33_in_commands165); - } - break; - case 9 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:33:4: ENTRY ^ idList0 idList0 idList0 - { - root_0 = (Object)adaptor.nil(); - - - ENTRY27=(Token)match(input,ENTRY,FOLLOW_ENTRY_in_commands171); - ENTRY27_tree = (Object)adaptor.create(ENTRY27); - root_0 = (Object)adaptor.becomeRoot(ENTRY27_tree, root_0); - - pushFollow(FOLLOW_idList0_in_commands174); - idList028=idList0(); - state._fsp--; - - adaptor.addChild(root_0, idList028.getTree()); - - pushFollow(FOLLOW_idList0_in_commands176); - idList029=idList0(); - state._fsp--; - - adaptor.addChild(root_0, idList029.getTree()); - - pushFollow(FOLLOW_idList0_in_commands178); - idList030=idList0(); - state._fsp--; - - adaptor.addChild(root_0, idList030.getTree()); - - } - break; - case 10 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:34:4: SORT ^ - { - root_0 = (Object)adaptor.nil(); - - - SORT31=(Token)match(input,SORT,FOLLOW_SORT_in_commands183); - SORT31_tree = (Object)adaptor.create(SORT31); - root_0 = (Object)adaptor.becomeRoot(SORT31_tree, root_0); - - } - break; - - } - retval.stop = input.LT(-1); - - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); - } - finally { - // do for sure before leaving - } - return retval; - } - // $ANTLR end "commands" - - - public static class identifier_return extends ParserRuleReturnScope { - Object tree; - @Override - public Object getTree() { return tree; } - }; - - - // $ANTLR start "identifier" - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:36:1: identifier : IDENTIFIER ; - public final BstParser.identifier_return identifier() throws RecognitionException { - BstParser.identifier_return retval = new BstParser.identifier_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token IDENTIFIER32=null; - - Object IDENTIFIER32_tree=null; - - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:37:2: ( IDENTIFIER ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:37:4: IDENTIFIER - { - root_0 = (Object)adaptor.nil(); - - - IDENTIFIER32=(Token)match(input,IDENTIFIER,FOLLOW_IDENTIFIER_in_identifier193); - IDENTIFIER32_tree = (Object)adaptor.create(IDENTIFIER32); - adaptor.addChild(root_0, IDENTIFIER32_tree); - - } - - retval.stop = input.LT(-1); - - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); - } - finally { - // do for sure before leaving - } - return retval; - } - // $ANTLR end "identifier" - - - public static class id_return extends ParserRuleReturnScope { - Object tree; - @Override - public Object getTree() { return tree; } - }; - - - // $ANTLR start "id" - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:39:1: id : '{' ! identifier '}' !; - public final BstParser.id_return id() throws RecognitionException { - BstParser.id_return retval = new BstParser.id_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal33=null; - Token char_literal35=null; - ParserRuleReturnScope identifier34 =null; - - Object char_literal33_tree=null; - Object char_literal35_tree=null; - - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:40:2: ( '{' ! identifier '}' !) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:40:4: '{' ! identifier '}' ! - { - root_0 = (Object)adaptor.nil(); - - - char_literal33=(Token)match(input,32,FOLLOW_32_in_id202); - pushFollow(FOLLOW_identifier_in_id205); - identifier34=identifier(); - state._fsp--; - - adaptor.addChild(root_0, identifier34.getTree()); - - char_literal35=(Token)match(input,33,FOLLOW_33_in_id207); - } - - retval.stop = input.LT(-1); - - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); - } - finally { - // do for sure before leaving - } - return retval; - } - // $ANTLR end "id" - - - public static class idList_return extends ParserRuleReturnScope { - Object tree; - @Override - public Object getTree() { return tree; } - }; - - - // $ANTLR start "idList" - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:42:1: idList : '{' ( identifier )+ '}' -> ^( IDLIST ( identifier )+ ) ; - public final BstParser.idList_return idList() throws RecognitionException { - BstParser.idList_return retval = new BstParser.idList_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal36=null; - Token char_literal38=null; - ParserRuleReturnScope identifier37 =null; - - Object char_literal36_tree=null; - Object char_literal38_tree=null; - RewriteRuleTokenStream stream_33=new RewriteRuleTokenStream(adaptor,"token 33"); - RewriteRuleTokenStream stream_32=new RewriteRuleTokenStream(adaptor,"token 32"); - RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier"); - - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:43:2: ( '{' ( identifier )+ '}' -> ^( IDLIST ( identifier )+ ) ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:43:4: '{' ( identifier )+ '}' - { - char_literal36=(Token)match(input,32,FOLLOW_32_in_idList217); - stream_32.add(char_literal36); - - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:43:8: ( identifier )+ - int cnt3=0; - loop3: - while (true) { - int alt3=2; - int LA3_0 = input.LA(1); - if ( (LA3_0==IDENTIFIER) ) { - alt3=1; - } - - switch (alt3) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:43:8: identifier - { - pushFollow(FOLLOW_identifier_in_idList219); - identifier37=identifier(); - state._fsp--; - - stream_identifier.add(identifier37.getTree()); - } - break; - - default : - if ( cnt3 >= 1 ) break loop3; - EarlyExitException eee = new EarlyExitException(3, input); - throw eee; - } - cnt3++; - } - - char_literal38=(Token)match(input,33,FOLLOW_33_in_idList222); - stream_33.add(char_literal38); - - // AST REWRITE - // elements: identifier - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null); - - root_0 = (Object)adaptor.nil(); - // 43:24: -> ^( IDLIST ( identifier )+ ) - { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:43:27: ^( IDLIST ( identifier )+ ) - { - Object root_1 = (Object)adaptor.nil(); - root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(IDLIST, "IDLIST"), root_1); - if ( !(stream_identifier.hasNext()) ) { - throw new RewriteEarlyExitException(); - } - while ( stream_identifier.hasNext() ) { - adaptor.addChild(root_1, stream_identifier.nextTree()); - } - stream_identifier.reset(); - - adaptor.addChild(root_0, root_1); - } - - } - - - retval.tree = root_0; - - } - - retval.stop = input.LT(-1); - - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); - } - finally { - // do for sure before leaving - } - return retval; - } - // $ANTLR end "idList" - - - public static class idList0_return extends ParserRuleReturnScope { - Object tree; - @Override - public Object getTree() { return tree; } - }; - - - // $ANTLR start "idList0" - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:45:1: idList0 : '{' ( identifier )* '}' -> ^( IDLIST ( identifier )* ) ; - public final BstParser.idList0_return idList0() throws RecognitionException { - BstParser.idList0_return retval = new BstParser.idList0_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal39=null; - Token char_literal41=null; - ParserRuleReturnScope identifier40 =null; - - Object char_literal39_tree=null; - Object char_literal41_tree=null; - RewriteRuleTokenStream stream_33=new RewriteRuleTokenStream(adaptor,"token 33"); - RewriteRuleTokenStream stream_32=new RewriteRuleTokenStream(adaptor,"token 32"); - RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier"); - - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:2: ( '{' ( identifier )* '}' -> ^( IDLIST ( identifier )* ) ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:4: '{' ( identifier )* '}' - { - char_literal39=(Token)match(input,32,FOLLOW_32_in_idList0240); - stream_32.add(char_literal39); - - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:8: ( identifier )* - loop4: - while (true) { - int alt4=2; - int LA4_0 = input.LA(1); - if ( (LA4_0==IDENTIFIER) ) { - alt4=1; - } - - switch (alt4) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:8: identifier - { - pushFollow(FOLLOW_identifier_in_idList0242); - identifier40=identifier(); - state._fsp--; - - stream_identifier.add(identifier40.getTree()); - } - break; - - default : - break loop4; - } - } - - char_literal41=(Token)match(input,33,FOLLOW_33_in_idList0245); - stream_33.add(char_literal41); - - // AST REWRITE - // elements: identifier - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null); - - root_0 = (Object)adaptor.nil(); - // 46:24: -> ^( IDLIST ( identifier )* ) - { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:27: ^( IDLIST ( identifier )* ) - { - Object root_1 = (Object)adaptor.nil(); - root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(IDLIST, "IDLIST"), root_1); - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:46:36: ( identifier )* - while ( stream_identifier.hasNext() ) { - adaptor.addChild(root_1, stream_identifier.nextTree()); - } - stream_identifier.reset(); - - adaptor.addChild(root_0, root_1); - } - - } - - - retval.tree = root_0; - - } - - retval.stop = input.LT(-1); - - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); - } - finally { - // do for sure before leaving - } - return retval; - } - // $ANTLR end "idList0" - - - public static class function_return extends ParserRuleReturnScope { - Object tree; - @Override - public Object getTree() { return tree; } - }; - - - // $ANTLR start "function" - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:48:1: function : ( '<' | '>' | '=' | '+' | '-' | ':=' | '*' | identifier ); - public final BstParser.function_return function() throws RecognitionException { - BstParser.function_return retval = new BstParser.function_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal42=null; - Token char_literal43=null; - Token char_literal44=null; - Token char_literal45=null; - Token char_literal46=null; - Token string_literal47=null; - Token char_literal48=null; - ParserRuleReturnScope identifier49 =null; - - Object char_literal42_tree=null; - Object char_literal43_tree=null; - Object char_literal44_tree=null; - Object char_literal45_tree=null; - Object char_literal46_tree=null; - Object string_literal47_tree=null; - Object char_literal48_tree=null; - - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:2: ( '<' | '>' | '=' | '+' | '-' | ':=' | '*' | identifier ) - int alt5=8; - switch ( input.LA(1) ) { - case 29: - { - alt5=1; - } - break; - case 31: - { - alt5=2; - } - break; - case 30: - { - alt5=3; - } - break; - case 26: - { - alt5=4; - } - break; - case 27: - { - alt5=5; - } - break; - case 28: - { - alt5=6; - } - break; - case 25: - { - alt5=7; - } - break; - case IDENTIFIER: - { - alt5=8; - } - break; - default: - NoViableAltException nvae = - new NoViableAltException("", 5, 0, input); - throw nvae; - } - switch (alt5) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:4: '<' - { - root_0 = (Object)adaptor.nil(); - - - char_literal42=(Token)match(input,29,FOLLOW_29_in_function263); - char_literal42_tree = (Object)adaptor.create(char_literal42); - adaptor.addChild(root_0, char_literal42_tree); - - } - break; - case 2 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:10: '>' - { - root_0 = (Object)adaptor.nil(); - - - char_literal43=(Token)match(input,31,FOLLOW_31_in_function267); - char_literal43_tree = (Object)adaptor.create(char_literal43); - adaptor.addChild(root_0, char_literal43_tree); - - } - break; - case 3 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:16: '=' - { - root_0 = (Object)adaptor.nil(); - - - char_literal44=(Token)match(input,30,FOLLOW_30_in_function271); - char_literal44_tree = (Object)adaptor.create(char_literal44); - adaptor.addChild(root_0, char_literal44_tree); - - } - break; - case 4 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:22: '+' - { - root_0 = (Object)adaptor.nil(); - - - char_literal45=(Token)match(input,26,FOLLOW_26_in_function275); - char_literal45_tree = (Object)adaptor.create(char_literal45); - adaptor.addChild(root_0, char_literal45_tree); - - } - break; - case 5 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:28: '-' - { - root_0 = (Object)adaptor.nil(); - - - char_literal46=(Token)match(input,27,FOLLOW_27_in_function279); - char_literal46_tree = (Object)adaptor.create(char_literal46); - adaptor.addChild(root_0, char_literal46_tree); - - } - break; - case 6 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:34: ':=' - { - root_0 = (Object)adaptor.nil(); - - - string_literal47=(Token)match(input,28,FOLLOW_28_in_function283); - string_literal47_tree = (Object)adaptor.create(string_literal47); - adaptor.addChild(root_0, string_literal47_tree); - - } - break; - case 7 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:41: '*' - { - root_0 = (Object)adaptor.nil(); - - - char_literal48=(Token)match(input,25,FOLLOW_25_in_function287); - char_literal48_tree = (Object)adaptor.create(char_literal48); - adaptor.addChild(root_0, char_literal48_tree); - - } - break; - case 8 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:49:47: identifier - { - root_0 = (Object)adaptor.nil(); - - - pushFollow(FOLLOW_identifier_in_function291); - identifier49=identifier(); - state._fsp--; - - adaptor.addChild(root_0, identifier49.getTree()); - - } - break; - - } - retval.stop = input.LT(-1); - - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); - } - finally { - // do for sure before leaving - } - return retval; - } - // $ANTLR end "function" - - - public static class stack_return extends ParserRuleReturnScope { - Object tree; - @Override - public Object getTree() { return tree; } - }; - - - // $ANTLR start "stack" - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:51:1: stack : '{' ( stackitem )+ '}' -> ^( STACK ( stackitem )+ ) ; - public final BstParser.stack_return stack() throws RecognitionException { - BstParser.stack_return retval = new BstParser.stack_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal50=null; - Token char_literal52=null; - ParserRuleReturnScope stackitem51 =null; - - Object char_literal50_tree=null; - Object char_literal52_tree=null; - RewriteRuleTokenStream stream_33=new RewriteRuleTokenStream(adaptor,"token 33"); - RewriteRuleTokenStream stream_32=new RewriteRuleTokenStream(adaptor,"token 32"); - RewriteRuleSubtreeStream stream_stackitem=new RewriteRuleSubtreeStream(adaptor,"rule stackitem"); - - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:52:2: ( '{' ( stackitem )+ '}' -> ^( STACK ( stackitem )+ ) ) - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:52:4: '{' ( stackitem )+ '}' - { - char_literal50=(Token)match(input,32,FOLLOW_32_in_stack300); - stream_32.add(char_literal50); - - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:52:8: ( stackitem )+ - int cnt6=0; - loop6: - while (true) { - int alt6=2; - int LA6_0 = input.LA(1); - if ( (LA6_0==IDENTIFIER||LA6_0==INTEGER||LA6_0==QUOTED||LA6_0==STRING||(LA6_0 >= 25 && LA6_0 <= 32)) ) { - alt6=1; - } - - switch (alt6) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:52:8: stackitem - { - pushFollow(FOLLOW_stackitem_in_stack302); - stackitem51=stackitem(); - state._fsp--; - - stream_stackitem.add(stackitem51.getTree()); - } - break; - - default : - if ( cnt6 >= 1 ) break loop6; - EarlyExitException eee = new EarlyExitException(6, input); - throw eee; - } - cnt6++; - } - - char_literal52=(Token)match(input,33,FOLLOW_33_in_stack305); - stream_33.add(char_literal52); - - // AST REWRITE - // elements: stackitem - // token labels: - // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: - retval.tree = root_0; - RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null); - - root_0 = (Object)adaptor.nil(); - // 52:23: -> ^( STACK ( stackitem )+ ) - { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:52:26: ^( STACK ( stackitem )+ ) - { - Object root_1 = (Object)adaptor.nil(); - root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(STACK, "STACK"), root_1); - if ( !(stream_stackitem.hasNext()) ) { - throw new RewriteEarlyExitException(); - } - while ( stream_stackitem.hasNext() ) { - adaptor.addChild(root_1, stream_stackitem.nextTree()); - } - stream_stackitem.reset(); - - adaptor.addChild(root_0, root_1); - } - - } - - - retval.tree = root_0; - - } - - retval.stop = input.LT(-1); - - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); - } - finally { - // do for sure before leaving - } - return retval; - } - // $ANTLR end "stack" - - - public static class stackitem_return extends ParserRuleReturnScope { - Object tree; - @Override - public Object getTree() { return tree; } - }; - - - // $ANTLR start "stackitem" - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:54:1: stackitem : ( function | STRING | INTEGER | QUOTED | stack ); - public final BstParser.stackitem_return stackitem() throws RecognitionException { - BstParser.stackitem_return retval = new BstParser.stackitem_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token STRING54=null; - Token INTEGER55=null; - Token QUOTED56=null; - ParserRuleReturnScope function53 =null; - ParserRuleReturnScope stack57 =null; - - Object STRING54_tree=null; - Object INTEGER55_tree=null; - Object QUOTED56_tree=null; - - try { - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:55:2: ( function | STRING | INTEGER | QUOTED | stack ) - int alt7=5; - switch ( input.LA(1) ) { - case IDENTIFIER: - case 25: - case 26: - case 27: - case 28: - case 29: - case 30: - case 31: - { - alt7=1; - } - break; - case STRING: - { - alt7=2; - } - break; - case INTEGER: - { - alt7=3; - } - break; - case QUOTED: - { - alt7=4; - } - break; - case 32: - { - alt7=5; - } - break; - default: - NoViableAltException nvae = - new NoViableAltException("", 7, 0, input); - throw nvae; - } - switch (alt7) { - case 1 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:55:4: function - { - root_0 = (Object)adaptor.nil(); - - - pushFollow(FOLLOW_function_in_stackitem323); - function53=function(); - state._fsp--; - - adaptor.addChild(root_0, function53.getTree()); - - } - break; - case 2 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:56:4: STRING - { - root_0 = (Object)adaptor.nil(); - - - STRING54=(Token)match(input,STRING,FOLLOW_STRING_in_stackitem328); - STRING54_tree = (Object)adaptor.create(STRING54); - adaptor.addChild(root_0, STRING54_tree); - - } - break; - case 3 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:57:4: INTEGER - { - root_0 = (Object)adaptor.nil(); - - - INTEGER55=(Token)match(input,INTEGER,FOLLOW_INTEGER_in_stackitem333); - INTEGER55_tree = (Object)adaptor.create(INTEGER55); - adaptor.addChild(root_0, INTEGER55_tree); - - } - break; - case 4 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:58:4: QUOTED - { - root_0 = (Object)adaptor.nil(); - - - QUOTED56=(Token)match(input,QUOTED,FOLLOW_QUOTED_in_stackitem338); - QUOTED56_tree = (Object)adaptor.create(QUOTED56); - adaptor.addChild(root_0, QUOTED56_tree); - - } - break; - case 5 : - // C:\\git-repositories\\jabref\\jabref-multi-module-build\\org.jabref.model\\src\\main\\antlr3\\org\\jabref\\bst\\Bst.g:59:4: stack - { - root_0 = (Object)adaptor.nil(); - - - pushFollow(FOLLOW_stack_in_stackitem343); - stack57=stack(); - state._fsp--; - - adaptor.addChild(root_0, stack57.getTree()); - - } - break; - - } - retval.stop = input.LT(-1); - - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - retval.tree = (Object)adaptor.errorNode(input, retval.start, input.LT(-1), re); - } - finally { - // do for sure before leaving - } - return retval; - } - // $ANTLR end "stackitem" - - // Delegated rules - - - - public static final BitSet FOLLOW_commands_in_program62 = new BitSet(new long[]{0x00000000009C98E2L}); - public static final BitSet FOLLOW_STRINGS_in_commands81 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_idList_in_commands84 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_INTEGERS_in_commands89 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_idList_in_commands92 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_FUNCTION_in_commands97 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_id_in_commands100 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_stack_in_commands102 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_MACRO_in_commands107 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_id_in_commands110 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_32_in_commands112 = new BitSet(new long[]{0x0000000000400000L}); - public static final BitSet FOLLOW_STRING_in_commands115 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_33_in_commands117 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_READ_in_commands123 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_EXECUTE_in_commands129 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_32_in_commands132 = new BitSet(new long[]{0x00000000FE000100L}); - public static final BitSet FOLLOW_function_in_commands135 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_33_in_commands137 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ITERATE_in_commands143 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_32_in_commands146 = new BitSet(new long[]{0x00000000FE000100L}); - public static final BitSet FOLLOW_function_in_commands149 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_33_in_commands151 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_REVERSE_in_commands157 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_32_in_commands160 = new BitSet(new long[]{0x00000000FE000100L}); - public static final BitSet FOLLOW_function_in_commands163 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_33_in_commands165 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ENTRY_in_commands171 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_idList0_in_commands174 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_idList0_in_commands176 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_idList0_in_commands178 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_SORT_in_commands183 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_IDENTIFIER_in_identifier193 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_32_in_id202 = new BitSet(new long[]{0x0000000000000100L}); - public static final BitSet FOLLOW_identifier_in_id205 = new BitSet(new long[]{0x0000000200000000L}); - public static final BitSet FOLLOW_33_in_id207 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_32_in_idList217 = new BitSet(new long[]{0x0000000000000100L}); - public static final BitSet FOLLOW_identifier_in_idList219 = new BitSet(new long[]{0x0000000200000100L}); - public static final BitSet FOLLOW_33_in_idList222 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_32_in_idList0240 = new BitSet(new long[]{0x0000000200000100L}); - public static final BitSet FOLLOW_identifier_in_idList0242 = new BitSet(new long[]{0x0000000200000100L}); - public static final BitSet FOLLOW_33_in_idList0245 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_29_in_function263 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_31_in_function267 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_30_in_function271 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_26_in_function275 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_27_in_function279 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_28_in_function283 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_25_in_function287 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_identifier_in_function291 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_32_in_stack300 = new BitSet(new long[]{0x00000001FE420500L}); - public static final BitSet FOLLOW_stackitem_in_stack302 = new BitSet(new long[]{0x00000003FE420500L}); - public static final BitSet FOLLOW_33_in_stack305 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_function_in_stackitem323 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_STRING_in_stackitem328 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_INTEGER_in_stackitem333 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_QUOTED_in_stackitem338 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_stack_in_stackitem343 = new BitSet(new long[]{0x0000000000000002L}); -} diff --git a/org.jabref.model/src/main/gen/org/jabref/search/Search.interp b/org.jabref.model/src/main/gen/org/jabref/search/Search.interp deleted file mode 100644 index 9a3fb3aacb8..00000000000 --- a/org.jabref.model/src/main/gen/org/jabref/search/Search.interp +++ /dev/null @@ -1,43 +0,0 @@ -token literal names: -null -null -'(' -')' -'=' -'==' -'!=' -null -null -null -null -null -null -'"' -null - -token symbolic names: -null -WS -LPAREN -RPAREN -EQUAL -EEQUAL -NEQUAL -AND -OR -CONTAINS -MATCHES -NOT -STRING -QUOTE -FIELDTYPE - -rule names: -start -expression -comparison -name - - -atn: -[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 16, 41, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 22, 10, 3, 3, 3, 3, 3, 3, 3, 7, 3, 27, 10, 3, 12, 3, 14, 3, 30, 11, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 5, 4, 37, 10, 4, 3, 5, 3, 5, 3, 5, 2, 3, 4, 6, 2, 4, 6, 8, 2, 5, 3, 2, 9, 10, 4, 2, 6, 8, 11, 12, 4, 2, 14, 14, 16, 16, 2, 40, 2, 10, 3, 2, 2, 2, 4, 21, 3, 2, 2, 2, 6, 36, 3, 2, 2, 2, 8, 38, 3, 2, 2, 2, 10, 11, 5, 4, 3, 2, 11, 12, 7, 2, 2, 3, 12, 3, 3, 2, 2, 2, 13, 14, 8, 3, 1, 2, 14, 15, 7, 4, 2, 2, 15, 16, 5, 4, 3, 2, 16, 17, 7, 5, 2, 2, 17, 22, 3, 2, 2, 2, 18, 19, 7, 13, 2, 2, 19, 22, 5, 4, 3, 4, 20, 22, 5, 6, 4, 2, 21, 13, 3, 2, 2, 2, 21, 18, 3, 2, 2, 2, 21, 20, 3, 2, 2, 2, 22, 28, 3, 2, 2, 2, 23, 24, 12, 5, 2, 2, 24, 25, 9, 2, 2, 2, 25, 27, 5, 4, 3, 6, 26, 23, 3, 2, 2, 2, 27, 30, 3, 2, 2, 2, 28, 26, 3, 2, 2, 2, 28, 29, 3, 2, 2, 2, 29, 5, 3, 2, 2, 2, 30, 28, 3, 2, 2, 2, 31, 32, 5, 8, 5, 2, 32, 33, 9, 3, 2, 2, 33, 34, 5, 8, 5, 2, 34, 37, 3, 2, 2, 2, 35, 37, 5, 8, 5, 2, 36, 31, 3, 2, 2, 2, 36, 35, 3, 2, 2, 2, 37, 7, 3, 2, 2, 2, 38, 39, 9, 4, 2, 2, 39, 9, 3, 2, 2, 2, 5, 21, 28, 36] \ No newline at end of file diff --git a/org.jabref.model/src/main/gen/org/jabref/search/Search.tokens b/org.jabref.model/src/main/gen/org/jabref/search/Search.tokens deleted file mode 100644 index bbfab1f6ca4..00000000000 --- a/org.jabref.model/src/main/gen/org/jabref/search/Search.tokens +++ /dev/null @@ -1,20 +0,0 @@ -WS=1 -LPAREN=2 -RPAREN=3 -EQUAL=4 -EEQUAL=5 -NEQUAL=6 -AND=7 -OR=8 -CONTAINS=9 -MATCHES=10 -NOT=11 -STRING=12 -QUOTE=13 -FIELDTYPE=14 -'('=2 -')'=3 -'='=4 -'=='=5 -'!='=6 -'"'=13 diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchBaseVisitor.java b/org.jabref.model/src/main/gen/org/jabref/search/SearchBaseVisitor.java deleted file mode 100644 index bbbb87aab85..00000000000 --- a/org.jabref.model/src/main/gen/org/jabref/search/SearchBaseVisitor.java +++ /dev/null @@ -1,63 +0,0 @@ -// Generated from C:\git-repositories\jabref\jabref-multi-module-build\org.jabref.model\src\main\antlr4\org\jabref\search\Search.g4 by ANTLR 4.7.1 -package org.jabref.search; -import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor; - -/** - * This class provides an empty implementation of {@link SearchVisitor}, - * which can be extended to create a visitor which only needs to handle a subset - * of the available methods. - * - * @param The return type of the visit operation. Use {@link Void} for - * operations with no return type. - */ -public class SearchBaseVisitor extends AbstractParseTreeVisitor implements SearchVisitor { - /** - * {@inheritDoc} - * - *

The default implementation returns the result of calling - * {@link #visitChildren} on {@code ctx}.

- */ - @Override public T visitStart(SearchParser.StartContext ctx) { return visitChildren(ctx); } - /** - * {@inheritDoc} - * - *

The default implementation returns the result of calling - * {@link #visitChildren} on {@code ctx}.

- */ - @Override public T visitBinaryExpression(SearchParser.BinaryExpressionContext ctx) { return visitChildren(ctx); } - /** - * {@inheritDoc} - * - *

The default implementation returns the result of calling - * {@link #visitChildren} on {@code ctx}.

- */ - @Override public T visitAtomExpression(SearchParser.AtomExpressionContext ctx) { return visitChildren(ctx); } - /** - * {@inheritDoc} - * - *

The default implementation returns the result of calling - * {@link #visitChildren} on {@code ctx}.

- */ - @Override public T visitParenExpression(SearchParser.ParenExpressionContext ctx) { return visitChildren(ctx); } - /** - * {@inheritDoc} - * - *

The default implementation returns the result of calling - * {@link #visitChildren} on {@code ctx}.

- */ - @Override public T visitUnaryExpression(SearchParser.UnaryExpressionContext ctx) { return visitChildren(ctx); } - /** - * {@inheritDoc} - * - *

The default implementation returns the result of calling - * {@link #visitChildren} on {@code ctx}.

- */ - @Override public T visitComparison(SearchParser.ComparisonContext ctx) { return visitChildren(ctx); } - /** - * {@inheritDoc} - * - *

The default implementation returns the result of calling - * {@link #visitChildren} on {@code ctx}.

- */ - @Override public T visitName(SearchParser.NameContext ctx) { return visitChildren(ctx); } -} \ No newline at end of file diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.interp b/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.interp deleted file mode 100644 index a2fcc8e7b17..00000000000 --- a/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.interp +++ /dev/null @@ -1,60 +0,0 @@ -token literal names: -null -null -'(' -')' -'=' -'==' -'!=' -null -null -null -null -null -null -'"' -null - -token symbolic names: -null -WS -LPAREN -RPAREN -EQUAL -EEQUAL -NEQUAL -AND -OR -CONTAINS -MATCHES -NOT -STRING -QUOTE -FIELDTYPE - -rule names: -WS -LPAREN -RPAREN -EQUAL -EEQUAL -NEQUAL -AND -OR -CONTAINS -MATCHES -NOT -STRING -QUOTE -FIELDTYPE -LETTER - -channel names: -DEFAULT_TOKEN_CHANNEL -HIDDEN - -mode names: -DEFAULT_MODE - -atn: -[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 16, 95, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 7, 13, 80, 10, 13, 12, 13, 14, 13, 83, 11, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 6, 15, 90, 10, 15, 13, 15, 14, 15, 91, 3, 16, 3, 16, 2, 2, 17, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 2, 3, 2, 17, 4, 2, 11, 11, 34, 34, 4, 2, 67, 67, 99, 99, 4, 2, 80, 80, 112, 112, 4, 2, 70, 70, 102, 102, 4, 2, 81, 81, 113, 113, 4, 2, 84, 84, 116, 116, 4, 2, 69, 69, 101, 101, 4, 2, 86, 86, 118, 118, 4, 2, 75, 75, 107, 107, 4, 2, 85, 85, 117, 117, 4, 2, 79, 79, 111, 111, 4, 2, 74, 74, 106, 106, 4, 2, 71, 71, 103, 103, 3, 2, 36, 36, 6, 2, 11, 11, 34, 36, 42, 43, 63, 63, 2, 95, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 3, 33, 3, 2, 2, 2, 5, 37, 3, 2, 2, 2, 7, 39, 3, 2, 2, 2, 9, 41, 3, 2, 2, 2, 11, 43, 3, 2, 2, 2, 13, 46, 3, 2, 2, 2, 15, 49, 3, 2, 2, 2, 17, 53, 3, 2, 2, 2, 19, 56, 3, 2, 2, 2, 21, 65, 3, 2, 2, 2, 23, 73, 3, 2, 2, 2, 25, 77, 3, 2, 2, 2, 27, 86, 3, 2, 2, 2, 29, 89, 3, 2, 2, 2, 31, 93, 3, 2, 2, 2, 33, 34, 9, 2, 2, 2, 34, 35, 3, 2, 2, 2, 35, 36, 8, 2, 2, 2, 36, 4, 3, 2, 2, 2, 37, 38, 7, 42, 2, 2, 38, 6, 3, 2, 2, 2, 39, 40, 7, 43, 2, 2, 40, 8, 3, 2, 2, 2, 41, 42, 7, 63, 2, 2, 42, 10, 3, 2, 2, 2, 43, 44, 7, 63, 2, 2, 44, 45, 7, 63, 2, 2, 45, 12, 3, 2, 2, 2, 46, 47, 7, 35, 2, 2, 47, 48, 7, 63, 2, 2, 48, 14, 3, 2, 2, 2, 49, 50, 9, 3, 2, 2, 50, 51, 9, 4, 2, 2, 51, 52, 9, 5, 2, 2, 52, 16, 3, 2, 2, 2, 53, 54, 9, 6, 2, 2, 54, 55, 9, 7, 2, 2, 55, 18, 3, 2, 2, 2, 56, 57, 9, 8, 2, 2, 57, 58, 9, 6, 2, 2, 58, 59, 9, 4, 2, 2, 59, 60, 9, 9, 2, 2, 60, 61, 9, 3, 2, 2, 61, 62, 9, 10, 2, 2, 62, 63, 9, 4, 2, 2, 63, 64, 9, 11, 2, 2, 64, 20, 3, 2, 2, 2, 65, 66, 9, 12, 2, 2, 66, 67, 9, 3, 2, 2, 67, 68, 9, 9, 2, 2, 68, 69, 9, 8, 2, 2, 69, 70, 9, 13, 2, 2, 70, 71, 9, 14, 2, 2, 71, 72, 9, 11, 2, 2, 72, 22, 3, 2, 2, 2, 73, 74, 9, 4, 2, 2, 74, 75, 9, 6, 2, 2, 75, 76, 9, 9, 2, 2, 76, 24, 3, 2, 2, 2, 77, 81, 5, 27, 14, 2, 78, 80, 10, 15, 2, 2, 79, 78, 3, 2, 2, 2, 80, 83, 3, 2, 2, 2, 81, 79, 3, 2, 2, 2, 81, 82, 3, 2, 2, 2, 82, 84, 3, 2, 2, 2, 83, 81, 3, 2, 2, 2, 84, 85, 5, 27, 14, 2, 85, 26, 3, 2, 2, 2, 86, 87, 7, 36, 2, 2, 87, 28, 3, 2, 2, 2, 88, 90, 5, 31, 16, 2, 89, 88, 3, 2, 2, 2, 90, 91, 3, 2, 2, 2, 91, 89, 3, 2, 2, 2, 91, 92, 3, 2, 2, 2, 92, 30, 3, 2, 2, 2, 93, 94, 10, 16, 2, 2, 94, 32, 3, 2, 2, 2, 5, 2, 81, 91, 3, 8, 2, 2] \ No newline at end of file diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.java b/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.java deleted file mode 100644 index c4f28ccbe50..00000000000 --- a/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.java +++ /dev/null @@ -1,135 +0,0 @@ -// Generated from C:\git-repositories\jabref\jabref-multi-module-build\org.jabref.model\src\main\antlr4\org\jabref\search\Search.g4 by ANTLR 4.7.1 -package org.jabref.search; -import org.antlr.v4.runtime.Lexer; -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.Token; -import org.antlr.v4.runtime.TokenStream; -import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.atn.*; -import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; - -@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) -public class SearchLexer extends Lexer { - static { RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION); } - - protected static final DFA[] _decisionToDFA; - protected static final PredictionContextCache _sharedContextCache = - new PredictionContextCache(); - public static final int - WS=1, LPAREN=2, RPAREN=3, EQUAL=4, EEQUAL=5, NEQUAL=6, AND=7, OR=8, CONTAINS=9, - MATCHES=10, NOT=11, STRING=12, QUOTE=13, FIELDTYPE=14; - public static String[] channelNames = { - "DEFAULT_TOKEN_CHANNEL", "HIDDEN" - }; - - public static String[] modeNames = { - "DEFAULT_MODE" - }; - - public static final String[] ruleNames = { - "WS", "LPAREN", "RPAREN", "EQUAL", "EEQUAL", "NEQUAL", "AND", "OR", "CONTAINS", - "MATCHES", "NOT", "STRING", "QUOTE", "FIELDTYPE", "LETTER" - }; - - private static final String[] _LITERAL_NAMES = { - null, null, "'('", "')'", "'='", "'=='", "'!='", null, null, null, null, - null, null, "'\"'" - }; - private static final String[] _SYMBOLIC_NAMES = { - null, "WS", "LPAREN", "RPAREN", "EQUAL", "EEQUAL", "NEQUAL", "AND", "OR", - "CONTAINS", "MATCHES", "NOT", "STRING", "QUOTE", "FIELDTYPE" - }; - public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); - - /** - * @deprecated Use {@link #VOCABULARY} instead. - */ - @Deprecated - public static final String[] tokenNames; - static { - tokenNames = new String[_SYMBOLIC_NAMES.length]; - for (int i = 0; i < tokenNames.length; i++) { - tokenNames[i] = VOCABULARY.getLiteralName(i); - if (tokenNames[i] == null) { - tokenNames[i] = VOCABULARY.getSymbolicName(i); - } - - if (tokenNames[i] == null) { - tokenNames[i] = ""; - } - } - } - - @Override - @Deprecated - public String[] getTokenNames() { - return tokenNames; - } - - @Override - - public Vocabulary getVocabulary() { - return VOCABULARY; - } - - - public SearchLexer(CharStream input) { - super(input); - _interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache); - } - - @Override - public String getGrammarFileName() { return "Search.g4"; } - - @Override - public String[] getRuleNames() { return ruleNames; } - - @Override - public String getSerializedATN() { return _serializedATN; } - - @Override - public String[] getChannelNames() { return channelNames; } - - @Override - public String[] getModeNames() { return modeNames; } - - @Override - public ATN getATN() { return _ATN; } - - public static final String _serializedATN = - "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\20_\b\1\4\2\t\2\4"+ - "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+ - "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\3\2\3\2\3\2\3\2\3\3"+ - "\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\6\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\t\3\t\3"+ - "\t\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3"+ - "\13\3\13\3\f\3\f\3\f\3\f\3\r\3\r\7\rP\n\r\f\r\16\rS\13\r\3\r\3\r\3\16"+ - "\3\16\3\17\6\17Z\n\17\r\17\16\17[\3\20\3\20\2\2\21\3\3\5\4\7\5\t\6\13"+ - "\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\2\3\2\21\4\2\13"+ - "\13\"\"\4\2CCcc\4\2PPpp\4\2FFff\4\2QQqq\4\2TTtt\4\2EEee\4\2VVvv\4\2KK"+ - "kk\4\2UUuu\4\2OOoo\4\2JJjj\4\2GGgg\3\2$$\6\2\13\13\"$*+??\2_\2\3\3\2\2"+ - "\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3"+ - "\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2"+ - "\2\2\33\3\2\2\2\2\35\3\2\2\2\3!\3\2\2\2\5%\3\2\2\2\7\'\3\2\2\2\t)\3\2"+ - "\2\2\13+\3\2\2\2\r.\3\2\2\2\17\61\3\2\2\2\21\65\3\2\2\2\238\3\2\2\2\25"+ - "A\3\2\2\2\27I\3\2\2\2\31M\3\2\2\2\33V\3\2\2\2\35Y\3\2\2\2\37]\3\2\2\2"+ - "!\"\t\2\2\2\"#\3\2\2\2#$\b\2\2\2$\4\3\2\2\2%&\7*\2\2&\6\3\2\2\2\'(\7+"+ - "\2\2(\b\3\2\2\2)*\7?\2\2*\n\3\2\2\2+,\7?\2\2,-\7?\2\2-\f\3\2\2\2./\7#"+ - "\2\2/\60\7?\2\2\60\16\3\2\2\2\61\62\t\3\2\2\62\63\t\4\2\2\63\64\t\5\2"+ - "\2\64\20\3\2\2\2\65\66\t\6\2\2\66\67\t\7\2\2\67\22\3\2\2\289\t\b\2\29"+ - ":\t\6\2\2:;\t\4\2\2;<\t\t\2\2<=\t\3\2\2=>\t\n\2\2>?\t\4\2\2?@\t\13\2\2"+ - "@\24\3\2\2\2AB\t\f\2\2BC\t\3\2\2CD\t\t\2\2DE\t\b\2\2EF\t\r\2\2FG\t\16"+ - "\2\2GH\t\13\2\2H\26\3\2\2\2IJ\t\4\2\2JK\t\6\2\2KL\t\t\2\2L\30\3\2\2\2"+ - "MQ\5\33\16\2NP\n\17\2\2ON\3\2\2\2PS\3\2\2\2QO\3\2\2\2QR\3\2\2\2RT\3\2"+ - "\2\2SQ\3\2\2\2TU\5\33\16\2U\32\3\2\2\2VW\7$\2\2W\34\3\2\2\2XZ\5\37\20"+ - "\2YX\3\2\2\2Z[\3\2\2\2[Y\3\2\2\2[\\\3\2\2\2\\\36\3\2\2\2]^\n\20\2\2^ "+ - "\3\2\2\2\5\2Q[\3\b\2\2"; - public static final ATN _ATN = - new ATNDeserializer().deserialize(_serializedATN.toCharArray()); - static { - _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()]; - for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) { - _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i); - } - } -} \ No newline at end of file diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.tokens b/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.tokens deleted file mode 100644 index bbfab1f6ca4..00000000000 --- a/org.jabref.model/src/main/gen/org/jabref/search/SearchLexer.tokens +++ /dev/null @@ -1,20 +0,0 @@ -WS=1 -LPAREN=2 -RPAREN=3 -EQUAL=4 -EEQUAL=5 -NEQUAL=6 -AND=7 -OR=8 -CONTAINS=9 -MATCHES=10 -NOT=11 -STRING=12 -QUOTE=13 -FIELDTYPE=14 -'('=2 -')'=3 -'='=4 -'=='=5 -'!='=6 -'"'=13 diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchParser.java b/org.jabref.model/src/main/gen/org/jabref/search/SearchParser.java deleted file mode 100644 index 55bdb28e30b..00000000000 --- a/org.jabref.model/src/main/gen/org/jabref/search/SearchParser.java +++ /dev/null @@ -1,450 +0,0 @@ -// Generated from C:\git-repositories\jabref\jabref-multi-module-build\org.jabref.model\src\main\antlr4\org\jabref\search\Search.g4 by ANTLR 4.7.1 -package org.jabref.search; -import org.antlr.v4.runtime.atn.*; -import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.misc.*; -import org.antlr.v4.runtime.tree.*; -import java.util.List; -import java.util.Iterator; -import java.util.ArrayList; - -@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) -public class SearchParser extends Parser { - static { RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION); } - - protected static final DFA[] _decisionToDFA; - protected static final PredictionContextCache _sharedContextCache = - new PredictionContextCache(); - public static final int - WS=1, LPAREN=2, RPAREN=3, EQUAL=4, EEQUAL=5, NEQUAL=6, AND=7, OR=8, CONTAINS=9, - MATCHES=10, NOT=11, STRING=12, QUOTE=13, FIELDTYPE=14; - public static final int - RULE_start = 0, RULE_expression = 1, RULE_comparison = 2, RULE_name = 3; - public static final String[] ruleNames = { - "start", "expression", "comparison", "name" - }; - - private static final String[] _LITERAL_NAMES = { - null, null, "'('", "')'", "'='", "'=='", "'!='", null, null, null, null, - null, null, "'\"'" - }; - private static final String[] _SYMBOLIC_NAMES = { - null, "WS", "LPAREN", "RPAREN", "EQUAL", "EEQUAL", "NEQUAL", "AND", "OR", - "CONTAINS", "MATCHES", "NOT", "STRING", "QUOTE", "FIELDTYPE" - }; - public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); - - /** - * @deprecated Use {@link #VOCABULARY} instead. - */ - @Deprecated - public static final String[] tokenNames; - static { - tokenNames = new String[_SYMBOLIC_NAMES.length]; - for (int i = 0; i < tokenNames.length; i++) { - tokenNames[i] = VOCABULARY.getLiteralName(i); - if (tokenNames[i] == null) { - tokenNames[i] = VOCABULARY.getSymbolicName(i); - } - - if (tokenNames[i] == null) { - tokenNames[i] = ""; - } - } - } - - @Override - @Deprecated - public String[] getTokenNames() { - return tokenNames; - } - - @Override - - public Vocabulary getVocabulary() { - return VOCABULARY; - } - - @Override - public String getGrammarFileName() { return "Search.g4"; } - - @Override - public String[] getRuleNames() { return ruleNames; } - - @Override - public String getSerializedATN() { return _serializedATN; } - - @Override - public ATN getATN() { return _ATN; } - - public SearchParser(TokenStream input) { - super(input); - _interp = new ParserATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache); - } - public static class StartContext extends ParserRuleContext { - public ExpressionContext expression() { - return getRuleContext(ExpressionContext.class,0); - } - public TerminalNode EOF() { return getToken(SearchParser.EOF, 0); } - public StartContext(ParserRuleContext parent, int invokingState) { - super(parent, invokingState); - } - @Override public int getRuleIndex() { return RULE_start; } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitStart(this); - else return visitor.visitChildren(this); - } - } - - public final StartContext start() throws RecognitionException { - StartContext _localctx = new StartContext(_ctx, getState()); - enterRule(_localctx, 0, RULE_start); - try { - enterOuterAlt(_localctx, 1); - { - setState(8); - expression(0); - setState(9); - match(EOF); - } - } - catch (RecognitionException re) { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally { - exitRule(); - } - return _localctx; - } - - public static class ExpressionContext extends ParserRuleContext { - public ExpressionContext(ParserRuleContext parent, int invokingState) { - super(parent, invokingState); - } - @Override public int getRuleIndex() { return RULE_expression; } - - public ExpressionContext() { } - public void copyFrom(ExpressionContext ctx) { - super.copyFrom(ctx); - } - } - public static class BinaryExpressionContext extends ExpressionContext { - public ExpressionContext left; - public Token operator; - public ExpressionContext right; - public List expression() { - return getRuleContexts(ExpressionContext.class); - } - public ExpressionContext expression(int i) { - return getRuleContext(ExpressionContext.class,i); - } - public TerminalNode AND() { return getToken(SearchParser.AND, 0); } - public TerminalNode OR() { return getToken(SearchParser.OR, 0); } - public BinaryExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitBinaryExpression(this); - else return visitor.visitChildren(this); - } - } - public static class AtomExpressionContext extends ExpressionContext { - public ComparisonContext comparison() { - return getRuleContext(ComparisonContext.class,0); - } - public AtomExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitAtomExpression(this); - else return visitor.visitChildren(this); - } - } - public static class ParenExpressionContext extends ExpressionContext { - public TerminalNode LPAREN() { return getToken(SearchParser.LPAREN, 0); } - public ExpressionContext expression() { - return getRuleContext(ExpressionContext.class,0); - } - public TerminalNode RPAREN() { return getToken(SearchParser.RPAREN, 0); } - public ParenExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitParenExpression(this); - else return visitor.visitChildren(this); - } - } - public static class UnaryExpressionContext extends ExpressionContext { - public TerminalNode NOT() { return getToken(SearchParser.NOT, 0); } - public ExpressionContext expression() { - return getRuleContext(ExpressionContext.class,0); - } - public UnaryExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitUnaryExpression(this); - else return visitor.visitChildren(this); - } - } - - public final ExpressionContext expression() throws RecognitionException { - return expression(0); - } - - private ExpressionContext expression(int _p) throws RecognitionException { - ParserRuleContext _parentctx = _ctx; - int _parentState = getState(); - ExpressionContext _localctx = new ExpressionContext(_ctx, _parentState); - ExpressionContext _prevctx = _localctx; - int _startState = 2; - enterRecursionRule(_localctx, 2, RULE_expression, _p); - int _la; - try { - int _alt; - enterOuterAlt(_localctx, 1); - { - setState(19); - _errHandler.sync(this); - switch (_input.LA(1)) { - case LPAREN: - { - _localctx = new ParenExpressionContext(_localctx); - _ctx = _localctx; - _prevctx = _localctx; - - setState(12); - match(LPAREN); - setState(13); - expression(0); - setState(14); - match(RPAREN); - } - break; - case NOT: - { - _localctx = new UnaryExpressionContext(_localctx); - _ctx = _localctx; - _prevctx = _localctx; - setState(16); - match(NOT); - setState(17); - expression(2); - } - break; - case STRING: - case FIELDTYPE: - { - _localctx = new AtomExpressionContext(_localctx); - _ctx = _localctx; - _prevctx = _localctx; - setState(18); - comparison(); - } - break; - default: - throw new NoViableAltException(this); - } - _ctx.stop = _input.LT(-1); - setState(26); - _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,1,_ctx); - while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { - if ( _alt==1 ) { - if ( _parseListeners!=null ) triggerExitRuleEvent(); - _prevctx = _localctx; - { - { - _localctx = new BinaryExpressionContext(new ExpressionContext(_parentctx, _parentState)); - ((BinaryExpressionContext)_localctx).left = _prevctx; - pushNewRecursionContext(_localctx, _startState, RULE_expression); - setState(21); - if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)"); - setState(22); - ((BinaryExpressionContext)_localctx).operator = _input.LT(1); - _la = _input.LA(1); - if ( !(_la==AND || _la==OR) ) { - ((BinaryExpressionContext)_localctx).operator = (Token)_errHandler.recoverInline(this); - } - else { - if ( _input.LA(1)==Token.EOF ) matchedEOF = true; - _errHandler.reportMatch(this); - consume(); - } - setState(23); - ((BinaryExpressionContext)_localctx).right = expression(4); - } - } - } - setState(28); - _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,1,_ctx); - } - } - } - catch (RecognitionException re) { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally { - unrollRecursionContexts(_parentctx); - } - return _localctx; - } - - public static class ComparisonContext extends ParserRuleContext { - public NameContext left; - public Token operator; - public NameContext right; - public List name() { - return getRuleContexts(NameContext.class); - } - public NameContext name(int i) { - return getRuleContext(NameContext.class,i); - } - public TerminalNode CONTAINS() { return getToken(SearchParser.CONTAINS, 0); } - public TerminalNode MATCHES() { return getToken(SearchParser.MATCHES, 0); } - public TerminalNode EQUAL() { return getToken(SearchParser.EQUAL, 0); } - public TerminalNode EEQUAL() { return getToken(SearchParser.EEQUAL, 0); } - public TerminalNode NEQUAL() { return getToken(SearchParser.NEQUAL, 0); } - public ComparisonContext(ParserRuleContext parent, int invokingState) { - super(parent, invokingState); - } - @Override public int getRuleIndex() { return RULE_comparison; } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitComparison(this); - else return visitor.visitChildren(this); - } - } - - public final ComparisonContext comparison() throws RecognitionException { - ComparisonContext _localctx = new ComparisonContext(_ctx, getState()); - enterRule(_localctx, 4, RULE_comparison); - int _la; - try { - setState(34); - _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,2,_ctx) ) { - case 1: - enterOuterAlt(_localctx, 1); - { - setState(29); - ((ComparisonContext)_localctx).left = name(); - setState(30); - ((ComparisonContext)_localctx).operator = _input.LT(1); - _la = _input.LA(1); - if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << EQUAL) | (1L << EEQUAL) | (1L << NEQUAL) | (1L << CONTAINS) | (1L << MATCHES))) != 0)) ) { - ((ComparisonContext)_localctx).operator = (Token)_errHandler.recoverInline(this); - } - else { - if ( _input.LA(1)==Token.EOF ) matchedEOF = true; - _errHandler.reportMatch(this); - consume(); - } - setState(31); - ((ComparisonContext)_localctx).right = name(); - } - break; - case 2: - enterOuterAlt(_localctx, 2); - { - setState(33); - ((ComparisonContext)_localctx).right = name(); - } - break; - } - } - catch (RecognitionException re) { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally { - exitRule(); - } - return _localctx; - } - - public static class NameContext extends ParserRuleContext { - public TerminalNode STRING() { return getToken(SearchParser.STRING, 0); } - public TerminalNode FIELDTYPE() { return getToken(SearchParser.FIELDTYPE, 0); } - public NameContext(ParserRuleContext parent, int invokingState) { - super(parent, invokingState); - } - @Override public int getRuleIndex() { return RULE_name; } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof SearchVisitor ) return ((SearchVisitor)visitor).visitName(this); - else return visitor.visitChildren(this); - } - } - - public final NameContext name() throws RecognitionException { - NameContext _localctx = new NameContext(_ctx, getState()); - enterRule(_localctx, 6, RULE_name); - int _la; - try { - enterOuterAlt(_localctx, 1); - { - setState(36); - _la = _input.LA(1); - if ( !(_la==STRING || _la==FIELDTYPE) ) { - _errHandler.recoverInline(this); - } - else { - if ( _input.LA(1)==Token.EOF ) matchedEOF = true; - _errHandler.reportMatch(this); - consume(); - } - } - } - catch (RecognitionException re) { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally { - exitRule(); - } - return _localctx; - } - - public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) { - switch (ruleIndex) { - case 1: - return expression_sempred((ExpressionContext)_localctx, predIndex); - } - return true; - } - private boolean expression_sempred(ExpressionContext _localctx, int predIndex) { - switch (predIndex) { - case 0: - return precpred(_ctx, 3); - } - return true; - } - - public static final String _serializedATN = - "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3\20)\4\2\t\2\4\3\t"+ - "\3\4\4\t\4\4\5\t\5\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\5\3\26"+ - "\n\3\3\3\3\3\3\3\7\3\33\n\3\f\3\16\3\36\13\3\3\4\3\4\3\4\3\4\3\4\5\4%"+ - "\n\4\3\5\3\5\3\5\2\3\4\6\2\4\6\b\2\5\3\2\t\n\4\2\6\b\13\f\4\2\16\16\20"+ - "\20\2(\2\n\3\2\2\2\4\25\3\2\2\2\6$\3\2\2\2\b&\3\2\2\2\n\13\5\4\3\2\13"+ - "\f\7\2\2\3\f\3\3\2\2\2\r\16\b\3\1\2\16\17\7\4\2\2\17\20\5\4\3\2\20\21"+ - "\7\5\2\2\21\26\3\2\2\2\22\23\7\r\2\2\23\26\5\4\3\4\24\26\5\6\4\2\25\r"+ - "\3\2\2\2\25\22\3\2\2\2\25\24\3\2\2\2\26\34\3\2\2\2\27\30\f\5\2\2\30\31"+ - "\t\2\2\2\31\33\5\4\3\6\32\27\3\2\2\2\33\36\3\2\2\2\34\32\3\2\2\2\34\35"+ - "\3\2\2\2\35\5\3\2\2\2\36\34\3\2\2\2\37 \5\b\5\2 !\t\3\2\2!\"\5\b\5\2\""+ - "%\3\2\2\2#%\5\b\5\2$\37\3\2\2\2$#\3\2\2\2%\7\3\2\2\2&\'\t\4\2\2\'\t\3"+ - "\2\2\2\5\25\34$"; - public static final ATN _ATN = - new ATNDeserializer().deserialize(_serializedATN.toCharArray()); - static { - _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()]; - for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) { - _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i); - } - } -} \ No newline at end of file diff --git a/org.jabref.model/src/main/gen/org/jabref/search/SearchVisitor.java b/org.jabref.model/src/main/gen/org/jabref/search/SearchVisitor.java deleted file mode 100644 index e7b5e052171..00000000000 --- a/org.jabref.model/src/main/gen/org/jabref/search/SearchVisitor.java +++ /dev/null @@ -1,59 +0,0 @@ -// Generated from C:\git-repositories\jabref\jabref-multi-module-build\org.jabref.model\src\main\antlr4\org\jabref\search\Search.g4 by ANTLR 4.7.1 -package org.jabref.search; -import org.antlr.v4.runtime.tree.ParseTreeVisitor; - -/** - * This interface defines a complete generic visitor for a parse tree produced - * by {@link SearchParser}. - * - * @param The return type of the visit operation. Use {@link Void} for - * operations with no return type. - */ -public interface SearchVisitor extends ParseTreeVisitor { - /** - * Visit a parse tree produced by {@link SearchParser#start}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitStart(SearchParser.StartContext ctx); - /** - * Visit a parse tree produced by the {@code binaryExpression} - * labeled alternative in {@link SearchParser#expression}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitBinaryExpression(SearchParser.BinaryExpressionContext ctx); - /** - * Visit a parse tree produced by the {@code atomExpression} - * labeled alternative in {@link SearchParser#expression}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitAtomExpression(SearchParser.AtomExpressionContext ctx); - /** - * Visit a parse tree produced by the {@code parenExpression} - * labeled alternative in {@link SearchParser#expression}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitParenExpression(SearchParser.ParenExpressionContext ctx); - /** - * Visit a parse tree produced by the {@code unaryExpression} - * labeled alternative in {@link SearchParser#expression}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitUnaryExpression(SearchParser.UnaryExpressionContext ctx); - /** - * Visit a parse tree produced by {@link SearchParser#comparison}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitComparison(SearchParser.ComparisonContext ctx); - /** - * Visit a parse tree produced by {@link SearchParser#name}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitName(SearchParser.NameContext ctx); -} \ No newline at end of file From 8fcbf709e0c7766320d674420b60ac543b7e06d3 Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 8 Feb 2018 00:28:09 +0100 Subject: [PATCH 43/79] Move checkstyle --- build.gradle | 22 +++++++++++++++++++--- org.jabref.cli.xmp/build.gradle | 12 ------------ org.jabref.gui/build.gradle | 12 ------------ org.jabref.logic/build.gradle | 12 ------------ org.jabref.model/build.gradle | 12 ------------ 5 files changed, 19 insertions(+), 51 deletions(-) diff --git a/build.gradle b/build.gradle index f1e27e4cb86..31185a4d882 100644 --- a/build.gradle +++ b/build.gradle @@ -17,12 +17,16 @@ plugins { } subprojects { + +} + +allprojects { apply plugin: 'java' apply plugin: 'checkstyle' sourceCompatibility = 1.8 targetCompatibility = 1.8 - + group = "org.jabref" version = "4.2-dev" @@ -33,10 +37,22 @@ subprojects { url 'https://oss.sonatype.org/content/groups/public' } } -} -allprojects { // linter for gradle - documentation: https://github.com/nebula-plugins/gradle-lint-plugin/wiki apply plugin: 'nebula.lint' gradleLint.rules = ['all-dependency'] + + dependencies { + checkstyle 'com.puppycrawl.tools:checkstyle:8.8' + } + + // Code quality tasks + checkstyle { + // do not use other packages for checkstyle, excluding gen(erated) sources + checkstyleMain.source = "src/main/java" + toolVersion = '8.5' + } + + checkstyleMain.shouldRunAfter test + checkstyleTest.shouldRunAfter test } diff --git a/org.jabref.cli.xmp/build.gradle b/org.jabref.cli.xmp/build.gradle index 6cab370f1f5..5e401fcf529 100644 --- a/org.jabref.cli.xmp/build.gradle +++ b/org.jabref.cli.xmp/build.gradle @@ -62,8 +62,6 @@ dependencies { testCompile 'com.tngtech.archunit:archunit:0.5.0' testCompile 'org.xmlunit:xmlunit-core:2.5.1' testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' - - checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } dependencyUpdates { @@ -167,16 +165,6 @@ afterEvaluate { } } -// Code quality tasks -checkstyle { - // do not use other packages for checkstyle, excluding gen(erated) sources - checkstyleMain.source = "src/main/java" - toolVersion = '8.5' -} - -checkstyleMain.shouldRunAfter test -checkstyleTest.shouldRunAfter test - modernizer { // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 8ca603498cc..52f68b1ce3d 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -119,8 +119,6 @@ dependencies { testCompile "org.testfx:testfx-core:4.0.+" testCompile "org.testfx:testfx-junit:4.0.+" testCompile 'com.tngtech.archunit:archunit:0.5.0' - - checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } dependencyUpdates { @@ -305,16 +303,6 @@ afterEvaluate { } } -// Code quality tasks -checkstyle { - // do not use other packages for checkstyle, excluding gen(erated) sources - checkstyleMain.source = "src/main/java" - toolVersion = '8.5' -} - -checkstyleMain.shouldRunAfter test -checkstyleTest.shouldRunAfter test - modernizer { // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index 85a6c0a9585..ba50cd1e965 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -83,8 +83,6 @@ dependencies { testCompile 'org.reflections:reflections:0.9.11' testCompile 'org.xmlunit:xmlunit-core:2.5.1' testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' - - checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } dependencyUpdates { @@ -192,16 +190,6 @@ afterEvaluate { } } -// Code quality tasks -checkstyle { - // do not use other packages for checkstyle, excluding gen(erated) sources - checkstyleMain.source = "src/main/java" - toolVersion = '8.5' -} - -checkstyleMain.shouldRunAfter test -checkstyleTest.shouldRunAfter test - modernizer { // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index 9964159c071..ac0129ca0cb 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -65,8 +65,6 @@ dependencies { testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' testCompile 'org.mockito:mockito-core:2.13.0' - - checkstyle 'com.puppycrawl.tools:checkstyle:8.8' } dependencyUpdates { @@ -221,16 +219,6 @@ afterEvaluate { } } -// Code quality tasks -checkstyle { - // do not use other packages for checkstyle, excluding gen(erated) sources - checkstyleMain.source = "src/main/java" - toolVersion = '8.5' -} - -checkstyleMain.shouldRunAfter test -checkstyleTest.shouldRunAfter test - modernizer { // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer From 4e131521c1c60585d57937901e812cac78ee2474 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 00:28:09 +0100 Subject: [PATCH 44/79] Revert "Fix location of *.css *.fxml --> resource is the key" This reverts commit d7abe228d244d19a920c9f51366fd510b458206b. --- .../src/main/{resources => java}/org/jabref/gui/Main.css | 0 .../org/jabref/gui/documentviewer/DocumentViewer.css | 0 .../org/jabref/gui/documentviewer/DocumentViewer.fxml | 0 .../org/jabref/gui/entryeditor/EntryEditor.css | 0 .../org/jabref/gui/entryeditor/EntryEditor.fxml | 0 .../gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml | 0 .../org/jabref/gui/errorconsole/ErrorConsole.css | 0 .../org/jabref/gui/errorconsole/ErrorConsole.fxml | 0 .../org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml | 0 .../org/jabref/gui/fieldeditors/DateEditor.fxml | 0 .../org/jabref/gui/fieldeditors/IdentifierEditor.fxml | 0 .../org/jabref/gui/fieldeditors/JournalEditor.fxml | 0 .../org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml | 0 .../org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml | 0 .../org/jabref/gui/fieldeditors/OptionEditor.fxml | 0 .../org/jabref/gui/fieldeditors/OwnerEditor.fxml | 0 .../org/jabref/gui/fieldeditors/UrlEditor.fxml | 0 .../main/{resources => java}/org/jabref/gui/groups/GroupTree.css | 0 .../main/{resources => java}/org/jabref/gui/groups/GroupTree.fxml | 0 .../{resources => java}/org/jabref/gui/util/component/Tag.fxml | 0 .../{resources => java}/org/jabref/gui/util/component/TagBar.css | 0 .../{resources => java}/org/jabref/gui/util/component/TagBar.fxml | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/Main.css (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/documentviewer/DocumentViewer.css (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/documentviewer/DocumentViewer.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/entryeditor/EntryEditor.css (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/entryeditor/EntryEditor.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/errorconsole/ErrorConsole.css (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/errorconsole/ErrorConsole.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/fieldeditors/DateEditor.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/fieldeditors/IdentifierEditor.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/fieldeditors/JournalEditor.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/fieldeditors/OptionEditor.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/fieldeditors/OwnerEditor.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/fieldeditors/UrlEditor.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/groups/GroupTree.css (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/groups/GroupTree.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/util/component/Tag.fxml (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/util/component/TagBar.css (100%) rename org.jabref.gui/src/main/{resources => java}/org/jabref/gui/util/component/TagBar.fxml (100%) diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/Main.css b/org.jabref.gui/src/main/java/org/jabref/gui/Main.css similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/Main.css rename to org.jabref.gui/src/main/java/org/jabref/gui/Main.css diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/documentviewer/DocumentViewer.css b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/documentviewer/DocumentViewer.css rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/documentviewer/DocumentViewer.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/documentviewer/DocumentViewer.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/EntryEditor.css b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/EntryEditor.css rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/EntryEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/EntryEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/errorconsole/ErrorConsole.css b/org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/errorconsole/ErrorConsole.css rename to org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/errorconsole/ErrorConsole.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/errorconsole/ErrorConsole.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/DateEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/DateEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/DateEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/DateEditor.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/IdentifierEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/IdentifierEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/JournalEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/JournalEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/OptionEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/OptionEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/OwnerEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/OwnerEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/UrlEditor.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/fieldeditors/UrlEditor.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/groups/GroupTree.css b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.css similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/groups/GroupTree.css rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.css diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/groups/GroupTree.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/groups/GroupTree.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/groups/GroupTree.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/util/component/Tag.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/Tag.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/util/component/Tag.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/Tag.fxml diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/util/component/TagBar.css b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.css similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/util/component/TagBar.css rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.css diff --git a/org.jabref.gui/src/main/resources/org/jabref/gui/util/component/TagBar.fxml b/org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.fxml similarity index 100% rename from org.jabref.gui/src/main/resources/org/jabref/gui/util/component/TagBar.fxml rename to org.jabref.gui/src/main/java/org/jabref/gui/util/component/TagBar.fxml From 49c24c371bce2832e60ed60f7d64b5035dd619f3 Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 8 Feb 2018 00:35:12 +0100 Subject: [PATCH 45/79] Modernizer --- build.gradle | 8 ++++++++ org.jabref.cli.xmp/build.gradle | 7 ------- org.jabref.gui/build.gradle | 7 ------- org.jabref.logic/build.gradle | 7 ------- org.jabref.logic/xjc.gradle | 5 +++++ org.jabref.model/build.gradle | 7 ------- 6 files changed, 13 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 31185a4d882..a5124954f8a 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,8 @@ buildscript { plugins { id 'nebula.lint' version '8.3.1' id 'nebula.info' version '3.6.0' + + id "com.simonharrer.modernizer" version '1.5.0-1' } subprojects { @@ -55,4 +57,10 @@ allprojects { checkstyleMain.shouldRunAfter test checkstyleTest.shouldRunAfter test + + modernizer { + // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. + // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer + failOnViolations = false + } } diff --git a/org.jabref.cli.xmp/build.gradle b/org.jabref.cli.xmp/build.gradle index 5e401fcf529..9797ac1eb0e 100644 --- a/org.jabref.cli.xmp/build.gradle +++ b/org.jabref.cli.xmp/build.gradle @@ -3,7 +3,6 @@ import org.gradle.internal.os.OperatingSystem plugins { id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" - id "com.simonharrer.modernizer" version '1.5.0-1' id 'me.champeau.gradle.jmh' version '0.4.3' id 'net.ltgt.errorprone' version '0.0.13' id 'com.github.ben-manes.versions' version '0.17.0' @@ -165,12 +164,6 @@ afterEvaluate { } } -modernizer { - // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. - // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer - failOnViolations = false -} - /* * Changes project.version to VERSION--snapshot--DATE--GIT_HASH */ diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 52f68b1ce3d..42b2ea31067 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -18,7 +18,6 @@ plugins { id 'com.install4j.gradle' version '7.0.3' id 'com.github.johnrengelman.shadow' version '2.0.2' id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" - id "com.simonharrer.modernizer" version '1.5.0-1' id 'me.champeau.gradle.jmh' version '0.4.3' id 'net.ltgt.errorprone' version '0.0.13' id 'com.github.ben-manes.versions' version '0.17.0' @@ -303,12 +302,6 @@ afterEvaluate { } } -modernizer { - // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. - // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer - failOnViolations = false -} - // Release tasks shadowJar { classifier 'fat' diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index ba50cd1e965..9ab0a23a448 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -3,7 +3,6 @@ import org.gradle.internal.os.OperatingSystem plugins { id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" - id "com.simonharrer.modernizer" version '1.5.0-1' id 'me.champeau.gradle.jmh' version '0.4.3' id 'net.ltgt.errorprone' version '0.0.13' id 'com.github.ben-manes.versions' version '0.17.0' @@ -190,12 +189,6 @@ afterEvaluate { } } -modernizer { - // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. - // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer - failOnViolations = false -} - /* * Changes project.version to VERSION--snapshot--DATE--GIT_HASH */ diff --git a/org.jabref.logic/xjc.gradle b/org.jabref.logic/xjc.gradle index 638a075f617..b482a300d3d 100644 --- a/org.jabref.logic/xjc.gradle +++ b/org.jabref.logic/xjc.gradle @@ -9,6 +9,11 @@ buildscript { } } +repositories { + mavenLocal() + jcenter() +} + dependencies { // Cannot be updated. xjc 'com.sun.xml.bind:jaxb-xjc:2.2.4-1' diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index ac0129ca0cb..db5d8652945 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -3,7 +3,6 @@ import org.gradle.internal.os.OperatingSystem plugins { id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" - id "com.simonharrer.modernizer" version '1.5.0-1' id 'me.champeau.gradle.jmh' version '0.4.3' id 'net.ltgt.errorprone' version '0.0.13' id 'com.github.ben-manes.versions' version '0.17.0' @@ -219,12 +218,6 @@ afterEvaluate { } } -modernizer { - // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. - // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer - failOnViolations = false -} - /* * Changes project.version to VERSION--snapshot--DATE--GIT_HASH */ From 2f937929272ca28f3598742d245fc2b4224043aa Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 00:42:52 +0100 Subject: [PATCH 46/79] Fix source sets --- org.jabref.gui/build.gradle | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 8ca603498cc..3cbaeed7aea 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -39,6 +39,17 @@ mainClassName = "org.jabref.JabRefMain" ext.minRequiredJavaVersion = "1.8.0_144" ext.allowJava9 = false +sourceSets { + main { + java { + srcDirs = ["src/main/java"] + } + resources { + srcDirs = ["src/main/java", "src/main/resources"] + } + } +} + dependencies { compile project(':org.jabref.model') compile project(':org.jabref.logic') From de57cf3dd3b2be5a8c309e1807900bb4ea9a1571 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 00:44:38 +0100 Subject: [PATCH 47/79] Add LinkedFileViewModelTest to classes which may use Globals --- .../java/org/jabref/architecture/TestArchitectureTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.jabref.gui/src/test/java/org/jabref/architecture/TestArchitectureTests.java b/org.jabref.gui/src/test/java/org/jabref/architecture/TestArchitectureTests.java index 04d5b0e8cf0..784eb99bcb2 100644 --- a/org.jabref.gui/src/test/java/org/jabref/architecture/TestArchitectureTests.java +++ b/org.jabref.gui/src/test/java/org/jabref/architecture/TestArchitectureTests.java @@ -28,6 +28,7 @@ public class TestArchitectureTests { private static final String CLASS_ORG_JABREF_PREFERENCES_MIGRATIONS_TEST = "PreferencesMigrationsTest"; private static final String CLASS_ORG_JABREF_UPDATE_TIMESTAMP_LISTENER_TEST = "UpdateTimestampListenerTest"; private static final String CLASS_ORG_JABREF_ENTRY_EDITOR_TEST = "EntryEditorTest"; + private static final String CLASS_ORG_JABREF_GUI_FIELDLISTEDITORS_LINKEDFILEVIEWMODELTEST = "LinkedFileViewModelTest"; private final String forbiddenPackage; @@ -43,6 +44,7 @@ public TestArchitectureTests(String forbiddenPackage) { exceptions.add(CLASS_ORG_JABREF_PREFERENCES_MIGRATIONS_TEST); exceptions.add(CLASS_ORG_JABREF_UPDATE_TIMESTAMP_LISTENER_TEST); exceptions.add(CLASS_ORG_JABREF_ENTRY_EDITOR_TEST); + exceptions.add(CLASS_ORG_JABREF_GUI_FIELDLISTEDITORS_LINKEDFILEVIEWMODELTEST); } @Parameterized.Parameters(name = "tests independent of {0}?") From 0352c003e46a1d58df960385c0c63b2a4f730e93 Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 8 Feb 2018 00:58:50 +0100 Subject: [PATCH 48/79] Move more stuff --- build.gradle | 47 +++++++++++++++++++++++++++++---- org.jabref.cli.xmp/build.gradle | 46 -------------------------------- org.jabref.gui/build.gradle | 25 ------------------ org.jabref.logic/build.gradle | 45 ------------------------------- org.jabref.model/build.gradle | 46 -------------------------------- 5 files changed, 42 insertions(+), 167 deletions(-) diff --git a/build.gradle b/build.gradle index a5124954f8a..e796e958c32 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import groovy.json.JsonSlurper + buildscript { repositories { mavenLocal() @@ -15,7 +17,9 @@ plugins { id 'nebula.lint' version '8.3.1' id 'nebula.info' version '3.6.0' - id "com.simonharrer.modernizer" version '1.5.0-1' + id 'me.champeau.gradle.jmh' version '0.4.3' + id 'net.ltgt.errorprone' version '0.0.13' + id 'com.github.ben-manes.versions' version '0.17.0' } subprojects { @@ -26,6 +30,12 @@ allprojects { apply plugin: 'java' apply plugin: 'checkstyle' + apply plugin: 'me.champeau.gradle.jmh' + apply plugin: 'com.github.ben-manes.versions' + apply plugin: 'project-report' + apply plugin: 'jacoco' + apply plugin: 'org.junit.platform.gradle.plugin' + sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -58,9 +68,36 @@ allprojects { checkstyleMain.shouldRunAfter test checkstyleTest.shouldRunAfter test - modernizer { - // We have more than 20 issues, which are not fixed yet. Nevertheless, we produce the modernizer output. - // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer - failOnViolations = false + jmh { + warmupIterations = 5 + iterations = 10 + fork = 2 + } + + dependencyUpdates { + outputFormatter = "json" + } + + task checkOutdatedDependencies(dependsOn: dependencyUpdates) { + doLast { + def dependencyReport = new JsonSlurper().parseText(new File("build/dependencyUpdates/report.json").text) + assert dependencyReport.outdated.count == 0: "There are outdated dependencies in build.gradle!\n Run ./gradlew dependencyUpdates to see which" + } + } + + // We have some dependencies which cannot be updated due to various reasons. + dependencyUpdates.resolutionStrategy = { + componentSelection { + withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") + } + } + withModule("org.apache.pdfbox:pdfbox") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") + } + } + } } } diff --git a/org.jabref.cli.xmp/build.gradle b/org.jabref.cli.xmp/build.gradle index 9797ac1eb0e..b4e8653a2b5 100644 --- a/org.jabref.cli.xmp/build.gradle +++ b/org.jabref.cli.xmp/build.gradle @@ -1,18 +1,5 @@ -import groovy.json.JsonSlurper import org.gradle.internal.os.OperatingSystem -plugins { - id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" - id 'me.champeau.gradle.jmh' version '0.4.3' - id 'net.ltgt.errorprone' version '0.0.13' - id 'com.github.ben-manes.versions' version '0.17.0' -} - -apply plugin: 'project-report' -apply plugin: 'jacoco' -apply plugin: 'me.champeau.gradle.jmh' -apply plugin: 'org.junit.platform.gradle.plugin' - dependencies { compile project(':org.jabref.model') compile project(':org.jabref.logic') @@ -63,33 +50,6 @@ dependencies { testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' } -dependencyUpdates { - outputFormatter = "json" -} - -// We have some dependencies which cannot be updated due to various reasons. -dependencyUpdates.resolutionStrategy = { - componentSelection { - withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") - } - } - withModule("org.apache.pdfbox:pdfbox") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") - } - } - } -} - -task checkOutdatedDependencies(dependsOn: dependencyUpdates) { - doLast { - def dependencyReport = new JsonSlurper().parseText(new File("build/dependencyUpdates/report.json").text) - assert dependencyReport.outdated.count == 0: "There are outdated dependencies in build.gradle!\n Run ./gradlew dependencyUpdates to see which" - } -} - compileJava { options.encoding = 'UTF-8' options.compilerArgs << "-Xlint:none" @@ -196,9 +156,3 @@ if (hasProperty('dev')) { project.version += "--snapshot--" + infoString } - -jmh { - warmupIterations = 5 - iterations = 10 - fork = 2 -} diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 42b2ea31067..22eae240bd4 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -1,4 +1,3 @@ -import groovy.json.JsonSlurper import org.gradle.internal.os.OperatingSystem buildscript { @@ -18,17 +17,10 @@ plugins { id 'com.install4j.gradle' version '7.0.3' id 'com.github.johnrengelman.shadow' version '2.0.2' id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" - id 'me.champeau.gradle.jmh' version '0.4.3' - id 'net.ltgt.errorprone' version '0.0.13' - id 'com.github.ben-manes.versions' version '0.17.0' } apply plugin: 'application' -apply plugin: 'project-report' -apply plugin: 'jacoco' apply plugin: 'install4j' -apply plugin: 'me.champeau.gradle.jmh' -apply plugin: 'org.junit.platform.gradle.plugin' project.ext.threeDotVersion = "4.1.0.1" project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j6' : 'install4j6') @@ -120,10 +112,6 @@ dependencies { testCompile 'com.tngtech.archunit:archunit:0.5.0' } -dependencyUpdates { - outputFormatter = "json" -} - // We have some dependencies which cannot be updated due to various reasons. dependencyUpdates.resolutionStrategy = { componentSelection { @@ -176,13 +164,6 @@ dependencyUpdates.resolutionStrategy = { } } -task checkOutdatedDependencies(dependsOn: dependencyUpdates) { - doLast { - def dependencyReport = new JsonSlurper().parseText(new File("build/dependencyUpdates/report.json").text) - assert dependencyReport.outdated.count == 0: "There are outdated dependencies in build.gradle!\n Run ./gradlew dependencyUpdates to see which" - } -} - processResources { filteringCharset = 'UTF-8' @@ -389,9 +370,3 @@ task releaseJar(dependsOn: "shadowJar") { task snapJar(dependsOn: "releaseJar", type: Delete) { delete fileTree(dir: "$buildDir/releases/", exclude: "JabRef-${project.version}.jar") } - -jmh { - warmupIterations = 5 - iterations = 10 - fork = 2 -} diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index 9ab0a23a448..ede8f81804d 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -1,17 +1,5 @@ -import groovy.json.JsonSlurper import org.gradle.internal.os.OperatingSystem -plugins { - id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" - id 'me.champeau.gradle.jmh' version '0.4.3' - id 'net.ltgt.errorprone' version '0.0.13' - id 'com.github.ben-manes.versions' version '0.17.0' -} - -apply plugin: 'project-report' -apply plugin: 'jacoco' -apply plugin: 'me.champeau.gradle.jmh' -apply plugin: 'org.junit.platform.gradle.plugin' apply from: 'xjc.gradle' sourceSets { @@ -84,33 +72,6 @@ dependencies { testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' } -dependencyUpdates { - outputFormatter = "json" -} - -// We have some dependencies which cannot be updated due to various reasons. -dependencyUpdates.resolutionStrategy = { - componentSelection { - withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") - } - } - withModule("org.apache.pdfbox:pdfbox") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") - } - } - } -} - -task checkOutdatedDependencies(dependsOn: dependencyUpdates) { - doLast { - def dependencyReport = new JsonSlurper().parseText(new File("build/dependencyUpdates/report.json").text) - assert dependencyReport.outdated.count == 0: "There are outdated dependencies in build.gradle!\n Run ./gradlew dependencyUpdates to see which" - } -} - clean { delete "src/main/gen" } @@ -221,9 +182,3 @@ if (hasProperty('dev')) { project.version += "--snapshot--" + infoString } - -jmh { - warmupIterations = 5 - iterations = 10 - fork = 2 -} diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index db5d8652945..a0632f45668 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -1,18 +1,5 @@ -import groovy.json.JsonSlurper import org.gradle.internal.os.OperatingSystem -plugins { - id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" - id 'me.champeau.gradle.jmh' version '0.4.3' - id 'net.ltgt.errorprone' version '0.0.13' - id 'com.github.ben-manes.versions' version '0.17.0' -} - -apply plugin: 'project-report' -apply plugin: 'jacoco' -apply plugin: 'me.champeau.gradle.jmh' -apply plugin: 'org.junit.platform.gradle.plugin' - sourceSets { main { java { @@ -66,33 +53,6 @@ dependencies { testCompile 'org.mockito:mockito-core:2.13.0' } -dependencyUpdates { - outputFormatter = "json" -} - -// We have some dependencies which cannot be updated due to various reasons. -dependencyUpdates.resolutionStrategy = { - componentSelection { - withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") - } - } - withModule("org.apache.pdfbox:pdfbox") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") - } - } - } -} - -task checkOutdatedDependencies(dependsOn: dependencyUpdates) { - doLast { - def dependencyReport = new JsonSlurper().parseText(new File("build/dependencyUpdates/report.json").text) - assert dependencyReport.outdated.count == 0: "There are outdated dependencies in build.gradle!\n Run ./gradlew dependencyUpdates to see which" - } -} - clean { delete "src/main/gen" } @@ -250,9 +210,3 @@ if (hasProperty('dev')) { project.version += "--snapshot--" + infoString } - -jmh { - warmupIterations = 5 - iterations = 10 - fork = 2 -} From f2f2f7a72eeee18c5689d06853c9c53f03806461 Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 8 Feb 2018 01:03:46 +0100 Subject: [PATCH 49/79] Java compilation --- build.gradle | 17 +++++++++++++++++ org.jabref.cli.xmp/build.gradle | 17 ----------------- org.jabref.gui/build.gradle | 17 ----------------- org.jabref.logic/build.gradle | 17 ----------------- org.jabref.model/build.gradle | 16 ---------------- 5 files changed, 17 insertions(+), 67 deletions(-) diff --git a/build.gradle b/build.gradle index e796e958c32..5f746c02f1a 100644 --- a/build.gradle +++ b/build.gradle @@ -100,4 +100,21 @@ allprojects { } } } + + compileJava { + options.encoding = 'UTF-8' + options.compilerArgs << "-Xlint:none" + } + + compileTestJava { + options.encoding = 'UTF-8' + } + + javadoc { + options { + encoding = 'UTF-8' + version = true + author = true + } + } } diff --git a/org.jabref.cli.xmp/build.gradle b/org.jabref.cli.xmp/build.gradle index b4e8653a2b5..1e84d59f25e 100644 --- a/org.jabref.cli.xmp/build.gradle +++ b/org.jabref.cli.xmp/build.gradle @@ -50,23 +50,6 @@ dependencies { testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' } -compileJava { - options.encoding = 'UTF-8' - options.compilerArgs << "-Xlint:none" -} - -compileTestJava { - options.encoding = 'UTF-8' -} - -javadoc { - options { - encoding = 'UTF-8' - version = true - author = true - } -} - // Test tasks junitPlatform { logManager 'org.apache.logging.log4j.jul.LogManager' diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 22eae240bd4..606b9123c0c 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -185,23 +185,6 @@ processResources { } } -compileJava { - options.encoding = 'UTF-8' - options.compilerArgs << "-Xlint:none" -} - -compileTestJava { - options.encoding = 'UTF-8' -} - -javadoc { - options { - encoding = 'UTF-8' - version = true - author = true - } -} - // Test tasks junitPlatform { filters { diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index ede8f81804d..3225dcd5b13 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -76,23 +76,6 @@ clean { delete "src/main/gen" } -compileJava { - options.encoding = 'UTF-8' - options.compilerArgs << "-Xlint:none" -} - -compileTestJava { - options.encoding = 'UTF-8' -} - -javadoc { - options { - encoding = 'UTF-8' - version = true - author = true - } -} - // Test tasks junitPlatform { logManager 'org.apache.logging.log4j.jul.LogManager' diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index a0632f45668..877fb1ecbb5 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -103,24 +103,8 @@ task generateSearchGrammarSource(type: JavaExec) { args = ["-o", destinationDir, "-visitor", "-no-listener", "-package", "org.jabref.search", antlrSource] } -compileJava { - options.encoding = 'UTF-8' - options.compilerArgs << "-Xlint:none" -} compileJava.dependsOn "generateSource" -compileTestJava { - options.encoding = 'UTF-8' -} - -javadoc { - options { - encoding = 'UTF-8' - version = true - author = true - } -} - // Test tasks junitPlatform { logManager 'org.apache.logging.log4j.jul.LogManager' From e738086078b8b7892a23301574ac70c7f0fbccbe Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 8 Feb 2018 01:08:33 +0100 Subject: [PATCH 50/79] Dev replacements --- build.gradle | 33 +++++++++++++++++++++++++++++++++ org.jabref.cli.xmp/build.gradle | 33 --------------------------------- org.jabref.gui/build.gradle | 33 --------------------------------- org.jabref.logic/build.gradle | 33 --------------------------------- org.jabref.model/build.gradle | 33 --------------------------------- 5 files changed, 33 insertions(+), 132 deletions(-) diff --git a/build.gradle b/build.gradle index 5f746c02f1a..67ceb0a972e 100644 --- a/build.gradle +++ b/build.gradle @@ -118,3 +118,36 @@ allprojects { } } } + +/* + * Changes project.version to VERSION--snapshot--DATE--GIT_HASH + */ +if (hasProperty('dev')) { + String command = "git log --pretty=format:%cd--%h -n 1 --date=short" + String commitInfo = "" + if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { + commitInfo = "cmd /c $command".execute().in.text + } else { + commitInfo = command.execute().in.text + } + + // determine branch + command = "git symbolic-ref -q --short HEAD" + String branchName = "" + if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { + branchName = "cmd /c $command".execute().in.text + } else { + branchName = command.execute().in.text + } + // A newline is returned. Remove it. (trim()) + // In the context of github, the branch name could be something like "pull/277" + // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" + // http://stackoverflow.com/a/15075907/873282 describes the used pattern. + branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") + + // hack string + // first the date (%cd), then the branch name, and finally the commit id (%h) + String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) + + project.version += "--snapshot--" + infoString +} diff --git a/org.jabref.cli.xmp/build.gradle b/org.jabref.cli.xmp/build.gradle index 1e84d59f25e..29ae5c9a583 100644 --- a/org.jabref.cli.xmp/build.gradle +++ b/org.jabref.cli.xmp/build.gradle @@ -106,36 +106,3 @@ afterEvaluate { } } } - -/* - * Changes project.version to VERSION--snapshot--DATE--GIT_HASH - */ -if (hasProperty('dev')) { - String command = "git log --pretty=format:%cd--%h -n 1 --date=short" - String commitInfo = "" - if (OperatingSystem.current().isWindows()) { - commitInfo = "cmd /c $command".execute().in.text - } else { - commitInfo = command.execute().in.text - } - - // determine branch - command = "git symbolic-ref -q --short HEAD" - String branchName = "" - if (OperatingSystem.current().isWindows()) { - branchName = "cmd /c $command".execute().in.text - } else { - branchName = command.execute().in.text - } - // A newline is returned. Remove it. (trim()) - // In the context of github, the branch name could be something like "pull/277" - // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" - // http://stackoverflow.com/a/15075907/873282 describes the used pattern. - branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") - - // hack string - // first the date (%cd), then the branch name, and finally the commit id (%h) - String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) - - project.version += "--snapshot--" + infoString -} diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 2b0ff7fe75f..44227985da4 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -282,39 +282,6 @@ shadowJar { classifier 'fat' } -/* - * Changes project.version to VERSION--snapshot--DATE--GIT_HASH - */ -if (hasProperty('dev')) { - String command = "git log --pretty=format:%cd--%h -n 1 --date=short" - String commitInfo = "" - if (OperatingSystem.current().isWindows()) { - commitInfo = "cmd /c $command".execute().in.text - } else { - commitInfo = command.execute().in.text - } - - // determine branch - command = "git symbolic-ref -q --short HEAD" - String branchName = "" - if (OperatingSystem.current().isWindows()) { - branchName = "cmd /c $command".execute().in.text - } else { - branchName = command.execute().in.text - } - // A newline is returned. Remove it. (trim()) - // In the context of github, the branch name could be something like "pull/277" - // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" - // http://stackoverflow.com/a/15075907/873282 describes the used pattern. - branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") - - // hack string - // first the date (%cd), then the branch name, and finally the commit id (%h) - String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) - - project.version += "--snapshot--" + infoString -} - install4j { installDir = file(project.ext.install4jDir) } diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index 3225dcd5b13..c86c6e196bb 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -132,36 +132,3 @@ afterEvaluate { } } } - -/* - * Changes project.version to VERSION--snapshot--DATE--GIT_HASH - */ -if (hasProperty('dev')) { - String command = "git log --pretty=format:%cd--%h -n 1 --date=short" - String commitInfo = "" - if (OperatingSystem.current().isWindows()) { - commitInfo = "cmd /c $command".execute().in.text - } else { - commitInfo = command.execute().in.text - } - - // determine branch - command = "git symbolic-ref -q --short HEAD" - String branchName = "" - if (OperatingSystem.current().isWindows()) { - branchName = "cmd /c $command".execute().in.text - } else { - branchName = command.execute().in.text - } - // A newline is returned. Remove it. (trim()) - // In the context of github, the branch name could be something like "pull/277" - // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" - // http://stackoverflow.com/a/15075907/873282 describes the used pattern. - branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") - - // hack string - // first the date (%cd), then the branch name, and finally the commit id (%h) - String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) - - project.version += "--snapshot--" + infoString -} diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index 877fb1ecbb5..7f2acd6700b 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -161,36 +161,3 @@ afterEvaluate { } } } - -/* - * Changes project.version to VERSION--snapshot--DATE--GIT_HASH - */ -if (hasProperty('dev')) { - String command = "git log --pretty=format:%cd--%h -n 1 --date=short" - String commitInfo = "" - if (OperatingSystem.current().isWindows()) { - commitInfo = "cmd /c $command".execute().in.text - } else { - commitInfo = command.execute().in.text - } - - // determine branch - command = "git symbolic-ref -q --short HEAD" - String branchName = "" - if (OperatingSystem.current().isWindows()) { - branchName = "cmd /c $command".execute().in.text - } else { - branchName = command.execute().in.text - } - // A newline is returned. Remove it. (trim()) - // In the context of github, the branch name could be something like "pull/277" - // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" - // http://stackoverflow.com/a/15075907/873282 describes the used pattern. - branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") - - // hack string - // first the date (%cd), then the branch name, and finally the commit id (%h) - String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) - - project.version += "--snapshot--" + infoString -} From fe6e2c5b42d35c678025bd25d83ceace679afe53 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 01:08:49 +0100 Subject: [PATCH 51/79] Revert "Add LinkedFileViewModelTest to classes which may use Globals" This reverts commit de57cf3dd3b2be5a8c309e1807900bb4ea9a1571. --- .../java/org/jabref/architecture/TestArchitectureTests.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/org.jabref.gui/src/test/java/org/jabref/architecture/TestArchitectureTests.java b/org.jabref.gui/src/test/java/org/jabref/architecture/TestArchitectureTests.java index 784eb99bcb2..04d5b0e8cf0 100644 --- a/org.jabref.gui/src/test/java/org/jabref/architecture/TestArchitectureTests.java +++ b/org.jabref.gui/src/test/java/org/jabref/architecture/TestArchitectureTests.java @@ -28,7 +28,6 @@ public class TestArchitectureTests { private static final String CLASS_ORG_JABREF_PREFERENCES_MIGRATIONS_TEST = "PreferencesMigrationsTest"; private static final String CLASS_ORG_JABREF_UPDATE_TIMESTAMP_LISTENER_TEST = "UpdateTimestampListenerTest"; private static final String CLASS_ORG_JABREF_ENTRY_EDITOR_TEST = "EntryEditorTest"; - private static final String CLASS_ORG_JABREF_GUI_FIELDLISTEDITORS_LINKEDFILEVIEWMODELTEST = "LinkedFileViewModelTest"; private final String forbiddenPackage; @@ -44,7 +43,6 @@ public TestArchitectureTests(String forbiddenPackage) { exceptions.add(CLASS_ORG_JABREF_PREFERENCES_MIGRATIONS_TEST); exceptions.add(CLASS_ORG_JABREF_UPDATE_TIMESTAMP_LISTENER_TEST); exceptions.add(CLASS_ORG_JABREF_ENTRY_EDITOR_TEST); - exceptions.add(CLASS_ORG_JABREF_GUI_FIELDLISTEDITORS_LINKEDFILEVIEWMODELTEST); } @Parameterized.Parameters(name = "tests independent of {0}?") From 261575684c6c78eed6260c0b62921877efe26f55 Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 8 Feb 2018 01:11:42 +0100 Subject: [PATCH 52/79] Unused imports --- org.jabref.cli.xmp/build.gradle | 2 -- org.jabref.logic/build.gradle | 2 -- org.jabref.model/build.gradle | 2 -- 3 files changed, 6 deletions(-) diff --git a/org.jabref.cli.xmp/build.gradle b/org.jabref.cli.xmp/build.gradle index 29ae5c9a583..19a79cbbe0f 100644 --- a/org.jabref.cli.xmp/build.gradle +++ b/org.jabref.cli.xmp/build.gradle @@ -1,5 +1,3 @@ -import org.gradle.internal.os.OperatingSystem - dependencies { compile project(':org.jabref.model') compile project(':org.jabref.logic') diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index c86c6e196bb..2bc9b41f766 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -1,5 +1,3 @@ -import org.gradle.internal.os.OperatingSystem - apply from: 'xjc.gradle' sourceSets { diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index 7f2acd6700b..6bf5d4b83dd 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -1,5 +1,3 @@ -import org.gradle.internal.os.OperatingSystem - sourceSets { main { java { From a933d52cd4023db15344da49012cc077e33d5c63 Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 8 Feb 2018 01:20:45 +0100 Subject: [PATCH 53/79] XMP dependencies --- org.jabref.cli.xmp/build.gradle | 43 --------------------------------- 1 file changed, 43 deletions(-) diff --git a/org.jabref.cli.xmp/build.gradle b/org.jabref.cli.xmp/build.gradle index 19a79cbbe0f..00aea5a9234 100644 --- a/org.jabref.cli.xmp/build.gradle +++ b/org.jabref.cli.xmp/build.gradle @@ -2,50 +2,7 @@ dependencies { compile project(':org.jabref.model') compile project(':org.jabref.logic') - - - // update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517 - runtime 'org.apache.pdfbox:pdfbox:1.8.13' compile 'org.apache.pdfbox:jempbox:1.8.13' - - - - - - - - // >1.8.0-beta is required for java 9 compatibility - runtime 'org.apache.logging.log4j:log4j-api:2.10.0' - runtime 'org.apache.logging.log4j:log4j-core:2.10.0' - runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' - runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' - - // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles - runtime 'org.citationstyles:styles:1.0.1-SNAPSHOT' - runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' - - testCompile 'org.antlr:antlr-runtime:3.5.2' - testCompile 'com.github.tomakehurst:wiremock:2.14.0' - testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' - testCompile 'junit:junit:4.12' - testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' - testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' - testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' - testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.assertj:assertj-core:3.8.0' - testCompile 'org.assertj:assertj-swing:3.8.0' - testCompile 'org.assertj:assertj-swing-junit:3.8.0' - testCompile 'org.hamcrest:hamcrest-core:1.3' - testCompile 'org.mockito:mockito-core:2.13.0' - testCompile 'org.reflections:reflections:0.9.11' - testCompile "org.testfx:testfx-core:4.0.+" - testCompile "org.testfx:testfx-junit:4.0.+" - testCompile 'com.tngtech.archunit:archunit:0.5.0' - testCompile 'org.xmlunit:xmlunit-core:2.5.1' - testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' } // Test tasks From 5d7e766d6f262215900c7e5556190812d286434a Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 8 Feb 2018 01:31:21 +0100 Subject: [PATCH 54/79] XMP build --- org.jabref.cli.xmp/build.gradle | 57 --------------------------------- 1 file changed, 57 deletions(-) diff --git a/org.jabref.cli.xmp/build.gradle b/org.jabref.cli.xmp/build.gradle index 00aea5a9234..46ae020ae37 100644 --- a/org.jabref.cli.xmp/build.gradle +++ b/org.jabref.cli.xmp/build.gradle @@ -4,60 +4,3 @@ dependencies { compile 'org.apache.pdfbox:jempbox:1.8.13' } - -// Test tasks -junitPlatform { - logManager 'org.apache.logging.log4j.jul.LogManager' -} - -// Test result tasks -task copyTestResources(type: Copy) { - from "${projectDir}/src/test/resources" - into "${buildDir}/classes/test" -} -processTestResources.dependsOn copyTestResources - -tasks.withType(Test) { - reports.html.destination = file("${reporting.baseDir}/${name}") - - jacoco { - append = true - } -} - -task jacocoMerge(type: JacocoMerge) { - executionData file("$buildDir/jacoco/junitPlatformTest.exec") - dependsOn junitPlatformTest -} - -jacocoTestReport { - executionData jacocoMerge.destinationFile - dependsOn jacocoMerge - - reports { - xml.enabled = true // coveralls plugin depends on xml format report - html.enabled = true - } -} - -afterEvaluate { - def junitPlatformTest = tasks.junitPlatformTest - - jacoco { - toolVersion = '0.8.0' - applyTo(junitPlatformTest) - } - - task jacocoJunit5TestReport(type: JacocoReport) { - executionData jacocoMerge.destinationFile - dependsOn jacocoMerge - sourceSets sourceSets.main - sourceDirectories = files(sourceSets.main.allSource.srcDirs) - classDirectories = files(sourceSets.main.output) - - reports { - xml.enabled true - html.enabled true - } - } -} From 214625d5e7f5391c30d8c8b5789e3c78a308d254 Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 8 Feb 2018 01:36:34 +0100 Subject: [PATCH 55/79] Move stuff --- build.gradle | 36 +++++++++++++++++++++++++ org.jabref.gui/build.gradle | 52 ------------------------------------- 2 files changed, 36 insertions(+), 52 deletions(-) diff --git a/build.gradle b/build.gradle index 67ceb0a972e..0508cf76c27 100644 --- a/build.gradle +++ b/build.gradle @@ -88,6 +88,36 @@ allprojects { // We have some dependencies which cannot be updated due to various reasons. dependencyUpdates.resolutionStrategy = { componentSelection { + withModule("org.controlsfx:controlsfx") { ComponentSelection selection -> + if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher + selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9") + } + } + withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> + if (selection.candidate.version.equals("1.0.10")) { + selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") + } + } + withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> + if (selection.candidate.version.equals("1.0.10")) { + selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") + } + } + withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> + if (selection.candidate.version.equals("2.0.0-BETA")) { + selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") + } + } + withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> + if (selection.candidate.version.equals("2.0.0-BETA")) { + selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") + } + } + withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection -> + if (selection.candidate.version ==~ /2.*/) { + selection.reject("Cannot be upgraded to version 2") + } + } withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> if (selection.candidate.version ==~ /2.*/) { selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") @@ -98,6 +128,12 @@ allprojects { selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") } } + withModule("mysql:mysql-connector-java") { ComponentSelection selection -> + if (selection.candidate.version ==~ /[6-9].*/) { + selection.reject("http://dev.mysql.com/downloads/connector/j/ lists the version 5.* as last stable version.") + } + } + } } diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 44227985da4..018847af9c4 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -123,58 +123,6 @@ dependencies { testCompile 'com.tngtech.archunit:archunit:0.5.0' } -// We have some dependencies which cannot be updated due to various reasons. -dependencyUpdates.resolutionStrategy = { - componentSelection { - withModule("org.controlsfx:controlsfx") { ComponentSelection selection -> - if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher - selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9") - } - } - withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> - if (selection.candidate.version.equals("1.0.10")) { - selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") - } - } - withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> - if (selection.candidate.version.equals("1.0.10")) { - selection.reject("Version 1.0.10 is broken... waiting for 1.0.11") - } - } - withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection -> - if (selection.candidate.version.equals("2.0.0-BETA")) { - selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") - } - } - withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection -> - if (selection.candidate.version.equals("2.0.0-BETA")) { - selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561") - } - } - withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("Cannot be upgraded to version 2") - } - } - withModule("org.apache.pdfbox:fontbox") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") - } - } - withModule("org.apache.pdfbox:pdfbox") { ComponentSelection selection -> - if (selection.candidate.version ==~ /2.*/) { - selection.reject("update to 2.0.x is not possible - see https://github.com/JabRef/jabref/pull/1096#issuecomment-208857517") - } - } - withModule("mysql:mysql-connector-java") { ComponentSelection selection -> - if (selection.candidate.version ==~ /[6-9].*/) { - selection.reject("http://dev.mysql.com/downloads/connector/j/ lists the version 5.* as last stable version.") - } - } - - } -} - processResources { filteringCharset = 'UTF-8' From e115a9d0ef6d077a929876567ccee7b4d24c2617 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 01:51:17 +0100 Subject: [PATCH 56/79] Fix path in CircleCI upload script --- circle.yml | 2 +- scripts/upload-to-builds.jabref.org.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 3dfc7c5ec42..12de7b17e61 100644 --- a/circle.yml +++ b/circle.yml @@ -46,4 +46,4 @@ deployment: general: artifacts: - - "build/releases" + - "org.jabref.gui/build/releases" diff --git a/scripts/upload-to-builds.jabref.org.sh b/scripts/upload-to-builds.jabref.org.sh index a7297a169f8..f2f30e07427 100755 --- a/scripts/upload-to-builds.jabref.org.sh +++ b/scripts/upload-to-builds.jabref.org.sh @@ -33,7 +33,7 @@ if [ "snapshot" != "$branch" ] ; then fi # only upload JabRef*, not md5sums, updates.xml, etc. -command="${command}mput build/releases/JabRef*\n" +command="${command}mput org.jabref.gui/build/releases/JabRef*\n" # create symlink ...--latest.jar to latest version command="${command}symlink ${jarname} /www/${branch}/JabRef--${branch}--latest.jar\n" From 9ec6cfe79c742271582b406639e546ecd0d67179 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 01:52:29 +0100 Subject: [PATCH 57/79] Remove obsolete scripts (was hosted at https://github.com/jabref/htdocs) --- scripts/htdocs-helper/README.md | 14 - ...nerate-htdocs-help-from-jabref-src-help.pl | 302 ------------------ .../htdocs-helper/validate-htdocs-syntax.pl | 72 ----- 3 files changed, 388 deletions(-) delete mode 100644 scripts/htdocs-helper/README.md delete mode 100644 scripts/htdocs-helper/generate-htdocs-help-from-jabref-src-help.pl delete mode 100644 scripts/htdocs-helper/validate-htdocs-syntax.pl diff --git a/scripts/htdocs-helper/README.md b/scripts/htdocs-helper/README.md deleted file mode 100644 index 11e7df3cb5e..00000000000 --- a/scripts/htdocs-helper/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# JabRef helper tools - -## Helper scripts - -* [generate-htdocs-help-from-jabref-src-help](generate-htdocs-help-from-jabref-src-help) is a script generating the help files in `htdocs` based on the content from `src/main/resources/help` -* [validate-htdocs-syntax.pl](validate-htdocs-syntax.pl) is used for syntax checking of the `htdocs` repository. - -## Repository `htdocs` - -https://github.com/JabRef/htdocs is the git repository for the htdocs of http://jabref.sourceforge.net/. -It is uploaded manually to JabRef. - -`htdocs/images/es.png` and `us.png` are from the "Flag icons - http://www.famfamfam.com". -These icons are public domain, and as such are free for any use (attribution appreciated but not required). diff --git a/scripts/htdocs-helper/generate-htdocs-help-from-jabref-src-help.pl b/scripts/htdocs-helper/generate-htdocs-help-from-jabref-src-help.pl deleted file mode 100644 index aa8dda83f97..00000000000 --- a/scripts/htdocs-helper/generate-htdocs-help-from-jabref-src-help.pl +++ /dev/null @@ -1,302 +0,0 @@ -#!/usr/bin/perl -#requires: perl >= 5.10 - -#generate-htdocs-help-form-jabref-src-help.pl -#(c) 2012 Kolja Brix and Oliver Kopp - -#This scripts converts the help files -#from the source directory of JabRef (HELPDIR_JABREF) -#to help files for the web page (HELPDIR_WEB) - -#Start it from the root directory of your git repository. -# Windows: perl generate-htdocs-help-form-jabref-src-help.pl -#It will overwrite all help files in HELPDIR_WEB -#It will NOT delete files in HELPDIR_WEB which were removed in HELPDIR_JABREF - -#There are NO command line parameters - -#If you have newline issues at the generated files, -#adapt FORCE_WINDOWS_NEWLINES - - -#Error: -#Use of uninitialized value in concatenation (.) or string at generate-htdocs-help-from-jabref-src-help.pl line 174, <$infileH> line 138. -#Reason: -#A new language has been added to HELPDIR_JABREF, where no translation is contained in -#%translation_back_to_contents. Please add the language to there. - -use constant HELPDIR_JABREF => "../src/main/resources/help"; -use constant HELPDIR_WEB => "../../htdocs/help"; - -#0 for normal operationrequired -#1 for cygwin's perl -use constant FORCE_WINDOWS_NEWLINES => 0; - -#translations for "Back to contents" -our %translation_back_to_contents = ( - "da" => "Back to contents", - "de" => "Zurück zum Inhaltsverzeichnis", - "en" => "Back to contents", - "fr" => "Retour au contenu", - "in" => "Kembali ke Daftar Isi", - "ja" => "目次に戻る" -); - - -#build.xml for getting string replacements ${version} and ${year} -use constant BUILDXML => "../build.xml"; - -use warnings; -use strict; - -#enable "given/when" -use feature ":5.10"; - -sub handleDir; -sub handleFile; -sub loadPreferences; - -our $jabref_version; -our $jabref_year; -our $jabref_placeholder_version; -our $jabref_placeholder_year; - -loadPreferences(); - -#Debug call for a single file -#handleFile("../src/main/resources/help/About.html", "../../htdocs/help/About.php", "en"); -#exit; - - -# handle English -handleDir(HELPDIR_JABREF, HELPDIR_WEB, "en"); - -#handle other languages (contained in sub directories) - -my $helpdirJabRef; - -opendir($helpdirJabRef, HELPDIR_JABREF) or die $!; - -my $sourcedir; -my $targetdir; -my $lang; - -while (my $subdir = readdir($helpdirJabRef)) { - $sourcedir = HELPDIR_JABREF . "/$subdir"; - next unless (-d $sourcedir); - next if ($subdir =~ /\.\.?/); - - $targetdir = HELPDIR_WEB . "/$subdir"; - $lang = $subdir; - - handleDir($sourcedir, $targetdir, $lang); -} -close($helpdirJabRef); - -exit 0; - - - -# Parameters: -# sourcedir -# targetdir -# language -sub handleDir { - my $sourcedir = shift; - my $targetdir = shift; - my $lang = shift; - - print("Handling $sourcedir...\n"); - - if (!-d $targetdir) { - mkdir($targetdir); - } - - my $dh; - opendir($dh, $sourcedir) or die $!; - while (my $infilename = readdir($dh)) { - next unless ($infilename =~ /\.html$/); - my $outfilename = $infilename; - $outfilename =~ s/\.html/\.php/g; - my $sourcefilename = $sourcedir . "/" . $infilename; - my $targetfilename = $targetdir . "/" . $outfilename; - handleFile($sourcefilename, $targetfilename, $lang); - } - close($dh); -} - -# -# Parameters: -# infilename: source file (html) -# outfile: target file (php) -# lang: language (ISO-format) -# -sub handleFile { - my $infilename = shift; - my $outfilename = shift; - my $lang = shift; - - my $replace_placeholders = ($infilename =~ /About.html$/); - - #Debug output - #print("handleFile:\n$infilename\n$outfilename\n$lang\n$replace_placeholders\n\n"); - - open(my $infileH, "<", $infilename) or die "cannot open < $infilename: $!"; - my @infile = <$infileH>; - - my @outfile=(); - - # Determine title out of first h1 heading - my $title=""; - my $line; - foreach $line(@infile) { - if ($line =~ /\(.*)\<\/h1\>/) { - $title=$1; - if ($replace_placeholders) { - $title =~ s/$jabref_placeholder_version/$jabref_version/; - $title =~ s/$jabref_placeholder_year/$jabref_year/; - } - # title is found, go to the normal handling - last; - } - } - - #remove html tags from title - #even if is not allowed in h1 elements, JabRef doc uses that - $title =~ s#<(.|\n)*?>##g; - -#Following prefix does not work at sourceforge. -# -#We use php's header statement instead - - #add to the relative path to navigation|footer if help is non-english - my $pathaddition; - if ($lang eq 'en') { - $pathaddition = ""; - } else { - $pathaddition = "../"; - } - - my $navigationlink = $pathaddition . "../navigation.php"; - my $footerlink = $pathaddition . "../footer.php"; - - my $header=< - - - - - $title - - - - -
- - $translation_back_to_contents{$lang} - -HTML - - my $footer=< -
\n\n\n -HTML - - push(@outfile, $header); - - my $status=0; - # 0 out of html - # 1 in html - # 2 within basefont - - foreach $line(@infile) { - #Debug states - #print "$status / $line"; - - if ($status==0 && $line =~ /\/) { - $status=0; - } elsif ($status==1) { - #we may not transfer a "basefont" - if ($line =~ /\/) { - $status = 2; - } - } else { - if ($replace_placeholders) { - $line =~ s/$jabref_placeholder_version/$jabref_version/; - $line =~ s/$jabref_placeholder_year/$jabref_year/; - } - if (!($line =~ /href=\"http:\/\//)) { - #line does NOT contain a href to some http address - #we assume that line is NOT a reference to an external site - #replace "html" extension with "php" extension - #still allow links as "...html#part". - $line =~ s/href=\"([^\"]*)\.html/href=\"$1\.php/g; - } - push(@outfile, $line); - } - } elsif (($status==2) && ($line =~ /\/\>/)) { - #basefont ended, reset to "inhtml" - $status = 1; - } - } - - push(@outfile, $footer); - - open(OUTFILE,">$outfilename"); - - if (FORCE_WINDOWS_NEWLINES) { - foreach my $line (@outfile) { - $line =~ s/\r?\n|\r/\r\n/g; - } - } - - print OUTFILE @outfile; - - close(OUTFILE); - - close($infileH); -} - -#extracts info out of build.xml -# -# -# -# -sub loadPreferences { - open(my $buildXML, "<", BUILDXML) or die "cannot open < " . BUILDXML . ": $!"; - my @buildxml = <$buildXML>; - close($buildXML); - foreach my $line (@buildxml) { - #check for one-line property declaration name / value - if ($line =~ /property name="([^"]*)" value="([^"]*)"/) { - #copy value from value to local variable - #a non-hardcoded version using "eval" would also be possible - #the SLOC count would be equal to the count of the following (easier) given/when construct. - given($1) { - when ("jabref.version") { - $jabref_version = $2; - } - when ("jabref.year") { - $jabref_year = $2; - } - when ("jabref.placeholder.version") { - $jabref_placeholder_version = $2; - } - when ("jabref.placeholder.year") { - $jabref_placeholder_year = $2; - } - } - } - } -} \ No newline at end of file diff --git a/scripts/htdocs-helper/validate-htdocs-syntax.pl b/scripts/htdocs-helper/validate-htdocs-syntax.pl deleted file mode 100644 index 695d0400d08..00000000000 --- a/scripts/htdocs-helper/validate-htdocs-syntax.pl +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/perl - -#validate-htdocs-syntax.pl -#(c) 2012 Oliver Kopp - -#This scripts validates the syntax of all files in the htdocs directory -#using tidy - -#This script requires "tidy". -#It was tested using cygwin's perl and cygwin's tidy. - -#Start it from the root directory of your git repository. -# Windows: perl validate-htdocs-syntax.pl - -#There are NO command line parameters - -#configuration: should there be a prompt after each error? -use constant WAITAFTEREACHERROR => 1; - - -#configuration: directory to check - -#online web site -use constant STARTDIR => "../../htdocs"; - -#single help -#use constant STARTDIR => "../../htdocs/help/ja"; - -#JabRef help -# never validates as no HTML head is used and no DOCTYPE is declared. -#use constant STARTDIR => "../src/main/resources/help/"; - - -use File::Find; -use strict; - -sub wait_for_keypress { - return unless WAITAFTEREACHERROR; - print "Press 'Return' to continue. (Enter \"exit\" to exit the whole process)\n"; - my $input = ; - exit 0 if $input =~ /exit/; -} - -sub verifyFile { - return unless -f; - #my $fullfilename = $File::Find::name; - my $filename = $_; - return unless ($filename =~ /(\.php)|(\.html)$/); - - #Debug output - #print "Checking $File::Find::name\n"; - - system("tidy", "-eq", "-utf8", "$filename"); - - if ($? == -1) { - print ("Failed to execute tidy."); - } elsif ($? & 127) { - printf "child died with signal %d, %s coredump\n", - ($? & 127), ($? & 128) ? 'with' : 'without'; - } elsif ($? != 0) { - #some error occured - - # html/php line offset is 11. I.e., if tidy outputs "276", the line in the .html is "265" - print "Above file was $File::Find::name and has errors\n\n"; - wait_for_keypress; - } -} - -#Debug call -#find(\&verifyFile, ("htdocs/contact.php")); - -find(\&verifyFile, (STARTDIR)); From ac35918ccac36592b1d30da47f1fe15b7a289455 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 02:13:49 +0100 Subject: [PATCH 58/79] Move dev switch to org.jabref.gui --- build.gradle | 37 ------------------------------------- org.jabref.gui/build.gradle | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index 0508cf76c27..80ef6df29a2 100644 --- a/build.gradle +++ b/build.gradle @@ -22,10 +22,6 @@ plugins { id 'com.github.ben-manes.versions' version '0.17.0' } -subprojects { - -} - allprojects { apply plugin: 'java' apply plugin: 'checkstyle' @@ -154,36 +150,3 @@ allprojects { } } } - -/* - * Changes project.version to VERSION--snapshot--DATE--GIT_HASH - */ -if (hasProperty('dev')) { - String command = "git log --pretty=format:%cd--%h -n 1 --date=short" - String commitInfo = "" - if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { - commitInfo = "cmd /c $command".execute().in.text - } else { - commitInfo = command.execute().in.text - } - - // determine branch - command = "git symbolic-ref -q --short HEAD" - String branchName = "" - if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { - branchName = "cmd /c $command".execute().in.text - } else { - branchName = command.execute().in.text - } - // A newline is returned. Remove it. (trim()) - // In the context of github, the branch name could be something like "pull/277" - // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" - // http://stackoverflow.com/a/15075907/873282 describes the used pattern. - branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") - - // hack string - // first the date (%cd), then the branch name, and finally the commit id (%h) - String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) - - project.version += "--snapshot--" + infoString -} diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 018847af9c4..1376cf594aa 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -26,6 +26,41 @@ project.ext.threeDotVersion = "4.1.0.1" project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j6' : 'install4j6') mainClassName = "org.jabref.JabRefMain" +/* + * Changes project.version to VERSION--snapshot--DATE--GIT_HASH + * + * This code has to stay in org.jabref.gui/build.gradle, because it has no effect if contained in /build.gradle. + */ +if (hasProperty('dev')) { + String command = "git log --pretty=format:%cd--%h -n 1 --date=short" + String commitInfo = "" + if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { + commitInfo = "cmd /c $command".execute().in.text + } else { + commitInfo = command.execute().in.text + } + + // determine branch + command = "git symbolic-ref -q --short HEAD" + String branchName = "" + if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { + branchName = "cmd /c $command".execute().in.text + } else { + branchName = command.execute().in.text + } + // A newline is returned. Remove it. (trim()) + // In the context of github, the branch name could be something like "pull/277" + // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" + // http://stackoverflow.com/a/15075907/873282 describes the used pattern. + branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") + + // hack string + // first the date (%cd), then the branch name, and finally the commit id (%h) + String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) + + project.version += "--snapshot--" + infoString +} + // These are the Java version requirements we will check on each start of JabRef ext.minRequiredJavaVersion = "1.8.0_144" ext.allowJava9 = false From 266c7b811e9cc29d7e698146f86d9fc7a48a4f9e Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 02:17:56 +0100 Subject: [PATCH 59/79] Enable build scan --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index 80ef6df29a2..f3fb19a35f7 100644 --- a/build.gradle +++ b/build.gradle @@ -16,12 +16,17 @@ buildscript { plugins { id 'nebula.lint' version '8.3.1' id 'nebula.info' version '3.6.0' + id "com.gradle.build-scan" version "1.11" id 'me.champeau.gradle.jmh' version '0.4.3' id 'net.ltgt.errorprone' version '0.0.13' id 'com.github.ben-manes.versions' version '0.17.0' } +// enable buildscan providing insights to our build (speed, ...) +// see https://gradle.com/build-scans for more information +buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' } + allprojects { apply plugin: 'java' apply plugin: 'checkstyle' From 5d258f8fe1690fa1ca9dd4e9cfd0d96ac58feca3 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 02:23:44 +0100 Subject: [PATCH 60/79] Fix location of binaries --- scripts/upload-to-builds.jabref.org.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upload-to-builds.jabref.org.sh b/scripts/upload-to-builds.jabref.org.sh index f2f30e07427..f2e33a40b9f 100755 --- a/scripts/upload-to-builds.jabref.org.sh +++ b/scripts/upload-to-builds.jabref.org.sh @@ -8,13 +8,13 @@ branch="snapshot" # simple solution to treat first file matching a pattern # hint by http://unix.stackexchange.com/a/156207/18033 -for buildfile in build/releases/*--snapshot--*; do +for buildfile in org.jabref.gui/build/releases/*--snapshot--*; do # the last "--" part is the branch name branch=`echo $buildfile | sed "sX.*--\(.*\)--.*X\1X"` break; done -for buildfile in build/releases/*--snapshot--*.jar; do +for buildfile in org.jabref.gui/build/releases/*--snapshot--*.jar; do # remove build/releases/ from the filename jarname=`echo $buildfile | sed "sXbuild/releases/XX"` break; From 9c54c3c974714b305008139cb07f62ddcd844cad Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 02:27:30 +0100 Subject: [PATCH 61/79] Add missing checkstyle configuration --- .../config/checkstyle/checkstyle.xml | 57 +++++++++++++++++++ .../config/checkstyle/suppressions.xml | 10 ++++ 2 files changed, 67 insertions(+) create mode 100644 org.jabref.logic/config/checkstyle/checkstyle.xml create mode 100644 org.jabref.logic/config/checkstyle/suppressions.xml diff --git a/org.jabref.logic/config/checkstyle/checkstyle.xml b/org.jabref.logic/config/checkstyle/checkstyle.xml new file mode 100644 index 00000000000..20cbcee3f60 --- /dev/null +++ b/org.jabref.logic/config/checkstyle/checkstyle.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.jabref.logic/config/checkstyle/suppressions.xml b/org.jabref.logic/config/checkstyle/suppressions.xml new file mode 100644 index 00000000000..7e853704d9d --- /dev/null +++ b/org.jabref.logic/config/checkstyle/suppressions.xml @@ -0,0 +1,10 @@ + + + + + + + + From e91ebaa00928fd9ca8cb17595ad5b4067c0f6e83 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 02:33:44 +0100 Subject: [PATCH 62/79] Include changes of https://github.com/JabRef/jabref/pull/3659 --- build.gradle | 11 ++++++++++- org.jabref.gui/build.gradle | 5 ++++- org.jabref.logic/build.gradle | 5 ++++- org.jabref.model/build.gradle | 5 ++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index f3fb19a35f7..2b876f46390 100644 --- a/build.gradle +++ b/build.gradle @@ -134,7 +134,16 @@ allprojects { selection.reject("http://dev.mysql.com/downloads/connector/j/ lists the version 5.* as last stable version.") } } - + withModule("org.jacoco.agent") { ComponentSelection selection -> + if (selection.candidate.version.equals("0.8.0")) { + selection.reject("As a native plugin we cannot control the actual version of jacoco. This dependency should be hidden.") + } + } + withModule("org.jacoco.ant") { ComponentSelection selection -> + if (selection.candidate.version.equals("0.8.0")) { + selection.reject("As a native plugin we cannot control the actual version of jacoco. This dependency should be hidden.") + } + } } } diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 1376cf594aa..526c615478d 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -22,6 +22,10 @@ plugins { apply plugin: 'application' apply plugin: 'install4j' +jacoco { + toolVersion = '0.8.0' +} + project.ext.threeDotVersion = "4.1.0.1" project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j6' : 'install4j6') mainClassName = "org.jabref.JabRefMain" @@ -242,7 +246,6 @@ afterEvaluate { def junitPlatformTest = tasks.junitPlatformTest jacoco { - toolVersion = '0.8.0' applyTo(junitPlatformTest) } diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index 2bc9b41f766..923b9373c4f 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -12,6 +12,10 @@ sourceSets { } } +jacoco { + toolVersion = '0.8.0' +} + dependencies { compile project(':org.jabref.model') @@ -113,7 +117,6 @@ afterEvaluate { def junitPlatformTest = tasks.junitPlatformTest jacoco { - toolVersion = '0.8.0' applyTo(junitPlatformTest) } diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index 6bf5d4b83dd..d7549fdceac 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -15,6 +15,10 @@ configurations { antlr4 } +jacoco { + toolVersion = '0.8.0' +} + dependencies { compile 'commons-logging:commons-logging:1.2' compile 'org.apache.commons:commons-lang3:3.6' @@ -142,7 +146,6 @@ afterEvaluate { def junitPlatformTest = tasks.junitPlatformTest jacoco { - toolVersion = '0.8.0' applyTo(junitPlatformTest) } From 3818f101a2f1102ab15e0ba6ac196d94815242f5 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 02:40:29 +0100 Subject: [PATCH 63/79] Remove "modernizer" also from Travis build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 63bf1713ef5..1067eef64f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ env: global: - GRADLE_OPTS=-Dorg.gradle.daemon=false matrix: - - TEST_SUITE=check OPTIONS=modernizer + - TEST_SUITE=check - TEST_SUITE=fetcherTest - TEST_SUITE=databaseTest - TEST_SUITE=guiTest From 8064843bd398d0ae349c3900450752e5ba57939d Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 02:40:44 +0100 Subject: [PATCH 64/79] Load buildscan first --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2b876f46390..a1b6e821f77 100644 --- a/build.gradle +++ b/build.gradle @@ -14,9 +14,10 @@ buildscript { } plugins { + id 'com.gradle.build-scan' version '1.11' + id 'nebula.lint' version '8.3.1' id 'nebula.info' version '3.6.0' - id "com.gradle.build-scan" version "1.11" id 'me.champeau.gradle.jmh' version '0.4.3' id 'net.ltgt.errorprone' version '0.0.13' From 8ebd6045b055e7ea00aef2da5a34a33360fde7b8 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 02:52:13 +0100 Subject: [PATCH 65/79] Fix build. a) dir b) name --- org.jabref.gui/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 526c615478d..f4fb7d2637f 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -303,10 +303,10 @@ task releaseJar(dependsOn: "shadowJar") { description "Creates a Jar release." doLast { copy { - from("$buildDir/libs/JabRef-${project.version}-fat.jar") - into("$buildDir/releases") + from("build/libs/org.jabref.gui-${project.version}-fat.jar") + into("build/releases") rename { String fileName -> - fileName.replace('-fat', '') + fileName.replace('-fat', '').replace('org.jabref.gui', 'JabRef') } } // set executable with read permissions (first true) and for all (false) From 5058b36c851da53699c82566ca4ee00e3e8c91fb Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 03:10:35 +0100 Subject: [PATCH 66/79] Reenable JUnit tests by global dependencies --- build.gradle | 11 +++++++++++ org.jabref.gui/build.gradle | 9 +-------- org.jabref.logic/build.gradle | 10 ---------- org.jabref.model/build.gradle | 7 ------- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index a1b6e821f77..421df790395 100644 --- a/build.gradle +++ b/build.gradle @@ -58,6 +58,17 @@ allprojects { dependencies { checkstyle 'com.puppycrawl.tools:checkstyle:8.8' + + testCompile 'junit:junit:4.12' + testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' + testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' + testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' + testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' + testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' + testCompile 'org.mockito:mockito-core:2.13.0' + testCompile 'org.hamcrest:hamcrest-core:1.3' } // Code quality tasks diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index f4fb7d2637f..e22dd7129d8 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -146,17 +146,10 @@ dependencies { compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' - testCompile 'junit:junit:4.12' - testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' - testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' - testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' - testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' + testCompile 'org.assertj:assertj-core:3.8.0' testCompile 'org.assertj:assertj-swing:3.8.0' testCompile 'org.assertj:assertj-swing-junit:3.8.0' - testCompile 'org.mockito:mockito-core:2.13.0' testCompile "org.testfx:testfx-core:4.0.+" testCompile "org.testfx:testfx-junit:4.0.+" testCompile 'com.tngtech.archunit:archunit:0.5.0' diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index 923b9373c4f..a278d5b7780 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -59,16 +59,6 @@ dependencies { testCompile 'org.antlr:antlr-runtime:3.5.2' testCompile 'com.github.tomakehurst:wiremock:2.14.0' - testCompile 'junit:junit:4.12' - testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' - testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' - testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' - testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.hamcrest:hamcrest-core:1.3' - testCompile 'org.mockito:mockito-core:2.13.0' testCompile 'org.reflections:reflections:0.9.11' testCompile 'org.xmlunit:xmlunit-core:2.5.1' testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index d7549fdceac..97195bcb78f 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -46,13 +46,6 @@ dependencies { runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' compile 'com.github.tomtung:latex2unicode_2.12:0.2.2' - - testCompile 'junit:junit:4.12' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' - testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' - testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' - testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.mockito:mockito-core:2.13.0' } clean { From e4e9e86bc433a3b2b0bc009a4122076228a46b0b Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 15:53:02 +0100 Subject: [PATCH 67/79] Restructure, update Install4J - Release jars are on the top folder - update Install4J - icons now in buildres --- .gitignore | 2 +- build.gradle | 93 ++++++++++++++++++ buildres/jabref.icns | Bin 0 -> 243528 bytes buildres/jabref.ico | Bin 0 -> 121718 bytes circle.yml | 2 +- .../jabref.install4j => jabref.install4j | 12 +-- org.jabref.gui/build.gradle | 92 ----------------- scripts/prepare-install4j.sh | 6 +- scripts/upload-to-builds.jabref.org.sh | 6 +- 9 files changed, 107 insertions(+), 106 deletions(-) create mode 100644 buildres/jabref.icns create mode 100644 buildres/jabref.ico rename org.jabref.gui/jabref.install4j => jabref.install4j (98%) diff --git a/.gitignore b/.gitignore index 9f856998d15..18c92535dea 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ status.md # Install4J -install4j6/ +install4j7/ # Gradle # generated when `gradlew --gui` is called diff --git a/build.gradle b/build.gradle index 421df790395..d93d5ff4649 100644 --- a/build.gradle +++ b/build.gradle @@ -19,11 +19,56 @@ plugins { id 'nebula.lint' version '8.3.1' id 'nebula.info' version '3.6.0' + id 'com.install4j.gradle' version '7.0.4' + id 'me.champeau.gradle.jmh' version '0.4.3' id 'net.ltgt.errorprone' version '0.0.13' id 'com.github.ben-manes.versions' version '0.17.0' } +apply plugin: 'install4j' + +group = "org.jabref" +version = "4.2-dev" +project.ext.threeDotVersion = "4.1.0.1" +project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (org.gradle.internal.os.OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j7' : 'install4j7') + +/* + * Set releaseVersion to VERSION--snapshot--DATE--GIT_HASH + */ +def releaseVersion +if (project.hasProperty('dev')) { + String command = "git log --pretty=format:%cd--%h -n 1 --date=short" + String commitInfo = "" + if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { + commitInfo = "cmd /c $command".execute().in.text + } else { + commitInfo = command.execute().in.text + } + + // determine branch + command = "git symbolic-ref -q --short HEAD" + String branchName = "" + if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { + branchName = "cmd /c $command".execute().in.text + } else { + branchName = command.execute().in.text + } + // A newline is returned. Remove it. (trim()) + // In the context of github, the branch name could be something like "pull/277" + // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" + // http://stackoverflow.com/a/15075907/873282 describes the used pattern. + branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") + + // hack string + // first the date (%cd), then the branch name, and finally the commit id (%h) + String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) + + releaseVersion = project.version + "--snapshot--" + infoString +} else { + releaseVersion = project.version +} + // enable buildscan providing insights to our build (speed, ...) // see https://gradle.com/build-scans for more information buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' } @@ -176,3 +221,51 @@ allprojects { } } } + +install4j { + installDir = file(project.ext.install4jDir) +} + +// has to be defined AFTER 'dev' things to have the correct releaseVersion +task releaseJar(dependsOn: ":org.jabref.gui:shadowJar") { + group = 'JabRef - Release' + description "Creates a Jar release." + doLast { + copy { + from("org.jabref.gui/build/libs/org.jabref.gui-${project.version}-fat.jar") + into("$buildDir/releases") + rename { String fileName -> "JabRef-${releaseVersion}.jar" } + } + // set executable with read permissions (first true) and for all (false) + file("$buildDir/releases/JabRef-${releaseVersion}.jar").setExecutable(true, false) + } +} + +// has to be defined AFTER 'dev' things to have the correct releaseVersion +task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") { + projectFile = file('jabref.install4j') + release = releaseVersion + winKeystorePassword = System.getenv('CERTIFICATE_PW') + macKeystorePassword = System.getenv('CERTIFICATE_PW') + variables = [ + versionFourDots: project.ext.threeDotVersion, + buildFileName : jar.archiveName, + version : releaseVersion + ] + + doLast { + copy { + from "build/install4j" + into "build/releases" + } + } +} + +task release(dependsOn: "media") { + group = 'JabRef - Release' + description 'Creates a release for all target platforms.' +} + +task snapJar(dependsOn: "releaseJar", type: Delete) { + delete fileTree(dir: "$buildDir/releases/", exclude: "JabRef-${releaseVersion}.jar") +} diff --git a/buildres/jabref.icns b/buildres/jabref.icns new file mode 100644 index 0000000000000000000000000000000000000000..2c87ce06a5ccb4d33fe625e763ba0405820f7aa1 GIT binary patch literal 243528 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%0AuH|UKeQf}4(e=ZHU5_g$&NUuaG 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 literal 0 HcmV?d00001 diff --git a/buildres/jabref.ico b/buildres/jabref.ico new file mode 100644 index 0000000000000000000000000000000000000000..52d04280324e4d3ffc339c4dd4891f8c07f06c98 GIT binary patch literal 121718 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 literal 0 HcmV?d00001 diff --git a/circle.yml b/circle.yml index 12de7b17e61..01bacd3e25d 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,7 @@ dependencies: # openssl aes-256-cbc -e -in ./buildres/jabref-cert-2016.p12 -out jabref-cert-2016.p12.enc -k {PASSWORD} #- openssl aes-256-cbc -d -in ./buildres/jabref-cert-2016.p12.enc -out ./buildres/jabref-cert-2016.p12 -k $CERTIFICATE - scripts/prepare-install4j.sh - - cd org.jabref.gui && install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY + - install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY #--win-keystore-password $CERTIFICATE_PW --mac-keystore-password $CERTIFICATE_PW override: # We do this to decrease build time by using CircleCI's cache. See https://discuss.circleci.com/t/effective-caching-for-gradle/540 for a longer motivation. diff --git a/org.jabref.gui/jabref.install4j b/jabref.install4j similarity index 98% rename from org.jabref.gui/jabref.install4j rename to jabref.install4j index 28d3fad052e..6df29d2037c 100644 --- a/org.jabref.gui/jabref.install4j +++ b/jabref.install4j @@ -59,8 +59,8 @@ - - + + @@ -102,7 +102,7 @@ - + @@ -183,7 +183,7 @@ context.setInstallationDirectory(new File(System.getenv("LOCALAPPDATA"), "JabRef")); } else { context.setInstallationDirectory(new File(System.getProperty("user.home"), "JabRef")); - } + } } return true; @@ -608,7 +608,7 @@ return console.askOkCancel(message, true); - ./src/main/resources/icons/jabref.icns + ./icons/jabref.icns @@ -622,7 +622,7 @@ return console.askOkCancel(message, true); - ./src/main/resources/icons/jabref.ico + ./icons/jabref.ico diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index e22dd7129d8..35b1a3e7188 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -1,5 +1,3 @@ -import org.gradle.internal.os.OperatingSystem - buildscript { repositories { mavenLocal() @@ -14,57 +12,18 @@ buildscript { } plugins { - id 'com.install4j.gradle' version '7.0.3' id 'com.github.johnrengelman.shadow' version '2.0.2' id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1" } apply plugin: 'application' -apply plugin: 'install4j' jacoco { toolVersion = '0.8.0' } -project.ext.threeDotVersion = "4.1.0.1" -project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j6' : 'install4j6') mainClassName = "org.jabref.JabRefMain" -/* - * Changes project.version to VERSION--snapshot--DATE--GIT_HASH - * - * This code has to stay in org.jabref.gui/build.gradle, because it has no effect if contained in /build.gradle. - */ -if (hasProperty('dev')) { - String command = "git log --pretty=format:%cd--%h -n 1 --date=short" - String commitInfo = "" - if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { - commitInfo = "cmd /c $command".execute().in.text - } else { - commitInfo = command.execute().in.text - } - - // determine branch - command = "git symbolic-ref -q --short HEAD" - String branchName = "" - if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { - branchName = "cmd /c $command".execute().in.text - } else { - branchName = command.execute().in.text - } - // A newline is returned. Remove it. (trim()) - // In the context of github, the branch name could be something like "pull/277" - // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_" - // http://stackoverflow.com/a/15075907/873282 describes the used pattern. - branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_") - - // hack string - // first the date (%cd), then the branch name, and finally the commit id (%h) - String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) - - project.version += "--snapshot--" + infoString -} - // These are the Java version requirements we will check on each start of JabRef ext.minRequiredJavaVersion = "1.8.0_144" ext.allowJava9 = false @@ -256,57 +215,6 @@ afterEvaluate { } } -// Release tasks shadowJar { classifier 'fat' } - -install4j { - installDir = file(project.ext.install4jDir) -} - -// has to be defined AFTER 'dev' things to have the correct project.version -task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") { - projectFile = file('jabref.install4j') - release = project.version - winKeystorePassword = System.getenv('CERTIFICATE_PW') - macKeystorePassword = System.getenv('CERTIFICATE_PW') - variables = [ - versionFourDots: project.ext.threeDotVersion, - buildFileName : jar.archiveName, - version : project.version - ] - - doLast { - copy { - from "build/install4j" - into "build/releases" - } - } -} - - -task release(dependsOn: ["media", "releaseJar"]) { - group = 'JabRef - Release' - description 'Creates a release for all target platforms.' -} - -task releaseJar(dependsOn: "shadowJar") { - group = 'JabRef - Release' - description "Creates a Jar release." - doLast { - copy { - from("build/libs/org.jabref.gui-${project.version}-fat.jar") - into("build/releases") - rename { String fileName -> - fileName.replace('-fat', '').replace('org.jabref.gui', 'JabRef') - } - } - // set executable with read permissions (first true) and for all (false) - file("$buildDir/releases/JabRef-${project.version}.jar").setExecutable(true, false) - } -} - -task snapJar(dependsOn: "releaseJar", type: Delete) { - delete fileTree(dir: "$buildDir/releases/", exclude: "JabRef-${project.version}.jar") -} diff --git a/scripts/prepare-install4j.sh b/scripts/prepare-install4j.sh index acfb562c172..91b1e374ef0 100755 --- a/scripts/prepare-install4j.sh +++ b/scripts/prepare-install4j.sh @@ -7,14 +7,14 @@ fi # ensure that tar archive of install4j exists cd ~/downloads -wget --quiet -nc http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_3.tar.gz +wget --quiet -nc http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_4.tar.gz # extract tar archive of install4j into the source directory of JabRef cd ~/jabref # version 7.0.1 is NOT zipped any more - old command line: "-xzf" -tar -xf ~/downloads/install4j_unix_7_0_3.tar.gz +tar -xf ~/downloads/install4j_unix_7_0_4.tar.gz # fix directory name (until install4j 6.1.5 it was install4j6 -mv install4j7.0.3 org.jabref.gui/install4j7 +mv install4j7.0.4 install4j7 # fetch JREs if [ ! -d ~/.install4j7/jres/ ]; then diff --git a/scripts/upload-to-builds.jabref.org.sh b/scripts/upload-to-builds.jabref.org.sh index f2e33a40b9f..a7297a169f8 100755 --- a/scripts/upload-to-builds.jabref.org.sh +++ b/scripts/upload-to-builds.jabref.org.sh @@ -8,13 +8,13 @@ branch="snapshot" # simple solution to treat first file matching a pattern # hint by http://unix.stackexchange.com/a/156207/18033 -for buildfile in org.jabref.gui/build/releases/*--snapshot--*; do +for buildfile in build/releases/*--snapshot--*; do # the last "--" part is the branch name branch=`echo $buildfile | sed "sX.*--\(.*\)--.*X\1X"` break; done -for buildfile in org.jabref.gui/build/releases/*--snapshot--*.jar; do +for buildfile in build/releases/*--snapshot--*.jar; do # remove build/releases/ from the filename jarname=`echo $buildfile | sed "sXbuild/releases/XX"` break; @@ -33,7 +33,7 @@ if [ "snapshot" != "$branch" ] ; then fi # only upload JabRef*, not md5sums, updates.xml, etc. -command="${command}mput org.jabref.gui/build/releases/JabRef*\n" +command="${command}mput build/releases/JabRef*\n" # create symlink ...--latest.jar to latest version command="${command}symlink ${jarname} /www/${branch}/JabRef--${branch}--latest.jar\n" From 0c96e141e5bbaee6f2d6e8745fe0a9d0fccfaca7 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 15:53:41 +0100 Subject: [PATCH 68/79] Update gradle from 4.5 to 4.5.1 --- gradle/wrapper/gradle-wrapper.jar | Bin 54333 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 99340b4ad18d3c7e764794d300ffd35017036793..a5fe1cb94b9ee5ce57e6113458225bcba12d83e3 100644 GIT binary patch delta 757 zcmY+CUr3Wt7{+&AYjZL4v&iN*r4&o~L{lkNk~uFjW0VtzX_UJt|By?=n4sXrz#tN2 z zE$lv=!7BC|zTk1%)W93whc7{e@|loLOvaN%32h;nTD8JT=riFBRa1>lMVBrQKSK&V z(5J24$Xb$caZ#qt{c5V%n9F-9^xh~eL*7B`3M+K`07ny=!>8C0c)}N`pj^~#<=MQ8 zLb?ip=a){9>6nndB{PjQ3i+(jz?(?OjL0Neh4nC!1)J4~j)+3?xwKVF4R#@i>;;gP z6*}B5u)SSIFGsp0@ab|L%f{zr8|y=D^dy_YaI}L;dl2Z%gQKSy{-}hKm`rge+rM#Df4=%~T=bc_rmq>06>TqMFislB>Scr`kg{;GAG~j65OqLNf z?1`VIQMZae;!SjDRK>nT13AW2d^BdlorHuPt1?|4S8d-of8we_&0f{=uUe>kLPg)W z7XFDGo{~_Llbarx^y^*xAA{4GU*bv-nPI@t&E^G04F&8B%neNVF zEKr2bR3%*xa9JTn^DZT`o7hTqvomO0@8X|pe!bfC|1UNEotrp&VR&1n4K4hE-$FVo Ai2wiq delta 705 zcmYL{-%Ha`7{+&AWj{#sYo*!I8LT4tis2GVX_1Sf<(d@^X%;mvW(t-i=tUtSNEcn$ zJKQoh=RHaqT|Wz+?>zzJn#F$IlR8g-+?W`RyK*Q zpqVY;Zm@xU!BuT3J_l8*WC(;x;9wk&;|iQ1PG_{js)SdogDaxIrc*YEk!#0-g-{3G zH;57=n!>fKqr&Ie2dsqM>?X`h?PNB|k#5sg_?A@KUL$2oO%V(cl?;2NY>qUNv0mbd z`a(Ps$&gLTr?vvb5(@I8oHp5|Wp@;!#a@Q?s7e(MY2Aw+B%4#>*XS{-a!GW=j!^!& zHPqo*tbvL>sP^o_#<Bg|M zex^>+?h%29@Ft_+_A+N3m|5R==LMSZ y_n`_hSx)_a-11xGS2X50I}T^AlT~0ox3_$K+r(~^{aX-uUxNN^wKlrAD*gax&lWEL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be280bec023..568c50bf3a4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip From ca0521581ad157fd99ff714f6eb8441c27fffb5b Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 16:15:29 +0100 Subject: [PATCH 69/79] Fix iconpath (again) --- jabref.install4j | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jabref.install4j b/jabref.install4j index 6df29d2037c..eb3f11dc6b5 100644 --- a/jabref.install4j +++ b/jabref.install4j @@ -608,7 +608,7 @@ return console.askOkCancel(message, true); - ./icons/jabref.icns + ./buildres/jabref.icns @@ -622,7 +622,7 @@ return console.askOkCancel(message, true); - ./icons/jabref.ico + ./buildres/jabref.ico

From 13b85df5c35148f5ac2e209614438d4754cc5326 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 19:40:06 +0100 Subject: [PATCH 70/79] Fix artifacts path --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 01bacd3e25d..281fc07fe88 100644 --- a/circle.yml +++ b/circle.yml @@ -46,4 +46,4 @@ deployment: general: artifacts: - - "org.jabref.gui/build/releases" + - "build/releases" From ff6f4409c2dcc8a5d1a2ef074391deb485b601a4 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 21:00:16 +0100 Subject: [PATCH 71/79] Better 9 binaries than nothing --- build.gradle | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index d93d5ff4649..46e443e3522 100644 --- a/build.gradle +++ b/build.gradle @@ -29,14 +29,14 @@ plugins { apply plugin: 'install4j' group = "org.jabref" -version = "4.2-dev" +String plainVersion = "4.2-dev" project.ext.threeDotVersion = "4.1.0.1" project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (org.gradle.internal.os.OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j7' : 'install4j7') /* - * Set releaseVersion to VERSION--snapshot--DATE--GIT_HASH + * Set vrsion to VERSION--snapshot--DATE--GIT_HASH */ -def releaseVersion +String versionAppendix if (project.hasProperty('dev')) { String command = "git log --pretty=format:%cd--%h -n 1 --date=short" String commitInfo = "" @@ -64,10 +64,11 @@ if (project.hasProperty('dev')) { // first the date (%cd), then the branch name, and finally the commit id (%h) String infoString = commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12) - releaseVersion = project.version + "--snapshot--" + infoString + versionAppendix = "--snapshot--" + infoString } else { - releaseVersion = project.version + versionAppendix = "" } +version = plainVersion + versionAppendix // enable buildscan providing insights to our build (speed, ...) // see https://gradle.com/build-scans for more information @@ -86,9 +87,6 @@ allprojects { sourceCompatibility = 1.8 targetCompatibility = 1.8 - group = "org.jabref" - version = "4.2-dev" - repositories { mavenLocal() jcenter() @@ -226,7 +224,7 @@ install4j { installDir = file(project.ext.install4jDir) } -// has to be defined AFTER 'dev' things to have the correct releaseVersion +// has to be defined AFTER 'dev' things to have the correct project.version task releaseJar(dependsOn: ":org.jabref.gui:shadowJar") { group = 'JabRef - Release' description "Creates a Jar release." @@ -234,23 +232,23 @@ task releaseJar(dependsOn: ":org.jabref.gui:shadowJar") { copy { from("org.jabref.gui/build/libs/org.jabref.gui-${project.version}-fat.jar") into("$buildDir/releases") - rename { String fileName -> "JabRef-${releaseVersion}.jar" } + rename { String fileName -> "JabRef-${project.version}.jar" } } // set executable with read permissions (first true) and for all (false) - file("$buildDir/releases/JabRef-${releaseVersion}.jar").setExecutable(true, false) + file("$buildDir/releases/JabRef-${project.version}.jar").setExecutable(true, false) } } -// has to be defined AFTER 'dev' things to have the correct releaseVersion +// has to be defined AFTER 'dev' things to have the correct project.version task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") { projectFile = file('jabref.install4j') - release = releaseVersion + release = project.version winKeystorePassword = System.getenv('CERTIFICATE_PW') macKeystorePassword = System.getenv('CERTIFICATE_PW') variables = [ versionFourDots: project.ext.threeDotVersion, buildFileName : jar.archiveName, - version : releaseVersion + version : project.version ] doLast { @@ -261,11 +259,11 @@ task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") { } } -task release(dependsOn: "media") { +task release(dependsOn: ["media", "releaseJar"]) { group = 'JabRef - Release' description 'Creates a release for all target platforms.' } task snapJar(dependsOn: "releaseJar", type: Delete) { - delete fileTree(dir: "$buildDir/releases/", exclude: "JabRef-${releaseVersion}.jar") + delete fileTree(dir: "$buildDir/releases/", exclude: "JabRef-${project.version}.jar") } From 9145feba84b4cf65950252a910b714893435ab66 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 14 Feb 2018 16:18:42 +0100 Subject: [PATCH 72/79] Fix file paths --- .../org/jabref/preferences/LastFocusedTabPreferencesTest.java | 0 .../logic/layout/format/ReplaceUnicodeLigaturesFormatter.java | 0 .../java/org/jabref/logic/util/strings/UnicodeLigaturesMap.java | 0 .../logic/layout/format/ReplaceUnicodeLigaturesFormatterTest.java | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {src => org.jabref.gui/src}/jmh/java/org/jabref/preferences/LastFocusedTabPreferencesTest.java (100%) rename {src => org.jabref.logic/src}/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java (100%) rename {src => org.jabref.logic/src}/main/java/org/jabref/logic/util/strings/UnicodeLigaturesMap.java (100%) rename {src => org.jabref.logic/src}/test/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatterTest.java (100%) diff --git a/src/jmh/java/org/jabref/preferences/LastFocusedTabPreferencesTest.java b/org.jabref.gui/src/jmh/java/org/jabref/preferences/LastFocusedTabPreferencesTest.java similarity index 100% rename from src/jmh/java/org/jabref/preferences/LastFocusedTabPreferencesTest.java rename to org.jabref.gui/src/jmh/java/org/jabref/preferences/LastFocusedTabPreferencesTest.java diff --git a/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java b/org.jabref.logic/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java similarity index 100% rename from src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java rename to org.jabref.logic/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java diff --git a/src/main/java/org/jabref/logic/util/strings/UnicodeLigaturesMap.java b/org.jabref.logic/src/main/java/org/jabref/logic/util/strings/UnicodeLigaturesMap.java similarity index 100% rename from src/main/java/org/jabref/logic/util/strings/UnicodeLigaturesMap.java rename to org.jabref.logic/src/main/java/org/jabref/logic/util/strings/UnicodeLigaturesMap.java diff --git a/src/test/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatterTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatterTest.java similarity index 100% rename from src/test/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatterTest.java rename to org.jabref.logic/src/test/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatterTest.java From 265507dc570adf95bb925e22ecfe0629083078f6 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 14 Feb 2018 19:22:39 +0100 Subject: [PATCH 73/79] Compile fix and migrate OAI2HandlerFetcherTest @Ignore to JUnit5 @Disabled --- .../EntryFromFileCreatorManagerTest.java | 16 ++++---- .../gui/importer/EntryFromPDFCreatorTest.java | 1 - .../fetcher/OAI2HandlerFetcherTest.java | 38 ++++++++----------- .../jabref/logic/xmp/XMPSchemaBibtexTest.java | 2 +- .../jabref/model/strings/StringUtilTest.java | 4 +- 5 files changed, 28 insertions(+), 33 deletions(-) diff --git a/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java index d582c17b035..e98cefd202b 100644 --- a/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java @@ -12,7 +12,6 @@ import java.util.Optional; import org.jabref.gui.externalfiletype.ExternalFileTypes; -import org.jabref.logic.importer.ImportDataTest; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.importer.ParserResult; import org.jabref.logic.importer.fileformat.BibtexParser; @@ -45,6 +44,7 @@ public class EntryFromFileCreatorManagerTest { public void setUp() { externalFileTypes = mock(ExternalFileTypes.class, Answers.RETURNS_DEEP_STUBS); when(externalFileTypes.getExternalFileTypeByExt("pdf")).thenReturn(Optional.empty()); + } /** * Tests the prerequisites of this test-class itself. @@ -53,20 +53,22 @@ public void setUp() { public void testTestDatabase() throws IOException { BibDatabase database; Collection entries; + BibEntry entry1; + BibEntry entry2; try (FileInputStream stream = new FileInputStream(UNLINKED_FILES_TEST_BIB); InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { ParserResult result = new BibtexParser(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor()).parse(reader); database = result.getDatabase(); entries = database.getEntries(); - BibEntry entry1 = database.getEntryByKey("entry1").get(); - BibEntry entry2 = database.getEntryByKey("entry2").get(); + entry1 = database.getEntryByKey("entry1").get(); + entry2 = database.getEntryByKey("entry2").get(); } - Assert.assertEquals(2, database.getEntryCount()); - Assert.assertEquals(2, entries.size()); - Assert.assertNotNull(entry1); - Assert.assertNotNull(entry2); + assertEquals(2, database.getEntryCount()); + assertEquals(2, entries.size()); + assertNotNull(entry1); + assertNotNull(entry2); } @Test diff --git a/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java index 17817eeb6b4..cc1dd2c8ca0 100644 --- a/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java @@ -6,7 +6,6 @@ import org.jabref.JabRefGUI; import org.jabref.gui.JabRefFrame; import org.jabref.gui.externalfiletype.ExternalFileTypes; -import org.jabref.logic.importer.ImportDataTest; import org.jabref.model.entry.BibEntry; import org.jabref.testutils.category.GUITest; diff --git a/org.jabref.gui/src/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java index 46dd1e87880..edb44c7cb09 100644 --- a/org.jabref.gui/src/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java @@ -9,10 +9,9 @@ import org.jabref.logic.importer.util.OAI2Handler; import org.jabref.model.entry.BibEntry; -import org.jabref.testutils.category.FetcherTest; -import org.junit.Ignore; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; @@ -23,12 +22,9 @@ /** * Test for OAI2-Handler and Fetcher. * - * @author Ulrich Stärk - * @author Christian Kopf - * @author Christopher Oezbek + * FIXME: Move this AND the OAI2HandlerFetcher to org.jabref.logic. Needs to be rewritten to new interface */ - -@FetcherTest +//@FetcherTest public class OAI2HandlerFetcherTest { protected OAI2Handler handler; @@ -123,23 +119,21 @@ public void testFixKey() { } @Test - @Ignore - public void testOnline() throws InterruptedException, IOException, SAXException { - - { - OAI2Fetcher fetcher = new OAI2Fetcher(); - be = fetcher.importOai2Entry("math.RA/0612188"); - assertNotNull(be); - - assertEquals(Optional.of("math/0612188"), be.getField("eprint")); - assertEquals(Optional.of("On the classification and properties of noncommutative duplicates"), - be.getField("title")); - assertEquals(Optional.of("Javier López Peña and Gabriel Navarro"), be.getField("author")); - assertEquals(Optional.of("2007"), be.getField("year")); + public void testMathRA0612188() throws Exception { + OAI2Fetcher fetcher = new OAI2Fetcher(); + be = fetcher.importOai2Entry("math.RA/0612188"); + assertNotNull(be); - Thread.sleep(20000); - } + assertEquals(Optional.of("math/0612188"), be.getField("eprint")); + assertEquals(Optional.of("On the classification and properties of noncommutative duplicates"), + be.getField("title")); + assertEquals(Optional.of("Javier López Peña and Gabriel Navarro"), be.getField("author")); + assertEquals(Optional.of("2"), be.getField("year")); + } + @Test + @Disabled + public void testOnline() throws InterruptedException, IOException, SAXException { { OAI2Fetcher fetcher = new OAI2Fetcher(); be = fetcher.importOai2Entry("astro-ph/0702080"); diff --git a/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java index 79c4d2e7c2a..f09e4844763 100644 --- a/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java +++ b/org.jabref.logic/src/test/java/org/jabref/logic/xmp/XMPSchemaBibtexTest.java @@ -258,7 +258,7 @@ public void testSetBibtexEntry() throws IOException { BibEntry e2 = bibtex.getBibtexEntry(); - Assert.assertEquals(e, e2); + assertEquals(e, e2); } @Test diff --git a/org.jabref.model/src/test/java/org/jabref/model/strings/StringUtilTest.java b/org.jabref.model/src/test/java/org/jabref/model/strings/StringUtilTest.java index d2d13ab826a..ceb656b91a0 100644 --- a/org.jabref.model/src/test/java/org/jabref/model/strings/StringUtilTest.java +++ b/org.jabref.model/src/test/java/org/jabref/model/strings/StringUtilTest.java @@ -21,9 +21,9 @@ public void StringUtilClassIsSmall() throws Exception { Path path = Paths.get("src", "main", "java", StringUtil.class.getName().replace('.', '/') + ".java"); int lineCount = Files.readAllLines(path, StandardCharsets.UTF_8).size(); - Assert.assertTrue("StringUtil increased in size. " + assertTrue(lineCount <= 722, "StringUtil increased in size. " + "We try to keep this class as small as possible. " - + "Thus think twice if you add something to StringUtil.", lineCount <= 722); + + "Thus think twice if you add something to StringUtil."); } @Test From 7c8b7617dbbe877f98737da55b7d2e312860de93 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 14 Feb 2018 20:04:00 +0100 Subject: [PATCH 74/79] Fix Install4J build --- build.gradle | 7 ++++--- org.jabref.gui/build.gradle | 13 ------------ org.jabref.logic/build.gradle | 21 +++++++++++++++++++ .../src/main/resources/build.properties | 0 4 files changed, 25 insertions(+), 16 deletions(-) rename {org.jabref.gui => org.jabref.logic}/src/main/resources/build.properties (100%) diff --git a/build.gradle b/build.gradle index 46e443e3522..5f8fa2505ca 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,6 @@ plugins { apply plugin: 'install4j' -group = "org.jabref" String plainVersion = "4.2-dev" project.ext.threeDotVersion = "4.1.0.1" project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (org.gradle.internal.os.OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j7' : 'install4j7') @@ -68,13 +67,15 @@ if (project.hasProperty('dev')) { } else { versionAppendix = "" } -version = plainVersion + versionAppendix // enable buildscan providing insights to our build (speed, ...) // see https://gradle.com/build-scans for more information buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' } allprojects { + group = "org.jabref" + version = plainVersion + versionAppendix + apply plugin: 'java' apply plugin: 'checkstyle' @@ -259,7 +260,7 @@ task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") { } } -task release(dependsOn: ["media", "releaseJar"]) { +task release(dependsOn: ["media"]) { group = 'JabRef - Release' description 'Creates a release for all target platforms.' } diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 35b1a3e7188..9afd2803c10 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -117,19 +117,6 @@ dependencies { processResources { filteringCharset = 'UTF-8' - filesMatching("build.properties") { - expand(version: project.version, - "year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)), - "authors": new File('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "), - "developers": new File('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "), - "azureInstrumentationKey": System.getenv('AzureInstrumentationKey'), - "minRequiredJavaVersion": minRequiredJavaVersion, - "allowJava9": allowJava9 - - ) - filteringCharset = 'UTF-8' - } - filesMatching("resource/**/meta.xml") { expand version: project.version } diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index a278d5b7780..8c4ebff10c9 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -64,6 +64,27 @@ dependencies { testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' } +processResources { + filteringCharset = 'UTF-8' + + filesMatching("build.properties") { + expand(version: project.version, + "year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)), + "authors": new File('../AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "), + "developers": new File('../DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "), + "azureInstrumentationKey": System.getenv('AzureInstrumentationKey'), + "minRequiredJavaVersion": minRequiredJavaVersion, + "allowJava9": allowJava9 + + ) + filteringCharset = 'UTF-8' + } + + filesMatching("resource/**/meta.xml") { + expand version: project.version + } +} + clean { delete "src/main/gen" } diff --git a/org.jabref.gui/src/main/resources/build.properties b/org.jabref.logic/src/main/resources/build.properties similarity index 100% rename from org.jabref.gui/src/main/resources/build.properties rename to org.jabref.logic/src/main/resources/build.properties From 2985d71f4a81faa5148cee288f1cbbd921dc81ec Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 14 Feb 2018 20:42:17 +0100 Subject: [PATCH 75/79] Fix build on CircleCI --- build.gradle | 6 +++++- org.jabref.gui/build.gradle | 4 ---- org.jabref.logic/build.gradle | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 5f8fa2505ca..6c92c9ffe5b 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.ext.threeDotVersion = "4.1.0.1" project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (org.gradle.internal.os.OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j7' : 'install4j7') /* - * Set vrsion to VERSION--snapshot--DATE--GIT_HASH + * Set version to VERSION--snapshot--DATE--GIT_HASH */ String versionAppendix if (project.hasProperty('dev')) { @@ -76,6 +76,10 @@ allprojects { group = "org.jabref" version = plainVersion + versionAppendix + // These are the Java version requirements we will check on each start of JabRef + ext.minRequiredJavaVersion = "1.8.0_144" + ext.allowJava9 = false + apply plugin: 'java' apply plugin: 'checkstyle' diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index 9afd2803c10..a8f87191992 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -24,10 +24,6 @@ jacoco { mainClassName = "org.jabref.JabRefMain" -// These are the Java version requirements we will check on each start of JabRef -ext.minRequiredJavaVersion = "1.8.0_144" -ext.allowJava9 = false - sourceSets { main { java { diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index 8c4ebff10c9..f49cbf24309 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -70,8 +70,8 @@ processResources { filesMatching("build.properties") { expand(version: project.version, "year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)), - "authors": new File('../AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "), - "developers": new File('../DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "), + "authors": Project.getRootProject().file('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "), + "developers": Project.getRootProject().file('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "), "azureInstrumentationKey": System.getenv('AzureInstrumentationKey'), "minRequiredJavaVersion": minRequiredJavaVersion, "allowJava9": allowJava9 From 92cf1a3e59a27df14baa6a47aa732edaa6b676b0 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 14 Feb 2018 21:03:06 +0100 Subject: [PATCH 76/79] No daemon at CircleCI --- circle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 281fc07fe88..9c6ae5389d7 100644 --- a/circle.yml +++ b/circle.yml @@ -14,14 +14,15 @@ dependencies: #--win-keystore-password $CERTIFICATE_PW --mac-keystore-password $CERTIFICATE_PW override: # We do this to decrease build time by using CircleCI's cache. See https://discuss.circleci.com/t/effective-caching-for-gradle/540 for a longer motivation. - - ./gradlew compileJava + - ./gradlew --no-daemon compileJava cache_directories: - "~/.install4j7" - "~/downloads" test: override: - - ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace + - ./gradlew --no-daemon -Pdev=true -Pinstall4jDir="install4j7" --stacktrace release + - ./gradlew --no-daemon -Drevision=release -DoutputFormatter=json -DoutputDir=build/releases dependencyUpdates post: # save test reports as build artifacts - mkdir -p $CIRCLE_TEST_REPORTS/junit/ @@ -33,10 +34,9 @@ deployment: tag: /v[0-9]+(\.[0-9]+)*(-.+)?/ commands: # we have to do a clean build as changing gradle's "project.version" does not lead to a rebuild of resources (mirroring project.version) - - ./gradlew -Pinstall4jDir="install4j7" clean release --stacktrace + - ./gradlew --no-daemon -Pinstall4jDir="install4j7" --stacktrace clean release # upload at all circumstances - scripts/upload-to-builds.jabref.org.sh - - ./gradlew dependencyUpdates -Drevision=release -DoutputFormatter=json -DoutputDir=build/releases development: # match all branches; this is executed, if "release" is not matched - see https://circleci.com/docs/configuration/ branch: /.*/ From de4a5742547b9d0810197d2f20532ec7962fae9a Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 14 Feb 2018 21:38:51 +0100 Subject: [PATCH 77/79] Initial compilation also is a development build --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 9c6ae5389d7..2fd93f04ad0 100644 --- a/circle.yml +++ b/circle.yml @@ -14,7 +14,7 @@ dependencies: #--win-keystore-password $CERTIFICATE_PW --mac-keystore-password $CERTIFICATE_PW override: # We do this to decrease build time by using CircleCI's cache. See https://discuss.circleci.com/t/effective-caching-for-gradle/540 for a longer motivation. - - ./gradlew --no-daemon compileJava + - ./gradlew --no-daemon -Pdev=true compileJava cache_directories: - "~/.install4j7" - "~/downloads" From 9bfea572ec15ab80e11e6405cd39e04d75f4430f Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 14 Feb 2018 21:39:03 +0100 Subject: [PATCH 78/79] Replace Project.getRootProject() by rootProject --- org.jabref.logic/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index f49cbf24309..36652d7ca89 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -70,8 +70,8 @@ processResources { filesMatching("build.properties") { expand(version: project.version, "year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)), - "authors": Project.getRootProject().file('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "), - "developers": Project.getRootProject().file('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "), + "authors": rootProject.file('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "), + "developers": rootProject.file('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "), "azureInstrumentationKey": System.getenv('AzureInstrumentationKey'), "minRequiredJavaVersion": minRequiredJavaVersion, "allowJava9": allowJava9 From a1deb36e8756d1f462254910168470cd893ab337 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 14 Feb 2018 22:25:42 +0100 Subject: [PATCH 79/79] Fix test --- .../test/java/org/jabref/gui/importer/ImportDataTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.jabref.gui/src/test/java/org/jabref/gui/importer/ImportDataTest.java b/org.jabref.gui/src/test/java/org/jabref/gui/importer/ImportDataTest.java index 6fbbd27cabf..1a6f670ac2d 100644 --- a/org.jabref.gui/src/test/java/org/jabref/gui/importer/ImportDataTest.java +++ b/org.jabref.gui/src/test/java/org/jabref/gui/importer/ImportDataTest.java @@ -11,15 +11,15 @@ public class ImportDataTest { public static final File FILE_IN_DATABASE = Paths - .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf").toFile(); + .get("src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf").toFile(); public static final File FILE_NOT_IN_DATABASE = Paths - .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf") + .get("src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf") .toFile(); public static final File EXISTING_FOLDER = Paths - .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder").toFile(); + .get("src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder").toFile(); public static final File NOT_EXISTING_FOLDER = Paths.get("notexistingfolder").toFile(); public static final File NOT_EXISTING_PDF = Paths - .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/null.pdf").toFile(); + .get("src/test/resources/org/jabref/gui/importer/unlinkedFilesTestFolder/null.pdf").toFile(); /** * Tests the testing environment.