procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GtkListPeer.java, [...]: Fix handling of alias methods...

Browse source 
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 2004-02-03 17:10:56 +00:00 • committed by Thomas Fitzsimmons
parent 5a98fa7bdb
commit b6d3cb37ef
23 changed files with 726 additions and 711 deletions
Download patch file Download diff file Expand all files Collapse all files

78
libjava/java/awt/Container.java
View file

@ -106,7 +106,7 @@ public class Container extends Component
*/
public int getComponentCount()
{
return ncomponents;
return countComponents ();
}
/**
@ -118,7 +118,7 @@ public class Container extends Component
*/
public int countComponents()
{
return getComponentCount();
return ncomponents;
}
/**
@ -186,10 +186,7 @@ public class Container extends Component
*/
public Insets getInsets()
{
if (peer == null)
return new Insets(0, 0, 0, 0);
return ((ContainerPeer) peer).getInsets();
return insets ();
}
/**
@ -201,7 +198,10 @@ public class Container extends Component
*/
public Insets insets()
{
return getInsets();
if (peer == null)
return new Insets (0, 0, 0, 0);
return ((ContainerPeer) peer).getInsets ();
}
/**
@ -463,8 +463,7 @@ public class Container extends Component
*/
public void doLayout()
{
if (layoutMgr != null)
layoutMgr.layoutContainer(this);
layout ();
}
/**
@ -474,7 +473,8 @@ public class Container extends Component
*/
public void layout()
{
doLayout();
if (layoutMgr != null)
layoutMgr.layoutContainer (this);
}
/**
@ -555,7 +555,7 @@ public class Container extends Component
*/
public Dimension getPreferredSize()
{
return preferredSize();
return preferredSize ();
}
/**
@ -567,10 +567,10 @@ public class Container extends Component
*/
public Dimension preferredSize()
{
if (layoutMgr != null)
return layoutMgr.preferredLayoutSize(this);
else
return super.preferredSize();
if (layoutMgr != null)
return layoutMgr.preferredLayoutSize (this);
else
return super.preferredSize ();
}
/**
@ -580,7 +580,7 @@ public class Container extends Component
*/
public Dimension getMinimumSize()
{
return minimumSize();
return minimumSize ();
}
/**
@ -592,10 +592,10 @@ public class Container extends Component
*/
public Dimension minimumSize()
{
if (layoutMgr != null)
return layoutMgr.minimumLayoutSize(this);
else
return super.minimumSize();
if (layoutMgr != null)
return layoutMgr.minimumLayoutSize (this);
else
return super.minimumSize ();
}
/**
@ -833,23 +833,7 @@ public class Container extends Component
*/
public Component getComponentAt(int x, int y)
{
synchronized (getTreeLock ())
{
if (! contains(x, y))
return null;
for (int i = 0; i < ncomponents; ++i)
{
// Ignore invisible children...
if (!component[i].isVisible())
continue;
int x2 = x - component[i].x;
int y2 = y - component[i].y;
if (component[i].contains(x2, y2))
return component[i];
}
return this;
}
return locate (x, y);
}
/**
@ -869,7 +853,23 @@ public class Container extends Component
*/
public Component locate(int x, int y)
{
return getComponentAt(x, y);
synchronized (getTreeLock ())
{
if (!contains (x, y))
return null;
for (int i = 0; i < ncomponents; ++i)
{
// Ignore invisible children...
if (!component[i].isVisible ())
continue;
int x2 = x - component[i].x;
int y2 = y - component[i].y;
if (component[i].contains (x2, y2))
return component[i];
}
return this;
}
}
/**
@ -886,7 +886,7 @@ public class Container extends Component
*/
public Component getComponentAt(Point p)
{
return getComponentAt(p.x, p.y);
return getComponentAt (p.x, p.y);
}
public Component findComponentAt(int x, int y)