[jabref] 371/459: Refresh patches.
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:41:11 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 bb4e1163344f9cccb1cda4985487bf73f622dc8a
Author: gregor herrmann <gregoa at debian.org>
Date: Tue Jan 1 17:35:16 2013 +0100
Refresh patches.
---
debian/patches/debian_libs.patch | 218 ++++++++++++++--------------
debian/patches/mrDlib_jayatana.patch | 269 ++++++++++++++++++-----------------
2 files changed, 247 insertions(+), 240 deletions(-)
diff --git a/debian/patches/debian_libs.patch b/debian/patches/debian_libs.patch
index 22a7a59..d1b18db 100644
--- a/debian/patches/debian_libs.patch
+++ b/debian/patches/debian_libs.patch
@@ -1,108 +1,114 @@
-Author: Gerardo Curiel <gerardo at sophie.gerardo.com.ve>
-Author: Philip Rinn <rinni at gmx.net>
-Description: Use debian libraries and disable unnecesary unjarlib target,
+Description: Use debian libraries and disable unnecesary unjarlib target,
+Forwarded: not needed
+Author: Gerardo Curiel <gerardo at sophie.gerardo.com.ve>,
+ Philip Rinn <rinni at gmx.net>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-01-01
+
--- a/build.xml
+++ b/build.xml
-@@ -75,7 +75,9 @@
- <property name="help.dir" value="${src.dir}/help" />
- <property name="extensions.dir" value="${src.dir}/extensions" />
- <property name="layout.dir" value="${src.dir}/resource/layout" />
-- <property name="lib.dir" value="lib" />
-+ <property name="lib.dir" value="/usr/share/java" />
-+ <property name="oo.dir" value="/usr/lib/libreoffice/program/classes" />
-+ <property name="ure.dir" value="/usr/lib/ure/share/java" />
- <property name="buildlib.dir" value="buildlib" />
- <property name="tests.dir" value="${src.dir}/tests" />
-
-@@ -100,33 +102,35 @@
-
- <fileset id="jarsFileset" dir="${lib.dir}">
- <include name="antlr.jar" />
-- <include name="antlr-3.4-complete.jar" />
-- <include name="jgoodies-common-1.4.0.jar" />
-- <include name="jgoodies-looks-2.5.2.jar" />
-- <include name="jgoodies-forms-1.6.0.jar" />
-- <include name="jayatana-1.2.4.jar" />
-+ <include name="antlr3.jar" />
-+ <include name="antlr3-runtime.jar" />
-+ <include name="jgoodies-common.jar" />
-+ <include name="jgoodies-looks.jar" />
-+ <include name="jgoodies-forms.jar" />
- <include name="spin.jar" />
-- <include name="glazedlists-1.8.0_java15.jar" />
-+ <include name="glazedlists.jar" />
- <include name="microba.jar" />
-- <include name="pdfbox-1.7.1.jar" />
-- <include name="jempbox-1.7.1.jar" />
-- <include name="fontbox-1.7.1.jar" />
-+ <include name="pdfbox.jar" />
-+ <include name="jempbox.jar" />
-+ <include name="fontbox.jar" />
- <include name="zoom-java.jar" />
-- <include name="mysql-connector-java-5.0.7-bin.jar" />
-- <include name="postgresql-9.2-1002.jdbc4.jar" />
-+ <include name="mysql-connector-java.jar" />
-+ <include name="postgresql.jar" />
- <!-- Plugin runtime dependencies -->
-- <include name="plugin/JPFCodeGenerator-rt.jar" />
-- <include name="plugin/jpf.jar" />
-- <include name="plugin/jpf-boot.jar" />
-- <include name="plugin/commons-logging.jar" />
-+ <include name="JPFCodeGenerator-rt.jar" />
-+ <include name="jpf.jar" />
-+ <include name="jpf-boot.jar" />
-+ <include name="commons-logging.jar" />
- </fileset>
-
- <!-- Openoffice connection dependencies. Compile-time only -->
-- <fileset id="ooFileset" dir="${lib.dir}">
-- <include name="oo/unoil.jar" />
-- <include name="oo/ridl.jar" />
-- <include name="oo/juh.jar" />
-- <include name="oo/jurt.jar" />
-+ <fileset id="ureFileset" dir="${ure.dir}">
-+ <include name="ridl.jar" />
-+ <include name="juh.jar" />
-+ <include name="jurt.jar" />
-+ </fileset>
-+ <fileset id="ooFileset" dir="${oo.dir}">
-+ <include name="unoil.jar" />
- </fileset>
-
- <!-- Done by MrDlib -->
-@@ -149,14 +153,15 @@
- <!-- Done by MrDlib -->
- <fileset refid="jarsFileset" />
- <fileset refid="ooFileset" />
-+ <fileset refid="ureFileset" />
- </path>
-
- <!-- Classpath for running the code generator -->
- <path id="codegenerator">
-- <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
-- <pathelement location="${lib.dir}/plugin/jpf.jar" />
-- <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
-- <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
-+ <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
-+ <pathelement location="${lib.dir}/jpf.jar" />
-+ <pathelement location="${lib.dir}/jpf-boot.jar" />
-+ <pathelement location="${lib.dir}/velocity.jar" />
- </path>
-
- <!-- Classpath for tests -->
-@@ -237,7 +242,7 @@
- </target>
-
- <!-- Jars up project -->
-- <target name="jars" depends="build, unjarlib">
-+ <target name="jars" depends="build">
- <mkdir dir="${build.lib}" />
-
- <mkdir dir="${build.tmp}" />
-@@ -595,6 +600,4 @@
- </jalopy>
- </target>
-
-- <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
--
- </project>
+@@ -76,7 +76,9 @@
+ <property name="help.dir" value="${src.dir}/help" />
+ <property name="extensions.dir" value="${src.dir}/extensions" />
+ <property name="layout.dir" value="${src.dir}/resource/layout" />
+- <property name="lib.dir" value="lib" />
++ <property name="lib.dir" value="/usr/share/java" />
++ <property name="oo.dir" value="/usr/lib/libreoffice/program/classes" />
++ <property name="ure.dir" value="/usr/lib/ure/share/java" />
+ <property name="buildlib.dir" value="buildlib" />
+ <property name="tests.dir" value="${src.dir}/tests" />
+
+@@ -102,33 +104,35 @@
+
+ <fileset id="jarsFileset" dir="${lib.dir}">
+ <include name="antlr.jar" />
+- <include name="antlr-3.4-complete.jar" />
+- <include name="jgoodies-common-1.4.0.jar" />
+- <include name="jgoodies-looks-2.5.2.jar" />
+- <include name="jgoodies-forms-1.6.0.jar" />
+- <include name="jayatana-1.2.4.jar" />
++ <include name="antlr3.jar" />
++ <include name="antlr3-runtime.jar" />
++ <include name="jgoodies-common.jar" />
++ <include name="jgoodies-looks.jar" />
++ <include name="jgoodies-forms.jar" />
+ <include name="spin.jar" />
+- <include name="glazedlists-1.8.0_java15.jar" />
++ <include name="glazedlists.jar" />
+ <include name="microba.jar" />
+- <include name="pdfbox-1.7.1.jar" />
+- <include name="jempbox-1.7.1.jar" />
+- <include name="fontbox-1.7.1.jar" />
++ <include name="pdfbox.jar" />
++ <include name="jempbox.jar" />
++ <include name="fontbox.jar" />
+ <include name="zoom-java.jar" />
+- <include name="mysql-connector-java-5.0.7-bin.jar" />
+- <include name="postgresql-9.2-1002.jdbc4.jar" />
++ <include name="mysql-connector-java.jar" />
++ <include name="postgresql.jar" />
+ <!-- Plugin runtime dependencies -->
+- <include name="plugin/JPFCodeGenerator-rt.jar" />
+- <include name="plugin/jpf.jar" />
+- <include name="plugin/jpf-boot.jar" />
+- <include name="plugin/commons-logging.jar" />
++ <include name="JPFCodeGenerator-rt.jar" />
++ <include name="jpf.jar" />
++ <include name="jpf-boot.jar" />
++ <include name="commons-logging.jar" />
+ </fileset>
+
+ <!-- Openoffice connection dependencies. Compile-time only -->
+- <fileset id="ooFileset" dir="${lib.dir}">
+- <include name="oo/unoil.jar" />
+- <include name="oo/ridl.jar" />
+- <include name="oo/juh.jar" />
+- <include name="oo/jurt.jar" />
++ <fileset id="ureFileset" dir="${ure.dir}">
++ <include name="ridl.jar" />
++ <include name="juh.jar" />
++ <include name="jurt.jar" />
++ </fileset>
++ <fileset id="ooFileset" dir="${oo.dir}">
++ <include name="unoil.jar" />
+ </fileset>
+
+ <!-- Done by MrDlib -->
+@@ -151,14 +155,15 @@
+ <!-- Done by MrDlib -->
+ <fileset refid="jarsFileset" />
+ <fileset refid="ooFileset" />
++ <fileset refid="ureFileset" />
+ </path>
+
+ <!-- Classpath for running the code generator -->
+ <path id="codegenerator">
+- <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
+- <pathelement location="${lib.dir}/plugin/jpf.jar" />
+- <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
+- <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
++ <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
++ <pathelement location="${lib.dir}/jpf.jar" />
++ <pathelement location="${lib.dir}/jpf-boot.jar" />
++ <pathelement location="${lib.dir}/velocity.jar" />
+ </path>
+
+ <!-- Classpath for tests -->
+@@ -239,7 +244,7 @@
+ </target>
+
+ <!-- Jars up project -->
+- <target name="jars" depends="build, unjarlib">
++ <target name="jars" depends="build">
+ <mkdir dir="${build.lib}" />
+
+ <mkdir dir="${build.tmp}" />
+@@ -631,8 +636,6 @@
+ </jalopy>
+ </target>
+
+- <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
+-
+ <target name="zipsrc">
+ <!-- clone current repo into tmp dir. Reason: we want to have a clean src.zip, but do not want to execute "git clean -xdf" to allow developers having some temporary files (and user.properties) -->
+ <tempfile property="temp.dir" destDir="${java.io.tmpdir}" prefix="jabrefsrc"/>
diff --git a/debian/patches/mrDlib_jayatana.patch b/debian/patches/mrDlib_jayatana.patch
index 5584895..1f279a3 100644
--- a/debian/patches/mrDlib_jayatana.patch
+++ b/debian/patches/mrDlib_jayatana.patch
@@ -1,154 +1,155 @@
-Description: This is the diff between the debian branch and the v_2.9b2 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.
-Origin: upstream git
-Author: Oliver Kopp <oliver.kopp at gmail.com>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2012-11-19
+Description: This is the diff between the debian branch and the v_2.9b2 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.
+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-01-01
--- a/.classpath
+++ b/.classpath
@@ -11,8 +11,6 @@
- <classpathentry exported="true" kind="lib" path="lib/plugin/JPFCodeGenerator-rt.jar" sourcepath="/JPFCodeGenerator/src"/>
- <classpathentry exported="true" kind="lib" path="lib/glazedlists-1.8.0_java15.jar"/>
- <classpathentry kind="lib" path="lib/mysql-connector-java-5.0.7-bin.jar"/>
-- <classpathentry kind="lib" path="lib/spl/sciplore/xstream-1.4.1.jar"/>
-- <classpathentry kind="lib" path="lib/spl/sciplore/mrDlib-serialization-api.jar" sourcepath="/Serialization API"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
- <accessrules>
- <accessrule kind="accessible" pattern="**"/>
+ <classpathentry exported="true" kind="lib" path="lib/plugin/JPFCodeGenerator-rt.jar" sourcepath="/JPFCodeGenerator/src"/>
+ <classpathentry exported="true" kind="lib" path="lib/glazedlists-1.8.0_java15.jar"/>
+ <classpathentry kind="lib" path="lib/mysql-connector-java-5.0.7-bin.jar"/>
+- <classpathentry kind="lib" path="lib/spl/sciplore/xstream-1.4.1.jar"/>
+- <classpathentry kind="lib" path="lib/spl/sciplore/mrDlib-serialization-api.jar" sourcepath="/Serialization API"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+ <accessrules>
+ <accessrule kind="accessible" pattern="**"/>
@@ -21,14 +19,10 @@
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/sciplore"/>
-- <classpathentry kind="lib" path="lib/spl/jersey/mimepull-1.3.jar"/>
- <classpathentry kind="lib" path="lib/oo/juh.jar"/>
- <classpathentry kind="lib" path="lib/oo/jurt.jar"/>
- <classpathentry kind="lib" path="lib/oo/ridl.jar"/>
- <classpathentry kind="lib" path="lib/oo/unoil.jar"/>
-- <classpathentry kind="lib" path="lib/spl/jersey/jersey-client-1.14.jar"/>
-- <classpathentry kind="lib" path="lib/spl/jersey/jersey-core-1.14.jar"/>
-- <classpathentry kind="lib" path="lib/spl/jersey/jersey-multipart-1.14.jar"/>
- <classpathentry kind="lib" path="lib/antlr-3.4-complete.jar"/>
- <classpathentry kind="lib" path="lib/jgoodies-common-1.4.0.jar"/>
- <classpathentry kind="lib" path="lib/jgoodies-forms-1.6.0.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/sciplore"/>
+- <classpathentry kind="lib" path="lib/spl/jersey/mimepull-1.3.jar"/>
+ <classpathentry kind="lib" path="lib/oo/juh.jar"/>
+ <classpathentry kind="lib" path="lib/oo/jurt.jar"/>
+ <classpathentry kind="lib" path="lib/oo/ridl.jar"/>
+ <classpathentry kind="lib" path="lib/oo/unoil.jar"/>
+- <classpathentry kind="lib" path="lib/spl/jersey/jersey-client-1.14.jar"/>
+- <classpathentry kind="lib" path="lib/spl/jersey/jersey-core-1.14.jar"/>
+- <classpathentry kind="lib" path="lib/spl/jersey/jersey-multipart-1.14.jar"/>
+ <classpathentry kind="lib" path="lib/antlr-3.4-complete.jar"/>
+ <classpathentry kind="lib" path="lib/jgoodies-common-1.4.0.jar"/>
+ <classpathentry kind="lib" path="lib/jgoodies-forms-1.6.0.jar"/>
@@ -36,7 +30,6 @@
- <classpathentry kind="lib" path="lib/fontbox-1.7.1.jar"/>
- <classpathentry kind="lib" path="lib/jempbox-1.7.1.jar"/>
- <classpathentry kind="lib" path="lib/pdfbox-1.7.1.jar"/>
-- <classpathentry kind="lib" path="lib/jayatana-1.2.4.jar"/>
- <classpathentry kind="lib" path="lib/postgresql-9.2-1002.jdbc4.jar"/>
- <classpathentry kind="output" path="bin"/>
- </classpath>
+ <classpathentry kind="lib" path="lib/fontbox-1.7.1.jar"/>
+ <classpathentry kind="lib" path="lib/jempbox-1.7.1.jar"/>
+ <classpathentry kind="lib" path="lib/pdfbox-1.7.1.jar"/>
+- <classpathentry kind="lib" path="lib/jayatana-1.2.4.jar"/>
+ <classpathentry kind="lib" path="lib/postgresql-9.2-1002.jdbc4.jar"/>
+ <classpathentry kind="output" path="bin"/>
+ </classpath>
--- a/src/java/net/sf/jabref/ImportSettingsTab.java
+++ b/src/java/net/sf/jabref/ImportSettingsTab.java
@@ -44,10 +44,8 @@
-
- private JRadioButton radioButtonXmp;
- private JRadioButton radioButtonPDFcontent;
-- private JRadioButton radioButtonMrDlib;
- private JRadioButton radioButtonNoMeta;
- private JRadioButton radioButtononlyAttachPDF;
-- private JRadioButton radioButtonUpdateEmptyFields;
- private JCheckBox useDefaultPDFImportStyle;
-
- private JTextField fileNamePattern;
+
+ private JRadioButton radioButtonXmp;
+ private JRadioButton radioButtonPDFcontent;
+- private JRadioButton radioButtonMrDlib;
+ private JRadioButton radioButtonNoMeta;
+ private JRadioButton radioButtononlyAttachPDF;
+- private JRadioButton radioButtonUpdateEmptyFields;
+ private JCheckBox useDefaultPDFImportStyle;
+
+ private JTextField fileNamePattern;
@@ -59,17 +57,12 @@
- 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"));
-- radioButtonMrDlib = new JRadioButton(Globals.lang("Create_entry_based_on_data_fetched_from")+" Mr.DLib");
- radioButtononlyAttachPDF = new JRadioButton(Globals.lang("Only_attach_PDF"));
-- radioButtonUpdateEmptyFields = new JRadioButton(Globals.lang("Update_empty_fields_with_data_fetched_from")
-- +" Mr.DLib");
- ButtonGroup bg = new ButtonGroup();
- bg.add(radioButtonNoMeta);
- bg.add(radioButtonXmp);
- bg.add(radioButtonPDFcontent);
-- bg.add(radioButtonMrDlib);
- bg.add(radioButtononlyAttachPDF);
-- bg.add(radioButtonUpdateEmptyFields);
-
- useDefaultPDFImportStyle = new JCheckBox(Globals.lang("Always use this PDF import style (and do not ask for each import)"));
-
+ 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"));
+- radioButtonMrDlib = new JRadioButton(Globals.lang("Create_entry_based_on_data_fetched_from")+" Mr.DLib");
+ radioButtononlyAttachPDF = new JRadioButton(Globals.lang("Only_attach_PDF"));
+- radioButtonUpdateEmptyFields = new JRadioButton(Globals.lang("Update_empty_fields_with_data_fetched_from")
+- +" Mr.DLib");
+ ButtonGroup bg = new ButtonGroup();
+ bg.add(radioButtonNoMeta);
+ bg.add(radioButtonXmp);
+ bg.add(radioButtonPDFcontent);
+- bg.add(radioButtonMrDlib);
+ bg.add(radioButtononlyAttachPDF);
+- bg.add(radioButtonUpdateEmptyFields);
+
+ useDefaultPDFImportStyle = new JCheckBox(Globals.lang("Always use this PDF import style (and do not ask for each import)"));
+
@@ -96,15 +89,9 @@
- builder.append(radioButtonPDFcontent);
- builder.nextLine();
- builder.append(pan);
-- builder.append(radioButtonMrDlib);
-- builder.nextLine();
-- builder.append(pan);
- builder.append(radioButtononlyAttachPDF);
- builder.nextLine();
- builder.append(pan);
-- builder.append(radioButtonUpdateEmptyFields);
-- builder.nextLine();
-- builder.append(pan);
- builder.append(useDefaultPDFImportStyle);
- builder.nextLine();
-
+ builder.append(radioButtonPDFcontent);
+ builder.nextLine();
+ builder.append(pan);
+- builder.append(radioButtonMrDlib);
+- builder.nextLine();
+- builder.append(pan);
+ builder.append(radioButtononlyAttachPDF);
+ builder.nextLine();
+ builder.append(pan);
+- builder.append(radioButtonUpdateEmptyFields);
+- builder.nextLine();
+- builder.append(pan);
+ builder.append(useDefaultPDFImportStyle);
+ builder.nextLine();
+
@@ -136,15 +123,9 @@
- case ImportDialog.CONTENT:
- radioButtonPDFcontent.setSelected(true);
- break;
-- case ImportDialog.MRDLIB:
-- radioButtonMrDlib.setSelected(true);
-- break;
- case ImportDialog.ONLYATTACH:
- radioButtononlyAttachPDF.setSelected(true);
- break;
-- case ImportDialog.UPDATEEMPTYFIELDS:
-- radioButtonUpdateEmptyFields.setSelected(true);
-- break;
- default:
- // fallback
- radioButtonPDFcontent.setSelected(true);
+ case ImportDialog.CONTENT:
+ radioButtonPDFcontent.setSelected(true);
+ break;
+- case ImportDialog.MRDLIB:
+- radioButtonMrDlib.setSelected(true);
+- break;
+ case ImportDialog.ONLYATTACH:
+ radioButtononlyAttachPDF.setSelected(true);
+ break;
+- case ImportDialog.UPDATEEMPTYFIELDS:
+- radioButtonUpdateEmptyFields.setSelected(true);
+- break;
+ default:
+ // fallback
+ radioButtonPDFcontent.setSelected(true);
@@ -162,12 +143,9 @@
- style = ImportDialog.XMP;
- else if (radioButtonPDFcontent.isSelected())
- style = ImportDialog.CONTENT;
-- else if (radioButtonMrDlib.isSelected())
-- style = ImportDialog.MRDLIB;
- else if (radioButtononlyAttachPDF.isSelected())
- style = ImportDialog.ONLYATTACH;
-- else if (radioButtonUpdateEmptyFields.isSelected())
-- style = ImportDialog.UPDATEEMPTYFIELDS;
-+ else throw new IllegalStateException();
- Globals.prefs.putInt(PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE, style);
- Globals.prefs.put(PREF_IMPORT_FILENAMEPATTERN, fileNamePattern.getText());
- }
+ style = ImportDialog.XMP;
+ else if (radioButtonPDFcontent.isSelected())
+ style = ImportDialog.CONTENT;
+- else if (radioButtonMrDlib.isSelected())
+- style = ImportDialog.MRDLIB;
+ else if (radioButtononlyAttachPDF.isSelected())
+ style = ImportDialog.ONLYATTACH;
+- else if (radioButtonUpdateEmptyFields.isSelected())
+- style = ImportDialog.UPDATEEMPTYFIELDS;
++ else throw new IllegalStateException();
+ Globals.prefs.putInt(PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE, style);
+ Globals.prefs.put(PREF_IMPORT_FILENAMEPATTERN, fileNamePattern.getText());
+ }
--- a/src/java/net/sf/jabref/JabRefFrame.java
+++ b/src/java/net/sf/jabref/JabRefFrame.java
@@ -1,4 +1,4 @@
--/* Copyright (C) 2003-2012 JabRef contributors.
-+/* Copyright (C) 2003-2011 JabRef contributors.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+-/* Copyright (C) 2003-2012 JabRef contributors.
++/* Copyright (C) 2003-2011 JabRef contributors.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
@@ -40,8 +40,6 @@
- import javax.swing.event.ChangeEvent;
- import javax.swing.event.ChangeListener;
-
--import org.java.ayatana.ApplicationMenu;
--
- import net.sf.jabref.export.*;
- import net.sf.jabref.external.ExternalFileTypeEditor;
- import net.sf.jabref.external.PushToApplicationButton;
-@@ -550,13 +548,6 @@
- }
- }
- });
--
-- // The following sets up integration with Unity's global menu, but currently (Nov 18, 2012)
-- // this doesn't work with OpenJDK 6 (leads to crash), only with 7.
-- String javaVersion = System.getProperty("java.version", null);
-- if (javaVersion.compareTo("1.7") >= 0)
-- ApplicationMenu.tryInstall(this);
--
- }
-
- public void setWindowTitle() {
+ import javax.swing.event.ChangeEvent;
+ import javax.swing.event.ChangeListener;
+
+-import org.java.ayatana.ApplicationMenu;
+-
+ import net.sf.jabref.export.*;
+ import net.sf.jabref.external.ExternalFileTypeEditor;
+ import net.sf.jabref.external.PushToApplicationButton;
+@@ -551,13 +549,6 @@
+ }
+ }
+ });
+-
+- // The following sets up integration with Unity's global menu, but currently (Nov 18, 2012)
+- // this doesn't work with OpenJDK 6 (leads to crash), only with 7.
+- String javaVersion = System.getProperty("java.version", null);
+- if (javaVersion.compareTo("1.7") >= 0)
+- ApplicationMenu.tryInstall(this);
+-
+ }
+
+ public void setWindowTitle() {
--- a/src/java/spl/DocumentWrapper.java
+++ /dev/null
@@ -1,272 +0,0 @@
--
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