harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r447713 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt: font/ geom/
Date Tue, 19 Sep 2006 03:47:24 GMT
Author: ndbeyer
Date: Mon Sep 18 20:47:22 2006
New Revision: 447713

URL: http://svn.apache.org/viewvc?view=rev&rev=447713
Log:
code cleanup; remove compiler warnings, add braces and annotations, etc

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/FontRenderContext.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphJustificationInfo.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphMetrics.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ImageGraphicAttribute.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/LineBreakMeasurer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ShapeGraphicAttribute.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextAttribute.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextHitInfo.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextLayout.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextMeasurer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/AffineTransform.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Area.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/CubicCurve2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Dimension2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/GeneralPath.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Line2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Point2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/QuadCurve2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Rectangle2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RectangularShape.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/FontRenderContext.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/FontRenderContext.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/FontRenderContext.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/FontRenderContext.java Mon Sep 18 20:47:22 2006
@@ -45,29 +45,28 @@
     protected FontRenderContext() {
     }
 
+    @Override
     public boolean equals(Object obj) {
-        if (obj == this)
+        if (obj == this) {
             return true;
+        }
 
         if (obj != null) {
-          try {
-            return equals((FontRenderContext)obj);
-          }
-          catch (ClassCastException e) {
-            return false;
-          }
-        } else {
-            return false;
+            try {
+                return equals((FontRenderContext) obj);
+            } catch (ClassCastException e) {
+                return false;
+            }
         }
+        return false;
 
     }
 
     public AffineTransform getTransform() {
         if (transform != null){
             return new AffineTransform(transform);
-        } else {
-            return new AffineTransform();
         }
+        return new AffineTransform();
     }
 
     public boolean equals(FontRenderContext frc) {
@@ -95,6 +94,7 @@
         return this.fAntiAliased;
     }
 
+    @Override
     public int hashCode() {
         return this.getTransform().hashCode() ^
                 new Boolean(this.fFractionalMetrics).hashCode() ^

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphJustificationInfo.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphJustificationInfo.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphJustificationInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphJustificationInfo.java Mon Sep 18 20:47:22 2006
@@ -47,60 +47,51 @@
 
     public final float weight;
 
-    public GlyphJustificationInfo(float weight, boolean growAbsorb, 
-            int growPriority, float growLeftLimit, float growRightLimit, 
-            boolean shrinkAbsorb, int shrinkPriority, float shrinkLeftLimit, 
-            float shrinkRightLimit) {
-
-
-        if (weight < 0 ){
-            throw new IllegalArgumentException("weight must be a " +
-                    "positive number");
-        } else
-            this.weight = weight;
-
-        if (growLeftLimit < 0 ){
-            throw new IllegalArgumentException("growLeftLimit must be a " +
-                    "positive number");
-        } else
-            this.growLeftLimit = growLeftLimit;
-
-        if (growRightLimit < 0 ){
-            throw new IllegalArgumentException("growRightLimit must be a " +
-                    "positive number");
-        } else
-            this.growRightLimit = growRightLimit;
-
-        if ((shrinkPriority < 0 ) || (shrinkPriority > PRIORITY_NONE)){
-            throw new IllegalArgumentException("incorrect value for " +
-                    "shrinkPriority, more than PRIORITY_NONE or less than " +
-                    "PRIORITY_KASHIDA value");
-        } else
-            this.shrinkPriority = shrinkPriority;
-
-        if ((growPriority < 0 ) || (growPriority > PRIORITY_NONE)){
-            throw new IllegalArgumentException("incorrect value for " +
-                    "growPriority, more than PRIORITY_NONE or less than " +
-                    "PRIORITY_KASHIDA value");
-        } else
-            this.growPriority = growPriority;
-
-        if (shrinkLeftLimit < 0 ){
-            throw new IllegalArgumentException("shrinkLeftLimit must be a " +
-                    "positive number");
-        } else
-            this.shrinkLeftLimit = shrinkLeftLimit;
-
-        if (shrinkRightLimit  < 0 ){
-            throw new IllegalArgumentException("shrinkRightLimit must be a " +
-                    "positive number");
-        } else
-            this.shrinkRightLimit = shrinkRightLimit;
+    public GlyphJustificationInfo(float weight, boolean growAbsorb, int growPriority,
+            float growLeftLimit, float growRightLimit, boolean shrinkAbsorb,
+            int shrinkPriority, float shrinkLeftLimit, float shrinkRightLimit) {
+
+        if (weight < 0) {
+            throw new IllegalArgumentException("weight must be a " + "positive number");
+        }
+        this.weight = weight;
+
+        if (growLeftLimit < 0) {
+            throw new IllegalArgumentException("growLeftLimit must be a " + "positive number");
+        }
+        this.growLeftLimit = growLeftLimit;
+
+        if (growRightLimit < 0) {
+            throw new IllegalArgumentException("growRightLimit must be a " + "positive number");
+        }
+        this.growRightLimit = growRightLimit;
+
+        if ((shrinkPriority < 0) || (shrinkPriority > PRIORITY_NONE)) {
+            throw new IllegalArgumentException("incorrect value for "
+                    + "shrinkPriority, more than PRIORITY_NONE or less than "
+                    + "PRIORITY_KASHIDA value");
+        }
+        this.shrinkPriority = shrinkPriority;
+
+        if ((growPriority < 0) || (growPriority > PRIORITY_NONE)) {
+            throw new IllegalArgumentException("incorrect value for "
+                    + "growPriority, more than PRIORITY_NONE or less than "
+                    + "PRIORITY_KASHIDA value");
+        }
+        this.growPriority = growPriority;
+
+        if (shrinkLeftLimit < 0) {
+            throw new IllegalArgumentException("shrinkLeftLimit must be a " + "positive number");
+        }
+        this.shrinkLeftLimit = shrinkLeftLimit;
+
+        if (shrinkRightLimit < 0) {
+            throw new IllegalArgumentException("shrinkRightLimit must be a "
+                    + "positive number");
+        }
+        this.shrinkRightLimit = shrinkRightLimit;
 
         this.shrinkAbsorb = shrinkAbsorb;
         this.growAbsorb = growAbsorb;
     }
-
-
 }
-

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphMetrics.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphMetrics.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphMetrics.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphMetrics.java Mon Sep 18 20:47:22 2006
@@ -101,17 +101,17 @@
     }
 
     public float getRSB() {
-        if (this.horizontal)
+        if (this.horizontal) {
             return this.advanceX - this.bounds.x - (float)this.bounds.getWidth();
-        else
-            return this.advanceY - this.bounds.y - (float)this.bounds.getHeight();
+        }
+        return this.advanceY - this.bounds.y - (float)this.bounds.getHeight();
     }
 
     public float getLSB() {
-        if (this.horizontal)
+        if (this.horizontal) {
             return this.bounds.x;
-        else
-            return this.bounds.y;
+        }
+        return this.bounds.y;
     }
 
     public float getAdvanceY() {
@@ -123,10 +123,10 @@
     }
 
     public float getAdvance() {
-        if (this.horizontal)
+        if (this.horizontal) {
             return this.advanceX;
-        else
-            return this.advanceY;
+        }
+        return this.advanceY;
     }
 
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ImageGraphicAttribute.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ImageGraphicAttribute.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ImageGraphicAttribute.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ImageGraphicAttribute.java Mon Sep 18 20:47:22 2006
@@ -60,6 +60,7 @@
         this(image, alignment, 0, 0);
     }
 
