[CIShell-SVN] SF.net SVN: cishell:[1061] trunk

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

Revision: 1061
          http://cishell.svn.sourceforge.net/cishell/?rev=1061&view=rev
Author:   jrbibers
Date:     2010-03-26 16:30:23 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
http://cns-jira.slis.indiana.edu/browse/SCISQUARED-121

Reviewed by Russell.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/FileUtil.java
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/FileViewer.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/FileUtilities.java
    trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/FileUtil.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/FileUtil.java	2010-03-26 15:32:11 UTC (rev 1060)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/FileUtil.java	2010-03-26 16:30:23 UTC (rev 1061)
@@ -135,13 +135,4 @@
     	
     	return fileNameWithoutExtension;
     }
-    
-    public static void main(String[] args) {
-//		String s = "Input data: CSV file: C:\\Documents and Settings\\katy\\Desktop\\NIH-Demo\\nih\\NIH-data\\NIH-NIGMS-PPBC-R01s,-FY08-Publications.csv";
-		String s = "a\\b/c:d*e?f\"g<h>i|j";
-		
-		System.out.println(replaceInvalidFilenameCharacters(s));		
-		
-    	System.exit(0);
-	}
 }

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-03-26 15:32:11 UTC (rev 1060)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/FileViewer.java	2010-03-26 16:30:23 UTC (rev 1061)
@@ -31,7 +31,7 @@
 	public static final String ANY_MIME_TYPE = "file:";
 	public static final String CSV_FILE_EXT = "file-ext:csv";
 	public static final String CSV_MIME_TYPE = "file:text/csv";
-	public static final String TEMPORARY_CSV_FILE_NAME = "xxx-Session-";
+	public static final String TEMPORARY_CSV_FILE_NAME = "CSV-";
 	public static final String CSV_FILE_EXTENSION = "csv";
 	public static final String TXT_FILE_EXTENSION = "txt";
 	public static final String ANY_FILE_FORMAT_PATTERN =

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/FileUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/FileUtilities.java	2010-03-26 15:32:11 UTC (rev 1060)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/FileUtilities.java	2010-03-26 16:30:23 UTC (rev 1061)
@@ -45,7 +45,7 @@
     	
     	try {
     		temporaryFile =
-    			File.createTempFile("NWB-Session-" + temporaryFileName,
+    			File.createTempFile(temporaryFileName,
     								"." + temporaryFileExtension,
     								temporaryDirectory);
     	}
@@ -120,7 +120,7 @@
 	    String temporaryDirectoryPath = getDefaultTemporaryDirectory();
 	    File temporaryImageFile =
 	    	createTemporaryFileInTemporaryDirectory(temporaryDirectoryPath,
-	    											"nwb-temp",
+	    											"image-",
 	    											imageType);
 
 	    // Attempt to write the image to the temporary file on disk.
@@ -140,7 +140,7 @@
 	    String temporaryDirectoryPath = getDefaultTemporaryDirectory();
 	    File temporaryTextFile =
 	    	createTemporaryFileInTemporaryDirectory(temporaryDirectoryPath,
-	    											"nwb-temp",
+	    											"text-",
 	    											fileExtension);
 
 	    FileWriter textFileWriter = new FileWriter(temporaryTextFile);

Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java	2010-03-26 15:32:11 UTC (rev 1060)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java	2010-03-26 16:30:23 UTC (rev 1061)
@@ -486,7 +486,7 @@
 		if(!tempDir.exists())
 			tempDir.mkdir();
 		try{
-			tempFile = File.createTempFile("NWB-Session-", ".nwb", tempDir);
+			tempFile = File.createTempFile("ConverterTester-", ".nwb", tempDir);
 
 		}catch (IOException e){
 			


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