Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
4ee9f87d
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
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看板
提交
4ee9f87d
编写于
7月 02, 2013
作者:
L
lana
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
b63fce38
5552e07d
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
249 addition
and
87 deletion
+249
-87
src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
+14
-1
src/share/classes/java/beans/XMLEncoder.java
src/share/classes/java/beans/XMLEncoder.java
+1
-1
src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java
src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java
+9
-7
src/solaris/classes/sun/awt/X11/XChoicePeer.java
src/solaris/classes/sun/awt/X11/XChoicePeer.java
+18
-14
src/solaris/classes/sun/awt/X11/XListPeer.java
src/solaris/classes/sun/awt/X11/XListPeer.java
+7
-6
src/windows/classes/sun/print/Win32PrintService.java
src/windows/classes/sun/print/Win32PrintService.java
+89
-56
test/java/beans/XMLEncoder/Test8016545.java
test/java/beans/XMLEncoder/Test8016545.java
+106
-0
test/javax/swing/text/View/8014863/bug8014863.java
test/javax/swing/text/View/8014863/bug8014863.java
+5
-2
未找到文件。
src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
浏览文件 @
4ee9f87d
...
@@ -127,8 +127,21 @@ public class CEmbeddedFrame extends EmbeddedFrame {
...
@@ -127,8 +127,21 @@ public class CEmbeddedFrame extends EmbeddedFrame {
}
}
}
}
/**
* When the parent window is activated this method is called for all EmbeddedFrames in it.
*
* For the CEmbeddedFrame which had focus before the deactivation this method triggers
* focus events in the following order:
* 1. WINDOW_ACTIVATED for this EmbeddedFrame
* 2. WINDOW_GAINED_FOCUS for this EmbeddedFrame
* 3. FOCUS_GAINED for the most recent focus owner in this EmbeddedFrame
*
* The caller must not requestFocus on the EmbeddedFrame together with calling this method.
*
* @param parentWindowActive true if the window is activated, false otherwise
*/
// handleWindowFocusEvent is called for all applets, when the browser
// handleWindowFocusEvent is called for all applets, when the browser
// bec
a
mes active/inactive. This event should be filtered out for
// bec
o
mes active/inactive. This event should be filtered out for
// non-focused applet. This method can be called from different threads.
// non-focused applet. This method can be called from different threads.
public
void
handleWindowFocusEvent
(
boolean
parentWindowActive
)
{
public
void
handleWindowFocusEvent
(
boolean
parentWindowActive
)
{
this
.
parentWindowActive
=
parentWindowActive
;
this
.
parentWindowActive
=
parentWindowActive
;
...
...
src/share/classes/java/beans/XMLEncoder.java
浏览文件 @
4ee9f87d
...
@@ -377,7 +377,7 @@ public class XMLEncoder extends Encoder implements AutoCloseable {
...
@@ -377,7 +377,7 @@ public class XMLEncoder extends Encoder implements AutoCloseable {
Object
arg
=
args
[
i
];
Object
arg
=
args
[
i
];
mark
(
arg
,
true
);
mark
(
arg
,
true
);
}
}
mark
(
stm
.
getTarget
(),
false
);
mark
(
stm
.
getTarget
(),
stm
instanceof
Expression
);
}
}
...
...
src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java
浏览文件 @
4ee9f87d
/*
/*
* Copyright (c) 2005, 20
08
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 20
13
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -904,11 +904,12 @@ abstract public class XBaseMenuWindow extends XWindow {
...
@@ -904,11 +904,12 @@ abstract public class XBaseMenuWindow extends XWindow {
*/
*/
public
void
dispose
()
{
public
void
dispose
()
{
setDisposed
(
true
);
setDisposed
(
true
);
EventQueue
.
invokeLater
(
new
Runnable
()
{
InvocationEvent
ev
=
new
InvocationEvent
(
target
,
new
Runnable
()
{
public
void
run
()
{
public
void
run
()
{
doDispose
();
doDispose
();
}
}
});
});
super
.
postEvent
(
ev
);
}
}
/**
/**
...
@@ -933,11 +934,12 @@ abstract public class XBaseMenuWindow extends XWindow {
...
@@ -933,11 +934,12 @@ abstract public class XBaseMenuWindow extends XWindow {
* so events can not be processed using standart means
* so events can not be processed using standart means
*/
*/
void
postEvent
(
final
AWTEvent
event
)
{
void
postEvent
(
final
AWTEvent
event
)
{
EventQueue
.
invokeLater
(
new
Runnable
()
{
InvocationEvent
ev
=
new
InvocationEvent
(
event
.
getSource
(),
new
Runnable
()
{
public
void
run
()
{
public
void
run
()
{
handleEvent
(
event
);
handleEvent
(
event
);
}
}
});
});
super
.
postEvent
(
ev
);
}
}
/**
/**
...
...
src/solaris/classes/sun/awt/X11/XChoicePeer.java
浏览文件 @
4ee9f87d
/*
/*
* Copyright (c) 2003, 20
07
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 20
13
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -1033,15 +1033,17 @@ public class XChoicePeer extends XComponentPeer implements ChoicePeer, ToplevelS
...
@@ -1033,15 +1033,17 @@ public class XChoicePeer extends XComponentPeer implements ChoicePeer, ToplevelS
//fix 6252982: PIT: Keyboard FocusTraversal not working when choice's drop-down is visible, on XToolkit
//fix 6252982: PIT: Keyboard FocusTraversal not working when choice's drop-down is visible, on XToolkit
if
(
e
instanceof
KeyEvent
){
if
(
e
instanceof
KeyEvent
){
// notify XWindow that this event had been already handled and no need to post it again
// notify XWindow that this event had been already handled and no need to post it again
EventQueue
.
invokeLater
(
new
Runnable
()
{
InvocationEvent
ev
=
new
InvocationEvent
(
target
,
new
Runnable
()
{
public
void
run
()
{
public
void
run
()
{
if
(
target
.
isFocusable
()
&&
if
(
target
.
isFocusable
()
&&
getParentTopLevel
().
isFocusableWindow
()
)
getParentTopLevel
().
isFocusableWindow
()
)
{
{
handleJavaKeyEvent
((
KeyEvent
)
e
);
handleJavaKeyEvent
((
KeyEvent
)
e
);
}
}
}
});
}
});
postEvent
(
ev
);
return
true
;
return
true
;
}
else
{
}
else
{
if
(
e
instanceof
MouseEvent
){
if
(
e
instanceof
MouseEvent
){
...
@@ -1083,11 +1085,13 @@ public class XChoicePeer extends XComponentPeer implements ChoicePeer, ToplevelS
...
@@ -1083,11 +1085,13 @@ public class XChoicePeer extends XComponentPeer implements ChoicePeer, ToplevelS
//convenient method
//convenient method
//do not generate this kind of Events
//do not generate this kind of Events
public
boolean
handleMouseEventByChoice
(
final
MouseEvent
me
){
public
boolean
handleMouseEventByChoice
(
final
MouseEvent
me
){
EventQueue
.
invokeLater
(
new
Runnable
()
{
InvocationEvent
ev
=
new
InvocationEvent
(
target
,
new
Runnable
()
{
public
void
run
()
{
public
void
run
()
{
handleJavaMouseEvent
(
me
);
handleJavaMouseEvent
(
me
);
}
}
});
});
postEvent
(
ev
);
return
true
;
return
true
;
}
}
...
...
src/solaris/classes/sun/awt/X11/XListPeer.java
浏览文件 @
4ee9f87d
/*
/*
* Copyright (c) 2003, 20
08
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 20
13
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -1669,11 +1669,12 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
...
@@ -1669,11 +1669,12 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
* Do handleJavaMouseEvent on EDT
* Do handleJavaMouseEvent on EDT
*/
*/
void
handleJavaMouseEventOnEDT
(
final
MouseEvent
me
){
void
handleJavaMouseEventOnEDT
(
final
MouseEvent
me
){
EventQueue
.
invokeLater
(
new
Runnable
()
{
InvocationEvent
ev
=
new
InvocationEvent
(
target
,
new
Runnable
()
{
public
void
run
()
{
public
void
run
()
{
handleJavaMouseEvent
(
me
);
handleJavaMouseEvent
(
me
);
}
}
});
});
postEvent
(
ev
);
}
}
/*
/*
...
...
src/windows/classes/sun/print/Win32PrintService.java
浏览文件 @
4ee9f87d
/*
/*
* Copyright (c) 2000, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 201
3
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -28,11 +28,8 @@ package sun.print;
...
@@ -28,11 +28,8 @@ package sun.print;
import
java.io.File
;
import
java.io.File
;
import
java.net.URI
;
import
java.net.URI
;
import
java.net.URISyntaxException
;
import
java.net.URISyntaxException
;
import
java.net.URL
;
import
java.util.ArrayList
;
import
java.util.Vector
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
javax.print.DocFlavor
;
import
javax.print.DocFlavor
;
import
javax.print.DocPrintJob
;
import
javax.print.DocPrintJob
;
import
javax.print.PrintService
;
import
javax.print.PrintService
;
...
@@ -69,22 +66,14 @@ import javax.print.attribute.standard.Severity;
...
@@ -69,22 +66,14 @@ import javax.print.attribute.standard.Severity;
import
javax.print.attribute.standard.Sides
;
import
javax.print.attribute.standard.Sides
;
import
javax.print.attribute.standard.ColorSupported
;
import
javax.print.attribute.standard.ColorSupported
;
import
javax.print.attribute.standard.PrintQuality
;
import
javax.print.attribute.standard.PrintQuality
;
import
javax.print.attribute.ResolutionSyntax
;
import
javax.print.attribute.standard.PrinterResolution
;
import
javax.print.attribute.standard.PrinterResolution
;
import
javax.print.attribute.standard.SheetCollate
;
import
javax.print.attribute.standard.SheetCollate
;
import
javax.print.event.PrintServiceAttributeListener
;
import
javax.print.event.PrintServiceAttributeListener
;
import
java.util.ArrayList
;
import
sun.print.SunPrinterJobService
;
public
class
Win32PrintService
implements
PrintService
,
AttributeUpdater
,
public
class
Win32PrintService
implements
PrintService
,
AttributeUpdater
,
SunPrinterJobService
{
SunPrinterJobService
{
public
static
MediaSize
[]
predefMedia
;
public
static
MediaSize
[]
predefMedia
=
Win32MediaSize
.
getPredefMedia
();
static
{
Class
c
=
Win32MediaSize
.
class
;
}
private
static
final
DocFlavor
[]
supportedFlavors
=
{
private
static
final
DocFlavor
[]
supportedFlavors
=
{
DocFlavor
.
BYTE_ARRAY
.
GIF
,
DocFlavor
.
BYTE_ARRAY
.
GIF
,
...
@@ -313,7 +302,9 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
...
@@ -313,7 +302,9 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
public
MediaSizeName
findWin32Media
(
int
dmIndex
)
{
public
MediaSizeName
findWin32Media
(
int
dmIndex
)
{
if
(
dmIndex
>=
1
&&
dmIndex
<=
dmPaperToPrintService
.
length
)
{
if
(
dmIndex
>=
1
&&
dmIndex
<=
dmPaperToPrintService
.
length
)
{
switch
(
dmIndex
)
{
return
dmPaperToPrintService
[
dmIndex
-
1
];
}
switch
(
dmIndex
)
{
/* matching media sizes with indices beyond
/* matching media sizes with indices beyond
dmPaperToPrintService's length */
dmPaperToPrintService's length */
case
DMPAPER_A2:
case
DMPAPER_A2:
...
@@ -323,11 +314,8 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
...
@@ -323,11 +314,8 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
case
DMPAPER_B6_JIS:
case
DMPAPER_B6_JIS:
return
MediaSizeName
.
JIS_B6
;
return
MediaSizeName
.
JIS_B6
;
default
:
default
:
return
dmPaperToPrintService
[
dmIndex
-
1
];
return
null
;
}
}
}
return
null
;
}
}
private
boolean
addToUniqueList
(
ArrayList
msnList
,
MediaSizeName
mediaName
)
{
private
boolean
addToUniqueList
(
ArrayList
msnList
,
MediaSizeName
mediaName
)
{
...
@@ -353,6 +341,7 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
...
@@ -353,6 +341,7 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
}
}
ArrayList
msnList
=
new
ArrayList
();
ArrayList
msnList
=
new
ArrayList
();
ArrayList
<
Win32MediaSize
>
trailingWmsList
=
new
ArrayList
<
Win32MediaSize
>();
ArrayList
printableList
=
new
ArrayList
();
ArrayList
printableList
=
new
ArrayList
();
MediaSizeName
mediaName
;
MediaSizeName
mediaName
;
boolean
added
;
boolean
added
;
...
@@ -371,7 +360,8 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
...
@@ -371,7 +360,8 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
idList
.
add
(
Integer
.
valueOf
(
media
[
i
]));
idList
.
add
(
Integer
.
valueOf
(
media
[
i
]));
}
}
mediaSizes
=
getMediaSizes
(
idList
,
media
);
ArrayList
<
String
>
dmPaperNameList
=
new
ArrayList
<
String
>();
mediaSizes
=
getMediaSizes
(
idList
,
media
,
dmPaperNameList
);
for
(
int
i
=
0
;
i
<
idList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
idList
.
size
();
i
++)
{
// match Win ID with our predefined ID using table
// match Win ID with our predefined ID using table
...
@@ -390,6 +380,7 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
...
@@ -390,6 +380,7 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
mediaName
=
null
;
mediaName
=
null
;
}
}
}
}
boolean
dmPaperIDMatched
=
(
mediaName
!=
null
);
// No match found, then we get the MediaSizeName out of the MediaSize
// No match found, then we get the MediaSizeName out of the MediaSize
// This requires 1-1 correspondence, lengths must be checked.
// This requires 1-1 correspondence, lengths must be checked.
...
@@ -398,9 +389,32 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
...
@@ -398,9 +389,32 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
}
}
// Add mediaName to the msnList
// Add mediaName to the msnList
added
=
false
;
if
(
mediaName
!=
null
)
{
if
(
mediaName
!=
null
)
{
added
=
addToUniqueList
(
msnList
,
mediaName
);
added
=
addToUniqueList
(
msnList
,
mediaName
);
}
}
if
((!
dmPaperIDMatched
||
!
added
)
&&
(
idList
.
size
()
==
dmPaperNameList
.
size
()))
{
/* The following block allows to add such media names to the list, whose sizes
* matched with media sizes predefined in JDK, while whose paper IDs did not,
* or whose sizes and paper IDs both did not match with any predefined in JDK.
*/
Win32MediaSize
wms
=
Win32MediaSize
.
findMediaName
(
dmPaperNameList
.
get
(
i
));
if
((
wms
==
null
)
&&
(
idList
.
size
()
==
mediaSizes
.
length
))
{
wms
=
new
Win32MediaSize
(
dmPaperNameList
.
get
(
i
),
(
Integer
)
idList
.
get
(
i
));
mediaSizes
[
i
]
=
new
MediaSize
(
mediaSizes
[
i
].
getX
(
MediaSize
.
MM
),
mediaSizes
[
i
].
getY
(
MediaSize
.
MM
),
MediaSize
.
MM
,
wms
);
}
if
((
wms
!=
null
)
&&
(
wms
!=
mediaName
))
{
if
(!
added
)
{
added
=
addToUniqueList
(
msnList
,
mediaName
=
wms
);
}
else
{
trailingWmsList
.
add
(
wms
);
}
}
}
}
for
(
Win32MediaSize
wms
:
trailingWmsList
)
{
added
=
addToUniqueList
(
msnList
,
wms
);
}
}
// init mediaSizeNames
// init mediaSizeNames
...
@@ -591,7 +605,11 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
...
@@ -591,7 +605,11 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
}
}
private
MediaSize
[]
getMediaSizes
(
ArrayList
idList
,
int
[]
media
)
{
private
MediaSize
[]
getMediaSizes
(
ArrayList
idList
,
int
[]
media
,
ArrayList
<
String
>
dmPaperNameList
)
{
if
(
dmPaperNameList
==
null
)
{
dmPaperNameList
=
new
ArrayList
<
String
>();
}
String
prnPort
=
getPort
();
String
prnPort
=
getPort
();
int
[]
mediaSz
=
getAllMediaSizes
(
printer
,
prnPort
);
int
[]
mediaSz
=
getAllMediaSizes
(
printer
,
prnPort
);
String
[]
winMediaNames
=
getAllMediaNames
(
printer
,
prnPort
);
String
[]
winMediaNames
=
getAllMediaNames
(
printer
,
prnPort
);
...
@@ -610,40 +628,43 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
...
@@ -610,40 +628,43 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
wid
=
mediaSz
[
i
*
2
]/
10
f
;
wid
=
mediaSz
[
i
*
2
]/
10
f
;
ht
=
mediaSz
[
i
*
2
+
1
]/
10
f
;
ht
=
mediaSz
[
i
*
2
+
1
]/
10
f
;
// Make sure to validate wid & ht.
// Make sure to validate wid & ht.
// HP LJ 4050 (german) causes IAE in Sonderformat paper, wid & ht
// HP LJ 4050 (german) causes IAE in Sonderformat paper, wid & ht
// returned is not constant.
// returned is not constant.
if
((
wid
<=
0
)
||
(
ht
<=
0
))
{
if
((
wid
<=
0
)
||
(
ht
<=
0
))
{
//Remove corresponding ID from list
//Remove corresponding ID from list
if
(
nMedia
==
media
.
length
)
{
if
(
nMedia
==
media
.
length
)
{
Integer
remObj
=
Integer
.
valueOf
(
media
[
i
]);
Integer
remObj
=
Integer
.
valueOf
(
media
[
i
]);
idList
.
remove
(
idList
.
indexOf
(
remObj
));
idList
.
remove
(
idList
.
indexOf
(
remObj
));
}
continue
;
}
}
continue
;
// Find matching media using dimensions.
}
// This call matches only with our own predefined sizes.
// Find matching media using dimensions.
msn
=
findMatchingMediaSizeNameMM
(
wid
,
ht
);
// This call matches only with our own predefined sizes.
if
(
msn
!=
null
)
{
msn
=
findMatchingMediaSizeNameMM
(
wid
,
ht
);
ms
=
MediaSize
.
getMediaSizeForName
(
msn
);
if
(
msn
!=
null
)
{
ms
=
MediaSize
.
getMediaSizeForName
(
msn
);
}
if
(
ms
!=
null
)
{
msList
.
add
(
ms
);
}
else
{
Win32MediaSize
wms
=
new
Win32MediaSize
(
winMediaNames
[
i
],
media
[
i
]);
try
{
ms
=
new
MediaSize
(
wid
,
ht
,
MediaSize
.
MM
,
wms
);
msList
.
add
(
ms
);
}
catch
(
IllegalArgumentException
e
)
{
if
(
nMedia
==
media
.
length
)
{
Integer
remObj
=
Integer
.
valueOf
(
media
[
i
]);
idList
.
remove
(
idList
.
indexOf
(
remObj
));
}
}
}
}
if
(
ms
!=
null
)
{
msList
.
add
(
ms
);
dmPaperNameList
.
add
(
winMediaNames
[
i
]);
}
else
{
Win32MediaSize
wms
=
Win32MediaSize
.
findMediaName
(
winMediaNames
[
i
]);
if
(
wms
==
null
)
{
wms
=
new
Win32MediaSize
(
winMediaNames
[
i
],
media
[
i
]);
}
try
{
ms
=
new
MediaSize
(
wid
,
ht
,
MediaSize
.
MM
,
wms
);
msList
.
add
(
ms
);
dmPaperNameList
.
add
(
winMediaNames
[
i
]);
}
catch
(
IllegalArgumentException
e
)
{
if
(
nMedia
==
media
.
length
)
{
Integer
remObj
=
Integer
.
valueOf
(
media
[
i
]);
idList
.
remove
(
idList
.
indexOf
(
remObj
));
}
}
}
}
}
MediaSize
[]
arr2
=
new
MediaSize
[
msList
.
size
()];
MediaSize
[]
arr2
=
new
MediaSize
[
msList
.
size
()];
...
@@ -1617,6 +1638,7 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
...
@@ -1617,6 +1638,7 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
class
Win32MediaSize
extends
MediaSizeName
{
class
Win32MediaSize
extends
MediaSizeName
{
private
static
ArrayList
winStringTable
=
new
ArrayList
();
private
static
ArrayList
winStringTable
=
new
ArrayList
();
private
static
ArrayList
winEnumTable
=
new
ArrayList
();
private
static
ArrayList
winEnumTable
=
new
ArrayList
();
private
static
MediaSize
[]
predefMedia
;
private
int
dmPaperID
;
// driver ID for this paper.
private
int
dmPaperID
;
// driver ID for this paper.
...
@@ -1630,6 +1652,18 @@ class Win32MediaSize extends MediaSizeName {
...
@@ -1630,6 +1652,18 @@ class Win32MediaSize extends MediaSizeName {
return
(
winStringTable
.
size
()-
1
);
return
(
winStringTable
.
size
()-
1
);
}
}
public
static
synchronized
Win32MediaSize
findMediaName
(
String
name
)
{
int
nameIndex
=
winStringTable
.
indexOf
(
name
);
if
(
nameIndex
!=
-
1
)
{
return
(
Win32MediaSize
)
winEnumTable
.
get
(
nameIndex
);
}
return
null
;
}
public
static
MediaSize
[]
getPredefMedia
()
{
return
predefMedia
;
}
public
Win32MediaSize
(
String
name
,
int
dmPaper
)
{
public
Win32MediaSize
(
String
name
,
int
dmPaper
)
{
super
(
nextValue
(
name
));
super
(
nextValue
(
name
));
dmPaperID
=
dmPaper
;
dmPaperID
=
dmPaper
;
...
@@ -1641,18 +1675,17 @@ class Win32MediaSize extends MediaSizeName {
...
@@ -1641,18 +1675,17 @@ class Win32MediaSize extends MediaSizeName {
}
}
static
{
static
{
/* initialize
Win32PrintService.
predefMedia */
/* initialize predefMedia */
{
{
Win32MediaSize
winMedia
=
new
Win32MediaSize
(-
1
);
Win32MediaSize
winMedia
=
new
Win32MediaSize
(-
1
);
// cannot call getSuperEnumTable directly because of static context
// cannot call getSuperEnumTable directly because of static context
MediaSizeName
[]
enumMedia
=
winMedia
.
getSuperEnumTable
();
MediaSizeName
[]
enumMedia
=
winMedia
.
getSuperEnumTable
();
if
(
enumMedia
!=
null
)
{
if
(
enumMedia
!=
null
)
{
Win32PrintService
.
predefMedia
=
new
MediaSize
[
enumMedia
.
length
];
predefMedia
=
new
MediaSize
[
enumMedia
.
length
];
for
(
int
i
=
0
;
i
<
enumMedia
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
enumMedia
.
length
;
i
++)
{
Win32PrintService
.
predefMedia
[
i
]
=
predefMedia
[
i
]
=
MediaSize
.
getMediaSizeForName
(
enumMedia
[
i
]);
MediaSize
.
getMediaSizeForName
(
enumMedia
[
i
]);
}
}
}
}
}
}
...
...
test/java/beans/XMLEncoder/Test8016545.java
0 → 100644
浏览文件 @
4ee9f87d
/*
* Copyright (c) 2013, 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 8016545
* @summary Tests beans with predefined fields
* @author Sergey Malenkov
*/
public
class
Test8016545
extends
AbstractTest
{
public
static
void
main
(
String
[]
args
)
{
new
Test8016545
().
test
(
true
);
}
@Override
protected
Object
getObject
()
{
Bean
bean
=
new
Bean
();
bean
.
setUndefined
(
Boolean
.
FALSE
);
Info
info
=
new
Info
();
info
.
setEnabled
(
Boolean
.
TRUE
);
info
.
setID
(
1
);
bean
.
setInfo
(
info
);
return
bean
;
}
@Override
protected
Object
getAnotherObject
()
{
Bean
bean
=
new
Bean
();
bean
.
setUndefined
(
Boolean
.
TRUE
);
bean
.
getInfo
().
setEnabled
(
Boolean
.
FALSE
);
bean
.
getInfo
().
setID
(
2
);
return
bean
;
}
public
static
class
Bean
{
private
Info
info
=
new
Info
();
// predefined
private
Boolean
defined
=
Boolean
.
TRUE
;
private
Boolean
undefined
;
public
Info
getInfo
()
{
return
this
.
info
;
}
public
void
setInfo
(
Info
info
)
{
this
.
info
=
info
;
}
public
Boolean
getDefined
()
{
return
this
.
defined
;
}
public
void
setDefined
(
Boolean
defined
)
{
this
.
defined
=
defined
;
}
public
Boolean
getUndefined
()
{
return
this
.
undefined
;
}
public
void
setUndefined
(
Boolean
undefined
)
{
this
.
undefined
=
undefined
;
}
}
public
static
class
Info
{
private
Integer
id
;
private
Boolean
enabled
;
public
Integer
getID
()
{
return
this
.
id
;
}
public
void
setID
(
Integer
id
)
{
this
.
id
=
id
;
}
public
Boolean
getEnabled
()
{
return
this
.
enabled
;
}
public
void
setEnabled
(
Boolean
enabled
)
{
this
.
enabled
=
enabled
;
}
}
}
test/javax/swing/text/View/8014863/bug8014863.java
浏览文件 @
4ee9f87d
...
@@ -136,9 +136,12 @@ public class bug8014863 {
...
@@ -136,9 +136,12 @@ public class bug8014863 {
"qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp"
+
"qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp"
+
"</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq</p>"
);
"</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq</p>"
);
editorPane
.
setCaretPosition
(
1
);
editorPane
.
setCaretPosition
(
1
);
// An actual font size depends on OS and might be differnet on various OSs.
// It is necessary to calculate the width to meet the expected number of lines.
int
width
=
SwingUtilities
.
computeStringWidth
(
editorPane
.
getFontMetrics
(
editorPane
.
getFont
()),
"qqqq pp qqqq pp qqqq pp qqqqqqqq"
);
frame
.
add
(
editorPane
);
frame
.
add
(
editorPane
);
frame
.
setSize
(
200
,
200
);
frame
.
setSize
(
width
,
200
);
frame
.
setVisible
(
true
);
frame
.
setVisible
(
true
);
}
}
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录