Skip to content

Commit 97d2a37

Browse files
mrserbmrserb
committed
8355790: Enhance code consistency: java.desktop/unix:sun.awt
Reviewed-by: achung, prr
1 parent 4369603 commit 97d2a37

File tree

105 files changed

+747
-102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+747
-102
lines changed

‎src/java.desktop/unix/classes/sun/awt/FcFontManager.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ protected String[] getDefaultPlatformFont() {
103103

104104
native String getFontPathNative(boolean noType1Fonts, boolean isX11GE);
105105

106+
@Override
106107
protected synchronized String getFontPath(boolean noType1Fonts) {
107108
return getFontPathNative(noType1Fonts, false);
108109
}

‎src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.awt.GraphicsEnvironment;
3030
import java.awt.Toolkit;
3131

32-
public class PlatformGraphicsInfo {
32+
public final class PlatformGraphicsInfo {
3333

3434
public static GraphicsEnvironment createGE() {
3535
return new X11GraphicsEnvironment();

‎src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public enum GtkVersions {
7070
ANY(0),
7171
GTK3(Constants.GTK3_MAJOR_NUMBER);
7272

73-
static class Constants {
73+
static final class Constants {
7474
static final int GTK3_MAJOR_NUMBER = 3;
7575
}
7676

‎src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ public void setFile(String file) {
154154
// have delegated to FileDialog#setFile
155155
}
156156

157+
@Override
157158
protected void requestXFocus(long time, boolean timeProvided) {
158159
if(standaloneWindow == 0) {
159160
super.requestXFocus(time, timeProvided);

‎src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public Insets getInsets() {
7878
closer = new Closer();
7979
}
8080

81+
@Override
8182
public Component add(Component c) {
8283
container.add(c, BorderLayout.CENTER);
8384
return c;
@@ -114,15 +115,17 @@ protected void show(Point corner, int indent) {
114115
closer.schedule();
115116
}
116117

118+
@Override
117119
@SuppressWarnings("deprecation")
118120
public void hide() {
119121
closer.close();
120122
}
121123

122-
private class Closer implements Runnable {
124+
private final class Closer implements Runnable {
123125
Runnable action;
124126
int time;
125127

128+
@Override
126129
public void run() {
127130
doClose();
128131
}
@@ -166,7 +169,7 @@ private interface LiveArguments {
166169
}
167170

168171
@SuppressWarnings("serial") // JDK-implementation class
169-
public static class Tooltip extends InfoWindow {
172+
public static final class Tooltip extends InfoWindow {
170173

171174
public interface LiveArguments extends InfoWindow.LiveArguments {
172175
/** The tooltip to be displayed. */
@@ -254,7 +257,7 @@ private boolean isPointerOverTrayIcon(Rectangle trayRect) {
254257
}
255258

256259
@SuppressWarnings("serial") // JDK-implementation class
257-
public static class Balloon extends InfoWindow {
260+
public static final class Balloon extends InfoWindow {
258261

259262
public interface LiveArguments extends InfoWindow.LiveArguments {
260263
/** The action to be performed upon clicking the balloon. */
@@ -422,6 +425,7 @@ public void run() {
422425
});
423426
}
424427

428+
@Override
425429
public void dispose() {
426430
displayer.thread.interrupt();
427431
super.dispose();
@@ -451,7 +455,8 @@ private void loadGtkImages() {
451455
}
452456
}
453457
@SuppressWarnings("deprecation")
454-
private class ActionPerformer extends MouseAdapter {
458+
private final class ActionPerformer extends MouseAdapter {
459+
@Override
455460
public void mouseClicked(MouseEvent e) {
456461
// hide the balloon by any click
457462
hide();
@@ -464,7 +469,7 @@ public void mouseClicked(MouseEvent e) {
464469
}
465470
}
466471

467-
private class Displayer implements Runnable {
472+
private final class Displayer implements Runnable {
468473
final int MAX_CONCURRENT_MSGS = 10;
469474

470475
ArrayBlockingQueue<Message> messageQueue = new ArrayBlockingQueue<Message>(MAX_CONCURRENT_MSGS);
@@ -511,7 +516,7 @@ void display(String caption, String text, String messageType) {
511516
}
512517
}
513518

514-
private static class Message {
519+
private static final class Message {
515520
String caption, text, messageType;
516521

517522
Message(String caption, String text, String messageType) {
@@ -522,4 +527,3 @@ private static class Message {
522527
}
523528
}
524529
}
525-

‎src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*
4242
*/
4343

44-
class MotifColorUtilities {
44+
final class MotifColorUtilities {
4545

4646

4747
static final float XmRED_LUMINOSITY=0.30f;

‎src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*
3939
* @since 1.5
4040
*/
41-
class MotifDnDConstants {
41+
final class MotifDnDConstants {
4242
// utility class can not be instantiated
4343
private MotifDnDConstants() {}
4444
// Note that offsets in all native structures below do not depend on the

‎src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*
4141
* @since 1.5
4242
*/
43-
class MotifDnDDragSourceProtocol extends XDragSourceProtocol
43+
final class MotifDnDDragSourceProtocol extends XDragSourceProtocol
4444
implements XEventDispatcher {
4545

4646
private static final Unsafe unsafe = XlibWrapper.unsafe;
@@ -61,10 +61,12 @@ static XDragSourceProtocol createInstance(XDragSourceProtocolListener listener)
6161
return new MotifDnDDragSourceProtocol(listener);
6262
}
6363

64+
@Override
6465
public String getProtocolName() {
6566
return XDragAndDropProtocols.MotifDnD;
6667
}
6768

69+
@Override
6870
protected void initializeDragImpl(int actions, Transferable contents,
6971
Map<Long, DataFlavor> formatMap, long[] formats)
7072
throws InvalidDnDOperationException,
@@ -95,6 +97,7 @@ protected void initializeDragImpl(int actions, Transferable contents,
9597
*
9698
* @return true if the event was successfully processed.
9799
*/
100+
@Override
98101
public boolean processClientMessage(XClientMessageEvent xclient) {
99102
if (xclient.get_message_type() !=
100103
MotifDnDConstants.XA_MOTIF_DRAG_AND_DROP_MESSAGE.getAtom()) {
@@ -173,6 +176,7 @@ public boolean processClientMessage(XClientMessageEvent xclient) {
173176
return true;
174177
}
175178

179+
@Override
176180
public TargetWindowInfo getTargetWindowInfo(long window) {
177181
assert XToolkit.isAWTLockHeldByCurrentThread();
178182

@@ -232,6 +236,7 @@ public TargetWindowInfo getTargetWindowInfo(long window) {
232236
}
233237
}
234238

239+
@Override
235240
public void sendEnterMessage(long[] formats,
236241
int sourceAction, int sourceActions, long time) {
237242
assert XToolkit.isAWTLockHeldByCurrentThread();
@@ -273,6 +278,7 @@ public void sendEnterMessage(long[] formats,
273278
}
274279
}
275280

281+
@Override
276282
public void sendMoveMessage(int xRoot, int yRoot,
277283
int sourceAction, int sourceActions, long time) {
278284
assert XToolkit.isAWTLockHeldByCurrentThread();
@@ -311,6 +317,7 @@ public void sendMoveMessage(int xRoot, int yRoot,
311317
}
312318
}
313319

320+
@Override
314321
public void sendLeaveMessage(long time) {
315322
assert XToolkit.isAWTLockHeldByCurrentThread();
316323
assert getTargetWindow() != 0;
@@ -342,6 +349,7 @@ public void sendLeaveMessage(long time) {
342349
}
343350
}
344351

352+
@Override
345353
protected void sendDropMessage(int xRoot, int yRoot,
346354
int sourceAction, int sourceActions,
347355
long time) {
@@ -388,17 +396,20 @@ protected void sendDropMessage(int xRoot, int yRoot,
388396
}
389397
}
390398

399+
@Override
391400
public boolean processProxyModeEvent(XClientMessageEvent xclient,
392401
long sourceWindow) {
393402
// Motif DnD for XEmbed is not implemented.
394403
return false;
395404
}
396405

406+
@Override
397407
public void cleanupTargetInfo() {
398408
super.cleanupTargetInfo();
399409
targetEnterServerTime = XConstants.CurrentTime;
400410
}
401411

412+
@Override
402413
public void dispatchEvent(XEvent ev) {
403414
switch (ev.get_type()) {
404415
case XConstants.SelectionRequest:

‎src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*
4141
* @since 1.5
4242
*/
43-
class MotifDnDDropTargetProtocol extends XDropTargetProtocol {
43+
final class MotifDnDDropTargetProtocol extends XDropTargetProtocol {
4444
private static final Unsafe unsafe = XlibWrapper.unsafe;
4545

4646
private long sourceWindow = 0;
@@ -68,22 +68,26 @@ static XDropTargetProtocol createInstance(XDropTargetProtocolListener listener)
6868
return new MotifDnDDropTargetProtocol(listener);
6969
}
7070

71+
@Override
7172
public String getProtocolName() {
7273
return XDragAndDropProtocols.MotifDnD;
7374
}
7475

76+
@Override
7577
public void registerDropTarget(long window) {
7678
assert XToolkit.isAWTLockHeldByCurrentThread();
7779

7880
MotifDnDConstants.writeDragReceiverInfoStruct(window);
7981
}
8082

83+
@Override
8184
public void unregisterDropTarget(long window) {
8285
assert XToolkit.isAWTLockHeldByCurrentThread();
8386

8487
MotifDnDConstants.XA_MOTIF_ATOM_0.DeleteProperty(window);
8588
}
8689

90+
@Override
8791
public void registerEmbedderDropSite(long embedder) {
8892
assert XToolkit.isAWTLockHeldByCurrentThread();
8993

@@ -185,6 +189,7 @@ public void registerEmbedderDropSite(long embedder) {
185189
putEmbedderRegistryEntry(embedder, overridden, version, proxy);
186190
}
187191

192+
@Override
188193
public void unregisterEmbedderDropSite(long embedder) {
189194
assert XToolkit.isAWTLockHeldByCurrentThread();
190195

@@ -261,6 +266,7 @@ public void unregisterEmbedderDropSite(long embedder) {
261266
* Gets and stores in the registry the embedder's Motif DnD drop site info
262267
* from the embedded.
263268
*/
269+
@Override
264270
public void registerEmbeddedDropSite(long embedded) {
265271
assert XToolkit.isAWTLockHeldByCurrentThread();
266272

@@ -317,6 +323,7 @@ public void registerEmbeddedDropSite(long embedded) {
317323
putEmbedderRegistryEntry(embedded, overridden, version, proxy);
318324
}
319325

326+
@Override
320327
public boolean isProtocolSupported(long window) {
321328
WindowPropertyGetter wpg =
322329
new WindowPropertyGetter(window,
@@ -677,6 +684,7 @@ private boolean processDropStart(XClientMessageEvent xclient) {
677684
return true;
678685
}
679686

687+
@Override
680688
public int getMessageType(XClientMessageEvent xclient) {
681689
if (xclient.get_message_type() !=
682690
MotifDnDConstants.XA_MOTIF_DRAG_AND_DROP_MESSAGE.getAtom()) {
@@ -703,6 +711,7 @@ public int getMessageType(XClientMessageEvent xclient) {
703711
}
704712
}
705713

714+
@Override
706715
protected boolean processClientMessageImpl(XClientMessageEvent xclient) {
707716
if (xclient.get_message_type() !=
708717
MotifDnDConstants.XA_MOTIF_DRAG_AND_DROP_MESSAGE.getAtom()) {
@@ -751,26 +760,31 @@ protected boolean processClientMessageImpl(XClientMessageEvent xclient) {
751760
* Currently we don't synthesize enter/leave messages for Motif DnD
752761
* protocol. See comments in XDropTargetProtocol.postProcessClientMessage.
753762
*/
763+
@Override
754764
protected void sendEnterMessageToToplevel(long win,
755765
XClientMessageEvent xclient) {
756766
throw new Error("UNIMPLEMENTED");
757767
}
758768

769+
@Override
759770
protected void sendLeaveMessageToToplevel(long win,
760771
XClientMessageEvent xclient) {
761772
throw new Error("UNIMPLEMENTED");
762773
}
763774

775+
@Override
764776
public boolean forwardEventToEmbedded(long embedded, long ctxt,
765777
int eventID) {
766778
// UNIMPLEMENTED.
767779
return false;
768780
}
769781

782+
@Override
770783
public boolean isXEmbedSupported() {
771784
return false;
772785
}
773786

787+
@Override
774788
public boolean sendResponse(long ctxt, int eventID, int action) {
775789
XClientMessageEvent xclient = new XClientMessageEvent(ctxt);
776790
if (xclient.get_message_type() !=
@@ -890,6 +904,7 @@ public boolean sendResponse(long ctxt, int eventID, int action) {
890904
return true;
891905
}
892906

907+
@Override
893908
public Object getData(long ctxt, long format)
894909
throws IllegalArgumentException, IOException {
895910
XClientMessageEvent xclient = new XClientMessageEvent(ctxt);
@@ -941,6 +956,7 @@ public Object getData(long ctxt, long format)
941956
return selection.getData(format, time_stamp);
942957
}
943958

959+
@Override
944960
public boolean sendDropDone(long ctxt, boolean success, int dropAction) {
945961
XClientMessageEvent xclient = new XClientMessageEvent(ctxt);
946962

@@ -1004,13 +1020,15 @@ public boolean sendDropDone(long ctxt, boolean success, int dropAction) {
10041020
return true;
10051021
}
10061022

1023+
@Override
10071024
public final long getSourceWindow() {
10081025
return sourceWindow;
10091026
}
10101027

10111028
/**
10121029
* Reset the state of the object.
10131030
*/
1031+
@Override
10141032
public void cleanup() {
10151033
// Clear the reference to this protocol.
10161034
XDropTargetEventProcessor.reset();
@@ -1046,6 +1064,7 @@ public void cleanup() {
10461064
topLevelLeavePostponed = false;
10471065
}
10481066

1067+
@Override
10491068
public boolean isDragOverComponent() {
10501069
return targetXWindow != null;
10511070
}

‎src/java.desktop/unix/classes/sun/awt/X11/Native.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* native data types on different platforms similarly.
3434
*/
3535

36-
class Native {
36+
final class Native {
3737

3838
private static Unsafe unsafe = XlibWrapper.unsafe;
3939

0 commit comments

Comments
 (0)