Commit 4f90e1c5 by Michael Koch Committed by Michael Koch

2004-01-28 Michael Koch <konqueror@gmx.de>

	* javax/swing/JComponent.java
	(listenerList): Initalize globally.
	(ancestor_list): Removed.
	(veto_list): Removed.
	(change_list): Removed.
	(get_veto_list): Removed.
	(get_change_list): Removed.
	(get_ancestor_list): Removed.
	(removeAncestorListener): Reimplemented.
	(removePropertyChangeListener): Likewise.
	(removeVetoableChangeListener): Likewise.
	(addAncestorListener): Likewise.
	(addPropertyChangeListener): Likewise.
	(addVetoableChangeListener): Likewise.
	(getListeners): New method.
	(getAncestorListeners): Likewise.
	(getVetoableChangeListeners): Likewise.
	(fireVetoableChange): Throws PropertyVetoException.
	* javax/swing/JEditorPane.java
	(JEditorPane): Throws IOException.

From-SVN: r76802
parent 685fe032
2004-01-28 Michael Koch <konqueror@gmx.de>
* javax/swing/JComponent.java
(listenerList): Initalize globally.
(ancestor_list): Removed.
(veto_list): Removed.
(change_list): Removed.
(get_veto_list): Removed.
(get_change_list): Removed.
(get_ancestor_list): Removed.
(removeAncestorListener): Reimplemented.
(removePropertyChangeListener): Likewise.
(removeVetoableChangeListener): Likewise.
(addAncestorListener): Likewise.
(addPropertyChangeListener): Likewise.
(addVetoableChangeListener): Likewise.
(getListeners): New method.
(getAncestorListeners): Likewise.
(getVetoableChangeListeners): Likewise.
(fireVetoableChange): Throws PropertyVetoException.
* javax/swing/JEditorPane.java
(JEditorPane): Throws IOException.
2004-01-28 David Jee <djee@redhat.com> 2004-01-28 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFramePeer.java * gnu/java/awt/peer/gtk/GtkFramePeer.java
......
/* JComponent.java -- Every component in swing inherits from this class. /* JComponent.java -- Every component in swing inherits from this class.
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
...@@ -63,8 +63,9 @@ import java.beans.PropertyChangeListener; ...@@ -63,8 +63,9 @@ import java.beans.PropertyChangeListener;
import java.beans.PropertyVetoException; import java.beans.PropertyVetoException;
import java.beans.VetoableChangeListener; import java.beans.VetoableChangeListener;
import java.io.Serializable; import java.io.Serializable;
import java.util.Vector; import java.util.EventListener;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Vector;
import javax.accessibility.Accessible; import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleExtendedComponent; import javax.accessibility.AccessibleExtendedComponent;
...@@ -86,6 +87,9 @@ import javax.swing.plaf.ComponentUI; ...@@ -86,6 +87,9 @@ import javax.swing.plaf.ComponentUI;
public abstract class JComponent extends Container implements Serializable public abstract class JComponent extends Container implements Serializable
{ {
static final long serialVersionUID = -5242478962609715464L; static final long serialVersionUID = -5242478962609715464L;
protected EventListenerList listenerList = new EventListenerList();
/** /**
* accessibleContext * accessibleContext
*/ */
...@@ -98,9 +102,6 @@ public abstract class JComponent extends Container implements Serializable ...@@ -98,9 +102,6 @@ public abstract class JComponent extends Container implements Serializable
boolean use_double_buffer, opaque; boolean use_double_buffer, opaque;
protected ComponentUI ui; protected ComponentUI ui;
Vector ancestor_list;
Vector veto_list;
Vector change_list;
Hashtable prop_hash; Hashtable prop_hash;
/** /**
...@@ -273,16 +274,12 @@ public abstract class JComponent extends Container implements Serializable ...@@ -273,16 +274,12 @@ public abstract class JComponent extends Container implements Serializable
super(); super();
super.setLayout(new FlowLayout()); super.setLayout(new FlowLayout());
listenerList = new EventListenerList();
//eventMask |= AWTEvent.COMP_KEY_EVENT_MASK; //eventMask |= AWTEvent.COMP_KEY_EVENT_MASK;
// enableEvents( AWTEvent.KEY_EVENT_MASK ); // enableEvents( AWTEvent.KEY_EVENT_MASK );
//updateUI(); // get a proper ui //updateUI(); // get a proper ui
} }
protected EventListenerList listenerList;
public boolean contains(int x, int y) public boolean contains(int x, int y)
{ {
//return dims.contains(x,y); //return dims.contains(x,y);
...@@ -301,24 +298,6 @@ public abstract class JComponent extends Container implements Serializable ...@@ -301,24 +298,6 @@ public abstract class JComponent extends Container implements Serializable
prop_hash = new Hashtable(); prop_hash = new Hashtable();
return prop_hash; return prop_hash;
} }
public Vector get_veto_list()
{
if (veto_list == null)
veto_list = new Vector();
return veto_list;
}
public Vector get_change_list()
{
if (change_list == null)
change_list = new Vector();
return change_list;
}
public Vector get_ancestor_list()
{
if (ancestor_list == null)
ancestor_list = new Vector();
return ancestor_list;
}
public Object getClientProperty(Object key) public Object getClientProperty(Object key)
{ return get_prop_hash().get(key); } { return get_prop_hash().get(key); }
...@@ -326,29 +305,99 @@ public abstract class JComponent extends Container implements Serializable ...@@ -326,29 +305,99 @@ public abstract class JComponent extends Container implements Serializable
public void putClientProperty(Object key, Object value) public void putClientProperty(Object key, Object value)
{ get_prop_hash().put(key, value); } { get_prop_hash().put(key, value); }
public void removeAncestorListener(AncestorListener listener) /**
{ get_ancestor_list().removeElement(listener); } * Unregister an <code>AncestorListener</code>.
*/
public void removePropertyChangeListener(PropertyChangeListener listener) public void removeAncestorListener(AncestorListener listener)
{ get_change_list().removeElement(listener); } {
listenerList.remove(AncestorListener.class, listener);
public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) }
{ /* FIXME */ get_change_list().removeElement(listener); }
/**
public void removeVetoableChangeListener(VetoableChangeListener listener) * Unregister a <code>PropertyChangeListener</code>.
{ get_veto_list().removeElement(listener); } */
public void removePropertyChangeListener(PropertyChangeListener listener)
public void addAncestorListener(AncestorListener listener) {
{ get_ancestor_list().addElement(listener); } listenerList.remove(PropertyChangeListener.class, listener);
}
public void addPropertyChangeListener(PropertyChangeListener listener)
{ get_change_list().addElement(listener); } /**
* Unregister a <code>PropertyChangeListener</code>.
public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) */
{ /* FIXME */ get_change_list().addElement(listener); } public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener)
{
public void addVetoableChangeListener(VetoableChangeListener listener) listenerList.remove(PropertyChangeListener.class, listener);
{ get_veto_list().addElement(listener); } }
/**
* Unregister a <code>VetoableChangeChangeListener</code>.
*/
public void removeVetoableChangeListener(VetoableChangeListener listener)
{
listenerList.remove(VetoableChangeListener.class, listener);
}
/**
* Register an <code>AncestorListener</code>.
*/
public void addAncestorListener(AncestorListener listener)
{
listenerList.add(AncestorListener.class, listener);
}
/**
* Register a <code>PropertyChangeListener</code>.
*/
public void addPropertyChangeListener(PropertyChangeListener listener)
{
listenerList.add(PropertyChangeListener.class, listener);
}
/**
* Register a <code>PropertyChangeListener</code>.
*/
public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener)
{
listenerList.add(PropertyChangeListener.class, listener);
}
/**
* Register a <code>VetoableChangeListener</code>.
*/
public void addVetoableChangeListener(VetoableChangeListener listener)
{
listenerList.add(VetoableChangeListener.class, listener);
}
/**
* Return all registered listeners of a special type.
*
* @since 1.3
*/
public EventListener[] getListeners (Class listenerType)
{
return listenerList.getListeners (listenerType);
}
/**
* Return all registered <code>Ancestor</code> objects.
*
* @since 1.4
*/
public AncestorListener[] getAncestorListeners()
{
return (AncestorListener[]) getListeners (AncestorListener.class);
}
/**
* Return all registered <code>VetoableChangeListener</code> objects.
*
* @since 1.4
*/
public VetoableChangeListener[] getVetoableChangeListeners()
{
return (VetoableChangeListener[]) getListeners (VetoableChangeListener.class);
}
public void computeVisibleRect(Rectangle rect) public void computeVisibleRect(Rectangle rect)
{ {
...@@ -397,6 +446,7 @@ public abstract class JComponent extends Container implements Serializable ...@@ -397,6 +446,7 @@ public abstract class JComponent extends Container implements Serializable
} }
protected void fireVetoableChange(String propertyName, Object oldValue, Object newValue) protected void fireVetoableChange(String propertyName, Object oldValue, Object newValue)
throws PropertyVetoException
{ {
// Support for reporting constrained property changes. // Support for reporting constrained property changes.
} }
......
/* JEditorPane.java -- /* JEditorPane.java --
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
...@@ -41,6 +41,7 @@ package javax.swing; ...@@ -41,6 +41,7 @@ package javax.swing;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.io.InputStream; import java.io.InputStream;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleContext;
import javax.swing.text.EditorKit; import javax.swing.text.EditorKit;
...@@ -63,6 +64,7 @@ public class JEditorPane extends JTextComponent ...@@ -63,6 +64,7 @@ public class JEditorPane extends JTextComponent
} }
public JEditorPane(String url) public JEditorPane(String url)
throws IOException
{ {
this(); this();
setPage(url); setPage(url);
...@@ -75,6 +77,7 @@ public class JEditorPane extends JTextComponent ...@@ -75,6 +77,7 @@ public class JEditorPane extends JTextComponent
} }
public JEditorPane(URL url) public JEditorPane(URL url)
throws IOException
{ {
setPage(url); setPage(url);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment