Refresh patches.
authorgregor herrmann <gregoa@debian.org>
Tue, 1 Jan 2013 16:35:16 +0000 (17:35 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 1 Jan 2013 16:35:16 +0000 (17:35 +0100)
debian/patches/debian_libs.patch
debian/patches/mrDlib_jayatana.patch

index 22a7a59..d1b18db 100644 (file)
-Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
-Author: Philip Rinn <rinni@gmx.net>
-Description: Use debian libraries and disable unnecesary unjarlib target,
+Description: Use debian libraries and disable unnecesary unjarlib target,\r
+Forwarded: not needed
+Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>,\r
+ Philip Rinn <rinni@gmx.net>\r
+Reviewed-by: gregor herrmann <gregoa@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" />\r
+       <property name="extensions.dir" value="${src.dir}/extensions" />\r
+       <property name="layout.dir" value="${src.dir}/resource/layout" />\r
+-      <property name="lib.dir" value="lib" />\r
++      <property name="lib.dir" value="/usr/share/java" />\r
++      <property name="oo.dir" value="/usr/lib/libreoffice/program/classes" />\r
++      <property name="ure.dir" value="/usr/lib/ure/share/java" />\r
+       <property name="buildlib.dir" value="buildlib" />\r
+       <property name="tests.dir" value="${src.dir}/tests" />\r
\r
+@@ -102,33 +104,35 @@
\r
+       <fileset id="jarsFileset" dir="${lib.dir}">\r
+               <include name="antlr.jar" />\r
+-              <include name="antlr-3.4-complete.jar" />\r
+-        <include name="jgoodies-common-1.4.0.jar" />\r
+-              <include name="jgoodies-looks-2.5.2.jar" />\r
+-              <include name="jgoodies-forms-1.6.0.jar" />\r
+-              <include name="jayatana-1.2.4.jar" />\r
++              <include name="antlr3.jar" />\r
++              <include name="antlr3-runtime.jar" />\r
++        <include name="jgoodies-common.jar" />\r
++              <include name="jgoodies-looks.jar" />\r
++              <include name="jgoodies-forms.jar" />\r
+               <include name="spin.jar" />\r
+-              <include name="glazedlists-1.8.0_java15.jar" />\r
++              <include name="glazedlists.jar" />\r
+               <include name="microba.jar" />\r
+-              <include name="pdfbox-1.7.1.jar" />\r
+-              <include name="jempbox-1.7.1.jar" />\r
+-              <include name="fontbox-1.7.1.jar" />\r
++              <include name="pdfbox.jar" />\r
++              <include name="jempbox.jar" />\r
++              <include name="fontbox.jar" />\r
+               <include name="zoom-java.jar" />\r
+-      <include name="mysql-connector-java-5.0.7-bin.jar" />\r
+-              <include name="postgresql-9.2-1002.jdbc4.jar" />\r
++      <include name="mysql-connector-java.jar" />\r
++              <include name="postgresql.jar" />\r
+         <!-- Plugin runtime dependencies -->\r
+-              <include name="plugin/JPFCodeGenerator-rt.jar" />\r
+-              <include name="plugin/jpf.jar" />\r
+-              <include name="plugin/jpf-boot.jar" />\r
+-              <include name="plugin/commons-logging.jar" />\r
++              <include name="JPFCodeGenerator-rt.jar" />\r
++              <include name="jpf.jar" />\r
++              <include name="jpf-boot.jar" />\r
++              <include name="commons-logging.jar" />\r
+       </fileset>\r
\r
+     <!-- Openoffice connection dependencies. Compile-time only -->\r
+-    <fileset id="ooFileset" dir="${lib.dir}">\r
+-        <include name="oo/unoil.jar" />\r
+-        <include name="oo/ridl.jar" />\r
+-        <include name="oo/juh.jar" />\r
+-        <include name="oo/jurt.jar" />\r
++    <fileset id="ureFileset" dir="${ure.dir}">\r
++        <include name="ridl.jar" />\r
++        <include name="juh.jar" />\r
++        <include name="jurt.jar" />\r
++    </fileset>\r
++    <fileset id="ooFileset" dir="${oo.dir}">\r
++        <include name="unoil.jar" />\r
+     </fileset>\r
\r
+     <!-- Done by MrDlib -->\r
+@@ -151,14 +155,15 @@
+         <!-- Done by MrDlib -->\r
+               <fileset refid="jarsFileset" />\r
+         <fileset refid="ooFileset" />\r
++        <fileset refid="ureFileset" />\r
+       </path>\r
\r
+       <!-- Classpath for running the code generator -->\r
+       <path id="codegenerator">\r
+-              <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />\r
+-              <pathelement location="${lib.dir}/plugin/jpf.jar" />\r
+-              <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />\r
+-              <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />\r
++              <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />\r
++              <pathelement location="${lib.dir}/jpf.jar" />\r
++              <pathelement location="${lib.dir}/jpf-boot.jar" />\r
++              <pathelement location="${lib.dir}/velocity.jar" />\r
+       </path>\r
\r
+       <!-- Classpath for tests -->\r
+@@ -239,7 +244,7 @@
+       </target>\r
\r
+       <!-- Jars up project -->\r
+-      <target name="jars" depends="build, unjarlib">\r
++      <target name="jars" depends="build">\r
+               <mkdir dir="${build.lib}" />\r
+         \r
+               <mkdir dir="${build.tmp}" />\r
+@@ -631,8 +636,6 @@
+               </jalopy>\r
+       </target>\r
\r
+-      <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />\r
+-\r
+       <target name="zipsrc">\r
+               <!-- 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) -->\r
+               <tempfile property="temp.dir" destDir="${java.io.tmpdir}" prefix="jabrefsrc"/>\r
index 5584895..1f279a3 100644 (file)
-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@gmail.com>
-Reviewed-by: gregor herrmann <gregoa@debian.org>
-Last-Update: 2012-11-19
+Description: This is the diff between the debian branch and the v_2.9b2 tag\r
+ in upstream git; the debian branch was created for us with the purpose to\r
+ disable the mrDlib functionality which needs libraries not packaged in\r
+ Debian yet.\r
+Origin: upstream git\r
+Forwarded: not-needed
+Author: Oliver Kopp <oliver.kopp@gmail.com>\r
+Reviewed-by: gregor herrmann <gregoa@debian.org>\r
+Last-Update: 2013-01-01\r
 
 --- 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"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/glazedlists-1.8.0_java15.jar"/>\r
