diff --git a/build.xml b/build.xml
index 0573196..0d8931e 100644
--- a/build.xml
+++ b/build.xml
@@ -66,6 +66,33 @@
nbproject/build-impl.xml file.
-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -73,27 +100,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -110,7 +122,10 @@
-
+
+
+
+
diff --git a/build/built-jar.properties b/build/built-jar.properties
index e2a5386..3f014a7 100644
--- a/build/built-jar.properties
+++ b/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Fri, 31 Mar 2017 11:34:31 +1100
+#Fri, 31 Mar 2017 12:00:06 +1100
/Users/jennyb/Documents/Java/FlexProjector=
diff --git a/dist/FlexProjector.jar b/dist/FlexProjector.jar
index f798e8e..0351fd0 100644
Binary files a/dist/FlexProjector.jar and b/dist/FlexProjector.jar differ
diff --git a/dist/lib/MRJAdapter.jar b/dist/lib/MRJAdapter.jar
deleted file mode 100644
index ce25a3f..0000000
Binary files a/dist/lib/MRJAdapter.jar and /dev/null differ
diff --git a/lib/MRJAdapter.jar b/lib/MRJAdapter.jar
deleted file mode 100644
index ce25a3f..0000000
Binary files a/lib/MRJAdapter.jar and /dev/null differ
diff --git a/mac/Flex Projector.app/Contents/Info.plist b/mac/Flex Projector.app/Contents/Info.plist
index 71fc0da..73b6999 100644
--- a/mac/Flex Projector.app/Contents/Info.plist
+++ b/mac/Flex Projector.app/Contents/Info.plist
@@ -1,44 +1,45 @@
-
+
- CFBundleAllowMixedLocalizations
- true
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- JavaApplicationStub
- CFBundleGetInfoString
- Flex Projector © Bernhard Jenny 2007-2015
- CFBundleIconFile
- icon.icns
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- Flex Projector
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
- 1.0.1
- CFBundleSignature
- ????
- CFBundleVersion
- 1
- Java
-
- ClassPath
- $JAVAROOT/FlexProjector.jar
- JVMVersion
- 1.6*
- MainClass
- ika.app.Main
- Properties
-
- apple.laf.useScreenMenuBar
- true
-
- VMOptions
- -Xms64m -Xmx2000m
-
+CFBundleDevelopmentRegion
+English
+CFBundleExecutable
+JavaAppLauncher
+CFBundleIconFile
+icon.icns
+CFBundleIdentifier
+ika.app.Main
+CFBundleDisplayName
+Flex Projector
+CFBundleInfoDictionaryVersion
+6.0
+CFBundleName
+Flex Projector
+CFBundlePackageType
+APPL
+CFBundleShortVersionString
+1.0.2
+CFBundleSignature
+????
+CFBundleVersion
+1
+NSHumanReadableCopyright
+© Bernhard Jenny 2007–2017
+LSApplicationCategoryType
+public.app-category.graphics-design
+JVMMainClassName
+ika.app.Main
+JVMOptions
+
+-Dapple.laf.useScreenMenuBar=true
+-Dcom.apple.macos.useScreenMenuBar=true
+-Dapple.awt.application.name=Flex Projector
+-Xmx1000m
+
+JVMArguments
+
+
+
diff --git a/mac/Flex Projector.app/Contents/Java/FlexProjector.jar b/mac/Flex Projector.app/Contents/Java/FlexProjector.jar
new file mode 100644
index 0000000..0351fd0
Binary files /dev/null and b/mac/Flex Projector.app/Contents/Java/FlexProjector.jar differ
diff --git a/mac/Flex Projector.app/Contents/MacOS/JavaAppLauncher b/mac/Flex Projector.app/Contents/MacOS/JavaAppLauncher
new file mode 100755
index 0000000..7bddebe
Binary files /dev/null and b/mac/Flex Projector.app/Contents/MacOS/JavaAppLauncher differ
diff --git a/mac/Flex Projector.app/Contents/MacOS/JavaApplicationStub b/mac/Flex Projector.app/Contents/MacOS/JavaApplicationStub
deleted file mode 100755
index 0eff982..0000000
Binary files a/mac/Flex Projector.app/Contents/MacOS/JavaApplicationStub and /dev/null differ
diff --git a/mac/Flex Projector.app/Contents/Resources/en.lproj/Localizable.strings b/mac/Flex Projector.app/Contents/Resources/en.lproj/Localizable.strings
new file mode 100644
index 0000000..0d306aa
--- /dev/null
+++ b/mac/Flex Projector.app/Contents/Resources/en.lproj/Localizable.strings
@@ -0,0 +1,3 @@
+"JRELoadError" = "Unable to load Java Runtime Environment.";
+"MainClassNameRequired" = "Main class name is required.";
+"JavaDirectoryNotFound" = "Unable to enumerate Java directory contents.";
diff --git a/mac/appbundler-1.0.jar b/mac/appbundler-1.0.jar
new file mode 100644
index 0000000..ef30f1c
Binary files /dev/null and b/mac/appbundler-1.0.jar differ
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 9767a2f..a626642 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -30,14 +30,12 @@ file.reference.iText-2.1.3.jar=lib/iText-2.1.3.jar
file.reference.jai_imageio.jar=lib/jai_imageio.jar
file.reference.JMapProjLib.jar=lib/JMapProjLib.jar
file.reference.l2fprod-common-fontchooser.jar=lib/l2fprod-common-fontchooser.jar
-file.reference.MRJAdapter.jar=lib/MRJAdapter.jar
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=false
jar.index=${jnlp.enabled}
javac.classpath=\
${file.reference.JMapProjLib.jar}:\
- ${file.reference.MRJAdapter.jar}:\
${file.reference.jai_imageio.jar}:\
${file.reference.l2fprod-common-fontchooser.jar}:\
${file.reference.iText-2.1.3.jar}:\
diff --git a/src/ika/gui/MacWindowsManager.java b/src/ika/gui/MacWindowsManager.java
index 9915a10..d392a29 100644
--- a/src/ika/gui/MacWindowsManager.java
+++ b/src/ika/gui/MacWindowsManager.java
@@ -7,11 +7,8 @@
package ika.gui;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
-import net.roydesign.mac.MRJAdapter;
/**
* Mac OS X specific code. Integrates a Java application to the standard Mac