stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2012-11-20 11:47:52 -08:00
commit 12c1fa1d8b
6 changed files with 170 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/share/classes/sun/awt/im/InputContext.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2012, 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
@ -786,7 +786,7 @@ public class InputContext extends java.awt.im.InputContext
public void disableNativeIM() {
InputMethod inputMethod = getInputMethod();
if (inputMethod != null && inputMethod instanceof InputMethodAdapter) {
((InputMethodAdapter)inputMethod).disableInputMethod();
((InputMethodAdapter)inputMethod).stopListening();
}
}

3
jdk/src/share/classes/sun/awt/im/InputMethodAdapter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2012, 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
@ -79,7 +79,6 @@ public abstract class InputMethodAdapter implements InputMethod {
/**
* Informs the input method adapter not to listen to the native events.
* This method is called when a Java input method is active.
*/
protected void stopListening() {
// ignore - adapters can override if needed

6
jdk/src/solaris/classes/sun/awt/X11InputMethod.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2012, 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
@ -415,6 +415,10 @@ public abstract class X11InputMethod extends InputMethodAdapter {
setXICFocus(getPeer(lastXICFocussedComponent), false, isLastXICActive);
lastXICFocussedComponent = null;
isLastXICActive = false;
resetXIC();
needResetXICClient = null;
needResetXIC = false;
}
}

4
jdk/test/java/beans/EventHandler/Test6277266.java
View File

@ -51,9 +51,11 @@ public class Test6277266 {
)
);
throw new Error("SecurityException expected");
} catch (SecurityException exception) {
return; // expected security exception in JDK 7
} catch (InvocationTargetException exception) {
if (exception.getCause() instanceof SecurityException){
return; // expected security exception
return; // expected security exception in JDK 8
}
throw new Error("unexpected exception", exception);
} catch (InterruptedException exception) {

28
jdk/test/javax/swing/text/StyledEditorKit/4506788/bug4506788.html Normal file
View File

@ -0,0 +1,28 @@
<!--
Copyright (c) 2012, 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.
-->
<Html>
<Body>
<APPLET code="bug4506788.class" WIDTH = 600 HEIGHT = 400></APPLET>
</Body>
</Html>

131
jdk/test/javax/swing/text/StyledEditorKit/4506788/bug4506788.java Normal file
View File

@ -0,0 +1,131 @@
/*
* Copyright (c) 2012, 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 4506788 7147408
@summary Tests if cursor gets stuck after insertion a character
@author Denis Sharypov
@run applet bug4506788.html
*/
import java.awt.*;
import java.awt.event.*;
import java.lang.reflect.InvocationTargetException;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
import sun.awt.SunToolkit;
public class bug4506788 extends JApplet {
private volatile boolean passed = false;
private JEditorPane jep;
private SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
@Override
public void init() {
try {
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
createAndShowGUI();
}
});
} catch (InterruptedException | InvocationTargetException ex) {
ex.printStackTrace();
throw new RuntimeException("FAILED: SwingUtilities.invokeAndWait method failed then creating and showing GUI");
}
}
@Override
public void start() {
Robot robot;
try {
robot = new Robot();
} catch (AWTException e) {
throw new RuntimeException("Robot could not be created");
}
toolkit.realSync();
Point p;
try {
p = getJEPLocOnScreen();
} catch (Exception e) {
throw new RuntimeException("Could not get JEditorPane location on screen");
}
robot.setAutoDelay(50);
robot.mouseMove(p.x, p.y);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
robot.keyPress(KeyEvent.VK_RIGHT);
robot.keyRelease(KeyEvent.VK_RIGHT);
robot.keyPress(KeyEvent.VK_X);
robot.keyRelease(KeyEvent.VK_X);
robot.keyPress(KeyEvent.VK_RIGHT);
robot.keyRelease(KeyEvent.VK_RIGHT);
toolkit.realSync();
if (!passed) {
throw new RuntimeException("Test failed.");
}
}
private Point getJEPLocOnScreen() throws Exception {
final Point[] result = new Point[1];
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
result[0] = jep.getLocationOnScreen();
}
});
return result[0];
}
private void createAndShowGUI() {
jep = new JEditorPane();
String text = "abc";
JFrame f = new JFrame();
jep.setEditorKit(new StyledEditorKit());
jep.setText(text);
jep.addCaretListener(new CaretListener() {
@Override
public void caretUpdate(CaretEvent e) {
passed = (e.getDot() == 3);
}
});
DefaultStyledDocument doc = (DefaultStyledDocument) jep.getDocument();
MutableAttributeSet atr = new SimpleAttributeSet();
StyleConstants.setBold(atr, true);
doc.setCharacterAttributes(1, 1, atr, false);
f.getContentPane().add(jep);
f.setSize(100, 100);
f.setVisible(true);
}
}