LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADT Manifest Editor: Fix for uses-sdk dup that won't go away.

Browse Source 
It was a display issue only, meaning the actual XML node was
being deleted but the Ui model was not updated properly. The
actual cause is that this is a mandatory node, and mandatory
nodes must stay as "fake nodes" in the Ui model. However
only one such node needs to stay in the hierarchy.

SDK BUG 2147112

Change-Id: I68e3d343bb95169865ad8dcad77004cbd51fafc3
This commit is contained in:
Raphael
2009-10-01 12:32:56 -07:00
parent 657bdd7d28
commit 2ace885b29
2 changed files with 87 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/ui/tree/UiTreeBlock.java
View File

@@ -526,7 +526,6 @@ public final class UiTreeBlock extends MasterDetailsBlock implements ICommitXml
// Append "add" and "remove" actions. They do the same thing as the add/remove
// buttons on the side.
Action action;
IconFactory factory = IconFactory.getInstance();
// "Add" makes sense only if there's 0 or 1 item selected since the

40
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiElementNode.java
View File

@@ -926,7 +926,8 @@ public class UiElementNode implements IPropertySource {
* Internal helper to remove an UI child node given by its index in the
* internal child list.
*
* Also invokes the update listener on the node to be deleted.
* Also invokes the update listener on the node to be deleted *after* the node has
* been removed.
*
* @param ui_index The index of the UI child to remove, range 0 .. mUiChildren.size()-1
* @return True if the structure has changed
@@ -935,19 +936,46 @@ public class UiElementNode implements IPropertySource {
*/
private boolean removeUiChildAtIndex(int ui_index) {
UiElementNode ui_node = mUiChildren.get(ui_index);
invokeUiUpdateListeners(UiUpdateState.DELETED);
ElementDescriptor desc = ui_node.getDescriptor();
try {
if (ui_node.getDescriptor().isMandatory()) {
// We can't remove a mandatory node, we just clear its content.
// This is a mandatory node. Such a node must exist in the UiNode hierarchy
// even if there's no XML counterpart. However we only need to keep one.
// Check if the parent (e.g. this node) has another similar ui child node.
boolean keepNode = true;
for (UiElementNode child : mUiChildren) {
if (child != ui_node && child.getDescriptor() == desc) {
// We found another child with the same descriptor that is not
// the node we want to remove. This means we have one mandatory
// node so we can safely remove ui_node.
keepNode = false;
break;
}
}
if (keepNode) {
// We can't remove a mandatory node as we need to keep at least one
// mandatory node in the parent. Instead we just clear its content
// (including its XML Node reference).
// A mandatory node with no XML means it doesn't really exist, so it can't be
// deleted.
// deleted. So the structure will change only if the ui node is actually
// associated to an XML node.
boolean xml_exists = (ui_node.getXmlNode() != null);
ui_node.clearContent();
return xml_exists;
} else {
}
}
mUiChildren.remove(ui_index);
return true;
} finally {
// Tell listeners that a node has been removed.
// The model has already been modified.
invokeUiUpdateListeners(UiUpdateState.DELETED);
}
}
@@ -1077,7 +1105,7 @@ public class UiElementNode implements IPropertySource {
}
/**
* Invoke all registered {@link IUiUpdateListener} listening on this UI updates for this node.
* Invoke all registered {@link IUiUpdateListener} listening on this UI update for this node.
*/
protected void invokeUiUpdateListeners(UiUpdateState state) {
if (mUiUpdateListeners != null) {