summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-08-06 23:42:28 +0000
committerMark Wielaard <mark@klomp.org>2006-08-06 23:42:28 +0000
commitf392b4f84f9e4baef9473bd01357c3e2809f6d07 (patch)
treeb4521b5d5a6c7104802f956e43a9c43be16951cf
parent78b0343cc4167add1b175a6dcafd2ae07b323b14 (diff)
downloadclasspath-f392b4f84f9e4baef9473bd01357c3e2809f6d07.tar.gz
2006-08-06 Roman Kennke <kennke@aicas.com>
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.
-rw-r--r--ChangeLog12
-rw-r--r--gnu/java/awt/peer/gtk/GtkCanvasPeer.java4
-rw-r--r--java/awt/peer/ComponentPeer.java12
3 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 029165d68..3e4d6e0b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-08-06 Roman Kennke <kennke@aicas.com>
+
+ 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 <sven@physto.se>
* 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();