#! /bin/sh /usr/share/dpatch/dpatch-run ## 01_free_javac.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Changes to be able to compile JabRef with free java compilers. ## Thanks to Matthias Klose, cf. #383006 @DPATCH@ diff -urNad jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java jabref-2.2~b2/src/java/net/sf/jabref/JabRef.java --- jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java 2006-11-26 21:10:32.000000000 +0100 +++ jabref-2.2~b2/src/java/net/sf/jabref/JabRef.java 2006-11-26 21:17:14.000000000 +0100 @@ -46,7 +46,6 @@ import com.jgoodies.looks.plastic.Plastic3DLookAndFeel; import com.jgoodies.looks.plastic.PlasticLookAndFeel; -import com.jgoodies.looks.windows.WindowsLookAndFeel; import com.jgoodies.looks.FontSet; import com.jgoodies.looks.FontSets; import com.jgoodies.looks.FontPolicy; @@ -578,27 +577,6 @@ //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf; } - else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) { - - // Set a "model" icon size, so menu items are evenly spaced even though - // only some items have icons. We load an arbitrary icon and look at - // its size to determine what size to use: - int defaultIconSize = GUIGlobals.getImage("open").getIconWidth(); - com.jgoodies.looks.Options.setDefaultIconSize - (new Dimension(defaultIconSize, defaultIconSize)); - - if (overrideDefaultFonts) { - FontSet fontSet = FontSets.createDefaultFontSet( - new Font("Tahoma", Font.PLAIN, fontSizes), // control font - new Font("Tahoma", Font.PLAIN, fontSizes), // menu font - new Font("Tahoma", Font.BOLD, fontSizes) // title font - ); - FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet); - WindowsLookAndFeel.setFontPolicy(fixedPolicy); - } - - //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf; - } if (lnf != null) { try { diff -urNad jabref-2.2~b2~/src/java/net/sf/jabref/export/VerifyingWriter.java jabref-2.2~b2/src/java/net/sf/jabref/export/VerifyingWriter.java --- jabref-2.2~b2~/src/java/net/sf/jabref/export/VerifyingWriter.java 2006-11-26 21:10:32.000000000 +0100 +++ jabref-2.2~b2/src/java/net/sf/jabref/export/VerifyingWriter.java 2006-11-26 21:14:29.000000000 +0100 @@ -1,7 +1,5 @@ package net.sf.jabref.export; -import sun.misc.CharacterEncoder; - import java.io.*; import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder;