[jabref] 03/07: freshen patch from Oliver Kopp's Debianized branch
Tony Mancill
tmancill at moszumanska.debian.org
Sat Dec 24 22:44:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch dev
in repository jabref.
commit aaa31989b9fb22e5e9deca621d054dca8457ebe2
Author: tony mancill <tmancill at debian.org>
Date: Sat Dec 24 14:00:24 2016 -0800
freshen patch from Oliver Kopp's Debianized branch
---
...ian_3.8.patch => 001_koppor_debian_3.8.1.patch} | 268 ++++++++-------------
debian/patches/040_disable_macadapter.patch | 45 ----
debian/patches/series | 3 +-
3 files changed, 107 insertions(+), 209 deletions(-)
diff --git a/debian/patches/001_koppor_debian_3.8.patch b/debian/patches/001_koppor_debian_3.8.1.patch
similarity index 93%
rename from debian/patches/001_koppor_debian_3.8.patch
rename to debian/patches/001_koppor_debian_3.8.1.patch
index 22b0a9c..796eba1 100644
--- a/debian/patches/001_koppor_debian_3.8.patch
+++ b/debian/patches/001_koppor_debian_3.8.1.patch
@@ -1,10 +1,10 @@
-Description: Debian-specific patches from koppor/debian_3.8
+Description: Debian-specific patches from koppor/debian_3.8.1
Author: Oliver Kopp <kopp.dev at gmail.com>
-Source: https://github.com/koppor/jabref/commits/debian_3.8
+Source: https://github.com/koppor/jabref/commits/debian_3.8.1
Forwarded: not-needed
diff --git a/build.gradle b/build.gradle
-index ae18040b0..dc794baf5 100644
+index 4fd9015a6..b4bc6a0b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,8 +91,6 @@ dependencies {
@@ -166,7 +166,7 @@ index 08fb3d1cf..000000000
-
-Copyright © 2003-2010 Apple Inc., All Rights Reserved
diff --git a/src/main/java/net/sf/jabref/gui/BasePanel.java b/src/main/java/net/sf/jabref/gui/BasePanel.java
-index c25b88161..910ace0d9 100644
+index ad57fa9d3..b53517a36 100644
--- a/src/main/java/net/sf/jabref/gui/BasePanel.java
+++ b/src/main/java/net/sf/jabref/gui/BasePanel.java
@@ -91,7 +91,6 @@ import net.sf.jabref.gui.undo.UndoableRemoveEntry;
@@ -186,7 +186,7 @@ index c25b88161..910ace0d9 100644
import net.sf.jabref.logic.exporter.BibtexDatabaseWriter;
import net.sf.jabref.logic.exporter.FileSaveSession;
import net.sf.jabref.logic.exporter.SaveException;
-@@ -154,8 +151,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
+@@ -153,8 +150,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
private final BibDatabaseContext bibDatabaseContext;
private final MainTableDataModel tableModel;
@@ -195,7 +195,7 @@ index c25b88161..910ace0d9 100644
// To contain instantiated entry editors. This is to save time
// As most enums, this must not be null
private BasePanelMode mode = BasePanelMode.SHOWING_NOTHING;
-@@ -222,8 +217,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
+@@ -221,8 +216,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
this.frame = frame;
this.tableModel = new MainTableDataModel(getBibDatabaseContext());
@@ -204,7 +204,7 @@ index c25b88161..910ace0d9 100644
setupMainPanel();
setupActions();
-@@ -495,12 +488,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
+@@ -494,12 +487,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
// The action for copying the BibTeX key and the title for the first selected entry
actions.put(Actions.COPY_KEY_AND_TITLE, (BaseAction) () -> copyKeyAndTitle());
@@ -217,7 +217,7 @@ index c25b88161..910ace0d9 100644
// The action for copying the BibTeX keys as hyperlinks to the urls of the selected entries
actions.put(Actions.COPY_KEY_AND_LINK, new CopyBibTeXKeyAndLinkAction(mainTable));
-@@ -708,14 +695,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
+@@ -706,14 +693,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
actions.put(Actions.DOWNLOAD_FULL_TEXT, new FindFullTextAction(this));
}
@@ -232,7 +232,7 @@ index c25b88161..910ace0d9 100644
private void copy() {
List<BibEntry> bes = mainTable.getSelectedEntries();
-@@ -2418,10 +2397,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
+@@ -2414,10 +2393,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
this.currentSearchQuery = currentSearchQuery;
}
@@ -244,7 +244,7 @@ index c25b88161..910ace0d9 100644
if (selectionListener == null) {
// only occurs if this is called while instantiating this BasePanel
diff --git a/src/main/java/net/sf/jabref/gui/IconTheme.java b/src/main/java/net/sf/jabref/gui/IconTheme.java
-index f43f8f9bd..2177138bc 100644
+index b2e1aa9aa..91eb697ad 100644
--- a/src/main/java/net/sf/jabref/gui/IconTheme.java
+++ b/src/main/java/net/sf/jabref/gui/IconTheme.java
@@ -158,7 +158,6 @@ public class IconTheme {
@@ -369,86 +369,6 @@ index 4d7d10be5..014519479 100644
} else {
LOGGER.error("unknown style type");
}
-diff --git a/src/main/java/net/sf/jabref/gui/date/DatePickerButton.java b/src/main/java/net/sf/jabref/gui/date/DatePickerButton.java
-index 6b4a3b997..a11d7710d 100644
---- a/src/main/java/net/sf/jabref/gui/date/DatePickerButton.java
-+++ b/src/main/java/net/sf/jabref/gui/date/DatePickerButton.java
-@@ -1,30 +1,26 @@
- package net.sf.jabref.gui.date;
-
- import java.awt.BorderLayout;
--import java.time.LocalDate;
--import java.time.ZonedDateTime;
--import java.time.format.DateTimeFormatter;
-+import java.awt.event.ActionEvent;
-+import java.awt.event.ActionListener;
-+import java.util.Date;
-
- import javax.swing.JComponent;
- import javax.swing.JPanel;
-
- import net.sf.jabref.Globals;
--import net.sf.jabref.gui.IconTheme;
- import net.sf.jabref.gui.fieldeditors.FieldEditor;
- import net.sf.jabref.logic.util.date.EasyDateFormat;
- import net.sf.jabref.preferences.JabRefPreferences;
-
--import com.github.lgooddatepicker.components.DatePicker;
--import com.github.lgooddatepicker.components.DatePickerSettings;
--import com.github.lgooddatepicker.optionalusertools.DateChangeListener;
--import com.github.lgooddatepicker.zinternaltools.DateChangeEvent;
-+import com.michaelbaranov.microba.calendar.DatePicker;
-
- /**
- * wrapper and service class for the DatePicker handling at the EntryEditor
- */
--public class DatePickerButton implements DateChangeListener {
-+public class DatePickerButton implements ActionListener {
-
-- private final DatePicker datePicker;
-+ private final DatePicker datePicker = new DatePicker();
- private final JPanel panel = new JPanel();
- private final FieldEditor editor;
- private final boolean isoFormat;
-@@ -32,29 +28,24 @@ public class DatePickerButton implements DateChangeListener {
-
- public DatePickerButton(FieldEditor pEditor, Boolean isoFormat) {
- this.isoFormat = isoFormat;
-- // Create a date picker with hidden text field (showing button only).
-- DatePickerSettings dateSettings = new DatePickerSettings();
-- dateSettings.setVisibleDateTextField(false);
-- dateSettings.setGapBeforeButtonPixels(0);
--
-- datePicker = new DatePicker(dateSettings);
-- datePicker.addDateChangeListener(this);
-- datePicker.getComponentToggleCalendarButton().setIcon(IconTheme.JabRefIcon.DATE_PICKER.getIcon());
-- datePicker.getComponentToggleCalendarButton().setText("");
--
-+ datePicker.showButtonOnly(true);
-+ datePicker.addActionListener(this);
-+ datePicker.setShowTodayButton(true);
- panel.setLayout(new BorderLayout());
- panel.add(datePicker, BorderLayout.WEST);
- editor = pEditor;
- }
-
- @Override
-- public void dateChanged(DateChangeEvent dateChangeEvent) {
-- LocalDate date = datePicker.getDate();
-+ public void actionPerformed(ActionEvent e) {
-+ Date date = datePicker.getDate();
- if (date != null) {
- if (isoFormat) {
-- editor.setText(date.format(DateTimeFormatter.ISO_DATE));
-+ editor.setText(EasyDateFormat.isoDateFormat().getDateAt(date));
- } else {
-- EasyDateFormat.fromTimeStampFormat(Globals.prefs.get(JabRefPreferences.TIME_STAMP_FORMAT)).getDateAt(ZonedDateTime.from(date));
-+ editor.setText(EasyDateFormat
-+ .fromTimeStampFormat(Globals.prefs.get(JabRefPreferences.TIME_STAMP_FORMAT))
-+ .getDateAt(date));
- }
- } else {
- // in this case the user selected "none" in the date picker, so we just clear the field
diff --git a/src/main/java/net/sf/jabref/gui/menus/RightClickMenu.java b/src/main/java/net/sf/jabref/gui/menus/RightClickMenu.java
index f5ce7dd3f..ca816a900 100644
--- a/src/main/java/net/sf/jabref/gui/menus/RightClickMenu.java
@@ -655,10 +575,10 @@ index 38bdaf180..205384ebc 100644
.getBuilder()
diff --git a/src/main/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorker.java b/src/main/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorker.java
deleted file mode 100644
-index c3daa9472..000000000
+index d74d53e14..000000000
--- a/src/main/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorker.java
+++ /dev/null
-@@ -1,195 +0,0 @@
+@@ -1,185 +0,0 @@
-package net.sf.jabref.gui.worker;
-
-import java.awt.datatransfer.StringSelection;
@@ -667,8 +587,6 @@ index c3daa9472..000000000
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
--import java.util.regex.Pattern;
--import java.util.stream.Collectors;
-
-import javax.swing.SwingWorker;
-
@@ -699,9 +617,6 @@ index c3daa9472..000000000
-public class CitationStyleToClipboardWorker extends SwingWorker<List<String>, Void> {
-
- private static final Log LOGGER = LogFactory.getLog(CitationStyleToClipboardWorker.class);
-- private static final Pattern REMOVE_HTML = Pattern.compile("<(?!br)(?!BR).*?>");
-- private static final Pattern WHITESPACE = Pattern.compile("(?m)^\\s|\\v+");
-- private static final Pattern HTML_NEWLINE = Pattern.compile("<br>|<BR>");
-
- private final BasePanel basePanel;
- private final List<BibEntry> selectedEntries;
@@ -784,12 +699,7 @@ index c3daa9472..000000000
- */
- protected static HtmlTransferable processPreview(List<String> citations) {
- String html = String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations);
-- String plain = citations.stream().map(c -> {
-- String tmp = WHITESPACE.matcher(c).replaceAll("");
-- tmp = REMOVE_HTML.matcher(tmp).replaceAll("");
-- return HTML_NEWLINE.matcher(tmp).replaceAll(OS.NEWLINE) + OS.NEWLINE;
-- }).collect(Collectors.joining(""));
-- return new HtmlTransferable(html, plain);
+- return new HtmlTransferable(html);
- }
-
- /**
@@ -1352,23 +1262,51 @@ index 6306dc0ff..000000000
-
-}
diff --git a/src/main/java/net/sf/jabref/logic/util/date/EasyDateFormat.java b/src/main/java/net/sf/jabref/logic/util/date/EasyDateFormat.java
-index 25885be93..3eb5a03dd 100644
---- a/src/main/java/net/sf/jabref/logic/util/date/EasyDateFormat.java
+new file mode 100644
+index 000000000..3eb5a03dd
+--- /dev/null
+++ b/src/main/java/net/sf/jabref/logic/util/date/EasyDateFormat.java
-@@ -1,7 +1,9 @@
- package net.sf.jabref.logic.util.date;
-
+@@ -0,0 +1,63 @@
++package net.sf.jabref.logic.util.date;
++
+import java.time.ZoneId;
- import java.time.ZonedDateTime;
- import java.time.format.DateTimeFormatter;
++import java.time.ZonedDateTime;
++import java.time.format.DateTimeFormatter;
+import java.util.Date;
-
- public class EasyDateFormat {
-
-@@ -36,6 +38,16 @@ public class EasyDateFormat {
- *
- * @return The formatted date string.
- */
++
++public class EasyDateFormat {
++
++ /**
++ * The formatter objects
++ */
++ private final DateTimeFormatter dateFormatter;
++
++
++ public EasyDateFormat(String dateFormat) {
++ this(DateTimeFormatter.ofPattern(dateFormat));
++ }
++
++ public EasyDateFormat(DateTimeFormatter dateFormatter) {
++ this.dateFormatter = dateFormatter;
++ }
++
++ /**
++ * Creates a String containing the current date (and possibly time),
++ * formatted according to the format set in preferences under the key
++ * "timeStampFormat".
++ *
++ * @return The date string.
++ */
++ public String getCurrentDate() {
++ return getDateAt(ZonedDateTime.now());
++ }
++
++ /**
++ * Creates a readable Date string from the parameter date. The format is set
++ * in preferences under the key "timeStampFormat".
++ *
++ * @return The formatted date string.
++ */
+ public String getDateAt(Date date) {
+ return getDateAt(date.toInstant().atZone(ZoneId.systemDefault()));
+ }
@@ -1379,9 +1317,19 @@ index 25885be93..3eb5a03dd 100644
+ *
+ * @return The formatted date string.
+ */
- public String getDateAt(ZonedDateTime dateTime) {
- // first use, create an instance
- return dateTime.format(dateFormatter);
++ public String getDateAt(ZonedDateTime dateTime) {
++ // first use, create an instance
++ return dateTime.format(dateFormatter);
++ }
++
++ public static EasyDateFormat fromTimeStampFormat(String timeStampFormat) {
++ return new EasyDateFormat(timeStampFormat);
++ }
++
++ public static EasyDateFormat isoDateFormat() {
++ return new EasyDateFormat(DateTimeFormatter.ISO_LOCAL_DATE);
++ }
++}
diff --git a/src/main/java/net/sf/jabref/logic/util/strings/DiffHighlighting.java b/src/main/java/net/sf/jabref/logic/util/strings/DiffHighlighting.java
deleted file mode 100644
index ba6463b1f..000000000
@@ -1490,7 +1438,7 @@ index ba6463b1f..000000000
-
-}
diff --git a/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java b/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java
-index 4c91d2a70..0cb30420b 100644
+index 0c05e671d..6a395e8bd 100644
--- a/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java
@@ -42,7 +42,6 @@ import net.sf.jabref.logic.autocompleter.AutoCompletePreferences;
@@ -1501,7 +1449,7 @@ index 4c91d2a70..0cb30420b 100644
import net.sf.jabref.logic.cleanup.CleanupPreferences;
import net.sf.jabref.logic.cleanup.CleanupPreset;
import net.sf.jabref.logic.cleanup.Cleanups;
-@@ -799,7 +798,7 @@ public class JabRefPreferences {
+@@ -800,7 +799,7 @@ public class JabRefPreferences {
defaults.put(VERSION_IGNORED_UPDATE, "");
// preview
@@ -1638,7 +1586,7 @@ index 2cae95385..000000000
-
-}
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
-index 1798e9656..8642ca84d 100644
+index 5c1e2ba60..617214ab3 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -975,11 +975,7 @@ Preferences=Indstillinger
@@ -1661,7 +1609,7 @@ index 1798e9656..8642ca84d 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
-index 05bf7882c..d7efde6c2 100644
+index e894ee473..b9cff46a2 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -975,11 +975,7 @@ Preferences=Einstellungen
@@ -1684,7 +1632,7 @@ index 05bf7882c..d7efde6c2 100644
-Copied_%0_citations.=Es_wurden_%0_Zitierungen_kopiert.
-Copying...=Kopiere...
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
-index 77d73ccf0..8db3c5d74 100644
+index e8a228e22..cca0328a5 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -975,11 +975,7 @@ Preferences=Preferences
@@ -1707,7 +1655,7 @@ index 77d73ccf0..8db3c5d74 100644
-Copied_%0_citations.=Copied_%0_citations.
-Copying...=Copying...
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
-index 60d05f66b..f1c98da92 100644
+index 5522c9b31..a242a1ea3 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -975,11 +975,7 @@ Preferences=Preferencias
@@ -1730,7 +1678,7 @@ index 60d05f66b..f1c98da92 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
-index 95a914796..9a0d5b13c 100644
+index 6c8b7f75d..a8e4751b8 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -975,11 +975,7 @@ Preferences=
@@ -1753,7 +1701,7 @@ index 95a914796..9a0d5b13c 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
-index be874a0af..bb2a42655 100644
+index adf5afce9..c0782a7e6 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -975,11 +975,7 @@ Preferences=Préférences
@@ -1768,15 +1716,8 @@ index be874a0af..bb2a42655 100644
Preview_style_changed_to\:_%0=Style_d'aperçu_modifié_en_:_%0
Next_preview_layout=Mode_d'aperçu_suivant
Previous_preview_layout=Mode_d'aperçu_précédent
-@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
-
- Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=Le_type_d'entrée_%0_est_uniquement_défini_pour_BibLaTeX_et_pas_pour_BibTeX
- Jump_to_entry=Aller_à_cette_entrée
--
--Copied_%0_citations.=
--Copying...=
diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
-index b3cc8c430..28829bb3e 100644
+index e6980343f..d2a0a8cf6 100644
--- a/src/main/resources/l10n/JabRef_in.properties
+++ b/src/main/resources/l10n/JabRef_in.properties
@@ -975,11 +975,7 @@ Preferences=Preferensi
@@ -1799,7 +1740,7 @@ index b3cc8c430..28829bb3e 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
-index 35d14ed46..74815df44 100644
+index 27cb2a4b8..d0c62360c 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -975,11 +975,7 @@ Preferences=Preferenze
@@ -1822,7 +1763,7 @@ index 35d14ed46..74815df44 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
-index 2d5571b09..1c3f2887c 100644
+index 464381bab..77591ea21 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -975,11 +975,7 @@ Preferences=設定
@@ -1845,7 +1786,7 @@ index 2d5571b09..1c3f2887c 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
-index 23328275c..af900a3cd 100644
+index 87a7403e3..4bc01aac1 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -975,11 +975,7 @@ Preferences=Instellingen
@@ -1868,7 +1809,7 @@ index 23328275c..af900a3cd 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
-index 5409f8d2b..6e7245413 100644
+index 4c5e41cd6..d91b3279a 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -975,11 +975,7 @@ Preferences=Oppsett
@@ -1891,7 +1832,7 @@ index 5409f8d2b..6e7245413 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
-index 92155f07d..1eb8e192f 100644
+index 06a731365..c6ed8c88a 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -975,11 +975,7 @@ Preferences=Preferências
@@ -1914,7 +1855,7 @@ index 92155f07d..1eb8e192f 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
-index 3e1661f59..d8b4ddb2a 100644
+index a484372d7..f8b556687 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -975,11 +975,7 @@ Preferences=Пользовательские_настройки
@@ -1937,7 +1878,7 @@ index 3e1661f59..d8b4ddb2a 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
-index 7a0fff6bc..1770ccd1b 100644
+index 60e54b9c1..683954ed4 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -975,11 +975,7 @@ Preferences=Inställningar
@@ -1960,7 +1901,7 @@ index 7a0fff6bc..1770ccd1b 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
-index e2f618abf..c16c9f694 100644
+index 9d8eec104..7a3894ba3 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -975,11 +975,7 @@ Preferences=Tercihler
@@ -1983,7 +1924,7 @@ index e2f618abf..c16c9f694 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
-index 17b32c167..f0e7def0e 100644
+index 70ffae957..095eb3a26 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -975,11 +975,7 @@ Preferences=Các_tùy_thích
@@ -2006,7 +1947,7 @@ index 17b32c167..f0e7def0e 100644
-Copied_%0_citations.=
-Copying...=
diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
-index acca530dd..4af9d5edd 100644
+index 2791c4344..d85dc5a62 100644
--- a/src/main/resources/l10n/JabRef_zh.properties
+++ b/src/main/resources/l10n/JabRef_zh.properties
@@ -975,11 +975,7 @@ Preferences=首选项
@@ -2078,16 +2019,6 @@ index bf9e2f1f5..3cef28936 100644
Copy_DOI_url=
-
-Copy_citation=
-diff --git a/src/main/resources/l10n/Menu_fr.properties b/src/main/resources/l10n/Menu_fr.properties
-index e6852d4bf..22e5451f7 100644
---- a/src/main/resources/l10n/Menu_fr.properties
-+++ b/src/main/resources/l10n/Menu_fr.properties
-@@ -135,5 +135,3 @@ Development_version=Version_en_développement
- View_change_log=Afficher_le_fichier_des_changements
- Copy_BibTeX_key_and_link=Copier_la_clef_BibTeX_et_le_lien
- Copy_DOI_url=Copier_l'URL_du_DOI
--
--Copy_citation=
diff --git a/src/main/resources/l10n/Menu_in.properties b/src/main/resources/l10n/Menu_in.properties
index c87591cbc..accd0c7a9 100644
--- a/src/main/resources/l10n/Menu_in.properties
@@ -2200,10 +2131,10 @@ index ef82349fc..c34246e67 100644
-Copy_citation=
diff --git a/src/test/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java b/src/test/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java
deleted file mode 100644
-index 2b9456369..000000000
+index 0bf7c6216..000000000
--- a/src/test/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java
+++ /dev/null
-@@ -1,220 +0,0 @@
+@@ -1,233 +0,0 @@
-package net.sf.jabref.gui.worker;
-
-import java.awt.datatransfer.DataFlavor;
@@ -2223,8 +2154,8 @@ index 2b9456369..000000000
-
- @Test
- public void processPreviewText() throws Exception {
-- String expected = "Article (Smith2016)Smith, B.; Jones, B. & Williams, J.Taylor, P. (Ed.)Title of the test entry BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 Abstract: This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE +
-- "Article (Smith2016)Smith, B.; Jones, B. & Williams, J.Taylor, P. (Ed.)Title of the test entry BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 Abstract: This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE;
+- String expected = "Article (Smith2016)Smith, B.; Jones, B. & Williams, J.Taylor, P. (Ed.)Title of the test entry BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 Abstract: This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger." + OS.NEWLINE +
+- "Article (Smith2016)Smith, B.; Jones, B. & Williams, J.Taylor, P. (Ed.)Title of the test entry BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 Abstract: This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger.";
-
- String citation = "Article (Smith2016)" + OS.NEWLINE +
- "Smith, B.; Jones, B. & Williams, J." + OS.NEWLINE +
@@ -2394,7 +2325,7 @@ index 2b9456369..000000000
- }
-
- @Test
-- public void processHtml() throws Exception {
+- public void processHtmlAsHtml() throws Exception {
- String expected = "<!DOCTYPE html>" + OS.NEWLINE +
- "<html>" + OS.NEWLINE +
- " <head>" + OS.NEWLINE +
@@ -2419,10 +2350,23 @@ index 2b9456369..000000000
- " </div>" + OS.NEWLINE;
- HtmlTransferable htmlTransferable = CitationStyleToClipboardWorker.processHtml(Arrays.asList(citation, citation));
-
-- Object actual = htmlTransferable.getTransferData(DataFlavor.stringFlavor);
+- Object actual = htmlTransferable.getTransferData(DataFlavor.allHtmlFlavor);
- Assert.assertEquals(expected, actual);
- }
-
+- @Test
+- public void processHtmlAsText() throws Exception {
+- String expected = "[1] B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal , vol. 34, no. 3, pp. 45–67, Jul. 2016." + OS.NEWLINE +
+- "[1] B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal , vol. 34, no. 3, pp. 45–67, Jul. 2016.";
+-
+- String citation = " <div class=\"csl-entry\">" + OS.NEWLINE +
+- " <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>" + OS.NEWLINE +
+- " </div>" + OS.NEWLINE;
+- HtmlTransferable htmlTransferable = CitationStyleToClipboardWorker.processHtml(Arrays.asList(citation, citation));
+-
+- Object actual = htmlTransferable.getTransferData(DataFlavor.stringFlavor);
+- Assert.assertEquals(expected, actual);
+- }
-}
diff --git a/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleGeneratorTest.java b/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
deleted file mode 100644
diff --git a/debian/patches/040_disable_macadapter.patch b/debian/patches/040_disable_macadapter.patch
deleted file mode 100644
index 0fba08f..0000000
--- a/debian/patches/040_disable_macadapter.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: disable OSX-specific functionality for building on Debian
-Author: tony mancill <tmancill at debian.org>
-Forwarded: not-needed
-
---- a/src/main/java/osx/macadapter/MacAdapter.java
-+++ b/src/main/java/osx/macadapter/MacAdapter.java
-@@ -1,5 +1,5 @@
- package osx.macadapter;
--
-+/*
- import java.io.File;
- import java.util.List;
-
-@@ -18,7 +18,10 @@
- import com.apple.eawt.PreferencesHandler;
- import com.apple.eawt.QuitHandler;
- import com.apple.eawt.QuitResponse;
-+*/
-
-+public class MacAdapter {
-+/*
- public class MacAdapter implements PreferencesHandler, AboutHandler, QuitHandler, OpenFilesHandler, AppReOpenedListener {
-
- private JabRefFrame parentFrame;
-@@ -82,4 +85,5 @@
- public void appReOpened(AppEvent.AppReOpenedEvent appReOpenedEvent) {
- parentFrame.setVisible(true);
- }
-+*/
- }
---- a/src/main/java/net/sf/jabref/gui/JabRefFrame.java
-+++ b/src/main/java/net/sf/jabref/gui/JabRefFrame.java
-@@ -667,9 +667,12 @@
- //Note: The registration of Apple event is at the end of initialization, because
- //if the events happen too early (ie when the window is not initialized yet), the
- //opened (double-clicked) documents are not displayed.
-+
-+ /* Debian: not applicable
- if (OS.OS_X) {
- LOGGER.fatal("This program is not designed to run at Mac OS X");
- }
-+ */
-
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 7728069..05d6abc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
-001_koppor_debian_3.8.patch
+001_koppor_debian_3.8.1.patch
010_gradle_build.patch
020_disable_automatic_upgrade_check.patch
030_xjc.patch
-040_disable_macadapter.patch
050_unirest_json.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git
More information about the pkg-java-commits
mailing list