Index: src/main/java/common/javax/swing/table/AbstractTableModel.java =================================================================== --- src/main/java/common/javax/swing/table/AbstractTableModel.java (revision 467351) +++ src/main/java/common/javax/swing/table/AbstractTableModel.java (working copy) @@ -58,7 +58,7 @@ return result < getColumnCount() ? result : -1; } - public Class getColumnClass(final int columnIndex) { + public Class getColumnClass(final int columnIndex) { return Object.class; } Index: src/main/java/common/javax/swing/table/DefaultTableColumnModel.java =================================================================== --- src/main/java/common/javax/swing/table/DefaultTableColumnModel.java (revision 467351) +++ src/main/java/common/javax/swing/table/DefaultTableColumnModel.java (working copy) @@ -114,7 +114,7 @@ return tableColumns.size(); } - public Enumeration getColumns() { + public Enumeration getColumns() { return Collections.enumeration(tableColumns); } Index: src/main/java/common/javax/swing/text/AbstractDocument.java =================================================================== --- src/main/java/common/javax/swing/text/AbstractDocument.java (revision 467351) +++ src/main/java/common/javax/swing/text/AbstractDocument.java (working copy) @@ -192,7 +192,7 @@ return attrs.getAttributeCount(); } - public Enumeration getAttributeNames() { + public Enumeration getAttributeNames() { return attrs.getAttributeNames(); } @@ -267,7 +267,7 @@ attrs = context.removeAttributes(attrs, attrSet); } - public void removeAttributes(final Enumeration attrNames) { + public void removeAttributes(final Enumeration attrNames) { checkWriteLock(); attrs = context.removeAttributes(attrs, attrNames); Index: src/main/java/common/javax/swing/text/GapContent.java =================================================================== --- src/main/java/common/javax/swing/text/GapContent.java (revision 467351) +++ src/main/java/common/javax/swing/text/GapContent.java (working copy) @@ -238,10 +238,12 @@ protected void replace(final int position, final int rmSize, final Object addItems, final int addSize) - throws BadLocationException { - - removeItems(position, rmSize); - insertItems(position, addItems, addSize); + { + try { + removeItems(position, rmSize); + insertItems(position, addItems, addSize); + } catch (BadLocationException e) { + } } protected void resetMarksAtZero() { Index: src/main/java/common/javax/swing/text/SimpleAttributeSet.java =================================================================== --- src/main/java/common/javax/swing/text/SimpleAttributeSet.java (revision 467351) +++ src/main/java/common/javax/swing/text/SimpleAttributeSet.java (working copy) @@ -107,7 +107,7 @@ return hashtable.size(); } - public Enumeration getAttributeNames() { + public Enumeration getAttributeNames() { return hashtable.keys(); } @@ -163,7 +163,7 @@ } } - public void removeAttributes(final Enumeration names) { + public void removeAttributes(final Enumeration names) { while (names.hasMoreElements()) { removeAttribute(names.nextElement()); } Index: src/main/java/common/javax/swing/text/StyleContext.java =================================================================== --- src/main/java/common/javax/swing/text/StyleContext.java (revision 467351) +++ src/main/java/common/javax/swing/text/StyleContext.java (working copy) @@ -110,7 +110,7 @@ return attrs.getAttributeCount(); } - public Enumeration getAttributeNames() { + public Enumeration getAttributeNames() { return attrs.getAttributeNames(); } @@ -155,7 +155,7 @@ fireStateChanged(); } - public void removeAttributes(final Enumeration names) { + public void removeAttributes(final Enumeration names) { attrs = StyleContext.this.removeAttributes(attrs, names); fireStateChanged(); } @@ -289,7 +289,7 @@ return attributes.length / 2; } - public Enumeration getAttributeNames() { + public Enumeration getAttributeNames() { return new Enumeration() { private int count = 0; @@ -641,7 +641,7 @@ } public synchronized AttributeSet removeAttributes(final AttributeSet old, - final Enumeration names) { + final Enumeration names) { attrSet.addAttributes(old); attrSet.removeAttributes(names); Index: src/main/java/common/javax/swing/tree/AbstractLayoutCache.java =================================================================== --- src/main/java/common/javax/swing/tree/AbstractLayoutCache.java (revision 467351) +++ src/main/java/common/javax/swing/tree/AbstractLayoutCache.java (working copy) @@ -532,15 +532,15 @@ return correspondingNode != null ? correspondingNode.getTotalChildrenCount() : 0; } - Enumeration getVisiblePathsFromImpl(final TreePath path) { + Enumeration getVisiblePathsFromImpl(final TreePath path) { if (!isModelPath(path) || !isRoot(path) && !isVisible(path)) { return null; } - return new Enumeration() { + return new Enumeration() { private TreePath currentPath = path; - public Object nextElement() { + public TreePath nextElement() { if (currentPath == null) { throw new NoSuchElementException(); } Index: src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java =================================================================== --- src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java (revision 467351) +++ src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java (working copy) @@ -148,7 +148,7 @@ return getVisibleChildCountImpl(path); } - public Enumeration getVisiblePathsFrom(final TreePath path) { + public Enumeration getVisiblePathsFrom(final TreePath path) { return getVisiblePathsFromImpl(path); } Index: src/main/java/common/javax/swing/tree/VariableHeightLayoutCache.java =================================================================== --- src/main/java/common/javax/swing/tree/VariableHeightLayoutCache.java (revision 467351) +++ src/main/java/common/javax/swing/tree/VariableHeightLayoutCache.java (working copy) @@ -251,7 +251,7 @@ } } - public Enumeration getVisiblePathsFrom(final TreePath path) { + public Enumeration getVisiblePathsFrom(final TreePath path) { return getVisiblePathsFromImpl(path); }