Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 5 deletions

diff --git a/libjava/classpath/javax/swing/text/html/Option.java b/libjava/classpath/javax/swing/text/html/Option.java
index 1def51b2f59..18d5c2bd86f 100644
--- a/libjava/classpath/javax/swing/text/html/Option.java
+++ b/libjava/classpath/javax/swing/text/html/Option.java
@@ -72,10 +72,10 @@ public class Option
    */
   public Option(AttributeSet attr)
   {
-    attributes = attr;
+    // Protect the attribute set.
+    attributes = attr.copyAttributes();
     label = null;
-    selected = false;
-    // FIXME: Probably initialize something using the attributes.
+    selected = attr.getAttribute(HTML.Attribute.SELECTED) != null;
   }
 
   /**
@@ -151,7 +151,9 @@ public class Option
    */
   public String getValue()
   {
-    // FIXME: Return some attribute here if specified.
-    return label;
+    String value = (String) attributes.getAttribute(HTML.Attribute.VALUE);
+    if (value == null)
+      value = label;
+    return value;
   }
 }