+    @Override
     public int hashCode() {
         HashCode hash = new HashCode();
 
@@ -83,6 +84,7 @@
                 fImage.equals(iga.fImage));
     }
 
+    @Override
     public boolean equals(Object obj) {
         try {
             return equals((ImageGraphicAttribute) obj);
@@ -93,22 +95,27 @@
 
     }
 
+    @Override
     public void draw(Graphics2D g2, float x, float y) {
         g2.drawImage(fImage, (int)(x - fOriginX), (int)(y - fOriginY), null);
     }
 
+    @Override
     public float getAdvance() {
         return Math.max(0, fImgWidth - fOriginX);
     }
 
+    @Override
     public float getAscent() {
         return Math.max(0, fOriginY);
     }
 
+    @Override
     public Rectangle2D getBounds() {
         return new Rectangle2D.Float(-fOriginX, -fOriginY, fImgWidth, fImgHeight);
     }
 
+    @Override
     public float getDescent() {
         return Math.max(0, fImgHeight - fOriginY);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/LineBreakMeasurer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/LineBreakMeasurer.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/LineBreakMeasurer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/LineBreakMeasurer.java Mon Sep 18 20:47:22 2006
@@ -68,18 +68,18 @@
     }
 
     public TextLayout nextLayout(float wrappingWidth, int offsetLimit, boolean requireNextWord) {
-        if (position == maxpos)
+        if (position == maxpos) {
             return null;
+        }
 
         int nextPosition = nextOffset(wrappingWidth, offsetLimit, requireNextWord);
 
         if (nextPosition == position) {
             return null;
-        } else {
-            TextLayout layout = tm.getLayout(position, nextPosition);
-            position = nextPosition;
-            return layout;
         }
+        TextLayout layout = tm.getLayout(position, nextPosition);
+        position = nextPosition;
+        return layout;
     }
 
     public TextLayout nextLayout(float wrappingWidth) {
@@ -91,13 +91,15 @@
     }
 
     public int nextOffset(float wrappingWidth, int offsetLimit, boolean requireNextWord) {
-        if (offsetLimit <= position)
+        if (offsetLimit <= position) {
             throw new IllegalArgumentException(
                     "Offset limit should be greater than current position."
             );
+        }
 
-        if (position == maxpos) // Reached end of the paragraph
+        if (position == maxpos) {
             return position;
+        }
 
         int breakPos = tm.getLineBreakIndex(position, wrappingWidth);
         int correctedPos = breakPos;
@@ -123,10 +125,10 @@
     }
 
     public void setPosition(int pos) {
-        if (tm.aci.getBeginIndex() > pos || maxpos < pos)
+        if (tm.aci.getBeginIndex() > pos || maxpos < pos) {
             throw new IllegalArgumentException("Index is out of range");
-        else
-            position = pos;
+        }
+        position = pos;
     }
 }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java Mon Sep 18 20:47:22 2006
