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

OC-9871

Browse Source
This commit is contained in:
Alexander Lobas
2014-05-14 16:58:43 +04:00
parent fd6d2fa644
commit 6da5c0cede
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
+11 -5
View File
@@ -45,6 +45,7 @@ import com.intellij.openapi.ui.ThreeComponentsSplitter;
import com.intellij.openapi.ui.VerticalFlowLayout;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -140,6 +141,8 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
private AsyncProcessIcon myProgressIcon;
private JLabel myProgressMessage;
protected String myLastExecuteCommand;
public DesignerEditorPanel(@NotNull DesignerEditor editor, @NotNull Project project, @NotNull Module module, @NotNull VirtualFile file) {
myEditor = editor;
myProject = project;
@@ -369,9 +372,9 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
return new Attachment[]{AttachmentFactory.createAttachment(myFile)};
}
protected abstract void configureError(final @NotNull ErrorInfo info);
protected abstract void configureError(@NotNull ErrorInfo info);
protected void showErrorPage(final ErrorInfo info) {
protected void showErrorPage(ErrorInfo info) {
storeState();
hideProgress();
myRootComponent = null;
@@ -1066,17 +1069,19 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
@Override
public boolean execute(final ThrowableRunnable<Exception> operation, String command, final boolean updateProperties) {
final boolean[] is = {true};
myLastExecuteCommand = command;
final Ref<Boolean> result = Ref.create(Boolean.TRUE);
CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
public void run() {
is[0] = DesignerEditorPanel.this.execute(operation, updateProperties);
result.set(DesignerEditorPanel.this.execute(operation, updateProperties));
}
}, command, null);
return is[0];
return result.get();
}
@Override
public void executeWithReparse(final ThrowableRunnable<Exception> operation, String command) {
myLastExecuteCommand = command;
CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
public void run() {
DesignerEditorPanel.this.executeWithReparse(operation);
@@ -1086,6 +1091,7 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
@Override
public void execute(final List<EditOperation> operations, String command) {
myLastExecuteCommand = command;
CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
public void run() {
DesignerEditorPanel.this.execute(operations);