MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +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-13 12:44:56 +02: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

16
java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java
View File

@@ -19,7 +19,7 @@ import java.util.concurrent.*;
public abstract class InvokeThread<E extends PrioritizedTask> {
private static final Logger LOG = Logger.getInstance(InvokeThread.class);
private static final ThreadLocal<WorkerThreadRequest> ourWorkerRequest = new ThreadLocal<>();
private static final ThreadLocal<WorkerThreadRequest<?>> ourWorkerRequest = new ThreadLocal<>();
public static final class WorkerThreadRequest<E extends PrioritizedTask> implements Runnable {
private final InvokeThread<E> myOwner;
@@ -103,7 +103,7 @@ public abstract class InvokeThread<E extends PrioritizedTask> {
protected final EventQueue<E> myEvents;
private volatile WorkerThreadRequest myCurrentRequest = null;
private volatile WorkerThreadRequest<E> myCurrentRequest = null;
public InvokeThread() {
myEvents = new EventQueue<>(PrioritizedTask.Priority.values().length);
@@ -123,7 +123,7 @@ public abstract class InvokeThread<E extends PrioritizedTask> {
processEvent(event);
}
private void run(final @NotNull WorkerThreadRequest threadRequest) {
private void run(final @NotNull WorkerThreadRequest<?> threadRequest) {
try {
DumbModeAccessType.RELIABLE_DATA_ONLY.ignoreDumbMode(() -> ProgressManager.getInstance().runProcess(() -> {
while (true) {
@@ -132,7 +132,7 @@ public abstract class InvokeThread<E extends PrioritizedTask> {
break;
}
final WorkerThreadRequest currentRequest = getCurrentRequest();
final WorkerThreadRequest<E> currentRequest = getCurrentRequest();
if (currentRequest != threadRequest) {
String message = "Expected " + threadRequest + " instead of " + currentRequest + " closed=" + myEvents.isClosed();
LOG.error(message, new IllegalStateException(message), ThreadDumper.dumpThreadsToString());
@@ -193,8 +193,8 @@ public abstract class InvokeThread<E extends PrioritizedTask> {
}
}
public static InvokeThread currentThread() {
final WorkerThreadRequest request = getCurrentThreadRequest();
public static InvokeThread<?> currentThread() {
final WorkerThreadRequest<?> request = getCurrentThreadRequest();
return request != null ? request.getOwner() : null;
}
@@ -223,11 +223,11 @@ public abstract class InvokeThread<E extends PrioritizedTask> {
currentThreadRequest.requestStop();
}
public WorkerThreadRequest getCurrentRequest() {
public WorkerThreadRequest<E> getCurrentRequest() {
return myCurrentRequest;
}
public static WorkerThreadRequest getCurrentThreadRequest() {
public static WorkerThreadRequest<?> getCurrentThreadRequest() {
return ourWorkerRequest.get();
}

2
java/idea-ui/src/com/intellij/framework/addSupport/FrameworkSupportInModuleProvider.java
View File

@@ -26,7 +26,7 @@ public abstract class FrameworkSupportInModuleProvider implements FrameworkOrGro
@NotNull
public abstract FrameworkSupportInModuleConfigurable createConfigurable(@NotNull FrameworkSupportModel model);
public abstract boolean isEnabledForModuleType(@NotNull ModuleType moduleType);
public abstract boolean isEnabledForModuleType(@NotNull ModuleType<?> moduleType);
public boolean isEnabledForModuleBuilder(@NotNull ModuleBuilder builder) {
return isEnabledForModuleType(builder.getModuleType());

2
java/idea-ui/src/com/intellij/framework/library/LibraryBasedFrameworkSupportProvider.java
View File

@@ -36,7 +36,7 @@ public class LibraryBasedFrameworkSupportProvider extends FrameworkSupportInModu
}
@Override
public boolean isEnabledForModuleType(@NotNull ModuleType moduleType) {
public boolean isEnabledForModuleType(@NotNull ModuleType<?> moduleType) {
return moduleType instanceof JavaModuleType;
}

2
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/OldFrameworkSupportProviderWrapper.java
View File

@@ -51,7 +51,7 @@ public class OldFrameworkSupportProviderWrapper extends FrameworkSupportInModule
}
@Override
public boolean isEnabledForModuleType(@NotNull ModuleType moduleType) {
public boolean isEnabledForModuleType(@NotNull ModuleType<?> moduleType) {
return myProvider.isEnabledForModuleType(moduleType);
}

2
java/idea-ui/testSrc/com/intellij/ide/projectWizard/ProjectTemplatesTest.java
View File

@@ -31,7 +31,7 @@ public class ProjectTemplatesTest extends TestCase {
public void testTemplate() throws Exception {
ArchivedProjectTemplate template = new ArchivedProjectTemplate("Display Name", "category") {
@Override
protected ModuleType getModuleType() {
protected ModuleType<?> getModuleType() {
return null;
}

2
java/java-analysis-impl/src/com/intellij/codeInspection/inconsistentLanguageLevel/InconsistentLanguageLevelInspection.java
View File

@@ -52,7 +52,7 @@ public final class InconsistentLanguageLevelInspection extends GlobalInspectionT
dependantModule.getName(), dependantLanguageLevel.getShortText()),
module,
new UnnecessaryModuleDependencyInspection.RemoveModuleDependencyFix(dependantModule.getName()),
(QuickFix)QuickFixFactory.getInstance().createShowModulePropertiesFix(module));
(QuickFix<?>)QuickFixFactory.getInstance().createShowModulePropertiesFix(module));
return new CommonProblemDescriptor[] {problemDescriptor};
}
}

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
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

6
java/java-impl-refactorings/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
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));

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java
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);
}

4
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
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;

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java
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);
}

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java
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)

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
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

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
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);

2
java/java-impl-refactorings/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
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);

4
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java
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;

2
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java
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;

2
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
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);
}

6
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/PullUpProcessor.java
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;
}

2
java/java-impl/src/com/intellij/codeInspection/ex/ClassPatternsPanel.java
View File

@@ -197,7 +197,7 @@ class ClassPatternsPanel extends JPanel {
}
@Override
public Class getColumnClass(int col) {
public Class<?> getColumnClass(int col) {
if (col == 0) {
return Boolean.class;
}

6
java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
View File

@@ -22,7 +22,9 @@ import com.intellij.psi.*;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.searches.OverridingMethodsSearch;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.*;
import com.intellij.psi.util.AccessModifier;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.BaseRefactoringProcessor;
import com.intellij.refactoring.JavaRefactoringFactory;
import com.intellij.refactoring.changeSignature.ParameterInfoImpl;
@@ -172,7 +174,7 @@ public final class SameParameterValueInspection extends GlobalJavaBatchInspectio
canonicalText = constValue.canonicalText();
}
else {
canonicalText = presentableText = (value instanceof Iterable it) ? Strings.join(it, ", ") : String.valueOf(value);
canonicalText = presentableText = (value instanceof Iterable<?> it) ? Strings.join(it, ", ") : String.valueOf(value);
}
PsiElement anchor = ObjectUtils.notNull(UDeclarationKt.getAnchorPsi(parameter), parameter);
if (!anchor.isPhysical()) return null;

2
java/java-impl/src/com/intellij/ide/projectView/actions/MarkGeneratedSourceRootAction.java
View File

@@ -68,7 +68,7 @@ public class MarkGeneratedSourceRootAction extends MarkRootActionBase {
}
private static boolean isJavaModule(Module module) {
ModuleType moduleType = ModuleType.get(module);
ModuleType<?> moduleType = ModuleType.get(module);
//this additional check can be removed when we get rid of PluginModuleType
return moduleType instanceof JavaModuleType || "PLUGIN_MODULE".equals(moduleType.getId());
}

2
java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java
View File

@@ -154,7 +154,7 @@ public class PackageViewPane extends AbstractProjectViewPaneWithAsyncSupport {
protected @NotNull ProjectAbstractTreeStructureBase createStructure() {
return new ProjectTreeStructure(myProject, ID){
@Override
protected AbstractTreeNode createRoot(final @NotNull Project project, @NotNull ViewSettings settings) {
protected AbstractTreeNode<?> createRoot(final @NotNull Project project, @NotNull ViewSettings settings) {
return new PackageViewProjectNode(project, settings);
}

2
java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandlerBase.java
View File

@@ -11,5 +11,5 @@ public interface JavaPullUpHandlerBase extends RefactoringActionHandler {
void runSilently(@NotNull PsiClass sourceClass,
PsiClass targetSuperClass,
MemberInfo[] membersToMove,
DocCommentPolicy javaDocPolicy);
DocCommentPolicy<?> javaDocPolicy);
}

2
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterStubImpl.java
View File

@@ -49,7 +49,7 @@ public class PsiParameterStubImpl extends StubBase<PsiParameter> implements PsiP
@Override
public PsiModifierListStub getModList() {
for (StubElement child : getChildrenStubs()) {
for (StubElement<?> child : getChildrenStubs()) {
if (child instanceof PsiModifierListStub) {
return (PsiModifierListStub)child;
}

4
java/java-psi-impl/src/com/intellij/psi/impl/smartPointers/PsiClassReferenceTypePointerFactory.java
View File

@@ -22,7 +22,7 @@ public final class PsiClassReferenceTypePointerFactory implements ClassTypePoint
}
private static class ClassReferenceTypePointer extends TypePointerBase<PsiClassReferenceType> {
private final SmartPsiElementPointer mySmartPsiElementPointer;
private final SmartPsiElementPointer<PsiJavaCodeReferenceElement> mySmartPsiElementPointer;
private final String myReferenceText;
private final Project myProject;
@@ -38,7 +38,7 @@ public final class PsiClassReferenceTypePointerFactory implements ClassTypePoint
@Override
protected PsiClassReferenceType calcType() {
PsiClassReferenceType myType = null;
final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)mySmartPsiElementPointer.getElement();
final PsiJavaCodeReferenceElement referenceElement = mySmartPsiElementPointer.getElement();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(myProject);
if (referenceElement != null) {
myType = (PsiClassReferenceType)factory.createType(referenceElement);

2
java/java-tests/testSrc/com/intellij/java/refactoring/ExtractSuperClassTest.java
View File

@@ -161,7 +161,7 @@ public class ExtractSuperClassTest extends LightMultiFileTestCase {
}
WriteCommandAction.writeCommandAction(getProject()).run(() -> ExtractSuperClassUtil
.extractSuperClass(getProject(), psiClass.getContainingFile().getContainingDirectory(), "TestSubclass", anonymousClass,
infos.toArray(new MemberInfo[0]), new DocCommentPolicy(DocCommentPolicy.ASIS)));
infos.toArray(new MemberInfo[0]), new DocCommentPolicy<>(DocCommentPolicy.ASIS)));
});
}

2
java/java-tests/testSrc/com/intellij/java/refactoring/PullUpTest.java
View File

@@ -302,7 +302,7 @@ public class PullUpTest extends LightRefactoringTestCase {
.checkConflicts(infos, sourceClass, targetClass, targetPackage, targetDirectory,
psiMethod -> PullUpProcessor.checkedInterfacesContain(Arrays.asList(infos), psiMethod))
);
final PullUpProcessor helper = new PullUpProcessor(sourceClass, targetClass, infos, new DocCommentPolicy(DocCommentPolicy.ASIS));
final PullUpProcessor helper = new PullUpProcessor(sourceClass, targetClass, infos, new DocCommentPolicy<>(DocCommentPolicy.ASIS));
helper.run();
UIUtil.dispatchAllInvocationEvents();
JavaRefactoringListenerManager.getInstance(getProject()).removeMoveMembersListener(listener);

4
java/java-tests/testSrc/com/intellij/java/refactoring/PushDownMultifileTest.java
View File

@@ -56,7 +56,7 @@ public class PushDownMultifileTest extends LightMultiFileTestCase {
assertTrue("No methods found", methods.length > 0);
final MemberInfo memberInfo = new MemberInfo(methods[0]);
memberInfo.setChecked(true);
new PushDownProcessor<>(srcClass, Collections.singletonList(memberInfo), new DocCommentPolicy(DocCommentPolicy.ASIS)).run();
new PushDownProcessor<>(srcClass, Collections.singletonList(memberInfo), new DocCommentPolicy<>(DocCommentPolicy.ASIS)).run();
//LocalFileSystem.getInstance().refresh(false);
@@ -108,7 +108,7 @@ public class PushDownMultifileTest extends LightMultiFileTestCase {
assertTrue("No methods found", fields.length > 0);
final MemberInfo memberInfo = new MemberInfo(fields[0]);
memberInfo.setChecked(true);
new PushDownProcessor<>(srcClass, Collections.singletonList(memberInfo), new DocCommentPolicy(DocCommentPolicy.ASIS)).run();
new PushDownProcessor<>(srcClass, Collections.singletonList(memberInfo), new DocCommentPolicy<>(DocCommentPolicy.ASIS)).run();
//LocalFileSystem.getInstance().refresh(false);

4
java/java-tests/testSrc/com/intellij/java/refactoring/PushDownTest.java
View File

@@ -174,7 +174,7 @@ public class PushDownTest extends LightRefactoringTestCase {
membersToMove.add(memberInfo);
new PushDownProcessor<>(currentClass, membersToMove,
new DocCommentPolicy(DocCommentPolicy.ASIS)) {
new DocCommentPolicy<>(DocCommentPolicy.ASIS)) {
@Override
protected boolean showConflicts(@NotNull MultiMap<PsiElement, String> conflicts, UsageInfo[] usages) {
checkConflicts.accept(conflicts);
@@ -207,7 +207,7 @@ public class PushDownTest extends LightRefactoringTestCase {
}
new PushDownProcessor<>(currentClass, members,
new DocCommentPolicy(DocCommentPolicy.ASIS)) {
new DocCommentPolicy<>(DocCommentPolicy.ASIS)) {
@Override
protected boolean showConflicts(@NotNull MultiMap<PsiElement, String> conflicts, UsageInfo[] usages) {
if (failure == conflicts.isEmpty()) {

2
java/openapi/src/com/intellij/refactoring/memberPullUp/PullUpData.java
View File

@@ -27,7 +27,7 @@ public interface PullUpData {
PsiClass getTargetClass();
DocCommentPolicy getDocCommentPolicy();
DocCommentPolicy<?> getDocCommentPolicy();
Set<PsiMember> getMembersToMove();

4
java/testFramework/src/com/intellij/debugger/mockJDI/types/MockInterfaceType.java
View File

@@ -11,7 +11,7 @@ import java.util.ArrayList;
import java.util.List;
public class MockInterfaceType extends MockReferenceType implements InterfaceType {
public MockInterfaceType(final MockVirtualMachine virtualMachine, Class type) {
public MockInterfaceType(final MockVirtualMachine virtualMachine, Class<?> type) {
super(type, virtualMachine);
}
@@ -26,7 +26,7 @@ public class MockInterfaceType extends MockReferenceType implements InterfaceTyp
@Override
public List<InterfaceType> superinterfaces() {
ArrayList<InterfaceType> interfaceTypes = new ArrayList<>();
for (Class aClass : myType.getInterfaces()) {
for (Class<?> aClass : myType.getInterfaces()) {
interfaceTypes.add(myVirtualMachine.createInterfaceType(aClass));
}
return interfaceTypes;

2
java/testFramework/src/com/intellij/debugger/mockJDI/types/MockType.java
View File

@@ -15,7 +15,7 @@ public abstract class MockType extends MockMirror implements Type {
super(virtualMachine);
}
public static MockType createType(final MockVirtualMachine virtualMachine, Class aClass) {
public static MockType createType(final MockVirtualMachine virtualMachine, Class<?> aClass) {
if (aClass.isPrimitive()) {
if (aClass == boolean.class) {
return virtualMachine.getBooleanType();

2
platform/lang-impl/src/com/intellij/ide/impl/ModuleStructurePane.java
View File

@@ -27,7 +27,7 @@ public final class ModuleStructurePane extends ProjectViewPane {
protected @NotNull ProjectAbstractTreeStructureBase createStructure() {
return new ProjectTreeStructure(myProject, ID){
@Override
protected AbstractTreeNode createRoot(final @NotNull Project project, @NotNull ViewSettings settings) {
protected AbstractTreeNode<?> createRoot(final @NotNull Project project, @NotNull ViewSettings settings) {
return new StructureViewModuleNode(project, myModule, settings);
}
};

2
platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectTreeStructure.java
View File

@@ -19,7 +19,7 @@ public abstract class AbstractProjectTreeStructure extends ProjectAbstractTreeSt
myRoot = createRoot(project, this);
}
protected AbstractTreeNode createRoot(@NotNull Project project, @NotNull ViewSettings settings) {
protected AbstractTreeNode<?> createRoot(@NotNull Project project, @NotNull ViewSettings settings) {
return new ProjectViewProjectNode(myProject, this);
}

8
platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownData.java
View File

@@ -13,19 +13,19 @@ public final class PushDownData<MemberInfo extends MemberInfoBase<Member>,
Member extends PsiElement> {
private PsiElement mySourceClass;
private final List<MemberInfo> myMembersToMove;
private final DocCommentPolicy myCommentPolicy;
private final DocCommentPolicy<?> myCommentPolicy;
private final boolean myPreserveLinks;
PushDownData(@NotNull PsiElement sourceClass,
@NotNull List<MemberInfo> membersToMove,
@NotNull DocCommentPolicy commentPolicy) {
@NotNull DocCommentPolicy<?> commentPolicy) {
this(sourceClass, membersToMove, commentPolicy, false);
}
@ApiStatus.Experimental
PushDownData(@NotNull PsiElement sourceClass,
@NotNull List<MemberInfo> membersToMove,
@NotNull DocCommentPolicy commentPolicy,
@NotNull DocCommentPolicy<?> commentPolicy,
boolean preserveExternalLinks) {
mySourceClass = sourceClass;
myMembersToMove = membersToMove;
@@ -42,7 +42,7 @@ public final class PushDownData<MemberInfo extends MemberInfoBase<Member>,
public @NotNull List<MemberInfo> getMembersToMove() {
return myMembersToMove;
}
public @NotNull DocCommentPolicy getCommentPolicy() {
public @NotNull DocCommentPolicy<?> getCommentPolicy() {
return myCommentPolicy;
}

4
platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
View File

@@ -39,14 +39,14 @@ public class PushDownProcessor<MemberInfo extends MemberInfoBase<Member>,
public PushDownProcessor(@NotNull Klass sourceClass,
@NotNull List<MemberInfo> memberInfos,
@NotNull DocCommentPolicy javaDocPolicy) {
@NotNull DocCommentPolicy<?> javaDocPolicy) {
this(sourceClass, memberInfos, javaDocPolicy, false);
}
@ApiStatus.Experimental
public PushDownProcessor(@NotNull Klass sourceClass,
@NotNull List<MemberInfo> memberInfos,
@NotNull DocCommentPolicy javaDocPolicy,
@NotNull DocCommentPolicy<?> javaDocPolicy,
boolean preserveExternalLinks) {
super(sourceClass.getProject());
myDelegate = PushDownDelegate.findDelegate(sourceClass);

2
plugins/gradle/java/src/frameworkSupport/GradleFrameworkSupportProvider.java
View File

@@ -64,7 +64,7 @@ public abstract class GradleFrameworkSupportProvider extends FrameworkSupportInM
}
@Override
public boolean isEnabledForModuleType(@NotNull ModuleType moduleType) {
public boolean isEnabledForModuleType(@NotNull ModuleType<?> moduleType) {
return false;
}
}

2
plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyFrameworkSupportProvider.java
View File

@@ -50,7 +50,7 @@ public class GroovyFrameworkSupportProvider extends FrameworkSupportInModuleProv
}
@Override
public boolean isEnabledForModuleType(@NotNull ModuleType moduleType) {
public boolean isEnabledForModuleType(@NotNull ModuleType<?> moduleType) {
return GroovyFacetUtil.isAcceptableModuleType(moduleType);
}
}

2
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpHelper.java
View File

@@ -62,7 +62,7 @@ public class GrPullUpHelper implements PullUpHelper<MemberInfo> {
private final Set<PsiMember> myMembersToMove;
private final PsiClass mySourceClass;
private final Project myProject;
private final DocCommentPolicy myDocCommentPolicy;
private final DocCommentPolicy<?> myDocCommentPolicy;
private final Set<PsiMember> myMembersAfterMove;
final ExplicitSuperDeleter myExplicitSuperDeleter;

2
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpTest.groovy
View File

@@ -192,7 +192,7 @@ class GrPullUpTest extends LightGroovyTestCase {
}
}
JavaRefactoringListenerManager.getInstance(getProject()).addMoveMembersListener(listener)
final PullUpProcessor helper = new PullUpProcessor(sourceClass, targetClass, infos, new DocCommentPolicy(DocCommentPolicy.ASIS))
final PullUpProcessor helper = new PullUpProcessor(sourceClass, targetClass, infos, new DocCommentPolicy<>(DocCommentPolicy.ASIS))
helper.run()
UIUtil.dispatchAllInvocationEvents()
JavaRefactoringListenerManager.getInstance(getProject()).removeMoveMembersListener(listener)