@@ -389,7 +389,7 @@
      */
     private int getIndexFromRange(int range){
         if (range == 0){
-            throw new IllegalArgumentException("illigal range argument value:"+
+            throw new IllegalArgumentException("Illegal range argument value:"+
                     range);
         }
 
@@ -401,7 +401,7 @@
             index++;
         }
 
-        throw new IllegalArgumentException("illigal range argument value:" + 
+        throw new IllegalArgumentException("Illegal range argument value:" + 
                 range);
 
     }
@@ -414,7 +414,7 @@
      */
     private int getRangeFromIndex(int index){
         if (index < 0 || index >= MAX_INDEX){
-            throw new IllegalArgumentException("illigal range argument value:"+
+            throw new IllegalArgumentException("Illegal range argument value:"+
                     index);
         }
 
@@ -422,6 +422,7 @@
     }
 
 
+    @Override
     public int hashCode() {
         HashCode hash = new HashCode();
 
@@ -433,6 +434,7 @@
 
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == null) {
             return false;
@@ -453,6 +455,7 @@
         return false;
     }
 
+    @Override
     public String toString() {
         /* !! There is no description in the documentation what this method must
          * return. Thus format of toString method is based on 1.5 release 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ShapeGraphicAttribute.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ShapeGraphicAttribute.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ShapeGraphicAttribute.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ShapeGraphicAttribute.java Mon Sep 18 20:47:22 2006
@@ -71,6 +71,7 @@
         this.fShapeHeight = (float)fBounds.getHeight();
     }
 
+    @Override
     public int hashCode() {
         HashCode hash = new HashCode();
 
@@ -94,6 +95,7 @@
 
     }
 
+    @Override
     public boolean equals(Object obj) {
         try {
             return equals((ShapeGraphicAttribute) obj);
@@ -103,6 +105,7 @@
         }
     }
 
+    @Override
     public void draw(Graphics2D g2, float x, float y) {
         AffineTransform at = AffineTransform.getTranslateInstance(x, y);
         if (fStroke == STROKE){
@@ -116,18 +119,22 @@
 
     }
 
+    @Override
     public float getAdvance() {
         return Math.max(0, fShapeWidth + fOriginX);
     }
 
+    @Override
     public float getAscent() {
         return Math.max(0, -fOriginY);
     }
 
+    @Override
     public Rectangle2D getBounds() {
         return (Rectangle2D)fBounds.clone();
     }
 
+    @Override
     public float getDescent() {
         return Math.max(0, fShapeHeight + fOriginY);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextAttribute.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextAttribute.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextAttribute.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextAttribute.java Mon Sep 18 20:47:22 2006
@@ -28,20 +28,20 @@
     private static final long serialVersionUID = 7744112784117861702L;
 
     // set of available text attributes
-    private static final Map attrMap = new HashMap();
+    private static final Map<String, TextAttribute> attrMap = new HashMap<String, TextAttribute>();
 
     protected TextAttribute(String name) {
         super(name);
         attrMap.put(name, this);
     }
 
+    @Override
     protected Object readResolve() throws InvalidObjectException {
-        TextAttribute result = (TextAttribute) attrMap.get(this.getName());
+        TextAttribute result = attrMap.get(this.getName());
         if (result != null) {
             return result;
-        } else {
-            throw new InvalidObjectException("Unknown attribute name");
         }
+        throw new InvalidObjectException("Unknown attribute name");
     }
 
     public static final TextAttribute BACKGROUND = new TextAttribute("background");
@@ -56,9 +56,11 @@
 
     public static final TextAttribute FOREGROUND = new TextAttribute("foreground");
 
-    public static final TextAttribute INPUT_METHOD_HIGHLIGHT = new TextAttribute("input method highlight");
+    public static final TextAttribute INPUT_METHOD_HIGHLIGHT = new TextAttribute(
+            "input method highlight");
 
-    public static final TextAttribute INPUT_METHOD_UNDERLINE = new TextAttribute("input method underline");
+    public static final TextAttribute INPUT_METHOD_UNDERLINE = new TextAttribute(
+            "input method underline");
 
     public static final TextAttribute JUSTIFICATION = new TextAttribute("justification");
 
@@ -148,6 +150,4 @@
 
     public static final Float WIDTH_EXTENDED = new Float(1.5f);
 
-
 }
-

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextHitInfo.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextHitInfo.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextHitInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextHitInfo.java Mon Sep 18 20:47:22 2006
@@ -32,6 +32,7 @@
         this.isTrailing = isTrailing;
     }
 
+    @Override
     public String toString() {
         return new String(
                 "TextHitInfo[" + charIdx + ", " +
@@ -39,11 +40,12 @@
         );
     }
 
+    @Override
     public boolean equals(Object obj) {
-        if (obj instanceof TextHitInfo)
+        if (obj instanceof TextHitInfo) {
             return equals((TextHitInfo) obj);
-        else
-            return false;
+        }
+        return false;
     }
 
     public boolean equals(TextHitInfo thi) {
@@ -67,6 +69,7 @@
         return !isTrailing;
     }
 
+    @Override
     public int hashCode() {
         return HashCode.combine(charIdx, isTrailing);
     }
@@ -95,4 +98,3 @@
         return new TextHitInfo(offset, false);
     }
 }
-

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextLayout.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextLayout.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextLayout.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextLayout.java Mon Sep 18 20:47:22 2006
@@ -54,9 +54,8 @@
 
             if (level1 == level2) {
                 return (hit2.isLeadingEdge() && (!hit1.isLeadingEdge())) ? hit2 : hit1;
-            } else {
-                return level1 > level2 ? hit1 : hit2;
             }
+            return level1 > level2 ? hit1 : hit2;
         }
 
     }
@@ -118,30 +117,35 @@
         caretManager = new CaretManager(this.breaker);
     }
 
+    @Override
     public int hashCode() {
         return breaker.hashCode();
     }
 
+    @Override
     protected Object clone() {
         TextLayout res = new TextLayout((TextRunBreaker) breaker.clone());
 
-        if (justificationWidth >= 0)
+        if (justificationWidth >= 0) {
             res.handleJustify(justificationWidth);
+        }
 
         return res;
     }
 
     public boolean equals(TextLayout layout) {
-        if (layout == null) // Need to check for null
+        if (layout == null) {
             return false;
-        else
-            return this.breaker.equals(layout.breaker);
+        }
+        return this.breaker.equals(layout.breaker);
     }
 
+    @Override
     public boolean equals(Object obj) {
         return obj instanceof TextLayout ? equals((TextLayout) obj) : false;
     }
 
+    @Override
     public String toString() { // what for?
         return super.toString();
     }
@@ -182,10 +186,10 @@
 
     public Shape getBlackBoxBounds(int firstEndpoint, int secondEndpoint) {
         updateMetrics();
-        if (firstEndpoint < secondEndpoint)
+        if (firstEndpoint < secondEndpoint) {
             return breaker.getBlackBoxBounds(firstEndpoint, secondEndpoint);
-        else
-            return breaker.getBlackBoxBounds(secondEndpoint, firstEndpoint);
+        }
+        return breaker.getBlackBoxBounds(secondEndpoint, firstEndpoint);
     }
 
     public Rectangle2D getBounds() {
@@ -235,10 +239,10 @@
     }
 
     public byte getCharacterLevel(int index) {
-        if (index == -1 || index == getCharacterCount())
+        if (index == -1 || index == getCharacterCount()) {
             return (byte) breaker.getBaseLevel();
-        else
-            return breaker.getLevel(index);
+        }
+        return breaker.getLevel(index);
     }
 
     public float getDescent() {
@@ -287,17 +291,16 @@
                     bounds,
                     this
             );
-        } else {
-            if (firstEndpoint < 0 || secondEndpoint > breaker.getCharCount()) {
-                throw new IllegalArgumentException("Endpoints are out of range");
-            }
-            return caretManager.getLogicalHighlightShape(
-                    firstEndpoint,
-                    secondEndpoint,
-                    bounds,
-                    this
-            );
         }
+        if (firstEndpoint < 0 || secondEndpoint > breaker.getCharCount()) {
+            throw new IllegalArgumentException("Endpoints are out of range");
+        }
+        return caretManager.getLogicalHighlightShape(
+                firstEndpoint,
+                secondEndpoint,
+                bounds,
+                this
+        );
     }
 
     public int[] getLogicalRangesForVisualSelection(TextHitInfo hit1, TextHitInfo hit2) {
@@ -324,9 +327,8 @@
 
         if (nextLeftHit != null) {
             return policy.getStrongCaret(getVisualOtherHit(nextLeftHit), nextLeftHit, this);
-        } else {
-            return null;
         }
+        return null;
     }
 
     public TextHitInfo getNextRightHit(TextHitInfo hitInfo) {
@@ -349,9 +351,8 @@
 
         if (nextRightHit != null) {
             return policy.getStrongCaret(getVisualOtherHit(nextRightHit), nextRightHit, this);
-        } else {
-            return null;
         }
+        return null;
     }
 
     public Shape getOutline(AffineTransform xform) {
@@ -359,8 +360,9 @@
 
         GeneralPath outline = breaker.getOutline();
 
-        if (outline != null && xform != null)
+        if (outline != null && xform != null) {
             outline.transform(xform);
+        }
 
         return outline;
     }
@@ -373,11 +375,11 @@
         // in logical representation. We use this fact.
         int lastNonWhitespace = breaker.getLastNonWhitespace();
 
-        if (lastNonWhitespace < 0)
+        if (lastNonWhitespace < 0) {
             return 0;
-        else if (lastNonWhitespace == getCharacterCount()-1)
+        } else if (lastNonWhitespace == getCharacterCount()-1) {
             return getAdvance();
-        else if (justificationWidth >= 0) { // Layout is justified
+        } else if (justificationWidth >= 0) { // Layout is justified
             return justificationWidth;
         } else {
             breaker.pushSegments(
@@ -430,13 +432,15 @@
     }
 
     public TextHitInfo hitTestChar(float x, float y, Rectangle2D bounds) {
-        if (x > bounds.getMaxX())
+        if (x > bounds.getMaxX()) {
             return breaker.isLTR() ?
                     TextHitInfo.trailing(breaker.getCharCount() - 1) : TextHitInfo.leading(0);
+        }
 
-        if (x < bounds.getMinX())
+        if (x < bounds.getMinX()) {
             return breaker.isLTR() ?
                     TextHitInfo.leading(0) : TextHitInfo.trailing(breaker.getCharCount() - 1);
+        }
 
         return breaker.hitTest(x, y);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextMeasurer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextMeasurer.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextMeasurer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/TextMeasurer.java Mon Sep 18 20:47:22 2006
@@ -63,6 +63,7 @@
         }
     }
 
+    @Override
     protected Object clone() {
         return new TextMeasurer((AttributedCharacterIterator) aci.clone(), frc);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/AffineTransform.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/AffineTransform.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/AffineTransform.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/AffineTransform.java Mon Sep 18 20:47:22 2006
@@ -535,6 +535,7 @@
         return dst;
     }
 
+    @Override
     public String toString() {
         return
             getClass().getName() +
@@ -542,6 +543,7 @@
                 + m10 + ", " + m11 + ", " + m12 + "]]";
     }
 
+    @Override
     public Object clone() {
         try {
             return super.clone();
@@ -550,6 +552,7 @@
         }
     }
 
+    @Override
     public int hashCode() {
         HashCode hash = new HashCode();
         hash.append(m00);
@@ -561,6 +564,7 @@
         return hash.hashCode();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java Mon Sep 18 20:47:22 2006
@@ -64,34 +64,42 @@
             this.extent = extent;
         }
 
+        @Override
         public double getX() {
             return x;
         }
 
-       public double getY() {
+       @Override
+    public double getY() {
             return y;
         }
 
+        @Override
         public double getWidth() {
             return width;
         }
 
+        @Override
         public double getHeight() {
             return height;
         }
 
+        @Override
         public double getAngleStart() {
             return start;
         }
 
+        @Override
         public double getAngleExtent() {
             return extent;
         }
 
+        @Override
         public boolean isEmpty() {
             return width <= 0.0f || height <= 0.0f;
         }
 
+        @Override
         public void setArc(double x, double y, double width, double height,
                 double start, double extent, int type)
         {
@@ -104,14 +112,17 @@
             this.extent = (float)extent;
         }
 
+        @Override
         public void setAngleStart(double start) {
             this.start = (float)start;
         }
 
+        @Override
         public void setAngleExtent(double extent) {
             this.extent = (float)extent;
         }
 
+        @Override
         protected Rectangle2D makeBounds(double x, double y, double width, double height) {
             return new Rectangle2D.Float((float)x, (float)y, (float)width, (float)height);
         }
@@ -157,34 +168,42 @@
             this.extent = extent;
         }
 
+        @Override
         public double getX() {
             return x;
         }
 
+        @Override
         public double getY() {
             return y;
         }
 
+        @Override
         public double getWidth() {
             return width;
         }
 
+        @Override
         public double getHeight() {
             return height;
         }
 
+        @Override
         public double getAngleStart() {
             return start;
         }
 
+        @Override
         public double getAngleExtent() {
             return extent;
         }
 
+        @Override
         public boolean isEmpty() {
             return width <= 0.0 || height <= 0.0;
         }
 
+        @Override
         public void setArc(double x, double y, double width, double height,
                 double start, double extent, int type)
         {
@@ -197,14 +216,17 @@
             this.extent = extent;
         }
 
+        @Override
         public void setAngleStart(double start) {
             this.start = start;
         }
 
+        @Override
         public void setAngleExtent(double extent) {
             this.extent = extent;
         }
 
+        @Override
         protected Rectangle2D makeBounds(double x, double y, double width, double height) {
             return new Rectangle2D.Double(x, y, width, height);
         }
@@ -534,6 +556,7 @@
         return makeBounds(bx1, by1, bx2 - bx1, by2 - by1);
     }
 
+    @Override
     public void setFrame(double x, double y, double width, double height) {
         setArc(x, y, width, height, getAngleStart(), getAngleExtent(), type);
     }
@@ -682,6 +705,7 @@
                 && !r.intersectsLine(cx, cy, p2.getX(), p2.getY());
     }
 
+    @Override
     public boolean contains(Rectangle2D rect) {
         return contains(rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight());
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Area.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Area.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Area.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Area.java Mon Sep 18 20:47:22 2006
@@ -127,9 +127,8 @@
             points[1] == points[3] && points[3] == points[9] && points[5] == points[7])
         {
             return new Rectangle2D.Float(points[0], points[1], points[2] - points[0], points[7] - points[1]);
-        } else {
-            return null;
         }
+        return null;
     }
     
     public void intersect(Area area) {
@@ -172,6 +171,7 @@
         return new Area(t.createTransformedShape(s));
     }
 
+    @Override
     public Object clone() {
         return new Area(this);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/CubicCurve2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/CubicCurve2D.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/CubicCurve2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/CubicCurve2D.java Mon Sep 18 20:47:22 2006
@@ -45,54 +45,67 @@
             setCurve(x1, y1, ctrlx1, ctrly1, ctrlx2, ctrly2, x2, y2);
         }
 
+        @Override
         public double getX1() {
             return x1;
         }
 
+        @Override
         public double getY1() {
             return y1;
         }
 
+        @Override
         public double getCtrlX1() {
             return ctrlx1;
         }
 
+        @Override
         public double getCtrlY1() {
             return ctrly1;
         }
 
+        @Override
         public double getCtrlX2() {
             return ctrlx2;
         }
 
+        @Override
         public double getCtrlY2() {
             return ctrly2;
         }
 
+        @Override
         public double getX2() {
             return x2;
         }
 
+        @Override
         public double getY2() {
             return y2;
         }
 
+        @Override
         public Point2D getP1() {
             return new Point2D.Float(x1, y1);
         }
 
+        @Override
         public Point2D getCtrlP1() {
             return new Point2D.Float(ctrlx1, ctrly1);
         }
 
+        @Override
         public Point2D getCtrlP2() {
             return new Point2D.Float(ctrlx2, ctrly2);
         }
 
+        @Override
         public Point2D getP2() {
             return new Point2D.Float(x2, y2);
         }
 
+        @Override
         public void setCurve(double x1, double y1, double ctrlx1, double ctrly1,
                 double ctrlx2, double ctrly2, double x2, double y2)
         {
@@ -147,54 +160,67 @@
             setCurve(x1, y1, ctrlx1, ctrly1, ctrlx2, ctrly2, x2, y2);
         }
 
+        @Override
         public double getX1() {
             return x1;
         }
 
+        @Override
         public double getY1() {
             return y1;
         }
 
+        @Override
         public double getCtrlX1() {
             return ctrlx1;
         }
 
+        @Override
         public double getCtrlY1() {
             return ctrly1;
         }
 
+        @Override
         public double getCtrlX2() {
             return ctrlx2;
         }
 
+        @Override
         public double getCtrlY2() {
             return ctrly2;
         }
 
+        @Override
         public double getX2() {
             return x2;
         }
 
+        @Override
         public double getY2() {
             return y2;
         }
 
+        @Override
         public Point2D getP1() {
             return new Point2D.Double(x1, y1);
         }
 
+        @Override
         public Point2D getCtrlP1() {
             return new Point2D.Double(ctrlx1, ctrly1);
         }
 
+        @Override
         public Point2D getCtrlP2() {
             return new Point2D.Double(ctrlx2, ctrly2);
         }
 
+        @Override
         public Point2D getP2() {
             return new Point2D.Double(x2, y2);
         }
 
+        @Override
         public void setCurve(double x1, double y1, double ctrlx1, double ctrly1,
                 double ctrlx2, double ctrly2, double x2, double y2)
         {
@@ -545,6 +571,7 @@
         return new FlatteningPathIterator(getPathIterator(at), flatness);
     }
 
+    @Override
     public Object clone() {
         try {
             return super.clone();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Dimension2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Dimension2D.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Dimension2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Dimension2D.java Mon Sep 18 20:47:22 2006
@@ -34,6 +34,7 @@
         setSize(d.getWidth(), d.getHeight());
     }
 
+    @Override
     public Object clone() {
         try {
             return super.clone();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java Mon Sep 18 20:47:22 2006
@@ -37,22 +37,27 @@
             setFrame(x, y, width, height);
         }
 
+        @Override
         public double getX() {
             return x;
         }
 
+        @Override
         public double getY() {
             return y;
         }
 
+        @Override
         public double getWidth() {
             return width;
         }
 
+        @Override
         public double getHeight() {
             return height;
         }
 
+        @Override
         public boolean isEmpty() {
             return width <= 0.0 || height <= 0.0;
         }
@@ -64,6 +69,7 @@
             this.height = height;
         }
 
+        @Override
         public void setFrame(double x, double y, double width, double height) {
             this.x = (float)x;
             this.y = (float)y;
@@ -90,26 +96,32 @@
             setFrame(x, y, width, height);
         }
 
+        @Override
         public double getX() {
             return x;
         }
 
+        @Override
         public double getY() {
             return y;
         }
 
+        @Override
         public double getWidth() {
             return width;
         }
 
+        @Override
         public double getHeight() {
             return height;
         }
 
+        @Override
         public boolean isEmpty() {
             return width <= 0.0 || height <= 0.0;
         }
 
+        @Override
         public void setFrame(double x, double y, double width, double height) {
             this.x = x;
             this.y = y;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/GeneralPath.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/GeneralPath.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/GeneralPath.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/GeneralPath.java Mon Sep 18 20:47:22 2006
@@ -132,7 +132,7 @@
 
         public int currentSegment(double[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iiterator out of bounds");
+                throw new NoSuchElementException("Iterator out of bounds");
             }
             int type = p.types[typeIndex];
             int count = GeneralPath.pointShift[type];
@@ -148,7 +148,7 @@
 
         public int currentSegment(float[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iiterator out of bounds");
+                throw new NoSuchElementException("Iterator out of bounds");
             }
             int type = p.types[typeIndex];
             int count = GeneralPath.pointShift[type];
@@ -195,7 +195,7 @@
     }
 
     /**
-     * Checks points and types buffer size to add pointCount points. If necessary realloc bufers to enlarge size.   
+     * Checks points and types buffer size to add pointCount points. If necessary realloc buffers to enlarge size.   
      * @param pointCount - the point count to be added in buffer
      */
     void checkBuf(int pointCount, boolean checkMove) {
@@ -311,9 +311,8 @@
                 int type = types[i];
                 if (type == PathIterator.SEG_MOVETO) {
                     break;
-                } else {
-                    j -= pointShift[type];
                 }
+                j -= pointShift[type];
             }
         }
         return new Point2D.Float(points[j], points[j + 1]);
@@ -371,14 +370,13 @@
     /**
      * Checks cross count according to path rule to define is it point inside shape or not. 
      * @param cross - the point cross count
-     * @return true if point is inside path, or false otherwiseh 
+     * @return true if point is inside path, or false otherwise 
      */
     boolean isInside(int cross) {
         if (rule == WIND_NON_ZERO) {
             return Crossing.isInsideNonZero(cross);
-        } else {
-            return Crossing.isInsideEvenOdd(cross);
         }
+        return Crossing.isInsideEvenOdd(cross);
     }
 
     public boolean contains(double px, double py) {
@@ -415,11 +413,12 @@
         return new FlatteningPathIterator(getPathIterator(t), flatness);
     }
 
+    @Override
     public Object clone() {
         try {
             GeneralPath p = (GeneralPath) super.clone();
-            p.types = (byte[])types.clone();
-            p.points = (float[])points.clone();
+            p.types = types.clone();
+            p.points = points.clone();
             return p;
         } catch (CloneNotSupportedException e) {
             throw new InternalError();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Line2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Line2D.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Line2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Line2D.java Mon Sep 18 20:47:22 2006
@@ -43,30 +43,37 @@
             setLine(p1, p2);
         }
 
+        @Override
         public double getX1() {
             return x1;
         }
 
+        @Override
         public double getY1() {
             return y1;
         }
 
+        @Override
         public double getX2() {
             return x2;
         }
 
+        @Override
         public double getY2() {
             return y2;
         }
 
+        @Override
         public Point2D getP1() {
             return new Point2D.Float(x1, y1);
         }
 
+        @Override
         public Point2D getP2() {
             return new Point2D.Float(x2, y2);
         }
 
+        @Override
         public void setLine(double x1, double y1, double x2, double y2) {
             this.x1 = (float)x1;
             this.y1 = (float)y1;
@@ -119,30 +126,37 @@
             setLine(p1, p2);
         }
 
+        @Override
         public double getX1() {
             return x1;
         }
 
+        @Override
         public double getY1() {
             return y1;
         }
 
+        @Override
         public double getX2() {
             return x2;
         }
 
+        @Override
         public double getY2() {
             return y2;
         }
 
+        @Override
         public Point2D getP1() {
             return new Point2D.Double(x1, y1);
         }
 
+        @Override
         public Point2D getP2() {
             return new Point2D.Double(x2, y2);
         }
 
+        @Override
         public void setLine(double x1, double y1, double x2, double y2) {
             this.x1 = x1;
             this.y1 = y1;
@@ -494,6 +508,7 @@
         return new Iterator(this, at);
     }
 
+    @Override
     public Object clone() {
         try {
             return super.clone();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Point2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Point2D.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Point2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Point2D.java Mon Sep 18 20:47:22 2006
@@ -36,10 +36,12 @@
             this.y = y;
         }
 
+        @Override
         public double getX() {
             return x;
         }
 
+        @Override
         public double getY() {
             return y;
         }
@@ -49,11 +51,13 @@
             this.y = y;
         }
 
+        @Override
         public void setLocation(double x, double y) {
             this.x = (float)x;
             this.y = (float)y;
         }
 
+        @Override
         public String toString() {
             return getClass().getName() + "[x=" + x + ",y=" + y + "]";
         }
@@ -72,19 +76,23 @@
             this.y = y;
         }
 
+        @Override
         public double getX() {
             return x;
         }
 
+        @Override
         public double getY() {
             return y;
         }
 
+        @Override
         public void setLocation(double x, double y) {
             this.x = x;
             this.y = y;
         }
 
+        @Override
         public String toString() {
             return getClass().getName() + "[x=" + x + ",y=" + y + "]";
         }
@@ -129,6 +137,7 @@
         return Math.sqrt(distanceSq(p));
     }
 
+    @Override
     public Object clone() {
         try {
             return super.clone();
@@ -137,6 +146,7 @@
         }
     }
 
+    @Override
     public int hashCode() {
         HashCode hash = new HashCode();
         hash.append(getX());
@@ -144,6 +154,7 @@
         return hash.hashCode();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/QuadCurve2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/QuadCurve2D.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/QuadCurve2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/QuadCurve2D.java Mon Sep 18 20:47:22 2006
@@ -43,42 +43,52 @@
             setCurve(x1, y1, ctrlx, ctrly, x2, y2);
         }
 
+        @Override
         public double getX1() {
             return x1;
         }
 
+        @Override
         public double getY1() {
             return y1;
         }
 
+        @Override
         public double getCtrlX() {
             return ctrlx;
         }
 
+        @Override
         public double getCtrlY() {
             return ctrly;
         }
 
+        @Override
         public double getX2() {
             return x2;
         }
 
+        @Override
         public double getY2() {
             return y2;
         }
 
+        @Override
         public Point2D getP1() {
             return new Point2D.Float(x1, y1);
         }
 
+        @Override
         public Point2D getCtrlPt() {
             return new Point2D.Float(ctrlx, ctrly);
         }
 
+        @Override
         public Point2D getP2() {
             return new Point2D.Float(x2, y2);
         }
 
+        @Override
         public void setCurve(double x1, double y1, double ctrlx, double ctrly, double x2, double y2) {
             this.x1 = (float)x1;
             this.y1 = (float)y1;
@@ -122,42 +132,52 @@
             setCurve(x1, y1, ctrlx, ctrly, x2, y2);
         }
 
+        @Override
         public double getX1() {
             return x1;
         }
 
+        @Override
         public double getY1() {
             return y1;
         }
 
+        @Override
         public double getCtrlX() {
             return ctrlx;
         }
 
+        @Override
         public double getCtrlY() {
             return ctrly;
         }
 
+        @Override
         public double getX2() {
             return x2;
         }
 
+        @Override
         public double getY2() {
             return y2;
         }
 
+        @Override
         public Point2D getP1() {
             return new Point2D.Double(x1, y1);
         }
 
+        @Override
         public Point2D getCtrlPt() {
             return new Point2D.Double(ctrlx, ctrly);
         }
 
+        @Override
         public Point2D getP2() {
             return new Point2D.Double(x2, y2);
         }
 
+        @Override
         public void setCurve(double x1, double y1, double ctrlx, double ctrly, double x2, double y2) {
             this.x1 = x1;
             this.y1 = y1;
@@ -457,6 +477,7 @@
         return new FlatteningPathIterator(getPathIterator(t), flatness);
     }
 
+    @Override
     public Object clone() {
         try {
             return super.clone();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Rectangle2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Rectangle2D.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Rectangle2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Rectangle2D.java Mon Sep 18 20:47:22 2006
@@ -44,22 +44,27 @@
             setRect(x, y, width, height);
         }
 
+        @Override
         public double getX() {
             return x;
         }
 
+        @Override
         public double getY() {
             return y;
         }
 
+        @Override
         public double getWidth() {
             return width;
         }
 
+        @Override
         public double getHeight() {
             return height;
         }
 
+        @Override
         public boolean isEmpty() {
             return width <= 0.0f || height <= 0.0f;
         }
@@ -71,6 +76,7 @@
             this.height = height;
         }
 
+        @Override
         public void setRect(double x, double y, double width, double height) {
             this.x = (float)x;
             this.y = (float)y;
@@ -78,6 +84,7 @@
             this.height = (float)height;
         }
 
+        @Override
         public void setRect(Rectangle2D r) {
             this.x = (float)r.getX();
             this.y = (float)r.getY();
@@ -85,6 +92,7 @@
             this.height = (float)r.getHeight();
         }
 
+        @Override
         public int outcode(double px, double py) {
             int code = 0;
 
@@ -111,10 +119,12 @@
             return code;
         }
 
+        @Override
         public Rectangle2D getBounds2D() {
             return new Float(x, y, width, height);
         }
 
+        @Override
         public Rectangle2D createIntersection(Rectangle2D r) {
             Rectangle2D dst;
             if (r instanceof Double) {
@@ -126,6 +136,7 @@
             return dst;
         }
 
+        @Override
         public Rectangle2D createUnion(Rectangle2D r) {
             Rectangle2D dst;
             if (r instanceof Double) {
@@ -137,6 +148,7 @@
             return dst;
         }
 
+        @Override
         public String toString() {
             // The output format based on 1.5 release behaviour. It could be obtained in the following way
             // System.out.println(new Rectangle2D.Float().toString())
@@ -158,26 +170,32 @@
             setRect(x, y, width, height);
         }
 
+        @Override
         public double getX() {
             return x;
         }
 
+        @Override
         public double getY() {
             return y;
         }
 
+        @Override
         public double getWidth() {
             return width;
         }
 
+        @Override
         public double getHeight() {
             return height;
         }
 
+        @Override
         public boolean isEmpty() {
             return width <= 0.0 || height <= 0.0;
         }
 
+        @Override
         public void setRect(double x, double y, double width, double height) {
             this.x = x;
             this.y = y;
@@ -185,6 +203,7 @@
             this.height = height;
         }
 
+        @Override
         public void setRect(Rectangle2D r) {
             this.x = r.getX();
             this.y = r.getY();
@@ -192,6 +211,7 @@
             this.height = r.getHeight();
         }
 
+        @Override
         public int outcode(double px, double py) {
             int code = 0;
 
@@ -218,22 +238,26 @@
             return code;
         }
 
+        @Override
         public Rectangle2D getBounds2D() {
             return new Double(x, y, width, height);
         }
 
+        @Override
         public Rectangle2D createIntersection(Rectangle2D r) {
             Rectangle2D dst = new Rectangle2D.Double();
             Rectangle2D.intersect(this, r, dst);
             return dst;
         }
 
+        @Override
         public Rectangle2D createUnion(Rectangle2D r) {
             Rectangle2D dest = new Rectangle2D.Double();
             Rectangle2D.union(this, r, dest);
             return dest;
         }
 
+        @Override
         public String toString() {
             // The output format based on 1.5 release behaviour. It could be obtained in the following way
             // System.out.println(new Rectangle2D.Double().toString())
@@ -400,6 +424,7 @@
         setRect(r.getX(), r.getY(), r.getWidth(), r.getHeight());
     }
 
+    @Override
     public void setFrame(double x, double y, double width, double height) {
         setRect(x, y, width, height);
     }
@@ -509,10 +534,12 @@
         return new Iterator(this, t);
     }
 
+    @Override
     public PathIterator getPathIterator(AffineTransform t, double flatness) {
         return new Iterator(this, t);
     }
 
+    @Override
     public int hashCode() {
         HashCode hash = new HashCode();
         hash.append(getX());
@@ -522,6 +549,7 @@
         return hash.hashCode();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RectangularShape.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RectangularShape.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RectangularShape.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RectangularShape.java Mon Sep 18 20:47:22 2006
@@ -132,6 +132,7 @@
         return new FlatteningPathIterator(getPathIterator(t), flatness);
     }
 
+    @Override
     public Object clone() {
         try {
             return super.clone();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java?view=diff&rev=447713&r1=447712&r2=447713
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java Mon Sep 18 20:47:22 2006
@@ -39,30 +39,37 @@
             setRoundRect(x, y, width, height, arcwidth, archeight);
         }
 
+        @Override
         public double getX() {
             return x;
         }
 
+        @Override
         public double getY() {
             return y;
         }
 
+        @Override
         public double getWidth() {
             return width;
         }
 
+        @Override
         public double getHeight() {
             return height;
         }
 
+        @Override
         public double getArcWidth() {
             return arcwidth;
         }
 
+        @Override
         public double getArcHeight() {
             return archeight;
         }
 
+        @Override
         public boolean isEmpty() {
             return width <= 0.0f || height <= 0.0f;
         }
@@ -76,6 +83,7 @@
             this.archeight = archeight;
         }
 
+        @Override
         public void setRoundRect(double x, double y, double width, double height, double arcwidth, double archeight) {
             this.x = (float)x;
             this.y = (float)y;
@@ -85,6 +93,7 @@
             this.archeight = (float)archeight;
         }
 
+        @Override
         public void setRoundRect(RoundRectangle2D rr) {
             this.x = (float)rr.getX();
             this.y = (float)rr.getY();
@@ -115,34 +124,42 @@
             setRoundRect(x, y, width, height, arcwidth, archeight);
         }
 
+        @Override
         public double getX() {
             return x;
         }
 
+        @Override
         public double getY() {
             return y;
         }
 
+        @Override
         public double getWidth() {
             return width;
         }
 
+        @Override
         public double getHeight() {
             return height;
         }
 
+        @Override
         public double getArcWidth() {
             return arcwidth;
         }
 
+        @Override
         public double getArcHeight() {
             return archeight;
         }
 
+        @Override
         public boolean isEmpty() {
             return width <= 0.0 || height <= 0.0;
         }
 
+        @Override
         public void setRoundRect(double x, double y, double width, double height, double arcwidth, double archeight) {
             this.x = x;
             this.y = y;
@@ -152,6 +169,7 @@
             this.archeight = archeight;
         }
 
+        @Override
         public void setRoundRect(RoundRectangle2D rr) {
             this.x = rr.getX();
             this.y = rr.getY();
@@ -343,6 +361,7 @@
                 .getArcWidth(), rr.getArcHeight());
     }
 
+    @Override
     public void setFrame(double x, double y, double width, double height) {
         setRoundRect(x, y, width, height, getArcWidth(), getArcHeight());
     }



Mime
View raw message