From 1e0659fa14a1c006fc2dfbd39166736ebd8cf1db Mon Sep 17 00:00:00 2001 From: Jayaprakash Arthanareeswaran Date: Thu, 13 Oct 2011 14:15:29 +0530 Subject: [PATCH] HEAD - Fix for 287164: Report build path error if source folder has other source folder as output folder --- .../preferences/JavaBuildConfigurationBlock.java | 8 ++++++-- .../ui/preferences/PreferencesMessages.java | 1 + .../ui/preferences/PreferencesMessages.properties | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildConfigurationBlock.java index b2c7eb7..cf46a06 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildConfigurationBlock.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildConfigurationBlock.java @@ -58,6 +58,7 @@ public class JavaBuildConfigurationBlock extends OptionsConfigurationBlock { private static final Key PREF_PB_INCOMPLETE_BUILDPATH= getJDTCoreKey(JavaCore.CORE_INCOMPLETE_CLASSPATH); private static final Key PREF_PB_CIRCULAR_BUILDPATH= getJDTCoreKey(JavaCore.CORE_CIRCULAR_CLASSPATH); private static final Key PREF_PB_INCOMPATIBLE_JDK_LEVEL= getJDTCoreKey(JavaCore.CORE_INCOMPATIBLE_JDK_LEVEL); + private static final Key PREF_PB_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE= getJDTCoreKey(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE); private static final Key PREF_PB_DUPLICATE_RESOURCE= getJDTCoreKey(JavaCore.CORE_JAVA_BUILD_DUPLICATE_RESOURCE); private static final Key PREF_RECREATE_MODIFIED_CLASS_FILES= getJDTCoreKey(JavaCore.CORE_JAVA_BUILD_RECREATE_MODIFIED_CLASS_FILES_IN_OUTPUT_FOLDER); @@ -89,8 +90,8 @@ public class JavaBuildConfigurationBlock extends OptionsConfigurationBlock { Key[] keys= new Key[] { PREF_PB_MAX_PER_UNIT, PREF_RESOURCE_FILTER, PREF_BUILD_INVALID_CLASSPATH, PREF_PB_INCOMPLETE_BUILDPATH, PREF_PB_CIRCULAR_BUILDPATH, PREF_BUILD_CLEAN_OUTPUT_FOLDER, PREF_PB_DUPLICATE_RESOURCE, - PREF_PB_INCOMPATIBLE_JDK_LEVEL, PREF_ENABLE_EXCLUSION_PATTERNS, PREF_ENABLE_MULTIPLE_OUTPUT_LOCATIONS, PREF_RECREATE_MODIFIED_CLASS_FILES, - PREF_PB_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE + PREF_PB_INCOMPATIBLE_JDK_LEVEL, PREF_PB_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, PREF_ENABLE_EXCLUSION_PATTERNS, PREF_ENABLE_MULTIPLE_OUTPUT_LOCATIONS, + PREF_RECREATE_MODIFIED_CLASS_FILES, PREF_PB_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE }; return keys; } @@ -192,6 +193,9 @@ public class JavaBuildConfigurationBlock extends OptionsConfigurationBlock { label= PreferencesMessages.JavaBuildConfigurationBlock_pb_check_prereq_binary_level_label; addComboBox(othersComposite, label, PREF_PB_INCOMPATIBLE_JDK_LEVEL, errorWarningIgnore, errorWarningIgnoreLabels, 0); + + label = PreferencesMessages.JavaBuildConfigurationBlock_pb_output_overlapping_with_source_label; + addComboBox(othersComposite, label, PREF_PB_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, errorWarningIgnore, errorWarningIgnoreLabels, 0); label= PreferencesMessages.JavaBuildConfigurationBlock_pb_strictly_compatible_jre_not_available_label; addComboBox(othersComposite, label, PREF_PB_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE, errorWarningIgnore, errorWarningIgnoreLabels, 0); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java index 9fe2dbf..94f3504 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java @@ -351,6 +351,7 @@ public final class PreferencesMessages extends NLS { public static String ProblemSeveritiesConfigurationBlock_pb_forbidden_reference_label; public static String JavaBuildConfigurationBlock_pb_max_per_unit_label; public static String JavaBuildConfigurationBlock_pb_check_prereq_binary_level_label; + public static String JavaBuildConfigurationBlock_pb_output_overlapping_with_source_label; public static String JavaBuildConfigurationBlock_pb_strictly_compatible_jre_not_available_label; public static String JavaBuildConfigurationBlock_empty_input; public static String JavaBuildConfigurationBlock_invalid_input; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties index aead438..9ced1fa 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties @@ -367,6 +367,7 @@ JavaBuildConfigurationBlock_pb_duplicate_resources_label=Duplica&ted resources: ProblemSeveritiesConfigurationBlock_pb_forbidden_reference_label=&Forbidden reference (access rules): JavaBuildConfigurationBlock_pb_max_per_unit_label=&Maximum number of problems reported per compilation unit: JavaBuildConfigurationBlock_pb_check_prereq_binary_level_label=In&compatible required binaries: +JavaBuildConfigurationBlock_pb_output_overlapping_with_source_label=Allow output location to overlap source locations JavaBuildConfigurationBlock_pb_strictly_compatible_jre_not_available_label= No &strictly compatible JRE for execution environment available: JavaBuildConfigurationBlock_empty_input=Number of problems cannot be empty. -- 1.7.6.msysgit.0