View | Details | Raw Unified | Return to bug 65795 | Differences between
and this patch

Collapse All | Expand All

(-)search/org/eclipse/jdt/internal/core/search/indexing/AddFolderToIndex.java (-2 / +5 lines)
Lines 80-87 Link Here
80 
									}
 80 
									}
81 
									return false;
 81 
									return false;
82 
								case IResource.FOLDER :
 82 
								case IResource.FOLDER :
83 
									if (Util.isExcluded(proxy.requestResource(), inclusionPatterns, exclusionPatterns))
 83 
									if (exclusionPatterns != null && inclusionPatterns == null) {
84 
										return false;
 84 
										// if there are inclusion patterns then we must walk the children
85 
										if (Util.isExcluded(proxy.requestFullPath(), inclusionPatterns, exclusionPatterns, true))
86 
										    return false;
87 
									}
85 
							}
 88 
							}
86 
							return true;
 89 
							return true;
87 
						}
 90 
						}
(-)search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java (-3 / +5 lines)
Lines 115-123 Link Here
115 
												}
 115 
												}
116 
												return false;
 116 
												return false;
117 
											case IResource.FOLDER :
 117 
											case IResource.FOLDER :
118 
												if (exclusionPatterns != null || inclusionPatterns != null)
 118 
												if (exclusionPatterns != null && inclusionPatterns == null) {
119 
													if (Util.isExcluded(proxy.requestResource(), inclusionPatterns, exclusionPatterns))
 119 
													// if there are inclusion patterns then we must walk the children
120 
														return false;
 120 
													if (Util.isExcluded(proxy.requestFullPath(), inclusionPatterns, exclusionPatterns, true))
121 
													    return false;
122 
												}
121 
												if (hasOutputs && outputs.contains(proxy.requestFullPath()))
 123 
												if (hasOutputs && outputs.contains(proxy.requestFullPath()))
122 
													return false;
 124 
													return false;
123 
										}
 125 
										}

Return to bug 65795