xsddoc/src/net/sf/xframe/xsddoc/util FileUtil.java,1.8,1.9

Update of /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9235/src/net/sf/xframe/xsddoc/util

Modified Files:
	FileUtil.java 
Log Message:
Fix for bug [1362775] Wrong Path for included Schema's

Index: FileUtil.java
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/util/FileUtil.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FileUtil.java	26 Feb 2005 14:03:38 -0000	1.8
--- FileUtil.java	15 Feb 2006 00:59:32 -0000	1.9
***************
*** 38,44 ****
      private static final int COPY_BUFFER_SIZE = 8192;
  
-     /** file separator from <code>File.separator</code>. */
-     private static final String FILE_SEP = File.separator;
- 
      /**
       * Private default constructor to prevent instantiation.
--- 38,41 ----
***************
*** 123,127 ****
       */
      public static String getLocation(final String baseFile, final String file) {
!         if (baseFile == null || file.indexOf(':') > 0) {
              return file;
          }
--- 120,127 ----
       */
      public static String getLocation(final String baseFile, final String file) {
!         if (baseFile == null) {
!             return file;
!         }
!         if (new File(file).isAbsolute()) {
              return file;
          }
***************
*** 130,134 ****
              return file;
          }
!         return parent + FILE_SEP + file;
      }
  }
--- 130,134 ----
              return file;
          }
!         return new File(parent, file).getAbsolutePath();
      }
  }



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642