diff options
Diffstat (limited to 'libjava/classpath/javax/swing')
33 files changed, 112 insertions, 63 deletions
diff --git a/libjava/classpath/javax/swing/AbstractButton.java b/libjava/classpath/javax/swing/AbstractButton.java index cb0f458b89f..8764f6f8c3d 100644 --- a/libjava/classpath/javax/swing/AbstractButton.java +++ b/libjava/classpath/javax/swing/AbstractButton.java @@ -37,6 +37,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Graphics; import java.awt.Image; @@ -2445,7 +2447,7 @@ public abstract class AbstractButton extends JComponent */ protected String paramString() { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(super.paramString()); sb.append(",defaultIcon="); if (getIcon() != null) diff --git a/libjava/classpath/javax/swing/JButton.java b/libjava/classpath/javax/swing/JButton.java index 878cfa68397..705a8638105 100644 --- a/libjava/classpath/javax/swing/JButton.java +++ b/libjava/classpath/javax/swing/JButton.java @@ -37,6 +37,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; @@ -225,7 +227,7 @@ public class JButton extends AbstractButton String superParam = super.paramString(); // 41 is the maximum number of chars which may be needed. - StringBuffer sb = new StringBuffer(41); + CPStringBuilder sb = new CPStringBuilder(41); sb.append(",defaultButton=").append(isDefaultButton()); sb.append(",defaultCapable=").append(defaultCapable); diff --git a/libjava/classpath/javax/swing/JComboBox.java b/libjava/classpath/javax/swing/JComboBox.java index fa6941cf977..74ff315eab7 100644 --- a/libjava/classpath/javax/swing/JComboBox.java +++ b/libjava/classpath/javax/swing/JComboBox.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.ItemSelectable; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -1104,7 +1106,7 @@ public class JComboBox extends JComponent implements ItemSelectable, protected String paramString() { String superParamStr = super.paramString(); - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(",isEditable=").append(isEditable()); sb.append(",lightWeightPopupEnabled=").append(isLightWeightPopupEnabled()); sb.append(",maximumRowCount=").append(getMaximumRowCount()); diff --git a/libjava/classpath/javax/swing/JComponent.java b/libjava/classpath/javax/swing/JComponent.java index a22a92e3b06..f71217867bc 100644 --- a/libjava/classpath/javax/swing/JComponent.java +++ b/libjava/classpath/javax/swing/JComponent.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.applet.Applet; import java.awt.AWTEvent; import java.awt.Color; @@ -2405,7 +2407,7 @@ public abstract class JComponent extends Container implements Serializable */ protected String paramString() { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(super.paramString()); sb.append(",alignmentX=").append(getAlignmentX()); sb.append(",alignmentY=").append(getAlignmentY()); diff --git a/libjava/classpath/javax/swing/JDesktopPane.java b/libjava/classpath/javax/swing/JDesktopPane.java index 454870ea6fc..b068a2998a5 100644 --- a/libjava/classpath/javax/swing/JDesktopPane.java +++ b/libjava/classpath/javax/swing/JDesktopPane.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.beans.PropertyVetoException; @@ -306,7 +308,7 @@ public class JDesktopPane extends JLayeredPane implements Accessible protected String paramString() { String superParamStr = super.paramString(); - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(",isOptimizedDrawingPossible="); sb.append(isOptimizedDrawingEnabled()); sb.append(",desktopManager="); diff --git a/libjava/classpath/javax/swing/JFileChooser.java b/libjava/classpath/javax/swing/JFileChooser.java index a508b8fcb20..b7615a58d0e 100644 --- a/libjava/classpath/javax/swing/JFileChooser.java +++ b/libjava/classpath/javax/swing/JFileChooser.java @@ -37,6 +37,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Frame; import java.awt.GraphicsEnvironment; @@ -1543,7 +1545,7 @@ public class JFileChooser extends JComponent implements Accessible */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",approveButtonText="); if (approveButtonText != null) sb.append(approveButtonText); diff --git a/libjava/classpath/javax/swing/JFrame.java b/libjava/classpath/javax/swing/JFrame.java index e54d453b8df..0c956b3969e 100644 --- a/libjava/classpath/javax/swing/JFrame.java +++ b/libjava/classpath/javax/swing/JFrame.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.AWTEvent; import java.awt.BorderLayout; import java.awt.Component; @@ -341,7 +343,7 @@ public class JFrame extends Frame */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",defaultCloseOperation="); sb.append(SwingUtilities.convertWindowConstantToString( getDefaultCloseOperation())); diff --git a/libjava/classpath/javax/swing/JLabel.java b/libjava/classpath/javax/swing/JLabel.java index 721287b21df..2bbd1ee5f8c 100644 --- a/libjava/classpath/javax/swing/JLabel.java +++ b/libjava/classpath/javax/swing/JLabel.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Font; import java.awt.FontMetrics; @@ -555,7 +557,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",defaultIcon="); if (icon != null) sb.append(icon); diff --git a/libjava/classpath/javax/swing/JList.java b/libjava/classpath/javax/swing/JList.java index ff1b239217a..bd744064c39 100644 --- a/libjava/classpath/javax/swing/JList.java +++ b/libjava/classpath/javax/swing/JList.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Color; import java.awt.Component; import java.awt.ComponentOrientation; @@ -2481,7 +2483,7 @@ public class JList extends JComponent implements Accessible, Scrollable */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",fixedCellHeight=").append(getFixedCellHeight()); sb.append(",fixedCellWidth=").append(getFixedCellWidth()); sb.append(",selectionBackground="); diff --git a/libjava/classpath/javax/swing/JMenuBar.java b/libjava/classpath/javax/swing/JMenuBar.java index 73b409e42db..030fc4cb87d 100644 --- a/libjava/classpath/javax/swing/JMenuBar.java +++ b/libjava/classpath/javax/swing/JMenuBar.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Graphics; import java.awt.Insets; @@ -481,7 +483,7 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement */ protected String paramString() { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(super.paramString()); sb.append(",margin="); if (getMargin() != null) diff --git a/libjava/classpath/javax/swing/JPopupMenu.java b/libjava/classpath/javax/swing/JPopupMenu.java index 1ae8adad02a..ac1a9ebf253 100644 --- a/libjava/classpath/javax/swing/JPopupMenu.java +++ b/libjava/classpath/javax/swing/JPopupMenu.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Dimension; import java.awt.Insets; @@ -767,7 +769,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement */ protected String paramString() { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(super.paramString()); sb.append(",label="); if (getLabel() != null) diff --git a/libjava/classpath/javax/swing/JProgressBar.java b/libjava/classpath/javax/swing/JProgressBar.java index ed2d0088d06..b20b02a0606 100644 --- a/libjava/classpath/javax/swing/JProgressBar.java +++ b/libjava/classpath/javax/swing/JProgressBar.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Graphics; import java.beans.PropertyChangeEvent; @@ -786,7 +788,7 @@ public class JProgressBar extends JComponent implements SwingConstants, protected String paramString() { String superParamStr = super.paramString(); - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(",orientation="); if (orientation == HORIZONTAL) sb.append("HORIZONTAL"); diff --git a/libjava/classpath/javax/swing/JScrollBar.java b/libjava/classpath/javax/swing/JScrollBar.java index f55feb3f22a..371bb60c65e 100644 --- a/libjava/classpath/javax/swing/JScrollBar.java +++ b/libjava/classpath/javax/swing/JScrollBar.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Adjustable; import java.awt.Dimension; import java.awt.event.AdjustmentEvent; @@ -671,7 +673,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",blockIncrement=").append(blockIncrement); sb.append(",orientation="); if (this.orientation == JScrollBar.HORIZONTAL) diff --git a/libjava/classpath/javax/swing/JSlider.java b/libjava/classpath/javax/swing/JSlider.java index 948a9629b4c..979707a7264 100644 --- a/libjava/classpath/javax/swing/JSlider.java +++ b/libjava/classpath/javax/swing/JSlider.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.MenuContainer; import java.awt.image.ImageObserver; import java.beans.PropertyChangeEvent; @@ -1104,7 +1106,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible, protected String paramString() { String superParamStr = super.paramString(); - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(",isInverted=").append(getInverted()); sb.append(",majorTickSpacing=").append(getMajorTickSpacing()); sb.append(",minorTickSpacing=").append(getMinorTickSpacing()); diff --git a/libjava/classpath/javax/swing/JSplitPane.java b/libjava/classpath/javax/swing/JSplitPane.java index fcdc1c04128..5b6ec158e6d 100644 --- a/libjava/classpath/javax/swing/JSplitPane.java +++ b/libjava/classpath/javax/swing/JSplitPane.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Graphics; import java.beans.PropertyChangeEvent; @@ -597,7 +599,7 @@ public class JSplitPane extends JComponent implements Accessible { // FIXME: the next line can be restored once PR27208 is fixed String superParamStr = ""; //super.paramString(); - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(",continuousLayout=").append(isContinuousLayout()); sb.append(",dividerSize=").append(getDividerSize()); sb.append(",lastDividerLocation=").append(getLastDividerLocation()); diff --git a/libjava/classpath/javax/swing/JTabbedPane.java b/libjava/classpath/javax/swing/JTabbedPane.java index c7244bf2b71..79521be3fec 100644 --- a/libjava/classpath/javax/swing/JTabbedPane.java +++ b/libjava/classpath/javax/swing/JTabbedPane.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Color; import java.awt.Component; import java.awt.Point; @@ -1692,7 +1694,7 @@ public class JTabbedPane extends JComponent implements Serializable, */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",tabPlacement="); if (tabPlacement == TOP) sb.append("TOP"); diff --git a/libjava/classpath/javax/swing/JToolBar.java b/libjava/classpath/javax/swing/JToolBar.java index fe4d2ae2046..33ebcfcaf89 100644 --- a/libjava/classpath/javax/swing/JToolBar.java +++ b/libjava/classpath/javax/swing/JToolBar.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Container; import java.awt.Dimension; @@ -766,7 +768,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",floatable=").append(floatable); sb.append(",margin="); if (margin != null) diff --git a/libjava/classpath/javax/swing/JToolTip.java b/libjava/classpath/javax/swing/JToolTip.java index 16bdd2d7e73..f59ec95fba4 100644 --- a/libjava/classpath/javax/swing/JToolTip.java +++ b/libjava/classpath/javax/swing/JToolTip.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.AWTEvent; import java.beans.PropertyChangeEvent; @@ -179,7 +181,7 @@ public class JToolTip extends JComponent implements Accessible */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",tiptext="); if (text != null) sb.append(text); diff --git a/libjava/classpath/javax/swing/UIManager.java b/libjava/classpath/javax/swing/UIManager.java index 3b1b3f72b38..0369b6514ae 100644 --- a/libjava/classpath/javax/swing/UIManager.java +++ b/libjava/classpath/javax/swing/UIManager.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Color; import java.awt.Dimension; import java.awt.Font; @@ -107,7 +109,7 @@ public class UIManager implements Serializable */ public String toString() { - StringBuffer s = new StringBuffer(); + CPStringBuilder s = new CPStringBuilder(); s.append(getClass().getName()); s.append('['); s.append(getName()); diff --git a/libjava/classpath/javax/swing/event/EventListenerList.java b/libjava/classpath/javax/swing/event/EventListenerList.java index 1568039f0ff..8c76f7f87e6 100644 --- a/libjava/classpath/javax/swing/event/EventListenerList.java +++ b/libjava/classpath/javax/swing/event/EventListenerList.java @@ -37,6 +37,8 @@ exception statement from your version. */ package javax.swing.event; +import gnu.java.lang.CPStringBuilder; + import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -295,7 +297,7 @@ public class EventListenerList */ public String toString() { - StringBuffer buf = new StringBuffer("EventListenerList: "); + CPStringBuilder buf = new CPStringBuilder("EventListenerList: "); buf.append(listenerList.length / 2); buf.append(" listeners: "); for (int i = 0; i < listenerList.length; i += 2) diff --git a/libjava/classpath/javax/swing/table/AbstractTableModel.java b/libjava/classpath/javax/swing/table/AbstractTableModel.java index 66b6a0743b6..743e5d4dc21 100644 --- a/libjava/classpath/javax/swing/table/AbstractTableModel.java +++ b/libjava/classpath/javax/swing/table/AbstractTableModel.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing.table; +import gnu.java.lang.CPStringBuilder; + import java.io.Serializable; import java.util.EventListener; @@ -80,7 +82,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable */ public String getColumnName(int columnIndex) { - StringBuffer buffer = new StringBuffer(); + CPStringBuilder buffer = new CPStringBuilder(); while (columnIndex >= 0) { buffer.insert(0, (char) ('A' + columnIndex % 26)); diff --git a/libjava/classpath/javax/swing/text/AbstractDocument.java b/libjava/classpath/javax/swing/text/AbstractDocument.java index 72178f840f3..29b20b321fb 100644 --- a/libjava/classpath/javax/swing/text/AbstractDocument.java +++ b/libjava/classpath/javax/swing/text/AbstractDocument.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing.text; +import gnu.java.lang.CPStringBuilder; + import java.awt.font.TextAttribute; import java.io.PrintStream; import java.io.Serializable; @@ -2013,7 +2015,7 @@ public abstract class AbstractDocument implements Document, Serializable */ public void dump(PrintStream stream, int indent) { - StringBuffer b = new StringBuffer(); + CPStringBuilder b = new CPStringBuilder(); for (int i = 0; i < indent; ++i) b.append(' '); b.append('<'); diff --git a/libjava/classpath/javax/swing/text/DefaultEditorKit.java b/libjava/classpath/javax/swing/text/DefaultEditorKit.java index aa69deca545..0d999a38096 100644 --- a/libjava/classpath/javax/swing/text/DefaultEditorKit.java +++ b/libjava/classpath/javax/swing/text/DefaultEditorKit.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing.text; +import gnu.java.lang.CPStringBuilder; + import java.awt.Toolkit; import java.awt.event.ActionEvent; @@ -1634,7 +1636,7 @@ public class DefaultEditorKit extends EditorKit BufferedReader reader = new BufferedReader(in); String line; - StringBuffer content = new StringBuffer(); + CPStringBuilder content = new CPStringBuilder(); while ((line = reader.readLine()) != null) { diff --git a/libjava/classpath/javax/swing/text/DefaultStyledDocument.java b/libjava/classpath/javax/swing/text/DefaultStyledDocument.java index 341579e3df8..8c70a8a3bfd 100644 --- a/libjava/classpath/javax/swing/text/DefaultStyledDocument.java +++ b/libjava/classpath/javax/swing/text/DefaultStyledDocument.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing.text; +import gnu.java.lang.CPStringBuilder; + import java.awt.Color; import java.awt.Font; import java.io.Serializable; @@ -374,7 +376,7 @@ public class DefaultStyledDocument extends AbstractDocument implements */ public String toString() { - StringBuilder b = new StringBuilder(); + CPStringBuilder b = new CPStringBuilder(); switch (type) { case StartTagType: @@ -2420,7 +2422,7 @@ public class DefaultStyledDocument extends AbstractDocument implements writeLock(); // First we collect the content to be inserted. - StringBuffer contentBuffer = new StringBuffer(); + CPStringBuilder contentBuffer = new CPStringBuilder(); for (int i = 0; i < data.length; i++) { // Collect all inserts into one so we can get the correct diff --git a/libjava/classpath/javax/swing/text/JTextComponent.java b/libjava/classpath/javax/swing/text/JTextComponent.java index 8e70fe2bb2b..24035e35ac2 100644 --- a/libjava/classpath/javax/swing/text/JTextComponent.java +++ b/libjava/classpath/javax/swing/text/JTextComponent.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing.text; +import gnu.java.lang.CPStringBuilder; + import java.awt.AWTEvent; import java.awt.Color; import java.awt.Container; @@ -2016,7 +2018,7 @@ public abstract class JTextComponent extends JComponent d.putProperty(Document.StreamDescriptionProperty, streamDescription); } - StringBuffer b = new StringBuffer(); + CPStringBuilder b = new CPStringBuilder(); int c; // Read till -1 (EOF). diff --git a/libjava/classpath/javax/swing/text/MaskFormatter.java b/libjava/classpath/javax/swing/text/MaskFormatter.java index 581cceb617d..4ebf65b9332 100644 --- a/libjava/classpath/javax/swing/text/MaskFormatter.java +++ b/libjava/classpath/javax/swing/text/MaskFormatter.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing.text; +import gnu.java.lang.CPStringBuilder; + import java.text.ParseException; import javax.swing.JFormattedTextField; @@ -311,7 +313,7 @@ public class MaskFormatter extends DefaultFormatter private String convertStringToValue(String value) throws ParseException { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); char valueChar; boolean isPlaceHolder; @@ -447,7 +449,7 @@ public class MaskFormatter extends DefaultFormatter private String convertValueToString(String value) throws ParseException { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); char valueChar; boolean isPlaceHolder; diff --git a/libjava/classpath/javax/swing/text/TabSet.java b/libjava/classpath/javax/swing/text/TabSet.java index 0f2c8c7c1ee..c08a650fb11 100644 --- a/libjava/classpath/javax/swing/text/TabSet.java +++ b/libjava/classpath/javax/swing/text/TabSet.java @@ -37,6 +37,8 @@ exception statement from your version. */ package javax.swing.text; +import gnu.java.lang.CPStringBuilder; + import java.io.Serializable; /** @@ -194,7 +196,7 @@ public class TabSet implements Serializable */ public String toString() { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append("[ "); for (int i = 0; i < tabs.length; ++i) { diff --git a/libjava/classpath/javax/swing/text/html/CSSParser.java b/libjava/classpath/javax/swing/text/html/CSSParser.java index 54a16bcc599..d49ac3a6fc9 100644 --- a/libjava/classpath/javax/swing/text/html/CSSParser.java +++ b/libjava/classpath/javax/swing/text/html/CSSParser.java @@ -163,11 +163,6 @@ class CSSParser private int pushedChar; /** - * Temporary place to hold identifiers. - */ - private StringBuffer unitBuffer; - - /** * Used to indicate blocks. */ private int[] unitStack; @@ -212,7 +207,6 @@ class CSSParser */ CSSParser() { - unitBuffer = new StringBuffer(); tokenBuffer = new char[10]; } diff --git a/libjava/classpath/javax/swing/text/html/HTMLWriter.java b/libjava/classpath/javax/swing/text/html/HTMLWriter.java index 44119c73286..6cc23df9aab 100644 --- a/libjava/classpath/javax/swing/text/html/HTMLWriter.java +++ b/libjava/classpath/javax/swing/text/html/HTMLWriter.java @@ -37,6 +37,8 @@ exception statement from your version. */ package javax.swing.text.html; +import gnu.java.lang.CPStringBuilder; + import java.io.IOException; import java.io.Writer; @@ -574,7 +576,7 @@ public class HTMLWriter protected void output(char[] chars, int off, int len) throws IOException { - StringBuffer strBuffer = new StringBuffer(); + CPStringBuilder strBuffer = new CPStringBuilder(); for (int i = 0; i < chars.length; i++) { @@ -1081,4 +1083,4 @@ public class HTMLWriter return ret_str; } // private String escapeCharHtmlEntity(char param_char) -} // public class HTMLWriter extends AbstractWriter
\ No newline at end of file +} // public class HTMLWriter extends AbstractWriter diff --git a/libjava/classpath/javax/swing/text/html/StyleSheet.java b/libjava/classpath/javax/swing/text/html/StyleSheet.java index 01f19fd7bdd..08578c80fad 100644 --- a/libjava/classpath/javax/swing/text/html/StyleSheet.java +++ b/libjava/classpath/javax/swing/text/html/StyleSheet.java @@ -182,7 +182,7 @@ public class StyleSheet extends StyleContext */ private class CSSStyle extends SimpleAttributeSet - implements Style, Comparable + implements Style, Comparable<CSSStyle> { static final int PREC_UA = 0; @@ -229,9 +229,8 @@ public class StyleSheet extends StyleContext * Sorts the rule according to the style's precedence and the * selectors specificity. */ - public int compareTo(Object o) + public int compareTo(CSSStyle other) { - CSSStyle other = (CSSStyle) o; return other.precedence + other.selector.getSpecificity() - precedence - selector.getSpecificity(); } @@ -247,18 +246,18 @@ public class StyleSheet extends StyleContext /** * The linked style sheets stored. */ - private ArrayList linked; + private ArrayList<StyleSheet> linked; /** * Maps element names (selectors) to AttributSet (the corresponding style * information). */ - ArrayList css = new ArrayList(); + ArrayList<CSSStyle> css = new ArrayList<CSSStyle>(); /** * Maps selectors to their resolved styles. */ - private HashMap resolvedStyles; + private HashMap<String,Style> resolvedStyles; /** * Constructs a StyleSheet. @@ -267,7 +266,7 @@ public class StyleSheet extends StyleContext { super(); baseFontSize = 4; // Default font size from CSS - resolvedStyles = new HashMap(); + resolvedStyles = new HashMap<String,Style>(); } /** @@ -283,7 +282,7 @@ public class StyleSheet extends StyleContext { // Create list of the element and all of its parents, starting // with the bottommost element. - ArrayList path = new ArrayList(); + ArrayList<Element> path = new ArrayList<Element>(); Element el; AttributeSet atts; for (el = e; el != null; el = el.getParentElement()) @@ -295,7 +294,7 @@ public class StyleSheet extends StyleContext // We append the actual element after this loop. for (int i = count - 1; i > 0; i--) { - el = (Element) path.get(i); + el = path.get(i); atts = el.getAttributes(); Object name = atts.getAttribute(StyleConstants.NameAttribute); selector.append(name.toString()); @@ -322,7 +321,7 @@ public class StyleSheet extends StyleContext selector.append(' '); } selector.append(t.toString()); - el = (Element) path.get(0); + el = path.get(0); atts = el.getAttributes(); // For leaf elements, we have to fetch the tag specific attributes. if (el.isLeaf()) @@ -372,7 +371,7 @@ public class StyleSheet extends StyleContext */ private Style getResolvedStyle(String selector, List path, HTML.Tag tag) { - Style style = (Style) resolvedStyles.get(selector); + Style style = resolvedStyles.get(selector); if (style == null) style = resolveStyle(selector, path, tag); return style; @@ -439,11 +438,9 @@ public class StyleSheet extends StyleContext { // FIXME: This style resolver is not correct. But it works good enough for // the default.css. - int count = tags.length; - ArrayList styles = new ArrayList(); - for (Iterator i = css.iterator(); i.hasNext();) + ArrayList<CSSStyle> styles = new ArrayList<CSSStyle>(); + for (CSSStyle style : css) { - CSSStyle style = (CSSStyle) i.next(); if (style.selector.matches(tags, attributes)) styles.add(style); } @@ -453,10 +450,10 @@ public class StyleSheet extends StyleContext { for (int i = linked.size() - 1; i >= 0; i--) { - StyleSheet ss = (StyleSheet) linked.get(i); + StyleSheet ss = linked.get(i); for (int j = ss.css.size() - 1; j >= 0; j--) { - CSSStyle style = (CSSStyle) ss.css.get(j); + CSSStyle style = ss.css.get(j); if (style.selector.matches(tags, attributes)) styles.add(style); } @@ -615,7 +612,7 @@ public class StyleSheet extends StyleContext if (linked != null) { linkedSS = new StyleSheet[linked.size()]; - linkedSS = (StyleSheet[]) linked.toArray(linkedSS); + linkedSS = linked.toArray(linkedSS); } else { @@ -1074,7 +1071,7 @@ public class StyleSheet extends StyleContext */ public void setBaseFontSize(String size) { - size.trim(); + size = size.trim(); int temp = 0; try { @@ -1446,8 +1443,8 @@ public class StyleSheet extends StyleContext */ private Map attributeSetToMap(AttributeSet atts) { - HashMap map = new HashMap(); - Enumeration keys = atts.getAttributeNames(); + HashMap<String,String> map = new HashMap<String,String>(); + Enumeration<?> keys = atts.getAttributeNames(); while (keys.hasMoreElements()) { Object key = keys.nextElement(); diff --git a/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java b/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java index 25db89fc405..8838646d5f5 100644 --- a/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java +++ b/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java @@ -83,7 +83,7 @@ class ViewAttributeSet { styleSheet = ss; view = v; - ArrayList atts = new ArrayList(); + ArrayList<AttributeSet> atts = new ArrayList<AttributeSet>(); Element el = v.getElement(); AttributeSet elAtts = el.getAttributes(); @@ -93,7 +93,7 @@ class ViewAttributeSet if (el.isLeaf()) { - Enumeration n = elAtts.getAttributeNames(); + Enumeration<?> n = elAtts.getAttributeNames(); while (n.hasMoreElements()) { Object key = n.nextElement(); @@ -115,7 +115,7 @@ class ViewAttributeSet } AttributeSet[] atts1 = new AttributeSet[atts.size()]; - atts1 = (AttributeSet[]) atts.toArray(atts1); + atts1 = atts.toArray(atts1); init(atts1); } diff --git a/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java b/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java index a1afe781324..34a70c19b59 100644 --- a/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java +++ b/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java @@ -68,7 +68,7 @@ public class DefaultMutableTreeNode * children. */ public static final Enumeration<TreeNode> EMPTY_ENUMERATION = - EmptyEnumeration.getInstance(); + new EmptyEnumeration<TreeNode>(); /** * The parent of this node (possibly <code>null</code>). diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java b/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java index 2bb0d0045a6..b2806f2728b 100644 --- a/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java +++ b/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing.tree; +import gnu.java.lang.CPStringBuilder; + import java.beans.PropertyChangeListener; import java.io.IOException; import java.io.ObjectInputStream; @@ -224,7 +226,7 @@ public class DefaultTreeSelectionModel return "[selection empty]"; else { - StringBuffer b = new StringBuffer("selected rows: ["); + CPStringBuilder b = new CPStringBuilder("selected rows: ["); for (int i = 0; i < selection.length; i++) { b.append(getRow(selection[i])); |
