This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch dev in repository jabref.
commit 92461ceeb17353958f5ce94ae03b15d569fab94d Author: tony mancill <[email protected]> Date: Sat Dec 24 14:06:32 2016 -0800 freshen 001_koppor patch to de-fuzz it --- debian/patches/001_koppor_debian_3.8.1.patch | 318 ++++++++------------------- 1 file changed, 92 insertions(+), 226 deletions(-) diff --git a/debian/patches/001_koppor_debian_3.8.1.patch b/debian/patches/001_koppor_debian_3.8.1.patch index 796eba1..d92bf28 100644 --- a/debian/patches/001_koppor_debian_3.8.1.patch +++ b/debian/patches/001_koppor_debian_3.8.1.patch @@ -3,11 +3,9 @@ Author: Oliver Kopp <[email protected]> Source: https://github.com/koppor/jabref/commits/debian_3.8.1 Forwarded: not-needed -diff --git a/build.gradle b/build.gradle -index 4fd9015a6..b4bc6a0b2 100644 --- a/build.gradle +++ b/build.gradle -@@ -91,8 +91,6 @@ dependencies { +@@ -91,8 +91,6 @@ compile 'org.openoffice:ridl:4.1.2' compile 'org.openoffice:unoil:4.1.2' @@ -16,7 +14,7 @@ index 4fd9015a6..b4bc6a0b2 100644 antlr3 'org.antlr:antlr:3.5.2' compile 'org.antlr:antlr-runtime:3.5.2' -@@ -102,7 +100,7 @@ dependencies { +@@ -102,7 +100,7 @@ // 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.40' @@ -25,7 +23,7 @@ index 4fd9015a6..b4bc6a0b2 100644 compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1' compile fileTree(dir: 'lib', includes: ['*.jar']) -@@ -123,13 +121,6 @@ dependencies { +@@ -123,13 +121,6 @@ compile 'org.xmlunit:xmlunit-core:2.3.0' compile 'org.xmlunit:xmlunit-matchers:2.3.0' @@ -39,11 +37,9 @@ index 4fd9015a6..b4bc6a0b2 100644 testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:2.3.0' testCompile 'com.github.tomakehurst:wiremock:2.4.1' -diff --git a/external-libraries.txt b/external-libraries.txt -index 9d4ee4843..d50c2ca60 100644 --- a/external-libraries.txt +++ b/external-libraries.txt -@@ -22,11 +22,6 @@ Note: It is important to include v1.5.54 or later as v1.5.54 is the first ver +@@ -22,11 +22,6 @@ # Libraries @@ -55,7 +51,7 @@ index 9d4ee4843..d50c2ca60 100644 Id: org.antlr:antlr Project: ANTLR 3 URL: http://www.antlr.org/ -@@ -47,16 +42,6 @@ Project: Apache Commons Logging +@@ -47,16 +42,6 @@ URL: http://commons.apache.org/logging/ License: Apache-2.0 @@ -72,7 +68,7 @@ index 9d4ee4843..d50c2ca60 100644 Id: com.jgoodies:jgoodies-common Project: JGoodies Common URL: http://www.jgoodies.com/downloads/libraries/ -@@ -147,10 +132,11 @@ Project: SwingX +@@ -147,10 +132,11 @@ URL: https://swingx.java.net/ License: LGPL-3.0 @@ -88,7 +84,7 @@ index 9d4ee4843..d50c2ca60 100644 Id: spin Path: lib/spin.jar -@@ -158,19 +144,4 @@ Project: Spin +@@ -158,19 +144,4 @@ URL: http://spin.sourceforge.net/ License: LGPL-2.1+ @@ -108,9 +104,6 @@ index 9d4ee4843..d50c2ca60 100644 -Licence: Apache-2.0 - The last entry has to end with an empty line. Otherwise the entry is not present in About.html. -diff --git a/licenses/com.apple_AppleJavaExtensions.txt b/licenses/com.apple_AppleJavaExtensions.txt -deleted file mode 100644 -index 08fb3d1cf..000000000 --- a/licenses/com.apple_AppleJavaExtensions.txt +++ /dev/null @@ -1,51 +0,0 @@ @@ -165,19 +158,17 @@ index 08fb3d1cf..000000000 -POSSIBILITY OF SUCH DAMAGE. - -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 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; +@@ -91,7 +91,6 @@ import net.sf.jabref.gui.util.component.CheckBoxMessage; import net.sf.jabref.gui.worker.AbstractWorker; import net.sf.jabref.gui.worker.CallBack; -import net.sf.jabref.gui.worker.CitationStyleToClipboardWorker; import net.sf.jabref.gui.worker.MarkEntriesAction; import net.sf.jabref.gui.worker.SendAsEMailAction; - import net.sf.jabref.gui.worker.Worker; -@@ -100,8 +99,6 @@ import net.sf.jabref.logic.autocompleter.AutoCompleter; + import net.sf.jabref.logic.autocompleter.AutoCompletePreferences; +@@ -99,8 +98,6 @@ import net.sf.jabref.logic.autocompleter.AutoCompleterFactory; import net.sf.jabref.logic.autocompleter.ContentAutoCompleters; import net.sf.jabref.logic.bibtexkeypattern.BibtexKeyPatternUtil; @@ -186,7 +177,7 @@ index ad57fa9d3..b53517a36 100644 import net.sf.jabref.logic.exporter.BibtexDatabaseWriter; import net.sf.jabref.logic.exporter.FileSaveSession; import net.sf.jabref.logic.exporter.SaveException; -@@ -153,8 +150,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe +@@ -152,8 +149,6 @@ private final BibDatabaseContext bibDatabaseContext; private final MainTableDataModel tableModel; @@ -195,7 +186,7 @@ index ad57fa9d3..b53517a36 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; -@@ -221,8 +216,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe +@@ -220,8 +215,6 @@ this.frame = frame; this.tableModel = new MainTableDataModel(getBibDatabaseContext()); @@ -204,7 +195,7 @@ index ad57fa9d3..b53517a36 100644 setupMainPanel(); setupActions(); -@@ -494,12 +487,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe +@@ -493,12 +486,6 @@ // 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 +208,7 @@ index ad57fa9d3..b53517a36 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)); -@@ -706,14 +693,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe +@@ -705,14 +692,6 @@ actions.put(Actions.DOWNLOAD_FULL_TEXT, new FindFullTextAction(this)); } @@ -232,7 +223,7 @@ index ad57fa9d3..b53517a36 100644 private void copy() { List<BibEntry> bes = mainTable.getSelectedEntries(); -@@ -2414,10 +2393,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe +@@ -2413,10 +2392,6 @@ this.currentSearchQuery = currentSearchQuery; } @@ -243,11 +234,9 @@ index ad57fa9d3..b53517a36 100644 public PreviewPanel getPreviewPanel() { 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 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 { +@@ -158,7 +158,6 @@ FACEBOOK("\uf20c"), /* css: facebook */ BLOG("\uf46b"), /* css: rss */ GLOBAL_SEARCH("\uF1E7"), /* css: earth */ @@ -255,11 +244,9 @@ index b2e1aa9aa..91eb697ad 100644 // STILL MISSING: GROUP_REGULAR("\uF4E6", Color.RED); -diff --git a/src/main/java/net/sf/jabref/gui/JabRefFrame.java b/src/main/java/net/sf/jabref/gui/JabRefFrame.java -index 31c543522..648dcb0d2 100644 --- a/src/main/java/net/sf/jabref/gui/JabRefFrame.java +++ b/src/main/java/net/sf/jabref/gui/JabRefFrame.java -@@ -139,9 +139,9 @@ import net.sf.jabref.preferences.SearchPreferences; +@@ -139,9 +139,9 @@ import com.google.common.eventbus.Subscribe; import com.jgoodies.looks.HeaderStyle; import com.jgoodies.looks.Options; @@ -270,7 +257,7 @@ index 31c543522..648dcb0d2 100644 /** * The main window of the application. -@@ -668,11 +668,7 @@ public class JabRefFrame extends JFrame implements OutputPrinter { +@@ -668,11 +668,7 @@ //if the events happen too early (ie when the window is not initialized yet), the //opened (double-clicked) documents are not displayed. if (OS.OS_X) { @@ -283,11 +270,9 @@ index 31c543522..648dcb0d2 100644 } } -diff --git a/src/main/java/net/sf/jabref/gui/PreviewPanel.java b/src/main/java/net/sf/jabref/gui/PreviewPanel.java -index 4d7d10be5..014519479 100644 --- a/src/main/java/net/sf/jabref/gui/PreviewPanel.java +++ b/src/main/java/net/sf/jabref/gui/PreviewPanel.java -@@ -31,8 +31,6 @@ import net.sf.jabref.JabRefExecutorService; +@@ -31,8 +31,6 @@ import net.sf.jabref.gui.desktop.JabRefDesktop; import net.sf.jabref.gui.fieldeditors.PreviewPanelTransferHandler; import net.sf.jabref.gui.keyboard.KeyBinding; @@ -296,7 +281,7 @@ index 4d7d10be5..014519479 100644 import net.sf.jabref.logic.exporter.ExportFormats; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.layout.Layout; -@@ -79,7 +77,6 @@ public class PreviewPanel extends JPanel implements SearchQueryHighlightListener +@@ -79,7 +77,6 @@ private final CopyPreviewAction copyPreviewAction = new CopyPreviewAction(); private Optional<Pattern> highlightPattern = Optional.empty(); @@ -304,7 +289,7 @@ index 4d7d10be5..014519479 100644 /** * @param databaseContext -@@ -202,21 +199,10 @@ public class PreviewPanel extends JPanel implements SearchQueryHighlightListener +@@ -202,21 +199,10 @@ PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences(); String style = previewPreferences.getPreviewCycle().get(previewPreferences.getPreviewCyclePosition()); @@ -326,7 +311,7 @@ index 4d7d10be5..014519479 100644 update(); } -@@ -264,11 +250,6 @@ public class PreviewPanel extends JPanel implements SearchQueryHighlightListener +@@ -264,11 +250,6 @@ public void update() { ExportFormats.entryNumber = 1; // Set entry number in case that is included in the preview layout. @@ -338,7 +323,7 @@ index 4d7d10be5..014519479 100644 if (layout.isPresent()){ StringBuilder sb = new StringBuilder(); bibEntry.ifPresent(entry -> sb.append(layout.get() -@@ -276,10 +257,6 @@ public class PreviewPanel extends JPanel implements SearchQueryHighlightListener +@@ -276,10 +257,6 @@ setPreviewLabel(sb.toString()); markHighlights(); } @@ -349,7 +334,7 @@ index 4d7d10be5..014519479 100644 } -@@ -316,18 +293,12 @@ public class PreviewPanel extends JPanel implements SearchQueryHighlightListener +@@ -316,18 +293,12 @@ /** * this fixes the Layout, the user cannot change it anymore. Useful for testing the styles in the settings @@ -369,11 +354,9 @@ index 4d7d10be5..014519479 100644 } else { LOGGER.error("unknown style type"); } -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 +++ b/src/main/java/net/sf/jabref/gui/menus/RightClickMenu.java -@@ -29,7 +29,6 @@ import net.sf.jabref.gui.specialfields.SpecialFieldMenuAction; +@@ -29,7 +29,6 @@ import net.sf.jabref.gui.specialfields.SpecialFieldValueViewModel; import net.sf.jabref.gui.specialfields.SpecialFieldViewModel; import net.sf.jabref.gui.worker.MarkEntriesAction; @@ -381,7 +364,7 @@ index f5ce7dd3f..ca816a900 100644 import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.FieldName; -@@ -73,17 +72,7 @@ public class RightClickMenu extends JPopupMenu implements PopupMenuListener { +@@ -73,17 +72,7 @@ // the submenu will behave dependent on what style is currently selected (citation/preview) PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences(); String style = previewPreferences.getPreviewCycle().get(previewPreferences.getPreviewCyclePosition()); @@ -399,11 +382,9 @@ index f5ce7dd3f..ca816a900 100644 copySpecialMenu.add(new GeneralAction(Actions.EXPORT_TO_CLIPBOARD, Localization.lang("Export to clipboard"), IconTheme.JabRefIcon.EXPORT_TO_CLIPBOARD.getSmallIcon())); -diff --git a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java -index e5b65c483..1b19f585e 100644 --- a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java +++ b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java -@@ -34,7 +34,6 @@ import net.sf.jabref.logic.bibtex.BibEntryWriter; +@@ -34,7 +34,6 @@ import net.sf.jabref.logic.bibtex.LatexFieldFormatter; import net.sf.jabref.logic.formatter.casechanger.SentenceCaseFormatter; import net.sf.jabref.logic.l10n.Localization; @@ -411,7 +392,7 @@ index e5b65c483..1b19f585e 100644 import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.InternalBibtexFields; -@@ -272,7 +271,7 @@ public class MergeEntries { +@@ -272,7 +271,7 @@ mergePanel.add(boldFontLabel(Localization.lang("Entry type")), CELL_CONSTRAINTS.xy(1, 1)); JTextPane leftTypeDisplay = new DiffHighlightingTextPane(); @@ -420,7 +401,7 @@ index e5b65c483..1b19f585e 100644 mergePanel.add(leftTypeDisplay, CELL_CONSTRAINTS.xy(3, 1)); if (leftEntry.getType().equals(rightEntry.getType())) { identicalTypes = true; -@@ -290,13 +289,14 @@ public class MergeEntries { +@@ -290,13 +289,14 @@ typeRadioButtons.get(0).setSelected(true); } JTextPane rightTypeDisplay = new DiffHighlightingTextPane(); @@ -436,7 +417,7 @@ index e5b65c483..1b19f585e 100644 // Set headings for (int i = 0; i < 6; i++) { -@@ -362,33 +362,11 @@ public class MergeEntries { +@@ -362,33 +362,11 @@ for (String field : fields) { String leftString = leftEntry.getField(field).orElse(""); String rightString = rightEntry.getField(field).orElse(""); @@ -472,11 +453,9 @@ index e5b65c483..1b19f585e 100644 } } SwingUtilities.invokeLater(() -> scrollPane.getVerticalScrollBar() -diff --git a/src/main/java/net/sf/jabref/gui/preftabs/PreviewPrefsTab.java b/src/main/java/net/sf/jabref/gui/preftabs/PreviewPrefsTab.java -index 38bdaf180..205384ebc 100644 --- a/src/main/java/net/sf/jabref/gui/preftabs/PreviewPrefsTab.java +++ b/src/main/java/net/sf/jabref/gui/preftabs/PreviewPrefsTab.java -@@ -5,7 +5,6 @@ import java.awt.Dimension; +@@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; @@ -484,7 +463,7 @@ index 38bdaf180..205384ebc 100644 import javax.swing.BoxLayout; import javax.swing.DefaultListModel; -@@ -16,13 +15,11 @@ import javax.swing.JPanel; +@@ -16,13 +15,11 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.ListSelectionModel; @@ -498,7 +477,7 @@ index 38bdaf180..205384ebc 100644 import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.util.TestEntry; import net.sf.jabref.preferences.PreviewPreferences; -@@ -38,8 +35,6 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab { +@@ -38,8 +35,6 @@ private static final Log LOGGER = LogFactory.getLog(PreviewPrefsTab.class); @@ -507,7 +486,7 @@ index 38bdaf180..205384ebc 100644 private final DefaultListModel<Object> availableModel = new DefaultListModel<>(); private final DefaultListModel<Object> chosenModel = new DefaultListModel<>(); -@@ -171,16 +166,12 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab { +@@ -171,16 +166,12 @@ chosenModel.clear(); boolean isPreviewChosen = false; for (String style : previewPreferences.getPreviewCycle()) { @@ -524,7 +503,7 @@ index 38bdaf180..205384ebc 100644 } availableModel.clear(); -@@ -193,35 +184,6 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab { +@@ -193,35 +184,6 @@ btnUp.setEnabled(!chosen.isSelectionEmpty()); btnDown.setEnabled(!chosen.isSelectionEmpty()); @@ -560,7 +539,7 @@ index 38bdaf180..205384ebc 100644 layout.setText(Globals.prefs.getPreviewPreferences().getPreviewStyle().replace("__NEWLINE__", "\n")); } -@@ -231,11 +193,7 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab { +@@ -231,11 +193,7 @@ Enumeration<Object> elements = chosenModel.elements(); while (elements.hasMoreElements()) { Object obj = elements.nextElement(); @@ -573,9 +552,6 @@ index 38bdaf180..205384ebc 100644 } PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences() .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 d74d53e14..000000000 --- a/src/main/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorker.java +++ /dev/null @@ -1,185 +0,0 @@ @@ -764,9 +740,6 @@ index d74d53e14..000000000 - } - -} -diff --git a/src/main/java/net/sf/jabref/gui/worker/CitationStyleWorker.java b/src/main/java/net/sf/jabref/gui/worker/CitationStyleWorker.java -deleted file mode 100644 -index 1cd1489d7..000000000 --- a/src/main/java/net/sf/jabref/gui/worker/CitationStyleWorker.java +++ /dev/null @@ -1,77 +0,0 @@ @@ -847,9 +820,6 @@ index 1cd1489d7..000000000 - } - -} -diff --git a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyle.java b/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyle.java -deleted file mode 100644 -index f4988b46d..000000000 --- a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyle.java +++ /dev/null @@ -1,178 +0,0 @@ @@ -1031,9 +1001,6 @@ index f4988b46d..000000000 - } - -} -diff --git a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleCache.java b/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleCache.java -deleted file mode 100644 -index 95d977129..000000000 --- a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleCache.java +++ /dev/null @@ -1,77 +0,0 @@ @@ -1114,9 +1081,6 @@ index 95d977129..000000000 - } - -} -diff --git a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleGenerator.java b/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleGenerator.java -deleted file mode 100644 -index cfa75548b..000000000 --- a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleGenerator.java +++ /dev/null @@ -1,100 +0,0 @@ @@ -1220,9 +1184,6 @@ index cfa75548b..000000000 - } - -} -diff --git a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleOutputFormat.java b/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleOutputFormat.java -deleted file mode 100644 -index 6306dc0ff..000000000 --- a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleOutputFormat.java +++ /dev/null @@ -1,35 +0,0 @@ @@ -1261,9 +1222,6 @@ 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 -new file mode 100644 -index 000000000..3eb5a03dd --- /dev/null +++ b/src/main/java/net/sf/jabref/logic/util/date/EasyDateFormat.java @@ -0,0 +1,63 @@ @@ -1330,9 +1288,6 @@ index 000000000..3eb5a03dd + 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 --- a/src/main/java/net/sf/jabref/logic/util/strings/DiffHighlighting.java +++ /dev/null @@ -1,101 +0,0 @@ @@ -1437,11 +1392,9 @@ 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 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; +@@ -42,7 +42,6 @@ import net.sf.jabref.logic.bibtex.FieldContentParserPreferences; import net.sf.jabref.logic.bibtex.LatexFieldFormatterPreferences; import net.sf.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences; @@ -1449,7 +1402,7 @@ index 0c05e671d..6a395e8bd 100644 import net.sf.jabref.logic.cleanup.CleanupPreferences; import net.sf.jabref.logic.cleanup.CleanupPreset; import net.sf.jabref.logic.cleanup.Cleanups; -@@ -800,7 +799,7 @@ public class JabRefPreferences { +@@ -800,7 +799,7 @@ defaults.put(VERSION_IGNORED_UPDATE, ""); // preview @@ -1458,11 +1411,9 @@ index 0c05e671d..6a395e8bd 100644 defaults.put(CYCLE_PREVIEW_POS, 0); defaults.put(PREVIEW_PANEL_HEIGHT, 200); defaults.put(PREVIEW_ENABLED, Boolean.TRUE); -diff --git a/src/main/java/net/sf/jabref/shared/DBMSType.java b/src/main/java/net/sf/jabref/shared/DBMSType.java -index d27b0af63..e96f567e5 100644 --- a/src/main/java/net/sf/jabref/shared/DBMSType.java +++ b/src/main/java/net/sf/jabref/shared/DBMSType.java -@@ -18,8 +18,8 @@ public enum DBMSType { +@@ -18,8 +18,8 @@ "jdbc:oracle:thin:@%s:%d:%s", 1521), POSTGRESQL( "PostgreSQL", @@ -1473,11 +1424,9 @@ index d27b0af63..e96f567e5 100644 private final String type; private final String driverPath; -diff --git a/src/main/java/net/sf/jabref/shared/PostgreSQLProcessor.java b/src/main/java/net/sf/jabref/shared/PostgreSQLProcessor.java -index 6a302d1a0..61818b325 100644 --- a/src/main/java/net/sf/jabref/shared/PostgreSQLProcessor.java +++ b/src/main/java/net/sf/jabref/shared/PostgreSQLProcessor.java -@@ -4,26 +4,14 @@ import java.sql.PreparedStatement; +@@ -4,26 +4,14 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; @@ -1504,7 +1453,7 @@ index 6a302d1a0..61818b325 100644 public PostgreSQLProcessor(DBMSConnection connection) { super(connection); } -@@ -85,47 +73,4 @@ public class PostgreSQLProcessor extends DBMSProcessor { +@@ -85,47 +73,4 @@ return "\"" + expression + "\""; } @@ -1552,9 +1501,6 @@ index 6a302d1a0..61818b325 100644 - } - } } -diff --git a/src/main/java/net/sf/jabref/shared/listener/PostgresSQLNotificationListener.java b/src/main/java/net/sf/jabref/shared/listener/PostgresSQLNotificationListener.java -deleted file mode 100644 -index 2cae95385..000000000 --- a/src/main/java/net/sf/jabref/shared/listener/PostgresSQLNotificationListener.java +++ /dev/null @@ -1,27 +0,0 @@ @@ -1585,11 +1531,9 @@ index 2cae95385..000000000 - } - -} -diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties -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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Indstillinger_gemt. Preview=Forhåndsvisning @@ -1601,18 +1545,16 @@ index 5c1e2ba60..617214ab3 100644 Preview_style_changed_to\:_%0= Next_preview_layout= Previous_preview_layout= -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties -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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Einstellungen_gespeichert. Preview=Vorschau @@ -1624,18 +1566,16 @@ index e894ee473..b9cff46a2 100644 Preview_style_changed_to\:_%0=Vorschaustil_geändert_zu:_%0 Next_preview_layout=Nächster_Vorschaustil Previous_preview_layout=Voriger_Vorschaustil -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=Abweichende_Anpass +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=Eintragstyp_%0_ist_nur_für_Biblatex,_nicht_aber_für_BibTeX_definiert Jump_to_entry=Springe_zu_Eintrag - -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 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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Preferences_recorded. Preview=Preview @@ -1647,18 +1587,16 @@ index e8a228e22..cca0328a5 100644 Preview_style_changed_to\:_%0=Preview_style_changed_to\:_%0 Next_preview_layout=Next_preview_layout Previous_preview_layout=Previous_preview_layout -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=Different_customiz +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX Jump_to_entry=Jump_to_entry - -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 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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Preferencias_guardadas. Preview=Vista_previa @@ -1670,18 +1608,16 @@ index 5522c9b31..a242a1ea3 100644 Preview_style_changed_to\:_%0= Next_preview_layout= Previous_preview_layout= -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties -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= +@@ -975,11 +975,7 @@ Preferences_recorded.= Preview= @@ -1693,18 +1629,16 @@ index 6c8b7f75d..a8e4751b8 100644 Preview_style_changed_to\:_%0= Next_preview_layout= Previous_preview_layout= -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties -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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Préférences_enregistrées. Preview=Aperçu @@ -1716,11 +1650,9 @@ index adf5afce9..c0782a7e6 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 -diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties -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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Preferensi_disimpan. Preview=Pratampilan @@ -1732,18 +1664,16 @@ index e6980343f..d2a0a8cf6 100644 Preview_style_changed_to\:_%0= Next_preview_layout= Previous_preview_layout= -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties -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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Preferenze_registrate. Preview=Anteprima @@ -1755,18 +1685,16 @@ index 27cb2a4b8..d0c62360c 100644 Preview_style_changed_to\:_%0=Stile_di_anteprima_modificato_in\:_%0 Next_preview_layout=Prossimo_layout_di_anteprima Previous_preview_layout=Successivo_layout_di_anteprima -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=Personalizzazione_ +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=Il_tipo_di_voce_%0_è_definita_per_Biblatex_ma_non_per_BibTeX Jump_to_entry=Salta_alla_voce - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties -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=設定 +@@ -975,11 +975,7 @@ Preferences_recorded.=設定が記録されました。 Preview=プレビュー @@ -1778,18 +1706,16 @@ index 464381bab..77591ea21 100644 Preview_style_changed_to\:_%0=プレビュー様式が_%0_に変更されました Next_preview_layout=次のプレビュー様式 Previous_preview_layout=前のプレビュー様式 -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry=項目へジャンプ - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties -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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Instellingen_opgeslagen. Preview=Voorbeeld @@ -1801,18 +1727,16 @@ index 87a7403e3..4bc01aac1 100644 Preview_style_changed_to\:_%0= Next_preview_layout= Previous_preview_layout= -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties -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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Lagret_oppsett. Preview=Forh\u00e5ndsvisning @@ -1824,18 +1748,16 @@ index 4c5e41cd6..d91b3279a 100644 Preview_style_changed_to\:_%0= Next_preview_layout= Previous_preview_layout= -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -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 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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Preferências_salvas. Preview=Previsualização @@ -1847,18 +1769,16 @@ index 06a731365..c6ed8c88a 100644 Preview_style_changed_to\:_%0= Next_preview_layout= Previous_preview_layout= -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties -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=Пользовательские_настройки +@@ -975,11 +975,7 @@ Preferences_recorded.=Пользовательские_настройки_записаны. Preview=Предварительный_просмотр @@ -1870,18 +1790,16 @@ index a484372d7..f8b556687 100644 Preview_style_changed_to\:_%0= Next_preview_layout= Previous_preview_layout= -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties -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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Inställningar_sparade. Preview=Postvisning @@ -1893,18 +1811,16 @@ index 60e54b9c1..683954ed4 100644 Preview_style_changed_to\:_%0= Next_preview_layout= Previous_preview_layout= -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties -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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Tercihler_kaydedildi. Preview=Önizleme @@ -1916,18 +1832,16 @@ index 9d8eec104..7a3894ba3 100644 Preview_style_changed_to\:_%0= Next_preview_layout= Previous_preview_layout= -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties -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 +@@ -975,11 +975,7 @@ Preferences_recorded.=Các_tùy_thích_được_ghi_lại. Preview=Xem_trước @@ -1939,18 +1853,16 @@ index 70ffae957..095eb3a26 100644 Preview_style_changed_to\:_%0=Thay_đổi_kiểu_xem_trước_theo\:_%0 Next_preview_layout=Xem_trước_bố_trí_tiếp_theo Previous_preview_layout=Xem_trước_bố_trí_trước_đó -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties -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=首选项 +@@ -975,11 +975,7 @@ Preferences_recorded.=首选项被记录。 Preview=预览 @@ -1962,176 +1874,141 @@ index 2791c4344..d85dc5a62 100644 Preview_style_changed_to\:_%0=预览样式更改为\:_%0 Next_preview_layout=下一条预览布局 Previous_preview_layout=上一条预览布局 -@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten= +@@ -2323,6 +2319,3 @@ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX= Jump_to_entry= - -Copied_%0_citations.= -Copying...= -diff --git a/src/main/resources/l10n/Menu_da.properties b/src/main/resources/l10n/Menu_da.properties -index 3454ce9de..3c7faed39 100644 --- a/src/main/resources/l10n/Menu_da.properties +++ b/src/main/resources/l10n/Menu_da.properties -@@ -135,5 +135,3 @@ Development_version= +@@ -135,5 +135,3 @@ View_change_log= Copy_BibTeX_key_and_link= Copy_DOI_url= - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_de.properties b/src/main/resources/l10n/Menu_de.properties -index 52d3c7483..f8e4e2536 100644 --- a/src/main/resources/l10n/Menu_de.properties +++ b/src/main/resources/l10n/Menu_de.properties -@@ -135,5 +135,3 @@ Development_version=Entwicklungsversion +@@ -135,5 +135,3 @@ View_change_log=Changelog_öffnen Copy_BibTeX_key_and_link=BibTeX-Key_und_Link_kopieren Copy_DOI_url=DOI-URL_kopieren - -Copy_citation=Kopiere_Zitation -diff --git a/src/main/resources/l10n/Menu_en.properties b/src/main/resources/l10n/Menu_en.properties -index 4d20f9a75..6a30064bd 100644 --- a/src/main/resources/l10n/Menu_en.properties +++ b/src/main/resources/l10n/Menu_en.properties -@@ -135,5 +135,3 @@ Development_version=Development_version +@@ -135,5 +135,3 @@ View_change_log=View_change_log Copy_BibTeX_key_and_link=Copy_BibTeX_key_and_link Copy_DOI_url=Copy_DOI_url - -Copy_citation=Copy_citation -diff --git a/src/main/resources/l10n/Menu_es.properties b/src/main/resources/l10n/Menu_es.properties -index c6a373605..12598350d 100644 --- a/src/main/resources/l10n/Menu_es.properties +++ b/src/main/resources/l10n/Menu_es.properties -@@ -135,5 +135,3 @@ Development_version=Versión_de_desarrollo +@@ -135,5 +135,3 @@ View_change_log=Ver_registro_de_cambios Copy_BibTeX_key_and_link=Copiar_clave_BibTeX_y_enlace Copy_DOI_url=Copiar_la_url_del_DOI - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_fa.properties b/src/main/resources/l10n/Menu_fa.properties -index bf9e2f1f5..3cef28936 100644 --- a/src/main/resources/l10n/Menu_fa.properties +++ b/src/main/resources/l10n/Menu_fa.properties -@@ -135,5 +135,3 @@ Development_version= +@@ -135,5 +135,3 @@ View_change_log= Copy_BibTeX_key_and_link= Copy_DOI_url= - -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 +++ b/src/main/resources/l10n/Menu_in.properties -@@ -135,5 +135,3 @@ Development_version= +@@ -135,5 +135,3 @@ View_change_log= Copy_BibTeX_key_and_link= Copy_DOI_url= - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_it.properties b/src/main/resources/l10n/Menu_it.properties -index c994dc88d..5392d98d4 100644 --- a/src/main/resources/l10n/Menu_it.properties +++ b/src/main/resources/l10n/Menu_it.properties -@@ -135,5 +135,3 @@ Development_version=Versione_di_sviluppo +@@ -135,5 +135,3 @@ View_change_log=Visualizza_la_lista_delle_modifiche Copy_BibTeX_key_and_link=Copia_la_chiave_e_il_link_BibTeX Copy_DOI_url=Copia_l'url_del_DOI - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_ja.properties b/src/main/resources/l10n/Menu_ja.properties -index c2f476e26..bdcc22c47 100644 --- a/src/main/resources/l10n/Menu_ja.properties +++ b/src/main/resources/l10n/Menu_ja.properties -@@ -135,5 +135,3 @@ Development_version=開発版 +@@ -135,5 +135,3 @@ View_change_log=変更履歴を閲覧 Copy_BibTeX_key_and_link=BibTeX鍵とリンクをコピー Copy_DOI_url=DOIのURLをコピー - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_nl.properties b/src/main/resources/l10n/Menu_nl.properties -index 326bcde8a..ca51ddcd5 100644 --- a/src/main/resources/l10n/Menu_nl.properties +++ b/src/main/resources/l10n/Menu_nl.properties -@@ -135,5 +135,3 @@ Development_version= +@@ -135,5 +135,3 @@ View_change_log= Copy_BibTeX_key_and_link= Copy_DOI_url= - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_no.properties b/src/main/resources/l10n/Menu_no.properties -index 06758073d..31d61399d 100644 --- a/src/main/resources/l10n/Menu_no.properties +++ b/src/main/resources/l10n/Menu_no.properties -@@ -135,5 +135,3 @@ Development_version=Utviklingsversjon +@@ -135,5 +135,3 @@ View_change_log=Vis_endringslogg Copy_BibTeX_key_and_link= Copy_DOI_url= - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_pt_BR.properties b/src/main/resources/l10n/Menu_pt_BR.properties -index 2eba8924d..080a103c9 100644 --- a/src/main/resources/l10n/Menu_pt_BR.properties +++ b/src/main/resources/l10n/Menu_pt_BR.properties -@@ -135,5 +135,3 @@ Development_version= +@@ -135,5 +135,3 @@ View_change_log= Copy_BibTeX_key_and_link= Copy_DOI_url= - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_ru.properties b/src/main/resources/l10n/Menu_ru.properties -index ea0d8b275..48dfbbdc9 100644 --- a/src/main/resources/l10n/Menu_ru.properties +++ b/src/main/resources/l10n/Menu_ru.properties -@@ -135,5 +135,3 @@ Development_version=Версия_для_разработчиков +@@ -135,5 +135,3 @@ View_change_log=Просмотр_журнала_изменений Copy_BibTeX_key_and_link= Copy_DOI_url= - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_sv.properties b/src/main/resources/l10n/Menu_sv.properties -index 570840df4..d798f6782 100644 --- a/src/main/resources/l10n/Menu_sv.properties +++ b/src/main/resources/l10n/Menu_sv.properties -@@ -135,5 +135,3 @@ Development_version=Utvecklingsversion +@@ -135,5 +135,3 @@ View_change_log=Visa_ändringar Copy_BibTeX_key_and_link= Copy_DOI_url= - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_tr.properties b/src/main/resources/l10n/Menu_tr.properties -index 3de436b65..00b2029e4 100644 --- a/src/main/resources/l10n/Menu_tr.properties +++ b/src/main/resources/l10n/Menu_tr.properties -@@ -135,5 +135,3 @@ Development_version=Geliştirme_sürümü +@@ -135,5 +135,3 @@ View_change_log=Değişiklik_kütüğünü_göster Copy_BibTeX_key_and_link=BibTeX_anahtarı_ve_bağlantısını_kopyala Copy_DOI_url=DOI_url'sini_kopyala - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_vi.properties b/src/main/resources/l10n/Menu_vi.properties -index d268ae3a9..55fd8accd 100644 --- a/src/main/resources/l10n/Menu_vi.properties +++ b/src/main/resources/l10n/Menu_vi.properties -@@ -135,5 +135,3 @@ Development_version=Phiên_bản_phát_triển +@@ -135,5 +135,3 @@ View_change_log=Xem_nhật_kí_thay_đổi Copy_BibTeX_key_and_link=Sao_chép_khóa_BibTex_và_đường_liên_kết Copy_DOI_url=Sao_chép_DOI_url - -Copy_citation= -diff --git a/src/main/resources/l10n/Menu_zh.properties b/src/main/resources/l10n/Menu_zh.properties -index ef82349fc..c34246e67 100644 --- a/src/main/resources/l10n/Menu_zh.properties +++ b/src/main/resources/l10n/Menu_zh.properties -@@ -135,5 +135,3 @@ Development_version=开发中版本 +@@ -135,5 +135,3 @@ View_change_log=查看变更记录 Copy_BibTeX_key_and_link=拷贝_BibTeX_key_和链接 Copy_DOI_url=拷贝_DOI_URL - -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 0bf7c6216..000000000 --- a/src/test/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java +++ /dev/null @@ -1,233 +0,0 @@ @@ -2368,9 +2245,6 @@ index 0bf7c6216..000000000 - 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 -index ed7aec24b..000000000 --- a/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleGeneratorTest.java +++ /dev/null @@ -1,119 +0,0 @@ @@ -2493,9 +2367,6 @@ index ed7aec24b..000000000 - } - -} -diff --git a/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleTest.java b/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleTest.java -deleted file mode 100644 -index 1e673494a..000000000 --- a/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleTest.java +++ /dev/null @@ -1,30 +0,0 @@ @@ -2529,9 +2400,6 @@ index 1e673494a..000000000 - } - -} -diff --git a/src/test/java/net/sf/jabref/logic/util/strings/DiffHighlightingTest.java b/src/test/java/net/sf/jabref/logic/util/strings/DiffHighlightingTest.java -deleted file mode 100644 -index 1ba979657..000000000 --- a/src/test/java/net/sf/jabref/logic/util/strings/DiffHighlightingTest.java +++ /dev/null @@ -1,81 +0,0 @@ @@ -2616,11 +2484,9 @@ index 1ba979657..000000000 - DiffHighlighting.generateSymmetricHighlighting("foo bar and some thing", "foo and thing", " ")); - } -} -diff --git a/src/test/java/net/sf/jabref/shared/DBMSTypeTest.java b/src/test/java/net/sf/jabref/shared/DBMSTypeTest.java -index 0ec8936fb..bfe9c0c1e 100644 --- a/src/test/java/net/sf/jabref/shared/DBMSTypeTest.java +++ b/src/test/java/net/sf/jabref/shared/DBMSTypeTest.java -@@ -20,7 +20,7 @@ public class DBMSTypeTest { +@@ -20,7 +20,7 @@ public void testGetDriverClassPath() { Assert.assertEquals("com.mysql.jdbc.Driver", DBMSType.MYSQL.getDriverClassPath()); Assert.assertEquals("oracle.jdbc.driver.OracleDriver", DBMSType.ORACLE.getDriverClassPath()); @@ -2629,7 +2495,7 @@ index 0ec8936fb..bfe9c0c1e 100644 } @Test -@@ -35,7 +35,7 @@ public class DBMSTypeTest { +@@ -35,7 +35,7 @@ public void testGetUrl() { Assert.assertEquals("jdbc:mysql://localhost:3306/xe", DBMSType.MYSQL.getUrl("localhost", 3306, "xe")); Assert.assertEquals("jdbc:oracle:thin:@localhost:1521:xe", DBMSType.ORACLE.getUrl("localhost", 1521, "xe")); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