+       <classpathentry kind="lib" path="lib/mysql-connector-java-5.0.7-bin.jar"/>\r
+-      <classpathentry kind="lib" path="lib/spl/sciplore/xstream-1.4.1.jar"/>\r
+-      <classpathentry kind="lib" path="lib/spl/sciplore/mrDlib-serialization-api.jar" sourcepath="/Serialization API"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">\r
+               <accessrules>\r
+                       <accessrule kind="accessible" pattern="**"/>\r
 @@ -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"/>\r
+       <classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/resources"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/sciplore"/>\r
+-      <classpathentry kind="lib" path="lib/spl/jersey/mimepull-1.3.jar"/>\r
+       <classpathentry kind="lib" path="lib/oo/juh.jar"/>\r
+       <classpathentry kind="lib" path="lib/oo/jurt.jar"/>\r
+       <classpathentry kind="lib" path="lib/oo/ridl.jar"/>\r
+       <classpathentry kind="lib" path="lib/oo/unoil.jar"/>\r
+-      <classpathentry kind="lib" path="lib/spl/jersey/jersey-client-1.14.jar"/>\r
+-      <classpathentry kind="lib" path="lib/spl/jersey/jersey-core-1.14.jar"/>\r
+-      <classpathentry kind="lib" path="lib/spl/jersey/jersey-multipart-1.14.jar"/>\r
+       <classpathentry kind="lib" path="lib/antlr-3.4-complete.jar"/>\r
+       <classpathentry kind="lib" path="lib/jgoodies-common-1.4.0.jar"/>\r
+       <classpathentry kind="lib" path="lib/jgoodies-forms-1.6.0.jar"/>\r
 @@ -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"/>\r
+       <classpathentry kind="lib" path="lib/jempbox-1.7.1.jar"/>\r
+       <classpathentry kind="lib" path="lib/pdfbox-1.7.1.jar"/>\r
+-      <classpathentry kind="lib" path="lib/jayatana-1.2.4.jar"/>\r
+       <classpathentry kind="lib" path="lib/postgresql-9.2-1002.jdbc4.jar"/>\r
+       <classpathentry kind="output" path="bin"/>\r
+ </classpath>\r
 --- 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;
+       \r
+     private JRadioButton radioButtonXmp;\r
+       private JRadioButton radioButtonPDFcontent;\r
+-    private JRadioButton radioButtonMrDlib;\r
+     private JRadioButton radioButtonNoMeta;\r
+       private JRadioButton radioButtononlyAttachPDF;\r
+-      private JRadioButton radioButtonUpdateEmptyFields;\r
+       private JCheckBox useDefaultPDFImportStyle;\r
+       \r
+       private JTextField fileNamePattern;\r
 @@ -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"));\r
