From 35c785d38f437db09e4d8a2e7564e8535432863a Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Fri, 10 Jun 2011 11:17:16 -0700 Subject: [PATCH] Fix excludes in the change layout/widget refactoring dialogs Change-Id: Ib1564f7528d36182071427b795f9e15da64ffc7a --- .../internal/editors/layout/refactoring/ChangeLayoutWizard.java | 4 ++++ .../internal/editors/layout/refactoring/ChangeViewWizard.java | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutWizard.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutWizard.java index 04da01d5a..ac920ebf0 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutWizard.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutWizard.java @@ -18,7 +18,9 @@ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; import static com.android.ide.common.layout.LayoutConstants.FQCN_RELATIVE_LAYOUT; import static com.android.ide.common.layout.LayoutConstants.RELATIVE_LAYOUT; +import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; +import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_MERGE; import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditor; import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.ViewElementDescriptor; @@ -108,6 +110,8 @@ class ChangeLayoutWizard extends VisualRefactoringWizard { // RelativeLayout at the root. Set exclude = new HashSet(); exclude.add(VIEW_INCLUDE); + exclude.add(VIEW_MERGE); + exclude.add(VIEW_FRAGMENT); boolean oldIsRelativeLayout = mOldType.equals(FQCN_RELATIVE_LAYOUT); if (oldIsRelativeLayout) { exclude.add(mOldType); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewWizard.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewWizard.java index 1372006c3..f235cf677 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewWizard.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewWizard.java @@ -16,8 +16,11 @@ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; +import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.REQUEST_FOCUS; +import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; +import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; + import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditor; -import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors; import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.ViewElementDescriptor; import com.android.ide.eclipse.adt.internal.editors.layout.gle2.CustomViewFinder; import com.android.ide.eclipse.adt.internal.editors.layout.gre.ViewMetadataRepository; @@ -152,7 +155,9 @@ class ChangeViewWizard extends VisualRefactoringWizard { targetData.getLayoutDescriptors().getViewDescriptors(); for (ViewElementDescriptor d : descriptors) { String className = d.getFullClassName(); - if (className.equals(LayoutDescriptors.VIEW_INCLUDE)) { + if (className.equals(VIEW_INCLUDE) + || className.equals(VIEW_FRAGMENT) + || className.equals(REQUEST_FOCUS)) { continue; } combo.add(d.getUiName()); -- 2.11.0