[jabref] 431/459: Refresh mrDlib_jayatana.patch.
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:41:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository jabref.
commit 51862827757d2366eeb38aa6245137c13ee70a57
Author: gregor herrmann <gregoa at debian.org>
Date: Wed Mar 12 18:37:44 2014 +0100
Refresh mrDlib_jayatana.patch.
---
debian/patches/mrDlib_jayatana.patch | 50 +++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 23 deletions(-)
diff --git a/debian/patches/mrDlib_jayatana.patch b/debian/patches/mrDlib_jayatana.patch
index c241330..39a7e83 100644
--- a/debian/patches/mrDlib_jayatana.patch
+++ b/debian/patches/mrDlib_jayatana.patch
@@ -1,4 +1,4 @@
-Description: This is the diff between the debian branch and the v_2.10b tag
+Description: This is the diff between the debian branch and the v_2.10 tag
in upstream git; the debian branch was created for us with the purpose to
disable the mrDlib functionality which needs libraries not packaged in
Debian yet.
@@ -6,7 +6,7 @@ Origin: upstream git
Forwarded: not-needed
Author: Oliver Kopp <oliver.kopp at gmail.com>
Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-03-29
+Last-Update: 2014-03-12
--- a/.classpath
+++ b/.classpath
@@ -562,7 +562,7 @@ Last-Update: 2013-03-29
-}
--- a/src/java/spl/PdfImporter.java
+++ b/src/java/spl/PdfImporter.java
-@@ -18,12 +18,8 @@
+@@ -19,12 +19,8 @@
import net.sf.jabref.undo.UndoableInsertEntry;
import net.sf.jabref.util.XMPUtil;
@@ -575,23 +575,24 @@ Last-Update: 2013-03-29
/**
* Created by IntelliJ IDEA.
-@@ -101,7 +97,6 @@
+@@ -129,7 +125,6 @@
BibtexEntryType type;
InputStream in = null;
- List<BibtexEntry> res = null;
+ List<BibtexEntry> localRes = null;
- MetaDataListDialog metaDataListDialog;
switch (choice) {
case ImportDialog.XMP:
//SplDatabaseChangeListener dataListener = new SplDatabaseChangeListener(frame, panel, entryTable, fileName);
-@@ -188,84 +183,9 @@
- panel.adjustSplitter();
+@@ -222,88 +217,10 @@
}
+ res.add(entry);
break;
- case ImportDialog.MRDLIB:
- metaDataListDialog = new MetaDataListDialog(fileName, true);
- Tools.centerRelativeToWindow(metaDataListDialog, frame);
- metaDataListDialog.showDialog();
- Document document = metaDataListDialog.getXmlDocuments();
+- entry = null; // to satisfy the Java compiler
- if(document != null /*&& documents.getDocuments() != null && documents.getDocuments().size() > 0*/ && metaDataListDialog.getResult() == JOptionPane.OK_OPTION){
- int selected = metaDataListDialog.getTableMetadata().getSelectedRow();
- if(selected > -1 /*&& selected < documents.getDocuments().size()*/){
@@ -620,21 +621,24 @@ Last-Update: 2013-03-29
- LabelPatternUtil.makeLabel(panel.metaData(), panel.database(), entry);
- }
- else{
-- createNewBlankEntry(fileName);
+- entry = createNewBlankEntry(fileName);
- }
- }
- else if(metaDataListDialog.getResult() == JOptionPane.CANCEL_OPTION ){
- continue;
- }
- else if(metaDataListDialog.getResult() == JOptionPane.NO_OPTION ){
-- createNewBlankEntry(fileName);
+- entry = createNewBlankEntry(fileName);
- }
- else if(document == null /*|| document.getDocuments() == null || document.getDocuments().size() <= 0*/ && metaDataListDialog.getResult() == JOptionPane.OK_OPTION){
-- createNewBlankEntry(fileName);
+- entry = createNewBlankEntry(fileName);
- }
+- assert(entry != null);
+- res.add(entry);
- break;
case ImportDialog.NOMETA:
- createNewBlankEntry(fileName);
+ entry = createNewBlankEntry(fileName);
+ res.add(entry);
break;
- case ImportDialog.UPDATEEMPTYFIELDS:
- metaDataListDialog = new MetaDataListDialog(fileName, false);
@@ -668,8 +672,8 @@ Last-Update: 2013-03-29
}
}
-@@ -283,58 +203,6 @@
- }
+@@ -322,58 +239,6 @@
+ return newEntry;
}
- private void insertFields(String[] fields, BibtexEntry entry, Document xmlDocument) {
@@ -951,9 +955,9 @@ Last-Update: 2013-03-29
- private JLabel labelMrDlib1;
- private JLabel labelMrDlib2;
private int result;
- private int dropRow;
private String fileName;
-@@ -71,15 +65,7 @@
+ // indicates whether the drop target is a row in the table or whether other kinds of imports are used
+@@ -72,15 +66,7 @@
radioButtonNoMeta = new JRadioButton(Globals.lang("Create_blank_entry_linking_the_PDF"));
radioButtonXmp = new JRadioButton(Globals.lang("Create_entry_based_on_XMP_data"));
radioButtonPDFcontent = new JRadioButton(Globals.lang("Create_entry_based_on_content"));
@@ -969,7 +973,7 @@ Last-Update: 2013-03-29
buttonOK = new JButton(Globals.lang("Ok"));
buttonCancel = new JButton(Globals.lang("Cancel"));
checkBoxDoNotShowAgain = new JCheckBox(Globals.lang("Do not show this box again for this import"));
-@@ -89,12 +75,8 @@
+@@ -90,12 +76,8 @@
b.append(radioButtonNoMeta, 3);
b.append(radioButtonXmp, 3);
b.append(radioButtonPDFcontent, 3);
@@ -982,16 +986,16 @@ Last-Update: 2013-03-29
b.nextLine();
b.append(checkBoxDoNotShowAgain);
b.append(useDefaultPDFImportStyle);
-@@ -114,8 +96,6 @@
- //this.setText();
- if (this.dropRow < 0) {
+@@ -113,8 +95,6 @@
+
+ if (!this.targetIsARow) {
this.radioButtononlyAttachPDF.setEnabled(false);
- this.radioButtonUpdateEmptyFields.setEnabled(false);
- this.labelMrDlib2.setEnabled(false);
}
this.fileName = fileName;
String name = new File(this.fileName).getName();
-@@ -124,8 +104,6 @@
+@@ -123,8 +103,6 @@
} else {
this.labelFileName.setText(new File(this.fileName).getName().substring(0, 33) + "...");
}
@@ -1000,7 +1004,7 @@ Last-Update: 2013-03-29
this.setTitle(LocalizationSupport.message("Import_Metadata_From_PDF"));
setModal(true);
-@@ -136,9 +114,7 @@
+@@ -135,9 +113,7 @@
bg.add(radioButtonNoMeta);
bg.add(radioButtonXmp);
bg.add(radioButtonPDFcontent);
@@ -1010,7 +1014,7 @@ Last-Update: 2013-03-29
buttonOK.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
-@@ -175,15 +151,9 @@
+@@ -174,15 +150,9 @@
case CONTENT:
radioButtonPDFcontent.setSelected(true);
break;
@@ -1026,7 +1030,7 @@ Last-Update: 2013-03-29
default:
// fallback
radioButtonPDFcontent.setSelected(true);
-@@ -218,14 +188,10 @@
+@@ -217,14 +187,10 @@
return XMP;
else if (radioButtonPDFcontent.isSelected())
return CONTENT;
--
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