summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLillian Angel <langel@redhat.com>2006-01-20 19:28:39 +0000
committerLillian Angel <langel@redhat.com>2006-01-20 19:28:39 +0000
commit0bd88a0ce8c6bfe84cf419b6867c3c4e1135213d (patch)
treec21cdc4947165b7c2e26a7ac2282fe90edd64785
parent6bc9c943ca7c4044b4cf5160efe89dde573c1a04 (diff)
downloadclasspath-0bd88a0ce8c6bfe84cf419b6867c3c4e1135213d.tar.gz
2006-01-20 Lillian Angel <langel@redhat.com>
* javax/swing/text/DefaultStyledDocument.java (pad): Removed, not needed. (printElements): Likewise. (printEdit): Likewise.
-rw-r--r--ChangeLog7
-rw-r--r--javax/swing/text/DefaultStyledDocument.java78
2 files changed, 8 insertions, 77 deletions
diff --git a/ChangeLog b/ChangeLog
index d5d7c6ad8..a4b56a218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-20 Lillian Angel <langel@redhat.com>
+
+ * javax/swing/text/DefaultStyledDocument.java
+ (pad): Removed, not needed.
+ (printElements): Likewise.
+ (printEdit): Likewise.
+
2006-01-20 Roman Kennke <kennke@aicas.com>
* javax/swing/text/DefaultFormatter.java
diff --git a/javax/swing/text/DefaultStyledDocument.java b/javax/swing/text/DefaultStyledDocument.java
index 8e0673ae1..7b26b1eb3 100644
--- a/javax/swing/text/DefaultStyledDocument.java
+++ b/javax/swing/text/DefaultStyledDocument.java
@@ -67,44 +67,7 @@ import javax.swing.undo.UndoableEdit;
public class DefaultStyledDocument extends AbstractDocument
implements StyledDocument
{
- // Prints some spaces.
- // This is just debugging code that will be used temporarily.
- static void pad(int pad)
- {
- for (int i = 0; i < pad; i++)
- System.out.print(" ");
- }
-
- // Displays the Element hierarchy starting with <code>start</code>.
- // This is just debugging code that will be used temporarily.
- static void printElements (Element start, int pad)
- {
- pad(pad);
- if (pad == 0)
- System.out.println ("ROOT ELEMENT ("+start.getStartOffset()+", "
- + start.getEndOffset()+")");
- else if (start instanceof AbstractDocument.BranchElement)
- System.out.println ("BranchElement ("+start.getStartOffset()+", "
- + start.getEndOffset()+")");
- else
- {
- try
- {
- System.out.println ("LeafElement ("+start.getStartOffset()+", "
- + start.getEndOffset()+"): "
- + start.getAttributes().getAttributeCount() + ": "
- + start.getDocument().
- getText(start.getStartOffset(),
- start.getEndOffset() -
- start.getStartOffset()));
- }
- catch (BadLocationException ble)
- {
- }
- }
- for (int i = 0; i < start.getElementCount(); i ++)
- printElements (start.getElement(i), pad+3);
- }
+
/**
* An {@link UndoableEdit} that can undo attribute changes to an element.
*
@@ -1092,45 +1055,6 @@ public class DefaultStyledDocument extends AbstractDocument
}
/**
- * This is a debugging method. Since we don't apply changes immediately
- * this method is helpful for debugging purposes so you can tell what the
- * tree will look like after all edits are applied.
- */
- void printPendingEdits()
- {
- int size = edits.size();
- System.out.println ("PENDING EDITS");
- for (int i = 0; i < size; i++)
- {
- Edit edit = (Edit)edits.elementAt(i);
- if (edit.e.isLeaf() || edit.e.getElementCount() > 0)
- System.out.print(printElement(edit.e));
- System.out.println("starting offset: "+edit.index);
- if (edit.added != null)
- for (int k = 0; k < edit.added.size(); k ++)
- System.out.println ("added: "+printElement((Element)edit.added.elementAt(k)));
- if (edit.removed != null)
- for (int k = 0; k < edit.removed.size(); k ++)
- System.out.println ("removed: "+printElement((Element)edit.removed.elementAt(k)));
- }
- System.out.println ("END PENDING EDITS");
- }
-
- /**
- * This is a helper method for debugging. To avoid NPE we can't just
- * print BranchElements because they may have no children. So this
- * method prints Elements and handles the case of BranchElements with
- * no children.
- * @param e the Element to print
- * @return a String describing the given Element
- */
- String printElement (Element e)
- {
- if (e.isLeaf() || e.getElementCount() > 0)
- return e.toString();
- return "BranchElement with no children";
- }
- /**
* Inserts a content element into the document structure.
*
* @param tag the element spec