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

Merge

Browse Source
This commit is contained in:
Lana Steuck 2011-09-26 14:30:38 -07:00
commit 9f70387b50
18 changed files with 294 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties
View File

@ -91,6 +91,9 @@ FileChooser.updateButtonToolTipText=Update directory listing
FileChooser.helpButtonToolTipText=FileChooser help
FileChooser.directoryOpenButtonToolTipText=Open selected directory
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=Preview
ColorChooser.okText=OK

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
View File

@ -90,6 +90,9 @@ FileChooser.updateButtonToolTipText=Verzeichnisliste aktualisieren
FileChooser.helpButtonToolTipText=FileChooser-Hilfe
FileChooser.directoryOpenButtonToolTipText=Ausgew\u00E4hltes Verzeichnis \u00F6ffnen
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=Vorschau
ColorChooser.okText=OK

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
View File

@ -90,6 +90,9 @@ FileChooser.updateButtonToolTipText=Actualizar lista de directorios
FileChooser.helpButtonToolTipText=Ayuda del Selector de Archivos
FileChooser.directoryOpenButtonToolTipText=Abrir directorio seleccionado
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=Presentaci\u00F3n Preliminar
ColorChooser.okText=Aceptar

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
View File

@ -90,6 +90,9 @@ FileChooser.updateButtonToolTipText=Met \u00E0 jour la liste des r\u00E9pertoire
FileChooser.helpButtonToolTipText=Aide du s\u00E9lecteur de fichiers
FileChooser.directoryOpenButtonToolTipText=Ouvre le r\u00E9pertoire s\u00E9lectionn\u00E9
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=Aper\u00E7u
ColorChooser.okText=OK

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
View File

@ -90,6 +90,9 @@ FileChooser.updateButtonToolTipText=Aggiorna la lista directory
FileChooser.helpButtonToolTipText=Guida FileChooser
FileChooser.directoryOpenButtonToolTipText=Apre la directory selezionata
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=Anteprima
ColorChooser.okText=OK

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
View File

@ -90,6 +90,9 @@ FileChooser.updateButtonToolTipText=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u
FileChooser.helpButtonToolTipText=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059
FileChooser.directoryOpenButtonToolTipText=\u9078\u629E\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u958B\u304D\u307E\u3059
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=\u30D7\u30EC\u30D3\u30E5\u30FC
ColorChooser.okText=OK

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
View File

@ -90,6 +90,9 @@ FileChooser.updateButtonToolTipText=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uAC31
FileChooser.helpButtonToolTipText=FileChooser \uB3C4\uC6C0\uB9D0
FileChooser.directoryOpenButtonToolTipText=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=\uBBF8\uB9AC\uBCF4\uAE30
ColorChooser.okText=\uD655\uC778

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
View File

@ -90,6 +90,9 @@ FileChooser.updateButtonToolTipText=Atualizar lista de diret\u00F3rios
FileChooser.helpButtonToolTipText=Ajuda do FileChooser
FileChooser.directoryOpenButtonToolTipText=Abrir diret\u00F3rio selecionado
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=Visualizar
ColorChooser.okText=OK

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
View File

@ -90,6 +90,9 @@ FileChooser.updateButtonToolTipText=Uppdatera kataloglistan
FileChooser.helpButtonToolTipText=Hj\u00E4lp - Filv\u00E4ljare
FileChooser.directoryOpenButtonToolTipText=\u00D6ppna vald katalog
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=Granska
ColorChooser.okText=OK

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
View File

@ -90,6 +90,9 @@ FileChooser.updateButtonToolTipText=\u66F4\u65B0\u76EE\u5F55\u5217\u8868
FileChooser.helpButtonToolTipText=FileChooser \u5E2E\u52A9
FileChooser.directoryOpenButtonToolTipText=\u6253\u5F00\u9009\u62E9\u7684\u76EE\u5F55
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=\u9884\u89C8
ColorChooser.okText=\u786E\u5B9A

3
jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
View File

@ -90,6 +90,9 @@ FileChooser.updateButtonToolTipText=\u66F4\u65B0\u76EE\u9304\u6E05\u55AE
FileChooser.helpButtonToolTipText=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E
FileChooser.directoryOpenButtonToolTipText=\u958B\u555F\u9078\u53D6\u7684\u76EE\u9304
FileChooser.filesListAccessibleName=Files List
FileChooser.filesDetailsAccessibleName=Files Details
############ COLOR CHOOSER STRINGS #############
ColorChooser.previewText=\u9810\u89BD
ColorChooser.okText=\u78BA\u5B9A

4
jdk/src/share/classes/java/awt/AWTKeyStroke.java
View File

