[multiple changes]

2003-11-27  Dalibor Topic <robilad@kaffe.org>

	* java/text/FieldPosition.java (equals): Adapted to handle
	field_attribute. Added fast-circuit check for comparison to self.
	Replaced use of instanceof by getClass to fix symmetry for derived
	types.
	(toString): Adapted to handle field_attribute. Improved readability.
	(hashCode): New method.

2003-11-27  Guilhem Lavaux <guilhem@kaffe.org>

	* java/text/FieldPosition.java (field_attribute): New field.
	(FieldPosition (Format.Field), FieldPosition(Format.Field, int),
	getFieldAttribute): New methods.

From-SVN: r73988

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fb7e8f7cd9db8e04c967e0a7372546a1f3b8ad4d..a7a388d5ddab382384afa8cbef046d9b294fc8e0 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,18 @@
+2003-11-27  Dalibor Topic <robilad@kaffe.org>
+
+       * java/text/FieldPosition.java (equals): Adapted to handle
+       field_attribute. Added fast-circuit check for comparison to self.
+       Replaced use of instanceof by getClass to fix symmetry for derived
+       types.
+       (toString): Adapted to handle field_attribute. Improved readability.
+       (hashCode): New method.
+
+2003-11-27  Guilhem Lavaux <guilhem@kaffe.org>
+
+       * java/text/FieldPosition.java (field_attribute): New field.
+       (FieldPosition (Format.Field), FieldPosition(Format.Field, int),
+       getFieldAttribute): New methods.
+
 2003-11-27  Guilhem Lavaux <guilhem@kaffe.org>
 
        * java/text/DecimalFormatSymbols.java (locale): New field.

diff --git a/libjava/java/text/FieldPosition.java b/libjava/java/text/FieldPosition.java
index b31ce707a9fe75189caf03e08bff52f78634da88..56f19cde68201720c6a01f7755852849773a2420 100644 (file)
--- a/libjava/java/text/FieldPosition.java
+++ b/libjava/java/text/FieldPosition.java
@@ -64,6 +64,38 @@ public class FieldPosition
    */
   private int end;
 
+  /**
+   * This is the field attribute value.
+   */
+  private Format.Field field_attribute;
+
+  /**
+   * This method initializes a new instance of <code>FieldPosition</code>
+   * to have the specified field attribute. The attribute will be used as
+   * an id.
+   *
+   * @param field The field format attribute.
+   */
+  public FieldPosition (Format.Field field)
+  {
+    this.field_attribute = field;
+  }
+
+  /**
+   * This method initializes a new instance of <code>FieldPosition</code>
+   * to have the specified field attribute. The attribute will be used as
+   * an id is non null. The integer field id is only used if the Format.Field
+   * attribute is not used by the formatter.
+   *
+   * @param field The field format attribute.
+   * @param field_id The field identifier value.
+   */
+  public FieldPosition (Format.Field field, int field_id)
+  {
+    this.field_attribute = field;
+    this.field_id = field_id;
+  }
+
   /**
    * This method initializes a new instance of <code>FieldPosition</code> to
    * have the specified field id.
@@ -85,6 +117,11 @@ public class FieldPosition
     return field_id;
   }
 
+  public Format.Field getFieldAttribute ()
+  {
+    return field_attribute;
+  }
+
   /**
    * This method returns the beginning index for this field.
    *
@@ -132,8 +169,8 @@ public class FieldPosition
    * <ul>
    * <li>The specified object is not <code>null</code>.
    * <li>The specified object is an instance of <code>FieldPosition</code>.
-   * <li>The specified object has the same field identifier and beginning
-   * and ending index as this object.
+   * <li>The specified object has the same field identifier, field attribute 
+   * and beginning and ending index as this object.
    * </ul>
    *
    * @param obj The object to test for equality to this object.
@@ -143,15 +180,40 @@ public class FieldPosition
    */
   public boolean equals (Object obj)
   {
-    if (! (obj instanceof FieldPosition))
+    if (this == obj)
+      return true;
+
+    if (obj == null || obj.getClass() != this.getClass())
       return false;
 
     FieldPosition fp = (FieldPosition) obj;
     return (field_id == fp.field_id
+           && (field_attribute == fp.field_attribute 
+               || (field_attribute != null 
+                   && field_attribute.equals(fp.field_attribute)))
            && begin == fp.begin
            && end == fp.end);
   }
 
+
+  /**
+   * This method returns a hash value for this object
+   * 
+   * @return A hash value for this object.
+   */
+  public int hashCode ()
+  {
+    int hash = 5;
+
+    hash = 31 * hash + field_id;
+    hash = 31 * hash + begin;
+    hash = 31 * hash + end;
+    hash = 31 * hash + 
+      (null == field_attribute ? 0 : field_attribute.hashCode());
+
+    return hash;
+  }
+
   /**
    * This method returns a <code>String</code> representation of this
    * object.
@@ -160,7 +222,11 @@ public class FieldPosition
    */
   public String toString ()
   {
-    return (getClass ().getName () + "[field=" + getField () + ",beginIndex="
-           + getBeginIndex () + ",endIndex=" + getEndIndex () + "]");
+    return (getClass ().getName ()
+           + "[field=" + getField ()
+           + ",attribute=" + getFieldAttribute ()
+           + ",beginIndex=" + getBeginIndex () 
+           + ",endIndex=" + getEndIndex () 
+           + "]");
   }
 }