RefactoringStatus with WARNING severity if
- * the give method will have a constructor name after renaming
- * null otherwise.
- */
- public static RefactoringStatus checkIfConstructorName(IMethod method, String newMethodName, String newTypeName) {
- if (!newMethodName.equals(newTypeName)) {
- return null;
- } else {
- return RefactoringStatus.createWarningStatus(Messages.format(RefactoringCoreMessages.Checks_constructor_name,
- new Object[] { JavaElementUtil.createMethodSignature(method), JavaElementLabels.getElementLabel(method.getDeclaringType(), JavaElementLabels.ALL_FULLY_QUALIFIED) }));
- }
- }
-
- /**
- * Checks if the given name is a valid Java field name.
- *
- * @param name
- * the java field name.
- * @param context
- * an {@link IJavaElement} or null
- * @return a refactoring status containing the error message if the name is not
- * a valid java field name.
- */
- public static RefactoringStatus checkFieldName(String name, IJavaElement context) {
- return checkName(name, JavaConventionsUtil.validateFieldName(name, context));
- }
-
- /**
- * Checks if the given name is a valid Java type parameter name.
- *
- * @param name
- * the java type parameter name.
- * @param context
- * an {@link IJavaElement} or null
- * @return a refactoring status containing the error message if the name is not
- * a valid java type parameter name.
- */
- public static RefactoringStatus checkTypeParameterName(String name, IJavaElement context) {
- return checkName(name, JavaConventionsUtil.validateTypeVariableName(name, context));
- }
-
- /**
- * Checks if the given name is a valid Java identifier.
- *
- * @param name
- * the java identifier.
- * @param context
- * an {@link IJavaElement} or null
- * @return a refactoring status containing the error message if the name is
- * not a valid java identifier.
- */
- public static RefactoringStatus checkIdentifier(String name, IJavaElement context) {
- return checkName(name, JavaConventionsUtil.validateIdentifier(name, context));
- }
-
- /**
- * Checks if the given name is a valid Java method name.
- *
- * @param name
- * the java method name.
- * @param context
- * an {@link IJavaElement} or null
- * @return a refactoring status containing the error message if the name is
- * not a valid java method name.
- */
- public static RefactoringStatus checkMethodName(String name, IJavaElement context) {
- RefactoringStatus status = checkName(name, JavaConventionsUtil.validateMethodName(name, context));
- if (status.isOK() && !startsWithLowerCase(name)) {
- return RefactoringStatus.createWarningStatus(RefactoringCoreMessages.Checks_method_names_lowercase);
- } else {
- return status;
- }
- }
-
- /**
- * Checks if the given name is a valid Java type name.
- *
- * @param name
- * the java method name.
- * @param context
- * an {@link IJavaElement} or null
- * @return a refactoring status containing the error message if the name is not
- * a valid java type name.
- */
- public static RefactoringStatus checkTypeName(String name, IJavaElement context) {
- //fix for: 1GF5Z0Z: ITPJUI:WINNT - assertion failed after renameType refactoring
- if (name.indexOf(".") != -1) {
- return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.Checks_no_dot);
- } else {
- return checkName(name, JavaConventionsUtil.validateJavaTypeName(name, context));
- }
- }
-
- /**
- * Checks if the given name is a valid Java package name.
- *
- * @param name
- * the java package name.
- * @param context
- * an {@link IJavaElement} or null
- * @return a refactoring status containing the error message if the name is not
- * a valid java package name.
- */
- public static RefactoringStatus checkPackageName(String name, IJavaElement context) {
- return checkName(name, JavaConventionsUtil.validatePackageName(name, context));
- }
-
- /**
- * Checks if the given name is a valid compilation unit name.
- *
- * @param name
- * the compilation unit name.
- * @param context
- * an {@link IJavaElement} or null
- * @return a refactoring status containing the error message if the name is not
- * a valid compilation unit name.
- */
- public static RefactoringStatus checkCompilationUnitName(String name, IJavaElement context) {
- return checkName(name, JavaConventionsUtil.validateCompilationUnitName(name, context));
- }
-
- /**
- * Returns OK status if the new name is OK, i.e. when no file with that name
- * exists. The name of the given CU is not OK.
- *
- * @param cu
- * CU to rename
- * @param newBareName
- * the new name of the CU (without extension)
- * @return the status: FATAL if the CU already exists, OK if OK
- */
- public static RefactoringStatus checkCompilationUnitNewName(ICompilationUnit cu, String newBareName) {
- String newCUName = JavaModelUtil.getRenamedCUName(cu, newBareName);
- IPath renamedResourcePath = cu.getParent().getPath().append(newCUName);
- if (resourceExists(renamedResourcePath)) {
- return RefactoringStatus.createFatalErrorStatus(Messages.format(RefactoringCoreMessages.Checks_cu_name_used, BasicElementLabels.getResourceName(newCUName)));
- } else {
- return new RefactoringStatus();
- }
- }
-
- public static boolean startsWithLowerCase(String s) {
- if (s == null) {
- return false;
- } else if ("".equals(s)) {
- return false;
- } else {
- //workaround for JDK bug (see 26529)
- return s.charAt(0) == Character.toLowerCase(s.charAt(0));
- }
- }
-
- public static boolean resourceExists(IPath resourcePath) {
- return ResourcesPlugin.getWorkspace().getRoot().findMember(resourcePath) != null;
- }
-
- public static boolean isTopLevel(IType type) {
- return type.getDeclaringType() == null;
- }
-
- public static boolean isAnonymous(IType type) throws JavaModelException {
- return type.isAnonymous();
- }
-
- public static boolean isTopLevelType(IMember member) {
- return member.getElementType() == IJavaElement.TYPE && isTopLevel((IType) member);
- }
-
- public static boolean isInsideLocalType(IType type) throws JavaModelException {
- while (type != null) {
- if (type.isLocal()) {
- return true;
- }
- type = type.getDeclaringType();
- }
- return false;
- }
-
- public static boolean isAlreadyNamed(IJavaElement element, String name) {
- return name.equals(element.getElementName());
- }
-
- //-------------- main and native method checks ------------------
- public static RefactoringStatus checkForMainAndNativeMethods(ICompilationUnit cu) throws JavaModelException {
- return checkForMainAndNativeMethods(cu.getTypes());
- }
-
- public static RefactoringStatus checkForMainAndNativeMethods(IType[] types) throws JavaModelException {
- RefactoringStatus result = new RefactoringStatus();
- for (int i = 0; i < types.length; i++) {
- result.merge(checkForMainAndNativeMethods(types[i]));
- }
- return result;
- }
-
- public static RefactoringStatus checkForMainAndNativeMethods(IType type) throws JavaModelException {
- RefactoringStatus result = new RefactoringStatus();
- result.merge(checkForMainAndNativeMethods(type.getMethods()));
- result.merge(checkForMainAndNativeMethods(type.getTypes()));
- return result;
- }
-
- private static RefactoringStatus checkForMainAndNativeMethods(IMethod[] methods) throws JavaModelException {
- RefactoringStatus result = new RefactoringStatus();
- for (int i = 0; i < methods.length; i++) {
- if (JdtFlags.isNative(methods[i])) {
- String typeName = JavaElementLabels.getElementLabel(methods[i].getDeclaringType(), JavaElementLabels.ALL_FULLY_QUALIFIED);
- String methodName = JavaElementLabels.getElementLabel(methods[i], JavaElementLabels.ALL_DEFAULT);
- String msg = Messages.format(RefactoringCoreMessages.Checks_method_native, new String[] { typeName, methodName, "UnsatisfiedLinkError" });//$NON-NLS-1$
- result.addEntry(RefactoringStatus.ERROR, msg, JavaStatusContext.create(methods[i]), JavaLanguageServerPlugin.PLUGIN_ID, RefactoringStatusCodes.NATIVE_METHOD);
- }
- if (methods[i].isMainMethod()) {
- String msg = Messages.format(RefactoringCoreMessages.Checks_has_main, JavaElementLabels.getElementLabel(methods[i].getDeclaringType(), JavaElementLabels.ALL_FULLY_QUALIFIED));
- result.addEntry(RefactoringStatus.WARNING, msg, JavaStatusContext.create(methods[i]), JavaLanguageServerPlugin.PLUGIN_ID, RefactoringStatusCodes.MAIN_METHOD);
- }
- }
- return result;
- }
-
- //---- New method name checking -------------------------------------------------------------
-
- /**
- * Checks if the new method is already used in the given type.
- *
- * @param type
- * @param methodName
- * @param parameters
- * @return the status
- */
- public static RefactoringStatus checkMethodInType(ITypeBinding type, String methodName, ITypeBinding[] parameters) {
- RefactoringStatus result = new RefactoringStatus();
- IMethodBinding method = org.eclipse.jdt.internal.corext.dom.Bindings.findMethodInType(type, methodName, parameters);
- if (method != null) {
- if (method.isConstructor()) {
- result.addWarning(Messages.format(RefactoringCoreMessages.Checks_methodName_constructor, new Object[] { BasicElementLabels.getJavaElementName(type.getName()) }));
- } else {
- result.addError(Messages.format(RefactoringCoreMessages.Checks_methodName_exists, new Object[] { BasicElementLabels.getJavaElementName(methodName), BasicElementLabels.getJavaElementName(type.getName()) }),
- JavaStatusContext.create(method));
- }
- }
- return result;
- }
-
- /**
- * Checks if the new method somehow conflicts with an already existing
- * method in the hierarchy. The following checks are done:
- * IJavaElement.
- * The IJavaElement must exist and be non read-only to be
- * modifiable. Moreover, if it is a IMember it must not be binary.
- * The returned RefactoringStatus has ERROR severity
- * if it is not possible to modify the element.
- *
- * @param javaElement
- * @return the status
- * @throws JavaModelException
- *
- * @see IJavaElement#exists
- * @see IJavaElement#isReadOnly
- * @see IMember#isBinary
- * @see RefactoringStatus
- */
- public static RefactoringStatus checkAvailability(IJavaElement javaElement) throws JavaModelException {
- RefactoringStatus result = new RefactoringStatus();
- if (!javaElement.exists()) {
- result.addFatalError(Messages.format(RefactoringCoreMessages.Refactoring_not_in_model, getJavaElementName(javaElement)));
- }
- if (javaElement.isReadOnly()) {
- result.addFatalError(Messages.format(RefactoringCoreMessages.Refactoring_read_only, getJavaElementName(javaElement)));
- }
- if (javaElement.exists() && !javaElement.isStructureKnown()) {
- result.addFatalError(Messages.format(RefactoringCoreMessages.Refactoring_unknown_structure, getJavaElementName(javaElement)));
- }
- if (javaElement instanceof IMember && ((IMember) javaElement).isBinary()) {
- result.addFatalError(Messages.format(RefactoringCoreMessages.Refactoring_binary, getJavaElementName(javaElement)));
- }
- return result;
- }
-
- private static String getJavaElementName(IJavaElement element) {
- return JavaElementLabels.getElementLabel(element, JavaElementLabels.ALL_DEFAULT);
- }
-
- public static boolean isAvailable(IJavaElement javaElement) throws JavaModelException {
- if (javaElement == null) {
- return false;
- }
- if (!javaElement.exists()) {
- return false;
- }
- if (javaElement.isReadOnly()) {
- return false;
- }
- // work around for https://bugs.eclipse.org/bugs/show_bug.cgi?id=48422
- // the Java project is now cheating regarding its children so we shouldn't
- // call isStructureKnown if the project isn't open.
- // see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=52474
- if (!(javaElement instanceof IJavaProject) && !(javaElement instanceof ILocalVariable) && !javaElement.isStructureKnown()) {
- return false;
- }
- if (javaElement instanceof IMember && ((IMember) javaElement).isBinary()) {
- return false;
- }
- return true;
- }
-
- public static IType findTypeInPackage(IPackageFragment pack, String elementName) throws JavaModelException {
- Assert.isTrue(pack.exists());
- Assert.isTrue(!pack.isReadOnly());
-
- String packageName = pack.getElementName();
- elementName = packageName.length() > 0 ? packageName + '.' + elementName : elementName;
-
- return pack.getJavaProject().findType(elementName, (IProgressMonitor) null);
- }
-
- public static RefactoringStatus checkTempName(String newName, IJavaElement context) {
- RefactoringStatus result = Checks.checkIdentifier(newName, context);
- if (result.hasFatalError()) {
- return result;
- }
- if (!Checks.startsWithLowerCase(newName)) {
- result.addWarning(RefactoringCoreMessages.ExtractTempRefactoring_convention);
- }
- return result;
- }
-
- public static RefactoringStatus checkEnumConstantName(String newName, IJavaElement context) {
- RefactoringStatus result = Checks.checkFieldName(newName, context);
- if (result.hasFatalError()) {
- return result;
- }
- for (int i = 0; i < newName.length(); i++) {
- char c = newName.charAt(i);
- if (Character.isLetter(c) && !Character.isUpperCase(c)) {
- result.addWarning(RefactoringCoreMessages.RenameEnumConstRefactoring_convention);
- break;
- }
- }
- return result;
- }
-
- public static RefactoringStatus checkConstantName(String newName, IJavaElement context) {
- RefactoringStatus result = Checks.checkFieldName(newName, context);
- if (result.hasFatalError()) {
- return result;
- }
- for (int i = 0; i < newName.length(); i++) {
- char c = newName.charAt(i);
- if (Character.isLetter(c) && !Character.isUpperCase(c)) {
- result.addWarning(RefactoringCoreMessages.ExtractConstantRefactoring_convention);
- break;
- }
- }
- return result;
- }
-
- // public static boolean isException(IType iType, IProgressMonitor pm) throws JavaModelException {
- // try {
- // if (!iType.isClass()) {
- // return false;
- // }
- // IType[] superTypes = iType.newSupertypeHierarchy(pm).getAllSupertypes(iType);
- // for (int i = 0; i < superTypes.length; i++) {
- // if ("java.lang.Throwable".equals(superTypes[i].getFullyQualifiedName())) {
- // return true;
- // }
- // }
- // return false;
- // } finally {
- // pm.done();
- // }
- // }
- //
- /**
- * @param e
- * @return int Checks.IS_RVALUE if e is an rvalue Checks.IS_RVALUE_GUESSED if e
- * is guessed as an rvalue Checks.NOT_RVALUE_VOID if e is not an rvalue
- * because its type is void Checks.NOT_RVALUE_MISC if e is not an rvalue
- * for some other reason
- */
- public static int checkExpressionIsRValue(Expression e) {
- if (e instanceof Name) {
- if (!(((Name) e).resolveBinding() instanceof IVariableBinding)) {
- return NOT_RVALUE_MISC;
- }
- }
- if (e instanceof Annotation) {
- return NOT_RVALUE_MISC;
- }
-
- ITypeBinding tb = e.resolveTypeBinding();
- boolean guessingRequired = false;
- if (tb == null) {
- guessingRequired = true;
- tb = ASTResolving.guessBindingForReference(e);
- }
- if (tb == null) {
- return NOT_RVALUE_MISC;
- } else if (tb.getName().equals("void")) {
- return NOT_RVALUE_VOID;
- }
-
- return guessingRequired ? IS_RVALUE_GUESSED : IS_RVALUE;
- }
-
- public static boolean isDeclaredIn(VariableDeclaration tempDeclaration, Class astNodeClass) {
- ASTNode initializer = ASTNodes.getParent(tempDeclaration, astNodeClass);
- if (initializer == null) {
- return false;
- }
- ASTNode anonymous = ASTNodes.getParent(tempDeclaration, AnonymousClassDeclaration.class);
- if (anonymous == null) {
- return true;
- }
- // stupid code. Is to find out if the variable declaration isn't a field.
- if (ASTNodes.isParent(anonymous, initializer)) {
- return false;
- }
- return true;
- }
-}
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/JDTRefactoringDescriptorComment.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/JDTRefactoringDescriptorComment.java
deleted file mode 100644
index 4dfb7cf541..0000000000
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/JDTRefactoringDescriptorComment.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Originally copied from org.eclipse.jdt.internal.corext.refactoring.JDTRefactoringDescriptorComment
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ls.core.internal.corext.refactoring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
-import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
-import org.eclipse.jdt.ls.core.internal.Messages;
-import org.eclipse.jdt.ls.core.internal.corext.refactoring.rename.RenamingNameSuggestor;
-import org.eclipse.jdt.ls.core.internal.corext.refactoring.reorg.IReorgPolicy;
-import org.eclipse.jdt.ls.core.internal.corext.refactoring.reorg.IReorgPolicy.IMovePolicy;
-import org.eclipse.jdt.ls.core.internal.corext.refactoring.tagging.IDelegateUpdating;
-import org.eclipse.jdt.ls.core.internal.corext.refactoring.tagging.INameUpdating;
-import org.eclipse.jdt.ls.core.internal.corext.refactoring.tagging.IQualifiedNameUpdating;
-import org.eclipse.jdt.ls.core.internal.corext.refactoring.tagging.IReferenceUpdating;
-import org.eclipse.jdt.ls.core.internal.corext.refactoring.tagging.ISimilarDeclarationUpdating;
-import org.eclipse.jdt.ls.core.internal.corext.refactoring.tagging.ITextUpdating;
-import org.eclipse.jdt.ls.core.internal.hover.JavaElementLabels;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
-
-public final class JDTRefactoringDescriptorComment {
-
- /** The element delimiter */
- private static final String ELEMENT_DELIMITER = RefactoringCoreMessages.JavaRefactoringDescriptorComment_element_delimiter;
-
- /** The line delimiter */
- private static final String LINE_DELIMITER = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * Creates a composite setting.
- *
- * @param caption
- * the caption
- * @param settings
- * the settings
- * @return the composite setting
- */
- public static String createCompositeSetting(final String caption, final String[] settings) {
- Assert.isNotNull(caption);
- Assert.isNotNull(settings);
- final StringBuffer buffer = new StringBuffer(128);
- for (int index = 0; index < settings.length; index++) {
- if (settings[index] != null && !"".equals(settings[index])) { //$NON-NLS-1$
- buffer.append(LINE_DELIMITER);
- buffer.append(ELEMENT_DELIMITER);
- buffer.append(settings[index]);
- } else {
- buffer.append(LINE_DELIMITER);
- buffer.append(ELEMENT_DELIMITER);
- buffer.append(RefactoringCoreMessages.JavaRefactoringDescriptor_not_available);
- }
- }
- if (buffer.length() > 0) {
- buffer.insert(0, caption);
- }
- return buffer.toString();
- }
-
- /** The header of the comment */
- private final String fHeader;
-
- /** The project name, or null */
- private final String fProject;
-
- /** The settings list */
- private final Listnull
- * @param object
- * the refactoring object to generate a comment for
- * @param header
- * the header of the comment (typically the unique description of
- * the refactoring with fully qualified element names)
- */
- public JDTRefactoringDescriptorComment(final String project, final Object object, final String header) {
- Assert.isNotNull(object);
- Assert.isNotNull(header);
- fProject = project;
- fHeader = header;
- initializeInferredSettings(object);
- }
-
- /**
- * Adds the specified setting to this comment.
- *
- * @param index
- * the index
- * @param setting
- * the setting to add
- */
- public void addSetting(final int index, final String setting) {
- Assert.isTrue(index >= 0);
- Assert.isNotNull(setting);
- Assert.isTrue(!"".equals(setting)); //$NON-NLS-1$
- fSettings.add(index, setting);
- }
-
- /**
- * Adds the specified setting to this comment.
- *
- * @param setting
- * the setting to add, or null for no setting
- */
- public void addSetting(final String setting) {
- if (setting != null && !"".equals(setting)) {
- fSettings.add(setting);
- }
- }
-
- /**
- * Returns this comment in a human-readable string representation.
- *
- * @return this comment in string representation
- */
- public String asString() {
- final StringBuffer buffer = new StringBuffer(256);
- buffer.append(fHeader);
- if (fProject != null && !"".equals(fProject)) { //$NON-NLS-1$
- buffer.append(LINE_DELIMITER);
- buffer.append(Messages.format(RefactoringCoreMessages.JavaRefactoringDescriptorComment_original_project, BasicElementLabels.getResourceName(fProject)));
- }
- for (final Iterator<String, String>) */
- private final Mapnull for the workspace */
- private String fProject;
-
- /**
- * Creates a new java refactoring arguments from arguments
- *
- * @param project
- * the project, or null for the workspace
- * @param arguments
- * the arguments
- */
- public JavaRefactoringArguments(String project, Mapnull
- */
- public String getAttribute(final String name) {
- return fAttributes.get(name);
- }
-
- /**
- * Returns the name of the project.
- *
- * @return the name of the project, or null for the workspace
- */
- public String getProject() {
- return fProject;
- }
-
- @Override
- public String toString() {
- return getClass().getName() + fAttributes.toString();
- }
-}
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/JavaRefactoringDescriptorUtil.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/JavaRefactoringDescriptorUtil.java
deleted file mode 100644
index 5a06f5d9ff..0000000000
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/JavaRefactoringDescriptorUtil.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Originally copied from org.eclipse.jdt.internal.corext.refactoring.JavaRefactoringDescriptorUtil
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ls.core.internal.corext.refactoring;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.WorkingCopyOwner;
-import org.eclipse.jdt.ls.core.internal.Messages;
-import org.eclipse.jdt.ls.core.internal.hover.JavaElementLabels;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class JavaRefactoringDescriptorUtil {
- /* TODO: share implementation with
- * org.eclipse.jdt.internal.core.refactoring.descriptors.JavaRefactoringDescriptorUtil
- */
-
- private JavaRefactoringDescriptorUtil() {
- }
-
- /**
- * Predefined argument called element<Number>.
- * - * This argument should be used to describe the elements being refactored. - * The value of this argument does not necessarily have to uniquely identify - * the elements. However, it must be possible to uniquely identify the - * elements using the value of this argument in conjunction with the values - * of the other user-defined attributes. - *
- *- * The element arguments are simply distinguished by appending a number to - * the argument name, e.g. element1. The indices of this argument are non - * zero-based. - *
- */ - public static final String ATTRIBUTE_ELEMENT = "element"; //$NON-NLS-1$ - - /** - * Predefined argument calledinput.
- * - * This argument should be used to describe the element being refactored. - * The value of this argument does not necessarily have to uniquely identify - * the input element. However, it must be possible to uniquely identify the - * input element using the value of this argument in conjunction with the - * values of the other user-defined attributes. - *
- */ - public static final String ATTRIBUTE_INPUT = "input"; //$NON-NLS-1$ - - /** - * Predefined argument calledname.
- * - * This argument should be used to name the element being refactored. The - * value of this argument may be shown in the user interface. - *
- */ - public static final String ATTRIBUTE_NAME = "name"; //$NON-NLS-1$ - - /** - * Predefined argument calledreferences.
- * - * This argument should be used to describe whether references to the - * elements being refactored should be updated as well. - *
- */ - public static final String ATTRIBUTE_REFERENCES = "references"; //$NON-NLS-1$ - - /** - * Predefined argument calledselection.
- * - * This argument should be used to describe user input selections within a - * text file. The value of this argument has the format "offset length". - *
- */ - public static final String ATTRIBUTE_SELECTION = "selection"; //$NON-NLS-1$ - - /** - * Converts the specified element to an input handle. - * - * @param project - * the project, ornull for the workspace
- * @param element
- * the element
- * @return a corresponding input handle Note: if the given project is not
- * the element's project, then the full handle is returned
- */
- public static String elementToHandle(final String project, final IJavaElement element) {
- final String handle = element.getHandleIdentifier();
- if (project != null && !(element instanceof IJavaProject)) {
- IJavaProject javaProject = element.getJavaProject();
- if (project.equals(javaProject.getElementName())) {
- final String id = javaProject.getHandleIdentifier();
- return handle.substring(id.length());
- }
- }
- return handle;
- }
-
- /**
- * Converts an input handle back to the corresponding java element.
- *
- * @param project
- * the project, or null for the workspace
- * @param handle
- * the input handle
- * @return the corresponding java element, or null if no such
- * element exists
- */
- public static IJavaElement handleToElement(final String project, final String handle) {
- return handleToElement(project, handle, true);
- }
-
- /**
- * Converts an input handle back to the corresponding java element.
- *
- * @param project
- * the project, or null for the workspace
- * @param handle
- * the input handle
- * @param check
- * true to check for existence of the element,
- * false otherwise
- * @return the corresponding java element, or null if no such
- * element exists
- */
- public static IJavaElement handleToElement(final String project, final String handle, final boolean check) {
- return handleToElement(null, project, handle, check);
- }
-
- /**
- * Converts an input handle back to the corresponding java element.
- *
- * @param owner
- * the working copy owner
- * @param project
- * the project, or null for the workspace
- * @param handle
- * the input handle
- * @param check
- * true to check for existence of the element,
- * false otherwise
- * @return the corresponding java element, or null if no such
- * element exists
- */
- public static IJavaElement handleToElement(final WorkingCopyOwner owner, final String project, final String handle, final boolean check) {
- IJavaElement element = null;
- if (owner != null) {
- element = JavaCore.create(handle, owner);
- } else {
- element = JavaCore.create(handle);
- }
- if (element == null && project != null) {
- final IJavaProject javaProject = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()).getJavaProject(project);
- final String identifier = javaProject.getHandleIdentifier();
- if (owner != null) {
- element = JavaCore.create(identifier + handle, owner);
- } else {
- element = JavaCore.create(identifier + handle);
- }
- }
- if (check && element instanceof IMethod) {
- /*
- * Resolve the method based on simple names of parameter types
- * (to accommodate for different qualifications when refactoring is e.g.
- * recorded in source but applied on binary method):
- */
- final IMethod method = (IMethod) element;
- final IMethod[] methods = method.getDeclaringType().findMethods(method);
- if (methods != null && methods.length > 0) {
- element = methods[0];
- }
- }
- if (element != null && (!check || element.exists())) {
- return element;
- }
- return null;
- }
-
- /**
- * Converts an input handle with the given prefix back to the corresponding
- * resource.
- *
- * @param project
- * the project, or null for the workspace
- * @param handle
- * the input handle
- *
- * @return the corresponding resource, or null if no such
- * resource exists. Note: if the given handle is absolute, the
- * project is not used to resolve.
- */
- public static IResource handleToResource(final String project, final String handle) {
- final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- if ("".equals(handle)) {
- return null;
- }
- final IPath path = Path.fromPortableString(handle);
- if (path == null) {
- return null;
- }
- if (project != null && !"".equals(project) && !path.isAbsolute()) {
- return root.getProject(project).findMember(path);
- }
- return root.findMember(path);
- }
-
- /**
- * Converts the specified resource to an input handle.
- *
- * @param project
- * the project, or null for the workspace
- * @param resource
- * the resource
- *
- * @return the input handle. Note: if the given project is not the
- * resource's project, then the full handle is returned.
- */
- public static String resourceToHandle(final String project, final IResource resource) {
- if (project != null && !"".equals(project) && project.equals(resource.getProject().getName())) {
- return resource.getProjectRelativePath().toPortableString();
- }
- return resource.getFullPath().toPortableString();
- }
-
- /**
- * Creates a fatal error status telling that the input element does not
- * exist.
- *
- * @param element
- * the input element, or null
- * @param name
- * the name of the refactoring
- * @param id
- * the id of the refactoring
- * @return the refactoring status
- */
- public static RefactoringStatus createInputFatalStatus(final Object element, final String name, final String id) {
- Assert.isNotNull(name);
- Assert.isNotNull(id);
- if (element != null) {
- return RefactoringStatus
- .createFatalErrorStatus(Messages.format(RefactoringCoreMessages.InitializableRefactoring_input_not_exists, new String[] { JavaElementLabels.getTextLabel(element, JavaElementLabels.ALL_FULLY_QUALIFIED), name, id }));
- } else {
- return RefactoringStatus.createFatalErrorStatus(Messages.format(RefactoringCoreMessages.InitializableRefactoring_inputs_do_not_exist, new String[] { name, id }));
- }
- }
-
- /**
- * Creates a warning status telling that the input element does not exist.
- *
- * @param element
- * the input element, or null
- * @param name
- * the name of the refactoring
- * @param id
- * the id of the refactoring
- * @return the refactoring status
- */
- public static RefactoringStatus createInputWarningStatus(final Object element, final String name, final String id) {
- Assert.isNotNull(name);
- Assert.isNotNull(id);
- if (element != null) {
- return RefactoringStatus
- .createWarningStatus(Messages.format(RefactoringCoreMessages.InitializableRefactoring_input_not_exists, new String[] { JavaElementLabels.getTextLabel(element, JavaElementLabels.ALL_FULLY_QUALIFIED), name, id }));
- } else {
- return RefactoringStatus.createWarningStatus(Messages.format(RefactoringCoreMessages.InitializableRefactoring_inputs_do_not_exist, new String[] { name, id }));
- }
- }
-
-}
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringAvailabilityTester.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringAvailabilityTester.java
index 529f5523d0..b346174aaf 100644
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringAvailabilityTester.java
+++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringAvailabilityTester.java
@@ -47,6 +47,7 @@
import org.eclipse.jdt.core.dom.Statement;
import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
import org.eclipse.jdt.core.dom.SuperMethodInvocation;
+import org.eclipse.jdt.internal.corext.refactoring.Checks;
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
import org.eclipse.jdt.internal.corext.util.JdtFlags;
import org.eclipse.jdt.ls.core.internal.corext.refactoring.rename.MethodChecks;
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringSearchEngine.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringSearchEngine.java
index 67d6f47370..d6062d5f1e 100644
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringSearchEngine.java
+++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringSearchEngine.java
@@ -34,6 +34,7 @@
import org.eclipse.jdt.core.search.SearchMatch;
import org.eclipse.jdt.core.search.SearchPattern;
import org.eclipse.jdt.core.search.SearchRequestor;
+import org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup;
import org.eclipse.jdt.ls.core.internal.corext.util.SearchUtils;
import org.eclipse.ltk.core.refactoring.IRefactoringStatusEntryComparator;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringSearchEngine2.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringSearchEngine2.java
index a0067c4b37..f9d7853fd0 100644
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringSearchEngine2.java
+++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringSearchEngine2.java
@@ -42,6 +42,7 @@
import org.eclipse.jdt.core.search.SearchPattern;
import org.eclipse.jdt.core.search.SearchRequestor;
import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
+import org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup;
import org.eclipse.jdt.ls.core.internal.Messages;
import org.eclipse.jdt.ls.core.internal.corext.util.SearchUtils;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/SearchResultGroup.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/SearchResultGroup.java
deleted file mode 100644
index baa563abae..0000000000
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/SearchResultGroup.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Originally copied from org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ls.core.internal.corext.refactoring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.search.SearchMatch;
-import org.eclipse.jdt.ls.core.internal.corext.util.SearchUtils;
-
-public class SearchResultGroup {
-
- private final IResource fResouce;
- private final List