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 224 additions and 243 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,46 +54,35 @@ public abstract class AbstractListModel
{
static final long serialVersionUID = -3285184064379168730L;
//-------------------------------------------------------------
// Variables --------------------------------------------------
//-------------------------------------------------------------
/**
* listenerList
*/
protected EventListenerList listenerList = new EventListenerList();
//-------------------------------------------------------------
// Initialization ---------------------------------------------
//-------------------------------------------------------------
protected EventListenerList listenerList = new EventListenerList ();
/**
* Constructor AbstractListModel
*/
public AbstractListModel() {
} // AbstractListModel()
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
public AbstractListModel ()
{
}
/**
* addListDataListener
* @param listener TODO
*/
public void addListDataListener(ListDataListener listener) {
listenerList.add(ListDataListener.class, (EventListener) listener);
} // addListDataListener()
public void addListDataListener(ListDataListener listener)
{
listenerList.add (ListDataListener.class, listener);
}
/**
* removeListDataListener
* @param listener TODO
*/
public void removeListDataListener(ListDataListener listener) {
listenerList.remove(ListDataListener.class, (EventListener) listener);
} // removeListDataListener()
public void removeListDataListener(ListDataListener listener)
{
listenerList.remove (ListDataListener.class, listener);
}
/**
* fireContentsChanged
......@@ -100,11 +90,11 @@ public abstract class AbstractListModel
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireContentsChanged(Object source, int startIndex, int endIndex) {
protected void fireContentsChanged(Object source, int startIndex, int endIndex)
{
// Variables
ListDataEvent event;
EventListener[] listeners;
ListDataListener[] listeners;
ListDataListener listener;
int index;
......@@ -113,15 +103,15 @@ public abstract class AbstractListModel
startIndex, endIndex);
// Get Listeners
listeners = listenerList.getListeners(ListDataListener.class);
listeners = getListDataListeners ();
// Process Listeners
for (index = 0; index < listeners.length; index++) {
for (index = 0; index < listeners.length; index++)
{
listener = (ListDataListener) listeners[index];
listener.contentsChanged(event);
} // for
} // fireContentsChanged()
}
}
/**
* fireIntervalAdded
......@@ -129,28 +119,28 @@ public abstract class AbstractListModel
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireIntervalAdded(Object source, int startIndex, int endIndex) {
protected void fireIntervalAdded (Object source, int startIndex, int endIndex)
{
// Variables
ListDataEvent event;
EventListener[] listeners;
ListDataListener[] listeners;
ListDataListener listener;
int index;
// Create Event
event = new ListDataEvent(source, ListDataEvent.INTERVAL_ADDED,
startIndex, endIndex);
event = new ListDataEvent (source, ListDataEvent.INTERVAL_ADDED, startIndex,
endIndex);
// Get Listeners
listeners = listenerList.getListeners(ListDataListener.class);
listeners = getListDataListeners ();
// Process Listeners
for (index = 0; index < listeners.length; index++) {
listener = (ListDataListener) listeners[index];
listener.intervalAdded(event);
} // for
} // fireIntervalAdded()
for (index = 0; index < listeners.length; index++)
{
listener = listeners [index];
listener.intervalAdded (event);
}
}
/**
* fireIntervalRemoved
......@@ -158,45 +148,46 @@ public abstract class AbstractListModel
* @param startIndex TODO
* @param endIndex TODO
*/
protected void fireIntervalRemoved(Object source, int startIndex, int endIndex) {
protected void fireIntervalRemoved (Object source, int startIndex,
int endIndex)
{
// Variables
ListDataEvent event;
EventListener[] listeners;
ListDataListener[] listeners;
ListDataListener listener;
int index;
// Create Event
event = new ListDataEvent(source, ListDataEvent.INTERVAL_REMOVED,
event = new ListDataEvent (source, ListDataEvent.INTERVAL_REMOVED,
startIndex, endIndex);
// Get Listeners
listeners = listenerList.getListeners(ListDataListener.class);
listeners = getListDataListeners ();
// Process Listeners
for (index = 0; index < listeners.length; index++) {
listener = (ListDataListener) listeners[index];
listener.intervalRemoved(event);
} // for
} // fireIntervalRemoved()
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);
} // getListeners()
public EventListener[] getListeners (Class listenerType)
{
return listenerList.getListeners (listenerType);
}
/**
* getListDataListeners
*/
public ListDataListener[] getListDataListeners()
public ListDataListener[] getListDataListeners ()
{
// FIXME: implement this
return null;
return (ListDataListener[]) getListeners (ListDataListener.class);
}
/**
......@@ -204,13 +195,11 @@ public abstract class AbstractListModel
* @param index TODO
* @returns Object
*/
public abstract Object getElementAt(int index);
public abstract Object getElementAt (int index);
/**
* getSize
* @returns int
*/
public abstract int getSize();
} // AbstractListModel
public abstract int getSize ();
}
libjava/javax/swing/DefaultBoundedRangeModel.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.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
/**
* DefaultBoundedRangeModel
......@@ -52,19 +53,15 @@ public class DefaultBoundedRangeModel
{
static final long serialVersionUID = 5034068491295259790L;
//-------------------------------------------------------------
// Variables --------------------------------------------------
//-------------------------------------------------------------
/**
* changeEvent
*/
protected transient ChangeEvent changeEvent = new ChangeEvent(this);
protected transient ChangeEvent changeEvent = new ChangeEvent (this);
/**
* listenerList
*/
protected EventListenerList listenerList = new EventListenerList();
protected EventListenerList listenerList = new EventListenerList ();
/**
* value
......@@ -91,17 +88,13 @@ public class DefaultBoundedRangeModel
*/
private boolean isAdjusting;
//-------------------------------------------------------------
// Initialization ---------------------------------------------
//-------------------------------------------------------------
/**
* Constructor DefaultBoundedRangeModel
*/
public DefaultBoundedRangeModel() {
setRangeProperties(0, 0, 0, 100, false);
} // DefaultBoundedRangeModel()
public DefaultBoundedRangeModel ()
{
setRangeProperties (0, 0, 0, 100, false);
}
/**
* Constructor DefaultBoundedRangeModel
......@@ -110,107 +103,110 @@ public class DefaultBoundedRangeModel
* @param minimum TODO
* @param maximum TODO
*/
public DefaultBoundedRangeModel(int value, int extent,
int minimum, int maximum) {
public DefaultBoundedRangeModel (int value, int extent, int minimum,
int maximum)
{
setRangeProperties(value, extent, minimum, maximum, false);
} // DefaultBoundedRangeModel()
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
}
/**
* toString
* @returns String
*/
public String toString() {
public String toString ()
{
return null; // TODO
} // toString()
}
/**
* getValue
* @returns int
*/
public int getValue() {
public int getValue ()
{
return value;
} // getValue()
}
/**
* setValue
* @param value TODO
*/
public void setValue(int value) {
public void setValue (int value)
{
// Validate Constraints
if (minimum > value || value > (value + extent) ||
(value + extent) > maximum) {
throw new IllegalArgumentException("Invalid value property set");
} // if
if (minimum > value ||
value > (value + extent) ||
(value + extent) > maximum)
{
throw new IllegalArgumentException ("Invalid value property set");
}
// Set Value
this.value = value;
// Notification
fireStateChanged();
} // setValue()
fireStateChanged ();
}
/**
* getExtent
* @returns int
*/
public int getExtent() {
public int getExtent ()
{
return extent;
} // getExtent()
}
/**
* setExtent
* @param extent TODO
*/
public void setExtent(int extent) {
public void setExtent (int extent)
{
// Validate Constraints
if (minimum > value || value > (value + extent) ||
(value + extent) > maximum) {
if (minimum > value ||
value > (value + extent) ||
(value + extent) > maximum)
{
throw new IllegalArgumentException("Invalid extent property set");
} // if
}
// Set Extent
this.extent = extent;
// Notification
fireStateChanged();
} // setExtent()
fireStateChanged ();
}
/**
* getMinimum
* @returns int
*/
public int getMinimum() {
public int getMinimum ()
{
return minimum;
} // getMinimum()
}
/**
* setMinimum
* @param minimum TODO
*/
public void setMinimum(int minimum) {
public void setMinimum (int minimum)
{
// Validate Constraints
if (minimum > value || value > (value + extent) ||
(value + extent) > maximum) {
if (minimum > value ||
value > (value + extent) ||
(value + extent) > maximum)
{
throw new IllegalArgumentException("Invalid minimum property set");
} // if
}
// Set Minimum
this.minimum = minimum;
// Notification
fireStateChanged();
} // setMinimum()
fireStateChanged ();
}
/**
* getMaximum
......@@ -218,49 +214,50 @@ public class DefaultBoundedRangeModel
*/
public int getMaximum() {
return maximum;
} // getMaximum()
}
/**
* setMaximum
* @param maximum TODO
*/
public void setMaximum(int maximum) {
public void setMaximum (int maximum)
{
// Validate Constraints
if (minimum > value || value > (value + extent) ||
(value + extent) > maximum) {
throw new IllegalArgumentException("Invalid maximum property set");
} // if
if (minimum > value ||
value > (value + extent) ||
(value + extent) > maximum)
{
throw new IllegalArgumentException ("Invalid maximum property set");
}
// Set Maximum
this.maximum = maximum;
// Notification
fireStateChanged();
} // setMaximum()
fireStateChanged ();
}
/**
* getValueIsAdjusting
* @returns boolean
*/
public boolean getValueIsAdjusting() {
public boolean getValueIsAdjusting ()
{
return isAdjusting;
} // getValueIsAdjusting()
}
/**
* setValueIsAdjusting
* @param isAdjusting TODO
*/
public void setValueIsAdjusting(boolean isAdjusting) {
public void setValueIsAdjusting (boolean isAdjusting)
{
// Set isAdjusting
this.isAdjusting = isAdjusting;
// Notification
fireStateChanged();
} // setValueIsAdjusting()
}
/**
* setRangeProperties
......@@ -270,14 +267,16 @@ public class DefaultBoundedRangeModel
* @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) ||
(value + extent) > maximum) {
throw new IllegalArgumentException("Invalid property set");
} // if
if (minimum > value ||
value > (value + extent) ||
(value + extent) > maximum)
{
throw new IllegalArgumentException ("Invalid property set");
}
// Set Data
this.value = value;
......@@ -287,64 +286,63 @@ public class DefaultBoundedRangeModel
this.isAdjusting = isAdjusting;
// Notification
fireStateChanged();
} // setRangeProperties()
fireStateChanged ();
}
/**
* addChangeListener
* @param listener TODO
*/
public void addChangeListener(ChangeListener listener) {
listenerList.add(ChangeListener.class, listener);
} // addChangeListener()
public void addChangeListener (ChangeListener listener)
{
listenerList.add (ChangeListener.class, listener);
}
/**
* removeChangeListener
* @param listener TODO
*/
public void removeChangeListener(ChangeListener listener) {
listenerList.remove(ChangeListener.class, listener);
} // removeChangeListener()
public void removeChangeListener (ChangeListener listener)
{
listenerList.remove (ChangeListener.class, listener);
}
/**
* fireStateChanged
*/
protected void fireStateChanged() {
protected void fireStateChanged ()
{
// Variables
ChangeListener listener;
EventListener[] listeners;
ChangeListener[] listeners;
int index;
// Get Listeners
listeners = listenerList.getListeners(ChangeListener.class);
listeners = getChangeListeners ();
// Process Listeners
for (index = 0; index < listeners.length; index++) {
listener = (ChangeListener) listeners[index];
listener.stateChanged(changeEvent);
} // for
} // fireStateChanged()
for (index = 0; index < listeners.length; index++)
{
listener = listeners [index];
listener.stateChanged (changeEvent);
}
}
/**
* getListeners
* @param c TODO
* @returns EventListener[]
*/
public EventListener[] getListeners(Class c) {
return listenerList.getListeners(c);
} // getListeners()
public EventListener[] getListeners (Class listenerType)
{
return listenerList.getListeners (listenerType);
}
/**
* getChangeListeners
*/
public ChangeListener[] getChangeListeners()
public ChangeListener[] getChangeListeners ()
{
// FIXME: implement this
return null;
return (ChangeListener[]) getListeners (ChangeListener.class);
}
} // DefaultBoundedRangeModel
}
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);
protected transient ChangeEvent changeEvent = new ChangeEvent (this);
/**
* listenerList
*/
protected EventListenerList listenerList= new EventListenerList();
protected EventListenerList listenerList= new EventListenerList ();
/**
* index
*/
private int index = -1;
//-------------------------------------------------------------
// Initialization ---------------------------------------------
//-------------------------------------------------------------
/**
* Constructor DefaultSingleSelectionModel
*/
public DefaultSingleSelectionModel() {
// TODO
} // DefaultSingleSelectionModel()
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
public DefaultSingleSelectionModel ()
{
}
/**
* getSelectedIndex
* @returns int
*/
public int getSelectedIndex() {
public int getSelectedIndex ()
{
return index;
} // getSelectedIndex()
}
/**
* setSelectedIndex
* @param index TODO
*/
public void setSelectedIndex(int index) {
public void setSelectedIndex (int index)
{
// Set Data
this.index = index;
// Notify Listeners
fireStateChanged();
} // setSelectedIndex()
fireStateChanged ();
}
/**
* clearSelection
*/
public void clearSelection() {
public void clearSelection ()
{
// Set Data
index = -1;
// Notify Listeners
fireStateChanged();
} // clearSelection()
fireStateChanged ();
}
/**
* isSelected
* @returns boolean
*/
public boolean isSelected() {
public boolean isSelected ()
{
return (index == -1);
} // isSelected()
}
/**
* addChangeListener
* @param listener TODO
*/
public void addChangeListener(ChangeListener listener) {
listenerList.add(ChangeListener.class, listener);
} // addChangeListener()
public void addChangeListener (ChangeListener listener)
{
listenerList.add (ChangeListener.class, listener);
}
/**
* removeChangeListener
* @param listener TODO
*/
public void removeChangeListener(ChangeListener listener) {
listenerList.remove(ChangeListener.class, listener);
} // removeChangeListener()
public void removeChangeListener (ChangeListener listener)
{
listenerList.remove (ChangeListener.class, listener);
}
/**
* fireStateChanged
*/
protected void fireStateChanged() {
protected void fireStateChanged ()
{
// Variables
ChangeListener listener;
EventListener[] listeners;
ChangeListener[] listeners;
int index;
// Get Listeners
listeners = listenerList.getListeners(ChangeListener.class);
listeners = getChangeListeners ();
// Process Listeners
for (index = 0; index < listeners.length; index++) {
listener = (ChangeListener) listeners[index];
listener.stateChanged(changeEvent);
} // for
} // fireStateChanged()
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);
} // getListeners()
public EventListener[] getListeners (Class listenerClass)
{
return listenerList.getListeners (listenerClass);
}
/**
* getChangeListeners
*/
public ChangeListener[] getChangeListeners()
public ChangeListener[] getChangeListeners ()
{
// FIXME: implement this
return null;
return (ChangeListener[]) getListeners (ChangeListener.class);
}
} // 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