*/
public class FileHandler {
- // unused file provider : collateral effects of single sourcing, this File
- // provider is compulsory for RAP file handler
- public FileHandler(FileProvider jfp) {
- }
+ private FileProvider provider;
- public void openFile(String fileName, String fileId, InputStream is) {
+ public FileHandler(FileProvider provider) {
+ this.provider = provider;
+ }
+ public void openFile(String fileName, String fileId) {
+ String tmpFileName = fileName;
String prefix = "", extension = "";
if (fileName != null) {
int ind = fileName.lastIndexOf('.');
}
}
- File file = createTmpFile(prefix, extension, is);
-
+ InputStream is = null;
try {
+ is = provider.getInputStreamFromFileId(fileId);
+ File file = createTmpFile(prefix, extension, is);
+ tmpFileName = file.getName();
Desktop desktop = null;
if (Desktop.isDesktopSupported()) {
desktop = Desktop.getDesktop();
}
desktop.open(file);
} catch (IOException e) {
- throw new ArgeoException("Cannot open file " + file.getName(), e);
- }
- }
-
- private void openFile(File file) {
- try {
- Desktop desktop = null;
- if (Desktop.isDesktopSupported()) {
- desktop = Desktop.getDesktop();
- desktop.open(file);
- } else {
- throw new ArgeoException("Desktop integration not supported.");
- }
- } catch (IOException e) {
- throw new ArgeoException("Cannot open file " + file.getName(), e);
+ // Note : tmpFileName = fileName if the error has been thrown while
+ // creating the tmpFile.
+ throw new ArgeoException("Cannot open file " + tmpFileName, e);
+ } finally {
+ IOUtils.closeQuietly(is);
}
}
}
return tmpFile;
}
-
}