I changed the class so all the addEdit calls are all done after
insertUpdate is called. This fixes some mauve regressions.
2006-01-13 Lillian Angel <[EMAIL PROTECTED]>
* javax/swing/text/DefaultStyledDocument.java
(Edit): New inner class.
(changeUpdate): Changed addEdit call to add a new
instance of Edit to the edits Vector, so addEdits can
be done later.
(split): Likewise.
(insertParagraph): Likewise.
(insertFracture): Likewise.
(insertContentTag): Likewise.
(insert): Added loop to go through edits Vector and perform
addEdit on each object.
Index: javax/swing/text/DefaultStyledDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/DefaultStyledDocument.java,v
retrieving revision 1.36
diff -u -r1.36 DefaultStyledDocument.java
--- javax/swing/text/DefaultStyledDocument.java 13 Jan 2006 16:20:51 -0000 1.36
+++ javax/swing/text/DefaultStyledDocument.java 13 Jan 2006 19:26:34 -0000
@@ -410,6 +410,33 @@
return b.toString();
}
}
+
+ /**
+ * Instance of all editing information for an object in
+ * the Vector.
+ */
+ class Edit
+ {
+ /** The element to edit . */
+ Element e;
+
+ /** The index of the change. */
+ int index;
+
+ /** The removed elements. */
+ Element[] removed;
+
+ /** The added elements. */
+ Element[] added;
+
+ public Edit(Element e, int i, Element[] removed, Element[] added)
+ {
+ this.e = e;
+ this.index = i;
+ this.removed = removed;
+ this.added = added;
+ }
+ }
/**
* Performs all <em>structural</code> changes to the <code>Element</code>
@@ -594,7 +621,7 @@
added = new Element[]{ res[0], res[1] };
}
par.replace(index, removed.length, added);
- addEdit(par, index, removed, added);
+ edits.add(new Edit(par, index, removed, added));
}
int endOffset = offset + length;
@@ -617,7 +644,7 @@
added = new Element[]{ res[0], res[1] };
}
par.replace(index, removed.length, added);
- addEdit(par, index, removed, added);
+ edits.add(new Edit(par, index, removed, added));
}
}
@@ -683,7 +710,7 @@
}
((BranchElement) el).replace(index, removed.length, added);
- addEdit(el, index, removed, added);
+ edits.add(new Edit(el, index, removed, added));
BranchElement newPar =
(BranchElement) createBranchElement(el.getParentElement(),
el.getAttributes());
@@ -698,7 +725,7 @@
added = new Element[0];
((BranchElement) el).replace(index, removed.length,
added);
- addEdit(el, index, removed, added);
+ edits.add(new Edit(el, index, removed, added));
BranchElement newPar =
(BranchElement) createBranchElement(el.getParentElement(),
el.getAttributes());
@@ -742,10 +769,18 @@
this.endOffset = offset + length;
documentEvent = ev;
// Push the root and the paragraph at offset onto the element stack.
+ edits.clear();
elementStack.clear();
elementStack.push(root);
elementStack.push(root.getElement(root.getElementIndex(offset)));
insertUpdate(data);
+
+ int size = edits.size();
+ for (int i = 0; i < size; i++)
+ {
+ Edit curr = (Edit) edits.get(i);
+ addEdit(curr.e, curr.index, curr.removed, curr.added);
+ }
}
/**
@@ -779,9 +814,8 @@
(grandParent.getElementIndex(parent.getEndOffset()));
Element firstLeaf = nextBranch.getElement(0);
while (!firstLeaf.isLeaf())
- {
firstLeaf = firstLeaf.getElement(0);
- }
+
BranchElement parent2 = (BranchElement) firstLeaf.getParentElement();
Element newEl2 =
createLeafElement(parent2,
@@ -789,7 +823,6 @@
offset, firstLeaf.getEndOffset());
parent2.replace(0, 1, new Element[] { newEl2 });
-
((BranchElement) parent).
replace(index, 1, new Element[] { newEl1 });
}
@@ -869,14 +902,14 @@
}
}
par.replace(index, removed.length, added);
- addEdit(par, index, removed, added);
+ edits.add(new Edit(par, index, removed, added));
}
else
{
ret = createBranchElement(par, null);
Element[] added = new Element[]{ ret };
par.replace(index, 0, added);
- addEdit(par, index, new Element[0], added);
+ edits.add(new Edit(par, index, new Element[0], added));
}
return ret;
}
@@ -941,7 +974,7 @@
for (int i = 1; i < numReplaced; i++)
newLeaves[i] = previous.getElement(previousIndex + i);
newBranch.replace(0, 0, newLeaves);
- addEdit(newBranch, 0, null, newLeaves);
+ edits.add(new Edit(newBranch, 0, null, newLeaves));
// Now we remove the children after the offset from the previous
// paragraph. (Step 3).
@@ -951,13 +984,13 @@
for (int j = 0; j < removeSize; j++)
remove[j] = previous.getElement(previousIndex + j);
previous.replace(previousIndex, removeSize, add);
- addEdit(previous, previousIndex, remove, add);
+ edits.add(new Edit(previous, previousIndex, remove, add));
// Finally we add the new paragraph to the parent. (Step 5).
Element[] nb = new Element[] { newBranch };
int index = parentIndex + 1;
parent.replace(index, 0, nb);
- addEdit(parent, index, null, nb);
+ edits.add(new Edit(parent, index, null, nb));
}
/**
@@ -1008,7 +1041,7 @@
next.getEndOffset());
Element[] add = new Element[] { newEl1, newEl2 };
paragraph.replace (index, 2, add);
- addEdit(paragraph, index, new Element[] { target, next }, add);
+ edits.add(new Edit(paragraph, index, new Element[] { target, next }, add));
}
}
else if (dir == ElementSpec.OriginateDirection)
@@ -1061,7 +1094,7 @@
added[2] = splitRes[1];
}
paragraph.replace(index, removed.length, added);
- addEdit(paragraph, index, removed, added);
+ edits.add(new Edit(paragraph, index, removed, added));
}
offset += len;
}
@@ -1235,6 +1268,9 @@
* Listens for changes on this document's styles and notifies styleChanged().
*/
private StyleChangeListener styleChangeListener;
+
+ /** Vector that contains all the edits. */
+ Vector edits = new Vector();
/**
* Creates a new <code>DefaultStyledDocument</code>.
_______________________________________________
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
