Adding support for Windows 7

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

Author: Emmanuel Hugonnet

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

@@ -51,7 +51,8 @@ public static int launch(MsOfficeType type, String url, AuthenticationInfo authI
       throws IOException, InterruptedException, OfficeNotFoundException {
     OfficeFinder finder = FinderFactory.getFinder(type);
     boolean modeDisconnected = (OsEnum.getOS() == OsEnum.WINDOWS_VISTA ||
-        OsEnum.getOS() == OsEnum.MAC_OSX) && (finder.isMicrosoftOffice2007());
+        OsEnum.getOS() == OsEnum.WINDOWS_SEVEN ||OsEnum.getOS() == OsEnum.MAC_OSX)
+        && (finder.isMicrosoftOffice2007());
     switch (type) {
       case EXCEL:
         return launch(finder.findSpreadsheet(), url, modeDisconnected, authInfo);

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

@@ -35,7 +35,8 @@
 public enum OsEnum {
 
   WINDOWS_XP("Application Data\\Mozilla\\Firefox\\Profiles"), WINDOWS_VISTA(
-      "Appdata\\Roaming\\Mozilla\\Firefox"), LINUX(".mozilla/firefox"), MAC_OSX(".mozilla/firefox");
+      "Appdata\\Roaming\\Mozilla\\Firefox"), WINDOWS_SEVEN(
+      "Appdata\\Roaming\\Mozilla\\Firefox"),LINUX(".mozilla/firefox"), MAC_OSX(".mozilla/firefox");
   protected String profilesDir;
 
   OsEnum(String profilesDir) {
@@ -46,6 +47,9 @@ public static OsEnum getOS(String value) {
     if ("Windows Vista".equalsIgnoreCase(value)) {
       return WINDOWS_VISTA;
     }
+    if ("Windows 7".equalsIgnoreCase(value)) {
+      return WINDOWS_SEVEN;
+    }
     if ("Windows XP".equalsIgnoreCase(value) || value.startsWith("Windows ")) {
       return WINDOWS_XP;
     }

src/main/java/com/silverpeas/openoffice/windows/WindowsOpenOfficeFinder.java

@@ -40,8 +40,8 @@
  */
 public class WindowsOpenOfficeFinder extends OpenOfficeFinder {
 
-  Logger logger = Logger.getLogger(WindowsOpenOfficeFinder.class.getName());
-  private static final String[] VERSIONS = new String[] { "3.1", "3.0", "2.4",
+  static final Logger logger = Logger.getLogger(WindowsOpenOfficeFinder.class.getName());
+  private static final String[] VERSIONS = new String[] { "3.2", "3.1", "3.0", "2.4",
       "2.3" };
   private static final String GLOBAL_OPEN_OFFICE_FOLDER =
       "\"HKEY_LOCAL_MACHINE\\SOFTWARE\\OpenOffice.org\\OpenOffice.org\\";

src/test/java/com/silverpeas/openoffice/windows/RegistryHelperTest.java

@@ -36,7 +36,7 @@
  */
 public class RegistryHelperTest extends TestCase {
 
-  public static final String INSTALLED_VERSION = "3.1";
+  public static final String INSTALLED_VERSION = "3.2";
   public static final String NOT_INSTALLED_VERSION = "2.0";
 
   public RegistryHelperTest(String testName) {