Index: src/main/java/common/javax/swing/JTable.java =================================================================== --- src/main/java/common/javax/swing/JTable.java (revision 463661) +++ src/main/java/common/javax/swing/JTable.java (working copy) @@ -1152,7 +1152,7 @@ return getModel().getColumnName(convertColumnIndexToModel(viewIndex)); } - public Class getColumnClass(final int viewIndex) { + public Class getColumnClass(final int viewIndex) { return getModel().getColumnClass(convertColumnIndexToModel(viewIndex)); } Index: src/main/java/common/javax/swing/plaf/basic/BasicDirectoryModel.java =================================================================== --- src/main/java/common/javax/swing/plaf/basic/BasicDirectoryModel.java (revision 463661) +++ src/main/java/common/javax/swing/plaf/basic/BasicDirectoryModel.java (working copy) @@ -42,12 +42,6 @@ } }; - private final class FileComparator implements Comparator { - public int compare(final T o1, final T o2) { - return lt(o1, o2) ? -1 : 1; - } - }; - public Vector getFiles() { return fileList; } Index: src/main/java/common/javax/swing/table/AbstractTableModel.java =================================================================== --- src/main/java/common/javax/swing/table/AbstractTableModel.java (revision 463661) +++ src/main/java/common/javax/swing/table/AbstractTableModel.java (working copy) @@ -82,7 +82,7 @@ return (TableModelListener[])listenerList.getListeners(TableModelListener.class); } - public EventListener[] getListeners(final Class listenerType) { + public T[] getListeners(final Class listenerType) { return listenerList.getListeners(listenerType); } Index: src/main/java/common/javax/swing/table/DefaultTableColumnModel.java =================================================================== --- src/main/java/common/javax/swing/table/DefaultTableColumnModel.java (revision 463661) +++ src/main/java/common/javax/swing/table/DefaultTableColumnModel.java (working copy) @@ -39,7 +39,7 @@ import javax.swing.event.TableColumnModelListener; public class DefaultTableColumnModel implements TableColumnModel, PropertyChangeListener, ListSelectionListener, Serializable { - protected Vector tableColumns = new Vector(); + protected Vector tableColumns = new Vector(); protected ListSelectionModel selectionModel; protected int columnMargin = 1; protected EventListenerList listenerList = new EventListenerList(); @@ -220,7 +220,7 @@ return (TableColumnModelListener[])listenerList.getListeners(TableColumnModelListener.class); } - public EventListener[] getListeners(final Class listenerType) { + public T[] getListeners(final Class listenerType) { return listenerList.getListeners(listenerType); } Index: src/main/java/common/javax/swing/table/TableColumnModel.java =================================================================== --- src/main/java/common/javax/swing/table/TableColumnModel.java (revision 463661) +++ src/main/java/common/javax/swing/table/TableColumnModel.java (working copy) @@ -33,7 +33,7 @@ void setColumnMargin(int margin); int getColumnMargin(); int getColumnCount(); - public Enumeration getColumns(); + public Enumeration getColumns(); int getColumnIndex(Object columnIdentifier); TableColumn getColumn(int columnIndex); int getColumnIndexAtX(int xPosition); Index: src/main/java/common/javax/swing/table/TableModel.java =================================================================== --- src/main/java/common/javax/swing/table/TableModel.java (revision 463661) +++ src/main/java/common/javax/swing/table/TableModel.java (working copy) @@ -27,7 +27,7 @@ int getRowCount(); int getColumnCount(); String getColumnName(int columnIndex); - Class getColumnClass(int columnIndex); + Class getColumnClass(int columnIndex); boolean isCellEditable(int rowIndex, int columnIndex); Object getValueAt(int rowIndex, int columnIndex); void setValueAt(Object value, int rowIndex, int columnIndex); Index: src/main/java/common/javax/swing/text/AbstractDocument.java =================================================================== --- src/main/java/common/javax/swing/text/AbstractDocument.java (revision 463661) +++ src/main/java/common/javax/swing/text/AbstractDocument.java (working copy) @@ -327,7 +327,7 @@ AttributeSet removeAttributes(AttributeSet old, AttributeSet toDelete); - AttributeSet removeAttributes(AttributeSet old, Enumeration names); + AttributeSet removeAttributes(AttributeSet old, Enumeration names); } @@ -335,7 +335,7 @@ Element[] elements = new Element[0]; private final SearchElement searchElem = new SearchElement(); - private final Comparator comparator = new ElementComparator(); + private final Comparator comparator = new ElementComparator(); public BranchElement(final Element parent, final AttributeSet attributes) { @@ -948,7 +948,7 @@ private transient AttributeContext context; private transient Position docEnd; private DocumentFilter docFilter; - private Dictionary docProperties = new Hashtable(); + private Dictionary docProperties = new Hashtable(); private transient Position docStart; private transient DocumentFilter.FilterBypass filterBypasser; @@ -1030,7 +1030,7 @@ .getListeners(DocumentListener.class); } - public Dictionary getDocumentProperties() { + public Dictionary getDocumentProperties() { return docProperties; } @@ -1042,7 +1042,7 @@ return content.length() - 1; } - public EventListener[] getListeners(final Class listenerType) { + public T[] getListeners(final Class listenerType) { return listenerList.getListeners(listenerType); } @@ -1173,7 +1173,7 @@ this.docFilter = filter; } - public void setDocumentProperties(final Dictionary properties) { + public void setDocumentProperties(final Dictionary properties) { this.docProperties = properties; } Index: src/main/java/common/javax/swing/text/AttributeSet.java =================================================================== --- src/main/java/common/javax/swing/text/AttributeSet.java (revision 463661) +++ src/main/java/common/javax/swing/text/AttributeSet.java (working copy) @@ -50,7 +50,7 @@ int getAttributeCount(); - Enumeration getAttributeNames(); + Enumeration getAttributeNames(); AttributeSet getResolveParent(); Index: src/main/java/common/javax/swing/text/DefaultCaret.java =================================================================== --- src/main/java/common/javax/swing/text/DefaultCaret.java (revision 463661) +++ src/main/java/common/javax/swing/text/DefaultCaret.java (working copy) @@ -627,8 +627,8 @@ return dotBias; } - public EventListener[] getListeners(final Class c) { - EventListener[] evL = null; + public T[] getListeners(final Class c) { + T[] evL = null; try { evL = listenerList.getListeners(c); } catch (final ClassCastException e) { Index: src/main/java/common/javax/swing/text/DefaultFormatter.java =================================================================== --- src/main/java/common/javax/swing/text/DefaultFormatter.java (revision 463661) +++ src/main/java/common/javax/swing/text/DefaultFormatter.java (working copy) @@ -204,7 +204,7 @@ return overwriteMode; } - public Class getValueClass() { + public Class getValueClass() { return valueClass; } @@ -230,7 +230,7 @@ this.overwriteMode = overwriteMode; } - public void setValueClass(final Class valueClass) { + public void setValueClass(final Class valueClass) { this.valueClass = valueClass; } Index: src/main/java/common/javax/swing/text/DefaultStyledDocument.java =================================================================== --- src/main/java/common/javax/swing/text/DefaultStyledDocument.java (revision 463661) +++ src/main/java/common/javax/swing/text/DefaultStyledDocument.java (working copy) @@ -1008,7 +1008,7 @@ return getStyleContext().getStyle(name); } - public Enumeration getStyleNames() { + public Enumeration getStyleNames() { return getStyleContext().getStyleNames(); } Index: src/main/java/common/javax/swing/text/html/FormSubmitEvent.java =================================================================== --- src/main/java/common/javax/swing/text/html/FormSubmitEvent.java (revision 463661) +++ src/main/java/common/javax/swing/text/html/FormSubmitEvent.java (working copy) @@ -28,33 +28,8 @@ public class FormSubmitEvent extends HTMLFrameHyperlinkEvent { - public static class MethodType { - // TODO: Uncomment along with transition to 1.5 - // public static enum MethodType extends Enum { + public static enum MethodType {GET, POST} - public static final MethodType GET = new MethodType(); - public static final MethodType POST = new MethodType(); - - private MethodType() { - } - - public static MethodType valueOf(final String name) { - if ("GET".equals(name)) { - return GET; - } else if ("POST".equals(name)) { - return POST; - } - throw new IllegalArgumentException("parameter has to be GET or POST"); - } - - public static final MethodType[] values() { - MethodType[] result = new MethodType[2]; - result[0] = GET; - result[1] = POST; - return result; - } - } - private String data; private MethodType method; Index: src/main/java/common/javax/swing/text/html/HTMLDocument.java =================================================================== --- src/main/java/common/javax/swing/text/html/HTMLDocument.java (revision 463661) +++ src/main/java/common/javax/swing/text/html/HTMLDocument.java (working copy) @@ -537,8 +537,10 @@ } protected MutableAttributeSet charAttr = new SimpleAttributeSet(); - protected Vector parseBuffer = new Vector(); + protected Vector parseBuffer = + new Vector(); + private static final String PARAGRAPH_TAG = "_paragraph_tag_"; private static final int IMPLIED_HTML_DOCUMENT_START_SPECS_NUMBER = 8; private static final int TOKEN_THRESHOLD_MULTIPLIER = 5; Index: src/main/java/common/javax/swing/text/html/parser/AttributeList.java =================================================================== --- src/main/java/common/javax/swing/text/html/parser/AttributeList.java (revision 463661) +++ src/main/java/common/javax/swing/text/html/parser/AttributeList.java (working copy) @@ -29,7 +29,7 @@ public int type; - public Vector values; + public Vector values; public int modifier; @@ -41,7 +41,7 @@ final int type, final int modifier, final String value, - final Vector values, + final Vector values, final AttributeList next) { this.name = name; this.type = type; @@ -137,7 +137,7 @@ return value; } - public Enumeration getValues() { + public Enumeration getValues() { return values.elements(); } Index: src/main/java/common/javax/swing/text/html/parser/ContentModel.java =================================================================== --- src/main/java/common/javax/swing/text/html/parser/ContentModel.java (revision 463661) +++ src/main/java/common/javax/swing/text/html/parser/ContentModel.java (working copy) @@ -247,9 +247,9 @@ * If content is null, nothing will be added to elemVec. */ - public void getElements(final Vector elemVec) { + public void getElements(final Vector elemVec) { if (content instanceof Element) { - elemVec.add(content); + elemVec.add((Element)content); } else if (content != null) { ((ContentModel)content).getElements(elemVec); } Index: src/main/java/common/javax/swing/text/html/parser/DTD.java =================================================================== --- src/main/java/common/javax/swing/text/html/parser/DTD.java (revision 463661) +++ src/main/java/common/javax/swing/text/html/parser/DTD.java (working copy) @@ -32,10 +32,10 @@ public String name; - public Vector elements = new Vector(); + public Vector elements = new Vector(); - public Hashtable elementHash = new Hashtable(); - public Hashtable entityHash = new Hashtable(); + public Hashtable elementHash = new Hashtable(); + public Hashtable entityHash = new Hashtable(); public final Element pcdata; public final Element html; @@ -161,8 +161,8 @@ public void read(final DataInputStream stream) throws IOException { ObjectInputStream is = new ObjectInputStream(stream); try { - elementHash = (Hashtable)is.readObject(); - elements = (Vector)is.readObject(); + elementHash = (Hashtable)is.readObject(); + elements = (Vector)is.readObject(); int size = is.readInt(); for (int i = 0; i < size; i ++) { String name = (String)is.readObject(); Index: src/main/java/common/javax/swing/text/MutableAttributeSet.java =================================================================== --- src/main/java/common/javax/swing/text/MutableAttributeSet.java (revision 463661) +++ src/main/java/common/javax/swing/text/MutableAttributeSet.java (working copy) @@ -32,7 +32,7 @@ void removeAttributes(AttributeSet attrSet); - void removeAttributes(Enumeration attrNames); + void removeAttributes(Enumeration attrNames); void setResolveParent(AttributeSet parent); Index: src/main/java/common/javax/swing/text/StyleContext.java =================================================================== --- src/main/java/common/javax/swing/text/StyleContext.java (revision 463661) +++ src/main/java/common/javax/swing/text/StyleContext.java (working copy) @@ -119,7 +119,7 @@ ChangeListener.class); } - public EventListener[] getListeners(final Class listenerType) { + public T[] getListeners(final Class listenerType) { return listenerList.getListeners(listenerType); } @@ -582,7 +582,7 @@ return (Style)styles.getAttribute(name); } - public Enumeration getStyleNames() { + public Enumeration getStyleNames() { return styles.getAttributeNames(); } Index: src/main/java/common/javax/swing/tree/AbstractLayoutCache.java =================================================================== --- src/main/java/common/javax/swing/tree/AbstractLayoutCache.java (revision 463661) +++ src/main/java/common/javax/swing/tree/AbstractLayoutCache.java (working copy) @@ -340,7 +340,7 @@ public abstract TreePath getPathForRow(int row); public abstract int getRowForPath(TreePath path); public abstract TreePath getPathClosestTo(int x, int y); - public abstract Enumeration getVisiblePathsFrom(TreePath path); + public abstract Enumeration getVisiblePathsFrom(TreePath path); public abstract int getVisibleChildCount(TreePath path); public abstract void setExpandedState(TreePath path, boolean isExpanded); public abstract boolean getExpandedState(TreePath path); Index: src/main/java/common/javax/swing/tree/DefaultMutableTreeNode.java =================================================================== --- src/main/java/common/javax/swing/tree/DefaultMutableTreeNode.java (revision 463661) +++ src/main/java/common/javax/swing/tree/DefaultMutableTreeNode.java (working copy) @@ -29,7 +29,7 @@ import java.util.Vector; public class DefaultMutableTreeNode implements Cloneable, MutableTreeNode, Serializable { - public static final Enumeration EMPTY_ENUMERATION = new Vector().elements(); + public static final Enumeration EMPTY_ENUMERATION = new Vector().elements(); protected MutableTreeNode parent; protected Vector children; Index: src/main/java/common/javax/swing/tree/DefaultTreeModel.java =================================================================== --- src/main/java/common/javax/swing/tree/DefaultTreeModel.java (revision 463661) +++ src/main/java/common/javax/swing/tree/DefaultTreeModel.java (working copy) @@ -67,7 +67,7 @@ return (TreeModelListener[])listenerList.getListeners(TreeModelListener.class); } - public EventListener[] getListeners(final Class listenerType) { + public T[] getListeners(final Class listenerType) { return listenerList.getListeners(listenerType); } Index: src/main/java/common/javax/swing/tree/DefaultTreeSelectionModel.java =================================================================== --- src/main/java/common/javax/swing/tree/DefaultTreeSelectionModel.java (revision 463661) +++ src/main/java/common/javax/swing/tree/DefaultTreeSelectionModel.java (working copy) @@ -76,7 +76,7 @@ : new PropertyChangeListener[0]; } - public EventListener[] getListeners(final Class listenerType) { + public T[] getListeners(final Class listenerType) { return listenerList.getListeners(listenerType); }