litesoft

URLs

Explore

Commits

Diff Revisions 366 vs 409 for /trunk/Java/ScarPlus/src/com/esotericsoftware/scar/ProjectParameters.java

		@@ -79,12 +79,11 @@
79	79
80	80		// -------------------------------------------------- Validation ---------------------------------------------------
81	81
82		-	@SuppressWarnings({"PointlessArithmeticExpression"})
83	82		public ProjectParameters validate()
84	83		{
85		-	int zHas = (1 * ((null != getAppDir()) ? 1 : 0)) + //
86		-	(2 * ((null != getOneJar()) ? 1 : 0)) + //
87		-	(4 * ((null != getWar()) ? 1 : 0));
	84	+	int zHas = intForNotNull( 1, getAppDir() ) + //
	85	+	intForNotNull( 2, getOneJar() ) + //
	86	+	intForNotNull( 4, getWar() );
88	87		switch ( zHas )
89	88		{
90	89		default:
		@@ -115,6 +114,45 @@
115	114		defaultJAR();
116	115		defaultDIST();
117	116		defaultGWT();
	117	+	defaultOneJar();
	118	+	}
	119	+
	120	+	protected void defaultOneJar()
	121	+	{
	122	+	enforceJarExtension( ONEJAR.getName() );
	123	+	}
	124	+
	125	+	protected void defaultDIST()
	126	+	{
	127	+	defaultSubDirOptional( DIST, "war" );
	128	+	}
	129	+
	130	+	protected void defaultJAR()
	131	+	{
	132	+	if ( null == enforceJarExtension( JAR.getName() ) )
	133	+	{
	134	+	mManager.put( JAR.getName(), "$target$/$name$" + (hasVersion() ? "-$version$" : "") + ".jar" );
	135	+	}
	136	+	}
	137	+
	138	+	protected void defaultTARGET()
	139	+	{
	140	+	defaultKey( TARGET, "build" );
	141	+	}
	142	+
	143	+	protected void defaultCLASSPATH()
	144	+	{
	145	+	defaultSubDirOptional( CLASSPATH, "lib\|**.jar" );
	146	+	}
	147	+
	148	+	protected void defaultRESOURCES()
	149	+	{
	150	+	defaultSubDirOptional( RESOURCES, "src/main/resources", "resources" );
	151	+	}
	152	+
	153	+	protected void defaultSOURCE()
	154	+	{
	155	+	defaultSubDirOptional( SOURCE, "src/main/java\|.java", "src\|.java" );
118	156		}
119	157
120	158		protected void defaultGWT()
		@@ -150,46 +188,18 @@
150	188		}
151	189		}
152	190
153		-	protected void defaultDIST()
154		-	{
155		-	defaultSubDirOptional( DIST, "war" );
156		-	}
157		-
158		-	protected void defaultJAR()
	191	+	protected String enforceJarExtension( String pEntryName )
159	192		{
160		-	String zJar = getJar();
161		-	if ( null == zJar )
162		-	{
163		-	mManager.put( JAR.getName(), "$target$/$name$" + (hasVersion() ? "-$version$" : "") + ".jar" );
164		-	}
165		-	else
	193	+	String zJar = get( pEntryName );
	194	+	if ( null != zJar )
166	195		{
167	196		int at = zJar.lastIndexOf( '.' );
168	197		if ( at == -1 \|\| !".jar".equalsIgnoreCase( zJar.substring( at ) ) )
169	198		{
170		-	mManager.put( JAR.getName(), zJar + ".jar" );
	199	+	mManager.put( pEntryName, zJar += ".jar" );
171	200		}
172	201		}
173		-	}
174		-
175		-	protected void defaultTARGET()
176		-	{
177		-	defaultKey( TARGET, "build" );
178		-	}
179		-
180		-	protected void defaultCLASSPATH()
181		-	{
182		-	defaultSubDirOptional( CLASSPATH, "lib\|**.jar" );
183		-	}
184		-
185		-	protected void defaultRESOURCES()
186		-	{
187		-	defaultSubDirOptional( RESOURCES, "src/main/resources", "resources" );
188		-	}
189		-
190		-	protected void defaultSOURCE()
191		-	{
192		-	defaultSubDirOptional( SOURCE, "src/main/java\|.java", "src\|.java" );
	202	+	return zJar;
193	203		}
194	204
195	205		// ------------------------------------------- Special Property Accessors ------------------------------------------

View View this file contents

History View the full history

Feeds

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