|
Lines 26-31
Link Here
|
| 26 |
import org.eclipse.core.runtime.OperationCanceledException; |
26 |
import org.eclipse.core.runtime.OperationCanceledException; |
| 27 |
import org.eclipse.core.runtime.SubProgressMonitor; |
27 |
import org.eclipse.core.runtime.SubProgressMonitor; |
| 28 |
|
28 |
|
|
|
29 |
import org.eclipse.jdt.core.IJavaProject; |
| 29 |
import org.eclipse.jdt.core.IMember; |
30 |
import org.eclipse.jdt.core.IMember; |
| 30 |
import org.eclipse.jdt.core.IMethod; |
31 |
import org.eclipse.jdt.core.IMethod; |
| 31 |
import org.eclipse.jdt.core.IRegion; |
32 |
import org.eclipse.jdt.core.IRegion; |
|
Lines 42-47
Link Here
|
| 42 |
import org.eclipse.jdt.core.search.SearchPattern; |
43 |
import org.eclipse.jdt.core.search.SearchPattern; |
| 43 |
import org.eclipse.jdt.core.search.SearchRequestor; |
44 |
import org.eclipse.jdt.core.search.SearchRequestor; |
| 44 |
|
45 |
|
|
|
46 |
import org.eclipse.jdt.internal.core.PackageFragment; |
| 47 |
import org.eclipse.jdt.internal.core.util.Util; |
| 45 |
import org.eclipse.jdt.internal.corext.refactoring.RefactoringScopeFactory; |
48 |
import org.eclipse.jdt.internal.corext.refactoring.RefactoringScopeFactory; |
| 46 |
import org.eclipse.jdt.internal.corext.refactoring.base.ReferencesInBinaryContext; |
49 |
import org.eclipse.jdt.internal.corext.refactoring.base.ReferencesInBinaryContext; |
| 47 |
import org.eclipse.jdt.internal.corext.util.JavaModelUtil; |
50 |
import org.eclipse.jdt.internal.corext.util.JavaModelUtil; |
|
Lines 181-186
Link Here
|
| 181 |
return (IMethod[]) rippleMethodsList.toArray(new IMethod[rippleMethodsList.size()]); |
184 |
return (IMethod[]) rippleMethodsList.toArray(new IMethod[rippleMethodsList.size()]); |
| 182 |
} |
185 |
} |
| 183 |
|
186 |
|
|
|
187 |
private boolean isValidPackageName(IMethod method) { |
| 188 |
if (method == null) |
| 189 |
return false; |
| 190 |
IType type= method.getDeclaringType(); |
| 191 |
PackageFragment packageFragment= (PackageFragment)type.getPackageFragment(); |
| 192 |
IJavaProject javaProject= method.getJavaProject(); |
| 193 |
String sourceLevel= javaProject.getOption(JavaCore.COMPILER_SOURCE, true); |
| 194 |
String complianceLevel= javaProject.getOption(JavaCore.COMPILER_COMPLIANCE, true); |
| 195 |
for (int i= 0, length= packageFragment.names.length; i < length; i++) { |
| 196 |
if (!Util.isValidFolderNameForPackage(packageFragment.names[i], sourceLevel, complianceLevel)) |
| 197 |
return false; |
| 198 |
} |
| 199 |
return true; |
| 200 |
} |
| 201 |
|
| 202 |
|
| 184 |
private IMethod[] findAllRippleMethods(IProgressMonitor pm, WorkingCopyOwner owner) throws CoreException { |
203 |
private IMethod[] findAllRippleMethods(IProgressMonitor pm, WorkingCopyOwner owner) throws CoreException { |
| 185 |
pm.beginTask("", 4); //$NON-NLS-1$ |
204 |
pm.beginTask("", 4); //$NON-NLS-1$ |
| 186 |
|
205 |
|
|
Lines 237-242
Link Here
|
| 237 |
boolean hasAlienInterfaces= false; |
256 |
boolean hasAlienInterfaces= false; |
| 238 |
for (Iterator iter= alienDeclarations.iterator(); iter.hasNext();) { |
257 |
for (Iterator iter= alienDeclarations.iterator(); iter.hasNext();) { |
| 239 |
IMethod alienDeclaration= (IMethod) iter.next(); |
258 |
IMethod alienDeclaration= (IMethod) iter.next(); |
|
|
259 |
if (!isValidPackageName(alienDeclaration)) { |
| 260 |
continue; |
| 261 |
} |
| 240 |
IType alienType= alienDeclaration.getDeclaringType(); |
262 |
IType alienType= alienDeclaration.getDeclaringType(); |
| 241 |
alienTypes.add(alienType); |
263 |
alienTypes.add(alienType); |
| 242 |
if (alienType.isInterface()) |
264 |
if (alienType.isInterface()) |
