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
This commit is contained in:
Michael Koch 2003-04-29 09:26:29 +00:00 committed by Michael Koch
parent 7e89296c0b
commit cac9b0bcb1
4 changed files with 517 additions and 536 deletions

View file

@ -1,3 +1,10 @@
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

View file

@ -37,10 +37,11 @@ exception statement from your version. */
package javax.swing;
// Imports
import java.io.*;
import java.util.*;
import javax.swing.event.*;
import java.io.Serializable;
import java.util.EventListener;
import javax.swing.event.EventListenerList;
import javax.swing.event.ListDataListener;
import javax.swing.event.ListDataEvent;
/**
* AbstractListModel
@ -53,164 +54,152 @@ public abstract class AbstractListModel
{
static final long serialVersionUID = -3285184064379168730L;
//-------------------------------------------------------------
// Variables --------------------------------------------------
//-------------------------------------------------------------
/**
* listenerList
*/
protected EventListenerList listenerList = new EventListenerList ();
/**
* Constructor AbstractListModel
*/
public AbstractListModel ()
{
}
/**
* listenerList
*/
protected EventListenerList listenerList = new EventListenerList();
/**
* addListDataListener
* @param listener TODO
*/
public void addListDataListener(ListDataListener listener)
{
listenerList.add (ListDataListener.class, listener);
}
/**
* removeListDataListener
* @param listener TODO
*/
public void removeListDataListener(ListDataListener listener)
{
listenerList.remove (ListDataListener.class, listener);
}
//-------------------------------------------------------------
// Initialization ---------------------------------------------
//-------------------------------------------------------------
/**
* fireContentsChanged
* @param source TODO
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireContentsChanged(Object source, int startIndex, int endIndex)
{
// Variables
ListDataEvent event;
ListDataListener[] listeners;
ListDataListener listener;
int index;
/**
* Constructor AbstractListModel
*/
public AbstractListModel() {
} // AbstractListModel()
// Create Event
event = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED,
startIndex, endIndex);
// Get Listeners
listeners = getListDataListeners ();
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
// Process Listeners
for (index = 0; index < listeners.length; index++)
{
listener = (ListDataListener) listeners[index];
listener.contentsChanged(event);
}
}
/**
* addListDataListener
* @param listener TODO
*/
public void addListDataListener(ListDataListener listener) {
listenerList.add(ListDataListener.class, (EventListener) listener);
} // addListDataListener()
/**
* fireIntervalAdded
* @param source TODO
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireIntervalAdded (Object source, int startIndex, int endIndex)
{
// Variables
ListDataEvent event;
ListDataListener[] listeners;
ListDataListener listener;
int index;
/**
* removeListDataListener
* @param listener TODO
*/
public void removeListDataListener(ListDataListener listener) {
listenerList.remove(ListDataListener.class, (EventListener) listener);
} // removeListDataListener()
// Create Event
event = new ListDataEvent (source, ListDataEvent.INTERVAL_ADDED, startIndex,
endIndex);
/**
* fireContentsChanged
* @param source TODO
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireContentsChanged(Object source, int startIndex, int endIndex) {
// Get Listeners
listeners = getListDataListeners ();
// Variables
ListDataEvent event;
EventListener[] listeners;
ListDataListener listener;
int index;
// Process Listeners
for (index = 0; index < listeners.length; index++)
{
listener = listeners [index];
listener.intervalAdded (event);
}
}
// Create Event
event = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED,
startIndex, endIndex);
/**
* fireIntervalRemoved
* @param source TODO
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireIntervalRemoved (Object source, int startIndex,
int endIndex)
{
// Variables
ListDataEvent event;
ListDataListener[] listeners;
ListDataListener listener;
int index;
// Get Listeners
listeners = listenerList.getListeners(ListDataListener.class);
// Create Event
event = new ListDataEvent (source, ListDataEvent.INTERVAL_REMOVED,
startIndex, endIndex);
// Process Listeners
for (index = 0; index < listeners.length; index++) {
listener = (ListDataListener) listeners[index];
listener.contentsChanged(event);
} // for
// Get Listeners
listeners = getListDataListeners ();
} // fireContentsChanged()
// Process Listeners
for (index = 0; index < listeners.length; index++)
{
listener = listeners [index];
listener.intervalRemoved (event);
}
}
/**
* fireIntervalAdded
* @param source TODO
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireIntervalAdded(Object source, int startIndex, int endIndex) {
/**
* getListeners
* @param listenerType TODO
* @returns EventListener[]
*/
public EventListener[] getListeners (Class listenerType)
{
return listenerList.getListeners (listenerType);
}
// Variables
ListDataEvent event;
EventListener[] listeners;
ListDataListener listener;
int index;
/**
* getListDataListeners
*/
public ListDataListener[] getListDataListeners ()
{
return (ListDataListener[]) getListeners (ListDataListener.class);
}
// Create Event
event = new ListDataEvent(source, ListDataEvent.INTERVAL_ADDED,
startIndex, endIndex);
/**
* getElementAt
* @param index TODO
* @returns Object
*/
public abstract Object getElementAt (int index);
// Get Listeners
listeners = listenerList.getListeners(ListDataListener.class);
// Process Listeners
for (index = 0; index < listeners.length; index++) {
listener = (ListDataListener) listeners[index];
listener.intervalAdded(event);
} // for
} // fireIntervalAdded()
/**
* fireIntervalRemoved
* @param source TODO
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireIntervalRemoved(Object source, int startIndex, int endIndex) {
// Variables
ListDataEvent event;
EventListener[] listeners;
ListDataListener listener;
int index;
// Create Event
event = new ListDataEvent(source, ListDataEvent.INTERVAL_REMOVED,
startIndex, endIndex);
// Get Listeners
listeners = listenerList.getListeners(ListDataListener.class);
// Process Listeners
for (index = 0; index < listeners.length; index++) {
listener = (ListDataListener) listeners[index];
listener.intervalRemoved(event);
} // for
} // fireIntervalRemoved()
/**
* getListeners
* @param listenerType TODO
* @returns EventListener[]
*/
public EventListener[] getListeners(Class listenerType) {
return listenerList.getListeners(listenerType);
} // getListeners()
/**
* getListDataListeners
*/
public ListDataListener[] getListDataListeners()
{
// FIXME: implement this
return null;
}
/**
* getElementAt
* @param index TODO
* @returns Object
*/
public abstract Object getElementAt(int index);
/**
* getSize
* @returns int
*/
public abstract int getSize();
} // AbstractListModel
/**
* getSize
* @returns int
*/
public abstract int getSize ();
}

