add philip's changes as quilt patches, remove old dpatch patches, hook quilt into...
[debian/jabref.git] / debian / patches / free_javac.patch
1 --- a/src/java/net/sf/jabref/JabRef.java
2 +++ b/src/java/net/sf/jabref/JabRef.java
3 @@ -29,7 +29,6 @@
4  import com.jgoodies.looks.FontSet;
5  import com.jgoodies.looks.FontSets;
6  import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
7 -import com.jgoodies.looks.windows.WindowsLookAndFeel;
8  import gnu.dtools.ritopt.BooleanOption;
9  import gnu.dtools.ritopt.Options;
10  import gnu.dtools.ritopt.StringOption;
11 @@ -610,27 +609,6 @@
12  
13                      //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
14                  }
15 -                else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) {
16 -
17 -                    // Set a "model" icon size, so menu items are evenly spaced even though
18 -                    // only some items have icons. We load an arbitrary icon and look at
19 -                    // its size to determine what size to use:
20 -                    int defaultIconSize = GUIGlobals.getImage("open").getIconWidth();
21 -                    com.jgoodies.looks.Options.setDefaultIconSize
22 -                        (new Dimension(defaultIconSize, defaultIconSize));
23 -
24 -                    if (overrideDefaultFonts) {
25 -                        FontSet fontSet = FontSets.createDefaultFontSet(
26 -                            new Font("Tahoma", Font.PLAIN, fontSizes),    // control font
27 -                            new Font("Tahoma", Font.PLAIN, fontSizes),    // menu font
28 -                            new Font("Tahoma", Font.BOLD, fontSizes)     // title font
29 -                            );
30 -                        FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
31 -                        WindowsLookAndFeel.setFontPolicy(fixedPolicy);
32 -                    }
33 -
34 -                    //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
35 -                }
36  
37                  if (lnf != null) {
38                      try {