mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
EA-37156 Assertion selectedTool != null not always true
This commit is contained in:
@@ -1,83 +1,82 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
package com.intellij.tools;
|
||||
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.ui.DialogWrapper;
|
||||
import com.intellij.openapi.ui.MessageType;
|
||||
import com.intellij.openapi.ui.popup.Balloon;
|
||||
import com.intellij.openapi.ui.popup.JBPopupFactory;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.ui.awt.RelativePoint;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.event.TreeSelectionEvent;
|
||||
import javax.swing.event.TreeSelectionListener;
|
||||
import java.awt.*;
|
||||
import java.io.IOException;
|
||||
|
||||
class ToolSelectDialog extends DialogWrapper {
|
||||
private final ToolsPanel myToolsPanel = new ToolsPanel();
|
||||
|
||||
protected ToolSelectDialog(@Nullable Project project, ToolBeforeRunTask task) {
|
||||
super(project);
|
||||
myToolsPanel.reset();
|
||||
myToolsPanel.addSelectionListener(new TreeSelectionListener() {
|
||||
@Override
|
||||
public void valueChanged(TreeSelectionEvent e) {
|
||||
final Tool selectedTool = myToolsPanel.getSingleSelectedTool();
|
||||
boolean isOk = selectedTool != null;
|
||||
setOKActionEnabled(isOk);
|
||||
}
|
||||
});
|
||||
init();
|
||||
pack();
|
||||
if(task.getToolActionId() != null){
|
||||
myToolsPanel.selectTool(task.getToolActionId());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doOKAction() {
|
||||
try {
|
||||
myToolsPanel.apply();
|
||||
}
|
||||
catch (IOException e) {
|
||||
String message = ToolsBundle.message("tools.failed.to.save.changes.0", StringUtil.decapitalize(e.getMessage()));
|
||||
final JLayeredPane pane = myToolsPanel.getRootPane().getLayeredPane();
|
||||
JBPopupFactory.getInstance().createHtmlTextBalloonBuilder(message, MessageType.ERROR, null)
|
||||
.setShowCallout(false).setFadeoutTime(3000).setHideOnAction(true).setHideOnClickOutside(true).setHideOnKeyOutside(true).
|
||||
createBalloon().show(new RelativePoint(pane, new Point(pane.getWidth(), 0)), Balloon.Position.above);
|
||||
return;
|
||||
}
|
||||
super.doOKAction();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JComponent createCenterPanel() {
|
||||
return myToolsPanel;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
Tool getSelectedTool() {
|
||||
return myToolsPanel.getSingleSelectedTool();
|
||||
}
|
||||
|
||||
boolean isModified() {
|
||||
return myToolsPanel.isModified();
|
||||
}
|
||||
}
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
package com.intellij.tools;
|
||||
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.ui.DialogWrapper;
|
||||
import com.intellij.openapi.ui.MessageType;
|
||||
import com.intellij.openapi.ui.popup.Balloon;
|
||||
import com.intellij.openapi.ui.popup.JBPopupFactory;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.ui.awt.RelativePoint;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.event.TreeSelectionEvent;
|
||||
import javax.swing.event.TreeSelectionListener;
|
||||
import java.awt.*;
|
||||
import java.io.IOException;
|
||||
|
||||
class ToolSelectDialog extends DialogWrapper {
|
||||
private final ToolsPanel myToolsPanel = new ToolsPanel();
|
||||
|
||||
protected ToolSelectDialog(@Nullable Project project, ToolBeforeRunTask task) {
|
||||
super(project);
|
||||
myToolsPanel.reset();
|
||||
setOKActionEnabled(myToolsPanel.getSingleSelectedTool() != null);
|
||||
myToolsPanel.addSelectionListener(new TreeSelectionListener() {
|
||||
@Override
|
||||
public void valueChanged(TreeSelectionEvent e) {
|
||||
setOKActionEnabled(myToolsPanel.getSingleSelectedTool() != null);
|
||||
}
|
||||
});
|
||||
init();
|
||||
pack();
|
||||
if(task.getToolActionId() != null){
|
||||
myToolsPanel.selectTool(task.getToolActionId());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doOKAction() {
|
||||
try {
|
||||
myToolsPanel.apply();
|
||||
}
|
||||
catch (IOException e) {
|
||||
String message = ToolsBundle.message("tools.failed.to.save.changes.0", StringUtil.decapitalize(e.getMessage()));
|
||||
final JLayeredPane pane = myToolsPanel.getRootPane().getLayeredPane();
|
||||
JBPopupFactory.getInstance().createHtmlTextBalloonBuilder(message, MessageType.ERROR, null)
|
||||
.setShowCallout(false).setFadeoutTime(3000).setHideOnAction(true).setHideOnClickOutside(true).setHideOnKeyOutside(true).
|
||||
createBalloon().show(new RelativePoint(pane, new Point(pane.getWidth(), 0)), Balloon.Position.above);
|
||||
return;
|
||||
}
|
||||
super.doOKAction();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JComponent createCenterPanel() {
|
||||
return myToolsPanel;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
Tool getSelectedTool() {
|
||||
return myToolsPanel.getSingleSelectedTool();
|
||||
}
|
||||
|
||||
boolean isModified() {
|
||||
return myToolsPanel.isModified();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user