diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-10-22 19:47:35 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2012-10-22 19:59:37 -0700 |
| commit | 329f33dfd3ca8eea76c0e005c25119fae35ada8f (patch) | |
| tree | 3474969958411c80322d30cc70780cc593e6c262 /eclipse/plugins | |
| parent | 896b6100561820feb931ad054e8ca6ef1bad746b (diff) | |
| download | sdk-329f33dfd3ca8eea76c0e005c25119fae35ada8f.zip sdk-329f33dfd3ca8eea76c0e005c25119fae35ada8f.tar.gz sdk-329f33dfd3ca8eea76c0e005c25119fae35ada8f.tar.bz2 | |
More gracefully handle restarting IDE with deleted files
Change-Id: I024103c1456a88f230db9b9d5aaf0fe2126a315e
Diffstat (limited to 'eclipse/plugins')
2 files changed, 7 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditorDelegate.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditorDelegate.java index a07e55e..1015d7d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditorDelegate.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditorDelegate.java @@ -261,6 +261,9 @@ public class LayoutEditorDelegate extends CommonXmlDelegate if (input instanceof FileEditorInput) { FileEditorInput fileInput = (FileEditorInput)input; editedFile = fileInput.getFile(); + if (!editedFile.isAccessible()) { + return; + } } else { AdtPlugin.log(IStatus.ERROR, "Input is not of type FileEditorInput: %1$s", //$NON-NLS-1$ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutWindowCoordinator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutWindowCoordinator.java index d40af29..56b86aa 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutWindowCoordinator.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutWindowCoordinator.java @@ -232,7 +232,10 @@ public class LayoutWindowCoordinator implements IPartListener2 { * * @param editor the editor to sync */ - private void sync(GraphicalEditorPart editor) { + private void sync(@Nullable GraphicalEditorPart editor) { + if (editor == null) { + return; + } if (mEditorMaximized) { editor.showStructureViews(true /*outline*/, true /*properties*/, true /*layout*/); } else if (mOutlineOpen) { |