Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
98a7b360
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
98a7b360
编写于
5月 17, 2014
作者:
C
coffeys
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
7ad6476c
04a51b86
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
586 addition
and
20 deletion
+586
-20
src/share/classes/java/lang/ConditionalSpecialCasing.java
src/share/classes/java/lang/ConditionalSpecialCasing.java
+10
-5
src/share/classes/java/lang/String.java
src/share/classes/java/lang/String.java
+3
-1
src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
...lasses/javax/swing/plaf/nimbus/AbstractRegionPainter.java
+3
-2
src/share/classes/javax/swing/plaf/nimbus/skin.laf
src/share/classes/javax/swing/plaf/nimbus/skin.laf
+6
-6
src/share/classes/javax/swing/plaf/synth/SynthContext.java
src/share/classes/javax/swing/plaf/synth/SynthContext.java
+2
-1
src/share/classes/javax/swing/plaf/synth/SynthParser.java
src/share/classes/javax/swing/plaf/synth/SynthParser.java
+2
-1
test/java/awt/Window/AlwaysOnTop/TestAlwaysOnTopBeforeShow.java
...ava/awt/Window/AlwaysOnTop/TestAlwaysOnTopBeforeShow.java
+472
-0
test/java/lang/String/ToLowerCase.java
test/java/lang/String/ToLowerCase.java
+6
-4
test/javax/swing/plaf/nimbus/8041725/bug8041725.java
test/javax/swing/plaf/nimbus/8041725/bug8041725.java
+82
-0
未找到文件。
src/share/classes/java/lang/ConditionalSpecialCasing.java
浏览文件 @
98a7b360
...
...
@@ -62,6 +62,7 @@ final class ConditionalSpecialCasing {
//# Conditional mappings
//# ================================================================================
new
Entry
(
0x03A3
,
new
char
[]{
0x03C2
},
new
char
[]{
0x03A3
},
null
,
FINAL_CASED
),
// # GREEK CAPITAL LETTER SIGMA
new
Entry
(
0x0130
,
new
char
[]{
0x0069
,
0x0307
},
new
char
[]{
0x0130
},
null
,
0
),
// # LATIN CAPITAL LETTER I WITH DOT ABOVE
//# ================================================================================
//# Locale-sensitive mappings
...
...
@@ -77,8 +78,8 @@ final class ConditionalSpecialCasing {
//# ================================================================================
//# Turkish and Azeri
//
new Entry(0x0130, new char[]{0x0069}, new char[]{0x0130}, "tr", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
//
new Entry(0x0130, new char[]{0x0069}, new char[]{0x0130}, "az", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
new
Entry
(
0x0130
,
new
char
[]{
0x0069
},
new
char
[]{
0x0130
},
"tr"
,
0
),
// # LATIN CAPITAL LETTER I WITH DOT ABOVE
new
Entry
(
0x0130
,
new
char
[]{
0x0069
},
new
char
[]{
0x0130
},
"az"
,
0
),
// # LATIN CAPITAL LETTER I WITH DOT ABOVE
new
Entry
(
0x0307
,
new
char
[]{},
new
char
[]{
0x0307
},
"tr"
,
AFTER_I
),
// # COMBINING DOT ABOVE
new
Entry
(
0x0307
,
new
char
[]{},
new
char
[]{
0x0307
},
"az"
,
AFTER_I
),
// # COMBINING DOT ABOVE
new
Entry
(
0x0049
,
new
char
[]{
0x0131
},
new
char
[]{
0x0049
},
"tr"
,
NOT_BEFORE_DOT
),
// # LATIN CAPITAL LETTER I
...
...
@@ -148,21 +149,25 @@ final class ConditionalSpecialCasing {
private
static
char
[]
lookUpTable
(
String
src
,
int
index
,
Locale
locale
,
boolean
bLowerCasing
)
{
HashSet
<
Entry
>
set
=
entryTable
.
get
(
new
Integer
(
src
.
codePointAt
(
index
)));
char
[]
ret
=
null
;
if
(
set
!=
null
)
{
Iterator
<
Entry
>
iter
=
set
.
iterator
();
String
currentLang
=
locale
.
getLanguage
();
while
(
iter
.
hasNext
())
{
Entry
entry
=
iter
.
next
();
String
conditionLang
=
entry
.
getLanguage
();
String
conditionLang
=
entry
.
getLanguage
();
if
(((
conditionLang
==
null
)
||
(
conditionLang
.
equals
(
currentLang
)))
&&
isConditionMet
(
src
,
index
,
locale
,
entry
.
getCondition
()))
{
return
(
bLowerCasing
?
entry
.
getLowerCase
()
:
entry
.
getUpperCase
());
ret
=
bLowerCasing
?
entry
.
getLowerCase
()
:
entry
.
getUpperCase
();
if
(
conditionLang
!=
null
)
{
break
;
}
}
}
}
return
null
;
return
ret
;
}
private
static
boolean
isConditionMet
(
String
src
,
int
index
,
Locale
locale
,
int
condition
)
{
...
...
src/share/classes/java/lang/String.java
浏览文件 @
98a7b360
...
...
@@ -2597,7 +2597,9 @@ public final class String
}
else
{
srcCount
=
1
;
}
if
(
localeDependent
||
srcChar
==
'\
u03A3
'
)
{
// GREEK CAPITAL LETTER SIGMA
if
(
localeDependent
||
srcChar
==
'\
u03A3
'
||
// GREEK CAPITAL LETTER SIGMA
srcChar
==
'\u0130'
)
{
// LATIN CAPITAL LETTER I WITH DOT ABOVE
lowerChar
=
ConditionalSpecialCasing
.
toLowerCaseEx
(
this
,
i
,
locale
);
}
else
{
lowerChar
=
Character
.
toLowerCase
(
srcChar
);
...
...
src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
浏览文件 @
98a7b360
...
...
@@ -31,6 +31,7 @@ import javax.swing.*;
import
javax.swing.plaf.UIResource
;
import
javax.swing.Painter
;
import
java.awt.print.PrinterGraphics
;
import
sun.reflect.misc.MethodUtil
;
/**
* Convenient base class for defining Painter instances for rendering a
...
...
@@ -445,8 +446,8 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
}
else
{
String
s
=
"get"
+
Character
.
toUpperCase
(
property
.
charAt
(
0
))
+
property
.
substring
(
1
);
try
{
Method
method
=
c
.
getClass
().
getMethod
(
s
);
color
=
(
Color
)
method
.
invoke
(
c
);
Method
method
=
MethodUtil
.
getMethod
(
c
.
getClass
(),
s
,
null
);
color
=
(
Color
)
MethodUtil
.
invoke
(
method
,
c
,
null
);
}
catch
(
Exception
e
)
{
//don't do anything, it just didn't work, that's all.
//This could be a normal occurance if you use a property
...
...
src/share/classes/javax/swing/plaf/nimbus/skin.laf
浏览文件 @
98a7b360
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1998, 201
0
, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1998, 201
4
, 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
...
...
@@ -13424,10 +13424,10 @@
<state stateKeys="Selected">
<style>
<textForeground>
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"
uiResource="false"
/>
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
</textForeground>
<textBackground>
<matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"
uiResource="false"
/>
<matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
</textBackground>
<background/>
<inherit-textForeground>false</inherit-textForeground>
...
...
@@ -13453,7 +13453,7 @@
<style>
<textForeground/>
<textBackground>
<matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"
uiResource="false"
/>
<matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
</textBackground>
<background/>
<inherit-textBackground>false</inherit-textBackground>
...
...
@@ -13477,7 +13477,7 @@
<state stateKeys="Disabled">
<style>
<textForeground>
<matte red="142" green="143" blue="145" alpha="255" uiDefaultParentName="nimbusDisabledText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"
uiResource="false"
/>
<matte red="142" green="143" blue="145" alpha="255" uiDefaultParentName="nimbusDisabledText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
</textForeground>
<textBackground/>
<background/>
...
...
@@ -13520,7 +13520,7 @@
</textForeground>
<textBackground/>
<background>
<matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"
uiResource="false"
/>
<matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
</background>
<inherit-textForeground>false</inherit-textForeground>
<inherit-background>false</inherit-background>
src/share/classes/javax/swing/plaf/synth/SynthContext.java
浏览文件 @
98a7b360
...
...
@@ -26,6 +26,7 @@ package javax.swing.plaf.synth;
import
javax.swing.*
;
import
java.util.*
;
import
sun.reflect.misc.ReflectUtil
;
/**
* An immutable transient object containing contextual information about
...
...
@@ -70,7 +71,7 @@ public class SynthContext {
}
if
(
context
==
null
)
{
try
{
context
=
(
SynthContext
)
type
.
newInstance
(
);
context
=
(
SynthContext
)
ReflectUtil
.
newInstance
(
type
);
}
catch
(
IllegalAccessException
iae
)
{
}
catch
(
InstantiationException
ie
)
{
}
...
...
src/share/classes/javax/swing/plaf/synth/SynthParser.java
浏览文件 @
98a7b360
...
...
@@ -67,6 +67,7 @@ import org.xml.sax.SAXParseException;
import
org.xml.sax.helpers.DefaultHandler
;
import
com.sun.beans.decoder.DocumentHandler
;
import
sun.reflect.misc.ReflectUtil
;
class
SynthParser
extends
DefaultHandler
{
//
...
...
@@ -648,7 +649,7 @@ class SynthParser extends DefaultHandler {
}
else
{
try
{
typeClass
=
Class
.
forName
(
typeName
.
substring
(
typeClass
=
ReflectUtil
.
forName
(
typeName
.
substring
(
0
,
classIndex
));
}
catch
(
ClassNotFoundException
cnfe
)
{
throw
new
SAXException
(
"Unknown class: "
+
...
...
test/java/awt/Window/AlwaysOnTop/TestAlwaysOnTopBeforeShow.java
0 → 100644
浏览文件 @
98a7b360
/*
* Copyright (c) 2014, 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 6236247
@summary Test that setting of always-on-top flags before showing window works
@author dom@sparc.spb.su: area=awt.toplevel
@run main TestAlwaysOnTopBeforeShow
*/
/**
* TestAlwaysOnTopBeforeShow.java
*
* summary: Test that always-on-top works in the following situations:
* - when set on a window before showing
* - when set on a child dialog
* - that it doesn't generate focus event when set on an invisible window
*/
import
java.awt.*
;
import
java.awt.event.*
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
sun.awt.SunToolkit
;
//*** global search and replace TestAlwaysOnTopBeforeShow with name of the test ***
public
class
TestAlwaysOnTopBeforeShow
{
//*** test-writer defined static variables go here ***
private
static
AtomicBoolean
focused
=
new
AtomicBoolean
();
private
static
AtomicBoolean
pressed
=
new
AtomicBoolean
();
private
static
volatile
Object
pressedTarget
;
private
static
void
init
()
{
//*** Create instructions for the user here ***
Toolkit
.
getDefaultToolkit
().
addAWTEventListener
(
new
AWTEventListener
()
{
public
void
eventDispatched
(
AWTEvent
e
)
{
if
(
e
.
getID
()
==
MouseEvent
.
MOUSE_PRESSED
)
{
synchronized
(
pressed
)
{
pressed
.
set
(
true
);
pressedTarget
=
e
.
getSource
();
pressed
.
notifyAll
();
}
}
}
},
AWTEvent
.
MOUSE_EVENT_MASK
);
Frame
f
=
new
Frame
(
"always-on-top"
);
f
.
setBounds
(
0
,
0
,
200
,
200
);
f
.
addFocusListener
(
new
FocusAdapter
()
{
public
void
focusGained
(
FocusEvent
e
)
{
synchronized
(
focused
)
{
focused
.
set
(
true
);
focused
.
notifyAll
();
}
}
});
f
.
setAlwaysOnTop
(
true
);
waitForIdle
(
1000
);
if
(
focused
.
get
())
{
throw
new
RuntimeException
(
"Always-on-top generated focus event"
);
}
f
.
setVisible
(
true
);
waitFocused
(
f
,
focused
);
focused
.
set
(
false
);
Frame
f2
=
new
Frame
(
"auxilary"
);
f2
.
setBounds
(
100
,
0
,
200
,
100
);
f2
.
setVisible
(
true
);
f2
.
toFront
();
waitForIdle
(
1000
);
Point
location
=
f
.
getLocationOnScreen
();
Dimension
size
=
f
.
getSize
();
checkOnTop
(
f
,
f2
,
location
.
x
+
size
.
width
/
2
,
location
.
y
+
size
.
height
/
2
);
Dialog
d
=
new
Dialog
(
f
,
"Always-on-top"
);
d
.
pack
();
d
.
setBounds
(
0
,
0
,
100
,
100
);
waitForIdle
(
1000
);
checkOnTop
(
f
,
f2
,
location
.
x
+
size
.
width
/
2
,
location
.
y
+
size
.
height
/
2
);
waitForIdle
(
1000
);
focused
.
set
(
false
);
f
.
setVisible
(
false
);
f
.
setAlwaysOnTop
(
false
);
waitForIdle
(
1000
);
if
(
focused
.
get
())
{
throw
new
RuntimeException
(
"Always-on-top generated focus event"
);
}
TestAlwaysOnTopBeforeShow
.
pass
();
}
//End init()
private
static
void
waitForIdle
(
int
mls
)
{
((
SunToolkit
)
Toolkit
.
getDefaultToolkit
()).
realSync
();
try
{
Thread
.
sleep
(
mls
);
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
();
}
}
static
void
waitFocused
(
Window
w
,
AtomicBoolean
b
)
{
try
{
synchronized
(
b
)
{
if
(
w
.
isFocusOwner
())
{
return
;
}
b
.
wait
(
3000
);
}
}
catch
(
Exception
e
)
{
throw
new
RuntimeException
(
e
);
}
if
(!
w
.
isFocusOwner
())
{
throw
new
RuntimeException
(
"Can't make "
+
w
+
" focus owner"
);
}
}
static
void
checkOnTop
(
Window
ontop
,
Window
under
,
int
x
,
int
y
)
{
under
.
toFront
();
try
{
Robot
robot
=
new
Robot
();
robot
.
mouseMove
(
x
,
y
);
robot
.
mousePress
(
InputEvent
.
BUTTON1_MASK
);
robot
.
mouseRelease
(
InputEvent
.
BUTTON1_MASK
);
synchronized
(
pressed
)
{
if
(
pressed
.
get
())
{
if
(
pressedTarget
!=
ontop
)
{
throw
new
RuntimeException
(
"Pressed at wrong location: "
+
pressedTarget
);
}
}
else
{
pressed
.
wait
(
5000
);
}
}
if
(!
pressed
.
get
()
||
pressedTarget
!=
ontop
)
{
throw
new
RuntimeException
(
"Pressed at wrong location: "
+
pressedTarget
);
}
}
catch
(
Exception
e
)
{
throw
new
RuntimeException
(
e
);
}
}
/*****************************************************
* Standard Test Machinery Section
* DO NOT modify anything in this section -- it's a
* standard chunk of code which has all of the
* synchronisation necessary for the test harness.
* By keeping it the same in all tests, it is easier
* to read and understand someone else's test, as
* well as insuring that all tests behave correctly
* with the test harness.
* There is a section following this for test-
* classes
******************************************************/
private
static
boolean
theTestPassed
=
false
;
private
static
boolean
testGeneratedInterrupt
=
false
;
private
static
String
failureMessage
=
""
;
private
static
Thread
mainThread
=
null
;
private
static
int
sleepTime
=
300000
;
// Not sure about what happens if multiple of this test are
// instantiated in the same VM. Being static (and using
// static vars), it aint gonna work. Not worrying about
// it for now.
public
static
void
main
(
String
args
[]
)
throws
InterruptedException
{
mainThread
=
Thread
.
currentThread
();
try
{
init
();
}
catch
(
TestPassedException
e
)
{
//The test passed, so just return from main and harness will
// interepret this return as a pass
return
;
}
//At this point, neither test pass nor test fail has been
// called -- either would have thrown an exception and ended the
// test, so we know we have multiple threads.
//Test involves other threads, so sleep and wait for them to
// called pass() or fail()
try
{
Thread
.
sleep
(
sleepTime
);
//Timed out, so fail the test
throw
new
RuntimeException
(
"Timed out after "
+
sleepTime
/
1000
+
" seconds"
);
}
catch
(
InterruptedException
e
)
{
//The test harness may have interrupted the test. If so, rethrow the exception
// so that the harness gets it and deals with it.
if
(
!
testGeneratedInterrupt
)
throw
e
;
//reset flag in case hit this code more than once for some reason (just safety)
testGeneratedInterrupt
=
false
;
if
(
theTestPassed
==
false
)
{
throw
new
RuntimeException
(
failureMessage
);
}
}
}
//main
public
static
synchronized
void
setTimeoutTo
(
int
seconds
)
{
sleepTime
=
seconds
*
1000
;
}
public
static
synchronized
void
pass
()
{
Sysout
.
println
(
"The test passed."
);
Sysout
.
println
(
"The test is over, hit Ctl-C to stop Java VM"
);
//first check if this is executing in main thread
if
(
mainThread
==
Thread
.
currentThread
()
)
{
//Still in the main thread, so set the flag just for kicks,
// and throw a test passed exception which will be caught
// and end the test.
theTestPassed
=
true
;
throw
new
TestPassedException
();
}
theTestPassed
=
true
;
testGeneratedInterrupt
=
true
;
mainThread
.
interrupt
();
}
//pass()
public
static
synchronized
void
fail
()
{
//test writer didn't specify why test failed, so give generic
fail
(
"it just plain failed! :-)"
);
}
public
static
synchronized
void
fail
(
String
whyFailed
)
{
Sysout
.
println
(
"The test failed: "
+
whyFailed
);
Sysout
.
println
(
"The test is over, hit Ctl-C to stop Java VM"
);
//check if this called from main thread
if
(
mainThread
==
Thread
.
currentThread
()
)
{
//If main thread, fail now 'cause not sleeping
throw
new
RuntimeException
(
whyFailed
);
}
theTestPassed
=
false
;
testGeneratedInterrupt
=
true
;
failureMessage
=
whyFailed
;
mainThread
.
interrupt
();
}
//fail()
}
// class TestAlwaysOnTopBeforeShow
//This exception is used to exit from any level of call nesting
// when it's determined that the test has passed, and immediately
// end the test.
class
TestPassedException
extends
RuntimeException
{
}
//*********** End Standard Test Machinery Section **********
//************ Begin classes defined for the test ****************
// if want to make listeners, here is the recommended place for them, then instantiate
// them in init()
/* Example of a class which may be written as part of a test
class NewClass implements anInterface
{
static int newVar = 0;
public void eventDispatched(AWTEvent e)
{
//Counting events to see if we get enough
eventCount++;
if( eventCount == 20 )
{
//got enough events, so pass
TestAlwaysOnTopBeforeShow.pass();
}
else if( tries == 20 )
{
//tried too many times without getting enough events so fail
TestAlwaysOnTopBeforeShow.fail();
}
}// eventDispatched()
}// NewClass class
*/
//************** End classes defined for the test *******************
/****************************************************
Standard Test Machinery
DO NOT modify anything below -- it's a standard
chunk of code whose purpose is to make user
interaction uniform, and thereby make it simpler
to read and understand someone else's test.
****************************************************/
/**
This is part of the standard test machinery.
It creates a dialog (with the instructions), and is the interface
for sending text messages to the user.
To print the instructions, send an array of strings to Sysout.createDialog
WithInstructions method. Put one line of instructions per array entry.
To display a message for the tester to see, simply call Sysout.println
with the string to be displayed.
This mimics System.out.println but works within the test harness as well
as standalone.
*/
class
Sysout
{
private
static
TestDialog
dialog
;
public
static
void
createDialogWithInstructions
(
String
[]
instructions
)
{
dialog
=
new
TestDialog
(
new
Frame
(),
"Instructions"
);
dialog
.
printInstructions
(
instructions
);
dialog
.
setVisible
(
true
);
println
(
"Any messages for the tester will display here."
);
}
public
static
void
createDialog
(
)
{
dialog
=
new
TestDialog
(
new
Frame
(),
"Instructions"
);
String
[]
defInstr
=
{
"Instructions will appear here. "
,
""
}
;
dialog
.
printInstructions
(
defInstr
);
dialog
.
setVisible
(
true
);
println
(
"Any messages for the tester will display here."
);
}
public
static
void
printInstructions
(
String
[]
instructions
)
{
dialog
.
printInstructions
(
instructions
);
}
public
static
void
println
(
String
messageIn
)
{
System
.
out
.
println
(
messageIn
);
}
}
// Sysout class
/**
This is part of the standard test machinery. It provides a place for the
test instructions to be displayed, and a place for interactive messages
to the user to be displayed.
To have the test instructions displayed, see Sysout.
To have a message to the user be displayed, see Sysout.
Do not call anything in this dialog directly.
*/
class
TestDialog
extends
Dialog
{
TextArea
instructionsText
;
TextArea
messageText
;
int
maxStringLength
=
80
;
//DO NOT call this directly, go through Sysout
public
TestDialog
(
Frame
frame
,
String
name
)
{
super
(
frame
,
name
);
int
scrollBoth
=
TextArea
.
SCROLLBARS_BOTH
;
instructionsText
=
new
TextArea
(
""
,
15
,
maxStringLength
,
scrollBoth
);
add
(
"North"
,
instructionsText
);
messageText
=
new
TextArea
(
""
,
5
,
maxStringLength
,
scrollBoth
);
add
(
"Center"
,
messageText
);
pack
();
setVisible
(
true
);
}
// TestDialog()
//DO NOT call this directly, go through Sysout
public
void
printInstructions
(
String
[]
instructions
)
{
//Clear out any current instructions
instructionsText
.
setText
(
""
);
//Go down array of instruction strings
String
printStr
,
remainingStr
;
for
(
int
i
=
0
;
i
<
instructions
.
length
;
i
++
)
{
//chop up each into pieces maxSringLength long
remainingStr
=
instructions
[
i
];
while
(
remainingStr
.
length
()
>
0
)
{
//if longer than max then chop off first max chars to print
if
(
remainingStr
.
length
()
>=
maxStringLength
)
{
//Try to chop on a word boundary
int
posOfSpace
=
remainingStr
.
lastIndexOf
(
' '
,
maxStringLength
-
1
);
if
(
posOfSpace
<=
0
)
posOfSpace
=
maxStringLength
-
1
;
printStr
=
remainingStr
.
substring
(
0
,
posOfSpace
+
1
);
remainingStr
=
remainingStr
.
substring
(
posOfSpace
+
1
);
}
//else just print
else
{
printStr
=
remainingStr
;
remainingStr
=
""
;
}
instructionsText
.
append
(
printStr
+
"\n"
);
}
// while
}
// for
}
//printInstructions()
//DO NOT call this directly, go through Sysout
public
void
displayMessage
(
String
messageIn
)
{
messageText
.
append
(
messageIn
+
"\n"
);
System
.
out
.
println
(
messageIn
);
}
}
// TestDialog class
test/java/lang/String/ToLowerCase.java
浏览文件 @
98a7b360
/*
* Copyright (c) 2003, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 201
4
, 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
...
...
@@ -23,7 +23,7 @@
/*
@test
@bug 4217441 4533872 4900935 8020037
@bug 4217441 4533872 4900935 8020037
8041791
@summary toLowerCase should lower-case Greek Sigma correctly depending
on the context (final/non-final). Also it should handle
Locale specific (lt, tr, and az) lowercasings and supplementary
...
...
@@ -72,8 +72,10 @@ public class ToLowerCase {
// I-dot tests
test
(
"\u0130"
,
turkish
,
"i"
);
test
(
"\u0130"
,
az
,
"i"
);
test
(
"\u0130"
,
lt
,
"i"
);
test
(
"\u0130"
,
Locale
.
US
,
"i"
);
test
(
"\u0130"
,
lt
,
"\u0069\u0307"
);
test
(
"\u0130"
,
Locale
.
US
,
"\u0069\u0307"
);
test
(
"\u0130"
,
Locale
.
JAPAN
,
"\u0069\u0307"
);
test
(
"\u0130"
,
Locale
.
ROOT
,
"\u0069\u0307"
);
// Remove dot_above in the sequence I + dot_above (Turkish and Azeri)
test
(
"I\u0307"
,
turkish
,
"i"
);
...
...
test/javax/swing/plaf/nimbus/8041725/bug8041725.java
0 → 100644
浏览文件 @
98a7b360
/*
* Copyright (c) 2014, 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 8041725
@summary JList selection colors are not UIResource instances in Nimbus L&F
@author Anton Litvinov
*/
import
java.awt.*
;
import
javax.swing.*
;
import
javax.swing.plaf.*
;
import
javax.swing.plaf.nimbus.*
;
public
class
bug8041725
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
UIManager
.
setLookAndFeel
(
new
NimbusLookAndFeel
());
SwingUtilities
.
invokeAndWait
(
new
Runnable
()
{
@Override
public
void
run
()
{
JFrame
frame
=
new
JFrame
(
"bug8041725"
);
frame
.
setSize
(
200
,
200
);
JList
list
=
new
JList
(
new
String
[]{
"Item1"
,
"Item2"
,
"Item3"
});
frame
.
getContentPane
().
add
(
list
);
frame
.
pack
();
frame
.
setVisible
(
true
);
System
.
err
.
println
(
"Test #1: No items are selected, list is enabled."
);
testSelectionColors
(
list
);
System
.
err
.
println
(
"Test #2: No items are selected, list is disabled."
);
list
.
setEnabled
(
false
);
testSelectionColors
(
list
);
System
.
err
.
println
(
"Test #3: One item is selected, list is disabled."
);
list
.
setSelectedIndex
(
0
);
testSelectionColors
(
list
);
System
.
err
.
println
(
"Test #4: One item is selected, list is enabled."
);
list
.
setEnabled
(
true
);
testSelectionColors
(
list
);
frame
.
dispose
();
}
});
}
private
static
void
testSelectionColors
(
JList
list
)
{
Color
selBackColor
=
list
.
getSelectionBackground
();
if
(!(
selBackColor
instanceof
UIResource
))
{
throw
new
RuntimeException
(
String
.
format
(
"JList.getSelectionBackground() returned instance of '%s' instead of UIResource."
,
selBackColor
.
getClass
()));
}
Color
selForeColor
=
list
.
getSelectionForeground
();
if
(!(
selForeColor
instanceof
UIResource
))
{
throw
new
RuntimeException
(
String
.
format
(
"JList.getSelectionForeground() returned instance of '%s' instead of UIResource."
,
selForeColor
.
getClass
()));
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录