litesoft

Explore

Commits

Diff Revisions 299 vs 301 for /trunk/Java/ScarPlus/src/com/esotericsoftware/scar/Scar.java

		@@ -57,19 +57,19 @@
57	57		/**
58	58		* Loads the specified project with default values and loads any other projects needed for the "include" property.
59	59		*
60		-	* @param pCurrentDirectory
61		-	* @param pPath Path to a YAML project file, or a directory containing a "project.yaml" file.
	60	+	* @param pCanonicalCurrentDirectory
	61	+	* @param pPath Path to a YAML project file, or a directory containing a "project.yaml" file.
62	62		*/
63	63		@Override
64		-	public Project project( File pCurrentDirectory, String pPath )
	64	+	public Project project( File pCanonicalCurrentDirectory, String pPath )
65	65		throws IOException
66	66		{
67		-	Util.assertNotNull( "CurrentDirectory", pCurrentDirectory );
	67	+	Util.assertNotNull( "CurrentDirectory", pCanonicalCurrentDirectory );
68	68		pPath = Util.assertNotEmpty( "Path", pPath );
69	69		File zFile = new File( pPath );
70	70		if ( !zFile.isAbsolute() )
71	71		{
72		-	zFile = new File( pCurrentDirectory, pPath );
	72	+	zFile = new File( pCanonicalCurrentDirectory, pPath );
73	73		}
74	74		zFile = zFile.getCanonicalFile();
75	75
		@@ -1573,7 +1573,7 @@
1573	1573		protected void createLaunchProject()
1574	1574		throws IOException
1575	1575		{
1576		-	mLaunchProject = project( new File( System.getProperty( "user.dir" ) ), mArgs.get( "file", "." ) );
	1576	+	mLaunchProject = project( CANONICAL_USER_DIR, mArgs.get( "file", "." ) );
1577	1577		}
1578	1578
1579	1579		protected int run()