From 6060231aa9e73ed2f56913392017cd4816457216 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Mon, 22 Jul 2013 09:10:29 +0000
Subject: [PATCH] OSX: Get application path from library path with Java7
 launcher

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2164 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/ui/OSXInfoPlist.java | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/java/davmail/ui/OSXInfoPlist.java b/src/java/davmail/ui/OSXInfoPlist.java
index 932e28a8..b7d43d1f 100644
--- a/src/java/davmail/ui/OSXInfoPlist.java
+++ b/src/java/davmail/ui/OSXInfoPlist.java
@@ -21,6 +21,7 @@ package davmail.ui;
 import davmail.util.IOUtil;
 import org.apache.log4j.Logger;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -37,7 +38,7 @@ public class OSXInfoPlist {
     }
 
     protected static String getInfoPlistContent() throws IOException {
-        FileInputStream fileInputStream = new FileInputStream(INFO_PLIST_PATH);
+        FileInputStream fileInputStream = new FileInputStream(getInfoPlistPath());
         return new String(IOUtil.readFully(fileInputStream));
     }
 
@@ -67,7 +68,7 @@ public class OSXInfoPlist {
                 boolean currentHideFromDock = isHideFromDock();
                 if (currentHideFromDock != hideFromDock) {
                     String content = getInfoPlistContent();
-                    FileOutputStream fileOutputStream = new FileOutputStream(INFO_PLIST_PATH);
+                    FileOutputStream fileOutputStream = new FileOutputStream(getInfoPlistPath());
                     try {
                         fileOutputStream.write(content.replaceFirst(
                                 "<key>LSUIElement</key><string>" + (currentHideFromDock ? "1" : "0") + "</string>",
@@ -82,4 +83,20 @@ public class OSXInfoPlist {
             LOGGER.warn("Unable to update Info.plist", e);
         }
     }
+
+    private static String getInfoPlistPath() throws IOException {
+        File file = new File(INFO_PLIST_PATH);
+        if (file.exists()) {
+            return INFO_PLIST_PATH;
+        }
+        // failover for Java7
+        String libraryPath = System.getProperty("java.library.path");
+        if (libraryPath != null && libraryPath.endsWith("Contents/MacOS")) {
+            file = new File(libraryPath.replace("Contents/MacOS", INFO_PLIST_PATH));
+            if (file.exists()) {
+                return INFO_PLIST_PATH;
+            }
+        }
+        throw new IOException("Info.plist file not found");
+    }
 }