View file

@ -37,10 +37,11 @@ exception statement from your version. */
package javax.swing;
// Imports
import java.io.*;
import java.util.*;
import javax.swing.event.*;
import java.io.Serializable;
import java.util.EventListener;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
/**
* DefaultBoundedRangeModel
@ -52,299 +53,296 @@ public class DefaultBoundedRangeModel
{
static final long serialVersionUID = 5034068491295259790L;
//-------------------------------------------------------------
// Variables --------------------------------------------------
//-------------------------------------------------------------
/**
* changeEvent
*/
protected transient ChangeEvent changeEvent = new ChangeEvent (this);
/**
* changeEvent
*/
protected transient ChangeEvent changeEvent = new ChangeEvent(this);
/**
* listenerList
*/
protected EventListenerList listenerList = new EventListenerList ();
/**
* listenerList
*/
protected EventListenerList listenerList = new EventListenerList();
/**
* value
*/
private int value;
/**
* value
*/
private int value;
/**
* extent
*/
private int extent;
/**
* extent
*/
private int extent;
/**
* minimum
*/
private int minimum;
/**
* minimum
*/
private int minimum;
/**
* maximum
*/
private int maximum;
/**
* maximum
*/
private int maximum;
/**
* isAdjusting
*/
private boolean isAdjusting;
/**
* isAdjusting
*/
private boolean isAdjusting;
/**
* Constructor DefaultBoundedRangeModel
*/
public DefaultBoundedRangeModel ()
{
setRangeProperties (0, 0, 0, 100, false);
}
/**
* Constructor DefaultBoundedRangeModel
* @param value TODO
* @param extent TODO
* @param minimum TODO
* @param maximum TODO
*/
public DefaultBoundedRangeModel (int value, int extent, int minimum,
int maximum)
{
setRangeProperties(value, extent, minimum, maximum, false);
}
//-------------------------------------------------------------
// Initialization ---------------------------------------------
//-------------------------------------------------------------
/**
* toString
* @returns String
*/
public String toString ()
{
return null; // TODO
}
/**
* Constructor DefaultBoundedRangeModel
*/
public DefaultBoundedRangeModel() {
setRangeProperties(0, 0, 0, 100, false);
} // DefaultBoundedRangeModel()
/**
* getValue
* @returns int
*/
public int getValue ()
{
return value;
}
/**
* Constructor DefaultBoundedRangeModel
* @param value TODO
* @param extent TODO
* @param minimum TODO
* @param maximum TODO
*/
public DefaultBoundedRangeModel(int value, int extent,
int minimum, int maximum) {
setRangeProperties(value, extent, minimum, maximum, false);
} // DefaultBoundedRangeModel()
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
/**
* toString
* @returns String
*/
public String toString() {
return null; // TODO
} // toString()
/**
* getValue
* @returns int
*/
public int getValue() {
return value;
} // getValue()
/**
* setValue
* @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
/**
* setValue
* @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");
}
// Set Value
this.value = value;
// Set Value
this.value = value;
// Notification
fireStateChanged();
// Notification
fireStateChanged ();
}
} // setValue()
/**
* getExtent
* @returns int
*/
public int getExtent ()
{
return extent;
}
/**
* getExtent
* @returns int
*/
public int getExtent() {
return extent;
} // getExtent()
/**
* setExtent
* @param extent TODO
*/
public void setExtent (int extent)
{
// Validate Constraints
if (minimum > value ||
value > (value + extent) ||
(value + extent) > maximum)
{
throw new IllegalArgumentException("Invalid extent property set");
}
/**
* setExtent
* @param extent TODO
*/
public void setExtent(int extent) {
// Validate Constraints
if (minimum > value || value > (value + extent) ||
(value + extent) > maximum) {
throw new IllegalArgumentException("Invalid extent property set");
} // if
// Set Extent
this.extent = extent;
// Set Extent
this.extent = extent;
// Notification
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
fireStateChanged();
} // 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
this.minimum = minimum;
// Set Minimum
this.minimum = minimum;
// Notification
fireStateChanged();
// Notification
fireStateChanged ();
}
} // setMinimum()
/**
* getMaximum
* @returns int
*/
public int getMaximum() {
/**
* getMaximum
* @returns int
*/
public int getMaximum() {
return maximum;
} // getMaximum()
}
/**
* setMaximum
* @param maximum TODO
*/
public void setMaximum(int maximum) {
// Validate Constraints
if (minimum > value || value > (value + extent) ||
(value + extent) > maximum) {
throw new IllegalArgumentException("Invalid maximum property set");
} // if
/**
* setMaximum
* @param maximum TODO
*/
public void setMaximum (int maximum)
{
// Validate Constraints
if (minimum > value ||
value > (value + extent) ||
(value + extent) > maximum)
{
throw new IllegalArgumentException ("Invalid maximum property set");
}
// Set Maximum
this.maximum = maximum;
// Set Maximum
this.maximum = maximum;
// Notification
fireStateChanged();
// Notification
fireStateChanged ();
}
} // setMaximum()
/**
* getValueIsAdjusting
* @returns boolean
*/
public boolean getValueIsAdjusting ()
{
return isAdjusting;
}
/**
* getValueIsAdjusting
* @returns boolean
*/
public boolean getValueIsAdjusting() {
return isAdjusting;
} // getValueIsAdjusting()
/**
* setValueIsAdjusting
* @param isAdjusting TODO
*/
public void setValueIsAdjusting (boolean isAdjusting)
{
// Set isAdjusting
this.isAdjusting = isAdjusting;
/**
* setValueIsAdjusting
* @param isAdjusting TODO
*/
public void setValueIsAdjusting(boolean isAdjusting) {
// Set isAdjusting
this.isAdjusting = isAdjusting;
// Notification
fireStateChanged();
}
// Notification
fireStateChanged();
/**
* setRangeProperties
* @param value TODO
* @param extent TODO
* @param minimum TODO
* @param maximum TODO
* @param isAdjusting TODO
*/
public void setRangeProperties (int value, int extent, int minimum,
int maximum, boolean isAdjusting)
{
// Validate Constraints
if (minimum > value ||
value > (value + extent) ||
(value + extent) > maximum)
{
throw new IllegalArgumentException ("Invalid property set");
}
} // setValueIsAdjusting()
/**
* setRangeProperties
* @param value TODO
* @param extent TODO
* @param minimum TODO
* @param maximum TODO
* @param isAdjusting TODO
*/
public void setRangeProperties(int value, int extent, int minimum,
int maximum, boolean isAdjusting) {
// Validate Constraints
if (minimum > value || value > (value + extent) ||
(value + extent) > maximum) {
throw new IllegalArgumentException("Invalid property set");
} // if
// Set Data
this.value = value;
this.extent = extent;
this.minimum = minimum;
this.maximum = maximum;
this.isAdjusting = isAdjusting;
// Set Data
this.value = value;
this.extent = extent;
this.minimum = minimum;
this.maximum = maximum;
this.isAdjusting = isAdjusting;
// Notification
fireStateChanged();
// Notification
fireStateChanged ();
}
} // setRangeProperties()
/**
* addChangeListener
* @param listener TODO
*/
public void addChangeListener (ChangeListener listener)
{
listenerList.add (ChangeListener.class, listener);
}
/**
* addChangeListener
* @param listener TODO
*/
public void addChangeListener(ChangeListener listener) {
listenerList.add(ChangeListener.class, listener);
} // addChangeListener()
/**
* removeChangeListener
* @param listener TODO
*/
public void removeChangeListener (ChangeListener listener)
{
listenerList.remove (ChangeListener.class, listener);
}
/**
* removeChangeListener
* @param listener TODO
*/
public void removeChangeListener(ChangeListener listener) {
listenerList.remove(ChangeListener.class, listener);
} // removeChangeListener()
/**
* fireStateChanged
*/
protected void fireStateChanged ()
{
// Variables
ChangeListener listener;
ChangeListener[] listeners;
int index;
/**
* fireStateChanged
*/
protected void fireStateChanged() {
// Get Listeners
listeners = getChangeListeners ();
// Variables
ChangeListener listener;
EventListener[] listeners;
int index;
// Process Listeners
for (index = 0; index < listeners.length; index++)
{
listener = listeners [index];
listener.stateChanged (changeEvent);
}
}
// Get Listeners
listeners = listenerList.getListeners(ChangeListener.class);
/**
* getListeners
* @param c TODO
* @returns EventListener[]
*/
public EventListener[] getListeners (Class listenerType)
{
return listenerList.getListeners (listenerType);
}
// Process Listeners
for (index = 0; index < listeners.length; index++) {
listener = (ChangeListener) listeners[index];
listener.stateChanged(changeEvent);
} // for
} // fireStateChanged()
/**
* getListeners
* @param c TODO
* @returns EventListener[]
*/
public EventListener[] getListeners(Class c) {
return listenerList.getListeners(c);
} // getListeners()
/**
* getChangeListeners
*/
public ChangeListener[] getChangeListeners()
{
// FIXME: implement this
return null;
}
} // DefaultBoundedRangeModel
/**
* getChangeListeners
*/
public ChangeListener[] getChangeListeners ()
{
return (ChangeListener[]) getListeners (ChangeListener.class);
}
}

