Upload Progress Bar is active for Vista/Office 2007

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

Author: Emmanuel Hugonnet

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

@@ -25,9 +25,7 @@
 
 /**
  * Authentication information.
- * 
  * @author Ludovic Bertin
- *
  */
 public class AuthenticationInfo {
 

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

@@ -34,12 +34,14 @@
 import javax.activation.MimetypesFileTypeMap;
 
 import com.silverpeas.openoffice.util.MsOfficeType;
+import com.silverpeas.openoffice.util.OsEnum;
 import com.silverpeas.openoffice.util.PasswordManager;
 import com.silverpeas.openoffice.util.UrlExtractor;
 import com.silverpeas.openoffice.windows.MsOfficePathFinder;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 
 /**
- * 
  * @author Emmanuel Hugonnet
  */
 public class Launcher {
@@ -49,8 +51,7 @@ public class Launcher {
   static Logger logger = Logger.getLogger(Launcher.class.getName());
 
   /**
-   * @param args
-   *            the command line arguments
+   * @param args the command line arguments
    */
   public static void main(String[] args) throws OfficeNotFoundException {
     logger.log(Level.INFO,
@@ -60,7 +61,7 @@ public static void main(String[] args) throws OfficeNotFoundException {
       String url = UrlExtractor.extractUrl(args[0]);
       logger.log(Level.INFO, MessageUtil.getMessage("info.url.decoded") + url);
       if (args[1] != null && !"".equals(args[1].trim())) {
-        logger.log(Level.INFO,MessageUtil.getMessage("info.default.path")
+        logger.log(Level.INFO, MessageUtil.getMessage("info.default.path")
             + ' ' + UrlExtractor.decodePath(args[1]));
         MsOfficePathFinder.basePath = UrlExtractor.decodePath(args[1]);
       }
@@ -69,8 +70,9 @@ public static void main(String[] args) throws OfficeNotFoundException {
         authInfo = PasswordManager.extractAuthenticationInfo(args[2], args[3]);
       }
       MsOfficeType contentType = getContentType(UrlExtractor.decodeUrl(args[0]));
-      logger.log(Level.FINE, MessageUtil.getMessage("info.document.type") +
-          contentType);
+      logger.log(Level.FINE, 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"),
@@ -89,6 +91,24 @@ public static void main(String[] args) throws OfficeNotFoundException {
     }
   }
 
+  protected static void defineLookAndFeel() {
+    try {
+      try {
+        if (OsEnum.getOS() == OsEnum.WINDOWS_VISTA || OsEnum.getOS() == OsEnum.WINDOWS_XP) {
+          UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        }
+      } catch (ClassNotFoundException ex) {
+        logger.log(Level.INFO, null, ex);
+      } catch (InstantiationException ex) {
+        logger.log(Level.INFO, null, ex);
+      } catch (IllegalAccessException ex) {
+        logger.log(Level.INFO, null, ex);
+      }
+    } catch (UnsupportedLookAndFeelException ex) {
+      logger.log(Level.INFO, "Unable to load native look and feel");
+    }
+  }
+
   protected static MsOfficeType getContentType(String url)
       throws MalformedURLException {
     String fileName = new URL(url).getFile();

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

@@ -1,53 +1,52 @@
-/**
- * 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.
- *
- * 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
- * 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.
- *
- * 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.
- */
-package com.silverpeas.openoffice;
-
-/**
- *
- * @author Emmanuel Hugonnet
- */
-public class MsOfficeNotFoundException extends Exception {
-
-  private static final long serialVersionUID = 10l;
-
-  public MsOfficeNotFoundException() {
-    super();
-  }
-
-  public MsOfficeNotFoundException(String message) {
-    super(message);
-  }
-
-  public MsOfficeNotFoundException(Throwable cause) {
-    super(cause);
-  }
-
-  public MsOfficeNotFoundException(String message, Throwable cause) {
-    super(message, cause);
-  }
-}
+/**
+ * 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.
+ *
+ * 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
+ * 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.
+ *
+ * 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.
+ */
+package com.silverpeas.openoffice;
+
+/**
+ * @author Emmanuel Hugonnet
+ */
+public class MsOfficeNotFoundException extends Exception {
+
+  private static final long serialVersionUID = 10l;
+
+  public MsOfficeNotFoundException() {
+    super();
+  }
+
+  public MsOfficeNotFoundException(String message) {
+    super(message);
+  }
+
+  public MsOfficeNotFoundException(Throwable cause) {
+    super(cause);
+  }
+
+  public MsOfficeNotFoundException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}

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

@@ -28,7 +28,6 @@
 package com.silverpeas.openoffice;
 
 /**
- *
  * @author Emmanuel Hugonnet
  */
 public interface OfficeFinder {
@@ -40,6 +39,6 @@ public interface OfficeFinder {
   public String findWordEditor() throws OfficeNotFoundException;
 
   public String findOther() throws OfficeNotFoundException;
-  
+
   public boolean isMicrosoftOffice2007();
 }

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

@@ -24,8 +24,9 @@
 package com.silverpeas.openoffice;
 
 import com.silverpeas.openoffice.windows.FileWebDavAccessManager;
+import com.silverpeas.openoffice.util.MessageUtil;
+import com.silverpeas.openoffice.util.MessageDisplayer;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -35,30 +36,22 @@
 import org.apache.commons.httpclient.HttpException;
 
 /**
- * 
  * @author Emmanuel Hugonnet
  */
 public class OfficeLauncher {
 
   static Logger logger = Logger.getLogger(OfficeLauncher.class.getName());
 
   /*
-   * If user is under Windows vista and use MS Office 2007.
-   * Disconnected mode must be activated :
-   *
-   * 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
-   *
+   * If user is under Windows vista and use MS Office 2007. Disconnected mode must be activated : 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
    */
-  public static int launch(MsOfficeType type, String url,
-      AuthenticationInfo authInfo) throws IOException,
-      InterruptedException, OfficeNotFoundException {
-    OfficeFinder finder = FinderFactory.getFinder(type); 
-    boolean modeDisconnected = (OsEnum.getOS() ==
-        OsEnum.WINDOWS_VISTA || OsEnum.getOS() ==
-        OsEnum.MAC_OSX) && (finder.isMicrosoftOffice2007());
+  public static int launch(MsOfficeType type, String url, AuthenticationInfo authInfo)
+          throws IOException, InterruptedException, OfficeNotFoundException {
+    OfficeFinder finder = FinderFactory.getFinder(type);
+    boolean modeDisconnected = (OsEnum.getOS() == OsEnum.WINDOWS_VISTA ||
+        OsEnum.getOS() == OsEnum.MAC_OSX) && (finder.isMicrosoftOffice2007());
     switch (type) {
       case EXCEL:
         return launch(finder.findSpreadsheet(), url, modeDisconnected, authInfo);
@@ -74,43 +67,38 @@ public static int launch(MsOfficeType type, String url,
 
   /**
    * Launch document edition
-   *
    * @param path path to editor
    * @param url document url
    * @param modeDisconnected disconnected mode (used under vista + MS Office 2007)
    * @param auth authentication info
-   *
    * @return status
-   *
    * @throws IOException
    * @throws InterruptedException
    */
   public static int launch(String path, String url, boolean modeDisconnected,
-      AuthenticationInfo auth)
-      throws IOException, InterruptedException {
+      AuthenticationInfo auth) throws IOException, InterruptedException {
     logger.log(Level.INFO, "The path: " + path);
     logger.log(Level.INFO, "The url: " + url);
     logger.log(Level.INFO, "The command line: " + path + ' ' + url);
     if (modeDisconnected) {
       try {
-        FileWebDavAccessManager webdavAccessManager =
-            new FileWebDavAccessManager(auth);
+        FileWebDavAccessManager webdavAccessManager = new FileWebDavAccessManager(auth);
         url = url.substring(1, url.length() - 1);
         String tmpFilePath = webdavAccessManager.retrieveFile(url);
-        Process process =
-            Runtime.getRuntime().exec(path + ' ' + tmpFilePath);
+        Process process = Runtime.getRuntime().exec(path + ' ' + tmpFilePath);
         process.waitFor();
         webdavAccessManager.pushFile(tmpFilePath, url);
+        MessageDisplayer.displayMessage(MessageUtil.getMessage("info.ok"));
         return 0;
       } catch (HttpException ex) {
         logger.log(Level.SEVERE, null, ex);
         throw new IOException(ex);
-      } catch (URISyntaxException ex) {
+      } catch (IOException ex) {
         logger.log(Level.SEVERE, null, ex);
-        throw new IOException(ex);
+        throw ex;
       }
     } else {
-      //Standard mode : just open it
+      // Standard mode : just open it
       logger.log(Level.INFO, "The exact exec line: " + path + ' ' + url);
       Process process = Runtime.getRuntime().exec(path + ' ' + url);
       return process.waitFor();