--- a/jdk/src/share/classes/sun/text/bidi/BidiBase.java Thu Jun 30 14:18:40 2011 -0700
+++ b/jdk/src/share/classes/sun/text/bidi/BidiBase.java Mon Jul 11 16:54:21 2011 -0700
@@ -2690,6 +2690,7 @@
public void setPara(AttributedCharacterIterator paragraph)
{
byte paraLvl;
+ char ch = paragraph.first();
Boolean runDirection =
(Boolean) paragraph.getAttribute(TextAttributeConstants.RUN_DIRECTION);
Object shaper = paragraph.getAttribute(TextAttributeConstants.NUMERIC_SHAPING);
@@ -2705,7 +2706,6 @@
byte[] embeddingLevels = new byte[len];
char[] txt = new char[len];
int i = 0;
- char ch = paragraph.first();
while (ch != AttributedCharacterIterator.DONE) {
txt[i] = ch;
Integer embedding =
@@ -3411,18 +3411,21 @@
* Display the bidi internal state, used in debugging.
*/
public String toString() {
- StringBuffer buf = new StringBuffer(super.toString());
+ StringBuilder buf = new StringBuilder(getClass().getName());
- buf.append("[dir: " + direction);
- buf.append(" baselevel: " + paraLevel);
- buf.append(" length: " + length);
+ buf.append("[dir: ");
+ buf.append(direction);
+ buf.append(" baselevel: ");
+ buf.append(paraLevel);
+ buf.append(" length: ");
+ buf.append(length);
buf.append(" runs: ");
if (levels == null) {
- buf.append("null");
+ buf.append("none");
} else {
buf.append('[');
buf.append(levels[0]);
- for (int i = 0; i < levels.length; i++) {
+ for (int i = 1; i < levels.length; i++) {
buf.append(' ');
buf.append(levels[i]);
}
@@ -3430,12 +3433,11 @@
}
buf.append(" text: [0x");
buf.append(Integer.toHexString(text[0]));
- for (int i = 0; i < text.length; i++) {
+ for (int i = 1; i < text.length; i++) {
buf.append(" 0x");
buf.append(Integer.toHexString(text[i]));
}
- buf.append(']');
- buf.append(']');
+ buf.append("]]");
return buf.toString();
}
--- a/jdk/src/windows/native/sun/windows/awt_Choice.cpp Thu Jun 30 14:18:40 2011 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Choice.cpp Mon Jul 11 16:54:21 2011 -0700
@@ -396,12 +396,6 @@
DASSERT(::IsWindow(hwnd));
- // This branch is required for the proper work of AwtComponent::GetComponent() method
- // while hovering drop-down list
- if (message == WmAwtIsComponent) {
- return (LRESULT)TRUE;
- }
-
switch (message) {
case WM_LBUTTONDOWN: {
DWORD curPos = ::GetMessagePos();
--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp Thu Jun 30 14:18:40 2011 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp Mon Jul 11 16:54:21 2011 -0700
@@ -364,6 +364,7 @@
AwtComponent *component =
(AwtComponent *)::GetWindowLongPtr(hWnd, GWLP_USERDATA);
DASSERT(!component || !IsBadReadPtr(component, sizeof(AwtComponent)) );
+ DASSERT(!component || component->GetHWnd() == hWnd );
return component;
}
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Thu Jun 30 14:18:40 2011 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Mon Jul 11 16:54:21 2011 -0700
@@ -1444,7 +1444,6 @@
AwtComponent* mouseComp =
AwtComponent::GetComponent(hWndFromPoint);
// Need extra copies for non-client area issues
- AwtComponent* mouseWheelComp = mouseComp;
HWND hWndForWheel = hWndFromPoint;
// If the point under the mouse isn't in the client area,
@@ -1510,9 +1509,9 @@
*/
if (msg.message == WM_MOUSEWHEEL &&
- mouseWheelComp != NULL) { //i.e. mouse is over client area for this
- //window
- msg.hwnd = hWndForWheel;
+ AwtToolkit::MainThread() == ::GetWindowThreadProcessId(hWndForWheel, NULL)) {
+ //i.e. mouse is over client area for this window
+ msg.hwnd = hWndForWheel;
}
/*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java Mon Jul 11 16:54:21 2011 -0700
@@ -0,0 +1,149 @@
+/*
+ * 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.
+ *
+ * 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 7050935
+ @summary closed/java/awt/Choice/WheelEventsConsumed/WheelEventsConsumed.html fails on win32
+ @author Oleg Pekhovskiy: area=awt-choice
+ @run main ChoiceMouseWheelTest
+*/
+
+import test.java.awt.regtesthelpers.Util;
+
+import java.awt.*;
+import java.awt.event.*;
+
+public class ChoiceMouseWheelTest extends Frame {
+
+ private volatile boolean itemChanged = false;
+ private volatile boolean wheelMoved = false;
+ private volatile boolean frameExited = false;
+
+ public static void main(String[] args) {
+ new ChoiceMouseWheelTest();
+ }
+
+ ChoiceMouseWheelTest() {
+ super("ChoiceMouseWheelTest");
+ setLayout(new FlowLayout());
+
+ Choice choice = new Choice();
+
+ addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ System.exit(0);
+ }
+ });
+
+ for(Integer i = 0; i < 50; i++) {
+ choice.add(i.toString());
+ }
+
+ choice.addItemListener(new ItemListener() {
+ public void itemStateChanged(ItemEvent e) {
+ itemChanged = true;
+ }
+ });
+ choice.addMouseWheelListener(new MouseWheelListener() {
+ public void mouseWheelMoved(MouseWheelEvent e) {
+ wheelMoved = true;
+ }
+ });
+
+ addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseExited(MouseEvent e) {
+ frameExited = true;
+ }
+ });
+
+ add(choice);
+ setSize(200, 300);
+ setVisible(true);
+ toFront();
+
+ try {
+ Robot robot = new Robot();
+ robot.setAutoDelay(20);
+ Util.waitForIdle(robot);
+
+ Point pt = choice.getLocationOnScreen();
+ Dimension size = choice.getSize();
+ int x = pt.x + size.width / 3;
+ robot.mouseMove(x, pt.y + size.height / 2);
+
+ // Test mouse wheel over the choice
+ String name = Toolkit.getDefaultToolkit().getClass().getName();
+ if(!name.equals("sun.awt.X11.XToolkit")) { // mouse wheel doesn't work for the choice on X11, so skip it
+ robot.mouseWheel(1);
+ Util.waitForIdle(robot);
+
+ if(!wheelMoved || !itemChanged) {
+ throw new RuntimeException("Mouse Wheel over the choice failed!");
+ }
+ }
+
+ // Test mouse wheel over the drop-down list
+ robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+ Util.waitForIdle(robot);
+ robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+ Util.waitForIdle(robot);
+
+ int y = getLocationOnScreen().y + getSize().height;
+ while(!frameExited && y >= 0) { // move to the bottom of drop-down list
+ robot.mouseMove(x, --y);
+ Util.waitForIdle(robot);
+ }
+
+ if(x < 0) {
+ throw new RuntimeException("Could not enter drop-down list!");
+ }
+
+ y -= choice.getHeight() / 2;
+ robot.mouseMove(x, y); // move to the last visible item in the drop-down list
+ Util.waitForIdle(robot);
+
+ robot.mouseWheel(choice.getItemCount()); // wheel to the last item
+ Util.waitForIdle(robot);
+
+ // click the last item
+ itemChanged = false;
+ robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+ Util.waitForIdle(robot);
+ robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+ Util.waitForIdle(robot);
+
+ if(!itemChanged || choice.getSelectedIndex() != choice.getItemCount() - 1) {
+ throw new RuntimeException("Mouse Wheel scroll position error!");
+ }
+
+ System.exit(0);
+
+ } catch (AWTException e) {
+ throw new RuntimeException("AWTException occurred - problem creating robot!");
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/text/Bidi/Bug7042148.java Mon Jul 11 16:54:21 2011 -0700
@@ -0,0 +1,92 @@
+/*
+ * 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.
+ *
+ * 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 7042148
+ * @summary verify that Bidi.baseIsLeftToRight() returns the correct value even if an incorrect position is set in the given AttributedCharacterIterator.
+ */
+import java.awt.font.*;
+import java.text.*;
+import java.util.*;
+
+public class Bug7042148 {
+
+ private static boolean err = false;
+
+ public static void main(String[] args) {
+ testDirection();
+
+ if (err) {
+ throw new RuntimeException("Failed");
+ } else {
+ System.out.println("Passed.");
+ }
+ }
+
+ private static void testDirection() {
+ Map attrLTR = new HashMap();
+ attrLTR.put(TextAttribute.RUN_DIRECTION,
+ TextAttribute.RUN_DIRECTION_LTR);
+ Map attrRTL = new HashMap();
+ attrRTL.put(TextAttribute.RUN_DIRECTION,
+ TextAttribute.RUN_DIRECTION_RTL);
+
+ String str1 = "A\u05e0";
+ String str2 = "\u05e0B";
+
+ test(str1, attrLTR, Bidi.DIRECTION_LEFT_TO_RIGHT);
+ test(str1, attrRTL, Bidi.DIRECTION_RIGHT_TO_LEFT);
+ test(str2, attrLTR, Bidi.DIRECTION_LEFT_TO_RIGHT);
+ test(str2, attrRTL, Bidi.DIRECTION_RIGHT_TO_LEFT);
+ }
+
+ private static void test(String text, Map attr, int dirFlag) {
+ boolean expected = (dirFlag == Bidi.DIRECTION_LEFT_TO_RIGHT);
+
+ Bidi bidi = new Bidi(text, dirFlag);
+ boolean got = bidi.baseIsLeftToRight();
+ if (got != expected) {
+ err = true;
+ System.err.println("wrong Bidi(String, int).baseIsLeftToRight() value: " +
+ "\n\ttext=" + text +
+ "\n\tExpected=" + expected +
+ "\n\tGot=" + got);
+ }
+
+ AttributedString as = new AttributedString(text, attr);
+ AttributedCharacterIterator itr = as.getIterator();
+ itr.last();
+ itr.next();
+ bidi = new Bidi(itr);
+ got = bidi.baseIsLeftToRight();
+ if (got != expected) {
+ err = true;
+ System.err.println("Wrong Bidi(AttributedCharacterIterator).baseIsLeftToRight() value: " +
+ "\n\ttext=" + text +
+ "\n\tExpected=" + expected +
+ "\n\tGot=" + got);
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/text/Bidi/Bug7051769.java Mon Jul 11 16:54:21 2011 -0700
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ *
+ * 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 7051769
+ * @summary verify that Bidi.toString() returns the corect result.
+ */
+import java.awt.font.*;
+import java.text.*;
+import java.util.*;
+
+public class Bug7051769 {
+
+ private static boolean err = false;
+
+ public static void main(String[] args) {
+ testNumericShaping();
+
+ if (err) {
+ throw new RuntimeException("Failed");
+ } else {
+ System.out.println("Passed.");
+ }
+ }
+
+ private static void testNumericShaping() {
+ Map attrNS = new HashMap();
+ attrNS.put(TextAttribute.NUMERIC_SHAPING,
+ NumericShaper.getContextualShaper(NumericShaper.ARABIC));
+ attrNS.put(TextAttribute.RUN_DIRECTION,
+ TextAttribute.RUN_DIRECTION_RTL);
+
+ String text = "\u0623\u0643\u062a\u0648\u0628\u0631 10";
+ String expected = "sun.text.bidi.BidiBase[dir: 2 baselevel: 1 length: 9 runs: [1 1 1 1 1 1 1 2 2] text: [0x623 0x643 0x62a 0x648 0x628 0x631 0x20 0x661 0x660]]";
+
+ AttributedString as = new AttributedString(text, attrNS);
+ AttributedCharacterIterator itr = as.getIterator();
+ itr.last();
+ itr.next();
+ Bidi bidi = new Bidi(itr);
+ String got = bidi.toString();
+
+ if (!got.equals(expected)) {
+ err = true;
+ System.err.println("Wrong toString() output: " +
+ "\n\tExpected=" + expected +
+ "\n\tGot=" + got);
+ }
+ }
+
+}