Fxing bug #273 : Support for Windows 7 64 bits

git-svn-id: https://www.silverpeas.org/svn/silverpeas/services/office-online/trunk@1050 a8e77078-a1c7-4fa5-b8fc-53c5178a176c

Author: Emmanuel Hugonnet

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.silverpeas</groupId>
     <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>4.0</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
@@ -35,7 +35,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
     </dependency>

src/main/java/com/silverpeas/openoffice/AuthenticationInfo.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package com.silverpeas.openoffice;
 
 /**

src/main/java/com/silverpeas/openoffice/Launcher.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package com.silverpeas.openoffice;
 
 import com.silverpeas.openoffice.util.MessageDisplayer;
@@ -54,34 +55,39 @@ public class Launcher {
    * @param args the command line arguments
    */
   public static void main(final String[] args) throws OfficeNotFoundException {
-    logger.log(Level.INFO, "{0} version {1}", new Object[]{MessageUtil.getMessage("app.title"), LAUNCHER_VERSION});
-    logger.log(Level.INFO, "{0}{1}", new Object[]{MessageUtil.getMessage("info.url.encoded"), args[0]});
+    logger.log(Level.INFO, "{0} version {1}", new Object[] { MessageUtil.getMessage("app.title"),
+        LAUNCHER_VERSION });
+    logger.log(Level.INFO, "{0}{1}", new Object[] { MessageUtil.getMessage("info.url.encoded"),
+        args[0] });
     try {
       String url = UrlExtractor.extractUrl(args[0]);
-      logger.log(Level.INFO, "{0}{1}", new Object[]{MessageUtil.getMessage("info.url.decoded"), url});
+      logger.log(Level.INFO, "{0}{1}", new Object[] { MessageUtil.getMessage("info.url.decoded"),
+          url });
       if (args[1] != null && !"".equals(args[1].trim())) {
-        logger.log(Level.INFO, "{0} {2}", new Object[]{MessageUtil.getMessage("info.default.path"), UrlExtractor.decodePath(args[1])});
+        logger.log(Level.INFO, "{0} {2}", new Object[] {
+            MessageUtil.getMessage("info.default.path"), UrlExtractor.decodePath(args[1]) });
         MsOfficePathFinder.basePath = UrlExtractor.decodePath(args[1]);
       }
       AuthenticationInfo authInfo = null;
       if (args.length >= 4) {
         authInfo = PasswordManager.extractAuthenticationInfo(args[2], args[3]);
       }
       MsOfficeType contentType = getContentType(UrlExtractor.decodeUrl(args[0]));
-      logger.log(Level.FINE, "{0}{1}", new Object[]{MessageUtil.getMessage("info.document.type"), contentType});
+      logger.log(Level.FINE, "{0}{1}", new Object[] { MessageUtil.getMessage("info.document.type"),
+          contentType });
       defineLookAndFeel();
       System.exit(OfficeLauncher.launch(contentType, url, authInfo));
     } catch (IOException ex) {
       logger.log(Level.SEVERE, MessageUtil.getMessage("error.message.general"),
-              ex);
+          ex);
       MessageDisplayer.displayError(ex);
     } catch (InterruptedException ex) {
       logger.log(Level.SEVERE, MessageUtil.getMessage("error.message.general"),
-              ex);
+          ex);
       MessageDisplayer.displayError(ex);
     } catch (Throwable ex) {
       logger.log(Level.SEVERE, MessageUtil.getMessage("error.message.general"),
-              ex);
+          ex);
       MessageDisplayer.displayError(ex);
     } finally {
       System.exit(0);
@@ -92,7 +98,7 @@ protected static void defineLookAndFeel() {
     try {
       try {
         if (OsEnum.getOS() == OsEnum.WINDOWS_VISTA || OsEnum.getOS() == OsEnum.WINDOWS_XP
-                || OsEnum.getOS() == OsEnum.WINDOWS_SEVEN) {
+            || OsEnum.getOS() == OsEnum.WINDOWS_SEVEN) {
           UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
         }
       } catch (ClassNotFoundException ex) {
@@ -108,7 +114,7 @@ protected static void defineLookAndFeel() {
   }
 
   protected static MsOfficeType getContentType(String url)
-          throws MalformedURLException {
+      throws MalformedURLException {
     String fileName = new URL(url).getFile();
     String contentType = mimeTypes.getContentType(fileName.toLowerCase());
     return MsOfficeType.valueOfMimeType(contentType);

src/main/java/com/silverpeas/openoffice/MsOfficeNotFoundException.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/OfficeFinder.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/OfficeLauncher.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package com.silverpeas.openoffice;
 
 import com.silverpeas.openoffice.windows.FileWebDavAccessManager;
@@ -51,9 +52,9 @@ public static int launch(MsOfficeType type, String url, AuthenticationInfo authI
       throws IOException, InterruptedException, OfficeNotFoundException {
     OfficeFinder finder = FinderFactory.getFinder(type);
     logger.log(Level.INFO, "Are we using Office 2007 : {0}", finder.isMicrosoftOffice2007());
-    logger.log(Level.INFO, "We are on {0} OS",  OsEnum.getOS());
+    logger.log(Level.INFO, "We are on {0} OS", OsEnum.getOS());
     boolean modeDisconnected = (OsEnum.getOS() == OsEnum.WINDOWS_VISTA ||
-        OsEnum.getOS() == OsEnum.WINDOWS_SEVEN ||OsEnum.getOS() == OsEnum.MAC_OSX)
+        OsEnum.getOS() == OsEnum.WINDOWS_SEVEN || OsEnum.getOS() == OsEnum.MAC_OSX)
         && finder.isMicrosoftOffice2007();
     switch (type) {
       case EXCEL:
@@ -82,7 +83,7 @@ public static int launch(String path, String url, boolean modeDisconnected,
       AuthenticationInfo auth) throws IOException, InterruptedException {
     logger.log(Level.INFO, "The path: {0}", path);
     logger.log(Level.INFO, "The url: {0}", url);
-    logger.log(Level.INFO, "The command line: {0} {1}", new Object[]{path, url});
+    logger.log(Level.INFO, "The command line: {0} {1}", new Object[] { path, url });
     if (modeDisconnected) {
       try {
         String webdavUrl = url;
@@ -91,7 +92,7 @@ public static int launch(String path, String url, boolean modeDisconnected,
           webdavUrl = url.substring(1, url.length() - 1);
         }
         String tmpFilePath = webdavAccessManager.retrieveFile(webdavUrl);
-        logger.log(Level.INFO, "The exact exec line: {0} {1}", new Object[]{path, tmpFilePath});
+        logger.log(Level.INFO, "The exact exec line: {0} {1}", new Object[] { path, tmpFilePath });
         Process process = Runtime.getRuntime().exec(path + ' ' + tmpFilePath);
         process.waitFor();
         webdavAccessManager.pushFile(tmpFilePath, url);
@@ -106,7 +107,7 @@ public static int launch(String path, String url, boolean modeDisconnected,
       }
     } else {
       // Standard mode : just open it
-      logger.log(Level.INFO, "The exact exec line: {0} {2}", new Object[]{path, url});
+      logger.log(Level.INFO, "The exact exec line: {0} {2}", new Object[] { path, url });
       Process process = Runtime.getRuntime().exec(path + ' ' + url);
       return process.waitFor();
     }

src/main/java/com/silverpeas/openoffice/OfficeNotFoundException.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/OpenOfficeFinder.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/OpenOfficeLauncher.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/OpenOfficeNotFoundException.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/linux/WhereisHelper.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/macosx/MacOsOfficeFinder.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/macosx/PlistHelper.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/macosx/WhereisMacHelper.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/util/DirectoryFilter.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/util/FinderFactory.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

src/main/java/com/silverpeas/openoffice/util/MessageDisplayer.java

@@ -9,7 +9,7 @@
  * As a special exception to the terms and conditions of version 3.0 of
  * the GPL, you may redistribute this Program in connection with Free/Libre
  * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have recieved a copy of the text describing
+ * FLOSS exception.  You should have received a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
@@ -21,6 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package com.silverpeas.openoffice.util;
 
 import javax.swing.JOptionPane;