### Eclipse Workspace Patch 1.0 #P org.eclipse.jst.j2ee Index: j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java,v retrieving revision 1.9 diff -u -r1.9 JavaEEPreferencesInitializer.java --- j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java 18 Jan 2012 20:21:08 -0000 1.9 +++ j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java 28 Feb 2012 01:08:31 -0000 @@ -323,8 +323,6 @@ * This will be made private once the deprecated J2EEPreferences class is deleted */ static String getAppClientDefaultOutputFolderName(){ - if (ProductManager.shouldUseSingleRootStructure()) - return getDefaultString(Keys.APP_CLIENT_CONTENT_FOLDER); return getDefaultOutputFolderName(); } @@ -333,8 +331,6 @@ * This will be made private once the deprecated J2EEPreferences class is deleted */ static String getEJBDefaultOutputFolderName(){ - if (ProductManager.shouldUseSingleRootStructure()) - return getDefaultString(Keys.EJB_CONTENT_FOLDER); return getDefaultOutputFolderName(); } @@ -343,8 +339,6 @@ * This will be made private once the deprecated J2EEPreferences class is deleted */ static String getJCADefaultOutputFolderName(){ - if (ProductManager.shouldUseSingleRootStructure()) - return getDefaultString(Keys.JCA_CONTENT_FOLDER); return getDefaultOutputFolderName(); } @@ -363,8 +357,6 @@ * This will be made private once the deprecated J2EEPreferences class is deleted */ static String getDefaultOutputFolderName(){ - if (ProductManager.shouldUseSingleRootStructure()) - return getDefaultJavaSrcFolder(); String outputFolder = getProductProperty( "defaultJavaOutputFolder" ); //$NON-NLS-1$ if( outputFolder == null ){ outputFolder = getProductProperty( "outputFolder" ); //$NON-NLS-1$