infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-21 10:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2010-11-15 19:01:42 -08:00
commit a497f97e12
7 changed files with 271 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/share/classes/javax/swing/GroupLayout.java
View File

@ -653,6 +653,10 @@ public class GroupLayout implements LayoutManager2 {
*/
public ParallelGroup createParallelGroup(Alignment alignment,
boolean resizable){
if (alignment == null) {
throw new IllegalArgumentException("alignment must be non null");
}
if (alignment == Alignment.BASELINE) {
return new BaselineGroup(resizable);
}

4
jdk/src/share/classes/javax/swing/JComponent.java
View File

@ -4734,6 +4734,8 @@ public abstract class JComponent extends Container implements Serializable,
* Notifies this component that it now has a parent component.
* When this method is invoked, the chain of parent components is
* set up with <code>KeyboardAction</code> event listeners.
* This method is called by the toolkit internally and should
* not be called directly by programs.
*
* @see #registerKeyboardAction
*/
@ -4750,6 +4752,8 @@ public abstract class JComponent extends Container implements Serializable,
* Notifies this component that it no longer has a parent component.
* When this method is invoked, any <code>KeyboardAction</code>s
* set up in the the chain of parent components are removed.
* This method is called by the toolkit internally and should
* not be called directly by programs.
*
* @see #registerKeyboardAction
*/

3
jdk/src/share/classes/javax/swing/Popup.java
View File

@ -156,7 +156,8 @@ public class Popup {
component.setLocation(ownerX, ownerY);
component.getContentPane().add(contents, BorderLayout.CENTER);
contents.invalidate();
component.invalidate();
component.validate();
if(component.isVisible()) {
// Do not call pack() if window is not visible to
// avoid early native peer creation

16
jdk/src/share/classes/javax/swing/text/DefaultHighlighter.java
View File

@ -113,6 +113,14 @@ public class DefaultHighlighter extends LayeredHighlighter {
* @exception BadLocationException if the specified location is invalid
*/
public Object addHighlight(int p0, int p1, Highlighter.HighlightPainter p) throws BadLocationException {
if (p0 < 0) {
throw new BadLocationException("Invalid start offset", p0);
}
if (p1 < p0) {
throw new BadLocationException("Invalid end offset", p1);
}
Document doc = component.getDocument();
HighlightInfo i = (getDrawsLayeredHighlights() &&
(p instanceof LayeredHighlighter.LayerPainter)) ?
@ -217,6 +225,14 @@ public class DefaultHighlighter extends LayeredHighlighter {
* @exception BadLocationException if the specified location is invalid
*/
public void changeHighlight(Object tag, int p0, int p1) throws BadLocationException {
if (p0 < 0) {
throw new BadLocationException("Invalid beginning of the range", p0);
}
if (p1 < p0) {
throw new BadLocationException("Invalid end of the range", p1);
}
Document doc = component.getDocument();
if (tag instanceof LayeredHighlightInfo) {
LayeredHighlightInfo lhi = (LayeredHighlightInfo)tag;

65
jdk/test/javax/swing/GroupLayout/6613904/bug6613904.java Normal file
View File

@ -0,0 +1,65 @@
/*
* Copyright (c) 2010, 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.
*
* 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.
*/
/*
* @test
* @bug 6613904
* @summary javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg
* @author Pavel Porvatov
*/
import javax.swing.*;
public class bug6613904 {
public static void main(String[] args) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
GroupLayout groupLayout = new GroupLayout(new JPanel());
try {
groupLayout.createParallelGroup(null);
throw new RuntimeException("groupLayout.createParallelGroup(null) doesn't throw IAE");
} catch (IllegalArgumentException e) {
// Ok
}
try {
groupLayout.createParallelGroup(null, true);
throw new RuntimeException("groupLayout.createParallelGroup(null, true) doesn't throw IAE");
} catch (IllegalArgumentException e) {
// Ok
}
try {
groupLayout.createParallelGroup(null, false);
throw new RuntimeException("groupLayout.createParallelGroup(null, false) doesn't throw IAE");
} catch (IllegalArgumentException e) {
// Ok
}
}
});
}
}

94
jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java Normal file
View File

@ -0,0 +1,94 @@
/*
* Copyright (c) 2010, 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.
*
* 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.
*/
/*
* @test
* @bug 6987844
* @summary Incorrect width of JComboBox drop down
* @author Alexander Potochkin
* @run main bug6987844
*/
import sun.awt.SunToolkit;
import javax.swing.*;
import java.awt.*;
import java.awt.event.InputEvent;
public class bug6987844 {
static JMenu menu1;
static JMenu menu2;
public static void main(String... args) throws Exception {
SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
Robot robot = new Robot();
robot.setAutoDelay(200);
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
JFrame frame = new JFrame();
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
JMenuBar bar = new JMenuBar();
menu1 = new JMenu("Menu1");
menu1.add(new JMenuItem("item"));
bar.add(menu1);
menu2 = new JMenu("Menu2");
menu2.add(new JMenuItem("item"));
menu2.add(new JMenuItem("item"));
bar.add(menu2);
frame.setJMenuBar(bar);
frame.pack();
frame.setVisible(true);
}
});
toolkit.realSync();
Point point1 = menu1.getLocationOnScreen();
Point point2 = menu2.getLocationOnScreen();
robot.mouseMove(point1.x + 1, point1.y + 1);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
robot.mouseMove(point2.x + 1, point2.y + 1);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
robot.mouseMove(point1.x + 1, point1.y + 1);
toolkit.realSync();
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
Dimension popupSize1 = menu1.getPopupMenu().getSize();
Dimension popupSize2 = menu2.getPopupMenu().getSize();
if (popupSize1.equals(popupSize2)) {
throw new RuntimeException("First popup unexpedetly changed its size");
}
}
});
}
}

