Skip to content

Commit 55f63b9

Browse files
snjezargrunber
authored andcommitted
Renaming record attributes
Signed-off-by: Snjezana Peco <[email protected]>
1 parent 586abdd commit 55f63b9

27 files changed

+1775
-540
lines changed

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/RefactoringAvailabilityTester.java

Lines changed: 48 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.eclipse.jdt.core.ILocalVariable;
3131
import org.eclipse.jdt.core.IMember;
3232
import org.eclipse.jdt.core.IMethod;
33+
import org.eclipse.jdt.core.IModuleDescription;
3334
import org.eclipse.jdt.core.IPackageDeclaration;
3435
import org.eclipse.jdt.core.IPackageFragment;
3536
import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -1230,6 +1231,10 @@ public static boolean isRenameAvailable(final IJavaProject project) throws JavaM
12301231
return true;
12311232
}
12321233

1234+
public static boolean isRenameAvailable(final IModuleDescription module) throws JavaModelException {
1235+
return Checks.isAvailable(module);
1236+
}
1237+
12331238
public static boolean isRenameAvailable(final ILocalVariable variable) throws JavaModelException {
12341239
return Checks.isAvailable(variable);
12351240
}
@@ -1329,6 +1334,10 @@ public static boolean isRenameFieldAvailable(final IField field) throws JavaMode
13291334
return Checks.isAvailable(field) && !JdtFlags.isEnum(field);
13301335
}
13311336

1337+
public static boolean isRenameModuleAvailable(final IModuleDescription module) throws JavaModelException {
1338+
return Checks.isAvailable(module);
1339+
}
1340+
13321341
public static boolean isRenameNonVirtualMethodAvailable(final IMethod method) throws JavaModelException, CoreException {
13331342
return isRenameAvailable(method) && !MethodChecks.isVirtual(method);
13341343
}
@@ -1353,35 +1362,46 @@ public static boolean isRenameVirtualMethodAvailable(final IMethod method) throw
13531362
}
13541363

13551364
public static boolean isRenameElementAvailable(IJavaElement element) throws CoreException {
1356-
switch (element.getElementType()) {
1357-
case IJavaElement.JAVA_PROJECT:
1358-
return isRenameAvailable((IJavaProject) element);
1359-
case IJavaElement.PACKAGE_FRAGMENT_ROOT:
1360-
return isRenameAvailable((IPackageFragmentRoot) element);
1361-
case IJavaElement.PACKAGE_FRAGMENT:
1362-
return isRenameAvailable((IPackageFragment) element);
1363-
case IJavaElement.COMPILATION_UNIT:
1364-
return isRenameAvailable((ICompilationUnit) element);
1365-
case IJavaElement.TYPE:
1366-
return isRenameAvailable((IType) element);
1367-
case IJavaElement.METHOD:
1368-
final IMethod method = (IMethod) element;
1369-
if (method.isConstructor()) {
1370-
return isRenameAvailable(method.getDeclaringType());
1371-
} else {
1372-
return isRenameAvailable(method);
1373-
}
1374-
case IJavaElement.FIELD:
1375-
final IField field = (IField) element;
1376-
if (Flags.isEnum(field.getFlags())) {
1377-
return isRenameEnumConstAvailable(field);
1378-
} else {
1379-
return isRenameFieldAvailable(field);
1365+
return isRenameElementAvailable(element, false);
1366+
}
1367+
1368+
public static boolean isRenameElementAvailable(IJavaElement element, boolean isTextSelection) throws CoreException {
1369+
if (element != null) {
1370+
switch (element.getElementType()) {
1371+
case IJavaElement.JAVA_PROJECT:
1372+
return isRenameAvailable((IJavaProject) element);
1373+
case IJavaElement.PACKAGE_FRAGMENT_ROOT:
1374+
return isRenameAvailable((IPackageFragmentRoot) element);
1375+
case IJavaElement.PACKAGE_FRAGMENT:
1376+
return isRenameAvailable((IPackageFragment) element);
1377+
case IJavaElement.COMPILATION_UNIT:
1378+
return isRenameAvailable((ICompilationUnit) element);
1379+
case IJavaElement.TYPE:
1380+
return isRenameAvailable((IType) element);
1381+
case IJavaElement.METHOD:
1382+
final IMethod method = (IMethod) element;
1383+
if (method.isConstructor()) {
1384+
return isRenameAvailable(method.getDeclaringType());
1385+
} else {
1386+
return isRenameAvailable(method);
1387+
}
1388+
case IJavaElement.FIELD:
1389+
final IField field = (IField) element;
1390+
if (Flags.isEnum(field.getFlags())) {
1391+
return isRenameEnumConstAvailable(field);
1392+
} else {
1393+
return isRenameFieldAvailable(field);
1394+
}
1395+
case IJavaElement.TYPE_PARAMETER:
1396+
return isRenameAvailable((ITypeParameter) element);
1397+
case IJavaElement.LOCAL_VARIABLE:
1398+
return isRenameAvailable((ILocalVariable) element);
1399+
case IJavaElement.JAVA_MODULE: {
1400+
return isRenameAvailable((IModuleDescription) element);
13801401
}
1381-
case IJavaElement.TYPE_PARAMETER:
1382-
return isRenameAvailable((ITypeParameter) element);
1383-
case IJavaElement.LOCAL_VARIABLE:
1384-
return isRenameAvailable((ILocalVariable) element);
1402+
default:
1403+
break;
1404+
}
13851405
}
13861406
return false;
13871407
}

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/rename/GenericRefactoringHandleTransplanter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*******************************************************************************
22
* Copyright (c) 2006, 2008 IBM Corporation and others.
3-
* All rights reserved. This program and the accompanying materials
3+
*
4+
* This program and the accompanying materials
45
* are made available under the terms of the Eclipse Public License 2.0
56
* which accompanies this distribution, and is available at
67
* https://www.eclipse.org/legal/epl-2.0/

0 commit comments

Comments
 (0)