mirror of
https://github.com/openjdk/jdk.git
synced 2026-03-25 07:09:55 +00:00
Merge
This commit is contained in:
commit
929f1f0d78
@ -9,3 +9,4 @@ b7474b739d13bacd9972f88ac91f6350b7b0be12 jdk7-b31
|
||||
c51121419e30eac5f0fbbce45ff1711c4ce0de28 jdk7-b32
|
||||
fa4c0a6cdd25d97d4e6f5d7aa180bcbb0e0d56af jdk7-b33
|
||||
434055a0716ee44bca712ebca02fc04b20e6e288 jdk7-b34
|
||||
cf4894b78ceb966326e93bf221db0c2d14d59218 jdk7-b35
|
||||
|
||||
@ -23,10 +23,6 @@
|
||||
# have any questions.
|
||||
#
|
||||
|
||||
#
|
||||
# Makefile for building com/sun
|
||||
#
|
||||
|
||||
BUILDDIR = ../../..
|
||||
include $(BUILDDIR)/common/Defs.gmk
|
||||
|
||||
|
||||
@ -23,10 +23,6 @@
|
||||
# have any questions.
|
||||
#
|
||||
|
||||
#
|
||||
# Makefile for building com/sun
|
||||
#
|
||||
|
||||
BUILDDIR = ../../../..
|
||||
include $(BUILDDIR)/common/Defs.gmk
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
#
|
||||
|
||||
#
|
||||
# Makefile for building JNDI service provider toolkit
|
||||
# Makefile for building JNDI DNS name service provider
|
||||
#
|
||||
|
||||
BUILDDIR = ../../../../..
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1996-1997 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1996-2008 Sun Microsystems, Inc. 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
|
||||
@ -34,6 +34,7 @@ package java.net;
|
||||
*/
|
||||
|
||||
public class BindException extends SocketException {
|
||||
private static final long serialVersionUID = -5945005768251722951L;
|
||||
|
||||
/**
|
||||
* Constructs a new BindException with the specified detail
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1996-1997 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1996-2008 Sun Microsystems, Inc. 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
|
||||
@ -34,6 +34,8 @@ package java.net;
|
||||
* @since JDK1.1
|
||||
*/
|
||||
public class ConnectException extends SocketException {
|
||||
private static final long serialVersionUID = 3831404271622369215L;
|
||||
|
||||
/**
|
||||
* Constructs a new ConnectException with the specified detail
|
||||
* message as to why the connect error occurred.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2004-2008 Sun Microsystems, Inc. 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
|
||||
@ -37,6 +37,7 @@ import java.io.IOException;
|
||||
*/
|
||||
public
|
||||
class HttpRetryException extends IOException {
|
||||
private static final long serialVersionUID = -9186022286469111381L;
|
||||
|
||||
private int responseCode;
|
||||
private String location;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1995-2008 Sun Microsystems, Inc. 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
|
||||
@ -36,6 +36,8 @@ import java.io.IOException;
|
||||
* @since JDK1.0
|
||||
*/
|
||||
public class MalformedURLException extends IOException {
|
||||
private static final long serialVersionUID = -182787522200415866L;
|
||||
|
||||
/**
|
||||
* Constructs a <code>MalformedURLException</code> with no detail message.
|
||||
*/
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1996-1997 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1996-2008 Sun Microsystems, Inc. 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
|
||||
@ -34,6 +34,8 @@ package java.net;
|
||||
* @since JDK1.1
|
||||
*/
|
||||
public class NoRouteToHostException extends SocketException {
|
||||
private static final long serialVersionUID = -1897550894873493790L;
|
||||
|
||||
/**
|
||||
* Constructs a new NoRouteToHostException with the specified detail
|
||||
* message as to why the remote host cannot be reached.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2001 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2001-2008 Sun Microsystems, Inc. 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
|
||||
@ -33,6 +33,7 @@ package java.net;
|
||||
*/
|
||||
|
||||
public class PortUnreachableException extends SocketException {
|
||||
private static final long serialVersionUID = 8462541992376507323L;
|
||||
|
||||
/**
|
||||
* Constructs a new <code>PortUnreachableException</code> with a
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1995-2008 Sun Microsystems, Inc. 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
|
||||
@ -36,6 +36,8 @@ import java.io.IOException;
|
||||
*/
|
||||
public
|
||||
class ProtocolException extends IOException {
|
||||
private static final long serialVersionUID = -6098449442062388080L;
|
||||
|
||||
/**
|
||||
* Constructs a new <code>ProtocolException</code> with the
|
||||
* specified detail message.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1995-2006 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1995-2008 Sun Microsystems, Inc. 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
|
||||
@ -35,6 +35,8 @@ import java.io.IOException;
|
||||
*/
|
||||
public
|
||||
class SocketException extends IOException {
|
||||
private static final long serialVersionUID = -5935874303556886934L;
|
||||
|
||||
/**
|
||||
* Constructs a new <code>SocketException</code> with the
|
||||
* specified detail message.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2000-2008 Sun Microsystems, Inc. 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
|
||||
@ -32,6 +32,7 @@ package java.net;
|
||||
*/
|
||||
|
||||
public class SocketTimeoutException extends java.io.InterruptedIOException {
|
||||
private static final long serialVersionUID = -8846654841826352300L;
|
||||
|
||||
/**
|
||||
* Constructs a new SocketTimeoutException with a detail
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2000-2008 Sun Microsystems, Inc. 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
|
||||
@ -38,6 +38,8 @@ package java.net;
|
||||
public class URISyntaxException
|
||||
extends Exception
|
||||
{
|
||||
private static final long serialVersionUID = 2137979680897488891L;
|
||||
|
||||
private String input;
|
||||
private int index;
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1995-2008 Sun Microsystems, Inc. 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
|
||||
@ -35,6 +35,8 @@ import java.io.IOException;
|
||||
*/
|
||||
public
|
||||
class UnknownHostException extends IOException {
|
||||
private static final long serialVersionUID = -4639126076052875403L;
|
||||
|
||||
/**
|
||||
* Constructs a new <code>UnknownHostException</code> with the
|
||||
* specified detail message.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1995-2008 Sun Microsystems, Inc. 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
|
||||
@ -37,6 +37,8 @@ import java.io.IOException;
|
||||
* @since JDK1.0
|
||||
*/
|
||||
public class UnknownServiceException extends IOException {
|
||||
private static final long serialVersionUID = -4169033248853639508L;
|
||||
|
||||
/**
|
||||
* Constructs a new <code>UnknownServiceException</code> with no
|
||||
* detail message.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2002-2008 Sun Microsystems, Inc. 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
|
||||
@ -30,10 +30,11 @@ import java.net.SocketException;
|
||||
/**
|
||||
* Thrown to indicate a connection reset.
|
||||
*
|
||||
* @since 1.4
|
||||
* @since 1.4.1
|
||||
*/
|
||||
public
|
||||
class ConnectionResetException extends SocketException {
|
||||
private static final long serialVersionUID = -7633185991801851556L;
|
||||
|
||||
public ConnectionResetException(String msg) {
|
||||
super(msg);
|
||||
|
||||
@ -32,6 +32,7 @@ import java.net.URL;
|
||||
*
|
||||
* @author Stanley Man-Kit Ho
|
||||
*/
|
||||
@SuppressWarnings("serial") // never serialized
|
||||
public class ProgressEvent extends EventObject {
|
||||
// URL of the stream
|
||||
private URL url;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1994-1995 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1994-2008 Sun Microsystems, Inc. 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
|
||||
@ -35,6 +35,8 @@ import java.io.*;
|
||||
*/
|
||||
|
||||
public class TelnetProtocolException extends IOException {
|
||||
private static final long serialVersionUID = 8509127047257111343L;
|
||||
|
||||
public TelnetProtocolException(String s) {
|
||||
super(s);
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1994-1995 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1994-2008 Sun Microsystems, Inc. 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
|
||||
@ -34,6 +34,8 @@ import java.io.*;
|
||||
* @author Jonathan Payne
|
||||
*/
|
||||
public class FtpLoginException extends FtpProtocolException {
|
||||
private static final long serialVersionUID = 2218162403237941536L;
|
||||
|
||||
FtpLoginException(String s) {
|
||||
super(s);
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1994-1995 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1994-2008 Sun Microsystems, Inc. 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
|
||||
@ -34,6 +34,8 @@ import java.io.*;
|
||||
* @author Jonathan Payne
|
||||
*/
|
||||
public class FtpProtocolException extends IOException {
|
||||
private static final long serialVersionUID = 5978077070276545054L;
|
||||
|
||||
FtpProtocolException(String s) {
|
||||
super(s);
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2005-2008 Sun Microsystems, Inc. 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
|
||||
@ -29,6 +29,8 @@ package sun.net.httpserver;
|
||||
* A Http error
|
||||
*/
|
||||
class HttpError extends RuntimeException {
|
||||
private static final long serialVersionUID = 8769596371344178179L;
|
||||
|
||||
public HttpError (String msg) {
|
||||
super (msg);
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2005-2008 Sun Microsystems, Inc. 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
|
||||
@ -28,4 +28,5 @@ package sun.net.httpserver;
|
||||
import java.io.*;
|
||||
|
||||
class StreamClosedException extends IOException {
|
||||
private static final long serialVersionUID = -4485921499356327937L;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1995 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1995-2008 Sun Microsystems, Inc. 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
|
||||
@ -32,6 +32,8 @@ import java.io.IOException;
|
||||
* an SMTP session.
|
||||
*/
|
||||
public class SmtpProtocolException extends IOException {
|
||||
private static final long serialVersionUID = -7547136771133814908L;
|
||||
|
||||
SmtpProtocolException(String s) {
|
||||
super(s);
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1996 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1996-2008 Sun Microsystems, Inc. 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
|
||||
@ -33,6 +33,8 @@ package sun.net.www;
|
||||
*/
|
||||
|
||||
public class ApplicationLaunchException extends Exception {
|
||||
private static final long serialVersionUID = -4782286141289536883L;
|
||||
|
||||
public ApplicationLaunchException(String reason) {
|
||||
super(reason);
|
||||
}
|
||||
|
||||
@ -43,6 +43,7 @@ import java.security.PrivilegedAction;
|
||||
* @author Chris Hegarty
|
||||
*/
|
||||
|
||||
@SuppressWarnings("serial") // never serialized
|
||||
public class KeepAliveStreamCleaner extends LinkedBlockingQueue<KeepAliveCleanerEntry> implements Runnable
|
||||
{
|
||||
// maximum amount of remaining data that we will try to cleanup
|
||||
|
||||
@ -59,6 +59,8 @@ class DigestAuthentication extends AuthenticationInfo {
|
||||
// instances as a result of a single authorization (for multiple domains)
|
||||
|
||||
static class Parameters implements java.io.Serializable {
|
||||
private static final long serialVersionUID = -3584543755194526252L;
|
||||
|
||||
private boolean serverQop; // server proposed qop=auth
|
||||
private String opaque;
|
||||
private String cnonce;
|
||||
|
||||
@ -30,18 +30,15 @@ import java.awt.event.*;
|
||||
import java.beans.*;
|
||||
import java.io.*;
|
||||
import java.lang.reflect.Array;
|
||||
import java.text.*;
|
||||
import java.util.*;
|
||||
|
||||
import javax.accessibility.*;
|
||||
import javax.swing.*;
|
||||
import javax.swing.border.*;
|
||||
import javax.swing.event.*;
|
||||
import javax.swing.filechooser.*;
|
||||
import javax.swing.filechooser.FileFilter;
|
||||
|
||||
import com.sun.tools.jconsole.JConsoleContext;
|
||||
import com.sun.tools.jconsole.JConsoleContext.ConnectionState;
|
||||
|
||||
import static com.sun.tools.jconsole.JConsoleContext.ConnectionState.*;
|
||||
|
||||
@ -130,6 +127,7 @@ public class Plotter extends JComponent
|
||||
private int bottomMargin = 45;
|
||||
private int leftMargin = 65;
|
||||
private int rightMargin = 70;
|
||||
private final boolean displayLegend;
|
||||
|
||||
public Plotter() {
|
||||
this(Unit.NONE, 0);
|
||||
@ -139,15 +137,21 @@ public class Plotter extends JComponent
|
||||
this(unit, 0);
|
||||
}
|
||||
|
||||
public Plotter(Unit unit, int decimals) {
|
||||
this(unit,decimals,true);
|
||||
}
|
||||
|
||||
// Note: If decimals > 0 then values must be decimally shifted left
|
||||
// that many places, i.e. multiplied by Math.pow(10.0, decimals).
|
||||
public Plotter(Unit unit, int decimals) {
|
||||
public Plotter(Unit unit, int decimals, boolean displayLegend) {
|
||||
this.displayLegend = displayLegend;
|
||||
setUnit(unit);
|
||||
setDecimals(decimals);
|
||||
|
||||
enableEvents(AWTEvent.MOUSE_EVENT_MASK);
|
||||
|
||||
addMouseListener(new MouseAdapter() {
|
||||
@Override
|
||||
public void mousePressed(MouseEvent e) {
|
||||
if (getParent() instanceof PlotterPanel) {
|
||||
getParent().requestFocusInWindow();
|
||||
@ -240,6 +244,7 @@ public class Plotter extends JComponent
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public JPopupMenu getComponentPopupMenu() {
|
||||
if (popupMenu == null) {
|
||||
popupMenu = new JPopupMenu(Resources.getText("Chart:"));
|
||||
@ -330,6 +335,7 @@ public class Plotter extends JComponent
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void paintComponent(Graphics g) {
|
||||
super.paintComponent(g);
|
||||
|
||||
@ -670,7 +676,7 @@ public class Plotter extends JComponent
|
||||
curValue += "%";
|
||||
}
|
||||
int valWidth = fm.stringWidth(curValue);
|
||||
String legend = seq.name;
|
||||
String legend = (displayLegend?seq.name:"");
|
||||
int legendWidth = fm.stringWidth(legend);
|
||||
if (checkRightMargin(valWidth) || checkRightMargin(legendWidth)) {
|
||||
// Wait for next repaint
|
||||
@ -986,10 +992,12 @@ public class Plotter extends JComponent
|
||||
}
|
||||
|
||||
private static class SaveDataFileChooser extends JFileChooser {
|
||||
private static final long serialVersionUID = -5182890922369369669L;
|
||||
SaveDataFileChooser() {
|
||||
setFileFilter(new FileNameExtensionFilter("CSV file", "csv"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void approveSelection() {
|
||||
File file = getSelectedFile();
|
||||
if (file != null) {
|
||||
@ -1034,6 +1042,7 @@ public class Plotter extends JComponent
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public AccessibleContext getAccessibleContext() {
|
||||
if (accessibleContext == null) {
|
||||
accessibleContext = new AccessiblePlotter();
|
||||
@ -1042,10 +1051,12 @@ public class Plotter extends JComponent
|
||||
}
|
||||
|
||||
protected class AccessiblePlotter extends AccessibleJComponent {
|
||||
private static final long serialVersionUID = -3847205410473510922L;
|
||||
protected AccessiblePlotter() {
|
||||
setAccessibleName(getText("Plotter.accessibleName"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getAccessibleName() {
|
||||
String name = super.getAccessibleName();
|
||||
|
||||
@ -1076,6 +1087,7 @@ public class Plotter extends JComponent
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AccessibleRole getAccessibleRole() {
|
||||
return AccessibleRole.CANVAS;
|
||||
}
|
||||
|
||||
@ -872,8 +872,8 @@ public class XMBeanAttributes extends XTable {
|
||||
MaximizedCellRenderer(Component comp) {
|
||||
this.comp = comp;
|
||||
Dimension d = comp.getPreferredSize();
|
||||
if (d.getHeight() > 200) {
|
||||
comp.setPreferredSize(new Dimension((int) d.getWidth(), 200));
|
||||
if (d.getHeight() > 220) {
|
||||
comp.setPreferredSize(new Dimension((int) d.getWidth(), 220));
|
||||
}
|
||||
}
|
||||
@Override
|
||||
|
||||
@ -34,7 +34,7 @@ public class XPlotter extends Plotter {
|
||||
JTable table;
|
||||
public XPlotter(JTable table,
|
||||
Plotter.Unit unit) {
|
||||
super(unit);
|
||||
super(unit,0,false);
|
||||
this.table = table;
|
||||
}
|
||||
@Override
|
||||
|
||||
@ -27,14 +27,10 @@ package sun.tools.jconsole.inspector;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import java.io.*;
|
||||
import java.util.*;
|
||||
import java.util.Timer;
|
||||
|
||||
import javax.management.*;
|
||||
import javax.swing.*;
|
||||
import javax.swing.border.*;
|
||||
import javax.swing.event.*;
|
||||
|
||||
import sun.tools.jconsole.*;
|
||||
|
||||
@ -127,6 +123,7 @@ public class XPlottingViewer extends PlotterPanel implements ActionListener {
|
||||
setBackground(g.getColor());
|
||||
plotter.paintComponent(g);
|
||||
}*/
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
plotterCache.remove(key);
|
||||
Timer t = timerCache.remove(key);
|
||||
@ -141,9 +138,11 @@ public class XPlottingViewer extends PlotterPanel implements ActionListener {
|
||||
JTable table) {
|
||||
final Plotter plotter = new XPlotter(table, Plotter.Unit.NONE) {
|
||||
Dimension prefSize = new Dimension(400, 170);
|
||||
@Override
|
||||
public Dimension getPreferredSize() {
|
||||
return prefSize;
|
||||
}
|
||||
@Override
|
||||
public Dimension getMinimumSize() {
|
||||
return prefSize;
|
||||
}
|
||||
@ -183,42 +182,40 @@ public class XPlottingViewer extends PlotterPanel implements ActionListener {
|
||||
return plotter;
|
||||
}
|
||||
|
||||
//Create Plotter display
|
||||
private void setupDisplay(Plotter plotter) {
|
||||
//setLayout(new GridLayout(2,0));
|
||||
GridBagLayout gbl = new GridBagLayout();
|
||||
setLayout(gbl);
|
||||
final JPanel buttonPanel = new JPanel();
|
||||
final GridBagLayout gbl = new GridBagLayout();
|
||||
buttonPanel.setLayout(gbl);
|
||||
setLayout(new BorderLayout());
|
||||
plotButton = new JButton(Resources.getText("Discard chart"));
|
||||
plotButton.addActionListener(this);
|
||||
plotButton.setEnabled(true);
|
||||
|
||||
// Add the display to the top four cells
|
||||
GridBagConstraints buttonConstraints = new GridBagConstraints();
|
||||
buttonConstraints.gridx = 0;
|
||||
buttonConstraints.gridy = 0;
|
||||
buttonConstraints.fill = GridBagConstraints.VERTICAL;
|
||||
buttonConstraints.anchor = GridBagConstraints.CENTER;
|
||||
gbl.setConstraints(plotButton, buttonConstraints);
|
||||
add(plotButton);
|
||||
|
||||
GridBagConstraints plotterConstraints = new GridBagConstraints();
|
||||
plotterConstraints.gridx = 0;
|
||||
plotterConstraints.gridy = 1;
|
||||
plotterConstraints.weightx = 1;
|
||||
//plotterConstraints.gridwidth = (int) plotter.getPreferredSize().getWidth();
|
||||
//plotterConstraints.gridheight = (int) plotter.getPreferredSize().getHeight();
|
||||
plotterConstraints.fill = GridBagConstraints.VERTICAL;
|
||||
gbl.setConstraints(plotter, plotterConstraints);
|
||||
|
||||
|
||||
//bordered = new JPanel();
|
||||
//bordered.setPreferredSize(new Dimension(400, 250));
|
||||
//bordered.add(plotButton);
|
||||
//bordered.add(plotter);
|
||||
|
||||
//add(bordered);
|
||||
buttonPanel.add(plotButton);
|
||||
|
||||
if (attributeName != null && attributeName.length()!=0) {
|
||||
final JPanel plotterLabelPanel = new JPanel();
|
||||
final JLabel label = new JLabel(attributeName);
|
||||
final GridBagLayout gbl2 = new GridBagLayout();
|
||||
plotterLabelPanel.setLayout(gbl2);
|
||||
final GridBagConstraints labelConstraints = new GridBagConstraints();
|
||||
labelConstraints.gridx = 0;
|
||||
labelConstraints.gridy = 0;
|
||||
labelConstraints.fill = GridBagConstraints.VERTICAL;
|
||||
labelConstraints.anchor = GridBagConstraints.CENTER;
|
||||
labelConstraints.ipady = 10;
|
||||
gbl2.setConstraints(label, labelConstraints);
|
||||
plotterLabelPanel.add(label);
|
||||
add(plotterLabelPanel, BorderLayout.NORTH);
|
||||
}
|
||||
setPlotter(plotter);
|
||||
add(buttonPanel, BorderLayout.SOUTH);
|
||||
repaint();
|
||||
}
|
||||
|
||||
|
||||
@ -64,6 +64,7 @@ import java.net.*;
|
||||
*/
|
||||
|
||||
class NTLMAuthentication extends AuthenticationInfo {
|
||||
private static final long serialVersionUID = -2403849171106437142L;
|
||||
|
||||
static char NTLM_AUTH = 'N';
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug B6744329
|
||||
* @bug 6744329
|
||||
* @summary Exception in light weight Http server
|
||||
*/
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user