Merge from 3.1.1 (at merge_src_20060221-0125) to 3.2 (at v20060222-2230_pre_merge).v20060222-2330_postmerge

3 files changed, 13 insertions, 3 deletions

diff --git a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AptConfigurationBlock.java b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AptConfigurationBlock.java
index b915161c3e..e0d2ea394a 100644
--- a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AptConfigurationBlock.java
+++ b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AptConfigurationBlock.java
@@ -18,6 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.preferences.IScopeContext;
@@ -386,6 +387,12 @@ public class AptConfigurationBlock extends BaseConfigurationBlock {
 		if (!AptConfig.validateGenSrcDir(fJProj, dirName)) {
 			return new StatusInfo(IStatus.ERROR, Messages.AptConfigurationBlock_genSrcDirMustBeValidRelativePath);
 		}
+		if (fJProj != null && !dirName.equals(fOriginalGenSrcDir)) {
+			IFolder folder = fJProj.getProject().getFolder( dirName );
+			if (folder != null && folder.exists() && !folder.isDerived()) {
+				return new StatusInfo(IStatus.WARNING, Messages.AptConfigurationBlock_warningContentsMayBeDeleted);
+			}
+		}
 		return new StatusInfo();
 	}
 
diff --git a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/Messages.java b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/Messages.java
index b3075e114b..8fa73c3cb0 100644
--- a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/Messages.java
+++ b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/Messages.java
@@ -105,4 +105,6 @@ public class Messages extends NLS {
 	public static String AdvancedFactoryPathOptionsDialog_batchMode;
 
 	public static String AdvancedFactoryPathOptionsDialog_label_processorsInThisContainer;
+
+	public static String AptConfigurationBlock_warningContentsMayBeDeleted;
 }
diff --git a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/messages.properties b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/messages.properties
index 6e5ea2fe5e..7bf18410bf 100644
--- a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/messages.properties
+++ b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/messages.properties
@@ -6,6 +6,7 @@ AptConfigurationBlock_remove=Remove
 AptConfigurationBlock_value=Value
 AptConfigurationBlock_generatedSrcDir=Generated source directory:
 AptConfigurationBlock_warningIgnoredOptions=An automatically set option will override this option
+AptConfigurationBlock_warningContentsMayBeDeleted=Contents of generated source directory may be deleted
 AptConfigurationBlock_classpathAddedAutomaticallyNote=Note: options such as \"-classpath\" and \"-sourcepath\" are automatically passed to all processors, with values corresponding to the project's Java settings.
 AptConfigurationBlock_genSrcDirMustBeValidRelativePath=Generated source directory must be a valid relative path
 AptConfigurationBlock_options=Processor options (-Akey=value):
@@ -13,18 +14,18 @@ AptPreferencePage_preferences=Specify the default annotation processor settings
 FactoryPathConfigurationBlock_up=Up
 FactoryPathConfigurationBlock_down=Down
 FactoryPathConfigurationBlock_edit=Edit...
-FactoryPathConfigurationBlock_addJars=Add Jars...
+FactoryPathConfigurationBlock_addJars=Add JARs...
 FactoryPathConfigurationBlock_advanced=Advanced...
 FactoryPathPreferencePage_factoryPath=Java annotation processor factory path:
 FactoryPathPreferencePage_preferences=Factory Path Preferences
-FactoryPathConfigurationBlock_addExternalJars=Add External Jars...
+FactoryPathConfigurationBlock_addExternalJars=Add External JARs...
 FactoryPathConfigurationBlock_unableToSaveFactorypath_title=Save Factory Path
 FactoryPathConfigurationBlock_unableToSaveFactorypath_message=Unable to save factory path.
 FactoryPathConfigurationBlock_addVariable=Add Variable...
 FactoryPathConfigurationBlock_remove=Remove
 FactoryPathConfigurationBlock_enableAll=Enable All
 FactoryPathConfigurationBlock_disableAll=Disable All
-FactoryPathConfigurationBlock_pluginsAndJars=Plugins and jars that contain annotation processors:
+FactoryPathConfigurationBlock_pluginsAndJars=Plug-ins and JARs that contain annotation processors:
 AptPreferencePage_preferencesTitle=Java Annotation Processing Preferences
 BaseConfigurationBlock_settingsChanged=Annotation Processing Settings Changed
 BaseConfigurationBlock_fullRebuildRequired=The annotation processing settings have changed. A full rebuild is required for changes to take effect. Do the full build now?