[CIShell-SVN] SF.net SVN: cishell:[1065] trunk/clients/gui/org.cishell.reference.gui. persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java

[<fu...@us...>]

Revision: 1065
          http://cishell.svn.sourceforge.net/cishell/?rev=1065&view=rev
Author:   fugu13
Date:     2010-03-26 20:32:48 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
Make small change that might fix Katy's problem w/ the load paths.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java	2010-03-26 20:12:06 UTC (rev 1064)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java	2010-03-26 20:32:48 UTC (rev 1065)
@@ -1,6 +1,7 @@
 package org.cishell.reference.gui.persistence.load;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Dictionary;
 
@@ -52,8 +53,18 @@
 	}
 	
 	protected static void relabelWithFilename(Data data, File file) {
-		File absoluteFile = file.getAbsoluteFile();
-		File parent = absoluteFile.getParentFile();
+		File absoluteFile;
+		try {
+			absoluteFile = file.getCanonicalFile();
+		} catch (IOException e) {
+			absoluteFile = file.getAbsoluteFile();
+		}
+		File parent;
+		try {
+			parent = absoluteFile.getParentFile().getCanonicalFile();
+		} catch (IOException e) {
+			parent = absoluteFile.getParentFile().getAbsoluteFile();
+		}
 		String prefix;
 		String parentName = parent.getName();
 		if(parentName.trim().length() == 0) {


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