Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8264680: Use the blessed modifier order in java.desktop #3337

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -43,7 +43,7 @@
public abstract class X11InputMethod extends X11InputMethodBase {

// to keep the instance of activating if IM resumed
static protected X11InputMethod activatedInstance = null;
protected static X11InputMethod activatedInstance = null;

/**
* Constructs an X11InputMethod instance. It initializes the XIM
@@ -42,7 +42,7 @@
*
* @see DesktopPeer
*/
final public class CDesktopPeer implements DesktopPeer {
public final class CDesktopPeer implements DesktopPeer {

@Override
public boolean isSupported(Action action) {
@@ -31,7 +31,7 @@
import java.awt.Taskbar.Feature;
import java.awt.peer.TaskbarPeer;

final public class CTaskbarPeer implements TaskbarPeer {
public final class CTaskbarPeer implements TaskbarPeer {

CTaskbarPeer() {}

@@ -71,7 +71,7 @@ public class CTrayIcon extends CFRetainedResource implements TrayIconPeer {
// events between MOUSE_PRESSED and MOUSE_RELEASED for particular button
private static int mouseClickButtons = 0;

private final static boolean useTemplateImages = AccessController.doPrivileged((PrivilegedAction<Boolean>)
private static final boolean useTemplateImages = AccessController.doPrivileged((PrivilegedAction<Boolean>)
() -> Boolean.getBoolean("apple.awt.enableTemplateImages")
);

@@ -88,7 +88,6 @@ public final class JavaSoundAudioClip implements AudioClip, MetaEventListener, L
*
*/
private static final long CLIP_THRESHOLD = 1048576;
//private final static long CLIP_THRESHOLD = 1;
private static final int STREAM_BUFFER_SIZE = 1024;

public static JavaSoundAudioClip create(final URLConnection uc) {
@@ -1019,8 +1019,8 @@ public SecondaryLoop createSecondaryLoop() {
}

private class FwSecondaryLoopWrapper implements SecondaryLoop {
final private SecondaryLoop loop;
final private EventFilter filter;
private final SecondaryLoop loop;
private final EventFilter filter;

public FwSecondaryLoopWrapper(SecondaryLoop loop, EventFilter filter) {
this.loop = loop;
@@ -55,7 +55,7 @@ public long getOwnerID(DialogOwner owner) {
}
}

static private Accessor accessor = new Accessor();
private static Accessor accessor = new Accessor();
static {
DialogOwnerAccessor.setAccessor(accessor);
}
@@ -602,7 +602,7 @@ public File[] getChooserComboBoxFiles() {
* possibly empty if there are no appropriate permissions.
* @since 12
*/
final public File[] getChooserShortcutPanelFiles() {
public final File[] getChooserShortcutPanelFiles() {
return (File[]) ShellFolder.get("fileChooserShortcutPanelFolders");
}

@@ -620,7 +620,7 @@ private void filterRow(byte[] rowByteBuffer, byte[] prevRow,
private static final byte[] blockHeight = { 1, 8, 8, 4, 4, 2, 2, 1 };
private static final byte[] blockWidth = { 1, 8, 4, 4, 2, 2, 1, 1 };

//abstract public class ChunkReader extends FilterInputStream {
//public abstract class ChunkReader extends FilterInputStream {
int pos, limit;
int chunkStart;
int chunkKey, chunkLength, chunkCRC;
@@ -728,7 +728,7 @@ boolean getData() throws IOException {
chunkLength = 0;
return chunkLength>0;
}
//abstract protected boolean handleChunk(int key, byte[] buf, int st, int len)
//protected abstract boolean handleChunk(int key, byte[] buf, int st, int len)
// throws IOException;
private static boolean checkCRC = true;
public static boolean getCheckCRC() { return checkCRC; }
@@ -33,7 +33,7 @@
*/
public final class JDKFontLookup {

public final static String getJDKFontDir() {
public static final String getJDKFontDir() {
return SunFontManager.getJDKFontDir();
}
}
@@ -695,7 +695,7 @@ public synchronized void makePipes() {
}
}

private final static class X11WindowSurfaceData extends X11SurfaceData {
private static final class X11WindowSurfaceData extends X11SurfaceData {

private final int scale;

@@ -744,7 +744,7 @@ public double getDefaultScaleY() {
}
}

private final static class X11PixmapSurfaceData extends X11SurfaceData {
private static final class X11PixmapSurfaceData extends X11SurfaceData {

private final Image offscreenImage;
private final int width;