@ -777,10 +777,6 @@ public class AWTKeyStroke implements Serializable {
*/
protected Object readResolve() throws java.io.ObjectStreamException {
synchronized (AWTKeyStroke.class) {
Class newClass = getClass();
if (!newClass.equals(ctor.getDeclaringClass())) {
registerSubclass(newClass);
}
return getCachedStroke(keyChar, keyCode, modifiers, onKeyRelease);
}
}

39
jdk/src/share/classes/java/awt/EventDispatchThread.java
View File

@ -34,8 +34,10 @@ import java.security.AccessController;
import sun.security.action.GetPropertyAction;
import sun.awt.AWTAutoShutdown;
import sun.awt.SunToolkit;
import sun.awt.AppContext;
import java.util.Vector;
import java.util.ArrayList;
import java.util.List;
import sun.util.logging.PlatformLogger;
import sun.awt.dnd.SunDragSourceContextPeer;
@ -66,11 +68,11 @@ class EventDispatchThread extends Thread {
private EventQueue theQueue;
private boolean doDispatch = true;
private boolean threadDeathCaught = false;
private volatile boolean shutdown = false;
private static final int ANY_EVENT = -1;
private Vector<EventFilter> eventFilters = new Vector<EventFilter>();
private ArrayList<EventFilter> eventFilters = new ArrayList<EventFilter>();
EventDispatchThread(ThreadGroup group, String name, EventQueue queue) {
super(group, name);
@ -84,6 +86,11 @@ class EventDispatchThread extends Thread {
doDispatch = false;
}
public void interrupt() {
shutdown = true;
super.interrupt();
}
public void run() {
while (true) {
try {
@ -93,8 +100,7 @@ class EventDispatchThread extends Thread {
}
});
} finally {
EventQueue eq = getEventQueue();
if (eq.detachDispatchThread(this) || threadDeathCaught) {
if(getEventQueue().detachDispatchThread(this, shutdown)) {
break;
}
}
@ -124,10 +130,9 @@ class EventDispatchThread extends Thread {
void pumpEventsForFilter(int id, Conditional cond, EventFilter filter) {
addEventFilter(filter);
doDispatch = true;
while (doDispatch && cond.evaluate()) {
if (isInterrupted() || !pumpOneEventForFilters(id)) {
doDispatch = false;
}
shutdown |= isInterrupted();
while (doDispatch && !shutdown && cond.evaluate()) {
pumpOneEventForFilters(id);
}
removeEventFilter(filter);
}
@ -163,7 +168,7 @@ class EventDispatchThread extends Thread {
}
}
boolean pumpOneEventForFilters(int id) {
void pumpOneEventForFilters(int id) {
AWTEvent event = null;
boolean eventOK = false;
try {
@ -212,24 +217,18 @@ class EventDispatchThread extends Thread {
if (delegate != null) {
delegate.afterDispatch(event, handle);
}
return true;
}
catch (ThreadDeath death) {
threadDeathCaught = true;
return false;
shutdown = true;
throw death;
}
catch (InterruptedException interruptedException) {
return false; // AppContext.dispose() interrupts all
// Threads in the AppContext
shutdown = true; // AppContext.dispose() interrupts all
// Threads in the AppContext
}
catch (Throwable e) {
processException(e);
}
return true;
}
private void processException(Throwable e) {

16
jdk/src/share/classes/java/awt/EventQueue.java
View File

@ -47,6 +47,7 @@ import sun.awt.AWTAccessor;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.atomic.AtomicInteger;
import java.security.AccessControlContext;
import java.security.ProtectionDomain;
@ -99,12 +100,7 @@ import sun.misc.JavaSecurityAccess;
* @since 1.1
*/
public class EventQueue {
// From Thread.java
private static int threadInitNumber;
private static synchronized int nextThreadNum() {
return threadInitNumber++;
}
private static final AtomicInteger threadInitNumber = new AtomicInteger(0);
private static final int LOW_PRIORITY = 0;
private static final int NORM_PRIORITY = 1;
@ -175,9 +171,9 @@ public class EventQueue {
* Non-zero if a thread is waiting in getNextEvent(int) for an event of
* a particular ID to be posted to the queue.
*/
private int waitForID;
private volatile int waitForID;
private final String name = "AWT-EventQueue-" + nextThreadNum();
private final String name = "AWT-EventQueue-" + threadInitNumber.getAndIncrement();
private static final PlatformLogger eventLog = PlatformLogger.getLogger("java.awt.event.EventQueue");
@ -1030,7 +1026,7 @@ public class EventQueue {
}
}
final boolean detachDispatchThread(EventDispatchThread edt) {
final boolean detachDispatchThread(EventDispatchThread edt, boolean forceDetach) {
/*
* This synchronized block is to secure that the event dispatch
* thread won't die in the middle of posting a new event to the
@ -1049,7 +1045,7 @@ public class EventQueue {
* Fix for 4648733. Check both the associated java event
* queue and the PostEventQueue.
*/
if ((peekEvent() != null) || !SunToolkit.isPostEventQueueEmpty()) {
if (!forceDetach && (peekEvent() != null) || !SunToolkit.isPostEventQueueEmpty()) {
return false;
}
dispatchThread = null;

6
jdk/src/share/classes/javax/swing/SwingUtilities.java
View File

@ -792,7 +792,7 @@ public class SwingUtilities implements SwingConstants
* @return true if the left mouse button was active
*/
public static boolean isLeftMouseButton(MouseEvent anEvent) {
return ((anEvent.getModifiers() & InputEvent.BUTTON1_MASK) != 0);
return (anEvent.getButton() == MouseEvent.BUTTON1);
}
/**
@ -802,7 +802,7 @@ public class SwingUtilities implements SwingConstants
* @return true if the middle mouse button was active
*/
public static boolean isMiddleMouseButton(MouseEvent anEvent) {
return ((anEvent.getModifiers() & InputEvent.BUTTON2_MASK) == InputEvent.BUTTON2_MASK);
return (anEvent.getButton() == MouseEvent.BUTTON2);
}
/**
@ -812,7 +812,7 @@ public class SwingUtilities implements SwingConstants
* @return true if the right mouse button was active
*/
public static boolean isRightMouseButton(MouseEvent anEvent) {
return ((anEvent.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK);
return (anEvent.getButton() == MouseEvent.BUTTON3);
}
/**

1
jdk/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
View File

@ -1,6 +1,5 @@
<html>
<head>
<link href="style.css" rel="stylesheet" type="text/css" />
</head>
<body>
<h1 id="primaryColors">Primary Colors</h1>

12
jdk/src/share/classes/sun/swing/FilePane.java
View File

@ -35,6 +35,7 @@ import java.util.*;
import java.util.List;
import java.util.concurrent.Callable;
import javax.accessibility.AccessibleContext;
import javax.swing.*;
import javax.swing.border.*;
import javax.swing.event.*;
@ -82,6 +83,9 @@ public class FilePane extends JPanel implements PropertyChangeListener {
private JPanel currentViewPanel;
private String[] viewTypeActionNames;
private String filesListAccessibleName = null;
private String filesDetailsAccessibleName = null;
private JPopupMenu contextMenu;
private JMenu viewMenu;
@ -450,6 +454,9 @@ public class FilePane extends JPanel implements PropertyChangeListener {
gigaByteString = UIManager.getString("FileChooser.fileSizeGigaBytes", l);
fullRowSelection = UIManager.getBoolean("FileView.fullRowSelection");
filesListAccessibleName = UIManager.getString("FileChooser.filesListAccessibleName", l);
filesDetailsAccessibleName = UIManager.getString("FileChooser.filesDetailsAccessibleName", l);
renameErrorTitleText = UIManager.getString("FileChooser.renameErrorTitleText", l);
renameErrorText = UIManager.getString("FileChooser.renameErrorText", l);
renameErrorFileExistsText = UIManager.getString("FileChooser.renameErrorFileExistsText", l);
@ -634,6 +641,9 @@ public class FilePane extends JPanel implements PropertyChangeListener {
if (listViewBorder != null) {
scrollpane.setBorder(listViewBorder);
}
list.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY, filesListAccessibleName);
p.add(scrollpane, BorderLayout.CENTER);
return p;
}
@ -1228,6 +1238,8 @@ public class FilePane extends JPanel implements PropertyChangeListener {
detailsTableModel.fireTableStructureChanged();
detailsTable.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY, filesDetailsAccessibleName);
return p;
} // createDetailsView

221
jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java Normal file
View File

@ -0,0 +1,221 @@
/*
* 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 7088744
@summary SwingUtilities.isMiddleMouseButton does not work with ALT/Meta keys
@author Pavel Porvatov
*/
import sun.awt.SunToolkit;
import javax.swing.*;
import java.awt.*;
import java.awt.event.InputEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
public class bug7088744 {
private static volatile JLabel label;
private static volatile Point point;
private static final int MOUSE_CLICKED = 1;
private static final int MOUSE_PRESSED = 2;
private static final int MOUSE_RELEASED = 3;
// Pair with (EventType, Mouse Button)
private static final int[][] BUTTON_EVENTS_SEQUENCE = {
{MOUSE_PRESSED, 1},
{MOUSE_PRESSED, 2},
{MOUSE_PRESSED, 3},
{MOUSE_RELEASED, 1},
{MOUSE_CLICKED, 1},
{MOUSE_RELEASED, 2},
{MOUSE_CLICKED, 2},
{MOUSE_RELEASED, 3},
{MOUSE_CLICKED, 3}
};
private static int eventCount;
public static void main(String[] args) throws Exception {
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
Component source = new JLabel();
MouseEvent mouseEventNoButtons = new MouseEvent(source, 0, System.currentTimeMillis(),
Event.ALT_MASK | Event.META_MASK | InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK,
0, 0, 0, false, MouseEvent.NOBUTTON);
// isLeftMouseButton
if (SwingUtilities.isLeftMouseButton(mouseEventNoButtons)) {
throw new RuntimeException("SwingUtilities.isLeftMouseButton fails 1");
}
if (!SwingUtilities.isLeftMouseButton(new MouseEvent(source, 0, System.currentTimeMillis(),
InputEvent.BUTTON1_MASK, 0, 0, 1, false, MouseEvent.BUTTON1))) {
throw new RuntimeException("SwingUtilities.isLeftMouseButton fails 2");
}
if (!SwingUtilities.isLeftMouseButton(new MouseEvent(source, 0, System.currentTimeMillis(),
InputEvent.BUTTON1_DOWN_MASK, 0, 0, 1, false, MouseEvent.BUTTON1))) {
throw new RuntimeException("SwingUtilities.isLeftMouseButton fails 3");
}
// isMiddleMouseButton
if (SwingUtilities.isMiddleMouseButton(mouseEventNoButtons)) {
throw new RuntimeException("SwingUtilities.isMiddleMouseButton fails 1");
}
if (!SwingUtilities.isMiddleMouseButton(new MouseEvent(source, 0, System.currentTimeMillis(),
InputEvent.BUTTON2_MASK, 0, 0, 1, false, MouseEvent.BUTTON2))) {
throw new RuntimeException("SwingUtilities.isMiddleMouseButton fails 2");
}
if (!SwingUtilities.isMiddleMouseButton(new MouseEvent(source, 0, System.currentTimeMillis(),
InputEvent.BUTTON2_DOWN_MASK, 0, 0, 1, false, MouseEvent.BUTTON2))) {
throw new RuntimeException("SwingUtilities.isMiddleMouseButton fails 3");
}
// isRightMouseButton
if (SwingUtilities.isRightMouseButton(mouseEventNoButtons)) {
throw new RuntimeException("SwingUtilities.isRightMouseButton fails 1");
}
if (!SwingUtilities.isRightMouseButton(new MouseEvent(source, 0, System.currentTimeMillis(),
InputEvent.BUTTON3_MASK, 0, 0, 1, false, MouseEvent.BUTTON3))) {
throw new RuntimeException("SwingUtilities.isRightMouseButton fails 2");
}
if (!SwingUtilities.isRightMouseButton(new MouseEvent(source, 0, System.currentTimeMillis(),
InputEvent.BUTTON3_DOWN_MASK, 0, 0, 1, false, MouseEvent.BUTTON3))) {
throw new RuntimeException("SwingUtilities.isRightMouseButton fails 3");
}
}
});
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
JFrame frame = new JFrame();
label = new JLabel("A label");
label.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
processEvent(MOUSE_CLICKED, e);
}
public void mousePressed(MouseEvent e) {
processEvent(MOUSE_PRESSED, e);
}
public void mouseReleased(MouseEvent e) {
processEvent(MOUSE_RELEASED, e);
}
});
frame.add(label);
frame.setSize(200, 100);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frame.setVisible(true);
}
});
SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
toolkit.realSync();
// On Linux platforms realSync doesn't guaranties setSize completion
Thread.sleep(1000);
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
point = label.getLocationOnScreen();
}
});
Robot robot = new Robot();
robot.setAutoDelay(100);
robot.mouseMove(point.x, point.y);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.mousePress(InputEvent.BUTTON2_MASK);
robot.mousePress(InputEvent.BUTTON3_MASK);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
robot.mouseRelease(InputEvent.BUTTON2_MASK);
robot.mouseRelease(InputEvent.BUTTON3_MASK);
toolkit.realSync();
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
if (eventCount != BUTTON_EVENTS_SEQUENCE.length) {
throw new RuntimeException("Not all events received");
}
}
});
System.out.println("Test passed");
}
private static void processEvent(int eventType, MouseEvent e) {
if (eventCount >= BUTTON_EVENTS_SEQUENCE.length) {
throw new RuntimeException("Unexpected event " + e);
}
int[] arr = BUTTON_EVENTS_SEQUENCE[eventCount];
if (arr[0] != eventType) {
throw new RuntimeException("Unexpected eventType " + eventType + "on step " + eventCount);
}
boolean result;
switch (arr[1]) {
case 1:
result = SwingUtilities.isLeftMouseButton(e);
break;
case 2:
result = SwingUtilities.isMiddleMouseButton(e);
break;
case 3:
result = SwingUtilities.isRightMouseButton(e);
break;
default:
throw new RuntimeException("Incorrect arr[1] on step " + eventCount);
}
if (!result) {
throw new RuntimeException("Test failed on step " + eventCount);
}
eventCount++;
}
}