Mercurial > hg > release > icedtea-1.10
changeset 1815:08e2220c7392
Remove @Override annotations that cause ecj issues.
2009-05-21 Andrew John Hughes <ahughes@redhat.com>
* generated/javax/swing/plaf/nimbus/NimbusDefaults.java:
Remove @Override annotations which cause ecj to spew.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Thu, 21 May 2009 17:56:41 +0100 |
parents | a9c10241b227 |
children | d0ad06682da3 |
files | ChangeLog generated/javax/swing/plaf/nimbus/NimbusDefaults.java |
diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 21 17:14:27 2009 +0100 +++ b/ChangeLog Thu May 21 17:56:41 2009 +0100 @@ -1,3 +1,8 @@ +2009-05-21 Andrew John Hughes <ahughes@redhat.com> + + * generated/javax/swing/plaf/nimbus/NimbusDefaults.java: + Remove @Override annotations which cause ecj to spew. + 2009-05-21 Andrew John Hughes <ahughes@redhat.com> * patches/icedtea-pregenerated-nimbus.patch: @@ -9,7 +14,7 @@ * patches/ecj/icedtea-pr39408.patch: Updated to put the file in the state - where PR40188 is present so that gcj 4.3 + where PR40188 is present so that gcj 4.3/4.4 builds work. 2009-05-21 Andrew John Hughes <ahughes@redhat.com>
--- a/generated/javax/swing/plaf/nimbus/NimbusDefaults.java Thu May 21 17:14:27 2009 +0100 +++ b/generated/javax/swing/plaf/nimbus/NimbusDefaults.java Thu May 21 17:56:41 2009 +0100 @@ -1237,7 +1237,6 @@ /** * @inheritDoc */ - @Override public Object createValue(UIDefaults defaults) { Font f = defaults.getFont(parentKey); if (f != null) { @@ -1309,7 +1308,6 @@ insets, canvasSize, inverted, cacheMode, maxH, maxV); } - @Override public Object createValue(UIDefaults table) { try { Class c; @@ -1663,7 +1661,7 @@ this.uiResource = uiResource; } - @Override + public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof DerivedColorKey)) return false; @@ -1679,7 +1677,7 @@ return true; } - @Override + public int hashCode() { int result = super.hashCode(); result = 31 * result + uiDefaultParentName.hashCode(); @@ -1699,7 +1697,7 @@ * Listener to update derived colors on UIManager Defaults changes */ private class DefaultsListener implements PropertyChangeListener { - @Override + public void propertyChange(PropertyChangeEvent evt) { Object src = evt.getSource(); String key = evt.getPropertyName(); @@ -1758,7 +1756,6 @@ this.painterKey = painterKey; } - @Override public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { if (painter == null) { painter = (Painter)UIManager.get(painterKey); @@ -1779,12 +1776,10 @@ g.translate(-x, -y); } - @Override public Insets getBorderInsets(Component c) { return (Insets)insets.clone(); } - @Override public boolean isBorderOpaque() { return false; }