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