From 573418645b973d9fc89f0e8b51d4660d14f9980e Mon Sep 17 00:00:00 2001 From: Alexander Lobas Date: Fri, 1 Jun 2012 16:11:48 +0400 Subject: [PATCH] Inspections --- .../designer/designSurface/DesignerEditorPanel.java | 8 ++++++++ .../designer/designSurface/tools/SelectionTool.java | 1 + .../designer/designSurface/tools/ToolProvider.java | 2 ++ 3 files changed, 11 insertions(+) diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java index 6f9520fbb573..93b235c2f877 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java @@ -227,6 +227,9 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider if (getActiveTool() instanceof CreationTool && !(tool instanceof CreationTool)) { PaletteManager.getInstance(getProject()).clearActiveItem(); } + if (!(tool instanceof SelectionTool)) { + hideInspections(); + } super.setActiveTool(tool); } @@ -255,6 +258,11 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider myInplaceEditingLayer.startEditing(inplaceContext); } + @Override + public void hideInspections() { + myQuickFixManager.hideHint(); + } + @Override public void showError(@NonNls String message, Throwable e) { DesignerEditorPanel.this.showError(message, e); diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTool.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTool.java index 077c881ebca9..07b4583f667f 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTool.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTool.java @@ -116,6 +116,7 @@ public class SelectionTool extends InputTool { refreshCursor(); if (myTracker != null) { + myToolProvider.hideInspections(); myTracker.setToolProvider(myToolProvider); myTracker.setArea(myArea); myTracker.activate(); diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java index a1827e4f8a74..c145c59a8c07 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java @@ -136,4 +136,6 @@ public abstract class ToolProvider { public abstract void execute(List operations, String command); public abstract void startInplaceEditing(@Nullable InplaceContext inplaceContext); + + public abstract void hideInspections(); } \ No newline at end of file