diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /platform/platform-impl/src/com/intellij/openapi/ui/popup/MultiSelectionListPopupStep.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/ui/popup/MultiSelectionListPopupStep.java')
| -rw-r--r-- | platform/platform-impl/src/com/intellij/openapi/ui/popup/MultiSelectionListPopupStep.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/popup/MultiSelectionListPopupStep.java b/platform/platform-impl/src/com/intellij/openapi/ui/popup/MultiSelectionListPopupStep.java index 815eafd56ab4..96fbccc87054 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/popup/MultiSelectionListPopupStep.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/popup/MultiSelectionListPopupStep.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -28,8 +28,8 @@ import java.util.List; public abstract class MultiSelectionListPopupStep<T> extends BaseListPopupStep<T> { private int[] myDefaultOptionIndices = ArrayUtil.EMPTY_INT_ARRAY; - protected MultiSelectionListPopupStep(@Nullable String aTitle, List<? extends T> aValues) { - super(aTitle, aValues); + protected MultiSelectionListPopupStep(@Nullable String title, List<? extends T> values) { + super(title, values); } public abstract PopupStep<?> onChosen(List<T> selectedValues, boolean finalChoice); @@ -54,8 +54,8 @@ public abstract class MultiSelectionListPopupStep<T> extends BaseListPopupStep<T } @Override - public final void setDefaultOptionIndex(int aDefaultOptionIndex) { - myDefaultOptionIndices = new int[]{aDefaultOptionIndex}; + public final void setDefaultOptionIndex(int defaultOptionIndex) { + myDefaultOptionIndices = new int[]{defaultOptionIndex}; } public int[] getDefaultOptionIndices() { |