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

Fix mismatching varargs/array params in overrides

Browse Source
This commit is contained in:
Dana Dahlstrom
2016-11-25 19:34:39 +01:00
committed by Anna.Kozlova
parent acb13c1458
commit 55c839cb96
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
+4 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@ import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurableGroup;
import com.intellij.openapi.options.ShowSettingsUtil;
import com.intellij.openapi.options.TabbedConfigurable;
import com.intellij.openapi.options.ex.*;
import com.intellij.openapi.options.ex.ConfigurableExtensionPointUtil;
import com.intellij.openapi.options.ex.ConfigurableVisitor;
import com.intellij.openapi.options.newEditor.SettingsDialog;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
@@ -86,7 +87,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
}
@Override
public void showSettingsDialog(@NotNull Project project, @NotNull ConfigurableGroup[] group) {
public void showSettingsDialog(@NotNull Project project, @NotNull ConfigurableGroup... group) {
try {
getDialog(project, group, null).show();
}
platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java
+1 -1
View File
@@ -356,7 +356,7 @@ public class MockChangeListManager extends ChangeListManagerEx {
}
@Override
public void moveChangesTo(LocalChangeList list, Change[] changes) {
public void moveChangesTo(LocalChangeList list, Change... changes) {
}
@Override
xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@ public class DomElementAnnotationHolderImpl extends SmartList<DomElementProblemD
public DomElementProblemDescriptor createProblem(@NotNull final DomElement domElement,
final HighlightSeverity highlightType,
final String message,
final LocalQuickFix[] fixes) {
final LocalQuickFix... fixes) {
return createProblem(domElement, highlightType, message, null, fixes);
}