From 55c839cb96e328d37f69e81b74e8e9181e0a7891 Mon Sep 17 00:00:00 2001
From: Dana Dahlstrom <dahlstrom@google.com>
Date: Fri, 25 Nov 2016 19:22:05 +0100
Subject: [PATCH] Fix mismatching varargs/array params in overrides

---
 .../src/com/intellij/ide/actions/ShowSettingsUtilImpl.java | 7 ++++---
 .../intellij/testFramework/vcs/MockChangeListManager.java  | 2 +-
 .../xml/highlighting/DomElementAnnotationHolderImpl.java   | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
index 1de6e85a6ba0..e20a82f91c24 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
@@ -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();
     }
diff --git a/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java b/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java
index 0e353c6867ef..8cc985ea89a9 100644
--- a/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java
+++ b/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java
@@ -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
diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java
index 73dbd8645a6e..355be5722381 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java
@@ -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);
   }