[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application JSmoothModelBean.java, 1.14, 1.15 JSmoothModelPersistency.java, 1.11, 1.12

[Rodrigo R. <re...@us...>]

Update of /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24631/src/net/charabia/jsmoothgen/application

Modified Files:
	JSmoothModelBean.java JSmoothModelPersistency.java 
Log Message:
Fixed [ 1694330 ] Working directory handled incorrectly
Fixed [ 1694128 ] launch in exe proc: '\' in command line not passed correctly


Index: JSmoothModelBean.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/JSmoothModelBean.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** JSmoothModelBean.java	27 Mar 2007 20:21:02 -0000	1.14
--- JSmoothModelBean.java	4 Apr 2007 19:47:08 -0000	1.15
***************
*** 394,399 ****
  		if (exebase.isAbsolute() == false)
  		    exebase = new File(filebase, exebase.toString()).getParentFile();
  		//		System.out.println("EXE FILEBASE: " + exebase.toString());
! 		m_currentDirectory = checkRelativePath(exebase, m_currentDirectory, result, "Current directory", toRelativePath);
  	    }
  
--- 394,401 ----
  		if (exebase.isAbsolute() == false)
  		    exebase = new File(filebase, exebase.toString()).getParentFile();
+ 
  		//		System.out.println("EXE FILEBASE: " + exebase.toString());
! 		if ((m_currentDirectory != null) && (m_currentDirectory.indexOf("${")>=0))
! 		    m_currentDirectory = checkRelativePath(exebase, m_currentDirectory, result, "Current directory", toRelativePath);
  	    }
  

Index: JSmoothModelPersistency.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/JSmoothModelPersistency.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JSmoothModelPersistency.java	17 Feb 2007 23:33:40 -0000	1.11
--- JSmoothModelPersistency.java	4 Apr 2007 19:47:08 -0000	1.12
***************
*** 127,130 ****
--- 127,133 ----
      static public File makePathRelativeIfPossible(File root, File f)
      {
+ 	if (f.toString().indexOf("${")>=0)
+ 	    return f;
+ 
  	File orgfile = f;
  	try