This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: AWT/Swing fixes
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Fri, 19 Mar 2004 21:45:00 +0100
- Subject: FYI: Patch: AWT/Swing fixes
Hi list,
I commited the attached patch to fix some access bugs (gcj still handles
package-privateness like public). I found them by trying to compile the
java files with jikes. This patch makes it possible to merge recent
AWT/Swing fixes into GNU classpath.
Michael
2004-03-19 Michael Koch <konqueror@gmx.de>
* java/awt/image/AffineTransformOp.java
(AffineTransformOp): Made public.
* javax/swing/JComponent.java
(listenerList): Made protected.
(accessibleContext): Likewise.
* javax/swing/JList.java
(valueChanged): Dont use internal fields of ListSelectionEvent.
* javax/swing/JViewport.java
(getView): Dont use internal fields of Component.
(addImpl): Likewise.
* javax/swing/Timer.java
(isRunning): Made public.
(start): Likewise.
(stop): Likewise.
* javax/swing/UIDefaults.java
(getInt): Made public.
* javax/swing/plaf/basic/BasicListUI.java
(mousePressed): Dont use internal fields of MouseEvent.
(propertyChanged): Dont use internal fields of PropertyChangeEvent.
* javax/swing/plaf/basic/BasicScrollBarUI.java
(arrowIcon): Made static.
* javax/swing/plaf/basic/BasicViewportUI.java
(stateChanged): Dont use internal field on ChangeEvent.
* javax/swing/text/JTextComponent.java
(getUI): Call UIManager.getUI().
(updateUI): Use getUI().
Index: java/awt/image/AffineTransformOp.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/AffineTransformOp.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 AffineTransformOp.java
--- java/awt/image/AffineTransformOp.java 17 Mar 2004 21:28:58 -0000 1.2
+++ java/awt/image/AffineTransformOp.java 19 Mar 2004 20:40:12 -0000
@@ -60,7 +59,6 @@
private AffineTransform transform;
private RenderingHints hints;
-
/**
* Construct AffineTransformOp with the given xform and interpolationType.
* Interpolation type can be either TYPE_BILINEAR or TYPE_NEAREST_NEIGHBOR.
@@ -68,8 +66,7 @@
* @param xform AffineTransform that will applied to the source image
* @param interpolationType type of interpolation used
*/
-
- AffineTransformOp (AffineTransform xform, int interpolationType)
+ public AffineTransformOp (AffineTransform xform, int interpolationType)
{
this.transform = xform;
@@ -89,8 +86,7 @@
* @param xform AffineTransform that will applied to the source image
* @param hints rendering hints that will be used during transformation
*/
-
- AffineTransformOp (AffineTransform xform, RenderingHints hints)
+ public AffineTransformOp (AffineTransform xform, RenderingHints hints)
{
this.transform = xform;
this.hints = hints;
@@ -249,7 +238,6 @@
* @param dstPt destination point
* @return the location of the transformed source point.
*/
-
public Point2D getPoint2D (Point2D srcPt, Point2D dstPt)
{
return transform.transform (srcPt, dstPt);
@@ -270,7 +257,6 @@
*
* @return transform
*/
-
public AffineTransform getTransform ()
{
return transform;
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComponent.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 JComponent.java
--- javax/swing/JComponent.java 17 Mar 2004 21:28:59 -0000 1.8
+++ javax/swing/JComponent.java 19 Mar 2004 20:40:12 -0000
@@ -89,12 +89,12 @@
{
static final long serialVersionUID = -5242478962609715464L;
- EventListenerList listenerList = new EventListenerList();
+ protected EventListenerList listenerList = new EventListenerList();
/**
* accessibleContext
*/
- AccessibleContext accessibleContext;
+ protected AccessibleContext accessibleContext;
Dimension pref,min,max;
Border border;
Index: javax/swing/JList.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JList.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 JList.java
--- javax/swing/JList.java 17 Mar 2004 21:28:59 -0000 1.5
+++ javax/swing/JList.java 19 Mar 2004 20:40:13 -0000
@@ -293,9 +293,9 @@
// ListSelectionListener events
public void valueChanged(ListSelectionEvent event)
{
- JList.this.fireSelectionValueChanged(event.firstIndex,
- event.lastIndex,
- event.isAdjusting);
+ JList.this.fireSelectionValueChanged(event.getFirstIndex(),
+ event.getLastIndex(),
+ event.getValueIsAdjusting());
JList.this.repaint();
}
};
Index: javax/swing/JViewport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JViewport.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 JViewport.java
--- javax/swing/JViewport.java 17 Mar 2004 21:28:59 -0000 1.4
+++ javax/swing/JViewport.java 19 Mar 2004 20:40:13 -0000
@@ -199,10 +199,10 @@
public Component getView()
{
- if (ncomponents > 0)
- return component[0];
- else
+ if (getComponentCount() == 0)
return null;
+
+ return getComponents()[0];
}
public void setView(Component v)
@@ -214,8 +214,9 @@
public void addImpl(Component comp, Object constraints, int index)
{
- if (ncomponents > 0)
- remove(component[0]);
+ if (getComponentCount() > 0)
+ remove(getComponents()[0]);
+
super.addImpl(comp, constraints, index);
}
Index: javax/swing/Timer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Timer.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Timer.java
--- javax/swing/Timer.java 24 Jun 2003 09:48:40 -0000 1.3
+++ javax/swing/Timer.java 19 Mar 2004 20:40:13 -0000
@@ -158,12 +156,12 @@
repeat_ticks = flag;
}
- boolean isRunning()
+ public boolean isRunning()
{
return running;
}
- void start()
+ public void start()
{
if (isRunning())
{
@@ -173,7 +171,7 @@
new Waker().start();
}
- void stop()
+ public void stop()
{
running = false;
}
Index: javax/swing/UIDefaults.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/UIDefaults.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 UIDefaults.java
--- javax/swing/UIDefaults.java 12 Feb 2004 00:17:23 -0000 1.7
+++ javax/swing/UIDefaults.java 19 Mar 2004 20:40:13 -0000
@@ -369,13 +369,13 @@
return o instanceof String ? (String) o : null;
}
- int getInt(Object key)
+ public int getInt(Object key)
{
Object o = get(key);
return o instanceof Integer ? ((Integer) o).intValue() : 0;
}
- int getInt(Object key, Locale l)
+ public int getInt(Object key, Locale l)
{
Object o = get(key, l);
return o instanceof Integer ? ((Integer) o).intValue() : 0;
Index: javax/swing/plaf/basic/BasicListUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicListUI.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 BasicListUI.java
--- javax/swing/plaf/basic/BasicListUI.java 17 Mar 2004 21:29:00 -0000 1.5
+++ javax/swing/plaf/basic/BasicListUI.java 19 Mar 2004 20:40:13 -0000
@@ -190,7 +190,7 @@
public void mousePressed(MouseEvent event)
{
// System.err.println("got mouse click event " + event);
- int row = BasicListUI.this.convertYToRow(event.y);
+ int row = BasicListUI.this.convertYToRow(event.getY());
if (row == -1)
return;
@@ -263,13 +263,13 @@
public void propertyChange(PropertyChangeEvent e)
{
// System.err.println(this + ".propertyChange(" + e + ")");
- if (e.source == BasicListUI.this.list)
+ if (e.getSource() == BasicListUI.this.list)
{
- if (e.oldValue != null && e.oldValue instanceof ListModel)
- ((ListModel) e.oldValue).removeListDataListener(BasicListUI.this.listDataListener);
+ if (e.getOldValue() != null && e.getOldValue() instanceof ListModel)
+ ((ListModel) e.getOldValue()).removeListDataListener(BasicListUI.this.listDataListener);
- if (e.newValue != null && e.newValue instanceof ListModel)
- ((ListModel) e.newValue).addListDataListener(BasicListUI.this.listDataListener);
+ if (e.getNewValue() != null && e.getNewValue() instanceof ListModel)
+ ((ListModel) e.getNewValue()).addListDataListener(BasicListUI.this.listDataListener);
}
BasicListUI.this.damageLayout();
}
Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicScrollBarUI.java
--- javax/swing/plaf/basic/BasicScrollBarUI.java 17 Mar 2004 21:29:01 -0000 1.2
+++ javax/swing/plaf/basic/BasicScrollBarUI.java 19 Mar 2004 20:40:14 -0000
@@ -472,7 +472,7 @@
* A helper class that allows us to draw icons for
* the JButton.
*/
- private class arrowIcon implements Icon
+ private static class arrowIcon implements Icon
{
/** The polygon that describes the icon. */
private Polygon arrow;
Index: javax/swing/plaf/basic/BasicViewportUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicViewportUI.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 BasicViewportUI.java
--- javax/swing/plaf/basic/BasicViewportUI.java 17 Mar 2004 21:29:01 -0000 1.4
+++ javax/swing/plaf/basic/BasicViewportUI.java 19 Mar 2004 20:40:14 -0000
@@ -64,7 +64,7 @@
{
public void stateChanged(ChangeEvent event)
{
- JViewport v = (JViewport)event.source;
+ JViewport v = (JViewport) event.getSource();
v.repaint();
}
}
Index: javax/swing/text/JTextComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/JTextComponent.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 JTextComponent.java
--- javax/swing/text/JTextComponent.java 12 Feb 2004 00:17:26 -0000 1.4
+++ javax/swing/text/JTextComponent.java 19 Mar 2004 20:40:14 -0000
@@ -473,13 +473,13 @@
}
public TextUI getUI()
- { return (TextUI) ui;
+ {
+ return (TextUI) UIManager.getUI(this);
}
public void updateUI()
{
- TextUI b = (TextUI)UIManager.getUI(this);
- setUI(b);
+ setUI(getUI());
}
public Dimension getPreferredScrollableViewportSize()