[CIShell-SVN] SF.net SVN: cishell:[1077] trunk/clients/gui/org.cishell.reference.gui. persistence/src/org/cishell/reference/gui/persistence/view/core/FileViewer. java

[<jrb...@us...>]

Revision: 1077
          http://cishell.svn.sourceforge.net/cishell/?rev=1077&view=rev
Author:   jrbibers
Date:     2010-06-24 18:18:27 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
Fixed tool error when using "View" or "View With..." on an item in the data manager whose label contains invalid filename characters (like "/" or "\").  The "Save" algorithm had been properly sanitizing data labels, so now we just do that same sanitization for "View" (to which "View With..." calls).

Reviewed by Russell.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/FileViewer.java

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/FileViewer.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/FileViewer.java	2010-06-20 19:33:14 UTC (rev 1076)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/FileViewer.java	2010-06-24 18:18:27 UTC (rev 1077)
@@ -278,20 +278,22 @@
 		String dataLabel =
 			(String)originalData.getMetadata().get(DataProperty.LABEL);
 		String dataFormat = originalData.getFormat();
-		String fileName = FileUtilities.extractFileName(dataLabel);
+		String suggestedFileName = FileUtilities.extractFileName(dataLabel);
+		String cleanedSuggestedFileName =
+			FileUtilities.replaceInvalidFilenameCharacters(suggestedFileName);
 		String fileExtension = FileUtilities.extractExtension(dataFormat);
 
 		try {
 			File fileToView = FileUtilities.
 				createTemporaryFileInDefaultTemporaryDirectory(
-					fileName, fileExtension);
+						cleanedSuggestedFileName, fileExtension);
 			FileUtilities.copyFile((File)originalData.getData(), fileToView);
 			
 			return fileToView;
 		} catch (IOException temporaryFileCreationException) {
 			String exceptionMessage =
 				"An IOException occurred when creating the temporary file \"" +
-				fileName + "." + fileExtension +
+				cleanedSuggestedFileName + "." + fileExtension +
 				"\" for viewing the data \"" + dataLabel + "\".";
 			
 			throw new ConvertDataForViewingException(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.