Skip to content

R
riscv-gcc-1
Commit cac9b0bc by Michael Koch Committed by Michael Koch
Options

AbstractListModel.java, [...]: New Versions from classpath. 

2003-04-29  Michael Koch  <konqueror@gmx.de>

	* javax/swing/AbstractListModel.java,
	javax/swing/DefaultBoundedRangeModel.java,
	javax/swing/DefaultSingleSelectionModel.java:
	New Versions from classpath.

From-SVN: r66212
parent 7e89296c
Showing with 582 additions and 601 deletions
libjava/ChangeLog
2003-04-29 Michael Koch <konqueror@gmx.de> 2003-04-29 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractListModel.java,
javax/swing/DefaultBoundedRangeModel.java,
javax/swing/DefaultSingleSelectionModel.java:
New Versions from classpath.
2003-04-29 Michael Koch <konqueror@gmx.de>
* java/awt/Window.java * java/awt/Window.java
(show): Call super.show() instead of setVisible() to avoid endless (show): Call super.show() instead of setVisible() to avoid endless
loop. loop.
......
libjava/javax/swing/AbstractListModel.java
...@@ -37,10 +37,11 @@ exception statement from your version. */ ...@@ -37,10 +37,11 @@ exception statement from your version. */
package javax.swing; package javax.swing;
// Imports import java.io.Serializable;
import java.io.*; import java.util.EventListener;
import java.util.*; import javax.swing.event.EventListenerList;
import javax.swing.event.*; import javax.swing.event.ListDataListener;
import javax.swing.event.ListDataEvent;
/** /**
* AbstractListModel * AbstractListModel
...@@ -53,164 +54,152 @@ public abstract class AbstractListModel ...@@ -53,164 +54,152 @@ public abstract class AbstractListModel
{ {
static final long serialVersionUID = -3285184064379168730L; static final long serialVersionUID = -3285184064379168730L;
//------------------------------------------------------------- /**
// Variables -------------------------------------------------- * listenerList
//------------------------------------------------------------- */
protected EventListenerList listenerList = new EventListenerList ();
/**
* listenerList /**
*/ * Constructor AbstractListModel
protected EventListenerList listenerList = new EventListenerList(); */
public AbstractListModel ()
{
//------------------------------------------------------------- }
// Initialization ---------------------------------------------
//------------------------------------------------------------- /**
* addListDataListener
/** * @param listener TODO
* Constructor AbstractListModel */
*/ public void addListDataListener(ListDataListener listener)
public AbstractListModel() { {
} // AbstractListModel() listenerList.add (ListDataListener.class, listener);
}
//------------------------------------------------------------- /**
// Methods ---------------------------------------------------- * removeListDataListener
//------------------------------------------------------------- * @param listener TODO
*/
/** public void removeListDataListener(ListDataListener listener)
* addListDataListener {
* @param listener TODO listenerList.remove (ListDataListener.class, listener);
*/ }
public void addListDataListener(ListDataListener listener) {
listenerList.add(ListDataListener.class, (EventListener) listener); /**
} // addListDataListener() * fireContentsChanged
* @param source TODO
/** * @param startIndex TODO
* removeListDataListener * @param endIndex TODO
* @param listener TODO */
*/ protected void fireContentsChanged(Object source, int startIndex, int endIndex)
public void removeListDataListener(ListDataListener listener) { {
listenerList.remove(ListDataListener.class, (EventListener) listener); // Variables
} // removeListDataListener() ListDataEvent event;
ListDataListener[] listeners;
/** ListDataListener listener;
* fireContentsChanged int index;
* @param source TODO
* @param startIndex TODO // Create Event
* @param endIndex TODO event = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED,
*/ startIndex, endIndex);
protected void fireContentsChanged(Object source, int startIndex, int endIndex) {
// Get Listeners
// Variables listeners = getListDataListeners ();
ListDataEvent event;
EventListener[] listeners; // Process Listeners
ListDataListener listener; for (index = 0; index < listeners.length; index++)
int index; {
listener = (ListDataListener) listeners[index];
// Create Event listener.contentsChanged(event);
event = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED, }
startIndex, endIndex); }
// Get Listeners /**
listeners = listenerList.getListeners(ListDataListener.class); * fireIntervalAdded
* @param source TODO
// Process Listeners * @param startIndex TODO
for (index = 0; index < listeners.length; index++) { * @param endIndex TODO
listener = (ListDataListener) listeners[index]; */
listener.contentsChanged(event); protected void fireIntervalAdded (Object source, int startIndex, int endIndex)
} // for {
// Variables
} // fireContentsChanged() ListDataEvent event;
ListDataListener[] listeners;
/** ListDataListener listener;
* fireIntervalAdded int index;
* @param source TODO
* @param startIndex TODO // Create Event
* @param endIndex TODO event = new ListDataEvent (source, ListDataEvent.INTERVAL_ADDED, startIndex,
*/ endIndex);
protected void fireIntervalAdded(Object source, int startIndex, int endIndex) {
// Get Listeners
// Variables listeners = getListDataListeners ();
ListDataEvent event;
EventListener[] listeners; // Process Listeners
ListDataListener listener; for (index = 0; index < listeners.length; index++)
int index; {
listener = listeners [index];
// Create Event listener.intervalAdded (event);
event = new ListDataEvent(source, ListDataEvent.INTERVAL_ADDED, }
startIndex, endIndex); }
// Get Listeners /**
listeners = listenerList.getListeners(ListDataListener.class); * fireIntervalRemoved
* @param source TODO
// Process Listeners * @param startIndex TODO
for (index = 0; index < listeners.length; index++) { * @param endIndex TODO
listener = (ListDataListener) listeners[index]; */
listener.intervalAdded(event); protected void fireIntervalRemoved (Object source, int startIndex,
} // for int endIndex)
{
} // fireIntervalAdded() // Variables
ListDataEvent event;
/** ListDataListener[] listeners;
* fireIntervalRemoved ListDataListener listener;
* @param source TODO int index;
* @param startIndex TODO
* @param endIndex TODO // Create Event
*/ event = new ListDataEvent (source, ListDataEvent.INTERVAL_REMOVED,
protected void fireIntervalRemoved(Object source, int startIndex, int endIndex) { startIndex, endIndex);
// Variables // Get Listeners
ListDataEvent event; listeners = getListDataListeners ();
EventListener[] listeners;
ListDataListener listener; // Process Listeners
int index; for (index = 0; index < listeners.length; index++)
{
// Create Event listener = listeners [index];
event = new ListDataEvent(source, ListDataEvent.INTERVAL_REMOVED, listener.intervalRemoved (event);
startIndex, endIndex); }
}
// Get Listeners
listeners = listenerList.getListeners(ListDataListener.class); /**
* getListeners
// Process Listeners * @param listenerType TODO
for (index = 0; index < listeners.length; index++) { * @returns EventListener[]
listener = (ListDataListener) listeners[index]; */
listener.intervalRemoved(event); public EventListener[] getListeners (Class listenerType)
} // for {
return listenerList.getListeners (listenerType);
} // fireIntervalRemoved() }
/** /**
* getListeners * getListDataListeners
* @param listenerType TODO */
* @returns EventListener[] public ListDataListener[] getListDataListeners ()
*/ {
public EventListener[] getListeners(Class listenerType) { return (ListDataListener[]) getListeners (ListDataListener.class);
return listenerList.getListeners(listenerType); }
} // getListeners()
/**
/** * getElementAt
* getListDataListeners * @param index TODO
*/ * @returns Object
public ListDataListener[] getListDataListeners() */
{ public abstract Object getElementAt (int index);
// FIXME: implement this
return null; /**
} * getSize
* @returns int
/** */
* getElementAt public abstract int getSize ();
* @param index TODO }
* @returns Object
*/
public abstract Object getElementAt(int index);
/**
* getSize
* @returns int
*/
public abstract int getSize();
} // AbstractListModel
libjava/javax/swing/DefaultBoundedRangeModel.java
...@@ -37,10 +37,11 @@ exception statement from your version. */ ...@@ -37,10 +37,11 @@ exception statement from your version. */
package javax.swing; package javax.swing;
// Imports import java.io.Serializable;
import java.io.*; import java.util.EventListener;
import java.util.*; import javax.swing.event.ChangeEvent;
import javax.swing.event.*; import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
/** /**
* DefaultBoundedRangeModel * DefaultBoundedRangeModel
...@@ -52,299 +53,296 @@ public class DefaultBoundedRangeModel ...@@ -52,299 +53,296 @@ public class DefaultBoundedRangeModel
{ {
static final long serialVersionUID = 5034068491295259790L; static final long serialVersionUID = 5034068491295259790L;
//------------------------------------------------------------- /**
// Variables -------------------------------------------------- * changeEvent
//------------------------------------------------------------- */
protected transient ChangeEvent changeEvent = new ChangeEvent (this);
/**
* changeEvent /**
*/ * listenerList
protected transient ChangeEvent changeEvent = new ChangeEvent(this); */
protected EventListenerList listenerList = new EventListenerList ();
/**
* listenerList /**
*/ * value
protected EventListenerList listenerList = new EventListenerList(); */
private int value;
/**
* value /**
*/ * extent
private int value; */
private int extent;
/**
* extent /**
*/ * minimum
private int extent; */
private int minimum;
/**
* minimum /**
*/ * maximum
private int minimum; */
private int maximum;
/**
* maximum /**
*/ * isAdjusting
private int maximum; */
private boolean isAdjusting;
/**
* isAdjusting /**
*/ * Constructor DefaultBoundedRangeModel
private boolean isAdjusting; */
public DefaultBoundedRangeModel ()
{
//------------------------------------------------------------- setRangeProperties (0, 0, 0, 100, false);
// Initialization --------------------------------------------- }
//-------------------------------------------------------------
/**
/** * Constructor DefaultBoundedRangeModel
* Constructor DefaultBoundedRangeModel * @param value TODO
*/ * @param extent TODO
public DefaultBoundedRangeModel() { * @param minimum TODO
setRangeProperties(0, 0, 0, 100, false); * @param maximum TODO
} // DefaultBoundedRangeModel() */
public DefaultBoundedRangeModel (int value, int extent, int minimum,
/** int maximum)
* Constructor DefaultBoundedRangeModel {
* @param value TODO setRangeProperties(value, extent, minimum, maximum, false);
* @param extent TODO }
* @param minimum TODO
* @param maximum TODO /**
*/ * toString
public DefaultBoundedRangeModel(int value, int extent, * @returns String
int minimum, int maximum) { */
setRangeProperties(value, extent, minimum, maximum, false); public String toString ()
} // DefaultBoundedRangeModel() {
return null; // TODO
}
//-------------------------------------------------------------
// Methods ---------------------------------------------------- /**
//------------------------------------------------------------- * getValue
* @returns int
/** */
* toString public int getValue ()
* @returns String {
*/ return value;
public String toString() { }
return null; // TODO
} // toString() /**
* setValue
/** * @param value TODO
* getValue */
* @returns int public void setValue (int value)
*/ {
public int getValue() { // Validate Constraints
return value; if (minimum > value ||
} // getValue() value > (value + extent) ||
(value + extent) > maximum)
/** {
* setValue throw new IllegalArgumentException ("Invalid value property set");
* @param value TODO }
*/
public void setValue(int value) {
// Validate Constraints
if (minimum > value || value > (value + extent) ||
(value + extent) > maximum) {
throw new IllegalArgumentException("Invalid value property set");
} // if
// Set Value // Set Value
this.value = value; this.value = value;
// Notification // Notification
fireStateChanged(); fireStateChanged ();
}
} // setValue()
/**
/** * getExtent
* getExtent * @returns int
* @returns int */
*/ public int getExtent ()
public int getExtent() { {
return extent; return extent;
} // getExtent() }
/** /**
* setExtent * setExtent
* @param extent TODO * @param extent TODO
*/ */
public void setExtent(int extent) { public void setExtent (int extent)
{
// Validate Constraints // Validate Constraints
if (minimum > value || value > (value + extent) || if (minimum > value ||
(value + extent) > maximum) { value > (value + extent) ||
throw new IllegalArgumentException("Invalid extent property set"); (value + extent) > maximum)
} // if {
throw new IllegalArgumentException("Invalid extent property set");
}
// Set Extent
this.extent = extent;
// Set Extent // Notification
this.extent = extent; fireStateChanged ();
}
/**
* getMinimum
* @returns int
*/
public int getMinimum ()
{
return minimum;
}
/**
* setMinimum
* @param minimum TODO
*/
public void setMinimum (int minimum)
{
// Validate Constraints
if (minimum > value ||
value > (value + extent) ||
(value + extent) > maximum)
{
throw new IllegalArgumentException("Invalid minimum property set");
}
// Notification // Set Minimum
fireStateChanged(); this.minimum = minimum;
} // setExtent()
/**
* getMinimum
* @returns int
*/
public int getMinimum() {
return minimum;
} // getMinimum()
/**
* setMinimum
* @param minimum TODO
*/
public void setMinimum(int minimum) {
// Validate Constraints
if (minimum > value || value > (value + extent) ||
(value + extent) > maximum) {
throw new IllegalArgumentException("Invalid minimum property set");
} // if
// Set Minimum // Notification
this.minimum = minimum; fireStateChanged ();
}
// Notification
fireStateChanged(); /**
* getMaximum
} // setMinimum() * @returns int
*/
/** public int getMaximum() {
* getMaximum
* @returns int
*/
public int getMaximum() {
return maximum; return maximum;
} // getMaximum() }
/** /**
* setMaximum * setMaximum
* @param maximum TODO * @param maximum TODO
*/ */
public void setMaximum(int maximum) { public void setMaximum (int maximum)
{
// Validate Constraints // Validate Constraints
if (minimum > value || value > (value + extent) || if (minimum > value ||
(value + extent) > maximum) { value > (value + extent) ||
throw new IllegalArgumentException("Invalid maximum property set"); (value + extent) > maximum)
} // if {
throw new IllegalArgumentException ("Invalid maximum property set");
// Set Maximum }
this.maximum = maximum;
// Set Maximum
// Notification this.maximum = maximum;
fireStateChanged();
// Notification
} // setMaximum() fireStateChanged ();
}
/**
* getValueIsAdjusting /**
* @returns boolean * getValueIsAdjusting
*/ * @returns boolean
public boolean getValueIsAdjusting() { */
return isAdjusting; public boolean getValueIsAdjusting ()
} // getValueIsAdjusting() {
return isAdjusting;
/** }
* setValueIsAdjusting
* @param isAdjusting TODO /**
*/ * setValueIsAdjusting
public void setValueIsAdjusting(boolean isAdjusting) { * @param isAdjusting TODO
*/
// Set isAdjusting public void setValueIsAdjusting (boolean isAdjusting)
this.isAdjusting = isAdjusting; {
// Set isAdjusting
// Notification this.isAdjusting = isAdjusting;
fireStateChanged();
// Notification
} // setValueIsAdjusting() fireStateChanged();
}
/**
* setRangeProperties /**
* @param value TODO * setRangeProperties
* @param extent TODO * @param value TODO
* @param minimum TODO * @param extent TODO
* @param maximum TODO * @param minimum TODO
* @param isAdjusting TODO * @param maximum TODO
*/ * @param isAdjusting TODO
public void setRangeProperties(int value, int extent, int minimum, */
int maximum, boolean isAdjusting) { public void setRangeProperties (int value, int extent, int minimum,
int maximum, boolean isAdjusting)
// Validate Constraints {
if (minimum > value || value > (value + extent) || // Validate Constraints
(value + extent) > maximum) { if (minimum > value ||
throw new IllegalArgumentException("Invalid property set"); value > (value + extent) ||
} // if (value + extent) > maximum)
{
// Set Data throw new IllegalArgumentException ("Invalid property set");
this.value = value; }
this.extent = extent;
this.minimum = minimum; // Set Data
this.maximum = maximum; this.value = value;
this.isAdjusting = isAdjusting; this.extent = extent;
this.minimum = minimum;
this.maximum = maximum;
this.isAdjusting = isAdjusting;
// Notification // Notification
fireStateChanged(); fireStateChanged ();
}
} // setRangeProperties()
/**
/** * addChangeListener
* addChangeListener * @param listener TODO
* @param listener TODO */
*/ public void addChangeListener (ChangeListener listener)
public void addChangeListener(ChangeListener listener) { {
listenerList.add(ChangeListener.class, listener); listenerList.add (ChangeListener.class, listener);
} // addChangeListener() }
/** /**
* removeChangeListener * removeChangeListener
* @param listener TODO * @param listener TODO
*/ */
public void removeChangeListener(ChangeListener listener) { public void removeChangeListener (ChangeListener listener)
listenerList.remove(ChangeListener.class, listener); {
} // removeChangeListener() listenerList.remove (ChangeListener.class, listener);
}
/**
* fireStateChanged /**
*/ * fireStateChanged
protected void fireStateChanged() { */
protected void fireStateChanged ()
// Variables {
ChangeListener listener; // Variables
EventListener[] listeners; ChangeListener listener;
int index; ChangeListener[] listeners;
int index;
// Get Listeners
listeners = listenerList.getListeners(ChangeListener.class); // Get Listeners
listeners = getChangeListeners ();
// Process Listeners
for (index = 0; index < listeners.length; index++) { // Process Listeners
listener = (ChangeListener) listeners[index]; for (index = 0; index < listeners.length; index++)
listener.stateChanged(changeEvent); {
} // for listener = listeners [index];
listener.stateChanged (changeEvent);
} // fireStateChanged() }
}
/**
* getListeners /**
* @param c TODO * getListeners
* @returns EventListener[] * @param c TODO
*/ * @returns EventListener[]
public EventListener[] getListeners(Class c) { */
return listenerList.getListeners(c); public EventListener[] getListeners (Class listenerType)
} // getListeners() {
return listenerList.getListeners (listenerType);
/** }
* getChangeListeners
*/ /**
public ChangeListener[] getChangeListeners() * getChangeListeners
{ */
// FIXME: implement this public ChangeListener[] getChangeListeners ()
return null; {
} return (ChangeListener[]) getListeners (ChangeListener.class);
}
}
} // DefaultBoundedRangeModel
libjava/javax/swing/DefaultSingleSelectionModel.java
...@@ -37,154 +37,141 @@ exception statement from your version. */ ...@@ -37,154 +37,141 @@ exception statement from your version. */
package javax.swing; package javax.swing;
// Imports import java.io.Serializable;
import java.io.*; import java.util.EventListener;
import java.util.*; import javax.swing.event.ChangeEvent;
import javax.swing.event.*; import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
/** /**
* DefaultSingleSelectionModel * DefaultSingleSelectionModel
* @author Andrew Selkirk * @author Andrew Selkirk
* @version 1.0 * @version 1.0
*/ */
public class DefaultSingleSelectionModel implements public class DefaultSingleSelectionModel
SingleSelectionModel, Serializable implements SingleSelectionModel, Serializable
{ {
static final long serialVersionUID = 3676229404753786004L; static final long serialVersionUID = 3676229404753786004L;
//------------------------------------------------------------- /**
// Variables -------------------------------------------------- * changeEvent
//------------------------------------------------------------- */
protected transient ChangeEvent changeEvent = new ChangeEvent (this);
/**
* changeEvent /**
*/ * listenerList
protected transient ChangeEvent changeEvent = new ChangeEvent(this); */
protected EventListenerList listenerList= new EventListenerList ();
/**
* listenerList /**
*/ * index
protected EventListenerList listenerList= new EventListenerList(); */
private int index = -1;
/**
* index /**
*/ * Constructor DefaultSingleSelectionModel
private int index = -1; */
public DefaultSingleSelectionModel ()
{
//------------------------------------------------------------- }
// Initialization ---------------------------------------------
//------------------------------------------------------------- /**
* getSelectedIndex
/** * @returns int
* Constructor DefaultSingleSelectionModel */
*/ public int getSelectedIndex ()
public DefaultSingleSelectionModel() { {
// TODO return index;
} // DefaultSingleSelectionModel() }
/**
//------------------------------------------------------------- * setSelectedIndex
// Methods ---------------------------------------------------- * @param index TODO
//------------------------------------------------------------- */
public void setSelectedIndex (int index)
/** {
* getSelectedIndex // Set Data
* @returns int this.index = index;
*/
public int getSelectedIndex() { // Notify Listeners
return index; fireStateChanged ();
} // getSelectedIndex() }
/** /**
* setSelectedIndex * clearSelection
* @param index TODO */
*/ public void clearSelection ()
public void setSelectedIndex(int index) { {
// Set Data
// Set Data index = -1;
this.index = index;
// Notify Listeners
// Notify Listeners fireStateChanged ();
fireStateChanged(); }
} // setSelectedIndex() /**
* isSelected
/** * @returns boolean
* clearSelection */
*/ public boolean isSelected ()
public void clearSelection() { {
return (index == -1);
// Set Data }
index = -1;
/**
// Notify Listeners * addChangeListener
fireStateChanged(); * @param listener TODO
*/
} // clearSelection() public void addChangeListener (ChangeListener listener)
{
/** listenerList.add (ChangeListener.class, listener);
* isSelected }
* @returns boolean
*/ /**
public boolean isSelected() { * removeChangeListener
return (index == -1); * @param listener TODO
} // isSelected() */
public void removeChangeListener (ChangeListener listener)
/** {
* addChangeListener listenerList.remove (ChangeListener.class, listener);
* @param listener TODO }
*/
public void addChangeListener(ChangeListener listener) { /**
listenerList.add(ChangeListener.class, listener); * fireStateChanged
} // addChangeListener() */
protected void fireStateChanged ()
/** {
* removeChangeListener // Variables
* @param listener TODO ChangeListener listener;
*/ ChangeListener[] listeners;
public void removeChangeListener(ChangeListener listener) { int index;
listenerList.remove(ChangeListener.class, listener);
} // removeChangeListener() // Get Listeners
listeners = getChangeListeners ();
/**
* fireStateChanged // Process Listeners
*/ for (index = 0; index < listeners.length; index++)
protected void fireStateChanged() { {
listener = listeners [index];
// Variables listener.stateChanged (changeEvent);
ChangeListener listener; }
EventListener[] listeners; }
int index;
/**
// Get Listeners * getListeners
listeners = listenerList.getListeners(ChangeListener.class); * @param listenerClass TODO
* @returns EventListener[]
// Process Listeners */
for (index = 0; index < listeners.length; index++) { public EventListener[] getListeners (Class listenerClass)
listener = (ChangeListener) listeners[index]; {
listener.stateChanged(changeEvent); return listenerList.getListeners (listenerClass);
} // for }
} // fireStateChanged() /**
* getChangeListeners
/** */
* getListeners public ChangeListener[] getChangeListeners ()
* @param listenerClass TODO {
* @returns EventListener[] return (ChangeListener[]) getListeners (ChangeListener.class);
*/ }
public EventListener[] getListeners(Class listenerClass) { }
return listenerList.getListeners(listenerClass);
} // getListeners()
/**
* getChangeListeners
*/
public ChangeListener[] getChangeListeners()
{
// FIXME: implement this
return null;
}
} // DefaultSingleSelectionModel
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