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

analysis dialog: absent selection if there's only project context (IDEA-183461)

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-12-11 12:59:07 +03:00
parent 31d2e88f2c
commit c38df1a8fa
1 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java
+36 -33
View File
@@ -1,17 +1,5 @@
/*
* Copyright 2000-2017 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-2017 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.analysis;
@@ -131,20 +119,11 @@ public class BaseAnalysisActionDialog extends DialogWrapper {
//module scope if applicable
myModuleButton.setText(AnalysisScopeBundle.message("scope.option.module.with.mnemonic", myModuleName));
boolean useModuleScope = false;
if (myModuleName != null) {
useModuleScope = myAnalysisOptions.SCOPE_TYPE == AnalysisScope.MODULE;
myModuleButton.setSelected(myRememberScope && useModuleScope);
}
myModuleButton.setVisible(myModuleName != null && ModuleManager.getInstance(myProject).getModules().length > 1);
boolean useUncommitedFiles = false;
final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
final boolean hasVCS = !changeListManager.getAffectedFiles().isEmpty();
if (hasVCS){
useUncommitedFiles = myAnalysisOptions.SCOPE_TYPE == AnalysisScope.UNCOMMITTED_FILES;
myUncommittedFilesButton.setSelected(myRememberScope && useUncommitedFiles);
}
myUncommittedFilesButton.setVisible(hasVCS);
DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>();
@@ -196,20 +175,36 @@ public class BaseAnalysisActionDialog extends DialogWrapper {
searchInLib = true;
}
//custom scope
myCustomScopeButton.setSelected(myRememberScope && myAnalysisOptions.SCOPE_TYPE == AnalysisScope.CUSTOM);
boolean someButtonEnabled = false;
if (myRememberScope) {
switch (myAnalysisOptions.SCOPE_TYPE) {
case AnalysisScope.PROJECT:
someButtonEnabled = select(myProjectButton);
break;
case AnalysisScope.MODULE:
someButtonEnabled = select(myModuleButton);
break;
case AnalysisScope.FILE:
someButtonEnabled = select(myFileButton);
break;
case AnalysisScope.UNCOMMITTED_FILES:
someButtonEnabled = select(myUncommittedFilesButton);
break;
case AnalysisScope.CUSTOM:
someButtonEnabled = select(myCustomScopeButton);
break;
}
} else {
if (!(someButtonEnabled = select(myFileButton))) {
select(myModuleButton);
}
}
if (!someButtonEnabled) {
select(myProjectButton);
}
myScopeCombo.init(myProject, searchInLib, true, preselect);
myScopeCombo.setCurrentSelection(false);
//correct selection
myFileButton.setSelected(myFileName != null &&
(!myRememberScope ||
myAnalysisOptions.SCOPE_TYPE != AnalysisScope.PROJECT && !useModuleScope && myAnalysisOptions.SCOPE_TYPE != AnalysisScope.CUSTOM && !useUncommitedFiles));
if (!myFileButton.isSelected()) {
myProjectButton.setSelected(myRememberScope && myAnalysisOptions.SCOPE_TYPE == AnalysisScope.PROJECT);
}
myScopeCombo.setEnabled(myCustomScopeButton.isSelected());
final ActionListener radioButtonPressed = new ActionListener() {
@@ -349,4 +344,12 @@ public class BaseAnalysisActionDialog extends DialogWrapper {
FindSettings.getInstance().setDefaultScopeName(scope.getDisplayName());
return scope;
}
private static boolean select(JRadioButton button) {
if (button.isVisible()) {
button.setSelected(true);
return true;
}
return false;
}
}