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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Vladimir.Orlov
2014-09-10 17:20:31 +04:00
parent 9474c01e0a e1b719458b
commit f043913ca6
2 changed files with 3 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/LevelChooser.java
-102
View File
@@ -1,102 +0,0 @@
/*
* Copyright 2000-2012 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.
*/
/*
* User: anna
* Date: 19-Apr-2009
*/
package com.intellij.profile.codeInspection.ui;
import com.intellij.codeHighlighting.HighlightDisplayLevel;
import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
import com.intellij.codeInsight.daemon.impl.SeverityRegistrar;
import com.intellij.codeInsight.daemon.impl.SeverityUtil;
import com.intellij.codeInspection.ex.SeverityEditorDialog;
import com.intellij.ui.ListCellRendererWrapper;
import com.intellij.lang.annotation.HighlightSeverity;
import com.intellij.ui.ComboboxWithBrowseButton;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.TreeSet;
public class LevelChooser extends ComboboxWithBrowseButton {
public LevelChooser(final SeverityRegistrar severityRegistrar) {
final JComboBox comboBox = getComboBox();
final DefaultComboBoxModel model = new DefaultComboBoxModel();
comboBox.setModel(model);
fillModel(model, severityRegistrar);
getButton().setToolTipText("Edit severities (" + getButton().getToolTipText(null) + ")");
comboBox.setRenderer(new ListCellRendererWrapper<HighlightSeverity>() {
@Override
public void customize(final JList list, final HighlightSeverity value, final int index, final boolean selected, final boolean hasFocus) {
if (value != null) {
setText(SingleInspectionProfilePanel.renderSeverity(value));
setIcon(HighlightDisplayLevel.find(value).getIcon());
}
}
});
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
final SeverityEditorDialog dlg =
new SeverityEditorDialog(LevelChooser.this, (HighlightSeverity)getComboBox().getSelectedItem(), severityRegistrar);
dlg.show();
if (dlg.isOK()) {
final Object item = getComboBox().getSelectedItem();
fillModel(model, severityRegistrar);
final HighlightInfoType type = dlg.getSelectedType();
if (type != null) {
getComboBox().setSelectedItem(type.getSeverity(null));
}
else {
getComboBox().setSelectedItem(item);
}
}
}
});
}
private static void fillModel(DefaultComboBoxModel model, final SeverityRegistrar severityRegistrar) {
model.removeAllElements();
final TreeSet<HighlightSeverity> severities = new TreeSet<HighlightSeverity>(severityRegistrar);
for (SeverityRegistrar.SeverityBasedTextAttributes type : SeverityUtil.getRegisteredHighlightingInfoTypes(severityRegistrar)) {
severities.add(type.getSeverity());
}
severities.add(HighlightSeverity.ERROR);
severities.add(HighlightSeverity.WARNING);
severities.add(HighlightSeverity.WEAK_WARNING);
severities.add(HighlightSeverity.GENERIC_SERVER_ERROR_OR_WARNING);
for (HighlightSeverity severity : severities) {
model.addElement(severity);
}
}
@NotNull
public HighlightDisplayLevel getLevel() {
HighlightSeverity severity = (HighlightSeverity)getComboBox().getSelectedItem();
if (severity == null) return HighlightDisplayLevel.WARNING;
return HighlightDisplayLevel.find(severity);
}
public void setLevel(HighlightDisplayLevel level) {
getComboBox().setSelectedItem(level.getSeverity());
}
}
platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
+3 -5
View File
@@ -26,10 +26,7 @@ import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.ui.ColorUtil;
import com.intellij.ui.Gray;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.JBColor;
import com.intellij.ui.*;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.util.ui.GraphicsUtil;
import com.intellij.util.ui.UIUtil;
@@ -103,7 +100,7 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
return 1;
}
protected class ComboBoxButton extends JButton {
protected class ComboBoxButton extends JButton implements UserActivityProviderComponent {
private final Presentation myPresentation;
private boolean myForcePressed = false;
private PropertyChangeListener myButtonSynchronizer;
@@ -227,6 +224,7 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
}
});
repaint();
fireStateChanged();
}
};