OpenJDK / portola / portola
changeset 20471:5f3e7611790a
Merge
| author | lana |
|---|---|
| date | Tue, 08 Oct 2013 14:53:14 -0700 |
| parents | f86a5b10b7fd 555b46436610 |
| children | a7dcd7811f02 |
| files | jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java |
| diffstat | 390 files changed, 3230 insertions(+), 1787 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/macosx/classes/apple/applescript/AppleScriptEngine.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/apple/applescript/AppleScriptEngine.java Tue Oct 08 14:53:14 2013 -0700 @@ -155,7 +155,7 @@ TRACE("init()"); // set up our context /* TODO -- name of current executable? bad java documentation at: - * http://java.sun.com/javase/6/docs/api/javax/script/ScriptEngine.html#FILENAME */ + * http://docs.oracle.com/javase/6/docs/api/javax/script/ScriptEngine.html#FILENAME */ put(ScriptEngine.FILENAME, ""); put(ScriptEngine.ENGINE, getEngine()); put(ScriptEngine.ENGINE_VERSION, getEngineVersion());
--- a/jdk/src/macosx/classes/com/apple/eawt/_AppEventLegacyHandler.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/com/apple/eawt/_AppEventLegacyHandler.java Tue Oct 08 14:53:14 2013 -0700 @@ -31,10 +31,6 @@ import com.apple.eawt.AppEvent.*; -interface _OpenAppHandler { - void handleOpenApp(); -} - @SuppressWarnings("deprecation") class _AppEventLegacyHandler implements AboutHandler, PreferencesHandler, _OpenAppHandler, AppReOpenedListener, OpenFilesHandler, PrintFilesHandler, QuitHandler { final _AppEventHandler parent;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/macosx/classes/com/apple/eawt/_OpenAppHandler.java Tue Oct 08 14:53:14 2013 -0700 @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.apple.eawt; + +interface _OpenAppHandler { + void handleOpenApp(); +} \ No newline at end of file
--- a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java Tue Oct 08 14:53:14 2013 -0700 @@ -25,141 +25,11 @@ package com.apple.laf; -import java.awt.*; - import javax.swing.*; import javax.swing.plaf.UIResource; -import sun.swing.SwingUtilities2; - class AquaComboBoxRenderer extends AquaComboBoxRendererInternal implements UIResource { public AquaComboBoxRenderer(final JComboBox comboBox) { super(comboBox); } } - -class AquaComboBoxRendererInternal extends JLabel implements ListCellRenderer { - final JComboBox fComboBox; - boolean fSelected; - boolean fChecked; - boolean fInList; - boolean fEditable; - boolean fDrawCheckedItem = true; - - // Provides space for a checkbox, and is translucent - public AquaComboBoxRendererInternal(final JComboBox comboBox) { - super(); - fComboBox = comboBox; - } - - // Don't include checkIcon space, because this is also used for button size calculations - // - the popup-size calc will get checkIcon space from getInsets - public Dimension getPreferredSize() { - // From BasicComboBoxRenderer - trick to avoid zero-height items - final Dimension size; - - final String text = getText(); - if ((text == null) || ("".equals(text))) { - setText(" "); - size = super.getPreferredSize(); - setText(""); - } else { - size = super.getPreferredSize(); - } - return size; - } - - // Don't paint the border here, it gets painted by the UI - protected void paintBorder(final Graphics g) { - - } - - public int getBaseline(int width, int height) { - return super.getBaseline(width, height) - 1; - } - - // Really means is the one with the mouse over it - public Component getListCellRendererComponent(final JList list, final Object value, int index, final boolean isSelected, final boolean cellHasFocus) { - fInList = (index >= 0); // When the button wants the item painted, it passes in -1 - fSelected = isSelected; - if (index < 0) { - index = fComboBox.getSelectedIndex(); - } - - // changed this to not ask for selected index but directly compare the current item and selected item - // different from basic because basic has no concept of checked, just has the last one selected, - // and the user changes selection. We have selection and a check mark. - // we used to call fComboBox.getSelectedIndex which ends up being a very bad call for large checkboxes - // it does a linear compare of every object in the checkbox until it finds the selected one, so if - // we have a 5000 element list we will 5000 * (selected index) .equals() of objects. - // See Radar #3141307 - - // Fix for Radar # 3204287 where we ask for an item at a negative index! - if (index >= 0) { - final Object item = fComboBox.getItemAt(index); - fChecked = fInList && item != null && item.equals(fComboBox.getSelectedItem()); - } else { - fChecked = false; - } - - fEditable = fComboBox.isEditable(); - if (isSelected) { - if (fEditable) { - setBackground(UIManager.getColor("List.selectionBackground")); - setForeground(UIManager.getColor("List.selectionForeground")); - } else { - setBackground(list.getSelectionBackground()); - setForeground(list.getSelectionForeground()); - } - } else { - if (fEditable) { - setBackground(UIManager.getColor("List.background")); - setForeground(UIManager.getColor("List.foreground")); - } else { - setBackground(list.getBackground()); - setForeground(list.getForeground()); - } - } - - setFont(list.getFont()); - - if (value instanceof Icon) { - setIcon((Icon)value); - } else { - setText((value == null) ? " " : value.toString()); - } - return this; - } - - public Insets getInsets(Insets insets) { - if (insets == null) insets = new Insets(0, 0, 0, 0); - insets.top = 1; - insets.bottom = 1; - insets.right = 5; - insets.left = (fInList && !fEditable ? 16 + 7 : 5); - return insets; - } - - protected void setDrawCheckedItem(final boolean drawCheckedItem) { - this.fDrawCheckedItem = drawCheckedItem; - } - - // Paint this component, and a checkbox if it's the selected item and not in the button - protected void paintComponent(final Graphics g) { - if (fInList) { - if (fSelected && !fEditable) { - AquaMenuPainter.instance().paintSelectedMenuItemBackground(g, getWidth(), getHeight()); - } else { - g.setColor(getBackground()); - g.fillRect(0, 0, getWidth(), getHeight()); - } - - if (fChecked && !fEditable && fDrawCheckedItem) { - final int y = getHeight() - 4; - g.setColor(getForeground()); - SwingUtilities2.drawString(fComboBox, g, "\u2713", 6, y); - } - } - super.paintComponent(g); - } -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java Tue Oct 08 14:53:14 2013 -0700 @@ -0,0 +1,157 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.apple.laf; + +import sun.swing.SwingUtilities2; + +import javax.swing.*; +import java.awt.*; + +class AquaComboBoxRendererInternal extends JLabel implements ListCellRenderer { + final JComboBox fComboBox; + boolean fSelected; + boolean fChecked; + boolean fInList; + boolean fEditable; + boolean fDrawCheckedItem = true; + + // Provides space for a checkbox, and is translucent + public AquaComboBoxRendererInternal(final JComboBox comboBox) { + super(); + fComboBox = comboBox; + } + + // Don't include checkIcon space, because this is also used for button size calculations + // - the popup-size calc will get checkIcon space from getInsets + public Dimension getPreferredSize() { + // From BasicComboBoxRenderer - trick to avoid zero-height items + final Dimension size; + + final String text = getText(); + if ((text == null) || ("".equals(text))) { + setText(" "); + size = super.getPreferredSize(); + setText(""); + } else { + size = super.getPreferredSize(); + } + return size; + } + + // Don't paint the border here, it gets painted by the UI + protected void paintBorder(final Graphics g) { + + } + + public int getBaseline(int width, int height) { + return super.getBaseline(width, height) - 1; + } + + // Really means is the one with the mouse over it + public Component getListCellRendererComponent(final JList list, final Object value, int index, final boolean isSelected, final boolean cellHasFocus) { + fInList = (index >= 0); // When the button wants the item painted, it passes in -1 + fSelected = isSelected; + if (index < 0) { + index = fComboBox.getSelectedIndex(); + } + + // changed this to not ask for selected index but directly compare the current item and selected item + // different from basic because basic has no concept of checked, just has the last one selected, + // and the user changes selection. We have selection and a check mark. + // we used to call fComboBox.getSelectedIndex which ends up being a very bad call for large checkboxes + // it does a linear compare of every object in the checkbox until it finds the selected one, so if + // we have a 5000 element list we will 5000 * (selected index) .equals() of objects. + // See Radar #3141307 + + // Fix for Radar # 3204287 where we ask for an item at a negative index! + if (index >= 0) { + final Object item = fComboBox.getItemAt(index); + fChecked = fInList && item != null && item.equals(fComboBox.getSelectedItem()); + } else { + fChecked = false; + } + + fEditable = fComboBox.isEditable(); + if (isSelected) { + if (fEditable) { + setBackground(UIManager.getColor("List.selectionBackground")); + setForeground(UIManager.getColor("List.selectionForeground")); + } else { + setBackground(list.getSelectionBackground()); + setForeground(list.getSelectionForeground()); + } + } else { + if (fEditable) { + setBackground(UIManager.getColor("List.background")); + setForeground(UIManager.getColor("List.foreground")); + } else { + setBackground(list.getBackground()); + setForeground(list.getForeground()); + } + } + + setFont(list.getFont()); + + if (value instanceof Icon) { + setIcon((Icon)value); + } else { + setText((value == null) ? " " : value.toString()); + } + return this; + } + + public Insets getInsets(Insets insets) { + if (insets == null) insets = new Insets(0, 0, 0, 0); + insets.top = 1; + insets.bottom = 1; + insets.right = 5; + insets.left = (fInList && !fEditable ? 16 + 7 : 5); + return insets; + } + + protected void setDrawCheckedItem(final boolean drawCheckedItem) { + this.fDrawCheckedItem = drawCheckedItem; + } + + // Paint this component, and a checkbox if it's the selected item and not in the button + protected void paintComponent(final Graphics g) { + if (fInList) { + if (fSelected && !fEditable) { + AquaMenuPainter.instance().paintSelectedMenuItemBackground(g, getWidth(), getHeight()); + } else { + g.setColor(getBackground()); + g.fillRect(0, 0, getWidth(), getHeight()); + } + + if (fChecked && !fEditable && fDrawCheckedItem) { + final int y = getHeight() - 4; + g.setColor(getForeground()); + SwingUtilities2.drawString(fComboBox, g, "\u2713", 6, y); + } + } + super.paintComponent(g); + } +}
--- a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -281,12 +281,16 @@ actionMap.put("aquaSelectPageUp", highlightPageUpAction); actionMap.put("aquaSelectPageDown", highlightPageDownAction); + actionMap.put("aquaHidePopup", hideAction); + SwingUtilities.replaceUIActionMap(comboBox, actionMap); } - abstract class ComboBoxAction extends AbstractAction { + private abstract class ComboBoxAction extends AbstractAction { public void actionPerformed(final ActionEvent e) { - if (!comboBox.isEnabled() || !comboBox.isShowing()) return; + if (!comboBox.isEnabled() || !comboBox.isShowing()) { + return; + } if (comboBox.isPopupVisible()) { final AquaComboBoxUI ui = (AquaComboBoxUI)comboBox.getUI(); @@ -302,7 +306,7 @@ /** * Hilight _but do not select_ the next item in the list. */ - Action highlightNextAction = new ComboBoxAction() { + private Action highlightNextAction = new ComboBoxAction() { @Override public void performComboBoxAction(AquaComboBoxUI ui) { final int si = listBox.getSelectedIndex(); @@ -318,7 +322,7 @@ /** * Hilight _but do not select_ the previous item in the list. */ - Action highlightPreviousAction = new ComboBoxAction() { + private Action highlightPreviousAction = new ComboBoxAction() { @Override void performComboBoxAction(final AquaComboBoxUI ui) { final int si = listBox.getSelectedIndex(); @@ -330,7 +334,7 @@ } }; - Action highlightFirstAction = new ComboBoxAction() { + private Action highlightFirstAction = new ComboBoxAction() { @Override void performComboBoxAction(final AquaComboBoxUI ui) { listBox.setSelectedIndex(0); @@ -338,7 +342,7 @@ } }; - Action highlightLastAction = new ComboBoxAction() { + private Action highlightLastAction = new ComboBoxAction() { @Override void performComboBoxAction(final AquaComboBoxUI ui) { final int size = listBox.getModel().getSize(); @@ -347,7 +351,7 @@ } }; - Action highlightPageUpAction = new ComboBoxAction() { + private Action highlightPageUpAction = new ComboBoxAction() { @Override void performComboBoxAction(final AquaComboBoxUI ui) { final int current = listBox.getSelectedIndex(); @@ -367,7 +371,7 @@ } }; - Action highlightPageDownAction = new ComboBoxAction() { + private Action highlightPageDownAction = new ComboBoxAction() { @Override void performComboBoxAction(final AquaComboBoxUI ui) { final int current = listBox.getSelectedIndex(); @@ -482,13 +486,13 @@ // This is somewhat messy. The difference here from BasicComboBoxUI.EnterAction is that // arrow up or down does not automatically select the - static final Action triggerSelectionAction = new AbstractAction() { + private static final Action triggerSelectionAction = new AbstractAction() { public void actionPerformed(final ActionEvent e) { triggerSelectionEvent((JComboBox)e.getSource(), e); } }; - static final Action toggleSelectionAction = new AbstractAction() { + private static final Action toggleSelectionAction = new AbstractAction() { public void actionPerformed(final ActionEvent e) { final JComboBox comboBox = (JComboBox)e.getSource(); if (!comboBox.isEnabled()) return; @@ -506,6 +510,18 @@ } }; + private static Action hideAction = new AbstractAction() { + @Override + public void actionPerformed(final ActionEvent e) { + final JComboBox comboBox = (JComboBox)e.getSource(); + + if (comboBox.isPopupVisible()) { + comboBox.firePopupMenuCanceled(); + comboBox.setPopupVisible(false); + } + } + }; + public void applySizeFor(final JComponent c, final Size size) { if (arrowButton == null) return; final Border border = arrowButton.getBorder();
--- a/jdk/src/macosx/classes/com/apple/laf/AquaKeyBindings.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/com/apple/laf/AquaKeyBindings.java Tue Oct 08 14:53:14 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -209,7 +209,7 @@ LateBoundInputMap getComboBoxInputMap() { return new LateBoundInputMap(new SimpleBinding(new String[] { - "ESCAPE", "hidePopup", + "ESCAPE", "aquaHidePopup", "PAGE_UP", "aquaSelectPageUp", "PAGE_DOWN", "aquaSelectPageDown", "HOME", "aquaSelectHome",
--- a/jdk/src/macosx/classes/com/apple/laf/AquaMenuBarUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/com/apple/laf/AquaMenuBarUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -73,8 +73,9 @@ public Dimension getPreferredSize(final JComponent c) { if (isScreenMenuBar((JMenuBar)c)) { - if (setScreenMenuBar((JFrame)(c.getTopLevelAncestor()))) ; - return new Dimension(0, 0); + if (setScreenMenuBar((JFrame)(c.getTopLevelAncestor()))) { + return new Dimension(0, 0); + } } return null; }
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java Tue Oct 08 14:53:14 2013 -0700 @@ -181,6 +181,9 @@ initDevices(); d = devices.get(mainDisplayID); + if (d == null) { + throw new AWTError("no screen devices"); + } } return d; }
--- a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java Tue Oct 08 14:53:14 2013 -0700 @@ -385,11 +385,6 @@ // ---- PEER METHODS ---- // - @Override - public Toolkit getToolkit() { - return LWToolkit.getLWToolkit(); - } - // Just a helper method public LWToolkit getLWToolkit() { return LWToolkit.getLWToolkit(); @@ -1010,13 +1005,13 @@ @Override public boolean prepareImage(Image img, int w, int h, ImageObserver o) { // TODO: is it a right/complete implementation? - return getToolkit().prepareImage(img, w, h, o); + return Toolkit.getDefaultToolkit().prepareImage(img, w, h, o); } @Override public int checkImage(Image img, int w, int h, ImageObserver o) { // TODO: is it a right/complete implementation? - return getToolkit().checkImage(img, w, h, o); + return Toolkit.getDefaultToolkit().checkImage(img, w, h, o); } @Override
--- a/jdk/src/macosx/classes/sun/lwawt/LWTextComponentPeer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/sun/lwawt/LWTextComponentPeer.java Tue Oct 08 14:53:14 2013 -0700 @@ -71,13 +71,14 @@ } setEditable(getTarget().isEditable()); setText(getTarget().getText()); + setCaretPosition(getTarget().getCaretPosition()); getTarget().addInputMethodListener(this); final int start = getTarget().getSelectionStart(); final int end = getTarget().getSelectionEnd(); if (end > start) { + // Should be called after setText() and setCaretPosition() select(start, end); } - setCaretPosition(getTarget().getCaretPosition()); firstChangeSkipped = true; } @@ -122,7 +123,7 @@ } @Override - public final void setText(final String l) { + public final void setText(final String text) { synchronized (getDelegateLock()) { // JTextArea.setText() posts two different events (remove & insert). // Since we make no differences between text events, @@ -130,7 +131,7 @@ // JTextArea.setText() is called. final Document document = getTextComponent().getDocument(); document.removeDocumentListener(this); - getTextComponent().setText(l); + getTextComponent().setText(text); revalidate(); if (firstChangeSkipped) { postEvent(new TextEvent(getTarget(),
--- a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java Tue Oct 08 14:53:14 2013 -0700 @@ -317,9 +317,25 @@ op |= SET_SIZE; } + // Don't post ComponentMoved/Resized and Paint events + // until we've got a notification from the delegate + Rectangle cb = constrainBounds(x, y, w, h); + setBounds(cb.x, cb.y, cb.width, cb.height, op, false, false); + // Get updated bounds, so we don't have to handle 'op' here manually + Rectangle r = getBounds(); + platformWindow.setBounds(r.x, r.y, r.width, r.height); + } + + public Rectangle constrainBounds(Rectangle bounds) { + return constrainBounds(bounds.x, bounds.y, bounds.width, bounds.height); + } + + public Rectangle constrainBounds(int x, int y, int w, int h) { + if (w < MINIMUM_WIDTH) { w = MINIMUM_WIDTH; } + if (h < MINIMUM_HEIGHT) { h = MINIMUM_HEIGHT; } @@ -334,12 +350,7 @@ h = maxH; } - // Don't post ComponentMoved/Resized and Paint events - // until we've got a notification from the delegate - setBounds(x, y, w, h, op, false, false); - // Get updated bounds, so we don't have to handle 'op' here manually - Rectangle r = getBounds(); - platformWindow.setBounds(r.x, r.y, r.width, r.height); + return new Rectangle(x, y, w, h); } @Override @@ -393,8 +404,12 @@ @Override public void setModalBlocked(Dialog blocker, boolean blocked) { synchronized (getPeerTreeLock()) { - this.blocker = !blocked ? null : - (LWWindowPeer) AWTAccessor.getComponentAccessor().getPeer(blocker); + ComponentPeer peer = AWTAccessor.getComponentAccessor().getPeer(blocker); + if (blocked && (peer instanceof LWWindowPeer)) { + this.blocker = (LWWindowPeer) peer; + } else { + this.blocker = null; + } } platformWindow.setModalBlocked(blocked); @@ -1146,8 +1161,11 @@ return false; } - Window currentActive = KeyboardFocusManager. - getCurrentKeyboardFocusManager().getActiveWindow(); + AppContext targetAppContext = AWTAccessor.getComponentAccessor().getAppContext(getTarget()); + KeyboardFocusManager kfm = AWTAccessor.getKeyboardFocusManagerAccessor() + .getCurrentKeyboardFocusManager(targetAppContext); + Window currentActive = kfm.getActiveWindow(); + Window opposite = LWKeyboardFocusManagerPeer.getInstance(). getCurrentFocusedWindow();
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java Tue Oct 08 14:53:14 2013 -0700 @@ -26,6 +26,7 @@ package sun.lwawt.macosx; import java.awt.*; +import java.awt.dnd.DropTarget; import sun.awt.dnd.SunDropTargetContextPeer; import sun.awt.dnd.SunDropTargetEvent; @@ -38,7 +39,7 @@ private long fNativeDropTransfer = 0; private long fNativeDataAvailable = 0; private Object fNativeData = null; - private boolean insideTarget = true; + private DropTarget insideTarget = null; Object awtLockAccess = new Object(); @@ -88,26 +89,19 @@ return fNativeData; } - // We need to take care of dragExit message because for some reason it is not being - // generated for lightweight components + // We need to take care of dragEnter and dragExit messages because + // native system generates them only for heavyweights @Override protected void processMotionMessage(SunDropTargetEvent event, boolean operationChanged) { - Component eventSource = (Component)event.getComponent(); - Point screenPoint = event.getPoint(); - SwingUtilities.convertPointToScreen(screenPoint, eventSource); - Rectangle screenBounds = new Rectangle(eventSource.getLocationOnScreen().x, - eventSource.getLocationOnScreen().y, - eventSource.getWidth(), eventSource.getHeight()); - if(insideTarget) { - if(!screenBounds.contains(screenPoint)) { + boolean eventInsideTarget = isEventInsideTarget(event); + if (event.getComponent().getDropTarget() == insideTarget) { + if (!eventInsideTarget) { processExitMessage(event); - insideTarget = false; return; } } else { - if(screenBounds.contains(screenPoint)) { + if (eventInsideTarget) { processEnterMessage(event); - insideTarget = true; } else { return; } @@ -115,17 +109,52 @@ super.processMotionMessage(event, operationChanged); } + /** + * Could be called when DnD enters a heavyweight or synthesized in processMotionMessage + */ + @Override + protected void processEnterMessage(SunDropTargetEvent event) { + Component c = event.getComponent(); + DropTarget dt = event.getComponent().getDropTarget(); + if (isEventInsideTarget(event) + && dt != insideTarget + && c.isShowing() + && dt != null + && dt.isActive()) { + insideTarget = dt; + super.processEnterMessage(event); + } + } + + /** + * Could be called when DnD exits a heavyweight or synthesized in processMotionMessage + */ + @Override + protected void processExitMessage(SunDropTargetEvent event) { + if (event.getComponent().getDropTarget() == insideTarget) { + insideTarget = null; + super.processExitMessage(event); + } + } + @Override protected void processDropMessage(SunDropTargetEvent event) { - Component eventSource = (Component)event.getComponent(); + if (isEventInsideTarget(event)) { + super.processDropMessage(event); + insideTarget = null; + } + } + + private boolean isEventInsideTarget(SunDropTargetEvent event) { + Component eventSource = event.getComponent(); Point screenPoint = event.getPoint(); SwingUtilities.convertPointToScreen(screenPoint, eventSource); - Rectangle screenBounds = new Rectangle(eventSource.getLocationOnScreen().x, - eventSource.getLocationOnScreen().y, - eventSource.getWidth(), eventSource.getHeight()); - if(screenBounds.contains(screenPoint)) { - super.processDropMessage(event); - } + Point locationOnScreen = eventSource.getLocationOnScreen(); + Rectangle screenBounds = new Rectangle(locationOnScreen.x, + locationOnScreen.y, + eventSource.getWidth(), + eventSource.getHeight()); + return screenBounds.contains(screenPoint); } @Override
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CFileDialog.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CFileDialog.java Tue Oct 08 14:53:14 2013 -0700 @@ -327,11 +327,6 @@ } @Override - public Toolkit getToolkit() { - return Toolkit.getDefaultToolkit(); - } - - @Override public void handleEvent(AWTEvent e) { }
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Tue Oct 08 14:53:14 2013 -0700 @@ -210,7 +210,6 @@ private boolean undecorated; // initialized in getInitialStyleBits() private Rectangle normalBounds = null; // not-null only for undecorated maximized windows private CPlatformResponder responder; - private volatile boolean zoomed = false; // from native perspective public CPlatformWindow() { super(0, true); @@ -231,7 +230,9 @@ contentView.initialize(peer, responder); final long ownerPtr = owner != null ? owner.getNSWindowPtr() : 0L; - final long nativeWindowPtr = nativeCreateNSWindow(contentView.getAWTView(), ownerPtr, styleBits, 0, 0, 0, 0); + Rectangle bounds = _peer.constrainBounds(_target.getBounds()); + final long nativeWindowPtr = nativeCreateNSWindow(contentView.getAWTView(), + ownerPtr, styleBits, bounds.x, bounds.y, bounds.width, bounds.height); setPtr(nativeWindowPtr); if (target instanceof javax.swing.RootPaneContainer) { @@ -466,7 +467,8 @@ } private boolean isMaximized() { - return undecorated ? this.normalBounds != null : zoomed; + return undecorated ? this.normalBounds != null + : CWrapper.NSWindow.isZoomed(getNSWindowPtr()); } private void maximize() { @@ -474,7 +476,6 @@ return; } if (!undecorated) { - zoomed = true; CWrapper.NSWindow.zoom(getNSWindowPtr()); } else { deliverZoom(true); @@ -496,7 +497,6 @@ return; } if (!undecorated) { - zoomed = false; CWrapper.NSWindow.zoom(getNSWindowPtr()); } else { deliverZoom(false);
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CWrapper.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CWrapper.java Tue Oct 08 14:53:14 2013 -0700 @@ -68,6 +68,7 @@ public static native void miniaturize(long window); public static native void deminiaturize(long window); + public static native boolean isZoomed(long window); public static native void zoom(long window); public static native void makeFirstResponder(long window, long responder);
--- a/jdk/src/macosx/lib/flavormap.properties Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/lib/flavormap.properties Tue Oct 08 14:53:14 2013 -0700 @@ -76,5 +76,6 @@ text/uri-list=application/x-java-file-list;class=java.util.List PNG=image/x-java-image;class=java.awt.Image JFIF=image/x-java-image;class=java.awt.Image +TIFF=image/x-java-image;class=java.awt.Image RICH_TEXT=text/rtf HTML=text/html;charset=utf-8;eoln="\r\n";terminators=1
--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m Tue Oct 08 14:53:14 2013 -0700 @@ -366,7 +366,7 @@ - (BOOL) canBecomeMainWindow { AWT_ASSERT_APPKIT_THREAD; - if(!self.isEnabled){ + if (!self.isEnabled) { // Native system can bring up the NSWindow to // the top even if the window is not main. // We should bring up the modal dialog manually @@ -377,7 +377,7 @@ if (platformWindow != NULL) { static JNF_MEMBER_CACHE(jm_checkBlockingAndOrder, jc_CPlatformWindow, "checkBlockingAndOrder", "()Z"); - JNFCallVoidMethod(env, platformWindow, jm_checkBlockingAndOrder); + JNFCallBooleanMethod(env, platformWindow, jm_checkBlockingAndOrder); (*env)->DeleteLocalRef(env, platformWindow); } }
--- a/jdk/src/macosx/native/sun/awt/CDropTarget.m Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/native/sun/awt/CDropTarget.m Tue Oct 08 14:53:14 2013 -0700 @@ -477,6 +477,8 @@ sDraggingExited = FALSE; sDraggingLocation = [sender draggingLocation]; NSPoint javaLocation = [fView convertPoint:sDraggingLocation fromView:nil]; + javaLocation.y = fView.window.frame.size.height - javaLocation.y; + DLog5(@"+ dragEnter: loc native %f, %f, java %f, %f\n", sDraggingLocation.x, sDraggingLocation.y, javaLocation.x, javaLocation.y); ////////// BEGIN Calculate the current drag actions ////////// @@ -570,8 +572,7 @@ // Should we notify Java things have changed? if (sDraggingError == FALSE && notifyJava) { NSPoint javaLocation = [fView convertPoint:sDraggingLocation fromView:nil]; - // For some reason even after the convertPoint drag events come with the y coordinate reverted - javaLocation.y = fView.window.frame.size.height - javaLocation.y; + javaLocation.y = fView.window.frame.size.height - javaLocation.y; //DLog5(@" : dragMoved: loc native %f, %f, java %f, %f\n", sDraggingLocation.x, sDraggingLocation.y, javaLocation.x, javaLocation.y); jlongArray formats = sDraggingFormats;
--- a/jdk/src/macosx/native/sun/awt/CFileDialog.m Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/native/sun/awt/CFileDialog.m Tue Oct 08 14:53:14 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -93,6 +93,14 @@ - (void)safeSaveOrLoad { NSSavePanel *thePanel = nil; + /* + * 8013553: turns off extension hiding for the native file dialog. + * This way is used because setExtensionHidden(NO) doesn't work + * as expected. + */ + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + [defaults setBool:NO forKey:@"NSNavLastUserSetHideExtensionButtonState"]; + if (fMode == java_awt_FileDialog_SAVE) { thePanel = [NSSavePanel savePanel]; [thePanel setAllowsOtherFileTypes:YES]; @@ -110,7 +118,7 @@ if (fMode == java_awt_FileDialog_LOAD) { NSOpenPanel *openPanel = (NSOpenPanel *)thePanel; [openPanel setAllowsMultipleSelection:fMultipleMode]; - [openPanel setCanChooseFiles:YES]; + [openPanel setCanChooseFiles:!fChooseDirectories]; [openPanel setCanChooseDirectories:fChooseDirectories]; [openPanel setCanCreateDirectories:YES]; }
--- a/jdk/src/macosx/native/sun/awt/CWrapper.m Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/native/sun/awt/CWrapper.m Tue Oct 08 14:53:14 2013 -0700 @@ -437,6 +437,29 @@ /* * Class: sun_lwawt_macosx_CWrapper$NSWindow + * Method: isZoomed + * Signature: (J)Z + */ +JNIEXPORT jboolean JNICALL +Java_sun_lwawt_macosx_CWrapper_00024NSWindow_isZoomed +(JNIEnv *env, jclass cls, jlong windowPtr) +{ + __block jboolean isZoomed = JNI_FALSE; + +JNF_COCOA_ENTER(env); + + NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); + [ThreadUtilities performOnMainThreadWaiting:YES block:^(){ + isZoomed = [window isZoomed]; + }]; + +JNF_COCOA_EXIT(env); + + return isZoomed; +} + +/* + * Class: sun_lwawt_macosx_CWrapper$NSWindow * Method: zoom * Signature: (J)V */
--- a/jdk/src/macosx/native/sun/awt/awt.m Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/macosx/native/sun/awt/awt.m Tue Oct 08 14:53:14 2013 -0700 @@ -227,7 +227,7 @@ id jrsAppKitAWTClass = objc_getClass("JRSAppKitAWT"); SEL markAppSel = @selector(markAppIsDaemon); if (![jrsAppKitAWTClass respondsToSelector:markAppSel]) return NO; - return (BOOL)[jrsAppKitAWTClass performSelector:markAppSel]; + return [jrsAppKitAWTClass performSelector:markAppSel] ? YES : NO; } + (void)appKitIsRunning:(id)arg { @@ -337,6 +337,8 @@ // Headless mode trumps either ordinary AWT or SWT-in-AWT mode. Declare us a daemon and return. if (headless) { + // Note that we don't install run loop observers in headless mode + // because we don't need them (see 7174704) if (!forceEmbeddedMode) { setUpAppKitThreadName(); }
--- a/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java Tue Oct 08 14:53:14 2013 -0700 @@ -187,9 +187,18 @@ static <T> List<T> getProviders(final Class<T> providerClass) { List<T> p = new ArrayList<>(); - // ServiceLoader creates "lazy" iterator instance, so it doesn't, - // require do be called from privileged section - final Iterator<T> ps = ServiceLoader.load(providerClass).iterator(); + // ServiceLoader creates "lazy" iterator instance, but it ensures that + // next/hasNext run with permissions that are restricted by whatever + // creates the ServiceLoader instance, so it requires to be called from + // privileged section + final PrivilegedAction<Iterator<T>> psAction = + new PrivilegedAction<Iterator<T>>() { + @Override + public Iterator<T> run() { + return ServiceLoader.load(providerClass).iterator(); + } + }; + final Iterator<T> ps = AccessController.doPrivileged(psAction); // the iterator's hasNext() method looks through classpath for // the provider class names, so it requires read permissions
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java Tue Oct 08 14:53:14 2013 -0700 @@ -35,7 +35,7 @@ /** * Handles SubjectKeyIdentifier (SKI) for X.509v3. * - * @see <A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/security/cert/X509Extension.html"> + * @see <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/security/cert/X509Extension.html"> * Interface X509Extension</A> */ public class XMLX509SKI extends SignatureElementProxy implements XMLX509DataContent {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java Tue Oct 08 14:53:14 2013 -0700 @@ -56,7 +56,7 @@ * </PRE> * * @see <A HREF="http://www.javaworld.com/javaworld/javatips/jw-javatip42_p.html">Java Tip 42: Write Java apps that work with proxy-based firewalls</A> - * @see <A HREF="http://java.sun.com/j2se/1.4/docs/guide/net/properties.html">SUN J2SE docs for network properties</A> + * @see <A HREF="http://docs.oracle.com/javase/1.4.2/docs/guide/net/properties.html">SUN J2SE docs for network properties</A> * @see <A HREF="http://metalab.unc.edu/javafaq/javafaq.html#proxy">The JAVA FAQ Question 9.5: How do I make Java work with a proxy server?</A> */ public class ResolverDirectHTTP extends ResourceResolverSpi {
--- a/jdk/src/share/classes/java/applet/Applet.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/applet/Applet.java Tue Oct 08 14:53:14 2013 -0700 @@ -143,11 +143,11 @@ * For example, suppose an applet is contained * within the document: * <blockquote><pre> - * http://java.sun.com/products/jdk/1.2/index.html + * http://www.oracle.com/technetwork/java/index.html * </pre></blockquote> * The document base is: * <blockquote><pre> - * http://java.sun.com/products/jdk/1.2/index.html + * http://www.oracle.com/technetwork/java/index.html * </pre></blockquote> * * @return the {@link java.net.URL} of the document that contains this
--- a/jdk/src/share/classes/java/applet/AppletStub.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/applet/AppletStub.java Tue Oct 08 14:53:14 2013 -0700 @@ -54,11 +54,11 @@ * For example, suppose an applet is contained * within the document: * <blockquote><pre> - * http://java.sun.com/products/jdk/1.2/index.html + * http://www.oracle.com/technetwork/java/index.html * </pre></blockquote> * The document base is: * <blockquote><pre> - * http://java.sun.com/products/jdk/1.2/index.html + * http://www.oracle.com/technetwork/java/index.html * </pre></blockquote> * * @return the {@link java.net.URL} of the document that contains the
--- a/jdk/src/share/classes/java/awt/BorderLayout.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/BorderLayout.java Tue Oct 08 14:53:14 2013 -0700 @@ -96,7 +96,7 @@ * alt="Diagram of an applet demonstrating BorderLayout. * Each section of the BorderLayout contains a Button corresponding to its position in the layout, one of: * North, West, Center, East, or South." - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * The code for this applet is as follows: * <p>
--- a/jdk/src/share/classes/java/awt/Button.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Button.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * under the Solaris operating system: * <p> * <img src="doc-files/Button-1.gif" alt="The following context describes the graphic" - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * The first view shows the button as it appears normally. * The second view shows the button
--- a/jdk/src/share/classes/java/awt/Checkbox.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Checkbox.java Tue Oct 08 14:53:14 2013 -0700 @@ -53,7 +53,7 @@ * created by this code example: * <p> * <img src="doc-files/Checkbox-1.gif" alt="The following context describes the graphic." - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * The button labeled <code>one</code> is in the "on" state, and the * other two are in the "off" state. In this example, which uses the
--- a/jdk/src/share/classes/java/awt/CheckboxGroup.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/CheckboxGroup.java Tue Oct 08 14:53:14 2013 -0700 @@ -48,7 +48,7 @@ * <p> * <img src="doc-files/CheckboxGroup-1.gif" * alt="Shows three checkboxes, arranged vertically, labeled one, two, and three. Checkbox one is in the on state." - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * @author Sami Shaio * @see java.awt.Checkbox
--- a/jdk/src/share/classes/java/awt/CheckboxMenuItem.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/CheckboxMenuItem.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * <p> * <img src="doc-files/MenuBar-1.gif" * alt="Menu labeled Examples, containing items Basic, Simple, Check, and More Examples. The Check item is a CheckBoxMenuItem instance, in the off state." - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * The item labeled <code>Check</code> shows a check box menu item * in its "off" state.
--- a/jdk/src/share/classes/java/awt/Choice.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Choice.java Tue Oct 08 14:53:14 2013 -0700 @@ -52,7 +52,7 @@ * it appears as follows in its normal state: * <p> * <img src="doc-files/Choice-1.gif" alt="The following text describes the graphic" - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * In the picture, <code>"Green"</code> is the current choice. * Pushing the mouse button down on the object causes a menu to
--- a/jdk/src/share/classes/java/awt/Color.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Color.java Tue Oct 08 14:53:14 2013 -0700 @@ -823,7 +823,7 @@ * <p> * The integer that is returned by <code>HSBtoRGB</code> encodes the * value of a color in bits 0-23 of an integer value that is the same - * format used by the method {@link #getRGB() <code>getRGB</code>}. + * format used by the method {@link #getRGB() getRGB}. * This integer can be supplied as an argument to the * <code>Color</code> constructor that takes a single integer argument. * @param hue the hue component of the color
--- a/jdk/src/share/classes/java/awt/Component.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Component.java Tue Oct 08 14:53:14 2013 -0700 @@ -173,10 +173,10 @@ * <b>Note</b>: For more information on the paint mechanisms utilitized * by AWT and Swing, including information on how to write the most * efficient painting code, see - * <a href="http://java.sun.com/products/jfc/tsc/articles/painting/index.html">Painting in AWT and Swing</a>. + * <a href="http://www.oracle.com/technetwork/java/painting-140037.html">Painting in AWT and Swing</a>. * <p> * For details on the focus subsystem, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>, and the * <a href="../../java/awt/doc-files/FocusSpec.html">Focus Specification</a> @@ -1223,10 +1223,6 @@ * be called on the toolkit thread. */ final Toolkit getToolkitImpl() { - ComponentPeer peer = this.peer; - if ((peer != null) && ! (peer instanceof LightweightPeer)){ - return peer.getToolkit(); - } Container parent = this.parent; if (parent != null) { return parent.getToolkitImpl(); @@ -3205,7 +3201,7 @@ * <b>Note</b>: For more information on the paint mechanisms utilitized * by AWT and Swing, including information on how to write the most * efficient painting code, see - * <a href="http://java.sun.com/products/jfc/tsc/articles/painting/index.html">Painting in AWT and Swing</a>. + * <a href="http://www.oracle.com/technetwork/java/painting-140037.html">Painting in AWT and Swing</a>. * * @param g the graphics context to use for painting * @see #update @@ -3240,7 +3236,7 @@ * <b>Note</b>: For more information on the paint mechanisms utilitized * by AWT and Swing, including information on how to write the most * efficient painting code, see - * <a href="http://java.sun.com/products/jfc/tsc/articles/painting/index.html">Painting in AWT and Swing</a>. + * <a href="http://www.oracle.com/technetwork/java/painting-140037.html">Painting in AWT and Swing</a>. * * @param g the specified context to use for updating * @see #paint @@ -3301,7 +3297,7 @@ * <b>Note</b>: For more information on the paint mechanisms utilitized * by AWT and Swing, including information on how to write the most * efficient painting code, see - * <a href="http://java.sun.com/products/jfc/tsc/articles/painting/index.html">Painting in AWT and Swing</a>. + * <a href="http://www.oracle.com/technetwork/java/painting-140037.html">Painting in AWT and Swing</a>. * * @see #update(Graphics) @@ -3319,7 +3315,7 @@ * <b>Note</b>: For more information on the paint mechanisms utilitized * by AWT and Swing, including information on how to write the most * efficient painting code, see - * <a href="http://java.sun.com/products/jfc/tsc/articles/painting/index.html">Painting in AWT and Swing</a>. + * <a href="http://www.oracle.com/technetwork/java/painting-140037.html">Painting in AWT and Swing</a>. * * @param tm maximum time in milliseconds before update * @see #paint @@ -3341,7 +3337,7 @@ * <b>Note</b>: For more information on the paint mechanisms utilitized * by AWT and Swing, including information on how to write the most * efficient painting code, see - * <a href="http://java.sun.com/products/jfc/tsc/articles/painting/index.html">Painting in AWT and Swing</a>. + * <a href="http://www.oracle.com/technetwork/java/painting-140037.html">Painting in AWT and Swing</a>. * * @param x the <i>x</i> coordinate * @param y the <i>y</i> coordinate @@ -3366,7 +3362,7 @@ * <b>Note</b>: For more information on the paint mechanisms utilitized * by AWT and Swing, including information on how to write the most * efficient painting code, see - * <a href="http://java.sun.com/products/jfc/tsc/articles/painting/index.html">Painting in AWT and Swing</a>. + * <a href="http://www.oracle.com/technetwork/java/painting-140037.html">Painting in AWT and Swing</a>. * * @param tm maximum time in milliseconds before update * @param x the <i>x</i> coordinate
--- a/jdk/src/share/classes/java/awt/Container.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Container.java Tue Oct 08 14:53:14 2013 -0700 @@ -75,7 +75,7 @@ * (and hence to the bottom of the stacking order). * <p> * <b>Note</b>: For details on the focus subsystem, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>, and the * <a href="../../java/awt/doc-files/FocusSpec.html">Focus Specification</a>
--- a/jdk/src/share/classes/java/awt/DefaultFocusTraversalPolicy.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/DefaultFocusTraversalPolicy.java Tue Oct 08 14:53:14 2013 -0700 @@ -54,7 +54,7 @@ * impact, the focusability of the Component itself. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>, and the * <a href="../../java/awt/doc-files/FocusSpec.html">Focus Specification</a>
--- a/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java Tue Oct 08 14:53:14 2013 -0700 @@ -49,7 +49,7 @@ * Container's FocusTraversalPolicy. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>, and the * <a href="../../java/awt/doc-files/FocusSpec.html">Focus Specification</a>
--- a/jdk/src/share/classes/java/awt/DisplayMode.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/DisplayMode.java Tue Oct 08 14:53:14 2013 -0700 @@ -35,7 +35,7 @@ * (see {@link GraphicsDevice#isDisplayChangeSupported}). * <p> * For more information on full-screen exclusive mode API, see the - * <a href="http://java.sun.com/docs/books/tutorial/extra/fullscreen/index.html"> + * <a href="http://docs.oracle.com/javase/tutorial/extra/fullscreen/index.html"> * Full-Screen Exclusive Mode API Tutorial</a>. * * @see GraphicsDevice
--- a/jdk/src/share/classes/java/awt/EventQueue.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/EventQueue.java Tue Oct 08 14:53:14 2013 -0700 @@ -652,7 +652,7 @@ * Dispatches an event. The manner in which the event is * dispatched depends upon the type of the event and the * type of the event's source object: - * <p> </p> + * <p> * <table border=1 summary="Event types, source types, and dispatch methods"> * <tr> * <th>Event Type</th> @@ -680,7 +680,7 @@ * <td>No action (ignored)</td> * </tr> * </table> - * <p> </p> + * <p> * @param event an instance of <code>java.awt.AWTEvent</code>, * or a subclass of it * @throws NullPointerException if <code>event</code> is <code>null</code>
--- a/jdk/src/share/classes/java/awt/FileDialog.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/FileDialog.java Tue Oct 08 14:53:14 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -457,9 +457,16 @@ * specified file. This file becomes the default file if it is set * before the file dialog window is first shown. * <p> + * When the dialog is shown, the specified file is selected. The kind of + * selection depends on the file existence, the dialog type, and the native + * platform. E.g., the file could be highlighted in the file list, or a + * file name editbox could be populated with the file name. + * <p> + * This method accepts either a full file path, or a file name with an + * extension if used together with the {@code setDirectory} method. + * <p> * Specifying "" as the file is exactly equivalent to specifying - * <code>null</code> - * as the file. + * {@code null} as the file. * * @param file the file being set * @see #getFile
--- a/jdk/src/share/classes/java/awt/FlowLayout.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/FlowLayout.java Tue Oct 08 14:53:14 2013 -0700 @@ -54,7 +54,7 @@ * <p> * <img src="doc-files/FlowLayout-1.gif" * ALT="Graphic of Layout for Three Buttons" - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * Here is the code for this applet: * <p>
--- a/jdk/src/share/classes/java/awt/FocusTraversalPolicy.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/FocusTraversalPolicy.java Tue Oct 08 14:53:14 2013 -0700 @@ -49,7 +49,7 @@ * policy is used to perform the search operation. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>, and the * <a href="../../java/awt/doc-files/FocusSpec.html">Focus Specification</a>
--- a/jdk/src/share/classes/java/awt/Font.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Font.java Tue Oct 08 14:53:14 2013 -0700 @@ -127,7 +127,7 @@ * <p> * For a discussion of the relative advantages and disadvantages of using * physical or logical fonts, see the - * <a href="http://java.sun.com/j2se/corejava/intl/reference/faqs/index.html#desktop-rendering">Internationalization FAQ</a> + * <a href="http://www.oracle.com/technetwork/java/javase/tech/faq-jsp-138165.html">Internationalization FAQ</a> * document. * * <h4>Font Faces and Names</h4>
--- a/jdk/src/share/classes/java/awt/FontMetrics.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/FontMetrics.java Tue Oct 08 14:53:14 2013 -0700 @@ -51,8 +51,8 @@ * <li>{@link #charsWidth(char[], int, int)} * </ul> * <p> - * <img src="doc-files/FontMetrics-1.gif" alt="The letter 'p' showing its 'reference point'" border=15 align - * ALIGN=right HSPACE=10 VSPACE=7> + * <img src="doc-files/FontMetrics-1.gif" alt="The letter 'p' showing its 'reference point'" + * style="border:15px; float:right; margin: 7px 10px;"> * Note that the implementations of these methods are * inefficient, so they are usually overridden with more efficient * toolkit-specific implementations.
--- a/jdk/src/share/classes/java/awt/Frame.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Frame.java Tue Oct 08 14:53:14 2013 -0700 @@ -83,7 +83,7 @@ * <img src="doc-files/MultiScreen.gif" * alt="Diagram of virtual device encompassing three physical screens and one primary physical screen. The primary physical screen * shows (0,0) coords while a different physical screen shows (-80,-100) coords." - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * In such an environment, when calling <code>setLocation</code>, * you must pass a virtual coordinate to this method. Similarly,
--- a/jdk/src/share/classes/java/awt/GraphicsDevice.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/GraphicsDevice.java Tue Oct 08 14:53:14 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -69,7 +69,7 @@ * </pre> * <p> * For more information on full-screen exclusive mode API, see the - * <a href="http://java.sun.com/docs/books/tutorial/extra/fullscreen/index.html"> + * <a href="http://docs.oracle.com/javase/tutorial/extra/fullscreen/index.html"> * Full-Screen Exclusive Mode API Tutorial</a>. * * @see GraphicsEnvironment @@ -334,11 +334,12 @@ } /** - * Returns the <code>Window</code> object representing the + * Returns the {@code Window} object representing the * full-screen window if the device is in full-screen mode. * - * @return the full-screen window, or <code>null</code> if the device is - * not in full-screen mode. + * @return the full-screen window, or {@code null} if the device is + * not in full-screen mode. The {@code Window} object can differ + * from the object previously set by {@code setFullScreenWindow}. * @see #setFullScreenWindow(Window) * @since 1.4 */
--- a/jdk/src/share/classes/java/awt/GridBagLayout.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/GridBagLayout.java Tue Oct 08 14:53:14 2013 -0700 @@ -125,9 +125,9 @@ * <center><table BORDER=0 WIDTH=800 * SUMMARY="absolute, relative and baseline values as described above"> * <tr> - * <th><P ALIGN="LEFT">Absolute Values</th> - * <th><P ALIGN="LEFT">Orientation Relative Values</th> - * <th><P ALIGN="LEFT">Baseline Relative Values</th> + * <th><P STYLE="TEXT-ALIGN:LEFT">Absolute Values</th> + * <th><P STYLE="TEXT-ALIGN:LEFT">Orientation Relative Values</th> + * <th><P STYLE="TEXT-ALIGN:LEFT">Baseline Relative Values</th> * </tr> * <tr> * <td> @@ -201,7 +201,7 @@ * <tr ALIGN=CENTER> * <td> * <img src="doc-files/GridBagLayout-baseline.png" - * alt="The following text describes this graphic (Figure 1)." ALIGN=center> + * alt="The following text describes this graphic (Figure 1)." style="float:center"> * </td> * </table></center> * This layout consists of three components: @@ -255,10 +255,10 @@ * <center><table WIDTH=600 summary="layout"> * <tr ALIGN=CENTER> * <td> - * <img src="doc-files/GridBagLayout-1.gif" alt="The preceeding text describes this graphic (Figure 1)." ALIGN=center HSPACE=10 VSPACE=7> + * <img src="doc-files/GridBagLayout-1.gif" alt="The preceeding text describes this graphic (Figure 1)." style="float:center; margin: 7px 10px;"> * </td> * <td> - * <img src="doc-files/GridBagLayout-2.gif" alt="The preceeding text describes this graphic (Figure 2)." ALIGN=center HSPACE=10 VSPACE=7> + * <img src="doc-files/GridBagLayout-2.gif" alt="The preceeding text describes this graphic (Figure 2)." style="float:center; margin: 7px 10px;"> * </td> * <tr ALIGN=CENTER> * <td>Figure 2: Horizontal, Left-to-Right</td>
--- a/jdk/src/share/classes/java/awt/GridLayout.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/GridLayout.java Tue Oct 08 14:53:14 2013 -0700 @@ -55,7 +55,7 @@ * If the container's <code>ComponentOrientation</code> property is horizontal * and right-to-left, the example produces the output shown in Figure 2. * <p> - * <center><table WIDTH=600 summary="layout"> + * <table style="float:center" WIDTH=600 summary="layout"> * <tr ALIGN=CENTER> * <td><img SRC="doc-files/GridLayout-1.gif" * alt="Shows 6 buttons in rows of 2. Row 1 shows buttons 1 then 2. @@ -73,7 +73,7 @@ * * <td>Figure 2: Horizontal, Right-to-Left</td> * </tr> - * </table></center> + * </table> * <p> * When both the number of rows and the number of columns have * been set to non-zero values, either by a constructor or
--- a/jdk/src/share/classes/java/awt/KeyboardFocusManager.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/KeyboardFocusManager.java Tue Oct 08 14:53:14 2013 -0700 @@ -88,7 +88,7 @@ * ClassLoader. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>, and the * <a href="../../java/awt/doc-files/FocusSpec.html">Focus Specification</a> @@ -590,6 +590,7 @@ * * @see Component#requestFocus() * @see java.awt.event.FocusEvent#FOCUS_LOST + * @since 1.8 */ public void clearFocusOwner() { if (getFocusOwner() != null) {
--- a/jdk/src/share/classes/java/awt/Label.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Label.java Tue Oct 08 14:53:14 2013 -0700 @@ -46,7 +46,7 @@ * produces the following labels: * <p> * <img src="doc-files/Label-1.gif" alt="Two labels: 'Hi There!' and 'Another label'" - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * * @author Sami Shaio * @since JDK1.0
--- a/jdk/src/share/classes/java/awt/LinearGradientPaint.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/LinearGradientPaint.java Tue Oct 08 14:53:14 2013 -0700 @@ -94,7 +94,7 @@ * of the three cycle methods: * <p> * <center> - * <img src = "doc-files/LinearGradientPaint.png"> + * <img src = "doc-files/LinearGradientPaint.png" alt="LinearGradientPaint"> * </center> * * @see java.awt.Paint
--- a/jdk/src/share/classes/java/awt/List.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/List.java Tue Oct 08 14:53:14 2013 -0700 @@ -61,7 +61,7 @@ * scrolling list: * <p> * <img src="doc-files/List-1.gif" - * alt="Shows a list containing: Venus, Earth, JavaSoft, and Mars. Javasoft is selected." ALIGN=center HSPACE=10 VSPACE=7> + * alt="Shows a list containing: Venus, Earth, JavaSoft, and Mars. Javasoft is selected." style="float:center; margin: 7px 10px;"> * <p> * If the List allows multiple selections, then clicking on * an item that is already selected deselects it. In the preceding
--- a/jdk/src/share/classes/java/awt/MenuBar.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/MenuBar.java Tue Oct 08 14:53:14 2013 -0700 @@ -45,7 +45,7 @@ * <img src="doc-files/MenuBar-1.gif" * alt="Diagram of MenuBar containing 2 menus: Examples and Options. * Examples menu is expanded showing items: Basic, Simple, Check, and More Examples." - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * A menu bar handles keyboard shortcuts for menu items, passing them * along to its child menus.
--- a/jdk/src/share/classes/java/awt/MenuItem.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/MenuItem.java Tue Oct 08 14:53:14 2013 -0700 @@ -42,8 +42,8 @@ * <p> * This picture of a menu bar shows five menu items: * <IMG SRC="doc-files/MenuBar-1.gif" alt="The following text describes this graphic." - * ALIGN=CENTER HSPACE=10 VSPACE=7> - * <br CLEAR=LEFT> + * style="float:center; margin: 7px 10px;"> + * <br style="clear:left;"> * The first two items are simple menu items, labeled * <code>"Basic"</code> and <code>"Simple"</code>. * Following these two items is a separator, which is itself
--- a/jdk/src/share/classes/java/awt/RadialGradientPaint.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/RadialGradientPaint.java Tue Oct 08 14:53:14 2013 -0700 @@ -80,14 +80,14 @@ * from the focus point. The following figure shows that the distance AB * is equal to the distance BC, and the distance AD is equal to the distance DE. * <center> - * <img src = "doc-files/RadialGradientPaint-3.png"> + * <img src = "doc-files/RadialGradientPaint-3.png" alt="RadialGradientPaint-3"> * </center> * If the gradient and graphics rendering transforms are uniformly scaled and * the user sets the focus so that it coincides with the center of the circle, * the gradient color proportions are equal for any line drawn from the center. * The following figure shows the distances AB, BC, AD, and DE. They are all equal. * <center> - * <img src = "doc-files/RadialGradientPaint-4.png"> + * <img src = "doc-files/RadialGradientPaint-4.png" alt="RadialGradientPaint-4"> * </center> * Note that some minor variations in distances may occur due to sampling at * the granularity of a pixel. @@ -117,7 +117,7 @@ * (centered) focus for each of the three cycle methods: * <p> * <center> - * <img src = "doc-files/RadialGradientPaint-1.png"> + * <img src = "doc-files/RadialGradientPaint-1.png" alt="RadialGradientPaint-1"> * </center> * * <p> @@ -141,7 +141,7 @@ * focus for each of the three cycle methods: * <p> * <center> - * <img src = "doc-files/RadialGradientPaint-2.png"> + * <img src = "doc-files/RadialGradientPaint-2.png" alt="RadialGradientPaint-2"> * </center> * * @see java.awt.Paint
--- a/jdk/src/share/classes/java/awt/Scrollbar.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Scrollbar.java Tue Oct 08 14:53:14 2013 -0700 @@ -42,7 +42,7 @@ * the red, green, and blue components of a color: * <p> * <img src="doc-files/Scrollbar-1.gif" alt="Image shows 3 vertical sliders, side-by-side." - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * Each scroll bar in this example could be created with * code similar to the following: @@ -60,7 +60,7 @@ * <p> * <img src="doc-files/Scrollbar-2.gif" * alt="Image shows horizontal slider with starting range of 0 and ending range of 300. The slider thumb is labeled 60." - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * The value range represented by the bubble in this example * is the <em>visible amount</em>. The horizontal scroll bar @@ -295,7 +295,7 @@ * Constructs a new vertical scroll bar. * The default properties of the scroll bar are listed in * the following table: - * <p> </p> + * <p> * <table border=1 summary="Scrollbar default properties"> * <tr> * <th>Property</th>
--- a/jdk/src/share/classes/java/awt/SystemTray.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/SystemTray.java Tue Oct 08 14:53:14 2013 -0700 @@ -361,7 +361,7 @@ /** * Adds a {@code PropertyChangeListener} to the list of listeners for the * specific property. The following properties are currently supported: - * <p> </p> + * <p> * <table border=1 summary="SystemTray properties"> * <tr> * <th>Property</th> @@ -384,7 +384,7 @@ * The property is accessed by the {@link #getSystemTray} method.</td> * </tr> * </table> - * <p> </p> + * <p> * The {@code listener} listens to property changes only in this context. * <p> * If {@code listener} is {@code null}, no exception is thrown
--- a/jdk/src/share/classes/java/awt/TextArea.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/TextArea.java Tue Oct 08 14:53:14 2013 -0700 @@ -42,7 +42,7 @@ * The following image shows the appearance of a text area: * <p> * <img src="doc-files/TextArea-1.gif" alt="A TextArea showing the word 'Hello!'" - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * This text area could be created by the following line of code: * <p>
--- a/jdk/src/share/classes/java/awt/TextComponent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/TextComponent.java Tue Oct 08 14:53:14 2013 -0700 @@ -822,37 +822,6 @@ // Accessibility support //////////////// - - /** - * - */ - int getIndexAtPoint(Point p) { - return -1; -/* To be fully implemented in a future release - if (peer == null) { - return -1; - } - TextComponentPeer peer = (TextComponentPeer)this.peer; - return peer.getIndexAtPoint(p.x, p.y); -*/ - } - - - /** - * - */ - Rectangle getCharacterBounds(int i) { - return null; -/* To be fully implemented in a future release - if (peer == null) { - return null; - } - TextComponentPeer peer = (TextComponentPeer)this.peer; - return peer.getCharacterBounds(i); -*/ - } - - /** * Gets the AccessibleContext associated with this TextComponent. * For text components, the AccessibleContext takes the form of an @@ -963,7 +932,7 @@ * @return the zero-based index of the character under Point p. */ public int getIndexAtPoint(Point p) { - return TextComponent.this.getIndexAtPoint(p); + return -1; } /** @@ -976,7 +945,7 @@ * @return the screen coordinates of the character's bounding box */ public Rectangle getCharacterBounds(int i) { - return TextComponent.this.getCharacterBounds(i); + return null; } /**
--- a/jdk/src/share/classes/java/awt/TextField.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/TextField.java Tue Oct 08 14:53:14 2013 -0700 @@ -42,7 +42,7 @@ * display the predefined text <code>"Hello"</code>. * <p> * <img src="doc-files/TextField-1.gif" alt="The preceding text describes this image." - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * Here is the code that produces these four text fields: * <p>
--- a/jdk/src/share/classes/java/awt/Toolkit.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Toolkit.java Tue Oct 08 14:53:14 2013 -0700 @@ -83,7 +83,7 @@ * <p> * <li>Moving the focus from one component to another. * <br>For more information, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html#transferTiming">Timing + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html#transferTiming">Timing * Focus Transfers</a>, a section in * <a href="http://java.sun.com/docs/books/tutorial/uiswing/">The Swing * Tutorial</a>.
--- a/jdk/src/share/classes/java/awt/Window.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/Window.java Tue Oct 08 14:53:14 2013 -0700 @@ -85,7 +85,7 @@ * <p> * <img src="doc-files/MultiScreen.gif" * alt="Diagram shows virtual device containing 4 physical screens. Primary physical screen shows coords (0,0), other screen shows (-80,-100)." - * ALIGN=center HSPACE=10 VSPACE=7> + * style="float:center; margin: 7px 10px;"> * <p> * In such an environment, when calling {@code setLocation}, * you must pass a virtual coordinate to this method. Similarly, @@ -226,6 +226,7 @@ boolean syncLWRequests = false; transient boolean beforeFirstShow = true; private transient boolean disposing = false; + transient WindowDisposerRecord disposerRecord = null; static final int OPENED = 0x01; @@ -437,18 +438,28 @@ transient Object anchor = new Object(); static class WindowDisposerRecord implements sun.java2d.DisposerRecord { - final WeakReference<Window> owner; + WeakReference<Window> owner; final WeakReference<Window> weakThis; final WeakReference<AppContext> context; + WindowDisposerRecord(AppContext context, Window victim) { - owner = new WeakReference<Window>(victim.getOwner()); weakThis = victim.weakThis; this.context = new WeakReference<AppContext>(context); } + + public void updateOwner() { + Window victim = weakThis.get(); + owner = (victim == null) + ? null + : new WeakReference<Window>(victim.getOwner()); + } + public void dispose() { - Window parent = owner.get(); - if (parent != null) { - parent.removeOwnedWindow(weakThis); + if (owner != null) { + Window parent = owner.get(); + if (parent != null) { + parent.removeOwnedWindow(weakThis); + } } AppContext ac = context.get(); if (null != ac) { @@ -502,6 +513,8 @@ } modalExclusionType = Dialog.ModalExclusionType.NO_EXCLUDE; + disposerRecord = new WindowDisposerRecord(appContext, this); + sun.java2d.Disposer.addRecord(anchor, disposerRecord); SunToolkit.checkAndSetPolicy(this); } @@ -617,11 +630,16 @@ this.parent = owner; if (owner != null) { owner.addOwnedWindow(weakThis); + if (owner.isAlwaysOnTop()) { + try { + setAlwaysOnTop(true); + } catch (SecurityException ignore) { + } + } } - // Fix for 6758673: this call is moved here from init(gc), because // WindowDisposerRecord requires a proper value of parent field. - Disposer.addRecord(anchor, new WindowDisposerRecord(appContext, this)); + disposerRecord.updateOwner(); } /** @@ -1022,7 +1040,9 @@ closeSplashScreen(); Dialog.checkShouldBeBlocked(this); super.show(); - locationByPlatform = false; + synchronized (getTreeLock()) { + this.locationByPlatform = false; + } for (int i = 0; i < ownedWindowList.size(); i++) { Window child = ownedWindowList.elementAt(i).get(); if ((child != null) && child.showWithParent) { @@ -1095,6 +1115,9 @@ modalBlocker.unblockWindow(this); } super.hide(); + synchronized (getTreeLock()) { + this.locationByPlatform = false; + } } final void clearMostRecentFocusOwnerOnHide() { @@ -2180,8 +2203,8 @@ * windows. To detect if always-on-top windows are supported by the * current platform, use {@link Toolkit#isAlwaysOnTopSupported()} and * {@link Window#isAlwaysOnTopSupported()}. If always-on-top mode - * isn't supported by the toolkit or for this window, calling this - * method has no effect. + * isn't supported for this window or this window's toolkit does not + * support always-on-top windows, calling this method has no effect. * <p> * If a SecurityManager is installed, the calling thread must be * granted the AWTPermission "setWindowAlwaysOnTop" in @@ -2194,11 +2217,13 @@ * windows * @throws SecurityException if the calling thread does not have * permission to set the value of always-on-top property + * * @see #isAlwaysOnTop * @see #toFront * @see #toBack * @see AWTPermission * @see #isAlwaysOnTopSupported + * @see #getToolkit * @see Toolkit#isAlwaysOnTopSupported * @since 1.5 */ @@ -2224,6 +2249,15 @@ } firePropertyChange("alwaysOnTop", oldAlwaysOnTop, alwaysOnTop); } + for (WeakReference<Window> ref : ownedWindowList) { + Window window = ref.get(); + if (window != null) { + try { + window.setAlwaysOnTop(alwaysOnTop); + } catch (SecurityException ignore) { + } + } + } } /** @@ -2231,11 +2265,13 @@ * window. Some platforms may not support always-on-top windows, some * may support only some kinds of top-level windows; for example, * a platform may not support always-on-top modal dialogs. - * @return {@code true}, if the always-on-top mode is - * supported by the toolkit and for this window, - * {@code false}, if always-on-top mode is not supported - * for this window or toolkit doesn't support always-on-top windows. + * + * @return {@code true}, if the always-on-top mode is supported for + * this window and this window's toolkit supports always-on-top windows, + * {@code false} otherwise + * * @see #setAlwaysOnTop(boolean) + * @see #getToolkit * @see Toolkit#isAlwaysOnTopSupported * @since 1.6 */ @@ -2774,6 +2810,7 @@ void connectOwnedWindow(Window child) { child.parent = this; addOwnedWindow(child.weakThis); + child.disposerRecord.updateOwner(); } private void addToWindowList() { @@ -2936,7 +2973,8 @@ weakThis = new WeakReference<>(this); anchor = new Object(); - sun.java2d.Disposer.addRecord(anchor, new WindowDisposerRecord(appContext, this)); + disposerRecord = new WindowDisposerRecord(appContext, this); + sun.java2d.Disposer.addRecord(anchor, disposerRecord); addToWindowList(); initGC(null);
--- a/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java Tue Oct 08 14:53:14 2013 -0700 @@ -90,7 +90,7 @@ * the same results. * <p> * For more information on the using data transfer with Swing see - * the <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/dnd.html"> + * the <a href="http://docs.oracle.com/javase/tutorial/uiswing/dnd/index.html"> * How to Use Drag and Drop and Data Transfer</a>, * section in <em>Java Tutorial</em>. *
--- a/jdk/src/share/classes/java/awt/datatransfer/Transferable.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/datatransfer/Transferable.java Tue Oct 08 14:53:14 2013 -0700 @@ -32,7 +32,7 @@ * for a transfer operation. * <p> * For information on using data transfer with Swing, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/dnd.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/dnd/index.html"> * How to Use Drag and Drop and Data Transfer</a>, * a section in <em>The Java Tutorial</em>, for more information. *
--- a/jdk/src/share/classes/java/awt/event/ActionEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/ActionEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -52,7 +52,7 @@ * in the range from {@code ACTION_FIRST} to {@code ACTION_LAST}. * * @see ActionListener - * @see <a href="http://java.sun.com/docs/books/tutorial/uiswing/events/actionlistener.html">Tutorial: How to Write an Action Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/actionlistener.html">Tutorial: How to Write an Action Listener</a> * * @author Carl Quinn * @since 1.1
--- a/jdk/src/share/classes/java/awt/event/ActionListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/ActionListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -37,7 +37,7 @@ * invoked. * * @see ActionEvent - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/eventmodel.html">Tutorial: Java 1.1 Event Model</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/actionlistener.html">How to Write an Action Listener</a> * * @author Carl Quinn * @since 1.1
--- a/jdk/src/share/classes/java/awt/event/ComponentAdapter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/ComponentAdapter.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * * @see ComponentEvent * @see ComponentListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/componentlistener.html">Tutorial: Writing a Component Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/componentlistener.html">Tutorial: Writing a Component Listener</a> * * @author Carl Quinn * @since 1.1
--- a/jdk/src/share/classes/java/awt/event/ComponentEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/ComponentEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -60,7 +60,7 @@ * * @see ComponentAdapter * @see ComponentListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/componentlistener.html">Tutorial: Writing a Component Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/componentlistener.html">Tutorial: Writing a Component Listener</a> * * @author Carl Quinn * @since 1.1
--- a/jdk/src/share/classes/java/awt/event/ComponentListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/ComponentListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -46,7 +46,7 @@ * * @see ComponentAdapter * @see ComponentEvent - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/componentlistener.html">Tutorial: Writing a Component Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/componentlistener.html">Tutorial: Writing a Component Listener</a> * * @author Carl Quinn * @since 1.1
--- a/jdk/src/share/classes/java/awt/event/ContainerAdapter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/ContainerAdapter.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * * @see ContainerEvent * @see ContainerListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/containerlistener.html">Tutorial: Writing a Container Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/containerlistener.html">Tutorial: Writing a Container Listener</a> * * @author Amy Fowler * @since 1.1
--- a/jdk/src/share/classes/java/awt/event/ContainerEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/ContainerEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -52,7 +52,7 @@ * * @see ContainerAdapter * @see ContainerListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/containerlistener.html">Tutorial: Writing a Container Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/containerlistener.html">Tutorial: Writing a Container Listener</a> * * @author Tim Prinzing * @author Amy Fowler
--- a/jdk/src/share/classes/java/awt/event/ContainerListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/ContainerListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -46,7 +46,7 @@ * * @see ContainerAdapter * @see ContainerEvent - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/containerlistener.html">Tutorial: Writing a Container Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/containerlistener.html">Tutorial: Writing a Container Listener</a> * * @author Tim Prinzing * @author Amy Fowler
--- a/jdk/src/share/classes/java/awt/event/FocusAdapter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/FocusAdapter.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * * @see FocusEvent * @see FocusListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/focuslistener.html">Tutorial: Writing a Focus Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/focuslistener.html">Tutorial: Writing a Focus Listener</a> * * @author Carl Quinn * @since 1.1
--- a/jdk/src/share/classes/java/awt/event/FocusEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/FocusEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -57,7 +57,7 @@ * * @see FocusAdapter * @see FocusListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/focuslistener.html">Tutorial: Writing a Focus Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/focuslistener.html">Tutorial: Writing a Focus Listener</a> * * @author Carl Quinn * @author Amy Fowler
--- a/jdk/src/share/classes/java/awt/event/FocusListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/FocusListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -42,7 +42,7 @@ * * @see FocusAdapter * @see FocusEvent - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/focuslistener.html">Tutorial: Writing a Focus Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/focuslistener.html">Tutorial: Writing a Focus Listener</a> * * @author Carl Quinn * @since 1.1
--- a/jdk/src/share/classes/java/awt/event/InputEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/InputEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -445,7 +445,7 @@ * <PRE> * int onmask = SHIFT_DOWN_MASK | BUTTON1_DOWN_MASK; * int offmask = CTRL_DOWN_MASK; - * if ((event.getModifiersEx() & (onmask | offmask)) == onmask) { + * if ((event.getModifiersEx() & (onmask | offmask)) == onmask) { * ... * } * </PRE>
--- a/jdk/src/share/classes/java/awt/event/ItemEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/ItemEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -58,7 +58,7 @@ * * @see java.awt.ItemSelectable * @see ItemListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/itemlistener.html">Tutorial: Writing an Item Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/itemlistener.html">Tutorial: Writing an Item Listener</a> * * @since 1.1 */
--- a/jdk/src/share/classes/java/awt/event/ItemListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/ItemListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * * @see java.awt.ItemSelectable * @see ItemEvent - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/itemlistener.html">Tutorial: Writing an Item Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/itemlistener.html">Tutorial: Writing an Item Listener</a> * * @since 1.1 */
--- a/jdk/src/share/classes/java/awt/event/KeyAdapter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/KeyAdapter.java Tue Oct 08 14:53:14 2013 -0700 @@ -46,7 +46,7 @@ * * @see KeyEvent * @see KeyListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/keylistener.html">Tutorial: Writing a Key Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/keylistener.html">Tutorial: Writing a Key Listener</a> * * @since 1.1 */
--- a/jdk/src/share/classes/java/awt/event/KeyEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/KeyEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -145,7 +145,7 @@ * * @see KeyAdapter * @see KeyListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/keylistener.html">Tutorial: Writing a Key Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/keylistener.html">Tutorial: Writing a Key Listener</a> * * @since 1.1 */
--- a/jdk/src/share/classes/java/awt/event/MouseAdapter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/MouseAdapter.java Tue Oct 08 14:53:14 2013 -0700 @@ -63,7 +63,7 @@ * @see MouseListener * @see MouseMotionListener * @see MouseWheelListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/mouselistener.html">Tutorial: Writing a Mouse Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/mouselistener.html">Tutorial: Writing a Mouse Listener</a> * * @since 1.1 */
--- a/jdk/src/share/classes/java/awt/event/MouseEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/MouseEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -146,12 +146,12 @@ * {@link InputEvent#getMaskForButton(int) getMaskForButton(button)} method may be used * as button masks. * <p> - * <code>MOUSE_DRAGGED</code> events are delivered to the <code>Component</code> + * {@code MOUSE_DRAGGED} events are delivered to the {@code Component} * in which the mouse button was pressed until the mouse button is released * (regardless of whether the mouse position is within the bounds of the - * <code>Component</code>). Due to platform-dependent Drag&Drop implementations, - * <code>MOUSE_DRAGGED</code> events may not be delivered during a native - * Drag&Drop operation. + * {@code Component}). Due to platform-dependent Drag&Drop implementations, + * {@code MOUSE_DRAGGED} events may not be delivered during a native + * Drag&Drop operation. * * In a multi-screen environment mouse drag events are delivered to the * <code>Component</code> even if the mouse position is outside the bounds of the @@ -182,8 +182,8 @@ * @see MouseMotionAdapter * @see MouseMotionListener * @see MouseWheelListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/mouselistener.html">Tutorial: Writing a Mouse Listener</a> - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/mousemotionlistener.html">Tutorial: Writing a Mouse Motion Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/mouselistener.html">Tutorial: Writing a Mouse Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/mousemotionlistener.html">Tutorial: Writing a Mouse Motion Listener</a> * * @since 1.1 */ @@ -327,7 +327,7 @@ * For all other events the count will be 0. * * @serial - * @see #getClickCount(). + * @see #getClickCount() */ int clickCount; @@ -403,7 +403,7 @@ /** * Initialize JNI field and method IDs for fields that may be - accessed from C. + * accessed from C. */ private static native void initIDs();
--- a/jdk/src/share/classes/java/awt/event/MouseListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/MouseListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -50,7 +50,7 @@ * * @see MouseAdapter * @see MouseEvent - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/mouselistener.html">Tutorial: Writing a Mouse Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/mouselistener.html">Tutorial: Writing a Mouse Listener</a> * * @since 1.1 */
--- a/jdk/src/share/classes/java/awt/event/MouseMotionAdapter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/MouseMotionAdapter.java Tue Oct 08 14:53:14 2013 -0700 @@ -49,7 +49,7 @@ * * @see MouseEvent * @see MouseMotionListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/mousemotionlistener.html">Tutorial: Writing a Mouse Motion Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/mousemotionlistener.html">Tutorial: Writing a Mouse Motion Listener</a> * * @since 1.1 */
--- a/jdk/src/share/classes/java/awt/event/MouseMotionListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/MouseMotionListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -47,7 +47,7 @@ * * @see MouseMotionAdapter * @see MouseEvent - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/mousemotionlistener.html">Tutorial: Writing a Mouse Motion Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/mousemotionlistener.html">Tutorial: Writing a Mouse Motion Listener</a> * * @since 1.1 */
--- a/jdk/src/share/classes/java/awt/event/WindowAdapter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/WindowAdapter.java Tue Oct 08 14:53:14 2013 -0700 @@ -45,7 +45,7 @@ * * @see WindowEvent * @see WindowListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/windowlistener.html">Tutorial: Writing a Window Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/windowlistener.html">Tutorial: Writing a Window Listener</a> * * @author Carl Quinn * @author Amy Fowler
--- a/jdk/src/share/classes/java/awt/event/WindowEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/WindowEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -52,7 +52,7 @@ * * @see WindowAdapter * @see WindowListener - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/windowlistener.html">Tutorial: Writing a Window Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/windowlistener.html">Tutorial: Writing a Window Listener</a> * * @since JDK1.1 */
--- a/jdk/src/share/classes/java/awt/event/WindowFocusListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/WindowFocusListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -47,7 +47,7 @@ * * @see WindowAdapter * @see WindowEvent - * @see <a href="http://java.sun.com/docs/books/tutorial/post1.0/ui/windowlistener.html">Tutorial: Writing a Window Listener</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/windowlistener.html">Tutorial: Writing a Window Listener</a> * * @since 1.4 */
--- a/jdk/src/share/classes/java/awt/event/WindowListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/event/WindowListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * * @see WindowAdapter * @see WindowEvent - * @see <a href="http://java.sun.com/docs/books/tutorial/uiswing/events/windowlistener.html">Tutorial: How to Write Window Listeners</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/windowlistener.html">Tutorial: How to Write Window Listeners</a> * * @since 1.1 */
--- a/jdk/src/share/classes/java/awt/font/TextAttribute.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/font/TextAttribute.java Tue Oct 08 14:53:14 2013 -0700 @@ -97,10 +97,10 @@ * <h4>Summary of attributes</h4> * <p> * <font size="-1"> - * <table align="center" border="0" cellspacing="0" cellpadding="2" width="%95" + * <table style="float:center" border="0" cellspacing="0" cellpadding="2" width="%95" * summary="Key, value type, principal constants, and default value * behavior of all TextAttributes"> - * <tr bgcolor="#ccccff"> + * <tr style="background-color:#ccccff"> * <th valign="TOP" align="CENTER">Key</th> * <th valign="TOP" align="CENTER">Value Type</th> * <th valign="TOP" align="CENTER">Principal Constants</th> @@ -115,7 +115,7 @@ </td> * <td valign="TOP">"Default" (use platform default)</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #WEIGHT}</td> * <td valign="TOP">Number</td> * <td valign="TOP">WEIGHT_REGULAR, WEIGHT_BOLD</td> @@ -127,7 +127,7 @@ * <td valign="TOP">WIDTH_CONDENSED, WIDTH_REGULAR,<br>WIDTH_EXTENDED</td> * <td valign="TOP">WIDTH_REGULAR</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #POSTURE}</td> * <td valign="TOP">Number</td> * <td valign="TOP">POSTURE_REGULAR, POSTURE_OBLIQUE</td> @@ -139,7 +139,7 @@ * <td valign="TOP">none</td> * <td valign="TOP">12.0</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #TRANSFORM}</td> * <td valign="TOP">{@link TransformAttribute}</td> * <td valign="TOP">See TransformAttribute {@link TransformAttribute#IDENTITY IDENTITY}</td> @@ -151,7 +151,7 @@ * <td valign="TOP">SUPERSCRIPT_SUPER, SUPERSCRIPT_SUB</td> * <td valign="TOP">0 (use the standard glyphs and metrics)</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #FONT}</td> * <td valign="TOP">{@link java.awt.Font}</td> * <td valign="TOP">none</td> @@ -163,7 +163,7 @@ * <td valign="TOP">none</td> * <td valign="TOP">null (draw text using font glyphs)</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #FOREGROUND}</td> * <td valign="TOP">{@link java.awt.Paint}</td> * <td valign="TOP">none</td> @@ -175,7 +175,7 @@ * <td valign="TOP">none</td> * <td valign="TOP">null (do not render background)</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #UNDERLINE}</td> * <td valign="TOP">Integer</td> * <td valign="TOP">UNDERLINE_ON</td> @@ -187,7 +187,7 @@ * <td valign="TOP">STRIKETHROUGH_ON</td> * <td valign="TOP">false (do not render strikethrough)</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #RUN_DIRECTION}</td> * <td valign="TOP">Boolean</td> * <td valign="TOP">RUN_DIRECTION_LTR<br>RUN_DIRECTION_RTL</td> @@ -199,7 +199,7 @@ * <td valign="TOP">none</td> * <td valign="TOP">0 (use base line direction)</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #JUSTIFICATION}</td> * <td valign="TOP">Number</td> * <td valign="TOP">JUSTIFICATION_FULL</td> @@ -211,7 +211,7 @@ * <td valign="TOP">(see class)</td> * <td valign="TOP">null (do not apply input highlighting)</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #INPUT_METHOD_UNDERLINE}</td> * <td valign="TOP">Integer</td> * <td valign="TOP">UNDERLINE_LOW_ONE_PIXEL,<br>UNDERLINE_LOW_TWO_PIXEL</td> @@ -223,7 +223,7 @@ * <td valign="TOP">SWAP_COLORS_ON</td> * <td valign="TOP">false (do not swap colors)</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #NUMERIC_SHAPING}</td> * <td valign="TOP">{@link java.awt.font.NumericShaper}</td> * <td valign="TOP">none</td> @@ -235,7 +235,7 @@ * <td valign="TOP">KERNING_ON</td> * <td valign="TOP">0 (do not request kerning)</td> * </tr> - * <tr bgcolor="#eeeeff"> + * <tr style="background-color:#eeeeff"> * <td valign="TOP">{@link #LIGATURES}</td> * <td valign="TOP">Integer</td> * <td valign="TOP">LIGATURES_ON</td>
--- a/jdk/src/share/classes/java/awt/geom/AffineTransform.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/geom/AffineTransform.java Tue Oct 08 14:53:14 2013 -0700 @@ -47,7 +47,7 @@ * [ 1 ] [ 0 0 1 ] [ 1 ] [ 1 ] * </pre> * <p> - * <a name="quadrantapproximation"><h4>Handling 90-Degree Rotations</h4></a> + * <a name="quadrantapproximation"></a><h4>Handling 90-Degree Rotations</h4> * <p> * In some variations of the <code>rotate</code> methods in the * <code>AffineTransform</code> class, a double-precision argument
--- a/jdk/src/share/classes/java/awt/geom/Line2D.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/geom/Line2D.java Tue Oct 08 14:53:14 2013 -0700 @@ -35,7 +35,7 @@ * default coordinate system called <i>user space</i> in which the y-axis * values increase downward and x-axis values increase to the right. For * more information on the user space coordinate system, see the - * <a href="http://java.sun.com/j2se/1.3/docs/guide/2d/spec/j2d-intro.fm2.html#61857"> + * <a href="http://docs.oracle.com/javase/1.3/docs/guide/2d/spec/j2d-intro.fm2.html#61857"> * Coordinate Systems</a> section of the Java 2D Programmer's Guide. * <p> * This class is only the abstract superclass for all objects that @@ -82,7 +82,7 @@ public float y2; /** - * Constructs and initializes a Line with coordinates (0, 0) -> (0, 0). + * Constructs and initializes a Line with coordinates (0, 0) → (0, 0). * @since 1.2 */ public Float() { @@ -249,7 +249,7 @@ public double y2; /** - * Constructs and initializes a Line with coordinates (0, 0) -> (0, 0). + * Constructs and initializes a Line with coordinates (0, 0) → (0, 0). * @since 1.2 */ public Double() { @@ -623,7 +623,7 @@ * specified line segment * @param y2 the Y coordinate of the end point of the * specified line segment - * @return <true> if this line segment and the specified line segment + * @return {@code <true>} if this line segment and the specified line segment * intersect each other; <code>false</code> otherwise. * @since 1.2 */
--- a/jdk/src/share/classes/java/awt/im/InputContext.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/im/InputContext.java Tue Oct 08 14:53:14 2013 -0700 @@ -118,7 +118,6 @@ * Otherwise, an input method or keyboard layout that supports the requested * locale is selected in an implementation dependent way.</li> * - * <p> * </ul> * Before switching away from an input method, any currently uncommitted text * is committed. If no input method or keyboard layout supporting the requested
--- a/jdk/src/share/classes/java/awt/im/InputMethodHighlight.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/im/InputMethodHighlight.java Tue Oct 08 14:53:14 2013 -0700 @@ -51,8 +51,8 @@ * mappings from abstract to concrete styles. Currently defined state values * are raw (unconverted) and converted. * These state values are recommended for use before and after the -* main conversion step of text composition, say, before and after kana->kanji -* or pinyin->hanzi conversion. +* main conversion step of text composition, say, before and after kana->kanji +* or pinyin->hanzi conversion. * The <code>variation</code> field allows input methods to express additional * information about the conversion results. * <p>
--- a/jdk/src/share/classes/java/awt/peer/ComponentPeer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/peer/ComponentPeer.java Tue Oct 08 14:53:14 2013 -0700 @@ -260,15 +260,6 @@ ColorModel getColorModel(); /** - * Returns the toolkit that is responsible for the component. - * - * @return the toolkit that is responsible for the component - * - * @see Component#getToolkit() - */ - Toolkit getToolkit(); - - /** * Returns a graphics object to paint on the component. * * @return a graphics object to paint on the component
--- a/jdk/src/share/classes/java/awt/peer/TextComponentPeer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/peer/TextComponentPeer.java Tue Oct 08 14:53:14 2013 -0700 @@ -60,11 +60,11 @@ /** * Sets the content for the text component. * - * @param l the content to set + * @param text the content to set * * @see TextComponent#setText(String) */ - void setText(String l); + void setText(String text); /** * Returns the start index of the current selection.
--- a/jdk/src/share/classes/java/awt/print/PrinterJob.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/awt/print/PrinterJob.java Tue Oct 08 14:53:14 2013 -0700 @@ -98,7 +98,7 @@ * Calling this method is equivalent to calling * {@link javax.print.PrintServiceLookup#lookupPrintServices( * DocFlavor, AttributeSet) - * <code>PrintServiceLookup.lookupPrintServices()</code>} + * PrintServiceLookup.lookupPrintServices()} * and specifying a Pageable DocFlavor. * @return a possibly empty array of 2D print services. * @since 1.4 @@ -136,8 +136,8 @@ * <code>PrinterJob</code> instances which support print services. * Calling this method is equivalent to calling * {@link javax.print.StreamPrintServiceFactory#lookupStreamPrintServiceFactories(DocFlavor, String) - * <code>StreamPrintServiceFactory.lookupStreamPrintServiceFactories() - * </code>} and specifying a Pageable DocFlavor. + * StreamPrintServiceFactory.lookupStreamPrintServiceFactories() + * } and specifying a Pageable DocFlavor. * * @param mimeType the required output format, or null to mean any format. * @return a possibly empty array of 2D stream print service factories. @@ -155,7 +155,7 @@ /** * A <code>PrinterJob</code> object should be created using the - * static {@link #getPrinterJob() <code>getPrinterJob</code>} method. + * static {@link #getPrinterJob() getPrinterJob} method. */ public PrinterJob() { }
--- a/jdk/src/share/classes/java/beans/EventHandler.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/beans/EventHandler.java Tue Oct 08 14:53:14 2013 -0700 @@ -33,6 +33,7 @@ import java.security.PrivilegedAction; import sun.reflect.misc.MethodUtil; +import sun.reflect.misc.ReflectUtil; /** * The <code>EventHandler</code> class provides @@ -677,22 +678,38 @@ * * @see EventHandler */ - @SuppressWarnings("unchecked") public static <T> T create(Class<T> listenerInterface, Object target, String action, String eventPropertyName, String listenerMethodName) { // Create this first to verify target/action are non-null - EventHandler eventHandler = new EventHandler(target, action, + final EventHandler handler = new EventHandler(target, action, eventPropertyName, listenerMethodName); if (listenerInterface == null) { throw new NullPointerException( "listenerInterface must be non-null"); } - return (T)Proxy.newProxyInstance(target.getClass().getClassLoader(), - new Class<?>[] {listenerInterface}, - eventHandler); + final ClassLoader loader = getClassLoader(listenerInterface); + final Class<?>[] interfaces = {listenerInterface}; + return AccessController.doPrivileged(new PrivilegedAction<T>() { + @SuppressWarnings("unchecked") + public T run() { + return (T) Proxy.newProxyInstance(loader, interfaces, handler); + } + }); + } + + private static ClassLoader getClassLoader(Class<?> type) { + ReflectUtil.checkPackageAccess(type); + ClassLoader loader = type.getClassLoader(); + if (loader == null) { + loader = Thread.currentThread().getContextClassLoader(); // avoid use of BCP + if (loader == null) { + loader = ClassLoader.getSystemClassLoader(); + } + } + return loader; } }
--- a/jdk/src/share/classes/java/beans/Introspector.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/beans/Introspector.java Tue Oct 08 14:53:14 2013 -0700 @@ -87,7 +87,7 @@ * <p> * For more information about introspection and design patterns, please * consult the - * <a href="http://java.sun.com/products/javabeans/docs/index.html">JavaBeans™ specification</a>. + * <a href="http://www.oracle.com/technetwork/java/javase/documentation/spec-136004.html">JavaBeans™ specification</a>. */ public class Introspector {
--- a/jdk/src/share/classes/java/net/URI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/net/URI.java Tue Oct 08 14:53:14 2013 -0700 @@ -188,7 +188,7 @@ * URI * * <blockquote> - * {@code http://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html#28} + * {@code http://docs.oracle.com/javase/1.3/docs/guide/collections/designfaq.html#28} * </blockquote> * * Resolving the relative URI @@ -227,7 +227,7 @@ * possible. For example, relativizing the URI * * <blockquote> - * {@code http://java.sun.com/j2se/1.3/docs/guide/index.html} + * {@code http://docs.oracle.com/javase/1.3/docs/guide/index.html} * </blockquote> * * against the base URI
--- a/jdk/src/share/classes/java/text/DecimalFormat.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/text/DecimalFormat.java Tue Oct 08 14:53:14 2013 -0700 @@ -371,7 +371,7 @@ * } * }</pre></blockquote> * - * @see <a href="http://java.sun.com/docs/books/tutorial/i18n/format/decimalFormat.html">Java Tutorial</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/i18n/format/decimalFormat.html">Java Tutorial</a> * @see NumberFormat * @see DecimalFormatSymbols * @see ParsePosition
--- a/jdk/src/share/classes/java/text/SimpleDateFormat.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java Tue Oct 08 14:53:14 2013 -0700 @@ -412,7 +412,7 @@ * If multiple threads access a format concurrently, it must be synchronized * externally. * - * @see <a href="http://java.sun.com/docs/books/tutorial/i18n/format/simpleDateFormat.html">Java Tutorial</a> + * @see <a href="http://docs.oracle.com/javase/tutorial/i18n/format/simpleDateFormat.html">Java Tutorial</a> * @see java.util.Calendar * @see java.util.TimeZone * @see DateFormat
--- a/jdk/src/share/classes/javax/management/Descriptor.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/management/Descriptor.java Tue Oct 08 14:53:14 2013 -0700 @@ -319,7 +319,7 @@ * <a href="modelmbean/ModelMBeanOperationInfo.html#descriptor"><!-- * -->{@code ModelMBeanOperationInfo}</a>, as * well as the chapter "Model MBeans" of the <a - * href="http://java.sun.com/products/JavaManagement/download.html">JMX + * href="http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html">JMX * Specification</a>. The following table summarizes these fields. Note * that when the Type in this table is Number, a String that is the decimal * representation of a Long can also be used.</p>
--- a/jdk/src/share/classes/javax/print/Doc.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/print/Doc.java Tue Oct 08 14:53:14 2013 -0700 @@ -65,8 +65,8 @@ * representation object "consumes" the print data as the caller obtains the * print data, such as a print data representation object which is a stream. * Once the Print Job has called {@link #getPrintData() - * <CODE>getPrintData()</CODE>} and obtained the stream, any further calls to - * {@link #getPrintData() <CODE>getPrintData()</CODE>} will return the same + * getPrintData()} and obtained the stream, any further calls to + * {@link #getPrintData() getPrintData()} will return the same * stream object upon which reading may already be in progress, <I>not</I> a new * stream object that will re-read the print data from the beginning. Specifying * a doc object to behave this way simplifies the implementation of doc objects, @@ -83,7 +83,7 @@ * object is constructed. In this case the doc object might provide a "lazy" * implementation that generates the print data representation object (and/or * the print data) only when the Print Job calls for it (when the Print Job - * calls the {@link #getPrintData() <CODE>getPrintData()</CODE>} method). + * calls the {@link #getPrintData() getPrintData()} method). * <P> * There is no restriction on the number of client threads that may be * simultaneously accessing the same doc. Therefore, all implementations of
--- a/jdk/src/share/classes/javax/print/DocFlavor.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/print/DocFlavor.java Tue Oct 08 14:53:14 2013 -0700 @@ -53,7 +53,7 @@ * <LI> * <B>Representation class name.</B> This specifies the fully-qualified name of * the class of the object from which the actual print data comes, as returned - * by the {@link java.lang.Class#getName() <CODE>Class.getName()</CODE>} method. + * by the {@link java.lang.Class#getName() Class.getName()} method. * (Thus the class name for <CODE>byte[]</CODE> is <CODE>"[B"</CODE>, for * <CODE>char[]</CODE> it is <CODE>"[C"</CODE>.) * </UL> @@ -174,7 +174,7 @@ * platform for data (eg files) stored in that platform's encoding. * A CharSet which corresponds to this and is suitable for use in a * mime-type for a DocFlavor can be obtained - * from {@link DocFlavor#hostEncoding <CODE>DocFlavor.hostEncoding</CODE>} + * from {@link DocFlavor#hostEncoding DocFlavor.hostEncoding} * This may not always be the primary IANA name but is guaranteed to be * understood by this VM. * For common flavors, the pre-defined *HOST DocFlavors may be used. @@ -669,7 +669,7 @@ /** * Doc flavor with MIME type = <CODE>"text/plain"</CODE>, * encoded in the host platform encoding. - * See {@link DocFlavor#hostEncoding <CODE>hostEncoding</CODE>} + * See {@link DocFlavor#hostEncoding hostEncoding} * Print data representation class name = * <CODE>"[B"</CODE> (byte array). */ @@ -728,7 +728,7 @@ /** * Doc flavor with MIME type = <CODE>"text/html"</CODE>, * encoded in the host platform encoding. - * See {@link DocFlavor#hostEncoding <CODE>hostEncoding</CODE>} + * See {@link DocFlavor#hostEncoding hostEncoding} * Print data representation class name = * <CODE>"[B"</CODE> (byte array). */ @@ -838,7 +838,7 @@ /** * Class DocFlavor.INPUT_STREAM provides predefined static constant * DocFlavor objects for example doc flavors using a byte stream ({@link - * java.io.InputStream <CODE>java.io.InputStream</CODE>}) as the print + * java.io.InputStream java.io.InputStream}) as the print * data representation class. * <P> * @@ -868,7 +868,7 @@ /** * Doc flavor with MIME type = <CODE>"text/plain"</CODE>, * encoded in the host platform encoding. - * See {@link DocFlavor#hostEncoding <CODE>hostEncoding</CODE>} + * See {@link DocFlavor#hostEncoding hostEncoding} * Print data representation class name = * <CODE>"java.io.InputStream"</CODE> (byte stream). */ @@ -925,7 +925,7 @@ /** * Doc flavor with MIME type = <CODE>"text/html"</CODE>, * encoded in the host platform encoding. - * See {@link DocFlavor#hostEncoding <CODE>hostEncoding</CODE>} + * See {@link DocFlavor#hostEncoding hostEncoding} * Print data representation class name = * <CODE>"java.io.InputStream"</CODE> (byte stream). */ @@ -1041,7 +1041,7 @@ * Class DocFlavor.URL provides predefined static constant DocFlavor * objects. * For example doc flavors using a Uniform Resource Locator ({@link - * java.net.URL <CODE>java.net.URL</CODE>}) as the print data + * java.net.URL java.net.URL}) as the print data * representation class. * <P> * @@ -1068,7 +1068,7 @@ /** * Doc flavor with MIME type = <CODE>"text/plain"</CODE>, * encoded in the host platform encoding. - * See {@link DocFlavor#hostEncoding <CODE>hostEncoding</CODE>} + * See {@link DocFlavor#hostEncoding hostEncoding} * Print data representation class name = * <CODE>"java.net.URL"</CODE> (byte stream). */ @@ -1125,7 +1125,7 @@ /** * Doc flavor with MIME type = <CODE>"text/html"</CODE>, * encoded in the host platform encoding. - * See {@link DocFlavor#hostEncoding <CODE>hostEncoding</CODE>} + * See {@link DocFlavor#hostEncoding hostEncoding} * Print data representation class name = * <CODE>"java.net.URL"</CODE> (byte stream). */ @@ -1280,7 +1280,7 @@ /** * Class DocFlavor.STRING provides predefined static constant DocFlavor * objects for example doc flavors using a string ({@link java.lang.String - * <CODE>java.lang.String</CODE>}) as the print data representation class. + * java.lang.String}) as the print data representation class. * As such, the character set is Unicode. * <P> * @@ -1328,7 +1328,7 @@ /** * Class DocFlavor.READER provides predefined static constant DocFlavor * objects for example doc flavors using a character stream ({@link - * java.io.Reader <CODE>java.io.Reader</CODE>}) as the print data + * java.io.Reader java.io.Reader}) as the print data * representation class. As such, the character set is Unicode. * <P> *
--- a/jdk/src/share/classes/javax/print/MultiDoc.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/print/MultiDoc.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,9 +39,9 @@ * docs. A multidoc object is like a node in the linked list, containing the * current doc in the list and a pointer to the next node (multidoc) in the * list. The Print Job can call the multidoc's {@link #getDoc() - * <CODE>getDoc()</CODE>} method to get the current doc. When it's ready to go + * getDoc()} method to get the current doc. When it's ready to go * on to the next doc, the Print Job can call the multidoc's {@link #next() - * <CODE>next()</CODE>} method to get the next multidoc, which contains the + * next()} method to get the next multidoc, which contains the * next doc. So Print Job code for accessing a multidoc might look like this: * <PRE> * void processMultiDoc(MultiDoc theMultiDoc) { @@ -88,12 +88,12 @@ * multiple docs to a Print Job, every Print Service proxy that supports * multidoc print jobs is required to access a MultiDoc object using the * interleaved pattern. That is, given a MultiDoc object, the print service - * proxy will call {@link #getDoc() <CODE>getDoc()</CODE>} one or more times + * proxy will call {@link #getDoc() getDoc()} one or more times * until it successfully obtains the current Doc object. The print service proxy * will then obtain the current doc's print data, not proceeding until all the * print data is obtained or an unrecoverable error occurs. If it is able to * continue, the print service proxy will then call {@link #next() - * <CODE>next()</CODE>} one or more times until it successfully obtains either + * next()} one or more times until it successfully obtains either * the next MultiDoc object or an indication that there are no more. An * implementation of interface MultiDoc can assume the print service proxy will * follow this interleaved pattern; for any other pattern of usage, the MultiDoc
--- a/jdk/src/share/classes/javax/print/attribute/standard/Finishings.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/print/attribute/standard/Finishings.java Tue Oct 08 14:53:14 2013 -0700 @@ -42,16 +42,16 @@ * Standard Finishings values are: * <TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=100% SUMMARY="layout"> * <TR> - * <TD WIDTH=10%> + * <TD STYLE="WIDTH:10%"> * * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #NONE NONE} * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #STAPLE STAPLE} * </TD> - * <TD WIDTH=36%> + * <TD STYLE="WIDTH:36%"> * {@link #EDGE_STITCH EDGE_STITCH} * </TD> * </TR> @@ -78,70 +78,70 @@ * corner or an edge as if the document were a portrait document: * <TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=100% SUMMARY="layout"> * <TR> - * <TD WIDTH=10%> + * <TD STYLE="WIDTH:10%"> * * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #STAPLE_TOP_LEFT STAPLE_TOP_LEFT} * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #EDGE_STITCH_LEFT EDGE_STITCH_LEFT} * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #STAPLE_DUAL_LEFT STAPLE_DUAL_LEFT} * </TD> - * <TD WIDTH=9%> + * <TD STYLE="WIDTH:9%"> * * </TD> * </TR> * <TR> - * <TD WIDTH=10%> + * <TD STYLE="WIDTH:10%"> * * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #STAPLE_BOTTOM_LEFT STAPLE_BOTTOM_LEFT} * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #EDGE_STITCH_TOP EDGE_STITCH_TOP} * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #STAPLE_DUAL_TOP STAPLE_DUAL_TOP} * </TD> - * <TD WIDTH=9%> + * <TD STYLE="WIDTH:9%"> * * </TD> * </TR> * <TR> - * <TD WIDTH=10%> + * <TD STYLE="WIDTH:10%"> * * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #STAPLE_TOP_RIGHT STAPLE_TOP_RIGHT} * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #EDGE_STITCH_RIGHT EDGE_STITCH_RIGHT} * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #STAPLE_DUAL_RIGHT STAPLE_DUAL_RIGHT} * </TD> - * <TD WIDTH=9%> + * <TD STYLE="WIDTH:9%"> * * </TD> * </TR> * <TR> - * <TD WIDTH=10%> + * <TD STYLE="WIDTH:10%"> * * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #STAPLE_BOTTOM_RIGHT STAPLE_BOTTOM_RIGHT} * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #EDGE_STITCH_BOTTOM EDGE_STITCH_BOTTOM} * </TD> - * <TD WIDTH=27%> + * <TD STYLE="WIDTH:27%"> * {@link #STAPLE_DUAL_BOTTOM STAPLE_DUAL_BOTTOM} * </TD> - * <TD WIDTH=9%> + * <TD STYLE="WIDTH:9%"> * * </TD> * </TR>
--- a/jdk/src/share/classes/javax/print/attribute/standard/JobStateReasons.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/print/attribute/standard/JobStateReasons.java Tue Oct 08 14:53:14 2013 -0700 @@ -110,7 +110,7 @@ * The underlying hash set's initial capacity and load factor are as * specified in the superclass constructor {@link * java.util.HashSet#HashSet(java.util.Collection) - * <CODE>HashSet(Collection)</CODE>}. + * HashSet(Collection)}. * * @param collection Collection to copy. *
--- a/jdk/src/share/classes/javax/print/attribute/standard/MediaPrintableArea.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaPrintableArea.java Tue Oct 08 14:53:14 2013 -0700 @@ -56,7 +56,7 @@ * any specified finishings. * <code>PrintService</code> provides the method to query the supported * values of an attribute in a suitable context : - * See {@link javax.print.PrintService#getSupportedAttributeValues(Class,DocFlavor, AttributeSet) <code>PrintService.getSupportedAttributeValues()</code>} + * See {@link javax.print.PrintService#getSupportedAttributeValues(Class,DocFlavor, AttributeSet) PrintService.getSupportedAttributeValues()} * <p> * The rectangular printable area is defined thus: * The (x,y) origin is positioned at the top-left of the paper in portrait @@ -153,8 +153,8 @@ * Get the printable area as an array of 4 values in the order * x, y, w, h. The values returned are in the given units. * @param units - * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or - * {@link #MM <CODE>MM</CODE>}. + * Unit conversion factor, e.g. {@link #INCH INCH} or + * {@link #MM MM}. * * @return printable area as array of x, y, w, h in the specified units. * @@ -170,8 +170,8 @@ * Get the x location of the origin of the printable area in the * specified units. * @param units - * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or - * {@link #MM <CODE>MM</CODE>}. + * Unit conversion factor, e.g. {@link #INCH INCH} or + * {@link #MM MM}. * * @return x location of the origin of the printable area in the * specified units. @@ -187,8 +187,8 @@ * Get the y location of the origin of the printable area in the * specified units. * @param units - * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or - * {@link #MM <CODE>MM</CODE>}. + * Unit conversion factor, e.g. {@link #INCH INCH} or + * {@link #MM MM}. * * @return y location of the origin of the printable area in the * specified units. @@ -203,8 +203,8 @@ /** * Get the width of the printable area in the specified units. * @param units - * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or - * {@link #MM <CODE>MM</CODE>}. + * Unit conversion factor, e.g. {@link #INCH INCH} or + * {@link #MM MM}. * * @return width of the printable area in the specified units. * @@ -218,8 +218,8 @@ /** * Get the height of the printable area in the specified units. * @param units - * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or - * {@link #MM <CODE>MM</CODE>}. + * Unit conversion factor, e.g. {@link #INCH INCH} or + * {@link #MM MM}. * * @return height of the printable area in the specified units. * @@ -292,8 +292,8 @@ * given units. * * @param units - * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or - * {@link #MM <CODE>MM</CODE>}. + * Unit conversion factor, e.g. {@link #INCH INCH} or + * {@link #MM MM}. * @param unitsName * Units name string, e.g. <CODE>"in"</CODE> or <CODE>"mm"</CODE>. If * null, no units name is appended to the result.
--- a/jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java Tue Oct 08 14:53:14 2013 -0700 @@ -71,7 +71,7 @@ * <UL> * <LI> * <A NAME="sdfi">{@link #SINGLE_DOCUMENT - * <B><CODE>SINGLE_DOCUMENT</CODE></B>}</A>. If a print job has multiple + * <B>SINGLE_DOCUMENT</B>}</A>. If a print job has multiple * documents -- say, the document data is called <CODE>a</CODE> and * <CODE>b</CODE> -- then the result of processing all the document data * (<CODE>a</CODE> and then <CODE>b</CODE>) must be treated as a single sequence @@ -86,7 +86,7 @@ * <P> * <LI> * <A NAME="sducfi">{@link #SEPARATE_DOCUMENTS_UNCOLLATED_COPIES - * <B><CODE>SEPARATE_DOCUMENTS_UNCOLLATED_COPIES</CODE></B>}</A>. If a print job + * <B>SEPARATE_DOCUMENTS_UNCOLLATED_COPIES</B>}</A>. If a print job * has multiple documents -- say, the document data is called <CODE>a</CODE> and * <CODE>b</CODE> -- then the result of processing the data in each document * instance must be treated as a single sequence of media sheets for finishing @@ -99,7 +99,7 @@ * <P> * <LI> * <A NAME="sdccfi">{@link #SEPARATE_DOCUMENTS_COLLATED_COPIES - * <B><CODE>SEPARATE_DOCUMENTS_COLLATED_COPIES</CODE></B>}</A>. If a print job + * <B>SEPARATE_DOCUMENTS_COLLATED_COPIES</B>}</A>. If a print job * has multiple documents -- say, the document data is called <CODE>a</CODE> and * <CODE>b</CODE> -- then the result of processing the data in each document * instance must be treated as a single sequence of media sheets for finishing @@ -112,7 +112,7 @@ * <P> * <LI> * <A NAME="sdnsfi">{@link #SINGLE_DOCUMENT_NEW_SHEET - * <B><CODE>SINGLE_DOCUMENT_NEW_SHEET</CODE></B>}</A>. Same as SINGLE_DOCUMENT, + * <B>SINGLE_DOCUMENT_NEW_SHEET</B>}</A>. Same as SINGLE_DOCUMENT, * except that the printer must ensure that the first impression of each * document instance in the job is placed on a new media sheet. This value * allows multiple documents to be stapled together with a single staple where @@ -127,7 +127,7 @@ * next document or document copy on to a new sheet. * <P> * In addition, if a {@link Finishings Finishings} attribute of - * {@link Finishings#STAPLE <CODE>STAPLE</CODE>} is specified, then: + * {@link Finishings#STAPLE STAPLE} is specified, then: * <UL> * <LI> * With SINGLE_DOCUMENT, documents <CODE>a</CODE> and <CODE>b</CODE> are
--- a/jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java Tue Oct 08 14:53:14 2013 -0700 @@ -129,7 +129,7 @@ * Severity} mappings as the given map. The underlying hash map's initial * capacity and load factor are as specified in the superclass constructor * {@link java.util.HashMap#HashMap(java.util.Map) - * <CODE>HashMap(Map)</CODE>}. + * HashMap(Map)}. * * @param map Map to copy. *
--- a/jdk/src/share/classes/javax/print/attribute/standard/Sides.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/print/attribute/standard/Sides.java Tue Oct 08 14:53:14 2013 -0700 @@ -134,7 +134,7 @@ * sides of consecutive media sheets, such that the orientation of each * pair of print-stream pages on the medium would be correct for the * reader as if for binding on the long edge. This imposition is also - * known as "duplex" (see {@link #DUPLEX <CODE>DUPLEX</CODE>}). + * known as "duplex" (see {@link #DUPLEX DUPLEX}). */ public static final Sides TWO_SIDED_LONG_EDGE = new Sides(1); @@ -143,19 +143,19 @@ * sides of consecutive media sheets, such that the orientation of each * pair of print-stream pages on the medium would be correct for the * reader as if for binding on the short edge. This imposition is also - * known as "tumble" (see {@link #TUMBLE <CODE>TUMBLE</CODE>}). + * known as "tumble" (see {@link #TUMBLE TUMBLE}). */ public static final Sides TWO_SIDED_SHORT_EDGE = new Sides(2); /** * An alias for "two sided long edge" (see {@link #TWO_SIDED_LONG_EDGE - * <CODE>TWO_SIDED_LONG_EDGE</CODE>}). + * TWO_SIDED_LONG_EDGE}). */ public static final Sides DUPLEX = TWO_SIDED_LONG_EDGE; /** * An alias for "two sided short edge" (see {@link #TWO_SIDED_SHORT_EDGE - * <CODE>TWO_SIDED_SHORT_EDGE</CODE>}). + * TWO_SIDED_SHORT_EDGE}). */ public static final Sides TUMBLE = TWO_SIDED_SHORT_EDGE;
--- a/jdk/src/share/classes/javax/swing/AbstractAction.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/AbstractAction.java Tue Oct 08 14:53:14 2013 -0700 @@ -49,7 +49,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/AbstractButton.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/AbstractButton.java Tue Oct 08 14:53:14 2013 -0700 @@ -53,12 +53,12 @@ * configuring a button. Refer to <a href="Action.html#buttonActions"> * Swing Components Supporting <code>Action</code></a> for more * details, and you can find more information in <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/misc/action.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/misc/action.html">How * to Use Actions</a>, a section in <em>The Java Tutorial</em>. * <p> * For further information see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/button.html">How to Use Buttons, Check Boxes, and Radio Buttons</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/button.html">How to Use Buttons, Check Boxes, and Radio Buttons</a>, * a section in <em>The Java Tutorial</em>. * <p> * <strong>Warning:</strong> @@ -66,7 +66,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1973,7 +1973,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -2379,7 +2379,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @since 1.4
--- a/jdk/src/share/classes/javax/swing/AbstractCellEditor.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/AbstractCellEditor.java Tue Oct 08 14:53:14 2013 -0700 @@ -43,7 +43,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/AbstractListModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/AbstractListModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -38,7 +38,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/BorderFactory.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/BorderFactory.java Tue Oct 08 14:53:14 2013 -0700 @@ -35,7 +35,7 @@ * possible, this factory will hand out references to shared * <code>Border</code> instances. * For further information and examples see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/border.html">How + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/border.htmll">How to Use Borders</a>, * a section in <em>The Java Tutorial</em>. *
--- a/jdk/src/share/classes/javax/swing/BoundedRangeModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/BoundedRangeModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -71,8 +71,8 @@ * * For an example of specifying custom bounded range models used by sliders, * see <a - href="http://java.sun.com/docs/books/tutorial/uiswing/overview/anatomy.html">The Anatomy of a Swing-Based Program</a> - * in <em>The Java Tutorial.</em> + href="http://www.oracle.com/technetwork/java/architecture-142923.html#separable">Separable model architecture</a> + * in <em>A Swing Architecture Overview.</em> * * @author Hans Muller * @see DefaultBoundedRangeModel
--- a/jdk/src/share/classes/javax/swing/Box.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/Box.java Tue Oct 08 14:53:14 2013 -0700 @@ -60,7 +60,7 @@ * If you are implementing a <code>BoxLayout</code> you * can find further information and examples in * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/layout/box.html">How to Use BoxLayout</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/layout/box.html">How to Use BoxLayout</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> @@ -68,7 +68,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -298,7 +298,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/BoxLayout.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/BoxLayout.java Tue Oct 08 14:53:14 2013 -0700 @@ -36,12 +36,12 @@ * vertically or horizontally. The components will not wrap so, for * example, a vertical arrangement of components will stay vertically * arranged when the frame is resized. - * <TABLE ALIGN="RIGHT" BORDER="0" SUMMARY="layout"> + * <TABLE STYLE="FLOAT:RIGHT" BORDER="0" SUMMARY="layout"> * <TR> * <TD ALIGN="CENTER"> - * <P ALIGN="CENTER"><IMG SRC="doc-files/BoxLayout-1.gif" + * <P STYLE="TEXT-ALIGN:CENTER"><IMG SRC="doc-files/BoxLayout-1.gif" * alt="The following text describes this graphic." - * WIDTH="191" HEIGHT="201" ALIGN="BOTTOM" BORDER="0"> + * WIDTH="191" HEIGHT="201" STYLE="FLOAT:BOTTOM; BORDER:0"> * </TD> * </TR> * </TABLE> @@ -116,7 +116,7 @@ * <p> * For further information and examples see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/layout/box.html">How to Use BoxLayout</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/layout/box.html">How to Use BoxLayout</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> @@ -124,7 +124,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/ButtonGroup.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/ButtonGroup.java Tue Oct 08 14:53:14 2013 -0700 @@ -51,7 +51,7 @@ * Initially, all buttons in the group are unselected. * <p> * For examples and further information on using button groups see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/button.html#radiobutton">How to Use Radio Buttons</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/button.html#radiobutton">How to Use Radio Buttons</a>, * a section in <em>The Java Tutorial</em>. * <p> * <strong>Warning:</strong> @@ -59,7 +59,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/CellRendererPane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/CellRendererPane.java Tue Oct 08 14:53:14 2013 -0700 @@ -57,7 +57,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/DefaultBoundedRangeModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/DefaultBoundedRangeModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -37,7 +37,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/DefaultButtonModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/DefaultButtonModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/DefaultCellEditor.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/DefaultCellEditor.java Tue Oct 08 14:53:14 2013 -0700 @@ -43,7 +43,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/DefaultFocusManager.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/DefaultFocusManager.java Tue Oct 08 14:53:14 2013 -0700 @@ -37,7 +37,7 @@ * <code>java.awt.DefaultKeyboardFocusManager</code> instead. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>, and the * <a href="../../java/awt/doc-files/FocusSpec.html">Focus Specification</a>
--- a/jdk/src/share/classes/javax/swing/DefaultListCellRenderer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/DefaultListCellRenderer.java Tue Oct 08 14:53:14 2013 -0700 @@ -63,7 +63,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -337,7 +337,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/DefaultListModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/DefaultListModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -41,7 +41,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/DefaultSingleSelectionModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/DefaultSingleSelectionModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -37,7 +37,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/FocusManager.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/FocusManager.java Tue Oct 08 14:53:14 2013 -0700 @@ -34,7 +34,7 @@ * <code>java.awt.DefaultKeyboardFocusManager</code> instead. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>, and the * <a href="../../java/awt/doc-files/FocusSpec.html">Focus Specification</a>
--- a/jdk/src/share/classes/javax/swing/ImageIcon.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/ImageIcon.java Tue Oct 08 14:53:14 2013 -0700 @@ -50,7 +50,7 @@ * * <p> * For further information and examples of using image icons, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/icon.html">How to Use Icons</a> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/icon.html">How to Use Icons</a> * in <em>The Java Tutorial.</em> * * <p> @@ -59,7 +59,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -555,7 +555,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @since 1.3
--- a/jdk/src/share/classes/javax/swing/JApplet.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JApplet.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * in <em>The Java Tutorial</em>, * in the section * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/applet.html">How to Make Applets</a>. + href="http://docs.oracle.com/javase/tutorial/uiswing/components/applet.html">How to Make Applets</a>. * <p> * The <code>JApplet</code> class is slightly incompatible with * <code>java.applet.Applet</code>. <code>JApplet</code> contains a @@ -77,7 +77,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -183,7 +183,7 @@ * are currently typed to {@code JComponent}. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/dnd.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/dnd/index.html"> * How to Use Drag and Drop and Data Transfer</a>, a section in * <em>The Java Tutorial</em>, for more information. *
--- a/jdk/src/share/classes/javax/swing/JButton.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JButton.java Tue Oct 08 14:53:14 2013 -0700 @@ -48,10 +48,10 @@ * configuring a button. Refer to <a href="Action.html#buttonActions"> * Swing Components Supporting <code>Action</code></a> for more * details, and you can find more information in <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/misc/action.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/misc/action.html">How * to Use Actions</a>, a section in <em>The Java Tutorial</em>. * <p> - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/button.html">How to Use Buttons, Check Boxes, and Radio Buttons</a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/button.html">How to Use Buttons, Check Boxes, and Radio Buttons</a> * in <em>The Java Tutorial</em> * for information and examples of using buttons. * <p> @@ -65,7 +65,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -304,7 +304,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JCheckBox.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JCheckBox.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * An implementation of a check box -- an item that can be selected or * deselected, and which displays its state to the user. * By convention, any number of check boxes in a group can be selected. - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/button.html">How to Use Buttons, Check Boxes, and Radio Buttons</a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/button.html">How to Use Buttons, Check Boxes, and Radio Buttons</a> * in <em>The Java Tutorial</em> * for examples and information on using check boxes. * <p> @@ -50,7 +50,7 @@ * configuring a button. Refer to <a href="Action.html#buttonActions"> * Swing Components Supporting <code>Action</code></a> for more * details, and you can find more information in <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/misc/action.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/misc/action.html">How * to Use Actions</a>, a section in <em>The Java Tutorial</em>. * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -63,7 +63,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -330,7 +330,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JCheckBoxMenuItem.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JCheckBoxMenuItem.java Tue Oct 08 14:53:14 2013 -0700 @@ -59,12 +59,12 @@ * configuring a menu item. Refer to <a href="Action.html#buttonActions"> * Swing Components Supporting <code>Action</code></a> for more * details, and you can find more information in <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/misc/action.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/misc/action.html">How * to Use Actions</a>, a section in <em>The Java Tutorial</em>. * <p> * For further information and examples of using check box menu items, * see <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/menu.html">How to Use Menus</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/menu.html">How to Use Menus</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -77,7 +77,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -289,7 +289,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JColorChooser.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JColorChooser.java Tue Oct 08 14:53:14 2013 -0700 @@ -42,7 +42,7 @@ * a user to manipulate and select a color. * For information about using color choosers, see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/colorchooser.html">How to Use Color Choosers</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/colorchooser.html">How to Use Color Choosers</a>, * a section in <em>The Java Tutorial</em>. * * <p> @@ -69,7 +69,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/JComboBox.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JComboBox.java Tue Oct 08 14:53:14 2013 -0700 @@ -57,13 +57,13 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * * <p> - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/combobox.html">How to Use Combo Boxes</a> - * in <a href="http://java.sun.com/Series/Tutorial/index.html"><em>The Java Tutorial</em></a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/combobox.html">How to Use Combo Boxes</a> + * in <a href="http://docs.oracle.com/javase/tutorial/"><em>The Java Tutorial</em></a> * for further information. * <p> * @see ComboBoxModel @@ -350,9 +350,7 @@ * by the look and feel. Some look and feels always use * heavyweight popups, no matter what the value of this property. * <p> - * See the article <a href="http://java.sun.com/products/jfc/tsc/articles/mixing/index.html">Mixing Heavy and Light Components</a> - * on <a href="http://java.sun.com/products/jfc/tsc"> - * <em>The Swing Connection</em></a> + * See the article <a href="http://www.oracle.com/technetwork/articles/java/mixing-components-433992.html">Mixing Heavy and Light Components</a> * This method fires a property changed event. * * @param aFlag if <code>true</code>, lightweight popups are desired @@ -1610,7 +1608,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JComponent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JComponent.java Tue Oct 08 14:53:14 2013 -0700 @@ -78,7 +78,7 @@ * that provide a place for other Swing components to paint themselves. * For an explanation of containment hierarchies, see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/overview/hierarchy.html">Swing Components and the Containment Hierarchy</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/toplevel.html">Swing Components and the Containment Hierarchy</a>, * a section in <em>The Java Tutorial</em>. * * <p> @@ -92,21 +92,20 @@ * <em>UI delegate</em> -- an object that descends from * {@link javax.swing.plaf.ComponentUI}. * See <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/misc/plaf.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html">How * to Set the Look and Feel</a> * in <em>The Java Tutorial</em> * for more information. * <li>Comprehensive keystroke handling. * See the document <a - * href="http://java.sun.com/products/jfc/tsc/special_report/kestrel/keybindings.html">Keyboard - * Bindings in Swing</a>, - * an article in <em>The Swing Connection</em>, + * href="http://docs.oracle.com/javase/tutorial/uiswing/misc/keybinding.html">How to Use Key Bindings</a>, + * an article in <em>The Java Tutorial</em>, * for more information. * <li>Support for tool tips -- * short descriptions that pop up when the cursor lingers * over a component. * See <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/components/tooltip.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/components/tooltip.html">How * to Use Tool Tips</a> * in <em>The Java Tutorial</em> * for more information. @@ -124,15 +123,15 @@ * <li>An infrastructure for painting * that includes double buffering and support for borders. * For more information see <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/overview/draw.html">Painting</a> and - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/border.html">How + * href="http://www.oracle.com/technetwork/java/painting-140037.html#swing">Painting</a> and + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/border.htmll">How * to Use Borders</a>, * both of which are sections in <em>The Java Tutorial</em>. * </ul> * For more information on these subjects, see the * <a href="package-summary.html#package_description">Swing package description</a> * and <em>The Java Tutorial</em> section - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/jcomponent.html">The JComponent Class</a>. + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/jcomponent.html">The JComponent Class</a>. * <p> * <code>JComponent</code> and its subclasses document default values * for certain properties. For example, <code>JTable</code> documents the @@ -150,7 +149,7 @@ * <p> * In release 1.4, the focus subsystem was rearchitected. * For more information, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>. * <p> @@ -164,7 +163,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1291,7 +1290,7 @@ /** * In release 1.4, the focus subsystem was rearchitected. * For more information, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>. * <p> @@ -1353,7 +1352,7 @@ /** * In release 1.4, the focus subsystem was rearchitected. * For more information, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>. * <p> @@ -1386,7 +1385,7 @@ /** * In release 1.4, the focus subsystem was rearchitected. * For more information, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>. * <p> @@ -1419,7 +1418,7 @@ * all, use the <code>setFocusable</code> method instead. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>, * for more information. @@ -1438,7 +1437,7 @@ * get focus; otherwise returns <code>false</code>. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>, * for more information. @@ -1464,7 +1463,7 @@ * its behavior is platform dependent. Instead we recommend the * use of {@link #requestFocusInWindow() requestFocusInWindow()}. * If you would like more information on focus, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>. * @@ -1487,7 +1486,7 @@ * use of {@link #requestFocusInWindow(boolean) * requestFocusInWindow(boolean)}. * If you would like more information on focus, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>. * @@ -1509,7 +1508,7 @@ * this method. * <p> * If you would like more information on focus, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>. * @@ -1530,7 +1529,7 @@ * this method. * <p> * If you would like more information on focus, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>. * @@ -2595,7 +2594,7 @@ /** * In release 1.4, the focus subsystem was rearchitected. * For more information, see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html"> * How to Use the Focus Subsystem</a>, * a section in <em>The Java Tutorial</em>. * <p> @@ -2986,7 +2985,7 @@ * Registers the text to display in a tool tip. * The text displays when the cursor lingers over the component. * <p> - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/tooltip.html">How to Use Tool Tips</a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/tooltip.html">How to Use Tool Tips</a> * in <em>The Java Tutorial</em> * for further documentation. * @@ -3206,7 +3205,7 @@ * default value for the system property is {@code false}. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/dnd.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/dnd/index.html"> * How to Use Drag and Drop and Data Transfer</a>, * a section in <em>The Java Tutorial</em>, for more information. * @@ -3654,7 +3653,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JDesktopPane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JDesktopPane.java Tue Oct 08 14:53:14 2013 -0700 @@ -63,7 +63,7 @@ * (closing, resizing, etc). * <p> * For further documentation and examples see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/internalframe.html">How to Use Internal Frames</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/internalframe.html">How to Use Internal Frames</a>, * a section in <em>The Java Tutorial</em>. * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -76,7 +76,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -612,7 +612,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JDialog.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JDialog.java Tue Oct 08 14:53:14 2013 -0700 @@ -35,7 +35,7 @@ * For information about creating dialogs, see * <em>The Java Tutorial</em> section * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/dialog.html">How + href="http://docs.oracle.com/javase/tutorial/uiswing/components/dialog.html">How * to Make Dialogs</a>. * * <p> @@ -77,7 +77,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the {@code java.beans} package. * Please see {@link java.beans.XMLEncoder}. * @@ -786,7 +786,7 @@ * are currently typed to {@code JComponent}. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/dnd.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/dnd/index.html"> * How to Use Drag and Drop and Data Transfer</a>, a section in * <em>The Java Tutorial</em>, for more information. *
--- a/jdk/src/share/classes/javax/swing/JEditorPane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JEditorPane.java Tue Oct 08 14:53:14 2013 -0700 @@ -43,7 +43,7 @@ /** * A text component to edit various kinds of content. * You can find how-to information and examples of using editor panes in - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/text.html">Using Text Components</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/text.html">Using Text Components</a>, * a section in <em>The Java Tutorial.</em> * * <p> @@ -179,7 +179,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1636,7 +1636,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1690,7 +1690,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JFileChooser.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JFileChooser.java Tue Oct 08 14:53:14 2013 -0700 @@ -57,7 +57,7 @@ * choose a file. * For information about using <code>JFileChooser</code>, see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/filechooser.html">How to Use File Choosers</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/filechooser.html">How to Use File Choosers</a>, * a section in <em>The Java Tutorial</em>. * * <p>
--- a/jdk/src/share/classes/javax/swing/JFormattedTextField.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JFormattedTextField.java Tue Oct 08 14:53:14 2013 -0700 @@ -54,7 +54,7 @@ * configuring what action should be taken when focus is lost. The possible * configurations are: * <table summary="Possible JFormattedTextField configurations and their descriptions"> - * <tr><th><p align="left">Value</p></th><th><p align="left">Description</p></th></tr> + * <tr><th><p style="text-align:left">Value</p></th><th><p style="text-align:left">Description</p></th></tr> * <tr><td>JFormattedTextField.REVERT * <td>Revert the display to match that of <code>getValue</code>, * possibly losing the current edit. @@ -171,7 +171,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/JFrame.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JFrame.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * You can find task-oriented documentation about using <code>JFrame</code> * in <em>The Java Tutorial</em>, in the section * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/frame.html">How to Make Frames</a>. + href="http://docs.oracle.com/javase/tutorial/uiswing/components/frame.html">How to Make Frames</a>. * * <p> * The <code>JFrame</code> class is slightly incompatible with <code>Frame</code>. @@ -77,7 +77,7 @@ * For more information on content panes * and other features that root panes provide, * see <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/toplevel.html">Using Top-Level Containers</a> in <em>The Java Tutorial</em>. + href="http://docs.oracle.com/javase/tutorial/uiswing/components/toplevel.html">Using Top-Level Containers</a> in <em>The Java Tutorial</em>. * <p> * In a multi-screen environment, you can create a <code>JFrame</code> * on a different screen device. See {@link java.awt.Frame} for more @@ -93,7 +93,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -430,7 +430,7 @@ * are currently typed to {@code JComponent}. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/dnd.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/dnd/index.html"> * How to Use Drag and Drop and Data Transfer</a>, a section in * <em>The Java Tutorial</em>, for more information. *
--- a/jdk/src/share/classes/javax/swing/JInternalFrame.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JInternalFrame.java Tue Oct 08 14:53:14 2013 -0700 @@ -50,7 +50,7 @@ * resizing, title display, and support for a menu bar. * For task-oriented documentation and examples of using internal frames, * see <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/internalframe.html" target="_top">How to Use Internal Frames</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/internalframe.html" target="_top">How to Use Internal Frames</a>, * a section in <em>The Java Tutorial</em>. * * <p> @@ -90,7 +90,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -2029,7 +2029,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -2144,7 +2144,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -2318,7 +2318,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JLabel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JLabel.java Tue Oct 08 14:53:14 2013 -0700 @@ -80,7 +80,7 @@ * should appear between the text and the image. * The default is 4 pixels. * <p> - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/label.html">How to Use Labels</a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/label.html">How to Use Labels</a> * in <em>The Java Tutorial</em> * for further documentation. * <p> @@ -94,7 +94,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1064,7 +1064,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JLayeredPane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JLayeredPane.java Tue Oct 08 14:53:14 2013 -0700 @@ -41,15 +41,15 @@ * container, where higher-numbered components sit "on top" of other * components. * For task-oriented documentation and examples of using layered panes see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/layeredpane.html">How to Use a Layered Pane</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/layeredpane.html">How to Use a Layered Pane</a>, * a section in <em>The Java Tutorial</em>. * <P> - * <TABLE ALIGN="RIGHT" BORDER="0" SUMMARY="layout"> + * <TABLE STYLE="FLOAT:RIGHT" BORDER="0" SUMMARY="layout"> * <TR> * <TD ALIGN="CENTER"> - * <P ALIGN="CENTER"><IMG SRC="doc-files/JLayeredPane-1.gif" + * <P STYLE="TEXT-ALIGN:CENTER"><IMG SRC="doc-files/JLayeredPane-1.gif" * alt="The following text describes this image." - * WIDTH="269" HEIGHT="264" ALIGN="BOTTOM" BORDER="0"> + * WIDTH="269" HEIGHT="264" STYLE="FLOAT:BOTTOM; BORDER=0"> * </TD> * </TR> * </TABLE> @@ -148,7 +148,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -765,7 +765,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JList.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JList.java Tue Oct 08 14:53:14 2013 -0700 @@ -253,15 +253,13 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * <p> - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/list.html">How to Use Lists</a> - * in <a href="http://java.sun.com/Series/Tutorial/index.html"><em>The Java Tutorial</em></a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/list.html">How to Use Lists</a> + * in <a href="http://docs.oracle.com/javase/tutorial/"><em>The Java Tutorial</em></a> * for further documentation. - * Also see the article <a href="http://java.sun.com/products/jfc/tsc/tech_topics/jlist_1/jlist.html">Advanced JList Programming</a> - * in <a href="http://java.sun.com/products/jfc/tsc"><em>The Swing Connection</em></a>. * <p> * @see ListModel * @see AbstractListModel @@ -972,7 +970,7 @@ * * <table border="1" * summary="Describes layouts VERTICAL, HORIZONTAL_WRAP, and VERTICAL_WRAP"> - * <tr><th><p align="left">Value</p></th><th><p align="left">Description</p></th></tr> + * <tr><th><p style="text-align:left">Value</p></th><th><p style="text-align:left">Description</p></th></tr> * <tr><td><code>VERTICAL</code> * <td>Cells are layed out vertically in a single column. * <tr><td><code>HORIZONTAL_WRAP</code> @@ -2879,7 +2877,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JMenu.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JMenu.java Tue Oct 08 14:53:14 2013 -0700 @@ -76,11 +76,11 @@ * configuring a menu. Refer to <a href="Action.html#buttonActions"> * Swing Components Supporting <code>Action</code></a> for more * details, and you can find more information in <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/misc/action.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/misc/action.html">How * to Use Actions</a>, a section in <em>The Java Tutorial</em>. * <p> * For information and examples of using menus see - * <a href="http://java.sun.com/doc/books/tutorial/uiswing/components/menu.html">How to Use Menus</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/menu.html">How to Use Menus</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -93,7 +93,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1149,7 +1149,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1386,7 +1386,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JMenuBar.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JMenuBar.java Tue Oct 08 14:53:14 2013 -0700 @@ -54,7 +54,7 @@ * <p> * For information and examples of using menu bars see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/menu.html">How to Use Menus</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/menu.html">How to Use Menus</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -67,7 +67,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * <p> @@ -502,7 +502,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JMenuItem.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JMenuItem.java Tue Oct 08 14:53:14 2013 -0700 @@ -54,12 +54,12 @@ * configuring a menu item. Refer to <a href="Action.html#buttonActions"> * Swing Components Supporting <code>Action</code></a> for more * details, and you can find more information in <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/misc/action.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/misc/action.html">How * to Use Actions</a>, a section in <em>The Java Tutorial</em>. * <p> * For further documentation and for examples, see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/menu.html">How to Use Menus</a> + href="http://docs.oracle.com/javase/tutorial/uiswing/components/menu.html">How to Use Menus</a> * in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -72,7 +72,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -826,7 +826,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JOptionPane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JOptionPane.java Tue Oct 08 14:53:14 2013 -0700 @@ -62,7 +62,7 @@ * prompts users for a value or informs them of something. * For information about using <code>JOptionPane</code>, see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/dialog.html">How to Make Dialogs</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/dialog.html">How to Make Dialogs</a>, * a section in <em>The Java Tutorial</em>. * * <p> @@ -108,16 +108,16 @@ * the caller until the user's interaction is complete. * <p> * - * <table cellspacing=6 cellpadding=4 border=0 align=right summary="layout"> + * <table cellspacing=6 cellpadding=4 border=0 style="float:right" summary="layout"> * <tr> - * <td bgcolor=#FFe0d0 rowspan=2>icon</td> - * <td bgcolor=#FFe0d0>message</td> + * <td style="background-color:#FFe0d0" rowspan=2>icon</td> + * <td style="background-color:#FFe0d0">message</td> * </tr> * <tr> - * <td bgcolor=#FFe0d0>input value</td> + * <td style="background-color:#FFe0d0">input value</td> * </tr> * <tr> - * <td bgcolor=#FFe0d0 colspan=2>option buttons</td> + * <td style="background-color:#FFe0d0" colspan=2>option buttons</td> * </tr> * </table> * @@ -127,7 +127,7 @@ * ultimately responsible for the final result. In particular, the * look-and-feels will adjust the layout to accommodate the option pane's * <code>ComponentOrientation</code> property. - * <br clear=all> + * <br style="clear:all"> * <p> * <b>Parameters:</b><br> * The parameters to these methods follow consistent patterns: @@ -298,7 +298,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -2573,7 +2573,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JPanel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JPanel.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * <code>JPanel</code> is a generic lightweight container. * For examples and task-oriented documentation for JPanel, see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/panel.html">How to Use Panels</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/panel.html">How to Use Panels</a>, * a section in <em>The Java Tutorial</em>. * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -52,7 +52,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -229,7 +229,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JPasswordField.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JPasswordField.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * the editing of a single line of text where the view indicates * something was typed, but does not show the original characters. * You can find further information and examples in - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/textfield.html">How to Use Text Fields</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/textfield.html">How to Use Text Fields</a>, * a section in <em>The Java Tutorial.</em> * <p> * <code>JPasswordField</code> is intended @@ -64,7 +64,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -399,7 +399,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JPopupMenu.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JPopupMenu.java Tue Oct 08 14:53:14 2013 -0700 @@ -58,7 +58,7 @@ * <p> * For information and examples of using popup menus, see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/menu.html">How to Use Menus</a> + href="http://docs.oracle.com/javase/tutorial/uiswing/components/menu.html">How to Use Menus</a> * in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -71,7 +71,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/JProgressBar.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JProgressBar.java Tue Oct 08 14:53:14 2013 -0700 @@ -100,7 +100,7 @@ * <p> * * For complete examples and further documentation see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/progress.html" target="_top">How to Monitor Progress</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/progress.html" target="_top">How to Monitor Progress</a>, * a section in <em>The Java Tutorial.</em> * * <p> @@ -114,7 +114,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -643,7 +643,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -910,7 +910,7 @@ * <p> * * See - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/progress.html" target="_top">How to Monitor Progress</a> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/progress.html" target="_top">How to Monitor Progress</a> * for examples of using indeterminate progress bars. * * @param newValue <code>true</code> if the progress bar @@ -1031,7 +1031,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JRadioButton.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JRadioButton.java Tue Oct 08 14:53:14 2013 -0700 @@ -57,10 +57,10 @@ * configuring a button. Refer to <a href="Action.html#buttonActions"> * Swing Components Supporting <code>Action</code></a> for more * details, and you can find more information in <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/misc/action.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/misc/action.html">How * to Use Actions</a>, a section in <em>The Java Tutorial</em>. * <p> - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/button.html">How to Use Buttons, Check Boxes, and Radio Buttons</a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/button.html">How to Use Buttons, Check Boxes, and Radio Buttons</a> * in <em>The Java Tutorial</em> * for further documentation. * <p> @@ -74,7 +74,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -280,7 +280,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JRadioButtonMenuItem.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JRadioButtonMenuItem.java Tue Oct 08 14:53:14 2013 -0700 @@ -53,12 +53,12 @@ * configuring a menu item. Refer to <a href="Action.html#buttonActions"> * Swing Components Supporting <code>Action</code></a> for more * details, and you can find more information in <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/misc/action.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/misc/action.html">How * to Use Actions</a>, a section in <em>The Java Tutorial</em>. * <p> * For further documentation and examples see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/menu.html">How to Use Menus</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/menu.html">How to Use Menus</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -71,7 +71,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -262,7 +262,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JRootPane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JRootPane.java Tue Oct 08 14:53:14 2013 -0700 @@ -43,13 +43,13 @@ * <code>JFrame</code>, <code>JDialog</code>, <code>JWindow</code>, * <code>JApplet</code>, and <code>JInternalFrame</code>. * For task-oriented information on functionality provided by root panes - * see <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/rootpane.html">How to Use Root Panes</a>, + * see <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/rootpane.html">How to Use Root Panes</a>, * a section in <em>The Java Tutorial</em>. * * <p> * The following image shows the relationships between * the classes that use root panes. - * <p align=center><img src="doc-files/JRootPane-1.gif" + * <p style="text-align:center"><img src="doc-files/JRootPane-1.gif" * alt="The following text describes this graphic." * HEIGHT=484 WIDTH=629></p> * The "heavyweight" components (those that delegate to a peer, or native @@ -69,7 +69,7 @@ * can be used to obtain the <code>JRootPane</code> that contains * a given component. * </blockquote> - * <table align="right" border="0" summary="layout"> + * <table style="float:right" border="0" summary="layout"> * <tr> * <td align="center"> * <img src="doc-files/JRootPane-2.gif" @@ -179,7 +179,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -898,7 +898,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1064,7 +1064,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JScrollBar.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JScrollBar.java Tue Oct 08 14:53:14 2013 -0700 @@ -67,7 +67,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -838,7 +838,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JScrollPane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JScrollPane.java Tue Oct 08 14:53:14 2013 -0700 @@ -50,16 +50,16 @@ * vertical and horizontal scroll bars, and optional row and * column heading viewports. * You can find task-oriented documentation of <code>JScrollPane</code> in - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/scrollpane.html">How to Use Scroll Panes</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/scrollpane.html">How to Use Scroll Panes</a>, * a section in <em>The Java Tutorial</em>. Note that * <code>JScrollPane</code> does not support heavyweight components. * <p> - * <TABLE ALIGN="RIGHT" BORDER="0" SUMMARY="layout"> + * <TABLE STYLE="FLOAT:RIGHT" BORDER="0" SUMMARY="layout"> * <TR> * <TD ALIGN="CENTER"> - * <P ALIGN="CENTER"><IMG SRC="doc-files/JScrollPane-1.gif" + * <P STYLE="TEXT-ALIGN:CENTER"><IMG SRC="doc-files/JScrollPane-1.gif" * alt="The following text describes this image." - * WIDTH="256" HEIGHT="248" ALIGN="BOTTOM" BORDER="0"> + * WIDTH="256" HEIGHT="248" STYLE="FLOAT:BOTTOM; BORDER:0px"> * </TD> * </TR> * </TABLE> @@ -146,7 +146,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -677,7 +677,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1437,7 +1437,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JSeparator.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JSeparator.java Tue Oct 08 14:53:14 2013 -0700 @@ -47,7 +47,7 @@ * * For more information and examples see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/menu.html">How to Use Menus</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/menu.html">How to Use Menus</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -60,7 +60,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -276,7 +276,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JSlider.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JSlider.java Tue Oct 08 14:53:14 2013 -0700 @@ -55,7 +55,7 @@ * <p> * For further information and examples see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/slider.html">How to Use Sliders</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/slider.html">How to Use Sliders</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -68,7 +68,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1425,7 +1425,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JSpinner.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JSpinner.java Tue Oct 08 14:53:14 2013 -0700 @@ -93,7 +93,7 @@ * </pre> * <p> * For information and examples of using spinner see - * <a href="http://java.sun.com/doc/books/tutorial/uiswing/components/spinner.html">How to Use Spinners</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/spinner.html">How to Use Spinners</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -106,7 +106,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/JSplitPane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JSplitPane.java Tue Oct 08 14:53:14 2013 -0700 @@ -49,7 +49,7 @@ * interactively resized by the user. * Information on using <code>JSplitPane</code> is in * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/splitpane.html">How to Use Split Panes</a> in + href="http://docs.oracle.com/javase/tutorial/uiswing/components/splitpane.html">How to Use Split Panes</a> in * <em>The Java Tutorial</em>. * <p> * The two <code>Component</code>s in a split pane can be aligned @@ -89,7 +89,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1152,7 +1152,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JTabbedPane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JTabbedPane.java Tue Oct 08 14:53:14 2013 -0700 @@ -43,7 +43,7 @@ * A component that lets the user switch between a group of components by * clicking on a tab with a given title and/or icon. * For examples and information on using tabbed panes see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/tabbedpane.html">How to Use Tabbed Panes</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/tabbedpane.html">How to Use Tabbed Panes</a>, * a section in <em>The Java Tutorial</em>. * <p> * Tabs/components are added to a <code>TabbedPane</code> object by using the @@ -91,7 +91,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -207,7 +207,7 @@ } /** - * Returns the UI object which implements the L&F for this component. + * Returns the UI object which implements the L&F for this component. * * @return a <code>TabbedPaneUI</code> object * @see #setUI @@ -217,7 +217,7 @@ } /** - * Sets the UI object which implements the L&F for this component. + * Sets the UI object which implements the L&F for this component. * * @param ui the new UI object * @see UIDefaults#getUI @@ -250,7 +250,7 @@ /** * Returns the name of the UI class that implements the - * L&F for this component. + * L&F for this component. * * @return the string "TabbedPaneUI" * @see JComponent#getUIClassID @@ -576,7 +576,7 @@ * * @param index the index to be selected * @exception IndexOutOfBoundsException if index is out of range - * (index < -1 || index >= tab count) + * {@code (index < -1 || index >= tab count)} * * @see #getSelectedIndex * @see SingleSelectionModel#setSelectedIndex @@ -924,7 +924,7 @@ * if added to other containers. * @param index the index of the tab to be removed * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #addTab * @see #insertTab @@ -1043,7 +1043,7 @@ * @param index the index of the component to remove from the * <code>tabbedpane</code> * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * @see #addTab * @see #removeTabAt */ @@ -1105,7 +1105,7 @@ * @param index the index of the item being queried * @return the title at <code>index</code> * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * @see #setTitleAt */ public String getTitleAt(int index) { @@ -1118,7 +1118,7 @@ * @param index the index of the item being queried * @return the icon at <code>index</code> * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #setIconAt */ @@ -1137,7 +1137,7 @@ * @param index the index of the item being queried * @return the icon at <code>index</code> * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #setDisabledIconAt */ @@ -1155,7 +1155,7 @@ * @param index the index of the item being queried * @return a string containing the tool tip text at <code>index</code> * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #setToolTipTextAt * @since 1.3 @@ -1171,7 +1171,7 @@ * @return the <code>Color</code> of the tab background at * <code>index</code> * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #setBackgroundAt */ @@ -1186,7 +1186,7 @@ * @return the <code>Color</code> of the tab foreground at * <code>index</code> * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #setForegroundAt */ @@ -1202,7 +1202,7 @@ * @return true if the tab at <code>index</code> is enabled; * false otherwise * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #setEnabledAt */ @@ -1216,7 +1216,7 @@ * @param index the index of the item being queried * @return the <code>Component</code> at <code>index</code> * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #setComponentAt */ @@ -1281,7 +1281,7 @@ * <code>index</code> is not currently visible in the UI, * or if there is no UI set on this <code>tabbedpane</code> * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} */ public Rectangle getBoundsAt(int index) { checkIndex(index); @@ -1303,7 +1303,7 @@ * @param index the tab index where the title should be set * @param title the title to be displayed in the tab * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #getTitleAt * @see #setTabComponentAt @@ -1345,7 +1345,7 @@ * @param index the tab index where the icon should be set * @param icon the icon to be displayed in the tab * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #setDisabledIconAt * @see #getIconAt @@ -1389,7 +1389,7 @@ * @param index the tab index where the disabled icon should be set * @param disabledIcon the icon to be displayed in the tab when disabled * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #getDisabledIconAt * @beaninfo @@ -1414,7 +1414,7 @@ * @param index the tab index where the tooltip text should be set * @param toolTipText the tooltip text to be displayed for the tab * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #getToolTipTextAt * @beaninfo @@ -1443,14 +1443,14 @@ * which can be <code>null</code>, in which case the tab's background color * will default to the background color of the <code>tabbedpane</code>. * An internal exception is raised if there is no tab at that index. - * <p/> + * <p> * It is up to the look and feel to honor this property, some may * choose to ignore it. * * @param index the tab index where the background should be set * @param background the color to be displayed in the tab's background * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #getBackgroundAt * @beaninfo @@ -1476,14 +1476,14 @@ * <code>null</code>, in which case the tab's foreground color * will default to the foreground color of this <code>tabbedpane</code>. * An internal exception is raised if there is no tab at that index. - * <p/> + * <p> * It is up to the look and feel to honor this property, some may * choose to ignore it. * * @param index the tab index where the foreground should be set * @param foreground the color to be displayed as the tab's foreground * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #getForegroundAt * @beaninfo @@ -1510,7 +1510,7 @@ * @param index the tab index which should be enabled/disabled * @param enabled whether or not the tab should be enabled * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #isEnabledAt */ @@ -1530,7 +1530,7 @@ * @param index the tab index where this component is being placed * @param component the component for the tab * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #getComponentAt * @beaninfo @@ -1605,8 +1605,8 @@ * @param tabIndex the index of the tab that the mnemonic refers to * @param mnemonicIndex index into the <code>String</code> to underline * @exception IndexOutOfBoundsException if <code>tabIndex</code> is - * out of range (<code>tabIndex < 0 || tabIndex >= tab - * count</code>) + * out of range ({@code tabIndex < 0 || tabIndex >= tab + * count}) * @exception IllegalArgumentException will be thrown if * <code>mnemonicIndex</code> is >= length of the tab * title , or < -1 @@ -1649,7 +1649,7 @@ * @param tabIndex the index of the tab that the mnemonic refers to * @param mnemonic the key code which represents the mnemonic * @exception IndexOutOfBoundsException if <code>tabIndex</code> is out - * of range (<code>tabIndex < 0 || tabIndex >= tab count</code>) + * of range ({@code tabIndex < 0 || tabIndex >= tab count}) * @see #getMnemonicAt(int) * @see #setDisplayedMnemonicIndexAt(int,int) * @@ -1885,7 +1885,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -2354,7 +2354,7 @@ * @param component the component to render the title for the * specified tab * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * @exception IllegalArgumentException if component has already been * added to this <code>JTabbedPane</code> * @@ -2386,7 +2386,7 @@ * @param index the index of the item being queried * @return the tab component at <code>index</code> * @exception IndexOutOfBoundsException if index is out of range - * (index < 0 || index >= tab count) + * {@code (index < 0 || index >= tab count)} * * @see #setTabComponentAt * @since 1.6
--- a/jdk/src/share/classes/javax/swing/JTable.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JTable.java Tue Oct 08 14:53:14 2013 -0700 @@ -62,7 +62,7 @@ /** * The <code>JTable</code> is used to display and edit regular two-dimensional tables * of cells. - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/table.html">How to Use Tables</a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/table.html">How to Use Tables</a> * in <em>The Java Tutorial</em> * for task-oriented documentation and examples of using <code>JTable</code>. * @@ -200,7 +200,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -2489,7 +2489,7 @@ * The default value of this property is defined by the look * and feel implementation. * <p> - * This is a <a href="http://java.sun.com/docs/books/tutorial/javabeans/properties/bound.html">JavaBeans</a> bound property. + * This is a <a href="http://docs.oracle.com/javase/tutorial/javabeans/writing/properties.html">JavaBeans</a> bound property. * * @param selectionForeground the <code>Color</code> to use in the foreground * for selected list items @@ -2527,7 +2527,7 @@ * The default value of this property is defined by the look * and feel implementation. * <p> - * This is a <a href="http://java.sun.com/docs/books/tutorial/javabeans/properties/bound.html">JavaBeans</a> bound property. + * This is a <a href="http://docs.oracle.com/javase/tutorial/javabeans/writing/properties.html">JavaBeans</a> bound property. * * @param selectionBackground the <code>Color</code> to use for the background * of selected cells @@ -6575,7 +6575,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JTextArea.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JTextArea.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * compatibility with the <code>java.awt.TextArea</code> class where it can * reasonably do so. * You can find information and examples of using all the text components in - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/text.html">Using Text Components</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/text.html">Using Text Components</a>, * a section in <em>The Java Tutorial.</em> * * <p> @@ -112,7 +112,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -783,7 +783,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JTextField.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JTextField.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * of a single line of text. * For information on and examples of using text fields, * see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/textfield.html">How to Use Text Fields</a> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/textfield.html">How to Use Text Fields</a> * in <em>The Java Tutorial.</em> * * <p> @@ -148,7 +148,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -939,7 +939,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JTextPane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JTextPane.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * A text component that can be marked up with attributes that are * represented graphically. * You can find how-to information and examples of using text panes in - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/text.html">Using Text Components</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/text.html">Using Text Components</a>, * a section in <em>The Java Tutorial.</em> * * <p> @@ -68,7 +68,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/JToggleButton.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JToggleButton.java Tue Oct 08 14:53:14 2013 -0700 @@ -42,7 +42,7 @@ * are subclasses of this class. * For information on using them see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/button.html">How to Use Buttons, Check Boxes, and Radio Buttons</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/button.html">How to Use Buttons, Check Boxes, and Radio Buttons</a>, * a section in <em>The Java Tutorial</em>. * <p> * Buttons can be configured, and to some degree controlled, by @@ -51,7 +51,7 @@ * configuring a button. Refer to <a href="Action.html#buttonActions"> * Swing Components Supporting <code>Action</code></a> for more * details, and you can find more information in <a - * href="http://java.sun.com/docs/books/tutorial/uiswing/misc/action.html">How + * href="http://docs.oracle.com/javase/tutorial/uiswing/misc/action.html">How * to Use Actions</a>, a section in <em>The Java Tutorial</em>. * <p> * <strong>Warning:</strong> Swing is not thread safe. For more @@ -64,7 +64,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -218,7 +218,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -380,7 +380,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JToolBar.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JToolBar.java Tue Oct 08 14:53:14 2013 -0700 @@ -52,7 +52,7 @@ * <code>JToolBar</code> provides a component that is useful for * displaying commonly used <code>Action</code>s or controls. * For examples and information on using tool bars see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/toolbar.html">How to Use Tool Bars</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/toolbar.html">How to Use Tool Bars</a>, * a section in <em>The Java Tutorial</em>. * * <p> @@ -74,7 +74,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/JToolTip.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JToolTip.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * display can override <code>JComponent</code>'s <code>createToolTip</code> * method and use a subclass of this class. * <p> - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/tooltip.html">How to Use Tool Tips</a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/tooltip.html">How to Use Tool Tips</a> * in <em>The Java Tutorial</em> * for further documentation. * <p> @@ -58,7 +58,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -254,7 +254,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JTree.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JTree.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * <a name="jtree_description"></a> * A control that displays a set of hierarchical data as an outline. * You can find task-oriented documentation and examples of using trees in - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/tree.html">How to Use Trees</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/tree.html">How to Use Trees</a>, * a section in <em>The Java Tutorial.</em> * <p> * A specific node in a tree can be identified either by a @@ -130,7 +130,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *</p> @@ -3238,7 +3238,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -3360,7 +3360,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -3861,7 +3861,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -4093,7 +4093,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JViewport.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JViewport.java Tue Oct 08 14:53:14 2013 -0700 @@ -94,7 +94,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1292,7 +1292,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1761,7 +1761,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/JWindow.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/JWindow.java Tue Oct 08 14:53:14 2013 -0700 @@ -76,7 +76,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -314,7 +314,7 @@ * are currently typed to {@code JComponent}. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/dnd.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/dnd/index.html"> * How to Use Drag and Drop and Data Transfer</a>, a section in * <em>The Java Tutorial</em>, for more information. *
--- a/jdk/src/share/classes/javax/swing/KeyStroke.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/KeyStroke.java Tue Oct 08 14:53:14 2013 -0700 @@ -51,7 +51,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/LookAndFeel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/LookAndFeel.java Tue Oct 08 14:53:14 2013 -0700 @@ -91,7 +91,7 @@ * to provide a specific set of defaults. These are documented in the * classes that require the specific default. * - * <h3><a name="#defaultRecommendation">ComponentUIs and defaults</a></h2> + * <h3><a name="#defaultRecommendation">ComponentUIs and defaults</a></h3> * * All {@code ComponentUIs} typically need to set various properties * on the {@code JComponent} the {@code ComponentUI} is providing the @@ -590,7 +590,7 @@ * Distinct look and feels should have different names, e.g. * a subclass of MotifLookAndFeel that changes the way a few components * are rendered should be called "CDE/Motif My Way"; something - * that would be useful to a user trying to select a L&F from a list + * that would be useful to a user trying to select a L&F from a list * of names. * * @return short identifier for the look and feel
--- a/jdk/src/share/classes/javax/swing/OverlayLayout.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/OverlayLayout.java Tue Oct 08 14:53:14 2013 -0700 @@ -45,7 +45,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/ProgressMonitor.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/ProgressMonitor.java Tue Oct 08 14:53:14 2013 -0700 @@ -71,7 +71,7 @@ * * For further documentation and examples see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/progress.html">How to Monitor Progress</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/progress.html">How to Monitor Progress</a>, * a section in <em>The Java Tutorial.</em> * * @see ProgressMonitorInputStream
--- a/jdk/src/share/classes/javax/swing/ProgressMonitorInputStream.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/ProgressMonitorInputStream.java Tue Oct 08 14:53:14 2013 -0700 @@ -54,7 +54,7 @@ * <p> * * For further documentation and examples see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/progress.html">How to Monitor Progress</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/progress.html">How to Monitor Progress</a>, * a section in <em>The Java Tutorial.</em> * * @see ProgressMonitor
--- a/jdk/src/share/classes/javax/swing/ScrollPaneLayout.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/ScrollPaneLayout.java Tue Oct 08 14:53:14 2013 -0700 @@ -48,7 +48,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/SizeRequirements.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/SizeRequirements.java Tue Oct 08 14:53:14 2013 -0700 @@ -81,7 +81,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/Spring.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/Spring.java Tue Oct 08 14:53:14 2013 -0700 @@ -109,7 +109,7 @@ * If you are implementing a <code>SpringLayout</code> you * can find further information and examples in * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/layout/spring.html">How to Use SpringLayout</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/layout/spring.html">How to Use SpringLayout</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> @@ -117,7 +117,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/SpringLayout.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/SpringLayout.java Tue Oct 08 14:53:14 2013 -0700 @@ -36,7 +36,7 @@ /** * A <code>SpringLayout</code> lays out the children of its associated container * according to a set of constraints. - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/layout/spring.html">How to Use SpringLayout</a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/layout/spring.html">How to Use SpringLayout</a> * in <em>The Java Tutorial</em> for examples of using * <code>SpringLayout</code>. * @@ -172,7 +172,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/SwingUtilities.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/SwingUtilities.java Tue Oct 08 14:53:14 2013 -0700 @@ -1280,7 +1280,7 @@ * <p> * Additional documentation and examples for this method can be * found in - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency in Swing</a>. + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency in Swing</a>. * <p> * As of 1.3 this method is just a cover for <code>java.awt.EventQueue.invokeLater()</code>. * <p> @@ -1331,7 +1331,7 @@ * <p> * Additional documentation and examples for this method can be * found in - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency in Swing</a>. + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency in Swing</a>. * <p> * As of 1.3 this method is just a cover for * <code>java.awt.EventQueue.invokeAndWait()</code>.
--- a/jdk/src/share/classes/javax/swing/SwingWorker.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/SwingWorker.java Tue Oct 08 14:53:14 2013 -0700 @@ -50,7 +50,7 @@ * When writing a multi-threaded application using Swing, there are * two constraints to keep in mind: * (refer to - * <a href="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"> * Concurrency in Swing * </a> for more details): * <ul>
--- a/jdk/src/share/classes/javax/swing/Timer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/Timer.java Tue Oct 08 14:53:14 2013 -0700 @@ -121,7 +121,7 @@ * <p> * You can find further documentation * and several examples of using timers by visiting - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/timer.html" + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/timer.html" * target = "_top">How to Use Timers</a>, * a section in <em>The Java Tutorial.</em> * For more examples and help in choosing between @@ -137,7 +137,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/TransferHandler.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/TransferHandler.java Tue Oct 08 14:53:14 2013 -0700 @@ -75,7 +75,7 @@ * of the transfer, and <code>setForeground</code> for the target of a transfer. * <p> * Please see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/dnd.html"> + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/dnd/index.html"> * How to Use Drag and Drop and Data Transfer</a>, * a section in <em>The Java Tutorial</em>, for more information. *
--- a/jdk/src/share/classes/javax/swing/UIDefaults.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/UIDefaults.java Tue Oct 08 14:53:14 2013 -0700 @@ -64,7 +64,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/UIManager.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/UIManager.java Tue Oct 08 14:53:14 2013 -0700 @@ -167,7 +167,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java Tue Oct 08 14:53:14 2013 -0700 @@ -33,7 +33,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/ViewportLayout.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/ViewportLayout.java Tue Oct 08 14:53:14 2013 -0700 @@ -50,7 +50,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/WindowConstants.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/WindowConstants.java Tue Oct 08 14:53:14 2013 -0700 @@ -36,7 +36,7 @@ * use these constants. * For examples of setting the default window-closing operation, see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/frame.html#windowevents">Responding to Window-Closing Events</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/frame.html#windowevents">Responding to Window-Closing Events</a>, * a section in <em>The Java Tutorial</em>. * @see JFrame#setDefaultCloseOperation(int) * @see JDialog#setDefaultCloseOperation(int)
--- a/jdk/src/share/classes/javax/swing/border/AbstractBorder.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/border/AbstractBorder.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/border/BevelBorder.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/border/BevelBorder.java Tue Oct 08 14:53:14 2013 -0700 @@ -38,7 +38,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/border/Border.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/border/Border.java Tue Oct 08 14:53:14 2013 -0700 @@ -33,7 +33,7 @@ * Interface describing an object capable of rendering a border * around the edges of a swing component. * For examples of using borders see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/border.html">How to Use Borders</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/border.htmll">How to Use Borders</a>, * a section in <em>The Java Tutorial.</em> * <p> * In the Swing component set, borders supercede Insets as the
--- a/jdk/src/share/classes/javax/swing/border/CompoundBorder.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/border/CompoundBorder.java Tue Oct 08 14:53:14 2013 -0700 @@ -37,18 +37,18 @@ * For example, this class may be used to add blank margin space * to a component with an existing decorative border: * <p> - * <code><pre> + * <pre> * Border border = comp.getBorder(); * Border margin = new EmptyBorder(10,10,10,10); * comp.setBorder(new CompoundBorder(border, margin)); - * </pre></code> + * </pre> * <p> * <strong>Warning:</strong> * Serialized objects of this class will not be compatible with * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/border/EmptyBorder.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/border/EmptyBorder.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/border/EtchedBorder.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/border/EtchedBorder.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/border/LineBorder.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/border/LineBorder.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/border/MatteBorder.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/border/MatteBorder.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/border/SoftBevelBorder.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/border/SoftBevelBorder.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/border/TitledBorder.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/border/TitledBorder.java Tue Oct 08 14:53:14 2013 -0700 @@ -60,7 +60,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -85,7 +85,7 @@ /** * Provides a hint to the look and feel as to the * <code>KeyEvent.VK</code> constant that can be used as a mnemonic to - * access the panel. A return value <= 0 indicates there is no mnemonic. + * access the panel. A return value <= 0 indicates there is no mnemonic. * <p> * The return value here is a hint, it is ultimately up to the look * and feel to honor the return value in some meaningful way. @@ -94,7 +94,7 @@ * <code>AbstractColorChooserPanel</code> does not support a mnemonic, * subclasses wishing a mnemonic will need to override this. * - * @return KeyEvent.VK constant identifying the mnemonic; <= 0 for no + * @return KeyEvent.VK constant identifying the mnemonic; <= 0 for no * mnemonic * @see #getDisplayedMnemonicIndex * @since 1.4 @@ -107,7 +107,7 @@ * Provides a hint to the look and feel as to the index of the character in * <code>getDisplayName</code> that should be visually identified as the * mnemonic. The look and feel should only use this if - * <code>getMnemonic</code> returns a value > 0. + * <code>getMnemonic</code> returns a value > 0. * <p> * The return value here is a hint, it is ultimately up to the look * and feel to honor the return value in some meaningful way. For example,
--- a/jdk/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java Tue Oct 08 14:53:14 2013 -0700 @@ -37,7 +37,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java Tue Oct 08 14:53:14 2013 -0700 @@ -46,7 +46,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java Tue Oct 08 14:53:14 2013 -0700 @@ -45,7 +45,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/AncestorEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/AncestorEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -37,7 +37,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/CaretEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/CaretEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -36,7 +36,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -56,7 +56,7 @@ /** * Fetches the location of the caret. * - * @return the dot >= 0 + * @return the dot >= 0 */ public abstract int getDot(); @@ -65,7 +65,7 @@ * selection. If there is no selection, this * will be the same as dot. * - * @return the mark >= 0 + * @return the mark >= 0 */ public abstract int getMark(); }
--- a/jdk/src/share/classes/javax/swing/event/ChangeEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/ChangeEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -36,7 +36,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/DocumentEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/DocumentEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -45,14 +45,14 @@ * Returns the offset within the document of the start * of the change. * - * @return the offset >= 0 + * @return the offset >= 0 */ public int getOffset(); /** * Returns the length of the change. * - * @return the length >= 0 + * @return the length >= 0 */ public int getLength(); @@ -155,7 +155,7 @@ * This is the location that children were added * and/or removed. * - * @return the index >= 0 + * @return the index >= 0 */ public int getIndex();
--- a/jdk/src/share/classes/javax/swing/event/EventListenerList.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/EventListenerList.java Tue Oct 08 14:53:14 2013 -0700 @@ -69,7 +69,7 @@ * Object[] listeners = listenerList.getListenerList(); * // Process the listeners last to first, notifying * // those that are interested in this event - * for (int i = listeners.length-2; i>=0; i-=2) { + * for (int i = listeners.length-2; i>=0; i-=2) { * if (listeners[i]==FooListener.class) { * // Lazily create the event: * if (fooEvent == null) @@ -88,7 +88,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/HyperlinkEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/HyperlinkEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/InternalFrameAdapter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/InternalFrameAdapter.java Tue Oct 08 14:53:14 2013 -0700 @@ -31,7 +31,7 @@ * convenience for creating listener objects, and is functionally * equivalent to the WindowAdapter class in the AWT. * <p> - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/events/internalframelistener.html">How to Write an Internal Frame Listener</a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/internalframelistener.html">How to Write an Internal Frame Listener</a> * in <em>The Java Tutorial</em> * * @see InternalFrameEvent
--- a/jdk/src/share/classes/javax/swing/event/InternalFrameEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/InternalFrameEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -34,7 +34,7 @@ * although different IDs are used. * Help on handling internal frame events * is in - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/events/internalframelistener.html" target="_top">How to Write an Internal Frame Listener</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/internalframelistener.html" target="_top">How to Write an Internal Frame Listener</a>, * a section in <em>The Java Tutorial</em>. * <p> * <strong>Warning:</strong> @@ -42,7 +42,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/InternalFrameListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/InternalFrameListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -32,7 +32,7 @@ * This class is functionally equivalent to the WindowListener class * in the AWT. * <p> - * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/events/internalframelistener.html">How to Write an Internal Frame Listener</a> + * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/internalframelistener.html">How to Write an Internal Frame Listener</a> * in <em>The Java Tutorial</em> for further documentation. * * @see java.awt.event.WindowListener
--- a/jdk/src/share/classes/javax/swing/event/ListDataEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/ListDataEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -36,7 +36,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -85,9 +85,9 @@ public int getIndex1() { return index1; } /** - * Constructs a ListDataEvent object. If index0 is > + * Constructs a ListDataEvent object. If index0 is > * index1, index0 and index1 will be swapped such that - * index0 will always be <= index1. + * index0 will always be <= index1. * * @param source the source Object (typically <code>this</code>) * @param type an int specifying {@link #CONTENTS_CHANGED},
--- a/jdk/src/share/classes/javax/swing/event/ListSelectionEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/ListSelectionEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -42,7 +42,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/MenuDragMouseEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/MenuDragMouseEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -41,7 +41,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/MenuEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/MenuEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -37,7 +37,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/MenuKeyEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/MenuKeyEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -41,7 +41,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/PopupMenuEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/PopupMenuEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -35,7 +35,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/TableColumnModelEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/TableColumnModelEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -38,7 +38,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/TableModelEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/TableModelEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -57,7 +57,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/TreeExpansionEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/TreeExpansionEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -34,15 +34,15 @@ * <p> * For further documentation and examples see * the following sections in <em>The Java Tutorial</em>: - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/events/treeexpansionlistener.html">How to Write a Tree Expansion Listener</a> and - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/events/treewillexpandlistener.html">How to Write a Tree-Will-Expand Listener</a>. + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/treeexpansionlistener.html">How to Write a Tree Expansion Listener</a> and + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/treewillexpandlistener.html">How to Write a Tree-Will-Expand Listener</a>. * <p> * <strong>Warning:</strong> * Serialized objects of this class will not be compatible with * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/TreeExpansionListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/TreeExpansionListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -32,7 +32,7 @@ * a node. * For further documentation and examples see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/events/treeexpansionlistener.html">How to Write a Tree Expansion Listener</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/events/treeexpansionlistener.html">How to Write a Tree Expansion Listener</a>, * a section in <em>The Java Tutorial.</em> * * @author Scott Violet
--- a/jdk/src/share/classes/javax/swing/event/TreeModelEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/TreeModelEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -34,7 +34,7 @@ * used to notify tree model listeners of the change. * For more information and examples see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/events/treemodellistener.html">How to Write a Tree Model Listener</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/events/treemodellistener.html">How to Write a Tree Model Listener</a>, * a section in <em>The Java Tutorial.</em> * <p> * <strong>Warning:</strong> @@ -42,7 +42,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -101,14 +101,14 @@ * of initial-positions, you then need to convert the Vector of <code>Integer</code> * objects to an array of <code>int</code> to create the event. * <p> - * <b>Notes:</b><ul> + * <b>Notes:</b><ul style="list-style-type:none"> * <li>Like the <code>insertNodeInto</code> method in the * <code>DefaultTreeModel</code> class, <code>insertElementAt</code> * appends to the <code>Vector</code> when the index matches the size * of the vector. So you can use <code>insertElementAt(Integer, 0)</code> - * even when the vector is empty. - * <ul>To create a node changed event for the root node, specify the parent - * and the child indices as <code>null</code>. + * even when the vector is empty.</li> + * <li>To create a node changed event for the root node, specify the parent + * and the child indices as <code>null</code>.</li> * </ul> * * @param source the Object responsible for generating the event (typically
--- a/jdk/src/share/classes/javax/swing/event/TreeModelListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/TreeModelListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -32,7 +32,7 @@ * to changes in a TreeModel. * For further information and examples see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/events/treemodellistener.html">How to Write a Tree Model Listener</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/events/treemodellistener.html">How to Write a Tree Model Listener</a>, * a section in <em>The Java Tutorial.</em> * * @author Rob Davis
--- a/jdk/src/share/classes/javax/swing/event/TreeSelectionEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/TreeSelectionEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/event/TreeSelectionListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/TreeSelectionListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -32,7 +32,7 @@ * changes. * For more information and examples see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/events/treeselectionlistener.html">How to Write a Tree Selection Listener</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/events/treeselectionlistener.html">How to Write a Tree Selection Listener</a>, * a section in <em>The Java Tutorial.</em> * * @see javax.swing.tree.TreeSelectionModel
--- a/jdk/src/share/classes/javax/swing/event/TreeWillExpandListener.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/TreeWillExpandListener.java Tue Oct 08 14:53:14 2013 -0700 @@ -32,7 +32,7 @@ * The listener that's notified when a tree expands or collapses * a node. * For further information and examples see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/events/treewillexpandlistener.html">How to Write a Tree-Will-Expand Listener</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/events/treewillexpandlistener.html">How to Write a Tree-Will-Expand Listener</a>, * a section in <em>The Java Tutorial.</em> * * @author Scott Violet
--- a/jdk/src/share/classes/javax/swing/event/UndoableEditEvent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/event/UndoableEditEvent.java Tue Oct 08 14:53:14 2013 -0700 @@ -35,7 +35,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/filechooser/FileFilter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/filechooser/FileFilter.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * For an example implementation of a simple file filter, see * <code><i>yourJDK</i>/demo/jfc/FileChooserDemo/ExampleFileFilter.java</code>. * For more information and examples see - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/filechooser.html">How to Use File Choosers</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/filechooser.html">How to Use File Choosers</a>, * a section in <em>The Java Tutorial</em>. * * @see FileNameExtensionFilter
--- a/jdk/src/share/classes/javax/swing/filechooser/FileView.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/filechooser/FileView.java Tue Oct 08 14:53:14 2013 -0700 @@ -31,9 +31,9 @@ /** * <code>FileView</code> defines an abstract class that can be implemented * to provide the filechooser with UI information for a <code>File</code>. - * Each L&F <code>JFileChooserUI</code> object implements this + * Each L&F <code>JFileChooserUI</code> object implements this * class to pass back the correct icons and type descriptions specific to - * that L&F. For example, the Microsoft Windows L&F returns the + * that L&F. For example, the Microsoft Windows L&F returns the * generic Windows icons for directories and generic files. * Additionally, you may want to provide your own <code>FileView</code> to * <code>JFileChooser</code> to return different icons or additional @@ -44,7 +44,7 @@ * <code>JFileChooser</code> first looks to see if there is a user defined * <code>FileView</code>, if there is, it gets type information from * there first. If <code>FileView</code> returns <code>null</code> for - * any method, <code>JFileChooser</code> then uses the L&F specific + * any method, <code>JFileChooser</code> then uses the L&F specific * view to get the information. * So, for example, if you provide a <code>FileView</code> class that * returns an <code>Icon</code> for JPG files, and returns <code>null</code> @@ -57,7 +57,7 @@ * <code><i>yourJDK</i>/demo/jfc/FileChooserDemo/ExampleFileView.java</code>. * For more information and examples see * <a - href="http://java.sun.com/docs/books/tutorial/uiswing/components/filechooser.html">How to Use File Choosers</a>, + href="http://docs.oracle.com/javase/tutorial/uiswing/components/filechooser.html">How to Use File Choosers</a>, * a section in <em>The Java Tutorial</em>. * * @see javax.swing.JFileChooser
--- a/jdk/src/share/classes/javax/swing/plaf/BorderUIResource.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/BorderUIResource.java Tue Oct 08 14:53:14 2013 -0700 @@ -51,7 +51,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/ColorUIResource.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/ColorUIResource.java Tue Oct 08 14:53:14 2013 -0700 @@ -37,7 +37,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/DimensionUIResource.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/DimensionUIResource.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/FontUIResource.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/FontUIResource.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/IconUIResource.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/IconUIResource.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/InsetsUIResource.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/InsetsUIResource.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -43,7 +43,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java Tue Oct 08 14:53:14 2013 -0700 @@ -160,7 +160,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java Tue Oct 08 14:53:14 2013 -0700 @@ -41,7 +41,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -135,7 +135,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -54,8 +54,7 @@ * <p> * For adding specific actions, * overide <code>installKeyboardActions</code> to add actions in response to - * KeyStroke bindings. See the article <a href="http://java.sun.com/products/jfc/tsc/special_report/kestrel/keybindings.html">Keyboard Bindings in Swing</a> - * at <a href="http://java.sun.com/products/jfc/tsc"><em>The Swing Connection</em></a>. + * KeyStroke bindings. See the article <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/keybinding.html">How to Use Key Bindings</a> * * @author Arnaud Weber * @author Tom Santos
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java Tue Oct 08 14:53:14 2013 -0700 @@ -53,7 +53,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java Tue Oct 08 14:53:14 2013 -0700 @@ -42,7 +42,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java Tue Oct 08 14:53:14 2013 -0700 @@ -50,7 +50,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicListUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicListUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -1488,7 +1488,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1592,7 +1592,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1650,7 +1650,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1717,7 +1717,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java Tue Oct 08 14:53:14 2013 -0700 @@ -96,7 +96,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java Tue Oct 08 14:53:14 2013 -0700 @@ -53,7 +53,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -671,7 +671,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -43,7 +43,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -45,7 +45,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -41,7 +41,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -93,7 +93,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/basic/ComboPopup.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/ComboPopup.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java Tue Oct 08 14:53:14 2013 -0700 @@ -79,7 +79,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java Tue Oct 08 14:53:14 2013 -0700 @@ -41,7 +41,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java Tue Oct 08 14:53:14 2013 -0700 @@ -41,7 +41,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -129,7 +129,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -43,7 +43,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java Tue Oct 08 14:53:14 2013 -0700 @@ -36,7 +36,7 @@ /** * Factory object that vends <code>Icon</code>s for - * the Java<sup><font size="-2">TM</font></sup> look and feel (Metal). + * the Java™ look and feel (Metal). * These icons are used extensively in Metal via the defaults mechanism. * While other look and feels often use GIFs for icons, creating icons * in code facilitates switching to other themes. @@ -52,7 +52,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1550,7 +1550,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1632,7 +1632,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1651,7 +1651,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1736,7 +1736,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Tue Oct 08 14:53:14 2013 -0700 @@ -72,7 +72,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -293,8 +293,8 @@ * <table border="1" cellpadding="1" cellspacing="0" * summary="Metal's system color mapping"> * <tr valign="top" align="left"> - * <th bgcolor="#CCCCFF" align="left">Key - * <th bgcolor="#CCCCFF" align="left">Value + * <th style="background-color:#CCCCFF" align="left">Key + * <th style="background-color:#CCCCFF" align="left">Value * <tr valign="top" align="left"> * <td>"desktop" * <td>{@code theme.getDesktopColor()} @@ -2361,7 +2361,7 @@ } // From the JLF Design Guidelines: - // http://java.sun.com/products/jlf/ed2/book/HIG.Visual2.html + // http://www.oracle.com/technetwork/java/jlf-135985.html private static class MetalLayoutStyle extends DefaultLayoutStyle { private static MetalLayoutStyle INSTANCE = new MetalLayoutStyle();
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -38,7 +38,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -46,7 +46,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -56,7 +56,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java Tue Oct 08 14:53:14 2013 -0700 @@ -43,7 +43,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -37,7 +37,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -41,7 +41,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -41,7 +41,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -49,7 +49,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -45,7 +45,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalTreeUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalTreeUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -46,7 +46,7 @@ * * <table summary="Descriptions of supported hints: Angled, Horizontal, and None"> * <tr> - * <th><p align="left">Angled</p></th> + * <th><p style="text-align:left">Angled</p></th> * <td>A line is drawn connecting the child to the parent. For handling * of the root node refer to * {@link javax.swing.JTree#setRootVisible} and @@ -54,11 +54,11 @@ * </td> * </tr> * <tr> - * <th><p align="left">Horizontal</p></th> + * <th><p style="text-align:left">Horizontal</p></th> * <td>A horizontal line is drawn dividing the children of the root node.</td> * </tr> * <tr> - * <th><p align="left">None</p></th> + * <th><p style="text-align:left">None</p></th> * <td>Do not draw any visual indication between nodes.</td> * </tr> * </table>
--- a/jdk/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java Tue Oct 08 14:53:14 2013 -0700 @@ -47,7 +47,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -43,7 +43,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/table/AbstractTableModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/table/AbstractTableModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -50,7 +50,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java Tue Oct 08 14:53:14 2013 -0700 @@ -75,7 +75,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -150,7 +150,7 @@ /** * Notification from the <code>UIManager</code> that the look and feel - * [L&F] has changed. + * [L&F] has changed. * Replaces the current UI object with the latest version from the * <code>UIManager</code>. * @@ -387,7 +387,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/table/DefaultTableColumnModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/table/DefaultTableColumnModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -44,7 +44,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/table/DefaultTableModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/table/DefaultTableModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -50,7 +50,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -418,15 +418,14 @@ * * <pre> * Examples of moves: - * <p> + * * 1. moveRow(1,3,5); * a|B|C|D|e|f|g|h|i|j|k - before * a|e|f|g|h|B|C|D|i|j|k - after - * <p> + * * 2. moveRow(6,7,1); * a|b|c|d|e|f|G|H|i|j|k - before * a|G|H|b|c|d|e|f|i|j|k - after - * <p> * </pre> * * @param start the starting row index to be moved
--- a/jdk/src/share/classes/javax/swing/table/JTableHeader.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/table/JTableHeader.java Tue Oct 08 14:53:14 2013 -0700 @@ -52,7 +52,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -437,7 +437,7 @@ // /** - * Returns the look and feel (L&F) object that renders this component. + * Returns the look and feel (L&F) object that renders this component. * * @return the <code>TableHeaderUI</code> object that renders this component */ @@ -446,9 +446,9 @@ } /** - * Sets the look and feel (L&F) object that renders this component. + * Sets the look and feel (L&F) object that renders this component. * - * @param ui the <code>TableHeaderUI</code> L&F object + * @param ui the <code>TableHeaderUI</code> L&F object * @see UIDefaults#getUI */ public void setUI(TableHeaderUI ui){ @@ -460,7 +460,7 @@ /** * Notification from the <code>UIManager</code> that the look and feel - * (L&F) has changed. + * (L&F) has changed. * Replaces the current UI object with the latest version from the * <code>UIManager</code>. * @@ -478,7 +478,7 @@ /** * Returns the suffix used to construct the name of the look and feel - * (L&F) class used to render this component. + * (L&F) class used to render this component. * @return the string "TableHeaderUI" * * @return "TableHeaderUI" @@ -776,7 +776,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/table/TableCellRenderer.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/table/TableCellRenderer.java Tue Oct 08 14:53:14 2013 -0700 @@ -49,10 +49,10 @@ * <pre> * JTable.DropLocation dropLocation = table.getDropLocation(); * if (dropLocation != null - * && !dropLocation.isInsertRow() - * && !dropLocation.isInsertColumn() - * && dropLocation.getRow() == row - * && dropLocation.getColumn() == column) { + * && !dropLocation.isInsertRow() + * && !dropLocation.isInsertColumn() + * && dropLocation.getRow() == row + * && dropLocation.getColumn() == column) { * * // this cell represents the current drop location * // so render it specially, perhaps with a different color
--- a/jdk/src/share/classes/javax/swing/table/TableColumn.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/table/TableColumn.java Tue Oct 08 14:53:14 2013 -0700 @@ -67,7 +67,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/table/TableModel.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/table/TableModel.java Tue Oct 08 14:53:14 2013 -0700 @@ -40,7 +40,7 @@ * JTable table = new JTable(myData); * </pre><p> * - * For further documentation, see <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/table.html#data">Creating a Table Model</a> + * For further documentation, see <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/table.html#data">Creating a Table Model</a> * in <em>The Java Tutorial</em>. * <p> * @author Philip Milne
--- a/jdk/src/share/classes/javax/swing/text/AbstractDocument.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/AbstractDocument.java Tue Oct 08 14:53:14 2013 -0700 @@ -90,7 +90,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -408,7 +408,7 @@ * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param r the renderer to execute @@ -426,7 +426,7 @@ * Returns the length of the data. This is the number of * characters of content that represents the users data. * - * @return the length >= 0 + * @return the length >= 0 * @see Document#getLength */ public int getLength() { @@ -569,11 +569,11 @@ * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * - * @param offs the starting offset >= 0 - * @param len the number of characters to remove >= 0 + * @param offs the starting offset >= 0 + * @param len the number of characters to remove >= 0 * @exception BadLocationException the given remove position is not a valid * position within the document * @see Document#remove @@ -682,10 +682,10 @@ * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * - * @param offs the starting offset >= 0 + * @param offs the starting offset >= 0 * @param str the string to insert; does nothing with null/empty strings * @param a the attributes for the inserted content * @exception BadLocationException the given insert position is not a valid @@ -777,8 +777,8 @@ /** * Gets a sequence of text from the document. * - * @param offset the starting offset >= 0 - * @param length the number of characters to retrieve >= 0 + * @param offset the starting offset >= 0 + * @param length the number of characters to retrieve >= 0 * @return the text * @exception BadLocationException the range given includes a position * that is not a valid position within the document @@ -810,7 +810,7 @@ * Segment text = new Segment(); * int offs = 0; * text.setPartialReturn(true); - * while (nleft > 0) { + * while (nleft > 0) { * doc.getText(offs, nleft, text); * // do something with text * nleft -= text.count; @@ -818,8 +818,8 @@ * } * </pre> * - * @param offset the starting offset >= 0 - * @param length the number of characters to retrieve >= 0 + * @param offset the starting offset >= 0 + * @param length the number of characters to retrieve >= 0 * @param txt the Segment object to retrieve the text into * @exception BadLocationException the range given includes a position * that is not a valid position within the document @@ -837,10 +837,10 @@ * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * - * @param offs the position in the model >= 0 + * @param offs the position in the model >= 0 * @return the position * @exception BadLocationException if the given position does not * represent a valid location in the associated document @@ -956,7 +956,7 @@ * should keep in mind however that a paragraph should at least be the * unit of text over which to run the Unicode bidirectional algorithm. * - * @param pos the starting offset >= 0 + * @param pos the starting offset >= 0 * @return the element */ public abstract Element getParagraphElement(int pos); @@ -1288,8 +1288,8 @@ * * @param parent the parent element * @param a the attributes for the element - * @param p0 the beginning of the range >= 0 - * @param p1 the end of the range >= p0 + * @param p0 the beginning of the range >= 0 + * @param p1 the end of the range >= p0 * @return the new element */ protected Element createLeafElement(Element parent, AttributeSet a, int p0, int p1) { @@ -1610,7 +1610,7 @@ * Creates a position within the content that will * track change as the content is mutated. * - * @param offset the offset in the content >= 0 + * @param offset the offset in the content >= 0 * @return a Position * @exception BadLocationException for an invalid offset */ @@ -1619,14 +1619,14 @@ /** * Current length of the sequence of character content. * - * @return the length >= 0 + * @return the length >= 0 */ public int length(); /** * Inserts a string of characters into the sequence. * - * @param where offset into the sequence to make the insertion >= 0 + * @param where offset into the sequence to make the insertion >= 0 * @param str string to insert * @return if the implementation supports a history mechanism, * a reference to an <code>Edit</code> implementation will be returned, @@ -1640,8 +1640,8 @@ * Removes some portion of the sequence. * * @param where The offset into the sequence to make the - * insertion >= 0. - * @param nitems The number of items in the sequence to remove >= 0. + * insertion >= 0. + * @param nitems The number of items in the sequence to remove >= 0. * @return If the implementation supports a history mechansim, * a reference to an Edit implementation will be returned, * otherwise null. @@ -1653,8 +1653,8 @@ /** * Fetches a string of characters contained in the sequence. * - * @param where Offset into the sequence to fetch >= 0. - * @param len number of characters to copy >= 0. + * @param where Offset into the sequence to fetch >= 0. + * @param len number of characters to copy >= 0. * @return the string * @exception BadLocationException Thrown if the area covered by * the arguments is not contained in the character sequence. @@ -1664,8 +1664,8 @@ /** * Gets a sequence of characters and copies them into a Segment. * - * @param where the starting offset >= 0 - * @param len the number of characters >= 0 + * @param where the starting offset >= 0 + * @param len the number of characters >= 0 * @param txt the target location to copy into * @exception BadLocationException Thrown if the area covered by * the arguments is not contained in the character sequence. @@ -1778,7 +1778,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1809,7 +1809,7 @@ * Dumps a debugging representation of the element hierarchy. * * @param psOut the output stream - * @param indentAmount the indentation level >= 0 + * @param indentAmount the indentation level >= 0 */ public void dump(PrintStream psOut, int indentAmount) { PrintWriter out; @@ -1867,7 +1867,7 @@ /** * Gets the number of attributes that are defined. * - * @return the number of attributes >= 0 + * @return the number of attributes >= 0 * @see AttributeSet#getAttributeCount */ public int getAttributeCount() { @@ -2116,21 +2116,21 @@ /** * Gets the starting offset in the model for the element. * - * @return the offset >= 0 + * @return the offset >= 0 */ public abstract int getStartOffset(); /** * Gets the ending offset in the model for the element. * - * @return the offset >= 0 + * @return the offset >= 0 */ public abstract int getEndOffset(); /** * Gets a child element. * - * @param index the child index, >= 0 && < getElementCount() + * @param index the child index, >= 0 && < getElementCount() * @return the child element */ public abstract Element getElement(int index); @@ -2138,15 +2138,15 @@ /** * Gets the number of children for the element. * - * @return the number of children >= 0 + * @return the number of children >= 0 */ public abstract int getElementCount(); /** * Gets the child element index closest to the given model offset. * - * @param offset the offset >= 0 - * @return the element index >= 0 + * @param offset the offset >= 0 + * @return the element index >= 0 */ public abstract int getElementIndex(int offset); @@ -2247,7 +2247,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -2272,7 +2272,7 @@ * Gets the child element that contains * the given model position. * - * @param pos the position >= 0 + * @param pos the position >= 0 * @return the element, null if none */ public Element positionToElement(int pos) { @@ -2289,8 +2289,8 @@ /** * Replaces content with a new set of elements. * - * @param offset the starting offset >= 0 - * @param length the length to replace >= 0 + * @param offset the starting offset >= 0 + * @param length the length to replace >= 0 * @param elems the new elements */ public void replace(int offset, int length, Element[] elems) { @@ -2342,7 +2342,7 @@ /** * Gets the starting offset in the model for the element. * - * @return the offset >= 0 + * @return the offset >= 0 */ public int getStartOffset() { return children[0].getStartOffset(); @@ -2352,7 +2352,7 @@ * Gets the ending offset in the model for the element. * @throws NullPointerException if this element has no children * - * @return the offset >= 0 + * @return the offset >= 0 */ public int getEndOffset() { Element child = @@ -2363,7 +2363,7 @@ /** * Gets a child element. * - * @param index the child index, >= 0 && < getElementCount() + * @param index the child index, >= 0 && < getElementCount() * @return the child element, null if none */ public Element getElement(int index) { @@ -2376,7 +2376,7 @@ /** * Gets the number of children for the element. * - * @return the number of children >= 0 + * @return the number of children >= 0 */ public int getElementCount() { return nchildren; @@ -2385,8 +2385,8 @@ /** * Gets the child element index closest to the given model offset. * - * @param offset the offset >= 0 - * @return the element index >= 0 + * @param offset the offset >= 0 + * @return the element index >= 0 */ public int getElementIndex(int offset) { int index; @@ -2501,7 +2501,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -2515,8 +2515,8 @@ * * @param parent The parent element * @param a The element attributes - * @param offs0 The start offset >= 0 - * @param offs1 The end offset >= offs0 + * @param offs0 The start offset >= 0 + * @param offs1 The end offset >= offs0 * @since 1.4 */ public LeafElement(Element parent, AttributeSet a, int offs0, int offs1) { @@ -2545,7 +2545,7 @@ /** * Gets the starting offset in the model for the element. * - * @return the offset >= 0 + * @return the offset >= 0 */ public int getStartOffset() { return p0.getOffset(); @@ -2554,7 +2554,7 @@ /** * Gets the ending offset in the model for the element. * - * @return the offset >= 0 + * @return the offset >= 0 */ public int getEndOffset() { return p1.getOffset(); @@ -2576,8 +2576,8 @@ /** * Gets the child element index closest to the given model offset. * - * @param pos the offset >= 0 - * @return the element index >= 0 + * @param pos the offset >= 0 + * @return the element index >= 0 */ public int getElementIndex(int pos) { return -1; @@ -2586,7 +2586,7 @@ /** * Gets a child element. * - * @param index the child index, >= 0 && < getElementCount() + * @param index the child index, >= 0 && < getElementCount() * @return the child element */ public Element getElement(int index) { @@ -2596,7 +2596,7 @@ /** * Returns the number of child elements. * - * @return the number of children >= 0 + * @return the number of children >= 0 */ public int getElementCount() { return 0; @@ -2731,8 +2731,8 @@ /** * Constructs a change record. * - * @param offs the offset into the document of the change >= 0 - * @param len the length of the change >= 0 + * @param offs the offset into the document of the change >= 0 + * @param len the length of the change >= 0 * @param type the type of event (DocumentEvent.EventType) * @since 1.4 */ @@ -2901,7 +2901,7 @@ /** * Returns the offset within the document of the start of the change. * - * @return the offset >= 0 + * @return the offset >= 0 * @see DocumentEvent#getOffset */ public int getOffset() { @@ -2911,7 +2911,7 @@ /** * Returns the length of the change. * - * @return the length >= 0 + * @return the length >= 0 * @see DocumentEvent#getLength */ public int getLength() { @@ -3024,7 +3024,7 @@ * current model state for views that just attached to a model. * * @param e the element - * @param index the index into the model >= 0 + * @param index the index into the model >= 0 * @param removed a set of elements that were removed * @param added a set of elements that were added */ @@ -3048,7 +3048,7 @@ /** * Returns the index into the list of elements. * - * @return the index >= 0 + * @return the index >= 0 */ public int getIndex() { return index;
--- a/jdk/src/share/classes/javax/swing/text/AbstractWriter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/AbstractWriter.java Tue Oct 08 14:53:14 2013 -0700 @@ -417,7 +417,7 @@ /** * Increments the indent level. If indenting would cause - * <code>getIndentSpace()</code> *<code>getIndentLevel()</code> to be > + * <code>getIndentSpace()</code> *<code>getIndentLevel()</code> to be > * than <code>getLineLength()</code> this will not cause an indent. */ protected void incrIndent() { @@ -663,7 +663,7 @@ } /** - * Writes out the set of attributes as " <name>=<value>" + * Writes out the set of attributes as " <name>=<value>" * pairs. It throws an IOException when encountered. * * @param attr an AttributeSet.
--- a/jdk/src/share/classes/javax/swing/text/AsyncBoxView.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/AsyncBoxView.java Tue Oct 08 14:53:14 2013 -0700 @@ -193,7 +193,7 @@ * of the child at the given index. * * @param index the child index. This should be a - * value >= 0 and < getViewCount(). + * value >= 0 and < getViewCount(). */ protected ChildState getChildState(int index) { synchronized(stats) { @@ -350,8 +350,8 @@ * thread will not happen (i.e. the layout thread * acquires a read lock before doing anything). * - * @param offset the starting offset into the child views >= 0 - * @param length the number of existing views to replace >= 0 + * @param offset the starting offset into the child views >= 0 + * @param length the number of existing views to replace >= 0 * @param views the child views to insert */ public void replace(int offset, int length, View[] views) { @@ -417,7 +417,7 @@ * the model. This is implemented to fetch the view in the case * where there is a child view for each child element. * - * @param pos the position >= 0 + * @param pos the position >= 0 * @return index of the view representing the given position, or * -1 if no view represents that position */ @@ -525,8 +525,8 @@ * axis. Since the minor axis is flexible, work is queued to resize * the children if the minor span changes. * - * @param width the width >= 0 - * @param height the height >= 0 + * @param width the width >= 0 + * @param height the height >= 0 */ public void setSize(float width, float height) { setSpanOnAxis(X_AXIS, width); @@ -618,7 +618,7 @@ * axis. * * @param axis may be either View.X_AXIS or View.Y_AXIS - * @return the span the view would like to be rendered into >= 0. + * @return the span the view would like to be rendered into >= 0. * Typically the view is told to render into the span * that is returned, although there is no guarantee. * The parent may choose to resize or break the view. @@ -643,7 +643,7 @@ * axis. * * @param axis may be either View.X_AXIS or View.Y_AXIS - * @return the span the view would like to be rendered into >= 0. + * @return the span the view would like to be rendered into >= 0. * Typically the view is told to render into the span * that is returned, although there is no guarantee. * The parent may choose to resize or break the view. @@ -671,7 +671,7 @@ * axis. * * @param axis may be either View.X_AXIS or View.Y_AXIS - * @return the span the view would like to be rendered into >= 0. + * @return the span the view would like to be rendered into >= 0. * Typically the view is told to render into the span * that is returned, although there is no guarantee. * The parent may choose to resize or break the view. @@ -690,7 +690,7 @@ * the default is to not be a composite view this * returns 0. * - * @return the number of views >= 0 + * @return the number of views >= 0 * @see View#getViewCount */ public int getViewCount() { @@ -703,7 +703,7 @@ * Gets the nth child view. Since there are no * children by default, this returns null. * - * @param n the number of the view to get, >= 0 && < getViewCount() + * @param n the number of the view to get, >= 0 && < getViewCount() * @return the view */ public View getView(int n) { @@ -721,7 +721,7 @@ * their location. This returns null since the * default is to not have any child views. * - * @param index the index of the child, >= 0 && < getViewCount() + * @param index the index of the child, >= 0 && < getViewCount() * @param a the allocation to this view. * @return the allocation to the child */ @@ -736,7 +736,7 @@ * to return -1 to indicate there is no valid child index for any * position. * - * @param pos the position >= 0 + * @param pos the position >= 0 * @return index of the view representing the given position, or * -1 if no view represents that position * @since 1.3 @@ -749,7 +749,7 @@ * Provides a mapping from the document model coordinate space * to the coordinate space of the view mapped to it. * - * @param pos the position to convert >= 0 + * @param pos the position to convert >= 0 * @param a the allocated region to render into * @param b the bias toward the previous character or the * next character represented by the offset, in case the @@ -788,11 +788,11 @@ * on the child view with a lock on the ChildState object * to avoid interaction with the layout thread. * - * @param x the X coordinate >= 0 - * @param y the Y coordinate >= 0 + * @param x the X coordinate >= 0 + * @param y the Y coordinate >= 0 * @param a the allocated region to render into * @return the location within the model that best represents the - * given point in the view >= 0. The biasReturn argument will be + * given point in the view >= 0. The biasReturn argument will be * filled in to indicate that the point given is closer to the next * character in the model or the previous character in the model. */ @@ -828,16 +828,16 @@ * they might not be in the same order found in the model, or they just * might not allow access to some of the locations in the model. * - * @param pos the position to convert >= 0 + * @param pos the position to convert >= 0 * @param a the allocated region to render into * @param direction the direction from the current position that can * be thought of as the arrow keys typically found on a keyboard; * this may be one of the following: - * <ul> - * <code>SwingConstants.WEST</code> - * <code>SwingConstants.EAST</code> - * <code>SwingConstants.NORTH</code> - * <code>SwingConstants.SOUTH</code> + * <ul style="list-style-type:none"> + * <li><code>SwingConstants.WEST</code></li> + * <li><code>SwingConstants.EAST</code></li> + * <li><code>SwingConstants.NORTH</code></li> + * <li><code>SwingConstants.SOUTH</code></li> * </ul> * @param biasRet an array contain the bias that was checked * @return the location within the model that best represents the next @@ -1007,8 +1007,8 @@ * with one or more calls to getChildAllocation that * should also be in the synchronized block. * - * @param x the X coordinate >= 0 - * @param y the Y coordinate >= 0 + * @param x the X coordinate >= 0 + * @param y the Y coordinate >= 0 * @param a the allocation to the View * @return the nearest child index */
--- a/jdk/src/share/classes/javax/swing/text/AttributeSet.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/AttributeSet.java Tue Oct 08 14:53:14 2013 -0700 @@ -89,7 +89,7 @@ * Returns the number of attributes that are defined locally in this set. * Attributes that are defined in the parent set are not included. * - * @return the number of attributes >= 0 + * @return the number of attributes >= 0 */ public int getAttributeCount();
--- a/jdk/src/share/classes/javax/swing/text/BadLocationException.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/BadLocationException.java Tue Oct 08 14:53:14 2013 -0700 @@ -33,7 +33,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/text/DateFormatter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/DateFormatter.java Tue Oct 08 14:53:14 2013 -0700 @@ -39,7 +39,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/text/DefaultCaret.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/DefaultCaret.java Tue Oct 08 14:53:14 2013 -0700 @@ -98,7 +98,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -237,7 +237,7 @@ * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. */ protected final synchronized void repaint() {
--- a/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java Tue Oct 08 14:53:14 2013 -0700 @@ -840,7 +840,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -899,7 +899,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -947,7 +947,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -989,7 +989,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1265,7 +1265,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1301,7 +1301,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1338,7 +1338,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1373,7 +1373,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java Tue Oct 08 14:53:14 2013 -0700 @@ -50,7 +50,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/text/DefaultFormatterFactory.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/DefaultFormatterFactory.java Tue Oct 08 14:53:14 2013 -0700 @@ -64,7 +64,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java Tue Oct 08 14:53:14 2013 -0700 @@ -61,7 +61,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -173,7 +173,7 @@ * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param offset the starting offset >= 0 @@ -426,7 +426,7 @@ * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param pos the offset from the start of the document >= 0 @@ -483,7 +483,7 @@ * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param offset the offset in the document >= 0 @@ -536,7 +536,7 @@ * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param offset the offset into the paragraph >= 0 @@ -1124,7 +1124,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1155,7 +1155,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1390,7 +1390,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */
--- a/jdk/src/share/classes/javax/swing/text/Document.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/Document.java Tue Oct 08 14:53:14 2013 -0700 @@ -46,7 +46,7 @@ * used are the location between two characters. As the diagram * below shows, a location in a text document can be referred to * as a position, or an offset. This position is zero-based. - * <p align=center><img src="doc-files/Document-coord.gif" + * <p style="text-align:center"><img src="doc-files/Document-coord.gif" * alt="The following text describes this graphic."> * <p> * In the example, if the content of a document is the @@ -69,7 +69,7 @@ * Exactly what structure is modeled is up to a particular Document * implementation. It might be as simple as no structure (i.e. a * simple text field), or it might be something like diagram below. - * <p align=center><img src="doc-files/Document-structure.gif" + * <p style="text-align:center"><img src="doc-files/Document-structure.gif" * alt="Diagram shows Book->Chapter->Paragraph"> * <p> * The unit of structure (i.e. a node of the tree) is referred to @@ -122,7 +122,7 @@ * generated since that edit is actually the source of the change * rather than a mutation to the <code>Document</code> made through its * api. - * <p align=center><img src="doc-files/Document-notification.gif" + * <p style="text-align:center"><img src="doc-files/Document-notification.gif" * alt="The preceeding text describes this graphic."> * <p> * Referring to the above diagram, suppose that the component shown @@ -187,7 +187,7 @@ * Returns number of characters of content currently * in the document. * - * @return number of characters >= 0 + * @return number of characters >= 0 */ public int getLength(); @@ -267,7 +267,7 @@ * For a removal, the end of the removal range is collapsed * down to the start of the range, and any marks in the removal * range are collapsed down to the start of the range. - * <p align=center><img src="doc-files/Document-remove.gif" + * <p style="text-align:center"><img src="doc-files/Document-remove.gif" * alt="Diagram shows removal of 'quick' from 'The quick brown fox.'"> * <p> * If the Document structure changed as result of the removal, @@ -280,8 +280,8 @@ * If the Document supports undo/redo, an UndoableEditEvent will * also be generated. * - * @param offs the offset from the beginning >= 0 - * @param len the number of characters to remove >= 0 + * @param offs the offset from the beginning >= 0 + * @param len the number of characters to remove >= 0 * @exception BadLocationException some portion of the removal range * was not a valid part of the document. The location in the exception * is the first bad position encountered. @@ -300,7 +300,7 @@ * insertUpdate method on the DocumentListener. * The offset and length of the generated DocumentEvent * will indicate what change was actually made to the Document. - * <p align=center><img src="doc-files/Document-insert.gif" + * <p style="text-align:center"><img src="doc-files/Document-insert.gif" * alt="Diagram shows insertion of 'quick' in 'The quick brown fox'"> * <p> * If the Document structure changed as result of the insertion, @@ -313,7 +313,7 @@ * If the Document supports undo/redo, an UndoableEditEvent will * also be generated. * - * @param offset the offset into the document to insert the content >= 0. + * @param offset the offset into the document to insert the content >= 0. * All positions that track change at or after the given location * will move. * @param str the string to insert @@ -333,9 +333,9 @@ * of the document. * * @param offset the offset into the document representing the desired - * start of the text >= 0 - * @param length the length of the desired string >= 0 - * @return the text, in a String of length >= 0 + * start of the text >= 0 + * @param length the length of the desired string >= 0 + * @return the text, in a String of length >= 0 * @exception BadLocationException some portion of the given range * was not a valid part of the document. The location in the exception * is the first bad position encountered. @@ -361,7 +361,7 @@ * Segment text = new Segment(); * int offs = 0; * text.setPartialReturn(true); - * while (nleft > 0) { + * while (nleft > 0) { * doc.getText(offs, nleft, text); * // do someting with text * nleft -= text.count; @@ -371,8 +371,8 @@ * </code></pre> * * @param offset the offset into the document representing the desired - * start of the text >= 0 - * @param length the length of the desired string >= 0 + * start of the text >= 0 + * @param length the length of the desired string >= 0 * @param txt the Segment object to return the text in * * @exception BadLocationException Some portion of the given range @@ -409,7 +409,7 @@ * insertion is forced to a position that follows the * original position. * - * @param offs the offset from the start of the document >= 0 + * @param offs the offset from the start of the document >= 0 * @return the position * @exception BadLocationException if the given position does not * represent a valid location in the associated document
--- a/jdk/src/share/classes/javax/swing/text/Element.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/Element.java Tue Oct 08 14:53:14 2013 -0700 @@ -69,7 +69,7 @@ * children, this will be the offset of the first child. * As a document position, there is an implied forward bias. * - * @return the starting offset >= 0 and < getEndOffset(); + * @return the starting offset >= 0 and < getEndOffset(); * @see Document * @see AbstractDocument */ @@ -87,8 +87,8 @@ * the document. As a result of this, it is possible for this to * return a value greater than the length of the document. * - * @return the ending offset > getStartOffset() and - * <= getDocument().getLength() + 1 + * @return the ending offset > getStartOffset() and + * <= getDocument().getLength() + 1 * @see Document * @see AbstractDocument */ @@ -105,8 +105,8 @@ * <code>getElementCount() - 1</code> if the location is * greater than or equal to the end offset. * - * @param offset the specified offset >= 0 - * @return the element index >= 0 + * @param offset the specified offset >= 0 + * @return the element index >= 0 */ public int getElementIndex(int offset); @@ -114,14 +114,14 @@ * Gets the number of child elements contained by this element. * If this element is a leaf, a count of zero is returned. * - * @return the number of child elements >= 0 + * @return the number of child elements >= 0 */ public int getElementCount(); /** * Fetches the child element at the given index. * - * @param index the specified index >= 0 + * @param index the specified index >= 0 * @return the child element */ public Element getElement(int index);
--- a/jdk/src/share/classes/javax/swing/text/InternationalFormatter.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/InternationalFormatter.java Tue Oct 08 14:53:14 2013 -0700 @@ -83,7 +83,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. *
--- a/jdk/src/share/classes/javax/swing/text/JTextComponent.java Tue Oct 08 14:37:33 2013 -0700 +++ b/jdk/src/share/classes/javax/swing/text/JTextComponent.java Tue Oct 08 14:53:14 2013 -0700 @@ -84,7 +84,7 @@ * support). * You can find information on how to use the functionality * this class provides in - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/generaltext.html">General Rules for Using Text Components</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/generaltext.html">General Rules for Using Text Components</a>, * a section in <em>The Java Tutorial.</em> * * <p> @@ -281,7 +281,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1122,7 +1122,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -2215,7 +2215,7 @@ * <p> * This method is thread-safe, although most Swing methods are not. Please * see <A - * HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html"> + * HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"> * Concurrency in Swing</A> for more information. * * <p>