GtkListPeer.java, [...]: Fix handling of alias methods...
2004-02-03 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkListPeer.java, java/awt/BorderLayout.java, java/awt/CardLayout.java, java/awt/CheckboxGroup.java, java/awt/Choice.java, java/awt/Component.java, java/awt/Container.java, java/awt/FontMetrics.java, java/awt/GridBagLayout.java, java/awt/LayoutManager2.java, java/awt/List.java, java/awt/Menu.java, java/awt/MenuBar.java, java/awt/MenuItem.java, java/awt/Polygon.java, java/awt/Rectangle.java, java/awt/ScrollPane.java, java/awt/Scrollbar.java, java/awt/TextArea.java, java/awt/TextField.java, java/awt/image/renderable/RenderContext.java, javax/swing/JApplet.java: Fix handling of alias methods, where a method has been deprecated in favour of a new one with the same funtion but a different name. Put the method implementation in the deprecated method and have the new method call the deprecated one. Make all other code call the new method. From-SVN: r77178
This commit is contained in:
Thomas Fitzsimmons
Thomas Fitzsimmons
parent
5a98fa7bdb
commit
b6d3cb37ef
23 changed files with 726 additions and 711 deletions
|
|
@ -175,7 +175,7 @@ List(int rows, boolean multipleMode)
|
|||
public int
|
||||
getItemCount()
|
||||
{
|
||||
return(items.size());
|
||||
return countItems ();
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -191,7 +191,7 @@ getItemCount()
|
|||
public int
|
||||
countItems()
|
||||
{
|
||||
return(getItemCount());
|
||||
return items.size ();
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -249,7 +249,7 @@ getRows()
|
|||
public boolean
|
||||
isMultipleMode()
|
||||
{
|
||||
return(multipleMode);
|
||||
return allowsMultipleSelections ();
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -266,7 +266,7 @@ isMultipleMode()
|
|||
public boolean
|
||||
allowsMultipleSelections()
|
||||
{
|
||||
return(multipleMode);
|
||||
return multipleMode;
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -281,12 +281,7 @@ allowsMultipleSelections()
|
|||
public void
|
||||
setMultipleMode(boolean multipleMode)
|
||||
{
|
||||
this.multipleMode = multipleMode;
|
||||
if (peer != null)
|
||||
{
|
||||
ListPeer l = (ListPeer) peer;
|
||||
l.setMultipleMode (multipleMode);
|
||||
}
|
||||
setMultipleSelections (multipleMode);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -303,7 +298,11 @@ setMultipleMode(boolean multipleMode)
|
|||
public void
|
||||
setMultipleSelections(boolean multipleMode)
|
||||
{
|
||||
setMultipleMode(multipleMode);
|
||||
this.multipleMode = multipleMode;
|
||||
|
||||
ListPeer peer = (ListPeer) getPeer ();
|
||||
if (peer != null)
|
||||
peer.setMultipleMode (multipleMode);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -316,7 +315,7 @@ setMultipleSelections(boolean multipleMode)
|
|||
public Dimension
|
||||
getMinimumSize()
|
||||
{
|
||||
return(getMinimumSize(rows));
|
||||
return getMinimumSize (getRows ());
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -332,7 +331,7 @@ getMinimumSize()
|
|||
public Dimension
|
||||
minimumSize()
|
||||
{
|
||||
return(getMinimumSize(rows));
|
||||
return minimumSize (getRows ());
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -348,11 +347,7 @@ minimumSize()
|
|||
public Dimension
|
||||
getMinimumSize(int rows)
|
||||
{
|
||||
ListPeer lp = (ListPeer)getPeer();
|
||||
if (lp != null)
|
||||
return(lp.minimumSize(rows));
|
||||
else
|
||||
return(new Dimension(0,0));
|
||||
return minimumSize (rows);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -371,7 +366,11 @@ getMinimumSize(int rows)
|
|||
public Dimension
|
||||
minimumSize(int rows)
|
||||
{
|
||||
return(getMinimumSize(rows));
|
||||
ListPeer peer = (ListPeer) getPeer ();
|
||||
if (peer != null)
|
||||
return peer.minimumSize (rows);
|
||||
else
|
||||
return new Dimension (0, 0);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -384,7 +383,7 @@ minimumSize(int rows)
|
|||
public Dimension
|
||||
getPreferredSize()
|
||||
{
|
||||
return(getPreferredSize(rows));
|
||||
return getPreferredSize (getRows ());
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -400,7 +399,7 @@ getPreferredSize()
|
|||
public Dimension
|
||||
preferredSize()
|
||||
{
|
||||
return(getPreferredSize(rows));
|
||||
return preferredSize (getRows ());
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -416,11 +415,7 @@ preferredSize()
|
|||
public Dimension
|
||||
getPreferredSize(int rows)
|
||||
{
|
||||
ListPeer lp = (ListPeer)getPeer();
|
||||
if (lp != null)
|
||||
return(lp.preferredSize(rows));
|
||||
else
|
||||
return(new Dimension(0,0));
|
||||
return preferredSize (rows);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -439,7 +434,11 @@ getPreferredSize(int rows)
|
|||
public Dimension
|
||||
preferredSize(int rows)
|
||||
{
|
||||
return(getPreferredSize(rows));
|
||||
ListPeer peer = (ListPeer) getPeer ();
|
||||
if (peer != null)
|
||||
return peer.preferredSize (rows);
|
||||
else
|
||||
return new Dimension (0, 0);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -452,7 +451,7 @@ preferredSize(int rows)
|
|||
public void
|
||||
add(String item)
|
||||
{
|
||||
add(item, -1);
|
||||
add (item, -1);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -467,7 +466,7 @@ add(String item)
|
|||
public void
|
||||
addItem(String item)
|
||||
{
|
||||
addItem(item, -1);
|
||||
addItem (item, -1);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -484,16 +483,7 @@ addItem(String item)
|
|||
public void
|
||||
add(String item, int index)
|
||||
{
|
||||
if ((index == -1) || (index >= items.size()))
|
||||
items.addElement(item);
|
||||
else
|
||||
items.insertElementAt(item, index);
|
||||
|
||||
if (peer != null)
|
||||
{
|
||||
ListPeer l = (ListPeer) peer;
|
||||
l.add (item, index);
|
||||
}
|
||||
addItem (item, index);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -512,7 +502,14 @@ add(String item, int index)
|
|||
public void
|
||||
addItem(String item, int index)
|
||||
{
|
||||
add(item, index);
|
||||
if ((index == -1) || (index >= items.size ()))
|
||||
items.addElement (item);
|
||||
else
|
||||
items.insertElementAt (item, index);
|
||||
|
||||
ListPeer peer = (ListPeer) getPeer ();
|
||||
if (peer != null)
|
||||
peer.add (item, index);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -529,7 +526,11 @@ addItem(String item, int index)
|
|||
public void
|
||||
delItem(int index) throws IllegalArgumentException
|
||||
{
|
||||
remove(index);
|
||||
items.removeElementAt (index);
|
||||
|
||||
ListPeer peer = (ListPeer) getPeer ();
|
||||
if (peer != null)
|
||||
peer.delItems (index, index);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -544,12 +545,7 @@ delItem(int index) throws IllegalArgumentException
|
|||
public void
|
||||
remove(int index) throws IllegalArgumentException
|
||||
{
|
||||
items.removeElementAt (index);
|
||||
if (peer != null)
|
||||
{
|
||||
ListPeer l = (ListPeer) peer;
|
||||
l.delItems (index, index);
|
||||
}
|
||||
delItem (index);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -613,12 +609,7 @@ remove(String item) throws IllegalArgumentException
|
|||
public synchronized void
|
||||
removeAll()
|
||||
{
|
||||
items.clear();
|
||||
if (peer != null)
|
||||
{
|
||||
ListPeer l = (ListPeer) peer;
|
||||
l.removeAll ();
|
||||
}
|
||||
clear ();
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -631,7 +622,11 @@ removeAll()
|
|||
public void
|
||||
clear()
|
||||
{
|
||||
removeAll();
|
||||
items.clear();
|
||||
|
||||
ListPeer peer = (ListPeer) getPeer ();
|
||||
if (peer != null)
|
||||
peer.removeAll ();
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -782,13 +777,7 @@ getSelectedObjects()
|
|||
public boolean
|
||||
isIndexSelected(int index)
|
||||
{
|
||||
int[] indexes = getSelectedIndexes();
|
||||
|
||||
for (int i = 0; i < indexes.length; i++)
|
||||
if (indexes[i] == index)
|
||||
return(true);
|
||||
|
||||
return(false);
|
||||
return isSelected (index);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
@ -807,7 +796,13 @@ isIndexSelected(int index)
|
|||
public boolean
|
||||
isSelected(int index)
|
||||
{
|
||||
return(isIndexSelected(index));
|
||||
int[] indexes = getSelectedIndexes ();
|
||||
|
||||
for (int i = 0; i < indexes.length; i++)
|
||||
if (indexes[i] == index)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue