View | Details | Raw Unified | Return to bug 372683
Collapse All | Expand All

(-)j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java (-8 lines)
Lines 323-330 Link Here
323 
	 * This will be made private once the deprecated J2EEPreferences class is deleted
323 
	 * This will be made private once the deprecated J2EEPreferences class is deleted
324 
	 */
 324 
	 */
325 
	static String getAppClientDefaultOutputFolderName(){
 325 
	static String getAppClientDefaultOutputFolderName(){
326 
		if (ProductManager.shouldUseSingleRootStructure())
327 
			return getDefaultString(Keys.APP_CLIENT_CONTENT_FOLDER);
328 
		return getDefaultOutputFolderName();
 326 
		return getDefaultOutputFolderName();
329 
	}
 327 
	}
330
328
Lines 333-340 Link Here
333 
	 * This will be made private once the deprecated J2EEPreferences class is deleted
331 
	 * This will be made private once the deprecated J2EEPreferences class is deleted
334 
	 */
 332 
	 */
335 
	static String getEJBDefaultOutputFolderName(){
 333 
	static String getEJBDefaultOutputFolderName(){
336 
		if (ProductManager.shouldUseSingleRootStructure())
337 
			return getDefaultString(Keys.EJB_CONTENT_FOLDER);
338 
		return getDefaultOutputFolderName();
 334 
		return getDefaultOutputFolderName();
339 
	}
 335 
	}
340
336
Lines 343-350 Link Here
343 
	 * This will be made private once the deprecated J2EEPreferences class is deleted
339 
	 * This will be made private once the deprecated J2EEPreferences class is deleted
344 
	 */
 340 
	 */
345 
	static String getJCADefaultOutputFolderName(){
 341 
	static String getJCADefaultOutputFolderName(){
346 
		if (ProductManager.shouldUseSingleRootStructure())
347 
			return getDefaultString(Keys.JCA_CONTENT_FOLDER);
348 
		return getDefaultOutputFolderName();
 342 
		return getDefaultOutputFolderName();
349 
	}
 343 
	}
350
344
Lines 363-370 Link Here
363 
	 * This will be made private once the deprecated J2EEPreferences class is deleted
357 
	 * This will be made private once the deprecated J2EEPreferences class is deleted
364 
	 */
 358 
	 */
365 
	static String getDefaultOutputFolderName(){
 359 
	static String getDefaultOutputFolderName(){
366 
		if (ProductManager.shouldUseSingleRootStructure())
367 
			return getDefaultJavaSrcFolder();
368 
	    String outputFolder = getProductProperty( "defaultJavaOutputFolder" ); //$NON-NLS-1$
 360 
	    String outputFolder = getProductProperty( "defaultJavaOutputFolder" ); //$NON-NLS-1$
369 
	    if( outputFolder == null ){
 361 
	    if( outputFolder == null ){
370 
	        outputFolder = getProductProperty( "outputFolder" ); //$NON-NLS-1$
 362 
	        outputFolder = getProductProperty( "outputFolder" ); //$NON-NLS-1$

Return to bug 372683