procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported GNU Classpath gcj-import-20051117.

Browse source 
* gnu/java/net/protocol/file/Connection.java: Removed, fully merged.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r107153
This commit is contained in:
Mark Wielaard 2005-11-18 00:59:33 +00:00
commit ca9e049bc1
102 changed files with 6716 additions and 1722 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libjava/classpath/javax/swing/text/AbstractDocument.java
View file

@ -672,20 +672,8 @@ public abstract class AbstractDocument implements Document, Serializable
new DefaultDocumentEvent(offset, length,
DocumentEvent.EventType.REMOVE);
// Here we set up the parameters for an ElementChange, if one
// needs to be added to the DocumentEvent later
Element root = getDefaultRootElement();
int start = root.getElementIndex(offset);
int end = root.getElementIndex(offset + length);
Element[] removed = new Element[end - start + 1];
for (int i = start; i <= end; i++)
removed[i - start] = root.getElement(i);
removeUpdate(event);
Element[] added = new Element[1];
added[0] = root.getElement(start);
boolean shouldFire = content.getString(offset, length).length() != 0;
writeLock();
@ -694,17 +682,6 @@ public abstract class AbstractDocument implements Document, Serializable
postRemoveUpdate(event);
GapContent.UndoRemove changes = null;
if (content instanceof GapContent)
changes = (GapContent.UndoRemove) temp;
if (changes != null && !(start == end))
{
// We need to add an ElementChange to our DocumentEvent
ElementEdit edit = new ElementEdit (root, start, removed, added);
event.addEdit(edit);
}
if (shouldFire)
fireRemoveUpdate(event);
}
@ -2143,7 +2120,10 @@ public abstract class AbstractDocument implements Document, Serializable
*/
public String getName()
{
return ContentElementName;
String name = super.getName();
if (name == null)
name = ContentElementName;
return name;
}
/**