litesoft

URLs

Explore

Commits

Diff Revisions 343 vs 356 for /trunk/Java/ScarPlus/src/com/esotericsoftware/scar/Scar.java

		@@ -171,9 +171,9 @@
171	171		throw new IllegalArgumentException( pBuildFile + " was NOT either a '.java' or a '.yaml' file!" );
172	172		}
173	173
174		-	protected Project createYamlProject( File zYamlBuildFile, File pCanonicalProjectDir, String pProjectName )
	174	+	protected Project createYamlProject( File pYamlBuildFile, File pCanonicalProjectDir, String pProjectName )
175	175		{
176		-	List<String> zLines = readLines( zYamlBuildFile );
	176	+	List<String> zLines = readLines( pYamlBuildFile );
177	177		int at = findLine( zLines, "---" );
178	178		String zYAML, zCode = null;
179	179		if ( at == -1 )
		@@ -191,20 +191,20 @@
191	191		{
192	192		zClass = createYamlCodeProjectClass( zClass, zCode, at + 1 );
193	193		}
194		-	return instantiate( zClass, pCanonicalProjectDir, pProjectName, zData );
	194	+	return instantiate( pYamlBuildFile, zClass, pCanonicalProjectDir, pProjectName, zData );
195	195		}
196	196
197		-	protected Project createJavaProject( File zJavaBuildFile, File pCanonicalProjectDir, String pProjectName )
	197	+	protected Project createJavaProject( File pJavaBuildFile, File pCanonicalProjectDir, String pProjectName )
198	198		{
199		-	String zFile = mergeLines( readLines( zJavaBuildFile ), 0 );
	199	+	String zFile = mergeLines( readLines( pJavaBuildFile ), 0 );
200	200		Class<? extends Project> zClass = createJavaProjectClass();
201	201		zClass = createJavaCodeProjectClass( zClass, zFile );
202		-	return instantiate( zClass, pCanonicalProjectDir, pProjectName, null );
	202	+	return instantiate( pJavaBuildFile, zClass, pCanonicalProjectDir, pProjectName, null );
203	203		}
204	204
205		-	protected Project instantiate( Class<? extends Project> pClass, File pCanonicalProjectDir, String pProjectName, Map<Object, Object> pData )
	205	+	protected Project instantiate( File zProjectFile, Class<? extends Project> pClass, File pCanonicalProjectDir, String pProjectName, Map<Object, Object> pData )
206	206		{
207		-	return instantiate( pClass, new ProjectParameters( pProjectName, pCanonicalProjectDir, pData ) );
	207	+	return instantiate( pClass, new ProjectParameters( zProjectFile, pProjectName, pCanonicalProjectDir, pData ) );
208	208		}
209	209
210	210		protected Project instantiate( Class<? extends Project> pClass, ProjectParameters pParameters )

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/ScarPlus/src/com/esotericsoftware/scar/Scar.java