86
jdk/test/javax/swing/text/DefaultHighlighter/6771184/bug6771184.java Normal file
View File

@ -0,0 +1,86 @@
/*
* Copyright (c) 2010, 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.
*
* 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.
*/
/*
* @test
* @bug 6771184
* @summary Some methods in text package don't throw BadLocationException when expected
* @author Pavel Porvatov
*/
import javax.swing.*;
import javax.swing.text.BadLocationException;
import javax.swing.text.Highlighter;
import javax.swing.text.JTextComponent;
import java.awt.*;
public class bug6771184 {
public static void main(String[] args) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
JTextArea textArea = new JTextArea("Tested string");
Highlighter highlighter = textArea.getHighlighter();
Highlighter.HighlightPainter myPainter = new Highlighter.HighlightPainter() {
public void paint(Graphics g, int p0, int p1, Shape bounds, JTextComponent c) {
}
};
int negativeTestedData[][] = {{50, 0},
{-1, 1},
{-5, -4},
{Integer.MAX_VALUE, Integer.MIN_VALUE},
{Integer.MIN_VALUE, Integer.MAX_VALUE},
{Integer.MIN_VALUE, Integer.MIN_VALUE}};
for (int[] data : negativeTestedData) {
try {
highlighter.addHighlight(data[0], data[1], myPainter);
throw new RuntimeException("Method addHighlight() does not throw BadLocationException for (" +
data[0] + ", " + data[1] + ") ");
} catch (BadLocationException e) {
// Ok
}
Object objRef;
try {
objRef = highlighter.addHighlight(0, 1, myPainter);
} catch (BadLocationException e) {
throw new RuntimeException("highlighter.addHighlight(0, 1, myPainter) throws exception", e);
}
try {
highlighter.changeHighlight(objRef, data[0], data[1]);
throw new RuntimeException("Method changeHighlight() does not throw BadLocationException for (" +
data[0] + ", " + data[1] + ") ");
} catch (BadLocationException e) {
// Ok
}
}
}
});
}
}