summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gilbert <david.gilbert@object-refinery.com>2006-06-27 15:33:48 +0000
committerDavid Gilbert <david.gilbert@object-refinery.com>2006-06-27 15:33:48 +0000
commitf4ce903ab06bf93776a935b6d66127247fd572b7 (patch)
tree1ca54566cc5052164a515a21b3f397a4512d7f9c
parentf1de28e5cc9a612ca73687141eb1f6e29c94b2fa (diff)
downloadclasspath-f4ce903ab06bf93776a935b6d66127247fd572b7.tar.gz
2006-06-27 David Gilbert <david.gilbert@object-refinery.com>
* java/awt/Component.java (setName): Fire required PropertyChangeEvent, * java/awt/Label.java (getText): Removed redundant brackets, (generateName): New method (override), (nextLabelNumber): New field, (getUniqueLong): New method.
-rw-r--r--ChangeLog10
-rw-r--r--java/awt/Component.java7
-rw-r--r--java/awt/Label.java22
3 files changed, 36 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cd0314de..b86db80bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-27 David Gilbert <david.gilbert@object-refinery.com>
+
+ * java/awt/Component.java
+ (setName): Fire required PropertyChangeEvent,
+ * java/awt/Label.java
+ (getText): Removed redundant brackets,
+ (generateName): New method (override),
+ (nextLabelNumber): New field,
+ (getUniqueLong): New method.
+
2006-06-27 Roman Kennke <kennke@aicas.com>
* gnu/java/awt/peer/swing/SwingComponentPeer.java
diff --git a/java/awt/Component.java b/java/awt/Component.java
index e45e294aa..30904cbc0 100644
--- a/java/awt/Component.java
+++ b/java/awt/Component.java
@@ -632,16 +632,19 @@ public abstract class Component
}
/**
- * Sets the name of this component to the specified name.
+ * Sets the name of this component to the specified name (this is a bound
+ * property with the name 'name').
*
- * @param name the new name of this component
+ * @param name the new name (<code>null</code> permitted).
* @see #getName()
* @since 1.1
*/
public void setName(String name)
{
nameExplicitlySet = true;
+ String old = this.name;
this.name = name;
+ firePropertyChange("name", old, name);
}
/**
diff --git a/java/awt/Label.java b/java/awt/Label.java
index ca2c013ac..71614da64 100644
--- a/java/awt/Label.java
+++ b/java/awt/Label.java
@@ -167,7 +167,7 @@ public class Label extends Component implements Accessible
*/
public String getText()
{
- return(text);
+ return text;
}
/**
@@ -271,5 +271,25 @@ public class Label extends Component implements Accessible
return accessibleContext;
}
+ /**
+ * Generate a unique name for this button.
+ *
+ * @return A unique name for this button.
+ */
+ String generateName()
+ {
+ return "label" + getUniqueLong();
+ }
+
+ /**
+ * The number used to generate the name returned by getName.
+ */
+ private static transient long nextLabelNumber;
+
+ private static synchronized long getUniqueLong()
+ {
+ return nextLabelNumber++;
+ }
+
}