+         radioButtonXmp = new JRadioButton(Globals.lang("Create_entry_based_on_XMP_data"));\r
+         radioButtonPDFcontent = new JRadioButton(Globals.lang("Create_entry_based_on_content"));\r
+-        radioButtonMrDlib = new JRadioButton(Globals.lang("Create_entry_based_on_data_fetched_from")+" Mr.DLib");\r
+         radioButtononlyAttachPDF = new JRadioButton(Globals.lang("Only_attach_PDF"));\r
+-        radioButtonUpdateEmptyFields = new JRadioButton(Globals.lang("Update_empty_fields_with_data_fetched_from")\r
+-            +" Mr.DLib");\r
+         ButtonGroup bg = new ButtonGroup();\r
+         bg.add(radioButtonNoMeta);\r
+         bg.add(radioButtonXmp);\r
+         bg.add(radioButtonPDFcontent);\r
+-        bg.add(radioButtonMrDlib);\r
+         bg.add(radioButtononlyAttachPDF);\r
+-        bg.add(radioButtonUpdateEmptyFields);\r
\r
+         useDefaultPDFImportStyle = new JCheckBox(Globals.lang("Always use this PDF import style (and do not ask for each import)"));\r
+               \r
 @@ -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);\r
+         builder.nextLine();\r
+         builder.append(pan);\r
+-              builder.append(radioButtonMrDlib);\r
+-        builder.nextLine();\r
+-        builder.append(pan);\r
+               builder.append(radioButtononlyAttachPDF);\r
+         builder.nextLine();\r
+         builder.append(pan);\r
+-              builder.append(radioButtonUpdateEmptyFields);\r
+-        builder.nextLine();\r
+-        builder.append(pan);\r
+               builder.append(useDefaultPDFImportStyle);\r
+         builder.nextLine();\r
+               \r
 @@ -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:\r
+                       radioButtonPDFcontent.setSelected(true);\r
+                       break;\r
+-              case ImportDialog.MRDLIB:\r
+-                      radioButtonMrDlib.setSelected(true);\r
+-                      break;\r
+               case ImportDialog.ONLYATTACH:\r
+                       radioButtononlyAttachPDF.setSelected(true);\r
+                       break;\r
+-              case ImportDialog.UPDATEEMPTYFIELDS:\r
+-                      radioButtonUpdateEmptyFields.setSelected(true);\r
+-                      break;\r
+               default:\r
+                       // fallback\r
+                       radioButtonPDFcontent.setSelected(true);\r
 @@ -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;\r
+               else if (radioButtonPDFcontent.isSelected())\r
+                       style = ImportDialog.CONTENT;\r
+-              else if (radioButtonMrDlib.isSelected())\r
+-                      style = ImportDialog.MRDLIB;\r
+               else if (radioButtononlyAttachPDF.isSelected())\r
+                       style = ImportDialog.ONLYATTACH;\r
+-              else if (radioButtonUpdateEmptyFields.isSelected())\r
+-                      style = ImportDialog.UPDATEEMPTYFIELDS;\r
++              else throw new IllegalStateException();\r
+               Globals.prefs.putInt(PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE, style);\r
+               Globals.prefs.put(PREF_IMPORT_FILENAMEPATTERN, fileNamePattern.getText());\r
+       }\r
 --- 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.\r
++/*  Copyright (C) 2003-2011 JabRef contributors.\r
+     This program is free software; you can redistribute it and/or modify\r
+     it under the terms of the GNU General Public License as published by\r
+     the Free Software Foundation; either version 2 of the License, or\r
 @@ -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;\r
+ import javax.swing.event.ChangeListener;\r
\r
+-import org.java.ayatana.ApplicationMenu;\r
+-\r
+ import net.sf.jabref.export.*;\r
+ import net.sf.jabref.external.ExternalFileTypeEditor;\r
+ import net.sf.jabref.external.PushToApplicationButton;\r
+@@ -551,13 +549,6 @@
+                 }\r
+             }\r
+         });\r
+-\r
+-        // The following sets up integration with Unity's global menu, but currently (Nov 18, 2012)\r
+-        // this doesn't work with OpenJDK 6 (leads to crash), only with 7.\r
+-        String javaVersion = System.getProperty("java.version", null);\r
+-        if (javaVersion.compareTo("1.7") >= 0)\r
+-            ApplicationMenu.tryInstall(this);\r
+-\r
+     }\r
\r
+     public void setWindowTitle() {\r
 --- a/src/java/spl/DocumentWrapper.java
 +++ /dev/null
 @@ -1,272 +0,0 @@