diff options
Diffstat (limited to 'libjava/classpath/java/awt')
24 files changed, 111 insertions, 42 deletions
diff --git a/libjava/classpath/java/awt/AlphaComposite.java b/libjava/classpath/java/awt/AlphaComposite.java index addd1e71327..a668fdae696 100644 --- a/libjava/classpath/java/awt/AlphaComposite.java +++ b/libjava/classpath/java/awt/AlphaComposite.java @@ -158,18 +158,53 @@ public final class AlphaComposite implements Composite return new AlphaCompositeContext(this, srcColorModel, dstColorModel); } + /** + * Return an <code>AlphaComposite</code> similar to <code>this</code>, + * that uses the specified rule. If <code>rule</code> is the same as + * <code>this.rule</code>, then <code>this</code> is returned. + * + * @since 1.6 + */ + public AlphaComposite derive(int rule) + { + if (this.rule == rule) + return this; + else + return AlphaComposite.getInstance(rule, this.getAlpha()); + } + + /** + * Return an <code>AlphaComposite</code> similar to <code>this</code>, + * that uses the specified <code>alpha</code>. + * + * If <code>alph</code> is the same as <code>this.alpha</code>, + * then <code>this</code> is returned. + * + * @since 1.6 + */ + public AlphaComposite derive(float alpha) + { + if (this.getAlpha() == alpha) + return this; + else + return AlphaComposite.getInstance(this.getRule(), alpha); + } + public float getAlpha() { return alpha; } + public int getRule() { return rule; } + public int hashCode() { return 31 * Float.floatToIntBits(alpha) + rule; } + public boolean equals(Object o) { if (! (o instanceof AlphaComposite)) diff --git a/libjava/classpath/java/awt/Component.java b/libjava/classpath/java/awt/Component.java index fe4fb9b8b0d..44676ba9dd3 100644 --- a/libjava/classpath/java/awt/Component.java +++ b/libjava/classpath/java/awt/Component.java @@ -43,6 +43,8 @@ package java.awt; import gnu.java.awt.ComponentReshapeEvent; +import gnu.java.lang.CPStringBuilder; + import java.awt.dnd.DropTarget; import java.awt.event.ActionEvent; import java.awt.event.AdjustmentEvent; @@ -175,7 +177,7 @@ public abstract class Component /** * Constant returned by the <code>getAlignmentY</code> and * <code>getAlignmentX</code> methods to indicate - * that the component wishes to be aligned to the center relative to + * that the component wishes to be aligned to the centdisper relative to * other components. * * @see #getAlignmentX() @@ -4991,7 +4993,7 @@ public abstract class Component */ protected String paramString() { - StringBuffer param = new StringBuffer(); + CPStringBuilder param = new CPStringBuilder(); String name = getName(); if (name != null) param.append(name).append(","); diff --git a/libjava/classpath/java/awt/Container.java b/libjava/classpath/java/awt/Container.java index 1e5004048a7..2634735118a 100644 --- a/libjava/classpath/java/awt/Container.java +++ b/libjava/classpath/java/awt/Container.java @@ -39,6 +39,8 @@ exception statement from your version. */ package java.awt; +import gnu.java.lang.CPStringBuilder; + import java.awt.event.ContainerEvent; import java.awt.event.ContainerListener; import java.awt.event.HierarchyEvent; @@ -1341,7 +1343,7 @@ public class Container extends Component if (layoutMgr == null) return super.paramString(); - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(super.paramString()); sb.append(",layout="); sb.append(layoutMgr.getClass().getName()); diff --git a/libjava/classpath/java/awt/JobAttributes.java b/libjava/classpath/java/awt/JobAttributes.java index 2acb3a01ed3..9ffc048782c 100644 --- a/libjava/classpath/java/awt/JobAttributes.java +++ b/libjava/classpath/java/awt/JobAttributes.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.awt; +import gnu.java.lang.CPStringBuilder; + /** * Needs documentation... * @@ -479,7 +481,7 @@ public final class JobAttributes implements Cloneable public String toString() { - StringBuffer s = new StringBuffer("copies=").append(copies) + CPStringBuilder s = new CPStringBuilder("copies=").append(copies) .append(",defaultSelection=").append(selection).append(",destination=") .append(destination).append(",dialog=").append(dialog) .append(",fileName=").append(filename).append(",fromPage=") diff --git a/libjava/classpath/java/awt/MouseInfo.java b/libjava/classpath/java/awt/MouseInfo.java index 957b6bccbef..8a853e15346 100644 --- a/libjava/classpath/java/awt/MouseInfo.java +++ b/libjava/classpath/java/awt/MouseInfo.java @@ -51,6 +51,13 @@ public class MouseInfo private static MouseInfoPeer peer; /** + * Private constructor to prevent instance creation. + */ + private MouseInfo() + { + } + + /** * Returns a PointerInfo object containing information about the current * location of the mouse pointer * diff --git a/libjava/classpath/java/awt/datatransfer/MimeType.java b/libjava/classpath/java/awt/datatransfer/MimeType.java index 438d78e9e73..8d2dcc01d1e 100644 --- a/libjava/classpath/java/awt/datatransfer/MimeType.java +++ b/libjava/classpath/java/awt/datatransfer/MimeType.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.awt.datatransfer; +import gnu.java.lang.CPStringBuilder; + import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; @@ -224,7 +226,7 @@ class MimeType */ public String toString() { - StringBuilder s = new StringBuilder(); + CPStringBuilder s = new CPStringBuilder(); s.append(primaryType); s.append('/'); s.append(subType); diff --git a/libjava/classpath/java/awt/event/ActionEvent.java b/libjava/classpath/java/awt/event/ActionEvent.java index 4bce7d45ce0..937d2cf5363 100644 --- a/libjava/classpath/java/awt/event/ActionEvent.java +++ b/libjava/classpath/java/awt/event/ActionEvent.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.awt.event; +import gnu.java.lang.CPStringBuilder; + import java.awt.AWTEvent; import java.awt.EventQueue; @@ -202,9 +204,9 @@ public class ActionEvent extends AWTEvent */ public String paramString() { - StringBuffer s = new StringBuffer(id == ACTION_PERFORMED - ? "ACTION_PERFORMED,cmd=" - : "unknown type,cmd="); + CPStringBuilder s = new CPStringBuilder(id == ACTION_PERFORMED + ? "ACTION_PERFORMED,cmd=" + : "unknown type,cmd="); s.append(actionCommand).append(",when=").append(when).append(",modifiers"); int len = s.length(); s.setLength(len + 1); diff --git a/libjava/classpath/java/awt/event/ComponentEvent.java b/libjava/classpath/java/awt/event/ComponentEvent.java index 6d478055aa5..156a3e2ad45 100644 --- a/libjava/classpath/java/awt/event/ComponentEvent.java +++ b/libjava/classpath/java/awt/event/ComponentEvent.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.awt.event; +import gnu.java.lang.CPStringBuilder; + import java.awt.AWTEvent; import java.awt.Component; @@ -114,7 +116,7 @@ public class ComponentEvent extends AWTEvent */ public String paramString() { - StringBuffer s = new StringBuffer(); + CPStringBuilder s = new CPStringBuilder(); // Unlike Sun, we don't throw NullPointerException or ClassCastException // when source was illegally changed. diff --git a/libjava/classpath/java/awt/event/HierarchyEvent.java b/libjava/classpath/java/awt/event/HierarchyEvent.java index e10cefbefcb..3237978f955 100644 --- a/libjava/classpath/java/awt/event/HierarchyEvent.java +++ b/libjava/classpath/java/awt/event/HierarchyEvent.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.awt.event; +import gnu.java.lang.CPStringBuilder; + import java.awt.AWTEvent; import java.awt.Component; import java.awt.Container; @@ -226,7 +228,7 @@ public class HierarchyEvent extends AWTEvent */ public String paramString() { - StringBuffer r = new StringBuffer(); + CPStringBuilder r = new CPStringBuilder(); switch (id) { case HIERARCHY_CHANGED: diff --git a/libjava/classpath/java/awt/event/InputEvent.java b/libjava/classpath/java/awt/event/InputEvent.java index 28cd9018599..b9dad3278bd 100644 --- a/libjava/classpath/java/awt/event/InputEvent.java +++ b/libjava/classpath/java/awt/event/InputEvent.java @@ -39,6 +39,7 @@ exception statement from your version. */ package java.awt.event; import gnu.java.awt.EventModifier; +import gnu.java.lang.CPStringBuilder; import java.awt.Component; @@ -376,7 +377,7 @@ public abstract class InputEvent extends ComponentEvent modifiers &= EventModifier.NEW_MASK; if (modifiers == 0) return ""; - StringBuffer s = new StringBuffer(); + CPStringBuilder s = new CPStringBuilder(); if ((modifiers & META_DOWN_MASK) != 0) s.append("Meta+"); if ((modifiers & CTRL_DOWN_MASK) != 0) diff --git a/libjava/classpath/java/awt/event/InputMethodEvent.java b/libjava/classpath/java/awt/event/InputMethodEvent.java index f6711a8fa5a..e0be40d5a67 100644 --- a/libjava/classpath/java/awt/event/InputMethodEvent.java +++ b/libjava/classpath/java/awt/event/InputMethodEvent.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.awt.event; +import gnu.java.lang.CPStringBuilder; + import java.awt.AWTEvent; import java.awt.Component; import java.awt.EventQueue; @@ -257,8 +259,8 @@ public class InputMethodEvent extends AWTEvent */ public String paramString() { - StringBuffer s - = new StringBuffer(80 + (text == null ? 0 + CPStringBuilder s + = new CPStringBuilder(80 + (text == null ? 0 : text.getEndIndex() - text.getBeginIndex())); s.append(id == INPUT_METHOD_TEXT_CHANGED ? "INPUT_METHOD_TEXT_CHANGED, " : "CARET_POSITION_CHANGED, "); diff --git a/libjava/classpath/java/awt/event/KeyEvent.java b/libjava/classpath/java/awt/event/KeyEvent.java index 42084d7333e..bb7ed4c2dc7 100644 --- a/libjava/classpath/java/awt/event/KeyEvent.java +++ b/libjava/classpath/java/awt/event/KeyEvent.java @@ -39,6 +39,7 @@ exception statement from your version. */ package java.awt.event; import gnu.java.awt.EventModifier; +import gnu.java.lang.CPStringBuilder; import java.awt.Component; import java.io.IOException; @@ -1673,7 +1674,7 @@ public class KeyEvent extends InputEvent */ public String paramString() { - StringBuffer s = new StringBuffer(); + CPStringBuilder s = new CPStringBuilder(); switch (id) { diff --git a/libjava/classpath/java/awt/event/MouseEvent.java b/libjava/classpath/java/awt/event/MouseEvent.java index 0ca833604a6..86a584c4103 100644 --- a/libjava/classpath/java/awt/event/MouseEvent.java +++ b/libjava/classpath/java/awt/event/MouseEvent.java @@ -39,6 +39,7 @@ exception statement from your version. */ package java.awt.event; import gnu.java.awt.EventModifier; +import gnu.java.lang.CPStringBuilder; import java.awt.Component; import java.awt.Point; @@ -434,7 +435,7 @@ public class MouseEvent extends InputEvent */ public String paramString() { - StringBuffer s = new StringBuffer(); + CPStringBuilder s = new CPStringBuilder(); switch (id) { case MOUSE_CLICKED: diff --git a/libjava/classpath/java/awt/event/WindowEvent.java b/libjava/classpath/java/awt/event/WindowEvent.java index 2186889e601..1298e1ad8ba 100644 --- a/libjava/classpath/java/awt/event/WindowEvent.java +++ b/libjava/classpath/java/awt/event/WindowEvent.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.awt.event; +import gnu.java.lang.CPStringBuilder; + import java.awt.Frame; import java.awt.Window; @@ -270,7 +272,7 @@ public class WindowEvent extends ComponentEvent */ public String paramString() { - StringBuffer s = new StringBuffer(); + CPStringBuilder s = new CPStringBuilder(); switch (id) { case WINDOW_OPENED: diff --git a/libjava/classpath/java/awt/font/TextLayout.java b/libjava/classpath/java/awt/font/TextLayout.java index dc0e537eba9..4346ab91d53 100644 --- a/libjava/classpath/java/awt/font/TextLayout.java +++ b/libjava/classpath/java/awt/font/TextLayout.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.awt.font; +import gnu.java.lang.CPStringBuilder; + import java.awt.Font; import java.awt.Graphics2D; import java.awt.Shape; @@ -362,7 +364,7 @@ public final class TextLayout implements Cloneable private static String getText(AttributedCharacterIterator iter) { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); int idx = iter.getIndex(); for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) sb.append(c); diff --git a/libjava/classpath/java/awt/image/BandedSampleModel.java b/libjava/classpath/java/awt/image/BandedSampleModel.java index afe62bdc4bd..94dbd8d4669 100644 --- a/libjava/classpath/java/awt/image/BandedSampleModel.java +++ b/libjava/classpath/java/awt/image/BandedSampleModel.java @@ -37,6 +37,7 @@ exception statement from your version. */ package java.awt.image; import gnu.java.awt.Buffers; +import gnu.java.lang.CPStringBuilder; /** * A sample model that reads each sample value from a separate band in the @@ -742,7 +743,7 @@ public final class BandedSampleModel extends ComponentSampleModel */ public String toString() { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); result.append(getClass().getName()); result.append("["); result.append("scanlineStride=").append(scanlineStride); diff --git a/libjava/classpath/java/awt/image/BufferedImage.java b/libjava/classpath/java/awt/image/BufferedImage.java index 78623ccd928..260d254fd65 100644 --- a/libjava/classpath/java/awt/image/BufferedImage.java +++ b/libjava/classpath/java/awt/image/BufferedImage.java @@ -41,6 +41,8 @@ package java.awt.image; import gnu.java.awt.Buffers; import gnu.java.awt.ClasspathGraphicsEnvironment; import gnu.java.awt.ComponentDataBlitOp; +import gnu.java.lang.CPStringBuilder; + import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.GraphicsEnvironment; @@ -778,9 +780,9 @@ public class BufferedImage extends Image public String toString() { - StringBuffer buf; + CPStringBuilder buf; - buf = new StringBuffer(/* estimated length */ 120); + buf = new CPStringBuilder(/* estimated length */ 120); buf.append("BufferedImage@"); buf.append(Integer.toHexString(hashCode())); buf.append(": type="); diff --git a/libjava/classpath/java/awt/image/ColorModel.java b/libjava/classpath/java/awt/image/ColorModel.java index e2873c5d71f..005b8d45ffe 100644 --- a/libjava/classpath/java/awt/image/ColorModel.java +++ b/libjava/classpath/java/awt/image/ColorModel.java @@ -631,8 +631,8 @@ public abstract class ColorModel implements Transparency throw new UnsupportedOperationException(); } - protected void coerceDataWorker(WritableRaster raster, - boolean isAlphaPremultiplied) + void coerceDataWorker(WritableRaster raster, + boolean isAlphaPremultiplied) { int w = raster.getWidth(); int h = raster.getHeight(); diff --git a/libjava/classpath/java/awt/image/ComponentColorModel.java b/libjava/classpath/java/awt/image/ComponentColorModel.java index 2096800b20d..e1e85e1912a 100644 --- a/libjava/classpath/java/awt/image/ComponentColorModel.java +++ b/libjava/classpath/java/awt/image/ComponentColorModel.java @@ -312,7 +312,7 @@ public class ComponentColorModel extends ColorModel /* TODO: provide better implementation based on the assumptions we can make due to the specific type of the color model. */ - super.coerceDataWorker(raster, isAlphaPremultiplied); + coerceDataWorker(raster, isAlphaPremultiplied); return new ComponentColorModel(cspace, hasAlpha, isAlphaPremultiplied, transparency, transferType); diff --git a/libjava/classpath/java/awt/image/DirectColorModel.java b/libjava/classpath/java/awt/image/DirectColorModel.java index dab15319fce..3d43c764237 100644 --- a/libjava/classpath/java/awt/image/DirectColorModel.java +++ b/libjava/classpath/java/awt/image/DirectColorModel.java @@ -393,8 +393,8 @@ public class DirectColorModel extends PackedColorModel return Buffers.getData(buffer); } - public ColorModel coerceData (WritableRaster raster, - boolean isAlphaPremultiplied) + public final ColorModel coerceData (WritableRaster raster, + boolean isAlphaPremultiplied) { if (this.isAlphaPremultiplied == isAlphaPremultiplied || !hasAlpha()) return this; @@ -402,7 +402,7 @@ public class DirectColorModel extends PackedColorModel /* TODO: provide better implementation based on the assumptions we can make due to the specific type of the color model. */ - super.coerceDataWorker(raster, isAlphaPremultiplied); + coerceDataWorker(raster, isAlphaPremultiplied); return new DirectColorModel(cspace, pixel_bits, getRedMask(), getGreenMask(), getBlueMask(), getAlphaMask(), diff --git a/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java b/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java index 8732e57659e..8db26b52d42 100644 --- a/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java +++ b/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java @@ -37,6 +37,7 @@ exception statement from your version. */ package java.awt.image; import gnu.java.awt.Buffers; +import gnu.java.lang.CPStringBuilder; /** * MultiPixelPackedSampleModel provides a single band model that supports @@ -587,7 +588,7 @@ public class MultiPixelPackedSampleModel extends SampleModel */ public String toString() { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); result.append(getClass().getName()); result.append("["); result.append("scanlineStride=").append(scanlineStride); diff --git a/libjava/classpath/java/awt/image/Raster.java b/libjava/classpath/java/awt/image/Raster.java index fb0950dabf3..615155fb3f9 100644 --- a/libjava/classpath/java/awt/image/Raster.java +++ b/libjava/classpath/java/awt/image/Raster.java @@ -37,6 +37,8 @@ exception statement from your version. */ package java.awt.image; +import gnu.java.lang.CPStringBuilder; + import java.awt.Point; import java.awt.Rectangle; @@ -920,7 +922,7 @@ public class Raster */ public String toString() { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); result.append(getClass().getName()); result.append("[("); diff --git a/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java b/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java index 1b0ac3f7904..22513865197 100644 --- a/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java +++ b/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java @@ -39,6 +39,7 @@ package java.awt.image; import java.util.Arrays; import gnu.java.awt.BitMaskExtent; +import gnu.java.lang.CPStringBuilder; /** * A <code>SampleModel</code> used when all samples are stored in a single @@ -569,7 +570,7 @@ public class SinglePixelPackedSampleModel extends SampleModel */ public String toString() { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); result.append(getClass().getName()); result.append("["); result.append("scanlineStride=").append(scanlineStride); diff --git a/libjava/classpath/java/awt/image/WritableRaster.java b/libjava/classpath/java/awt/image/WritableRaster.java index bf8db140c7f..02789a3d142 100644 --- a/libjava/classpath/java/awt/image/WritableRaster.java +++ b/libjava/classpath/java/awt/image/WritableRaster.java @@ -111,13 +111,8 @@ public class WritableRaster extends Raster public WritableRaster createWritableTranslatedChild(int childMinX, int childMinY) { - // This mirrors the code from the super class - int tcx = sampleModelTranslateX - minX + childMinX; - int tcy = sampleModelTranslateY - minY + childMinY; - - return new WritableRaster(sampleModel, dataBuffer, - new Rectangle(childMinX, childMinY, width, height), - new Point(tcx, tcy), this); + return createWritableChild(minX, minY, width, height, + childMinX, childMinY, null); } /** @@ -143,12 +138,14 @@ public class WritableRaster extends Raster SampleModel sm = (bandList == null) ? sampleModel : sampleModel.createSubsetSampleModel(bandList); - - return new WritableRaster(sm, dataBuffer, - new Rectangle(childMinX, childMinY, w, h), - new Point(sampleModelTranslateX + childMinX - parentX, - sampleModelTranslateY + childMinY - parentY), - this); + + return new WritableRaster(sm, getDataBuffer(), + new Rectangle(childMinX, childMinY, w, h), + new Point(sampleModelTranslateX + childMinX - + parentX, + sampleModelTranslateY + childMinY - + parentY), + this); } public Raster createChild(int parentX, int parentY, int width, |
