/hg/icedtea6: Only apply @Override patch to the ecj tree (needed...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 16 10:01:08 PDT 2010
changeset 44393698a7c0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=44393698a7c0
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 16 17:00:56 2010 +0000
Only apply @Override patch to the ecj tree (needed as we currently
build with 1.5 not 1.6 flags)
2010-03-16 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-override.patch: Moved to ecj
subdirectory.
* Makefile.am: (ICEDTEA_PATCHES): Remove override patch.
(ICEDTEA_ECJ_PATCHES): Add override patch in ecj directory.
* patches/ecj/override.patch: Apply to ecj tree only.
diffstat:
4 files changed, 211 insertions(+), 201 deletions(-)
ChangeLog | 11 ++
Makefile.am | 5 -
patches/ecj/override.patch | 198 ++++++++++++++++++++++++++++++++++++++++
patches/icedtea-override.patch | 198 ----------------------------------------
diffs (444 lines):
diff -r 1bbce8b0b0a1 -r 44393698a7c0 ChangeLog
--- a/ChangeLog Tue Mar 16 15:39:34 2010 +0000
+++ b/ChangeLog Tue Mar 16 17:00:56 2010 +0000
@@ -1,3 +1,14 @@ 2010-03-16 Andrew John Hughes <ahughes
+2010-03-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-override.patch:
+ Moved to ecj subdirectory.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove override patch.
+ (ICEDTEA_ECJ_PATCHES): Add override patch in ecj
+ directory.
+ * patches/ecj/override.patch:
+ Apply to ecj tree only.
+
2010-03-16 Andrew John Hughes <ahughes at redhat.com>
NetX/plugin build sync (3/3):
diff -r 1bbce8b0b0a1 -r 44393698a7c0 Makefile.am
--- a/Makefile.am Tue Mar 16 15:39:34 2010 +0000
+++ b/Makefile.am Tue Mar 16 17:00:56 2010 +0000
@@ -382,8 +382,6 @@ ICEDTEA_PATCHES += patches/hotspot/origi
patches/openjdk/6822370-reentrantreadwritelock.patch
endif
-ICEDTEA_PATCHES += patches/icedtea-override.patch
-
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
@@ -394,7 +392,8 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedte
patches/ecj/icedtea-jopt.patch \
patches/ecj/icedtea-jaxp-dependency.patch \
patches/ecj/bootver.patch \
- patches/ecj/getannotation-cast.patch
+ patches/ecj/getannotation-cast.patch \
+ patches/ecj/override.patch
if DTDTYPE_QNAME
ICEDTEA_ECJ_PATCHES += \
diff -r 1bbce8b0b0a1 -r 44393698a7c0 patches/ecj/override.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/override.patch Tue Mar 16 17:00:56 2010 +0000
@@ -0,0 +1,198 @@
+diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2009-12-15 00:04:14.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2009-12-15 00:09:04.000000000 +0000
+@@ -200,7 +200,6 @@
+ super.uninstallListeners();
+ }
+
+- @Override
+ public SynthContext getContext(JComponent c) {
+ return getContext(c, getComponentState(c));
+ }
+@@ -273,7 +272,6 @@
+ // end UI Initialization
+ //======================
+
+- @Override
+ public void propertyChange(PropertyChangeEvent e) {
+ if (SynthLookAndFeel.shouldUpdateStyle(e)) {
+ updateStyle(comboBox);
+@@ -318,7 +316,6 @@
+ }
+ }
+
+- @Override
+ public void paintBorder(SynthContext context, Graphics g, int x,
+ int y, int w, int h) {
+ context.getPainter().paintComboBoxBorder(context, g, x, y, w, h);
+@@ -424,7 +421,6 @@
+ setText(" ");
+ }
+
+- @Override
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus) {
+ setName("ComboBox.listRenderer");
+@@ -491,7 +487,6 @@
+ editor.setName("ComboBox.textField");
+ }
+
+- @Override
+ public Component getEditorComponent() {
+ return editor;
+ }
+@@ -501,7 +496,6 @@
+ *
+ * @param anObject the displayed value of the editor
+ */
+- @Override
+ public void setItem(Object anObject) {
+ String text;
+
+@@ -517,7 +511,6 @@
+ }
+ }
+
+- @Override
+ public Object getItem() {
+ Object newValue = editor.getText();
+
+@@ -540,18 +533,15 @@
+ return newValue;
+ }
+
+- @Override
+ public void selectAll() {
+ editor.selectAll();
+ editor.requestFocus();
+ }
+
+- @Override
+ public void addActionListener(ActionListener l) {
+ editor.addActionListener(l);
+ }
+
+- @Override
+ public void removeActionListener(ActionListener l) {
+ editor.removeActionListener(l);
+ }
+@@ -685,27 +675,22 @@
+ // MouseListener/MouseMotionListener Methods
+ //------------------------------------------------------------------
+
+- @Override
+ public void mouseEntered(MouseEvent mouseEvent) {
+ updateOver(true);
+ }
+
+- @Override
+ public void mouseExited(MouseEvent mouseEvent) {
+ updateOver(false);
+ }
+
+- @Override
+ public void mousePressed(MouseEvent mouseEvent) {
+ updatePressed(true);
+ }
+
+- @Override
+ public void mouseReleased(MouseEvent mouseEvent) {
+ updatePressed(false);
+ }
+
+- @Override
+ public void mouseClicked(MouseEvent e) {}
+
+ //------------------------------------------------------------------
+@@ -722,16 +707,13 @@
+ * This bug was only noticed when acting as a button, but may be generally
+ * present. If so, remove the if() block
+ */
+- @Override
+ public void popupMenuCanceled(PopupMenuEvent e) {
+ if (shouldActLikeButton() || pressedWhenPopupVisible) {
+ comboBox.repaint();
+ }
+ }
+
+- @Override
+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {}
+- @Override
+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
+ }
+
+diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2009-12-09 16:38:59.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2009-12-09 16:38:39.000000000 +0000
+@@ -832,7 +832,6 @@
+ tk.addPropertyChangeListener(key, this);
+ }
+
+- @Override
+ public void propertyChange(PropertyChangeEvent pce) {
+ UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+ if (defaults.getBoolean("Synth.doNotSetTextAA")) {
+@@ -901,7 +900,6 @@
+ if (!isUpdatePending()) {
+ setUpdatePending(true);
+ Runnable uiUpdater = new Runnable() {
+- @Override
+ public void run() {
+ updateAllUIs();
+ setUpdatePending(false);
+@@ -918,7 +916,6 @@
+ }
+
+ private class Handler implements PropertyChangeListener {
+- @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ String propertyName = evt.getPropertyName();
+ Object newValue = evt.getNewValue();
+diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2009-12-15 00:31:41.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2009-12-15 00:32:03.000000000 +0000
+@@ -154,7 +154,6 @@
+ tree.addPropertyChangeListener(this);
+ }
+
+- @Override
+ public SynthContext getContext(JComponent c) {
+ return getContext(c, getComponentState(c));
+ }
+diff -Nru openjdk.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java openjdk/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
+--- openjdk-ecj.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2009-12-15 00:44:58.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2009-12-15 00:45:15.000000000 +0000
+@@ -701,7 +701,6 @@
+ this.delegate = delegate;
+ }
+
+- @Override
+ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+ Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+
+diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
+--- openjdk-ecj.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2010-01-16 03:11:22.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2010-01-16 03:11:57.000000000 +0000
+@@ -572,7 +572,7 @@
+ /*
+ * Return the certificate's revocation status code
+ */
+- @Override public CertStatus getCertStatus() {
++ public CertStatus getCertStatus() {
+ return certStatus;
+ }
+
+@@ -580,11 +580,11 @@
+ return certId;
+ }
+
+- @Override public Date getRevocationTime() {
++ public Date getRevocationTime() {
+ return (Date) revocationTime.clone();
+ }
+
+- @Override public Reason getRevocationReason() {
++ public Reason getRevocationReason() {
+ return revocationReason;
+ }
+
diff -r 1bbce8b0b0a1 -r 44393698a7c0 patches/icedtea-override.patch
--- a/patches/icedtea-override.patch Tue Mar 16 15:39:34 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
---- openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2009-12-15 00:04:14.000000000 +0000
-+++ openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2009-12-15 00:09:04.000000000 +0000
-@@ -200,7 +200,6 @@
- super.uninstallListeners();
- }
-
-- @Override
- public SynthContext getContext(JComponent c) {
- return getContext(c, getComponentState(c));
- }
-@@ -273,7 +272,6 @@
- // end UI Initialization
- //======================
-
-- @Override
- public void propertyChange(PropertyChangeEvent e) {
- if (SynthLookAndFeel.shouldUpdateStyle(e)) {
- updateStyle(comboBox);
-@@ -318,7 +316,6 @@
- }
- }
-
-- @Override
- public void paintBorder(SynthContext context, Graphics g, int x,
- int y, int w, int h) {
- context.getPainter().paintComboBoxBorder(context, g, x, y, w, h);
-@@ -424,7 +421,6 @@
- setText(" ");
- }
-
-- @Override
- public Component getListCellRendererComponent(JList list, Object value,
- int index, boolean isSelected, boolean cellHasFocus) {
- setName("ComboBox.listRenderer");
-@@ -491,7 +487,6 @@
- editor.setName("ComboBox.textField");
- }
-
-- @Override
- public Component getEditorComponent() {
- return editor;
- }
-@@ -501,7 +496,6 @@
- *
- * @param anObject the displayed value of the editor
- */
-- @Override
- public void setItem(Object anObject) {
- String text;
-
-@@ -517,7 +511,6 @@
- }
- }
-
-- @Override
- public Object getItem() {
- Object newValue = editor.getText();
-
-@@ -540,18 +533,15 @@
- return newValue;
- }
-
-- @Override
- public void selectAll() {
- editor.selectAll();
- editor.requestFocus();
- }
-
-- @Override
- public void addActionListener(ActionListener l) {
- editor.addActionListener(l);
- }
-
-- @Override
- public void removeActionListener(ActionListener l) {
- editor.removeActionListener(l);
- }
-@@ -685,27 +675,22 @@
- // MouseListener/MouseMotionListener Methods
- //------------------------------------------------------------------
-
-- @Override
- public void mouseEntered(MouseEvent mouseEvent) {
- updateOver(true);
- }
-
-- @Override
- public void mouseExited(MouseEvent mouseEvent) {
- updateOver(false);
- }
-
-- @Override
- public void mousePressed(MouseEvent mouseEvent) {
- updatePressed(true);
- }
-
-- @Override
- public void mouseReleased(MouseEvent mouseEvent) {
- updatePressed(false);
- }
-
-- @Override
- public void mouseClicked(MouseEvent e) {}
-
- //------------------------------------------------------------------
-@@ -722,16 +707,13 @@
- * This bug was only noticed when acting as a button, but may be generally
- * present. If so, remove the if() block
- */
-- @Override
- public void popupMenuCanceled(PopupMenuEvent e) {
- if (shouldActLikeButton() || pressedWhenPopupVisible) {
- comboBox.repaint();
- }
- }
-
-- @Override
- public void popupMenuWillBecomeVisible(PopupMenuEvent e) {}
-- @Override
- public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
- }
-
-diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
---- openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2009-12-09 16:38:59.000000000 +0000
-+++ openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2009-12-09 16:38:39.000000000 +0000
-@@ -832,7 +832,6 @@
- tk.addPropertyChangeListener(key, this);
- }
-
-- @Override
- public void propertyChange(PropertyChangeEvent pce) {
- UIDefaults defaults = UIManager.getLookAndFeelDefaults();
- if (defaults.getBoolean("Synth.doNotSetTextAA")) {
-@@ -901,7 +900,6 @@
- if (!isUpdatePending()) {
- setUpdatePending(true);
- Runnable uiUpdater = new Runnable() {
-- @Override
- public void run() {
- updateAllUIs();
- setUpdatePending(false);
-@@ -918,7 +916,6 @@
- }
-
- private class Handler implements PropertyChangeListener {
-- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- String propertyName = evt.getPropertyName();
- Object newValue = evt.getNewValue();
-diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
---- openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2009-12-15 00:31:41.000000000 +0000
-+++ openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2009-12-15 00:32:03.000000000 +0000
-@@ -154,7 +154,6 @@
- tree.addPropertyChangeListener(this);
- }
-
-- @Override
- public SynthContext getContext(JComponent c) {
- return getContext(c, getComponentState(c));
- }
-diff -Nru openjdk.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java openjdk/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2009-12-15 00:44:58.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2009-12-15 00:45:15.000000000 +0000
-@@ -701,7 +701,6 @@
- this.delegate = delegate;
- }
-
-- @Override
- public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
- Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-
-diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
---- openjdk.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2010-01-16 03:11:22.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2010-01-16 03:11:57.000000000 +0000
-@@ -572,7 +572,7 @@
- /*
- * Return the certificate's revocation status code
- */
-- @Override public CertStatus getCertStatus() {
-+ public CertStatus getCertStatus() {
- return certStatus;
- }
-
-@@ -580,11 +580,11 @@
- return certId;
- }
-
-- @Override public Date getRevocationTime() {
-+ public Date getRevocationTime() {
- return (Date) revocationTime.clone();
- }
-
-- @Override public Reason getRevocationReason() {
-+ public Reason getRevocationReason() {
- return revocationReason;
- }
-
More information about the distro-pkg-dev
mailing list