diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-06-06 12:52:44 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2012-06-06 12:52:44 -0700 |
| commit | a6f0399c864916b4b94872642025f41c281868ee (patch) | |
| tree | 8679d0f4a9ebfe3b1bd39627494ed762b825dde0 /eclipse | |
| parent | 455038d1740083aa5e2b5b0ec852cd81bcc9ce1e (diff) | |
| download | sdk-a6f0399c864916b4b94872642025f41c281868ee.zip sdk-a6f0399c864916b4b94872642025f41c281868ee.tar.gz sdk-a6f0399c864916b4b94872642025f41c281868ee.tar.bz2 | |
Update MoreUnit prefs for new plugin names.
Also fix a potential SWT exception.
Change-Id: I45758b0ccad0daf4fe3b309cf93b9cd99bb54904
Diffstat (limited to 'eclipse')
2 files changed, 2 insertions, 3 deletions
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); |