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 290 additions and 307 deletions
libjava/ChangeLog
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
(show): Call super.show() instead of setVisible() to avoid endless
loop.
......
libjava/javax/swing/AbstractListModel.java
......@@ -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();
//-------------------------------------------------------------
// Initialization ---------------------------------------------
//-------------------------------------------------------------
/**
* Constructor AbstractListModel
*/
public AbstractListModel() {
} // AbstractListModel()
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
/**
* addListDataListener
* @param listener TODO
*/
public void addListDataListener(ListDataListener listener) {
listenerList.add(ListDataListener.class, (EventListener) listener);
} // addListDataListener()
/**
* removeListDataListener
* @param listener TODO
*/
public void removeListDataListener(ListDataListener listener) {
listenerList.remove(ListDataListener.class, (EventListener) listener);
} // removeListDataListener()
/**
* fireContentsChanged
* @param source TODO
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireContentsChanged(Object source, int startIndex, int endIndex) {
// Variables
ListDataEvent event;
EventListener[] listeners;
ListDataListener listener;
int index;
// Create Event
event = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED,
startIndex, endIndex);
// Get Listeners
listeners = listenerList.getListeners(ListDataListener.class);
// Process Listeners
for (index = 0; index < listeners.length; index++) {
listener = (ListDataListener) listeners[index];
listener.contentsChanged(event);
} // for
} // fireContentsChanged()
/**
* fireIntervalAdded
* @param source TODO
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireIntervalAdded(Object source, int startIndex, int endIndex) {
// Variables
ListDataEvent event;
EventListener[] listeners;
ListDataListener listener;
int index;
// Create Event
event = new ListDataEvent(source, ListDataEvent.INTERVAL_ADDED,
startIndex, endIndex);
// 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
/**
* listenerList
*/
protected EventListenerList listenerList = new EventListenerList ();
/**
* Constructor AbstractListModel
*/
public AbstractListModel ()
{
}
/**
* 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);
}
/**
* 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;
// Create Event
event = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED,
startIndex, endIndex);
// Get Listeners
listeners = getListDataListeners ();
// Process Listeners
for (index = 0; index < listeners.length; index++)
{
listener = (ListDataListener) listeners[index];
listener.contentsChanged(event);
}
}
/**
* 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;
// Create Event
event = new ListDataEvent (source, ListDataEvent.INTERVAL_ADDED, startIndex,
endIndex);
// Get Listeners
listeners = getListDataListeners ();
// Process Listeners
for (index = 0; index < listeners.length; index++)
{
listener = listeners [index];
listener.intervalAdded (event);
}
}
/**
* 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;
// Create Event
event = new ListDataEvent (source, ListDataEvent.INTERVAL_REMOVED,
startIndex, endIndex);
// Get Listeners
listeners = getListDataListeners ();
// Process Listeners
for (index = 0; index < listeners.length; index++)
{
listener = listeners [index];
listener.intervalRemoved (event);
}
}
/**
* getListeners
* @param listenerType TODO
* @returns EventListener[]
*/
public EventListener[] getListeners (Class listenerType)
{
return listenerList.getListeners (listenerType);
}
/**
* getListDataListeners
*/
public ListDataListener[] getListDataListeners ()
{
return (ListDataListener[]) getListeners (ListDataListener.class);
}
/**
* getElementAt
* @param index TODO
* @returns Object
*/
public abstract Object getElementAt (int index);
/**
* getSize
* @returns int
*/
public abstract int getSize ();
}
libjava/javax/swing/DefaultSingleSelectionModel.java
......@@ -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);
/**
* listenerList
*/
protected EventListenerList listenerList= new EventListenerList();
/**
* index
*/
private int index = -1;
//-------------------------------------------------------------
// Initialization ---------------------------------------------
//-------------------------------------------------------------
/**
* Constructor DefaultSingleSelectionModel
*/
public DefaultSingleSelectionModel() {
// TODO
} // DefaultSingleSelectionModel()
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
/**
* getSelectedIndex
* @returns int
*/
public int getSelectedIndex() {
return index;
} // getSelectedIndex()
/**
* setSelectedIndex
* @param index TODO
*/
public void setSelectedIndex(int index) {
// Set Data
this.index = index;
// Notify Listeners
fireStateChanged();
} // setSelectedIndex()
/**
* clearSelection
*/
public void clearSelection() {
// Set Data
index = -1;
// 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
/**
* changeEvent
*/
protected transient ChangeEvent changeEvent = new ChangeEvent (this);
/**
* listenerList
*/
protected EventListenerList listenerList= new EventListenerList ();
/**
* index
*/
private int index = -1;
/**
* Constructor DefaultSingleSelectionModel
*/
public DefaultSingleSelectionModel ()
{
}
/**
* getSelectedIndex
* @returns int
*/
public int getSelectedIndex ()
{
return index;
}
/**
* setSelectedIndex
* @param index TODO
*/
public void setSelectedIndex (int index)
{
// Set Data
this.index = index;
// Notify Listeners
fireStateChanged ();
}
/**
* clearSelection
*/
public void clearSelection ()
{
// Set Data
index = -1;
// Notify Listeners
fireStateChanged ();
}
/**
* isSelected
* @returns boolean
*/
public boolean isSelected ()
{
return (index == -1);
}
/**
* addChangeListener
* @param listener TODO
*/
public void addChangeListener (ChangeListener listener)
{
listenerList.add (ChangeListener.class, listener);
}
/**
* removeChangeListener
* @param listener TODO
*/
public void removeChangeListener (ChangeListener listener)
{
listenerList.remove (ChangeListener.class, listener);
}
/**
* fireStateChanged
*/
protected void fireStateChanged ()
{
// Variables
ChangeListener listener;
ChangeListener[] listeners;
int index;
// Get Listeners
listeners = getChangeListeners ();
// Process Listeners
for (index = 0; index < listeners.length; index++)
{
listener = listeners [index];
listener.stateChanged (changeEvent);
}
}
/**
* getListeners
* @param listenerClass TODO
* @returns EventListener[]
*/
public EventListener[] getListeners (Class listenerClass)
{
return listenerList.getListeners (listenerClass);
}
/**
* getChangeListeners
*/
public ChangeListener[] getChangeListeners ()
{
return (ChangeListener[]) getListeners (ChangeListener.class);
}
}
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