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

error sign instead of error border

Browse Source
This commit is contained in:
Konstantin Bulenkov
2010-12-29 15:06:49 +03:00
parent 311f959795
commit a4c17eef83
3 changed files with 78 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/icons/src/ide/errorPoint.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 182 B

platform/icons/src/ide/errorSign.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 705 B

platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+78 -74
View File
@@ -25,6 +25,8 @@ import com.intellij.openapi.help.HelpManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.StackingPopupDispatcher;
import com.intellij.openapi.util.*;
import com.intellij.openapi.wm.IdeGlassPaneUtil;
import com.intellij.openapi.wm.impl.content.GraphicsConfig;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.UIBundle;
import com.intellij.util.Alarm;
@@ -33,6 +35,7 @@ import com.intellij.util.ui.AwtVisitor;
import com.intellij.util.ui.DialogUtil;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -193,11 +196,11 @@ public abstract class DialogWrapper {
//validation
private final Alarm myValidationAlarm = new Alarm(myDisposable);
private int myValidationDelay = 300;
private static final String OLD_BORDER = "OLD_BORDER";
private JComponent myLastErrorComponent = null;
private boolean myDisposed = false;
private Boolean myLastPaintButtonBorder = null;
private boolean myValidationStarted = false;
private Icon ERROR_POINT = IconLoader.getIcon("/ide/errorPoint.png");
private Icon ERROR_SIGN = IconLoader.getIcon("/ide/errorSign.png");
private final ErrorPainter myErrorPainter = new ErrorPainter();
/**
* Allows to postpone first start of validation
@@ -219,80 +222,30 @@ public abstract class DialogWrapper {
return null;
}
/**
* Controls components highlighting
*
* @return <code>true</code> for problem components highlighting. <code>false</code> otherwise.
*/
protected boolean isShowErrorBorder() {
return true;
}
/**
* Specifies border color for error highlighting
*
* @return color for error highlighting
*/
protected Color getErrorColor() {
return Color.RED;
}
public void setValidationDelay(int delay) {
myValidationDelay = delay;
}
private void reportProblem(final String message, final JComponent comp) {
private void reportProblem(final ValidationInfo info) {
myErrorPainter.setValidationInfo(info);
if (! info.message.equals(myErrorText.myLabel.getText())) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
if (myDisposed) return;
if (isShowErrorBorder()) {
if (myLastErrorComponent != comp) {
if (myLastErrorComponent != null) {
myLastErrorComponent.setBorder((Border)myLastErrorComponent.getClientProperty(OLD_BORDER));
if (myLastErrorComponent instanceof AbstractButton && myLastPaintButtonBorder != null) {
((AbstractButton)myLastErrorComponent).setBorderPainted(myLastPaintButtonBorder);
}
}
myLastErrorComponent = comp;
if (comp != null) {
if (comp instanceof AbstractButton) {
myLastPaintButtonBorder = ((AbstractButton)comp).isBorderPainted();
((AbstractButton)comp).setBorderPainted(true);
}
final Object border = comp.getClientProperty(OLD_BORDER);
if (border == null) {
comp.putClientProperty(OLD_BORDER, comp.getBorder());
}
comp.setBorder(BorderFactory.createLineBorder(getErrorColor(), 1));
}
}
}
setErrorText(message);
setErrorText(info.message);
myPeer.getRootPane().getGlassPane().repaint();
getOKAction().setEnabled(false);
}
});
}
}
private void clearProblems() {
myErrorPainter.setValidationInfo(null);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
if (myDisposed) return;
setErrorText(null);
myPeer.getRootPane().getGlassPane().repaint();
getOKAction().setEnabled(true);
//if (myLastPeerSize != null) {
// myPeer.setSize(myLastPeerSize.width, myLastPeerSize.height);
// myLastPeerSize = null;
//}
if (myLastErrorComponent != null) {
myLastErrorComponent.setBorder((Border)myLastErrorComponent.getClientProperty(OLD_BORDER));
if (myLastPaintButtonBorder != null && myLastErrorComponent instanceof AbstractButton) {
((AbstractButton)myLastErrorComponent).setBorderPainted(myLastPaintButtonBorder);
}
myLastErrorComponent = null;
myLastPaintButtonBorder = null;
}
}
});
}
@@ -924,7 +877,9 @@ public abstract class DialogWrapper {
final JComponent c = createCenterPanel();
if (c != null) {
centerSection.add(wrap(c, isCenterStrictedToPreferredSize()), BorderLayout.CENTER);
final JComponent wrap = wrap(c, isCenterStrictedToPreferredSize());
centerSection.add(wrap, BorderLayout.CENTER);
IdeGlassPaneUtil.installPainter(wrap, myErrorPainter, myDisposable);
}
final JPanel southSection = new JPanel(new BorderLayout());
@@ -961,7 +916,7 @@ public abstract class DialogWrapper {
if (result == null) {
clearProblems();
} else {
reportProblem(result.message, result.component);
reportProblem(result);
}
if (!myDisposed) {
@@ -971,17 +926,6 @@ public abstract class DialogWrapper {
}, myValidationDelay, ModalityState.current());
}
public static final class ValidationInfo {
public final String message;
public final JComponent component;
public ValidationInfo(String message, JComponent component) {
this.message = message;
this.component = component;
}
}
private static JComponent wrap(final JComponent c, boolean strict) {
if (!strict) return c;
@@ -1521,4 +1465,64 @@ public abstract class DialogWrapper {
String getDoNotShowMessage();
}
private ErrorPaintingType getErrorPaintingType() {
return ErrorPaintingType.SIGN;
}
private class ErrorPainter extends AbstractPainter {
private ValidationInfo myInfo;
@Override
public void executePaint(Component component, Graphics2D g) {
if (myInfo != null && myInfo.component != null) {
final JComponent comp = myInfo.component;
final int w = comp.getWidth();
final int h = comp.getHeight();
Point p;
switch (getErrorPaintingType()) {
case DOT:
p = SwingUtilities.convertPoint(comp, 2, h/2 , component);
ERROR_POINT.paintIcon(component, g, p.x, p.y);
break;
case SIGN:
p = SwingUtilities.convertPoint(comp, w, 0, component);
ERROR_SIGN.paintIcon(component, g, p.x - 8, p.y - 8);
break;
case LINE:
p = SwingUtilities.convertPoint(comp, 0, h, component);
final GraphicsConfig config = new GraphicsConfig(g);
g.setColor(new Color(255, 0, 0 , 100));
g.fillRoundRect(p.x, p.y-2, w, 4, 2, 2);
config.restore();
break;
}
}
}
@Override
public boolean needsRepaint() {
return true;
}
public void setValidationInfo(ValidationInfo info) {
myInfo = info;
}
}
private static enum ErrorPaintingType {DOT, SIGN, LINE}
public static final class ValidationInfo {
public final String message;
public final JComponent component;
public ValidationInfo(@NotNull String message, JComponent component) {
this.message = message;
this.component = component;
}
public ValidationInfo(@NotNull String message) {
this(message, null);
}
}
}