litesoft

Explore

Commits

Diff Revisions 546 vs 547 for /trunk/Java/ScarPlus/src/com/esotericsoftware/scar/ProjectParameters.java

		@@ -160,7 +160,7 @@
160	160		String zGWT = getGWT();
161	161		if ( null != zGWT )
162	162		{
163		-	verifyGWTlibs( getGWTat() );
	163	+	verifyGWTlibs( getGWTatDir() );
164	164		defaultKey( GWTwar, "$target$/GWTCompilerOutput" );
165	165		defaultKey( GWTstyle, "OBF" );
166	166		defaultKey( GWTlogging, "INFO" );
		@@ -168,22 +168,21 @@
168	168		}
169	169		}
170	170
171		-	protected void verifyGWTlibs( String pRelativeGWTlibsDir )
	171	+	protected void verifyGWTlibs( File pGWTdir )
172	172		{
173		-	if ( pRelativeGWTlibsDir == null )
	173	+	if ( pGWTdir == null )
174	174		{
175	175		throw new IllegalStateException( "GWT specified, but NO GWTat!" );
176	176		}
177		-	if ( !dirExists( pRelativeGWTlibsDir ) )
	177	+	if ( !pGWTdir.isDirectory() )
178	178		{
179		-	throw new IllegalStateException( "GWTat '" + pRelativeGWTlibsDir + "' is not a directory!" );
	179	+	throw new IllegalStateException( "GWTat '" + pGWTdir + "' is not a directory!" );
180	180		}
181		-	File zGWTdir = canonicalizePath( getCanonicalProjectDir(), pRelativeGWTlibsDir );
182	181		for ( String zGwtJar : GWT_JARS )
183	182		{
184		-	if ( !new File( zGWTdir, zGwtJar ).isFile() )
	183	+	if ( !new File( pGWTdir, zGwtJar ).isFile() )
185	184		{
186		-	throw new IllegalStateException( "GWTat '" + pRelativeGWTlibsDir + "' -> '" + zGWTdir.getPath() + "' did not contain: " + zGwtJar );
	185	+	throw new IllegalStateException( "GWTat '" + pGWTdir.getPath() + "' did not contain: " + zGwtJar );
187	186		}
188	187		}
189	188		}