Mercurial > hg > release > icedtea6-1.11
view patches/ecj/override.patch @ 2914:49e2fd0a8dfd
Remove unused patches and those which need more testing in HEAD.
2013-07-09 Andrew John Hughes <gnu.andrew@redhat.com>
* patches/ecj/ant.patch,
* patches/openjdk/6990754-handle_renames.patch,
* patches/openjdk/6990754-use_native_memory_for_symboltable.patch,
* patches/openjdk/7008809-report_class_in_arraystoreexception.patch,
* patches/openjdk/7014851-unused_parallel_compaction_code.patch,
* patches/openjdk/7017732-move_static_fields_to_class.patch,
* patches/openjdk/7036747-elfstringtable.patch,
* patches/openjdk/7086585-flexible_field_injection.patch,
* patches/openjdk/7188114-alternate_command_line_parser.patch,
* patches/openjdk/7199143-OCSP_timeout.patch,
* patches/openjdk/8002070-remove_logger_stack_search.patch,
* patches/openjdk/8002070-remove_logger_stack_search_2.patch,
* patches/openjdk/8006120-server_jre.patch,
* patches/openjdk/8006536-remove_trailing_slashes.patch,
* patches/openjdk/8009463-space_and_final_backslash.patch,
* patches/openjdk/8010118-caller_sensitive.patch,
* patches/openjdk/8010213-set_socketoptions_windows.patch,
* patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
* patches/openjdk/8011313-OCSP_timeout_wrong_value.patch,
* patches/openjdk/8011990-logger_test_urls.patch,
* patches/openjdk/8012243-serial_regression.patch,
* patches/openjdk/8013380-handle_renames.patch,
* patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
* patches/openjdk/8014205-blank_swing_dialogs_windows.patch,
* patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch,
* patches/openjdk/8014676-javadebugger_space_in_paths.patch,
* patches/openjdk/8014745-logger_stack_walk_switch.patch,
* patches/openjdk/8014968-OCSP_timeout_default.patch,
* patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch,
* patches/security/20130618/8001330-checking_order_improvement-it6.patch,
* patches/security/20130618/hs_merge-01.patch,
* patches/security/20130618/hs_merge-02.patch,
* patches/security/20130618/hs_merge-03.patch,
* patches/security/20130618/hs_merge-04.patch,
* patches/sparc.patch:
Remove unused patches.
* Makefile.am:
(ICEDTEA_PATCHES): Remove patches which need more testing before
release.
* patches/ecj/override.patch: Drop recent addition. In accordance with
PR1397, we should avoid extending this patch in favour of either not
including @Override additions or setting source/target correctly.
* patches/security/20130618/7158805-nested_subroutine_rewriting.patch,
* patches/security/20130618/8001330-checking_order_improvement.patch:
Replace with Chris' patches, regenerated as unified diffs.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Tue, 09 Jul 2013 16:29:08 +0100 |
parents | d59bbf7333e0 |
children | a3249839270a |
line wrap: on
line source
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 697e3f8cac33 src/share/classes/sun/net/www/protocol/https/HttpsClient.java --- openjdk-ecj.orig/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java Wed Mar 24 17:05:49 2010 +0000 +++ openjdk-ecj/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java Sun Mar 28 12:55:34 2010 +0100 @@ -624,7 +624,6 @@ * a given connection may change. When sessions change, so may * peer identities and cipher suites. */ - @Override public void handshakeCompleted(HandshakeCompletedEvent event) { session = event.getSession(); diff --git a/src/share/classes/sun/security/x509/X509CRLEntryImpl.java b/src/share/classes/sun/security/x509/X509CRLEntryImpl.java --- openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java +++ openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java @@ -464,7 +464,6 @@ getExtension(PKIXExtensions.CertificateIssuer_Id); } - @Override public int compareTo(X509CRLEntryImpl that) { int compSerial = getSerialNumber().compareTo(that.getSerialNumber()); if (compSerial != 0) { diff --git a/src/share/classes/sun/security/x509/X509CRLImpl.java b/src/share/classes/sun/security/x509/X509CRLImpl.java --- openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java +++ openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java @@ -1276,7 +1276,6 @@ return hashcode; } - @Override public int compareTo(X509IssuerSerial another) { int cissuer = issuer.toString() .compareTo(another.issuer.toString()); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java --- openjdk-ecj.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java 2012-10-11 19:58:37.130814619 +0100 +++ openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java 2012-10-11 19:59:39.699829277 +0100 @@ -168,7 +168,6 @@ this.defaultContextClassLoader = AccessController.doPrivileged( new PrivilegedAction<ClassLoader>() { - @Override public ClassLoader run() { return new CombinedClassLoader(Thread.currentThread().getContextClassLoader(), dcl); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/security/pkcs11/P11Key.java openjdk-ecj/jdk/src/share/classes/sun/security/pkcs11/P11Key.java --- openjdk-ecj.orig/jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2012-10-11 20:18:07.340676704 +0100 +++ openjdk-ecj/jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2012-10-11 20:17:40.092039288 +0100 @@ -216,7 +216,6 @@ /** * Return bit length of the key. */ - @Override public int length() { return keyLength; } diff -Nru openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java --- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java 2013-04-16 16:35:02.573376655 +0100 +++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java 2013-04-16 16:37:00.267265360 +0100 @@ -50,17 +50,14 @@ } // size of the chunk given by the parser - @Override public int size() { return len; } - @Override public byte[] read() { return data; } - @Override public long writeTo(DataFile file) { return file.writeTo(data, 0, len); } @@ -70,7 +67,6 @@ * @param buf * @return */ - @Override public Data createNext(DataHead dataHead, ByteBuffer buf) { if (!config.isOnlyMemory() && dataHead.inMemory >= config.memoryThreshold) { try { diff -Nru openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java --- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java 2013-04-16 16:35:53.298190677 +0100 +++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java 2013-04-16 16:36:17.818584168 +0100 @@ -644,7 +644,6 @@ return AccessController.doPrivileged( new PrivilegedAction<T>() { - @Override public T run() { Object proxy = Proxy.newProxyInstance(portInterface.getClassLoader(), new Class[]{portInterface, WSBindingProvider.class, Closeable.class}, pis); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java --- openjdk-ecj.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java 2013-04-16 17:23:26.739938611 +0100 +++ openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java 2013-04-16 17:24:03.072520033 +0100 @@ -483,7 +483,6 @@ Receiver. Therefore, subclasses should not override this method. Instead, they should implement implSend(). */ - @Override public final synchronized void send(final MidiMessage message, final long timeStamp) { if (!open) { @@ -499,7 +498,6 @@ * Therefore, subclasses that override this method must call * 'super.close()'. */ - @Override public final void close() { open = false; synchronized (AbstractMidiDevice.this.traRecLock) {