From a6f0399c864916b4b94872642025f41c281868ee Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Wed, 6 Jun 2012 12:52:44 -0700 Subject: Update MoreUnit prefs for new plugin names. Also fix a potential SWT exception. Change-Id: I45758b0ccad0daf4fe3b309cf93b9cd99bb54904 --- .../plugins/com.android.ide.eclipse.adt/.settings/org.moreunit.prefs | 3 +-- .../ide/eclipse/adt/internal/editors/layout/gle2/OutlinePage.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'eclipse') diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.moreunit.prefs b/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.moreunit.prefs index 7400eff..c5e8a5e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.moreunit.prefs +++ b/eclipse/plugins/com.android.ide.eclipse.adt/.settings/org.moreunit.prefs @@ -1,5 +1,4 @@ -#Sat Nov 05 13:00:35 PDT 2011 eclipse.preferences.version=1 org.moreunit.prefixes= -org.moreunit.unitsourcefolder=adt\:src\:adt-tests\:unittests\#adt\:src\:adt-tests\:src +org.moreunit.unitsourcefolder=plugin-adt\:src\:plugin-tests\:unittests\#plugin-adt\:src\:plugin-tests\:src org.moreunit.useprojectsettings=true diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlinePage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlinePage.java index 9261aff..7f407df 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlinePage.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlinePage.java @@ -493,7 +493,7 @@ public class OutlinePage extends ContentOutlinePage mRootWrapper.setRoot(rootViewInfo); TreeViewer tv = getTreeViewer(); - if (tv != null) { + if (tv != null && !tv.getTree().isDisposed()) { Object[] expanded = tv.getExpandedElements(); tv.refresh(); tv.setExpandedElements(expanded); -- cgit v1.1