View file

@ -37,154 +37,141 @@ exception statement from your version. */
package javax.swing;
// Imports
import java.io.*;
import java.util.*;
import javax.swing.event.*;
import java.io.Serializable;
import java.util.EventListener;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
/**
* DefaultSingleSelectionModel
* @author Andrew Selkirk
* @version 1.0
*/
public class DefaultSingleSelectionModel implements
SingleSelectionModel, Serializable
public class DefaultSingleSelectionModel
implements SingleSelectionModel, Serializable
{
static final long serialVersionUID = 3676229404753786004L;
//-------------------------------------------------------------
// Variables --------------------------------------------------
//-------------------------------------------------------------
/**
* changeEvent
*/
protected transient ChangeEvent changeEvent = new ChangeEvent (this);
/**
* changeEvent
*/
protected transient ChangeEvent changeEvent = new ChangeEvent(this);
/**
* listenerList
*/
protected EventListenerList listenerList= new EventListenerList ();
/**
* listenerList
*/
protected EventListenerList listenerList= new EventListenerList();
/**
* index
*/
private int index = -1;
/**
* index
*/
private int index = -1;
/**
* Constructor DefaultSingleSelectionModel
*/
public DefaultSingleSelectionModel ()
{
}
/**
* getSelectedIndex
* @returns int
*/
public int getSelectedIndex ()
{
return index;
}
//-------------------------------------------------------------
// Initialization ---------------------------------------------
//-------------------------------------------------------------
/**
* setSelectedIndex
* @param index TODO
*/
public void setSelectedIndex (int index)
{
// Set Data
this.index = index;
/**
* Constructor DefaultSingleSelectionModel
*/
public DefaultSingleSelectionModel() {
// TODO
} // DefaultSingleSelectionModel()
// Notify Listeners
fireStateChanged ();
}
/**
* clearSelection
*/
public void clearSelection ()
{
// Set Data
index = -1;
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
// Notify Listeners
fireStateChanged ();
}
/**
* getSelectedIndex
* @returns int
*/
public int getSelectedIndex() {
return index;
} // getSelectedIndex()
/**
* isSelected
* @returns boolean
*/
public boolean isSelected ()
{
return (index == -1);
}
/**
* setSelectedIndex
* @param index TODO
*/
public void setSelectedIndex(int index) {
/**
* addChangeListener
* @param listener TODO
*/
public void addChangeListener (ChangeListener listener)
{
listenerList.add (ChangeListener.class, listener);
}
// Set Data
this.index = index;
/**
* removeChangeListener
* @param listener TODO
*/
public void removeChangeListener (ChangeListener listener)
{
listenerList.remove (ChangeListener.class, listener);
}
// Notify Listeners
fireStateChanged();
/**
* fireStateChanged
*/
protected void fireStateChanged ()
{
// Variables
ChangeListener listener;
ChangeListener[] listeners;
int index;
} // setSelectedIndex()
// Get Listeners
listeners = getChangeListeners ();
/**
* clearSelection
*/
public void clearSelection() {
// Process Listeners
for (index = 0; index < listeners.length; index++)
{
listener = listeners [index];
listener.stateChanged (changeEvent);
}
}
// Set Data
index = -1;
/**
* getListeners
* @param listenerClass TODO
* @returns EventListener[]
*/
public EventListener[] getListeners (Class listenerClass)
{
return listenerList.getListeners (listenerClass);
}
// Notify Listeners
fireStateChanged();
} // clearSelection()
/**
* isSelected
* @returns boolean
*/
public boolean isSelected() {
return (index == -1);
} // isSelected()
/**
* addChangeListener
* @param listener TODO
*/
public void addChangeListener(ChangeListener listener) {
listenerList.add(ChangeListener.class, listener);
} // addChangeListener()
/**
* removeChangeListener
* @param listener TODO
*/
public void removeChangeListener(ChangeListener listener) {
listenerList.remove(ChangeListener.class, listener);
} // removeChangeListener()
/**
* fireStateChanged
*/
protected void fireStateChanged() {
// Variables
ChangeListener listener;
EventListener[] listeners;
int index;
// Get Listeners
listeners = listenerList.getListeners(ChangeListener.class);
// Process Listeners
for (index = 0; index < listeners.length; index++) {
listener = (ChangeListener) listeners[index];
listener.stateChanged(changeEvent);
} // for
} // fireStateChanged()
/**
* getListeners
* @param listenerClass TODO
* @returns EventListener[]
*/
public EventListener[] getListeners(Class listenerClass) {
return listenerList.getListeners(listenerClass);
} // getListeners()
/**
* getChangeListeners
*/
public ChangeListener[] getChangeListeners()
{
// FIXME: implement this
return null;
}
} // DefaultSingleSelectionModel
/**
* getChangeListeners
*/
public ChangeListener[] getChangeListeners ()
{
return (ChangeListener[]) getListeners (ChangeListener.class);
}
}