Fixing bug #4346 Taking Ms Office and Windows version into account when choosing the webdav url.

Author: Emmanuel Hugonnet

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

@@ -43,26 +43,25 @@ public class OfficeLauncher {
 
   /**
    * Launch the document editor.
+   *
    * @param type type of editor for the document (word editor, presentation editor, etc.)
    * @param url the url to the document.
    * @param authInfo authentication parameters
-   * @param useDeconnectedMode : set to true if you want to activate the Disconnected mode : 
-   *  1) download file using webdav to local temp directory 
-   *  2) open it 
-   *  3) after close, send it back to silverpeas, still using webdav 
-   *  4) delete temp file locally
+   * @param useDeconnectedMode : set to true if you want to activate the Disconnected mode : 1)
+   * download file using webdav to local temp directory 2) open it 3) after close, send it back to
+   * silverpeas, still using webdav 4) delete temp file locally
    * @return the result of the process.
    * @throws IOException
    * @throws InterruptedException
-   * @throws OfficeNotFoundException 
+   * @throws OfficeNotFoundException
    */
   public static int launch(MsOfficeType type, String url, AuthenticationInfo authInfo,
       boolean useDeconnectedMode) throws IOException, InterruptedException, OfficeNotFoundException {
     OfficeFinder finder = FinderFactory.getFinder(type);
     logger.log(Level.INFO, "Are we using Office : {0}", finder.isMicrosoftOffice());
     logger.log(Level.INFO, "We are on {0} OS", OsEnum.getOS());
     boolean modeDisconnected = ((OsEnum.isWindows() && useDeconnectedMode) || OsEnum.getOS()
-        == OsEnum.MAC_OSX) && finder.isMicrosoftOffice();    
+        == OsEnum.MAC_OSX) && finder.isMicrosoftOffice();
     switch (type) {
       case EXCEL:
         return launch(type, finder.findSpreadsheet(), url, modeDisconnected, authInfo);
@@ -116,7 +115,8 @@ protected static int launch(MsOfficeType type, String path, String url, boolean
     } else {
       // Standard mode : just open it
       String webdavUrl = url;
-      if(OsEnum.isWindows() && MsOfficeVersion.isOldOffice(type)) {
+      if (OsEnum.getOS() == OsEnum.WINDOWS_XP || (OsEnum.isWindows() && MsOfficeVersion.isOldOffice(
+          type))) {
         webdavUrl = webdavUrl.replace("/repository/", "/repository2000/");
       }
       logger.log(Level.INFO, "The exact exec line: {0} {2}", new Object[]{path, webdavUrl});

src/main/java/org/silverpeas/openoffice/util/OsEnum.java

@@ -1,47 +1,33 @@
 /**
  * Copyright (C) 2000 - 2009 Silverpeas
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU Affero General Public License as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *
- * 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 received a copy of the text describing
- * the FLOSS exception, and it is also available here:
+ * 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 received a copy of the
+ * text describing the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
  *
- * 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.
+ * 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 org.silverpeas.openoffice.util;
 
-import java.io.File;
-
 /**
- * @author Emmanuel Hugonnet
+ * Enumeration of supported OS type.
  */
 public enum OsEnum {
 
-  WINDOWS_XP("Application Data\\Mozilla\\Firefox\\Profiles"), WINDOWS_VISTA(
-      "Appdata\\Roaming\\Mozilla\\Firefox"), WINDOWS_SEVEN("Appdata\\Roaming\\Mozilla\\Firefox"), LINUX(
-      ".mozilla/firefox"), MAC_OSX(".mozilla/firefox");
-  protected String profilesDir;
+  WINDOWS_XP, WINDOWS_VISTA, WINDOWS_SEVEN, WINDOWS_8, LINUX, MAC_OSX;
 
-  OsEnum(String profilesDir) {
-    this.profilesDir = profilesDir;
+  OsEnum() {
   }
 
   public static OsEnum getOS(String value) {
@@ -51,6 +37,9 @@ public static OsEnum getOS(String value) {
     if ("Windows 7".equalsIgnoreCase(value)) {
       return WINDOWS_SEVEN;
     }
+    if ("Windows 8".equalsIgnoreCase(value)) {
+      return WINDOWS_8;
+    }
     if ("Windows XP".equalsIgnoreCase(value) || value.startsWith("Windows ")) {
       return WINDOWS_XP;
     }
@@ -60,20 +49,20 @@ public static OsEnum getOS(String value) {
     return MAC_OSX;
   }
 
+  /**
+   * Detect the local OS.
+   *
+   * @return the OS on which the code is running.
+   */
   public static OsEnum getOS() {
     return getOS(System.getProperty("os.name"));
   }
 
-  public String getProfilesDirectory() {
-    return System.getProperty("user.home") + File.separator + profilesDir;
-  }
-  
-  
   public static boolean isWindows() {
     OsEnum currentOS = getOS();
     return currentOS == WINDOWS_SEVEN || currentOS == WINDOWS_XP || currentOS == WINDOWS_VISTA;
   }
-  
+
   public static boolean isLinux() {
     return getOS() == LINUX;
   }

src/main/java/org/silverpeas/openoffice/windows/MsOfficeRegistryHelper.java

@@ -58,7 +58,7 @@ protected String getPath(RegistryApplicationKey type) {
         path = RegistryKeyReader.readKey(BASE_KEY_64_CLSID + clsid + "\\LocalServer32\"");
       }
       if (path != null) {
-        String extractedPath = extractPath(path);
+        String extractedPath = extractPath(path).trim();
         if (!extractedPath.startsWith("\"")) {
           extractedPath = '"' + extractedPath + '"';
         }