Index: javax/swing/DefaultListCellRenderer.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultListCellRenderer.java,v retrieving revision 1.3.8.3 diff -u -r1.3.8.3 DefaultListCellRenderer.java --- javax/swing/DefaultListCellRenderer.java 22 Oct 2004 12:41:11 -0000 1.3.8.3 +++ javax/swing/DefaultListCellRenderer.java 6 Dec 2004 16:57:38 -0000 @@ -52,10 +52,10 @@ * @author Andrew Selkirk * @version 1.0 */ -public class DefaultListCellRenderer extends JLabel implements ListCellRenderer, - Serializable +public class DefaultListCellRenderer extends JLabel + implements ListCellRenderer, Serializable { - static final long serialVersionUID = 7708947179685189462L; + private static final long serialVersionUID = 7708947179685189462L; public static class UIResource extends DefaultListCellRenderer implements javax.swing.plaf.UIResource @@ -89,6 +89,7 @@ String s = value.toString(); setText(s); setOpaque(true); + setHorizontalAlignment(LEFT); if (isSelected) { Index: javax/swing/JLabel.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/swing/JLabel.java,v retrieving revision 1.4.2.9 diff -u -r1.4.2.9 JLabel.java --- javax/swing/JLabel.java 22 Oct 2004 12:41:12 -0000 1.4.2.9 +++ javax/swing/JLabel.java 6 Dec 2004 16:57:38 -0000 @@ -523,13 +523,13 @@ */ public void setVerticalAlignment(int alignment) { - if (alignment != verticalAlignment) - { - int oldAlignment = verticalAlignment; - verticalAlignment = checkVerticalKey(alignment, "verticalAlignment"); - firePropertyChange(VERTICAL_ALIGNMENT_CHANGED_PROPERTY, oldAlignment, - verticalAlignment); - } + if (alignment == verticalAlignment) + return; + + int oldAlignment = verticalAlignment; + verticalAlignment = checkVerticalKey(alignment, "verticalAlignment"); + firePropertyChange(VERTICAL_ALIGNMENT_CHANGED_PROPERTY, + oldAlignment, verticalAlignment); } /** @@ -550,6 +550,9 @@ */ public void setHorizontalAlignment(int alignment) { + if (horizontalAlignment == alignment) + return; + int oldAlignment = horizontalAlignment; horizontalAlignment = checkHorizontalKey(alignment, "horizontalAlignment"); firePropertyChange(HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY, oldAlignment, Index: javax/swing/JList.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/swing/JList.java,v retrieving revision 1.4.2.12 diff -u -r1.4.2.12 JList.java --- javax/swing/JList.java 26 Nov 2004 20:45:10 -0000 1.4.2.12 +++ javax/swing/JList.java 6 Dec 2004 16:57:38 -0000 @@ -862,13 +862,16 @@ /** * Sets the value of the address@hidden #celLRenderer} property. * - * @param cellRenderer The new property value + * @param renderer The new property value */ - public void setCellRenderer(ListCellRenderer cr) + public void setCellRenderer(ListCellRenderer renderer) { + if (cellRenderer == renderer) + return; + ListCellRenderer old = cellRenderer; - cellRenderer = cr; - firePropertyChange(CELL_RENDERER_PROPERTY_CHANGED, old, cr); + cellRenderer = renderer; + firePropertyChange(CELL_RENDERER_PROPERTY_CHANGED, old, renderer); revalidate(); repaint(); } @@ -890,15 +893,21 @@ * * @param model The new property value */ - public void setModel(ListModel m) + public void setModel(ListModel model) { - ListModel old = model; - if (old != null) - old.removeListDataListener(listListener); - model = m; - if (model != null) - model.addListDataListener(listListener); - firePropertyChange(MODEL_PROPERTY_CHANGED, old, m); + if (this.model == model) + return; + + if (this.model != null) + this.model.removeListDataListener(listListener); + + ListModel old = this.model; + this.model = model; + + if (this.model != null) + this.model.addListDataListener(listListener); + + firePropertyChange(MODEL_PROPERTY_CHANGED, old, model); revalidate(); repaint(); } @@ -914,17 +923,23 @@ * address@hidden #listListener} is unsubscribed from the existing selection * model, if it exists, and re-subscribed to the new selection model. * - * @param l The new property value + * @param model The new property value */ - public void setSelectionModel(ListSelectionModel l) + public void setSelectionModel(ListSelectionModel model) { + if (selectionModel == model) + return; + + if (selectionModel != null) + selectionModel.removeListSelectionListener(listListener); + ListSelectionModel old = selectionModel; - if (old != null) - old.removeListSelectionListener(listListener); - selectionModel = l; + selectionModel = model; + if (selectionModel != null) selectionModel.addListSelectionListener(listListener); - firePropertyChange(SELECTION_MODEL_PROPERTY_CHANGED, old, l); + + firePropertyChange(SELECTION_MODEL_PROPERTY_CHANGED, old, model); revalidate(); repaint(); }