From 8f4cedca1469bd6fb89af787a23963133d260e8c Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 22 Mar 2018 18:23:01 +0100 Subject: [PATCH] Cleanup: merge nested ifs --- .../daemon/impl/PsiElementListNavigator.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java index 5b51273f8fa0..ae086c69c342 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java @@ -1,18 +1,4 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.codeInsight.daemon.impl; @@ -167,7 +153,7 @@ public class PsiElementListNavigator { final JBPopup popup = popupChooserBuilder.createPopup(); if (builder instanceof PopupChooserBuilder) { JBList list = (JBList)((PopupChooserBuilder)builder).getChooserComponent(); - list.setTransferHandler(new TransferHandler(){ + list.setTransferHandler(new TransferHandler() { @Override protected Transferable createTransferable(JComponent c) { final Object[] selectedValues = list.getSelectedValues(); @@ -183,8 +169,7 @@ public class PsiElementListNavigator { return COPY; } }); - } - if (builder instanceof PopupChooserBuilder) { + JScrollPane pane = ((PopupChooserBuilder)builder).getScrollPane(); pane.setBorder(null); pane.setViewportBorder(null);