From: Ron B. <rjb...@us...> - 2007-01-19 19:25:45
|
Update of /cvsroot/glassbox/glassbox/bootstrap/src/glassbox/bootstrap/log In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13530/src/glassbox/bootstrap/log Modified Files: InitializeLog.java Log Message: Update jar location utility and test. Index: InitializeLog.java =================================================================== RCS file: /cvsroot/glassbox/glassbox/bootstrap/src/glassbox/bootstrap/log/InitializeLog.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** InitializeLog.java 23 Dec 2006 01:22:07 -0000 1.9 --- InitializeLog.java 19 Jan 2007 19:25:30 -0000 1.10 *************** *** 126,133 **** if(resloc.startsWith("file:")) { resloc = resloc.substring("file:".length()); ! if(isWindows()) { resloc = resloc.substring(1); } } } return resloc; --- 126,137 ---- if(resloc.startsWith("file:")) { resloc = resloc.substring("file:".length()); ! // handle file:/c:/, which should be c:/ ! if(isWindows() && resloc.length()>2 && resloc.charAt(0)=='/' && Character.isLetter(resloc.charAt(1)) && resloc.charAt(2)==':') { resloc = resloc.substring(1); } } + if (resloc.length()>0 && resloc.charAt(resloc.length()-1)==File.separatorChar) { + resloc = resloc.substring(0, resloc.length()-1); + } } return resloc; |