FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported Classpath 0.18.

Browse source 
* sources.am, Makefile.in: Updated.
	* Makefile.am (nat_source_files): Removed natProxy.cc.
	* java/lang/reflect/natProxy.cc: Removed.
	* gnu/classpath/jdwp/VMFrame.java,
	gnu/classpath/jdwp/VMIdManager.java,
	gnu/classpath/jdwp/VMVirtualMachine.java,
	java/lang/reflect/VMProxy.java: New files.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC
	list.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/net/DefaultContentHandlerFactory.java (getContent):
	Remove ClasspathToolkit references.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/awt/xlib/XCanvasPeer.java: Add new peer methods.
	* gnu/awt/xlib/XFramePeer.java: Likewise.
	* gnu/awt/xlib/XGraphicsConfiguration.java: Likewise.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c.  Add
	classpath/native/jawt/jawt.c.
	* Makefile.in: Regenerate.
	* jawt.c: Remove file.
	* include/Makefile.am (tool_include__HEADERS): Remove jawt.h and
	jawt_md.h.  Add ../classpath/include/jawt.h and
	../classpath/include/jawt_md.h.
	* include/Makefile.in: Regenerate.
	* include/jawt.h: Regenerate.
	* include/jawt_md.h: Regenerate.

From-SVN: r104586
This commit is contained in:
Tom Tromey 2005-09-23 21:31:04 +00:00
parent 9b044d1951
commit 1ea63ef8be
544 changed files with 34724 additions and 14512 deletions
Download patch file Download diff file Expand all files Collapse all files

62
libjava/classpath/javax/swing/JOptionPane.java
View file

@ -384,8 +384,8 @@ public class JOptionPane extends JComponent implements Accessible
}
/**
* This method creates a new JInternalFrame that is in the JDesktopPane
* which contains the parentComponent given. If no suitable JDesktopPane
* This method creates a new JInternalFrame that is in the JLayeredPane
* which contains the parentComponent given. If no suitable JLayeredPane
* can be found from the parentComponent given, a RuntimeException will be
* thrown.
*
@ -395,25 +395,42 @@ public class JOptionPane extends JComponent implements Accessible
* @return A new JInternalFrame based on the JOptionPane configuration.
*
* @throws RuntimeException If no suitable JDesktopPane is found.
*
* @specnote The specification says that the internal frame is placed
* in the nearest <code>JDesktopPane</code> that is found in
* <code>parent</code>'s ancestors. The behaviour of the JDK
* is that it actually looks up the nearest
* <code>JLayeredPane</code> in <code>parent</code>'s ancestors.
* So do we.
*/
public JInternalFrame createInternalFrame(Component parentComponent,
String title)
throws RuntimeException
{
JDesktopPane toUse = getDesktopPaneForComponent(parentComponent);
// Try to find a JDesktopPane.
JLayeredPane toUse = getDesktopPaneForComponent(parentComponent);
// If we don't have a JDesktopPane, we try to find a JLayeredPane.
if (toUse == null)
throw new RuntimeException("parentComponent does not have a valid parent");
toUse = JLayeredPane.getLayeredPaneAbove(parentComponent);
// If this still fails, we throw a RuntimeException.
if (toUse == null)
throw new RuntimeException
("parentComponent does not have a valid parent");
JInternalFrame frame = new JInternalFrame(title);
inputValue = UNINITIALIZED_VALUE;
value = UNINITIALIZED_VALUE;
frame.setContentPane(this);
frame.setClosable(true);
toUse.add(frame);
// FIXME: JLayeredPane broken? See bug # 16576
// frame.setLayer(JLayeredPane.MODAL_LAYER);
toUse.add(frame);
frame.setLayer(JLayeredPane.MODAL_LAYER);
frame.pack();
frame.setVisible(true);
return frame;
}
@ -1102,7 +1119,7 @@ public class JOptionPane extends JComponent implements Accessible
JOptionPane pane = new JOptionPane(message);
JInternalFrame frame = pane.createInternalFrame(parentComponent, null);
startModal(frame, pane);
startModal(frame);
return ((Integer) pane.getValue()).intValue();
}
@ -1127,7 +1144,7 @@ public class JOptionPane extends JComponent implements Accessible
JOptionPane pane = new JOptionPane(message, PLAIN_MESSAGE, optionType);
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame, pane);
startModal(frame);
return ((Integer) pane.getValue()).intValue();
}
@ -1153,7 +1170,7 @@ public class JOptionPane extends JComponent implements Accessible
JOptionPane pane = new JOptionPane(message, messageType, optionType);
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame, pane);
startModal(frame);
return ((Integer) pane.getValue()).intValue();
}
@ -1181,7 +1198,7 @@ public class JOptionPane extends JComponent implements Accessible
JOptionPane pane = new JOptionPane(message, messageType, optionType, icon);
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame, pane);
startModal(frame);
return ((Integer) pane.getValue()).intValue();
}
@ -1204,7 +1221,7 @@ public class JOptionPane extends JComponent implements Accessible
pane.setWantsInput(true);
JInternalFrame frame = pane.createInternalFrame(parentComponent, null);
startModal(frame, pane);
startModal(frame);
return (String) pane.getInputValue();
}
@ -1230,7 +1247,7 @@ public class JOptionPane extends JComponent implements Accessible
pane.setWantsInput(true);
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame, pane);
startModal(frame);
return (String) pane.getInputValue();
}
@ -1265,7 +1282,7 @@ public class JOptionPane extends JComponent implements Accessible
pane.setInitialSelectionValue(initialSelectionValue);
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame, pane);
startModal(frame);
return (String) pane.getInputValue();
}
@ -1284,7 +1301,7 @@ public class JOptionPane extends JComponent implements Accessible
JOptionPane pane = new JOptionPane(message);
JInternalFrame frame = pane.createInternalFrame(parentComponent, null);
startModal(frame, pane);
startModal(frame);
}
/**
@ -1304,7 +1321,7 @@ public class JOptionPane extends JComponent implements Accessible
JOptionPane pane = new JOptionPane(message, messageType);
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame, pane);
startModal(frame);
}
/**
@ -1326,7 +1343,7 @@ public class JOptionPane extends JComponent implements Accessible
pane.setIcon(icon);
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame, pane);
startModal(frame);
}
/**
@ -1358,7 +1375,7 @@ public class JOptionPane extends JComponent implements Accessible
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame, pane);
startModal(frame);
return ((Integer) pane.getValue()).intValue();
}
@ -1509,15 +1526,8 @@ public class JOptionPane extends JComponent implements Accessible
* @param f The JInternalFrame to make modal.
* @param pane The JOptionPane to add to the JInternalFrame.
*/
private static void startModal(JInternalFrame f, JOptionPane pane)
private static void startModal(JInternalFrame f)
{
f.getContentPane().add(pane);
f.pack();
f.show();
Dimension pref = f.getPreferredSize();
f.setBounds(0, 0, pref.width, pref.height);
synchronized (f)
{
final JInternalFrame tmp = f;