From 702245b0f879fb0fca8dbb7264cac8a9dae8454c Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 6 Aug 2006 23:42:18 +0000 Subject: 2006-08-06 Roman Kennke PR 28571 * gnu/java/awt/peer/gtk/GtkCanvasPeer.java (getPreferredSize): Renamed method to preferredSize(). That's the one that gets called from java.awt.*. * java/awt/peer/ComponentPeer.java (getPreferredSize): Added specnote about this method never beeing called in the RI. (getMinimumSize): Added specnote about this method never beeing called in the RI. --- ChangeLog | 12 ++++++++++++ gnu/java/awt/peer/gtk/GtkCanvasPeer.java | 4 ++-- java/awt/peer/ComponentPeer.java | 12 ++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a2e2460d..9aa571aa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-08-06 Roman Kennke + + PR 28571 + * gnu/java/awt/peer/gtk/GtkCanvasPeer.java + (getPreferredSize): Renamed method to preferredSize(). That's + the one that gets called from java.awt.*. + * java/awt/peer/ComponentPeer.java + (getPreferredSize): Added specnote about this method never + beeing called in the RI. + (getMinimumSize): Added specnote about this method never + beeing called in the RI. + 2006-08-06 Sven de Marothy * gnu/java/awt/peer/gtk/ComponentGraphics.java diff --git a/gnu/java/awt/peer/gtk/GtkCanvasPeer.java b/gnu/java/awt/peer/gtk/GtkCanvasPeer.java index edfc9ceee..30c39dede 100644 --- a/gnu/java/awt/peer/gtk/GtkCanvasPeer.java +++ b/gnu/java/awt/peer/gtk/GtkCanvasPeer.java @@ -53,8 +53,8 @@ public class GtkCanvasPeer extends GtkComponentPeer implements CanvasPeer // Preferred size for a drawing widget is always what the user // requested. - public Dimension getPreferredSize () + public Dimension preferredSize() { - return awtComponent.getSize (); + return awtComponent.getSize(); } } diff --git a/java/awt/peer/ComponentPeer.java b/java/awt/peer/ComponentPeer.java index 95979b8a9..bc6e3a457 100644 --- a/java/awt/peer/ComponentPeer.java +++ b/java/awt/peer/ComponentPeer.java @@ -153,6 +153,12 @@ public interface ComponentPeer * {@link Component#getMinimumSize()}. * * @return the minimum size for the component + * + * @specnote Presumably this method got added to replace minimumSize(). + * However, testing shows that this is never called in the RI + * (tested with JDK5), but instead minimumSize() is called + * directly. It is advisable to implement this method to delegate + * to minimumSize() and put the real implementation in there. */ Dimension getMinimumSize(); @@ -161,6 +167,12 @@ public interface ComponentPeer * {@link Component#getPreferredSize()}. * * @return the preferred size for the component + * + * @specnote Presumably this method got added to replace preferredSize(). + * However, testing shows that this is never called in the RI + * (tested with JDK5), but instead preferredSize() is called + * directly. It is advisable to implement this method to delegate + * to preferredSize() and put the real implementation in there. */ Dimension getPreferredSize(); -- cgit v1.2.1