MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-02 10:14:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

Less raw types

Browse Source 
GitOrigin-RevId: 2a6e712b4017cf1ead7870543e562acb654fbeaf
This commit is contained in:
Tagir Valeev
2024-09-16 11:23:15 +00:00
committed by intellij-monorepo-bot
parent 3f3f8d8279
commit 05de6a6bdb
41 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl-refactorings/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
+1 -1
View File
@@ -136,7 +136,7 @@ class ExtractInterfaceDialog extends JavaExtractSuperBaseDialog {
protected ExtractSuperBaseProcessor createProcessor() {
return new ExtractInterfaceProcessor(myProject, false, getTargetDirectory(), getExtractedSuperName(),
mySourceClass, getSelectedMemberInfos().toArray(new MemberInfo[0]),
new DocCommentPolicy(getDocCommentPolicy()));
new DocCommentPolicy<>(getDocCommentPolicy()));
}
@Override
java/java-impl-refactorings/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
+3 -3
View File
@@ -40,7 +40,7 @@ public class ExtractInterfaceHandler implements ElementsHandler, ContextAwareAct
private String myInterfaceName;
private MemberInfo[] mySelectedMembers;
private PsiDirectory myTargetDir;
private DocCommentPolicy myJavaDocPolicy;
private DocCommentPolicy<?> myJavaDocPolicy;
@Override
public boolean isAvailableForQuickList(@NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext dataContext) {
@@ -100,7 +100,7 @@ public class ExtractInterfaceHandler implements ElementsHandler, ContextAwareAct
myInterfaceName = dialog.getExtractedSuperName();
mySelectedMembers = dialog.getSelectedMemberInfos().toArray(new MemberInfo[0]);
myTargetDir = dialog.getTargetDirectory();
myJavaDocPolicy = new DocCommentPolicy(dialog.getDocCommentPolicy());
myJavaDocPolicy = new DocCommentPolicy<>(dialog.getDocCommentPolicy());
LocalHistoryAction a = LocalHistory.getInstance().startAction(getCommandName());
try {
return extractInterface(myTargetDir, myClass, myInterfaceName, mySelectedMembers, myJavaDocPolicy);
@@ -116,7 +116,7 @@ public class ExtractInterfaceHandler implements ElementsHandler, ContextAwareAct
PsiClass aClass,
String interfaceName,
MemberInfo[] selectedMembers,
DocCommentPolicy javaDocPolicy) {
DocCommentPolicy<?> javaDocPolicy) {
final Project project = aClass.getProject();
project.getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
.refactoringStarted(ExtractSuperClassUtil.REFACTORING_EXTRACT_SUPER_ID, ExtractSuperClassUtil.createBeforeData(aClass, selectedMembers));
java/java-impl-refactorings/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class ExtractInterfaceProcessor extends ExtractSuperBaseProcessor {
String newClassName,
PsiClass aClass,
MemberInfo[] memberInfos,
DocCommentPolicy javaDocPolicy) {
DocCommentPolicy<?> javaDocPolicy) {
super(project, replaceInstanceOf, targetDirectory, newClassName, aClass, memberInfos, javaDocPolicy);
}
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
+2 -2
View File
@@ -31,14 +31,14 @@ public abstract class ExtractSuperBaseProcessor extends TurnRefsToSuperProcessor
protected PsiDirectory myTargetDirectory;
protected final String myNewClassName;
protected final MemberInfo[] myMemberInfos;
protected final DocCommentPolicy myJavaDocPolicy;
protected final DocCommentPolicy<?> myJavaDocPolicy;
public ExtractSuperBaseProcessor(Project project,
boolean replaceInstanceOf,
PsiDirectory targetDirectory,
String newClassName,
PsiClass aClass, MemberInfo[] memberInfos, DocCommentPolicy javaDocPolicy) {
PsiClass aClass, MemberInfo[] memberInfos, DocCommentPolicy<?> javaDocPolicy) {
super(project, replaceInstanceOf, newClassName);
myTargetDirectory = targetDirectory;
myNewClassName = newClassName;
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java
+1 -1
View File
@@ -11,7 +11,7 @@ public class ExtractSuperClassProcessor extends ExtractSuperBaseProcessor {
public ExtractSuperClassProcessor(Project project,
PsiDirectory targetDirectory, String newClassName, PsiClass aClass, MemberInfo[] memberInfos, boolean replaceInstanceOf,
DocCommentPolicy javaDocPolicy) {
DocCommentPolicy<?> javaDocPolicy) {
super(project, replaceInstanceOf, targetDirectory, newClassName, aClass, memberInfos, javaDocPolicy);
}
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java
+1 -1
View File
@@ -44,7 +44,7 @@ public final class ExtractSuperClassUtil {
final String superclassName,
final PsiClass subclass,
final MemberInfo[] selectedMemberInfos,
final DocCommentPolicy javaDocPolicy)
final DocCommentPolicy<?> javaDocPolicy)
throws IncorrectOperationException {
project.getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
+1 -1
View File
@@ -142,7 +142,7 @@ class ExtractSuperclassDialog extends JavaExtractSuperBaseDialog {
protected ExtractSuperBaseProcessor createProcessor() {
return new ExtractSuperClassProcessor(myProject, getTargetDirectory(), getExtractedSuperName(),
mySourceClass, getSelectedMemberInfos().toArray(new MemberInfo[0]), false,
new DocCommentPolicy(getDocCommentPolicy()));
new DocCommentPolicy<>(getDocCommentPolicy()));
}
@Override
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
+1 -1
View File
@@ -152,7 +152,7 @@ public class ExtractSuperclassHandler implements ElementsHandler, ExtractSupercl
final String superclassName = dialog.getExtractedSuperName();
final PsiDirectory targetDirectory = dialog.getTargetDirectory();
final MemberInfo[] selectedMemberInfos = dialog.getSelectedMemberInfos().toArray(new MemberInfo[0]);
final DocCommentPolicy javaDocPolicy = new DocCommentPolicy(dialog.getDocCommentPolicy());
final DocCommentPolicy<?> javaDocPolicy = new DocCommentPolicy<>(dialog.getDocCommentPolicy());
LocalHistoryAction a = LocalHistory.getInstance().startAction(getCommandName(subclass, superclassName));
try {
return ExtractSuperClassUtil.extractSuperClass(project, targetDirectory, superclassName, subclass, selectedMemberInfos, javaDocPolicy);
java/java-impl-refactorings/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
+1 -1
View File
@@ -316,7 +316,7 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori
protected void performRefactoring(final UsageInfo @NotNull [] usages) {
try {
final UsageInfo[] infos = ContainerUtil.map2Array(myTargetClasses, UsageInfo.class, UsageInfo::new);
new PushDownProcessor<>(mySuperClass, Arrays.asList(myMemberInfos), new DocCommentPolicy(myPolicy), myCurrentInheritor!=null)
new PushDownProcessor<>(mySuperClass, Arrays.asList(myMemberInfos), new DocCommentPolicy<>(myPolicy), myCurrentInheritor!=null)
.pushDownToClasses(infos);
CommonRefactoringUtil.sortDepthFirstRightLeftOrder(usages);
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java
+2 -2
View File
@@ -64,7 +64,7 @@ public class JavaPullUpHandler implements PullUpDialog.Callback, ElementsHandler
@Override
public void runSilently(@NotNull PsiClass sourceClass,
PsiClass targetSuperClass,
MemberInfo[] membersToMove, DocCommentPolicy javaDocPolicy) {
MemberInfo[] membersToMove, DocCommentPolicy<?> javaDocPolicy) {
new PullUpProcessor(sourceClass, targetSuperClass, membersToMove, javaDocPolicy).run();
}
@@ -152,7 +152,7 @@ public class JavaPullUpHandler implements PullUpDialog.Callback, ElementsHandler
}), RefactoringBundle.message("detecting.possible.conflicts"), true, myProject)) return false;
if (!conflicts.isEmpty()) {
ConflictsDialog conflictsDialog = new ConflictsDialog(myProject, conflicts, () ->
new PullUpProcessor(mySubclass, superClass, infos.toArray(new MemberInfo[0]), new DocCommentPolicy(dialog.getJavaDocPolicy())).run());
new PullUpProcessor(mySubclass, superClass, infos.toArray(new MemberInfo[0]), new DocCommentPolicy<>(dialog.getJavaDocPolicy())).run());
boolean ok = conflictsDialog.showAndGet();
if (!ok && conflictsDialog.isShowConflicts()) dialog.close(DialogWrapper.CANCEL_EXIT_CODE);
return ok;
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class JavaPullUpHelper implements PullUpHelper<MemberInfo> {
private final PsiClass mySourceClass;
private final PsiClass myTargetSuperClass;
private final boolean myIsTargetInterface;
private final DocCommentPolicy myJavaDocPolicy;
private final DocCommentPolicy<?> myJavaDocPolicy;
private final Set<PsiMember> myMembersAfterMove;
private final Set<PsiMember> myMembersToMove;
private final Project myProject;
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class PullUpDialog extends PullUpDialogBase<MemberInfoStorage, MemberInfo
List<MemberInfo> infos = getSelectedMemberInfos();
invokeRefactoring(new PullUpProcessor(myClass, superClass, infos.toArray(new MemberInfo[0]),
new DocCommentPolicy(getJavaDocPolicy())));
new DocCommentPolicy<>(getJavaDocPolicy())));
close(OK_EXIT_CODE);
}
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/PullUpProcessor.java
+3 -3
View File
@@ -43,12 +43,12 @@ public class PullUpProcessor extends BaseRefactoringProcessor implements PullUpD
private final PsiClass mySourceClass;
private final PsiClass myTargetSuperClass;
private final MemberInfo[] myMembersToMove;
private final DocCommentPolicy myJavaDocPolicy;
private final DocCommentPolicy<?> myJavaDocPolicy;
private Set<PsiMember> myMembersAfterMove;
private Set<PsiMember> myMovedMembers;
private final Map<Language, PullUpHelper<MemberInfo>> myProcessors = new HashMap<>();
public PullUpProcessor(@NotNull PsiClass sourceClass, PsiClass targetSuperClass, MemberInfo[] membersToMove, DocCommentPolicy javaDocPolicy) {
public PullUpProcessor(@NotNull PsiClass sourceClass, PsiClass targetSuperClass, MemberInfo[] membersToMove, DocCommentPolicy<?> javaDocPolicy) {
super(sourceClass.getProject());
mySourceClass = sourceClass;
myTargetSuperClass = targetSuperClass;
@@ -273,7 +273,7 @@ public class PullUpProcessor extends BaseRefactoringProcessor implements PullUpD
}
@Override
public DocCommentPolicy getDocCommentPolicy() {
public DocCommentPolicy<?> getDocCommentPolicy() {
return myJavaDocPolicy;
}