import static com.android.ide.common.layout.LayoutConstants.ANDROID_URI;
import static com.android.ide.common.layout.LayoutConstants.ATTR_ID;
import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT;
+import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX;
import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH;
import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX;
import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX;
import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT;
import static com.android.ide.eclipse.adt.AndroidConstants.DOT_XML;
-import static com.android.ide.eclipse.adt.AndroidConstants.WS_LAYOUTS;
import static com.android.ide.eclipse.adt.AndroidConstants.WS_SEP;
import static com.android.ide.eclipse.adt.internal.editors.descriptors.XmlnsAttributeDescriptor.XMLNS;
import static com.android.ide.eclipse.adt.internal.editors.descriptors.XmlnsAttributeDescriptor.XMLNS_COLON;
import com.android.ide.eclipse.adt.internal.wizards.newxmlfile.ResourceNameValidator;
import com.android.sdklib.util.Pair;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
+import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
String newFileName = newName + DOT_XML;
IProject project = mCanvas.getLayoutEditor().getProject();
- IFile file = project.getFile(WS_LAYOUTS + WS_SEP + newFileName);
+ IContainer parent = mCanvas.getLayoutEditor().getInputFile().getParent();
+ IPath parentPath = parent.getProjectRelativePath();
+ IFile file = project.getFile(new Path(parentPath + WS_SEP + newFileName));
writeFile(file, sb.toString());
LayoutEditor editor = mCanvas.getLayoutEditor();
editor.getGraphicalEditor().refreshProjectResources();
+ String referenceId = getReferenceId();
+ List<Edit> edits = new ArrayList<Edit>();
+
+ // Replace existing elements in the source file and insert <include>
+ String include = computeIncludeString(newName, androidNsPrefix, referenceId);
+ edits.add(new Edit(start, end, include));
+
+ // Update any layout references to the old id with the new id
+ if (referenceId != null) {
+ String rootId = getRootId();
+ IStructuredModel model = editor.getModelForRead();
+ try {
+ IStructuredDocument doc = model.getStructuredDocument();
+ if (doc != null) {
+ List<Edit> replaceIds = replaceIds(doc, start, end, rootId, referenceId);
+ edits.addAll(replaceIds);
+ }
+ } finally {
+ model.releaseFromRead();
+ }
+ }
+
// Open extracted file. This seems to trigger refreshing of ProjectResources
// such that the @layout/<newName> reference from the new <include> we're adding
// will work; without this we get file reference errors
openFile(file);
- // Replace existing elements in the source file and insert <include>
- replaceWithInclude(newName, start, end, androidNsPrefix);
+ // Perform edits
+ applyEdits("Extract As Include", edits);
+ }
+
+ /** Produce a list of edits to replace references to the given id with the given new id */
+ private List<Edit> replaceIds(IStructuredDocument doc, int skipStart, int skipEnd,
+ String rootId, String referenceId) {
+
+ // We need to search for either @+id/ or @id/
+ String match1 = rootId;
+ String match2;
+ if (match1.startsWith(ID_PREFIX)) {
+ match2 = '"' + NEW_ID_PREFIX + match1.substring(ID_PREFIX.length()) + '"';
+ match1 = '"' + match1 + '"';
+ } else if (match1.startsWith(NEW_ID_PREFIX)) {
+ match2 = '"' + ID_PREFIX + match1.substring(NEW_ID_PREFIX.length()) + '"';
+ match1 = '"' + match1 + '"';
+ } else {
+ return Collections.emptyList();
+ }
+
+ String namePrefix = ANDROID_NS_PREFIX + ':' + ATTR_LAYOUT_PREFIX;
+ List<Edit> edits = new ArrayList<Edit>();
+
+ IStructuredDocumentRegion region = doc.getFirstStructuredDocumentRegion();
+ for (; region != null; region = region.getNext()) {
+ ITextRegionList list = region.getRegions();
+ int regionStart = region.getStart();
+
+ // Look at all attribute values and look for an id reference match
+ String attributeName = ""; //$NON-NLS-1$
+ for (int j = 0; j < region.getNumberOfRegions(); j++) {
+ ITextRegion subRegion = list.get(j);
+ String type = subRegion.getType();
+ if (DOMRegionContext.XML_TAG_ATTRIBUTE_NAME.equals(type)) {
+ attributeName = region.getText(subRegion);
+ } else if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(type)) {
+ // Only replace references in layout attributes
+ if (!attributeName.startsWith(namePrefix)) {
+ continue;
+ }
+ // Skip occurrences in the given skip range
+ int subRegionStart = regionStart + subRegion.getStart();
+ if (subRegionStart >= skipStart && subRegionStart <= skipEnd) {
+ continue;
+ }
+
+ String attributeValue = region.getText(subRegion);
+ if (attributeValue.equals(match1) || attributeValue.equals(match2)) {
+ int start = subRegionStart + 1; // skip quote
+ int end = start + rootId.length();
+ edits.add(new Edit(start, end, referenceId));
+ }
+ }
+ }
+ }
+
+ return edits;
+ }
+
+ /** Returns the id to be used for the include tag itself (may be null) */
+ private String getReferenceId() {
+ String rootId = getRootId();
+ if (rootId != null) {
+ return rootId + "_ref";
+ }
+
+ return null;
+ }
+
+ /** Get the id of the root selected element, if any */
+ private String getRootId() {
+ Element primaryNode = getPrimaryNode();
+ if (primaryNode != null) {
+ String oldId = primaryNode.getAttributeNS(ANDROID_URI, ATTR_ID);
+ if (oldId.length() > 0) {
+ return oldId;
+ }
+ }
+
+ return null;
}
private boolean writeFile(IFile file, String content) {
}
}
- /** Replace existing elements in the source file and insert {@code <include>} */
- private void replaceWithInclude(final String newName, final int start, final int end,
- final String androidNsPrefix) {
- final LayoutEditor editor = mCanvas.getLayoutEditor();
- editor.wrapUndoEditXmlModel("Extract As Include", new Runnable() {
- public void run() {
- IStructuredDocument document = editor.getStructuredDocument();
- if (document != null) {
- String include = computeIncludeString(newName, androidNsPrefix);
- try {
- document.replace(start, end - start, include);
- } catch (BadLocationException e) {
- AdtPlugin.log(e, "Cannot insert <include> tag");
- return;
- }
- }
- }
- });
- }
-
/**
* Compute the actual {@code <include>} string to be inserted in place of the old
* selection
*/
- private String computeIncludeString(String newName, String androidNsPrefix) {
+ private String computeIncludeString(String newName, String androidNsPrefix,
+ String referenceId) {
StringBuilder sb = new StringBuilder();
sb.append("<include layout=\"@layout/"); //$NON-NLS-1$
sb.append(newName);
sb.append('"');
+ // Create new id for the include itself
+ if (referenceId != null) {
+ sb.append(androidNsPrefix);
+ sb.append(':');
+ sb.append(ATTR_ID);
+ sb.append('=').append('"');
+ sb.append(referenceId);
+ sb.append('"').append(' ');
+ }
+
+ // Add id string, unless it's a <merge>, since we may need to adjust any layout
+ // references to apply to the <include> tag instead
+ // TODO: Use refactoring infrastructure to handle this part
+
+ // I should move all the layout_ attributes as well
+ // I also need to duplicate and modify the id and then replace
+ // everything else in the file with this new id...
+
// HACK: see issue 13494: We must duplicate the width/height attributes on the
// <include> statement for designtime rendering only
Element primaryNode = getPrimaryNode();
sb.append(':');
sb.append(ATTR_LAYOUT_WIDTH);
sb.append('=').append('"');
- sb.append(width);
+ sb.append(DescriptorsUtils.toXmlAttributeValue(width));
sb.append('"');
}
if (height != null) {
sb.append(':');
sb.append(ATTR_LAYOUT_HEIGHT);
sb.append('=').append('"');
- sb.append(height);
+ sb.append(DescriptorsUtils.toXmlAttributeValue(height));
sb.append('"');
}
+ // Duplicate all the other layout attributes as well
+ if (primaryNode != null) {
+ NamedNodeMap attributes = primaryNode.getAttributes();
+ for (int i = 0, n = attributes.getLength(); i < n; i++) {
+ Node attr = attributes.item(i);
+ String name = attr.getLocalName();
+ if (name.startsWith(ATTR_LAYOUT_PREFIX)
+ && ANDROID_URI.equals(attr.getNamespaceURI())) {
+ if (name.equals(ATTR_LAYOUT_WIDTH) || name.equals(ATTR_LAYOUT_HEIGHT)) {
+ // Already handled
+ continue;
+ }
+
+ sb.append(' ');
+ sb.append(androidNsPrefix);
+ sb.append(':');
+ sb.append(name);
+ sb.append('=').append('"');
+ sb.append(DescriptorsUtils.toXmlAttributeValue(attr.getNodeValue()));
+ sb.append('"');
+ }
+ }
+ }
+
sb.append("/>");
return sb.toString();
}
try {
IStructuredDocument document = editor.getStructuredDocument();
String xml = document.get(start, end - start);
+ Element primaryNode = getPrimaryNode();
+ xml = stripTopLayoutAttributes(primaryNode, start, xml);
xml = dedent(xml);
// Wrap siblings in <merge>?
- Element primaryNode = getPrimaryNode();
if (primaryNode == null) {
StringBuilder sb = new StringBuilder();
sb.append("<merge>\n"); //$NON-NLS-1$
}
}
+ /** Remove sections of the document that correspond to top level layout attributes;
+ * these are placed on the include element instead */
+ private String stripTopLayoutAttributes(Element primaryNode, int start, String xml) {
+ if (primaryNode != null) {
+ // List of attributes to remove
+ //IndexedRegion attRegion = (IndexedRegion) attrs.item(i);
+ List<IndexedRegion> skip = new ArrayList<IndexedRegion>();
+ NamedNodeMap attributes = primaryNode.getAttributes();
+ for (int i = 0, n = attributes.getLength(); i < n; i++) {
+ Node attr = attributes.item(i);
+ String name = attr.getLocalName();
+ if (name.startsWith(ATTR_LAYOUT_PREFIX)
+ && ANDROID_URI.equals(attr.getNamespaceURI())) {
+ if (name.equals(ATTR_LAYOUT_WIDTH) || name.equals(ATTR_LAYOUT_HEIGHT)) {
+ // These are special and are left in
+ continue;
+ }
+
+ if (attr instanceof IndexedRegion) {
+ skip.add((IndexedRegion) attr);
+ }
+ }
+ }
+ if (skip.size() > 0) {
+ Collections.sort(skip, new Comparator<IndexedRegion>() {
+ // Sort in start order
+ public int compare(IndexedRegion r1, IndexedRegion r2) {
+ return r1.getStartOffset() - r2.getStartOffset();
+ }
+ });
+
+ // Successively cut out the various layout attributes
+ // TODO remove adjacent whitespace too (but not newlines, unless they
+ // are newly adjacent)
+ StringBuilder sb = new StringBuilder(xml.length());
+ int nextStart = 0;
+
+ // Copy out all the sections except the skip sections
+ for (IndexedRegion r : skip) {
+ int regionStart = r.getStartOffset();
+ // Adjust to string offsets since we've copied the string out of
+ // the document
+ regionStart -= start;
+
+ sb.append(xml.substring(nextStart, regionStart));
+
+ nextStart = regionStart + r.getLength();
+ }
+ if (nextStart < xml.length()) {
+ sb.append(xml.substring(nextStart));
+ }
+
+ return sb.toString();
+ }
+ }
+
+ return xml;
+ }
+
private static String getIndent(String line, int max) {
int i = 0;
int n = Math.min(max, line.length());
return Pair.of(start, end);
}
+
+ /** Apply edits into document under an undo lock */
+ private void applyEdits(String label, final List<Edit> edits) {
+ // Process the edits in reverse document position order to ensure
+ // that the offsets aren't affected by other edits
+ Collections.sort(edits);
+ final LayoutEditor editor = mCanvas.getLayoutEditor();
+ editor.wrapUndoEditXmlModel(label, new Runnable() {
+ public void run() {
+ IStructuredDocument document = editor.getStructuredDocument();
+ if (document != null) {
+ try {
+ for (Edit edit : edits) {
+ edit.apply(document);
+ }
+ } catch (BadLocationException e) {
+ AdtPlugin.log(e, "Cannot insert <include> tag");
+ return;
+ }
+ }
+ }
+ });
+ }
+
+ /**
+ * Edit operation (insert, delete, replace) at a given offset - a collection of these
+ * can be sorted in reverse offset order such that they can be applied successively
+ * without having to updated offsets
+ * <p>
+ * TODO: When rewriting this extract operation to the refactoring framework, use
+ * refactoring framework's change list instead
+ */
+ private static class Edit implements Comparable<Edit> {
+ private final int mStart;
+ private final int mEnd;
+ private final String mReplaceWith;
+
+ public Edit(int start, int end, String replaceWith) {
+ super();
+ mStart = start;
+ mEnd = end;
+ mReplaceWith = replaceWith;
+ }
+
+ void apply(IStructuredDocument document) throws BadLocationException {
+ document.replace(mStart, mEnd - mStart, mReplaceWith);
+ }
+
+ public int compareTo(Edit o) {
+ // Sort in *reverse* offset order
+ return o.mStart - mStart;
+ }
+
+ @Override
+ public String toString() {
+ return "Edit [start=" + mStart + ", end=" + mEnd + ", replaceWith=" + mReplaceWith
+ + "]";
+ }
+ }
}
OSDN Git Service
