From cc6b4959e7a332065fe85377b87d0512d09fb1b1 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Sat, 11 Apr 2009 22:26:02 +0000
Subject: [PATCH] * specify bootclasspath explicitly so we can compile code
 that depends on sun.* classes (AssociativeScriptObject)

---
 build.xml                                | 6 +++++-
 source/net/sourceforge/filebot/Main.java | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index aeb7ddf2..e98f99fe 100644
--- a/build.xml
+++ b/build.xml
@@ -106,8 +106,12 @@
 			<classpath>
 				<fileset dir="${dir.lib}" includes="*.jar" />
 			</classpath>
+			<bootclasspath>
+				<!-- specify bootclasspath explicitly so we can compile code that depends on sun.* classes -->
+				<fileset dir="${java.home}/lib" includes="*.jar" />
+			</bootclasspath>
 		</javac>
-
+		
 		<!-- copy resources -->
 		<copy todir="${dir.build}">
 			<fileset dir="${dir.source}">
diff --git a/source/net/sourceforge/filebot/Main.java b/source/net/sourceforge/filebot/Main.java
index aae35214..16520ead 100644
--- a/source/net/sourceforge/filebot/Main.java
+++ b/source/net/sourceforge/filebot/Main.java
@@ -11,6 +11,7 @@ import java.util.logging.Logger;
 import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
 
 import net.sourceforge.filebot.ui.MainFrame;
 import net.sourceforge.filebot.ui.NotificationLoggingHandler;
@@ -54,7 +55,11 @@ public class Main {
 				UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 			} else {
 				// use nimubs laf on linux, bsd, ...
-				UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
+				for (LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
+					if (laf.getName().equals("Nimbus")) {
+						UIManager.setLookAndFeel(laf.getClassName());
+					}
+				}
 			}
 		} catch (Exception e) {
 			Logger.getLogger(Main.class.getName()).log(Level.WARNING, e.toString(), e);