From 3a807eaca83b62a6e25b533f0ff83cdffe0b8e57 Mon Sep 17 00:00:00 2001 From: Jure Slak Date: Mon, 18 Feb 2019 17:08:22 +0100 Subject: [PATCH 1/4] Fix issues with double spaces. (#4662) I noticed that "Applied numerical mathematics" was not abbreviating and found that this is most likely die to a double space present in its name. I also fixed other occurrences. --- src/main/resources/journals/journalList.txt | 44 ++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/resources/journals/journalList.txt b/src/main/resources/journals/journalList.txt index c2db98e8d68..389c94551de 100644 --- a/src/main/resources/journals/journalList.txt +++ b/src/main/resources/journals/journalList.txt @@ -1384,7 +1384,7 @@ Applied Mechanics Reviews = Appl. Mech. Rev. Applied Microbiology = Appl. Microbiol. Applied Microbiology and Biotechnology = Appl. Microbiol. Biotechnol. Applied Neurophysiology = Appl. Neurophysiol. -Applied Numerical Mathematics = Appl. Numer. Math. +Applied Numerical Mathematics = Appl. Numer. Math. Applied Nursing Research = Appl. Nurs. Res. Applied Ocean Research = Appl. Ocean Res. Applied Optics = Appl. Opt. @@ -1974,7 +1974,7 @@ Berg- und Huettenmaennische Monatshefte = Berg- Huettenmaenn. Monatsh. Bericht uber die Zusammenkunft der Deutschen Ophthalmologischen Gesellschaft = Ber. Zusammenkunft Dtsch. Ophthalmol. Ges. Berichte aus der Bonner Universitatsklinik und Poliklinik fur Mund-, Zahn- und Kieferkrankheiten = Ber. Bonn. Univ. Poliklin. Mund. Zahn. Kieferkr. Berichte der Bunsen-Gesellschaft = Ber. Bunsen Ges. -Berichte der Bunsen-Gesellschaft fur Physikalische Chemie = Ber. Bunsen Ges. Phys. Chem. +Berichte der Bunsen-Gesellschaft fur Physikalische Chemie = Ber. Bunsen Ges. Phys. Chem. Berichte der Deutschen Botanischen Gesellschaft = Ber. Dtsch. Bot. Ges. Berichte der Deutschen Chemischen Gesellschaft = Ber. Dtsch. Chem. Ges. Berichte der Deutschen Gesellschaft fur Geologische Wissenschaft Reihe A: Geologie und Palaeontologie = Ber. Dtsch. Ges. Geol. Wiss. Reihe A @@ -2404,7 +2404,7 @@ Bordeaux Medical = Bord. Med. Borden's Review of Nutrition Research = Bordens Rev. Nutr. Res. Boreal Environment Research = Boreal Environ. Res. Bornetandlaegen = Bornetandlaegen -Botanical Museum Leaflets, Harvard University = Bot. Mus. Leafl. Harv. Univ. +Botanical Museum Leaflets, Harvard University = Bot. Mus. Leafl. Harv. Univ. Botanical Review = Bot. Rev. Boundary-Layer Meteorology = Boundary Layer Meteorol. Brachytherapy = Brachytherapy @@ -3083,7 +3083,7 @@ Chang Gung Medical Journal = Chang Gung Med. J. Change = Change Changgeng Yi Xue Za Zhi (Chang Gung Medical Journal) = Changgeng Yi Xue Za Zhi Changing Times = Changing Times -Chaos, Solitons & Fractals = Chaos, Solitons Fractals +Chaos, Solitons & Fractals = Chaos, Solitons Fractals Chart = Chart Chem-Bio Informatics Journal = Chem-Bio Inf. J. Chembiochem = Chembiochem @@ -3522,7 +3522,7 @@ Colorado Nurse = Colo. Nurse Coloration Technology = Color. Technol. Columbia Law Review = Columbia Law Rev. Columbus Dental Society Bulletin = Columbus Dent. Soc. Bull. -Combinatorial Chemistry - an Online Journal = Comb. Chem. +Combinatorial Chemistry - an Online Journal = Comb. Chem. Combinatorial Chemistry and High Throughput Screening = Comb. Chem. High Throughput Screening Combinatorics, Probability and Computing = Comb. Probab. Comput. Combustion and Flame = Combust. Flame @@ -4617,7 +4617,7 @@ Environmental Conservation = Environ. Conserv. Environmental Control in Biology = Environ. Control. Biol. Environmental Engineering and Management Journal = Environ. Eng. Manage. J. Environmental Engineering and Policy = Environ. Eng. Policy -Environmental Engineering Research = Environ. Eng. Res. +Environmental Engineering Research = Environ. Eng. Res. Environmental Engineering Science = Environ. Eng. Sci. Environmental Fluid Mechanics = Environ. Fluid Mech. Environmental Forensics = Environ. Forensics @@ -7017,8 +7017,8 @@ Iranian Polymer Journal = Iran. Polym. J. Iraqi Dental Journal = Iraqi Dent. J. IRB; A Review of Human Subjects Research = IRB. IRCS Journal of Medical Science = IRCS J. Med. Sci. -IRE Transactions on Industrial Electronics = IRE Trans. Ind. Electron. -IRE Transactions on Information Theory = IRE Trans. Inf. Theory +IRE Transactions on Industrial Electronics = IRE Trans. Ind. Electron. +IRE Transactions on Information Theory = IRE Trans. Inf. Theory IRE Transactions on Aeronautical and Navigational Electronics = IRE Trans. Aeronaut. Navig. Electron. IRE Transactions on Aerospace and Navigational Electronics = IRE Trans. Aerosp. Navig. Electron. IRE Transactions on Antennas and Propagation = IRE Trans. Anntenas Propag. @@ -7282,7 +7282,7 @@ Journal fur Landwirtschaft = J. Landwirtschaft Journal fur Praktische Chemie = J. Prakt. Chem. Journal fur Verbraucherschutz und Lebensmittelsicherheit = J. Verbraucherschutz Lebensmittelsicherh. Journal Medical Libanais (Lebanese Medical Journal) = J. Med. Liban. -Journal of Circadian Rhythms = J. Circadian Rhythms +Journal of Circadian Rhythms = J. Circadian Rhythms Journal of AAPOS = J. AAPOS Journal of Abnormal Child Psychology = J. Abnorm. Child Psychol. Journal of Abnormal Psychology = J. Abnorm. Psychol. @@ -8081,7 +8081,7 @@ Journal of Hospital Dental Practice = J. Hosp. Dent. Pract. Journal of Hospital Infection = J. Hosp. Infect. Journal of Hospital Marketing = J. Hosp. Mark. Journal of Hospital Supply, Processing and Distribution = J. Hosp. Supply. Process. Distrib. -Journal of Housing and the Built Environment = J. Hous. Built Environ. +Journal of Housing and the Built Environment = J. Hous. Built. Environ. Journal of Huazhong University of Science and Technology. Medical Sciences = J. Huazhong Univ. Sci. Technolog. Med. Sci. Journal of Human Ergology = J. Hum. Ergol. (Tokyo) Journal of Human Evolution = J. Hum. Evol. @@ -9322,7 +9322,7 @@ Journal of Vector Borne Diseases = J. Vector Borne Dis. Journal of Vector Ecology = J. Vector Ecol. Journal of Vegetation Science = J. Veg. Sci. Journal of Venomous Animals and Toxins Including Tropical Diseases = J. Venomous Anim. Toxins Incl. Trop. Dis. -Journal of Vertebrate Paleontology = J. Vertebr. Paleontol. +Journal of Vertebrate Paleontology = J. Vertebr. Paleontol. Journal of Vestibular Research = J. Vestib. Res. Journal of Veterinary Dentistry = J. Vet. Dent. Journal of Veterinary Diagnostic Investigation = J. Vet. Diagn. Invest. @@ -10543,13 +10543,13 @@ Mutation Research = Mutat. Res. Mutation Research Letters = Mutat. Res. Lett. Mutation Research, DNA Repair = Mutat. Res. DNA Repair Mutation Research, DNA Repair Reports = Mutat. Res. DNA Repair Rep. -Mutation Research, DNAging: Genetic Instability and Aging = Mutat. Res. DNAging: Genet. Instab. Aging +Mutation Research, DNAging: Genetic Instability and Aging = Mutat. Res. DNAging: Genet. Instab. Aging Mutation Research, Environmental Mutagenesis and Related Subjects = Mutat. Res. Environ. Mutagen. Relat. Subj. Mutation Research, Fundamental and Molecular Mechanisms of Mutagenesis = Mutat. Res. Fundam. Mol. Mech. Mutagen. Mutation Research, Genetic Toxicology = Mutat. Res. Genet. Toxicol. Mutation Research, Genetic Toxicology and Environmental Mutagenesis = Mutat. Res. Genet. Toxicol. Environ. Mutagen. Mutation Research, Genetic Toxicology Testing = Mutat. Res. Genet. Toxicol. Test. -Mutation Research, Mutation Research Genomics = Mutat. Res. Mutat. Res. Genomics +Mutation Research, Mutation Research Genomics = Mutat. Res. Mutat. Res. Genomics Mutation Research, Reviews in Genetic Toxicology = Mutat. Res. Rev. Genet. Toxicol. Mutation Research, Reviews in Mutation Research = Mutat. Res. Rev. Mutat. Res. Mycologia = Mycologia @@ -10711,7 +10711,7 @@ Naturwissenschaftliche Wochenschrift = Naturwiss. Wochenschr. Nauchni Trudove na Nauchno-Izsledovatelskiia Stomatologichen Institut = Nauchni Tr. Nauchnoizsled. Stomatol. Inst. (Sofiia) Nauchni Trudove na Visshiia Meditsinski Institut, Sofiia = Nauchni Tr. Vissh. Med. Inst. Sofiia Naunyn-Schmiedeberg's Archives of Pharmacology = Naunyn. Schmiedebergs Arch. Pharmacol. -Naunyn-Schmiedebergs Archiv fur Experimentelle Pathologie und Pharmacologie = Naunyn-Schmiedeberg's Arch. Exp. Pathol. Pharmacol. +Naunyn-Schmiedebergs Archiv fur Experimentelle Pathologie und Pharmacologie = Naunyn-Schmiedeberg's Arch. Exp. Pathol. Pharmacol. Naunyn-Schmiedebergs Archiv fur Experimentelle Pathologie und Pharmakologie = Naunyn. Schmiedebergs Arch. Exp. Pathol. Pharmakol. Naunyn-Schmiedebergs Archiv fur Pharmakologie = Naunyn. Schmiedebergs Arch. Pharmakol. Naval Engineers Journal = Nav. Eng. J. @@ -11519,7 +11519,7 @@ Pakistan Nursing and Health Review = Pak. Nurs. Health Rev. Palaeogeography, Palaeoclimatology, Palaeoecology = Palaeogeogr. Palaeoclimatol. Palaeoecol. Palaeontologia Electronica = Palaeontol. Electronica Palaeontologische Zeitschrift = Palaentolog. Z. -PalArch's Journal of Vertebrate Palaeontology = PalArch's J. Vertebr. Palaeontol. +PalArch's Journal of Vertebrate Palaeontology = PalArch's J. Vertebr. Palaeontol. Paleontological Bulletin = Paleontol. Bull. Paleontological Journal = Paleontolog. J. Paleontological Research = Paleontolog. Res. @@ -11956,7 +11956,7 @@ PLoS Biology = PLoS Biol. PLoS Clinical Trials = PLoS Clin. Trials PLoS Computational Biology = PLoS Comput. Biol. PLOS Currents: Disasters = PLOS Curr.: Disasters -PLOS Currents: Evidence on Genomic Tests = PLOS Curr.: Evidence Genomic Tests +PLOS Currents: Evidence on Genomic Tests = PLOS Curr.: Evidence Genomic Tests PLOS Currents: Huntington Disease = PLOS Curr.: Huntington Dis. PLOS Currents: Muscular Dystrophy = PLOS Curr.: Muscular Dystrophy PLOS Currents: Outbreaks = PLOS Curr.: Outbreaks @@ -13202,7 +13202,7 @@ Rhode Island Medicine = R. I. Med. Rhodesia Nurse = Rhod. Nurse Rhodesian Nurse = Rhod. Nurse Rhumatologie = Rhumatologie -RIAI Revista Iberoamericana de Automatica e Informatica Industrial = Rev. Iberoam. Autom. Inf. Ind. +RIAI Revista Iberoamericana de Automatica e Informatica Industrial = Rev. Iberoam. Autom. Inf. Ind. RIC Reviews = RIC Rev. Rice Science = Rice Sci. Ricerca in Clinica e in Laboratorio = Ric. Clin. Lab. @@ -13483,7 +13483,7 @@ Science = Science Science Advances = Sci. Adv. Science and Justice = Sci. Justice Science and Technology of Advanced Materials = Sci. Technol. Adv. Mater. -Science and Technology of Archaeological Research = Sci. Technol. Archaeolog. Res. +Science and Technology of Archaeological Research = Sci. Technol. Archaeolog. Res. Science and Technology of Energetic Materials = Sci. Technol. Energetic Mater. Science and Technology of Welding and Joining = Sci. Technol. Weld. Joining Science China Materials = Sci. China Mater. @@ -13945,7 +13945,7 @@ Strength of Materials = Strength Mater. Stress = Stress Stroke = Stroke Struct.--Process., Meas., Phenom. Journal of Vacuum Science & Technology, B: Microelectronics and Nanometer Structures--Processing, Measurement, and Phenomena = J. Vac. Sci. Technol., B: Microelectron. Nanometer -Structural and Multidisciplinary Optimization = Struct. Multidiscip. Optim. +Structural and Multidisciplinary Optimization = Struct. Multidiscip. Optim. Structural Chemistry = Struct. Chem. Structural Design of Tall and Special Buildings = Struct. Des. Tall Special Build. Structural Safety = Struct. Saf. @@ -14395,7 +14395,7 @@ Transition Metal Chemistry = Transition Met. Chem. Translational Materials Research = Transl. Mater. Res. Translational Oncology = Trans. Oncol. Translational Proteomics = Transl. Proteomics -Translational Psychiatry = Transl. Psychiatry +Translational Psychiatry = Transl. Psychiatry Translational Research = Transl. Res. Transplant Immunology = Transpl. Immunol. Transplant Infectious Disease = Transpl. Infect. Dis. @@ -14590,7 +14590,7 @@ Vascular Pharmacology = Vascul. Pharmacol. Vascular Surgery = Vasc. Surg. Vecteur Environnement = Vecteur Environ. Vector Borne and Zoonotic Diseases = Vector Borne Zoonotic Dis. -Vegetable Crops Research Bulletin = Veg. Crops Res. Bull. +Vegetable Crops Research Bulletin = Veg. Crops. Res. Bull. Vehicle System Dynamics = Veh. Syst. Dyn. Vehicular Communications = Veh. Commun. Venezuela Odontologica = Venez. Odontol. @@ -14755,7 +14755,7 @@ Water Quality and Ecosystems Modeling = Water Qual. Ecosyst. Model. Water Quality Research Journal of Canada = Water Qual. Res. J. Can. Water Quality, Exposure and Health = Water Qual. Exposure Health Water Research = Water Res. -Water Resources Investigations Report (united States Geological Survey) = Water Resour. Invest. Rep. U.S. Geol. Surv. +Water Resources Investigations Report (united States Geological Survey) = Water Resour. Invest. Rep. U.S. Geol. Surv. Water Resources = Water Resour. Water Resources and Economics = Water Resour. Econ. Water Resources and Industry = Water Resour. Ind. From 7e1bf18f9bb02439133d7e9a270ae0cd24d95a8b Mon Sep 17 00:00:00 2001 From: ricantech Date: Mon, 18 Feb 2019 22:11:09 +0100 Subject: [PATCH 2/4] Fix for #4628 - cant save new content selectors (#4658) * Design of content selector dialog + initial view commit * Restyle dialog design + add basic functionalities for field names * Add logic regarding keywords * Minor rework of keywords logic + toggling of delete button * Unify naming convention * Logic tuneup * Add english translations * Add translations + imports * Convert ObservableList into ListProperty - review changes * Rework actions on bindings instead of using directly change listener - review changes * Replace setting of first element with built-in method in selection model * Use Inject for DialogService --- src/main/java/org/jabref/gui/BasePanel.java | 6 - src/main/java/org/jabref/gui/JabRefFrame.java | 3 +- .../actions/ManageContentSelectorAction.java | 29 + .../ContentSelectorDialog.fxml | 67 +++ .../ContentSelectorDialog.java | 499 ------------------ .../ContentSelectorDialogView.java | 122 +++++ .../ContentSelectorDialogViewModel.java | 213 ++++++++ src/main/resources/l10n/JabRef_en.properties | 19 +- 8 files changed, 447 insertions(+), 511 deletions(-) create mode 100644 src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java create mode 100644 src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml delete mode 100644 src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java create mode 100644 src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java create mode 100644 src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java index ef5e2875994..8c99cc4a68a 100644 --- a/src/main/java/org/jabref/gui/BasePanel.java +++ b/src/main/java/org/jabref/gui/BasePanel.java @@ -43,7 +43,6 @@ import org.jabref.gui.bibtexkeypattern.SearchFixDuplicateLabels; import org.jabref.gui.collab.DatabaseChangeMonitor; import org.jabref.gui.collab.FileUpdatePanel; -import org.jabref.gui.contentselector.ContentSelectorDialog; import org.jabref.gui.desktop.JabRefDesktop; import org.jabref.gui.edit.ReplaceStringAction; import org.jabref.gui.entryeditor.EntryEditor; @@ -399,11 +398,6 @@ private void setupActions() { actions.put(Actions.NEXT_PREVIEW_STYLE, this::nextPreviewStyle); actions.put(Actions.PREVIOUS_PREVIEW_STYLE, this::previousPreviewStyle); - actions.put(Actions.MANAGE_SELECTORS, () -> { - ContentSelectorDialog csd = new ContentSelectorDialog(frame, BasePanel.this, false, null); - csd.setVisible(true); - }); - actions.put(Actions.SEND_AS_EMAIL, new SendAsEMailAction(frame)); actions.put(Actions.WRITE_XMP, new WriteXMPAction(this)::execute); diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index b657ee1e1db..dbbce3f23b3 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -64,6 +64,7 @@ import org.jabref.gui.actions.EditExternalFileTypesAction; import org.jabref.gui.actions.ErrorConsoleAction; import org.jabref.gui.actions.LookupIdentifierAction; +import org.jabref.gui.actions.ManageContentSelectorAction; import org.jabref.gui.actions.ManageCustomExportsAction; import org.jabref.gui.actions.ManageCustomImportsAction; import org.jabref.gui.actions.ManageJournalsAction; @@ -941,7 +942,7 @@ private MenuBar createMenu() { new SeparatorMenuItem(), - factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new OldDatabaseCommandWrapper(Actions.MANAGE_SELECTORS, this, Globals.stateManager)), + factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new ManageContentSelectorAction(this)), factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)), factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this))); diff --git a/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java b/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java new file mode 100644 index 00000000000..31e2b1e1149 --- /dev/null +++ b/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java @@ -0,0 +1,29 @@ +package org.jabref.gui.actions; + +import org.jabref.gui.BasePanel; +import org.jabref.gui.JabRefFrame; +import org.jabref.gui.contentselector.ContentSelectorDialogView; +import org.jabref.logic.l10n.Localization; + +public class ManageContentSelectorAction extends SimpleCommand { + + private final JabRefFrame jabRefFrame; + + public ManageContentSelectorAction(JabRefFrame jabRefFrame) { + this.jabRefFrame = jabRefFrame; + } + + @Override + public void execute() { + BasePanel basePanel = jabRefFrame.getCurrentBasePanel(); + if (noActiveConnectionExists(basePanel)) { + jabRefFrame.getDialogService().showErrorDialogAndWait(Localization.lang("Active database connection do not exists!")); + return; + } + new ContentSelectorDialogView(basePanel).showAndWait(); + } + + private boolean noActiveConnectionExists(BasePanel basePanel) { + return basePanel == null || basePanel.getBibDatabaseContext() == null; + } +} diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml new file mode 100644 index 00000000000..94744038b42 --- /dev/null +++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java deleted file mode 100644 index a188c1fca8a..00000000000 --- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java +++ /dev/null @@ -1,499 +0,0 @@ -package org.jabref.gui.contentselector; - -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.BorderFactory; -import javax.swing.DefaultListModel; -import javax.swing.JButton; -import javax.swing.JList; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextField; - -import org.jabref.gui.BasePanel; -import org.jabref.gui.JabRefDialog; -import org.jabref.gui.JabRefFrame; -import org.jabref.gui.help.HelpAction; -import org.jabref.gui.keyboard.KeyBinder; -import org.jabref.logic.help.HelpFile; -import org.jabref.logic.l10n.Localization; -import org.jabref.model.entry.FieldName; -import org.jabref.model.metadata.ContentSelector; -import org.jabref.model.metadata.ContentSelectors; -import org.jabref.model.metadata.MetaData; - -import com.jgoodies.forms.builder.ButtonBarBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ContentSelectorDialog extends JabRefDialog { - - private static final String WORD_FIRSTLINE_TEXT = Localization.lang(" Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Abbreviate journal names of the selected entries (ISO abbreviation) Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Abbreviate journal names of the selected entries (MEDLINE abbreviation) @@ -1470,7 +1467,6 @@ Move\ to\ group=Move to group Clear\ read\ status=Clear read status Convert\ to\ biblatex\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journal'\ field\ to\ 'journaltitle')=Convert to biblatex format (for example, move the value of the 'journal' field to 'journaltitle') -Could\ not\ apply\ changes.=Could not apply changes. Deprecated\ fields=Deprecated fields No\ read\ status\ information=No read status information Printed=Printed @@ -2175,4 +2171,17 @@ Error\ adding\ discovered\ CitationStyles=Error adding discovered CitationStyles Add\ new\ String=Add new String Remove\ selected\ Strings=Remove selected Strings Must\ not\ be\ empty\!=Must not be empty\! -Open\ Help\ page=Open Help page \ No newline at end of file +Open\ Help\ page=Open Help page + +Active\ database\ connection\ do\ not\ exists\!=Active database connection do not exists! +Add\ new\ field\ name=Add new field name +Field\ name\:=Field name: +Field\ name\ \"%0\"\ already\ exists=Field name "%0" already exists +No\ field\ name\ selected\!=No field name selected! +Remove\ field\ name=Remove field name +Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ \"%0\"?=Are you sure you want to remove field name: "%0"? +Add\ new\ keyword=Add new keyword +Keyword\:=Keyword: +Keyword\ \"%0\"\ already\ exists=Keyword "%0" already exists +Remove\ keyword=Remove keyword +Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ \"%0\"?=Are you sure you want to remove keyword: "%0"? From 623718aa9a08a969bf965ccfeb3cb83f77c2f006 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 19 Feb 2019 08:33:11 +0100 Subject: [PATCH 3/4] Bump mockito-core from 2.24.0 to 2.24.5 (#4663) Bumps [mockito-core](https://github.com/mockito/mockito) from 2.24.0 to 2.24.5. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v2.24.0...v2.24.5) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1e55cfe71cc..9a7e49aafea 100644 --- a/build.gradle +++ b/build.gradle @@ -167,7 +167,7 @@ dependencies { testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1' testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.2' - testCompile 'org.mockito:mockito-core:2.24.0' + testCompile 'org.mockito:mockito-core:2.24.5' testCompile 'com.github.tomakehurst:wiremock:2.21.0' testCompile 'org.assertj:assertj-swing-junit:3.9.2' testCompile 'org.reflections:reflections:0.9.11' From 22e9bf811337aa47374d49238be2551ffe87a66e Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Tue, 19 Feb 2019 16:41:30 +0100 Subject: [PATCH 4/4] fix copy base bug in Strings Dialog validation --- .../org/jabref/gui/metadata/BibtexStringEditorDialogView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java index bdb3f169c00..a5afc2c8215 100644 --- a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java +++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java @@ -69,7 +69,7 @@ private void initialize() { new ViewModelTextFieldTableCellVisualizationFactory().withValidation(BibtexStringViewModel::labelValidation, visualizer).install(colLabel, new DefaultStringConverter()); colContent.setCellValueFactory(cellData -> cellData.getValue().contentProperty()); - new ViewModelTextFieldTableCellVisualizationFactory().withValidation(BibtexStringViewModel::labelValidation, visualizer).install(colContent, new DefaultStringConverter()); + new ViewModelTextFieldTableCellVisualizationFactory().withValidation(BibtexStringViewModel::contentValidation, visualizer).install(colContent, new DefaultStringConverter()); colLabel.setOnEditCommit((CellEditEvent cell) -> { cell.getRowValue().setLabel(cell.getNewValue());