[java-atk-wrapper] fix IDE warnings for java 11
- From: Samuel Thibault <sthibaul src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-atk-wrapper] fix IDE warnings for java 11
- Date: Thu, 25 Jul 2019 16:03:52 +0000 (UTC)
commit ff30d5f8bf4100a9a2e5f029a457baa1121a35f5
Author: giuseppe <giuseppe dhcp-64-173 muc redhat com>
Date: Thu Jul 25 10:21:41 2019 +0200
fix IDE warnings for java 11
wrapper/module-info.java | 2 +-
wrapper/org/GNOME/Accessibility/AtkAction.java | 6 +-
wrapper/org/GNOME/Accessibility/AtkKeyEvent.java | 228 ++++++++++-----------
wrapper/org/GNOME/Accessibility/AtkWrapper.java.in | 9 +-
4 files changed, 123 insertions(+), 122 deletions(-)
---
diff --git a/wrapper/module-info.java b/wrapper/module-info.java
index 9249b08..79b542f 100644
--- a/wrapper/module-info.java
+++ b/wrapper/module-info.java
@@ -1,6 +1,6 @@
module atk.wrapper {
exports org.GNOME.Accessibility;
- requires java.desktop;
+ requires transitive java.desktop;
requires java.management;
provides javax.accessibility.AccessibilityProvider
with org.GNOME.Accessibility.AtkProvider;
diff --git a/wrapper/org/GNOME/Accessibility/AtkAction.java b/wrapper/org/GNOME/Accessibility/AtkAction.java
index c28831b..032ced6 100644
--- a/wrapper/org/GNOME/Accessibility/AtkAction.java
+++ b/wrapper/org/GNOME/Accessibility/AtkAction.java
@@ -21,6 +21,8 @@ package org.GNOME.Accessibility;
import javax.accessibility.*;
import javax.swing.*;
+
+import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
public class AtkAction {
@@ -160,7 +162,7 @@ public class AtkAction {
if (o instanceof KeyStroke) {
KeyStroke keyStroke = (KeyStroke)o;
- String modString =
KeyEvent.getKeyModifiersText(keyStroke.getModifiers());
+ String modString =
InputEvent.getModifiersExText(keyStroke.getModifiers());
String keyString =
KeyEvent.getKeyText(keyStroke.getKeyCode());
if ( keyString != null ) {
@@ -173,7 +175,7 @@ public class AtkAction {
} else if (o instanceof KeyStroke[]) {
KeyStroke[] keyStroke = (KeyStroke[])o;
for ( int j = 0; j < keyStroke.length; j++ ) {
- String modString =
KeyEvent.getKeyModifiersText(keyStroke[j].getModifiers());
+ String modString =
InputEvent.getModifiersExText(keyStroke[j].getModifiers());
String keyString =
KeyEvent.getKeyText(keyStroke[j].getKeyCode());
if (j > 0) {
diff --git a/wrapper/org/GNOME/Accessibility/AtkKeyEvent.java
b/wrapper/org/GNOME/Accessibility/AtkKeyEvent.java
index 1af950b..edf28ec 100644
--- a/wrapper/org/GNOME/Accessibility/AtkKeyEvent.java
+++ b/wrapper/org/GNOME/Accessibility/AtkKeyEvent.java
@@ -181,7 +181,7 @@ class GNOMEKeyMapping {
else if (javaKeyLocation == KeyEvent.KEY_LOCATION_RIGHT)
javaKeyCode += RIGHT_OFFSET;
- if ( (gdkKeyInfo = (GNOMEKeyInfo)keyMap.get ( new Integer(javaKeyCode) )) != null ) {
+ if ( (gdkKeyInfo = (GNOMEKeyInfo)keyMap.get ( Integer.valueOf(javaKeyCode) )) != null ) {
return ( gdkKeyInfo );
} else {
return null;
@@ -194,129 +194,129 @@ class GNOMEKeyMapping {
private static void initializeMap() {
keyMap = new HashMap<>( 146 ); // Currently only 110, so allocate 110 / 0.75
- keyMap.put( new Integer(KeyEvent.VK_COLON), new GNOMEKeyInfo( 0x20a1, "ColonSign" ) ); //
GDK_ColonSign
- keyMap.put( new Integer(KeyEvent.VK_EURO_SIGN), new GNOMEKeyInfo( 0x20ac, "EuroSign" ) ); //
GDK_EuroSign
- keyMap.put( new Integer(KeyEvent.VK_BACK_SPACE), new GNOMEKeyInfo( 0xFF08, "BackSpace" ) ); //
GDK_BackSpace
- keyMap.put( new Integer(KeyEvent.VK_TAB), new GNOMEKeyInfo( 0xFF09, "Tab" ) ); // GDK_Tab
- keyMap.put( new Integer(KeyEvent.VK_CLEAR), new GNOMEKeyInfo( 0xFF0B, "Clear" ) ); // GDK_Clear
- keyMap.put( new Integer(KeyEvent.VK_ENTER), new GNOMEKeyInfo( 0xFF0D, "Return" ) ); // GDK_Return
- keyMap.put( new Integer(KeyEvent.VK_PAUSE), new GNOMEKeyInfo( 0xFF13, "Pause" ) ); // GDK_Pause
- keyMap.put( new Integer(KeyEvent.VK_SCROLL_LOCK), new GNOMEKeyInfo( 0xFF14, "Scroll_Lock" ) ); //
GDK_Scroll_Lock
- keyMap.put( new Integer(KeyEvent.VK_ESCAPE), new GNOMEKeyInfo( 0xFF1B, "Escape" ) ); // GDK_Escape
- keyMap.put( new Integer(KeyEvent.VK_KANJI), new GNOMEKeyInfo( 0xFF21, "Kanji" ) ); // GDK_Kanji
- keyMap.put( new Integer(KeyEvent.VK_HIRAGANA), new GNOMEKeyInfo( 0xFF25, "Hiragana" ) ); //
GDK_Hiragana
- keyMap.put( new Integer(KeyEvent.VK_KATAKANA), new GNOMEKeyInfo( 0xFF26, "Katakana" ) ); //
GDK_Katakana
- keyMap.put( new Integer(KeyEvent.VK_KANA_LOCK), new GNOMEKeyInfo( 0xFF2D, "Kana_Lock" ) ); //
GDK_Kana_Lock
- keyMap.put( new Integer(KeyEvent.VK_KANA), new GNOMEKeyInfo( 0xFF2E, "Kana_Shift" ) ); //
GDK_Kana_Shift
- keyMap.put( new Integer(KeyEvent.VK_KANJI), new GNOMEKeyInfo( 0xFF37, "Kanji_Bangou" ) ); //
GDK_Kanji_Bangou
+ keyMap.put( Integer.valueOf(KeyEvent.VK_COLON), new GNOMEKeyInfo( 0x20a1, "ColonSign" ) ); //
GDK_ColonSign
+ keyMap.put( Integer.valueOf(KeyEvent.VK_EURO_SIGN), new GNOMEKeyInfo( 0x20ac, "EuroSign" ) ); //
GDK_EuroSign
+ keyMap.put( Integer.valueOf(KeyEvent.VK_BACK_SPACE), new GNOMEKeyInfo( 0xFF08, "BackSpace" ) ); //
GDK_BackSpace
+ keyMap.put( Integer.valueOf(KeyEvent.VK_TAB), new GNOMEKeyInfo( 0xFF09, "Tab" ) ); // GDK_Tab
+ keyMap.put( Integer.valueOf(KeyEvent.VK_CLEAR), new GNOMEKeyInfo( 0xFF0B, "Clear" ) ); //
GDK_Clear
+ keyMap.put( Integer.valueOf(KeyEvent.VK_ENTER), new GNOMEKeyInfo( 0xFF0D, "Return" ) ); //
GDK_Return
+ keyMap.put( Integer.valueOf(KeyEvent.VK_PAUSE), new GNOMEKeyInfo( 0xFF13, "Pause" ) ); //
GDK_Pause
+ keyMap.put( Integer.valueOf(KeyEvent.VK_SCROLL_LOCK), new GNOMEKeyInfo( 0xFF14, "Scroll_Lock" ) ); //
GDK_Scroll_Lock
+ keyMap.put( Integer.valueOf(KeyEvent.VK_ESCAPE), new GNOMEKeyInfo( 0xFF1B, "Escape" ) ); //
GDK_Escape
+ keyMap.put( Integer.valueOf(KeyEvent.VK_KANJI), new GNOMEKeyInfo( 0xFF21, "Kanji" ) ); //
GDK_Kanji
+ keyMap.put( Integer.valueOf(KeyEvent.VK_HIRAGANA), new GNOMEKeyInfo( 0xFF25, "Hiragana" ) ); //
GDK_Hiragana
+ keyMap.put( Integer.valueOf(KeyEvent.VK_KATAKANA), new GNOMEKeyInfo( 0xFF26, "Katakana" ) ); //
GDK_Katakana
+ keyMap.put( Integer.valueOf(KeyEvent.VK_KANA_LOCK), new GNOMEKeyInfo( 0xFF2D, "Kana_Lock" ) ); //
GDK_Kana_Lock
+ keyMap.put( Integer.valueOf(KeyEvent.VK_KANA), new GNOMEKeyInfo( 0xFF2E, "Kana_Shift" ) ); //
GDK_Kana_Shift
+ keyMap.put( Integer.valueOf(KeyEvent.VK_KANJI), new GNOMEKeyInfo( 0xFF37, "Kanji_Bangou" ) ); //
GDK_Kanji_Bangou
- keyMap.put( new Integer(KeyEvent.VK_HOME), new GNOMEKeyInfo( 0xFF50, "Home" ) ); // GDK_Home
- keyMap.put( new Integer(KeyEvent.VK_LEFT), new GNOMEKeyInfo( 0xFF51, "Left" ) ); // GDK_Left
- keyMap.put( new Integer(KeyEvent.VK_UP), new GNOMEKeyInfo( 0xFF52, "Up" ) ); // GDK_Up
- keyMap.put( new Integer(KeyEvent.VK_RIGHT), new GNOMEKeyInfo( 0xFF53, "Right" ) ); // GDK_Right
- keyMap.put( new Integer(KeyEvent.VK_DOWN), new GNOMEKeyInfo( 0xFF54, "Down" ) ); // GDK_Down
- keyMap.put( new Integer(KeyEvent.VK_PAGE_UP), new GNOMEKeyInfo( 0xFF55, "Page_Up" ) ); //
GDK_Page_Up
- keyMap.put( new Integer(KeyEvent.VK_PAGE_DOWN), new GNOMEKeyInfo( 0xFF56, "Page_Down" ) ); //
GDK_Page_Down
- keyMap.put( new Integer(KeyEvent.VK_END), new GNOMEKeyInfo( 0xFF57, "End" ) ); // GDK_End
- keyMap.put( new Integer(KeyEvent.VK_PRINTSCREEN), new GNOMEKeyInfo( 0xFF61, "Print" ) ); // GDK_Print
- keyMap.put( new Integer(KeyEvent.VK_INSERT), new GNOMEKeyInfo( 0xFF63, "Insert" ) ); // GDK_Insert
- keyMap.put( new Integer(KeyEvent.VK_UNDO), new GNOMEKeyInfo( 0xFF65, "Undo" ) ); // GDK_Undo
- keyMap.put( new Integer(KeyEvent.VK_AGAIN), new GNOMEKeyInfo( 0xFF66, "Redo" ) ); // GDK_Redo
- keyMap.put( new Integer(KeyEvent.VK_FIND), new GNOMEKeyInfo( 0xFF68, "Find" ) ); // GDK_Find
- keyMap.put( new Integer(KeyEvent.VK_CANCEL), new GNOMEKeyInfo( 0xFF69, "Cancel" ) ); // GDK_Cancel
- keyMap.put( new Integer(KeyEvent.VK_HELP), new GNOMEKeyInfo( 0xFF6A, "Help" ) ); // GDK_Help
- keyMap.put( new Integer(KeyEvent.VK_ALT_GRAPH), new GNOMEKeyInfo( 0xFF7E, "Mode_Switch" ) ); //
GDK_Mode_Switch
- keyMap.put( new Integer(KeyEvent.VK_NUM_LOCK), new GNOMEKeyInfo( 0xFF7F, "Num_Lock" ) ); //
GDK_Num_Lock
- keyMap.put( new Integer(KeyEvent.VK_KP_LEFT), new GNOMEKeyInfo( 0xFF96, "KP_Left" ) ); //
GDK_KP_Left
- keyMap.put( new Integer(KeyEvent.VK_KP_UP), new GNOMEKeyInfo( 0xFF97, "KP_Up" ) ); // GDK_KP_Up
- keyMap.put( new Integer(KeyEvent.VK_KP_RIGHT), new GNOMEKeyInfo( 0xFF98, "KP_Right" ) ); //
GDK_KP_Right
- keyMap.put( new Integer(KeyEvent.VK_KP_DOWN), new GNOMEKeyInfo( 0xFF99, "KP_Down" ) ); //
GDK_KP_Down
+ keyMap.put( Integer.valueOf(KeyEvent.VK_HOME), new GNOMEKeyInfo( 0xFF50, "Home" ) ); // GDK_Home
+ keyMap.put( Integer.valueOf(KeyEvent.VK_LEFT), new GNOMEKeyInfo( 0xFF51, "Left" ) ); // GDK_Left
+ keyMap.put( Integer.valueOf(KeyEvent.VK_UP), new GNOMEKeyInfo( 0xFF52, "Up" ) ); // GDK_Up
+ keyMap.put( Integer.valueOf(KeyEvent.VK_RIGHT), new GNOMEKeyInfo( 0xFF53, "Right" ) ); //
GDK_Right
+ keyMap.put( Integer.valueOf(KeyEvent.VK_DOWN), new GNOMEKeyInfo( 0xFF54, "Down" ) ); // GDK_Down
+ keyMap.put( Integer.valueOf(KeyEvent.VK_PAGE_UP), new GNOMEKeyInfo( 0xFF55, "Page_Up" ) ); //
GDK_Page_Up
+ keyMap.put( Integer.valueOf(KeyEvent.VK_PAGE_DOWN), new GNOMEKeyInfo( 0xFF56, "Page_Down" ) ); //
GDK_Page_Down
+ keyMap.put( Integer.valueOf(KeyEvent.VK_END), new GNOMEKeyInfo( 0xFF57, "End" ) ); // GDK_End
+ keyMap.put( Integer.valueOf(KeyEvent.VK_PRINTSCREEN), new GNOMEKeyInfo( 0xFF61, "Print" ) ); //
GDK_Print
+ keyMap.put( Integer.valueOf(KeyEvent.VK_INSERT), new GNOMEKeyInfo( 0xFF63, "Insert" ) ); //
GDK_Insert
+ keyMap.put( Integer.valueOf(KeyEvent.VK_UNDO), new GNOMEKeyInfo( 0xFF65, "Undo" ) ); // GDK_Undo
+ keyMap.put( Integer.valueOf(KeyEvent.VK_AGAIN), new GNOMEKeyInfo( 0xFF66, "Redo" ) ); // GDK_Redo
+ keyMap.put( Integer.valueOf(KeyEvent.VK_FIND), new GNOMEKeyInfo( 0xFF68, "Find" ) ); // GDK_Find
+ keyMap.put( Integer.valueOf(KeyEvent.VK_CANCEL), new GNOMEKeyInfo( 0xFF69, "Cancel" ) ); //
GDK_Cancel
+ keyMap.put( Integer.valueOf(KeyEvent.VK_HELP), new GNOMEKeyInfo( 0xFF6A, "Help" ) ); // GDK_Help
+ keyMap.put( Integer.valueOf(KeyEvent.VK_ALT_GRAPH), new GNOMEKeyInfo( 0xFF7E, "Mode_Switch" ) ); //
GDK_Mode_Switch
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUM_LOCK), new GNOMEKeyInfo( 0xFF7F, "Num_Lock" ) ); //
GDK_Num_Lock
+ keyMap.put( Integer.valueOf(KeyEvent.VK_KP_LEFT), new GNOMEKeyInfo( 0xFF96, "KP_Left" ) ); //
GDK_KP_Left
+ keyMap.put( Integer.valueOf(KeyEvent.VK_KP_UP), new GNOMEKeyInfo( 0xFF97, "KP_Up" ) ); //
GDK_KP_Up
+ keyMap.put( Integer.valueOf(KeyEvent.VK_KP_RIGHT), new GNOMEKeyInfo( 0xFF98, "KP_Right" ) ); //
GDK_KP_Right
+ keyMap.put( Integer.valueOf(KeyEvent.VK_KP_DOWN), new GNOMEKeyInfo( 0xFF99, "KP_Down" ) ); //
GDK_KP_Down
// For Key's that are NUMPAD, but no VK_KP_* equivalent exists
// NOTE: Some syms do have VK_KP equivalents, but may or may not have
// KeyLocation() set to NUMPAD - so these are in twice with and
// without the offset..
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUM_LOCK), new GNOMEKeyInfo( 0xFF7F, "Num_Lock"
) ); // GDK_Num_Lock
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_ENTER), new GNOMEKeyInfo( 0xFF8D, "KP_Enter"
) ); // GDK_KP_Enter
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_HOME), new GNOMEKeyInfo( 0xFF95, "KP_Home" )
); // GDK_KP_Home
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_KP_LEFT), new GNOMEKeyInfo( 0xFF96, "KP_Left" )
); // GDK_KP_Left
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_KP_UP), new GNOMEKeyInfo( 0xFF97, "KP_Up" )
); // GDK_KP_Up
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_KP_RIGHT), new GNOMEKeyInfo( 0xFF98, "KP_Right"
) ); // GDK_KP_Right
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_KP_DOWN), new GNOMEKeyInfo( 0xFF99, "KP_Down" )
); // GDK_KP_Down
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_PAGE_UP), new GNOMEKeyInfo( 0xFF9A,
"KP_Page_Up" ) ); // GDK_KP_Page_Up
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_PAGE_DOWN), new GNOMEKeyInfo( 0xFF9B,
"KP_Page_Down" ) ); // GDK_KP_Page_Down
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_END), new GNOMEKeyInfo( 0xFF9C, "KP_End" )
); // GDK_KP_End
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_BEGIN), new GNOMEKeyInfo( 0xFF9D, "KP_Begin"
) ); // GDK_KP_Begin
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_INSERT), new GNOMEKeyInfo( 0xFF9E, "KP_Insert"
) ); // GDK_KP_Insert
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_DELETE), new GNOMEKeyInfo( 0xFF9F, "KP_Delete"
) ); // GDK_KP_Delete
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_MULTIPLY), new GNOMEKeyInfo( 0xFFAA,
"KP_Multiply" ) ); // GDK_KP_Multiply
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_ADD), new GNOMEKeyInfo( 0xFFAB, "KP_Add" )
); // GDK_KP_Add
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_SEPARATOR), new GNOMEKeyInfo( 0xFFAC,
"KP_Separator" ) ); // GDK_KP_Separator
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_SUBTRACT), new GNOMEKeyInfo( 0xFFAD,
"KP_Subtract" ) ); // GDK_KP_Subtract
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_DECIMAL), new GNOMEKeyInfo( 0xFFAE,
"KP_Decimal" ) ); // GDK_KP_Decimal
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_DIVIDE), new GNOMEKeyInfo( 0xFFAF, "KP_Divide"
) ); // GDK_KP_Divide
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD0), new GNOMEKeyInfo( 0xFFB0, "KP_0" ) );
// GDK_KP_0
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD1), new GNOMEKeyInfo( 0xFFB1, "KP_1" ) );
// GDK_KP_1
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD2), new GNOMEKeyInfo( 0xFFB2, "KP_2" ) );
// GDK_KP_2
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD3), new GNOMEKeyInfo( 0xFFB3, "KP_3" ) );
// GDK_KP_3
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD4), new GNOMEKeyInfo( 0xFFB4, "KP_4" ) );
// GDK_KP_4
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD5), new GNOMEKeyInfo( 0xFFB5, "KP_5" ) );
// GDK_KP_5
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD6), new GNOMEKeyInfo( 0xFFB6, "KP_6" ) );
// GDK_KP_6
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD7), new GNOMEKeyInfo( 0xFFB7, "KP_7" ) );
// GDK_KP_7
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD8), new GNOMEKeyInfo( 0xFFB8, "KP_8" ) );
// GDK_KP_8
- keyMap.put( new Integer(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD9), new GNOMEKeyInfo( 0xFFB9, "KP_9" ) );
// GDK_KP_9
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUM_LOCK), new GNOMEKeyInfo( 0xFF7F,
"Num_Lock" ) ); // GDK_Num_Lock
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_ENTER), new GNOMEKeyInfo( 0xFF8D,
"KP_Enter" ) ); // GDK_KP_Enter
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_HOME), new GNOMEKeyInfo( 0xFF95,
"KP_Home" ) ); // GDK_KP_Home
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_KP_LEFT), new GNOMEKeyInfo( 0xFF96,
"KP_Left" ) ); // GDK_KP_Left
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_KP_UP), new GNOMEKeyInfo( 0xFF97, "KP_Up"
) ); // GDK_KP_Up
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_KP_RIGHT), new GNOMEKeyInfo( 0xFF98,
"KP_Right" ) ); // GDK_KP_Right
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_KP_DOWN), new GNOMEKeyInfo( 0xFF99,
"KP_Down" ) ); // GDK_KP_Down
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_PAGE_UP), new GNOMEKeyInfo( 0xFF9A,
"KP_Page_Up" ) ); // GDK_KP_Page_Up
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_PAGE_DOWN), new GNOMEKeyInfo( 0xFF9B,
"KP_Page_Down" ) ); // GDK_KP_Page_Down
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_END), new GNOMEKeyInfo( 0xFF9C,
"KP_End" ) ); // GDK_KP_End
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_BEGIN), new GNOMEKeyInfo( 0xFF9D,
"KP_Begin" ) ); // GDK_KP_Begin
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_INSERT), new GNOMEKeyInfo( 0xFF9E,
"KP_Insert" ) ); // GDK_KP_Insert
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_DELETE), new GNOMEKeyInfo( 0xFF9F,
"KP_Delete" ) ); // GDK_KP_Delete
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_MULTIPLY), new GNOMEKeyInfo( 0xFFAA,
"KP_Multiply" ) ); // GDK_KP_Multiply
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_ADD), new GNOMEKeyInfo( 0xFFAB,
"KP_Add" ) ); // GDK_KP_Add
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_SEPARATOR), new GNOMEKeyInfo( 0xFFAC,
"KP_Separator" ) ); // GDK_KP_Separator
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_SUBTRACT), new GNOMEKeyInfo( 0xFFAD,
"KP_Subtract" ) ); // GDK_KP_Subtract
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_DECIMAL), new GNOMEKeyInfo( 0xFFAE,
"KP_Decimal" ) ); // GDK_KP_Decimal
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_DIVIDE), new GNOMEKeyInfo( 0xFFAF,
"KP_Divide" ) ); // GDK_KP_Divide
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD0), new GNOMEKeyInfo( 0xFFB0, "KP_0"
) ); // GDK_KP_0
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD1), new GNOMEKeyInfo( 0xFFB1, "KP_1"
) ); // GDK_KP_1
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD2), new GNOMEKeyInfo( 0xFFB2, "KP_2"
) ); // GDK_KP_2
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD3), new GNOMEKeyInfo( 0xFFB3, "KP_3"
) ); // GDK_KP_3
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD4), new GNOMEKeyInfo( 0xFFB4, "KP_4"
) ); // GDK_KP_4
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD5), new GNOMEKeyInfo( 0xFFB5, "KP_5"
) ); // GDK_KP_5
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD6), new GNOMEKeyInfo( 0xFFB6, "KP_6"
) ); // GDK_KP_6
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD7), new GNOMEKeyInfo( 0xFFB7, "KP_7"
) ); // GDK_KP_7
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD8), new GNOMEKeyInfo( 0xFFB8, "KP_8"
) ); // GDK_KP_8
+ keyMap.put( Integer.valueOf(NUMPAD_OFFSET + KeyEvent.VK_NUMPAD9), new GNOMEKeyInfo( 0xFFB9, "KP_9"
) ); // GDK_KP_9
- keyMap.put( new Integer(KeyEvent.VK_NUMPAD0), new GNOMEKeyInfo( 0xFFB0, "KP_0" ) ); // GDK_KP_0
- keyMap.put( new Integer(KeyEvent.VK_NUMPAD1), new GNOMEKeyInfo( 0xFFB1, "KP_1" ) ); // GDK_KP_1
- keyMap.put( new Integer(KeyEvent.VK_NUMPAD2), new GNOMEKeyInfo( 0xFFB2, "KP_2" ) ); // GDK_KP_2
- keyMap.put( new Integer(KeyEvent.VK_NUMPAD3), new GNOMEKeyInfo( 0xFFB3, "KP_3" ) ); // GDK_KP_3
- keyMap.put( new Integer(KeyEvent.VK_NUMPAD4), new GNOMEKeyInfo( 0xFFB4, "KP_4" ) ); // GDK_KP_4
- keyMap.put( new Integer(KeyEvent.VK_NUMPAD5), new GNOMEKeyInfo( 0xFFB5, "KP_5" ) ); // GDK_KP_5
- keyMap.put( new Integer(KeyEvent.VK_NUMPAD6), new GNOMEKeyInfo( 0xFFB6, "KP_6" ) ); // GDK_KP_6
- keyMap.put( new Integer(KeyEvent.VK_NUMPAD7), new GNOMEKeyInfo( 0xFFB7, "KP_7" ) ); // GDK_KP_7
- keyMap.put( new Integer(KeyEvent.VK_NUMPAD8), new GNOMEKeyInfo( 0xFFB8, "KP_8" ) ); // GDK_KP_8
- keyMap.put( new Integer(KeyEvent.VK_NUMPAD9), new GNOMEKeyInfo( 0xFFB9, "KP_9" ) ); // GDK_KP_9
- keyMap.put( new Integer(KeyEvent.VK_F1), new GNOMEKeyInfo( 0xFFBE, "F1" ) ); // GDK_F1
- keyMap.put( new Integer(KeyEvent.VK_F2), new GNOMEKeyInfo( 0xFFBF, "F2" ) ); // GDK_F2
- keyMap.put( new Integer(KeyEvent.VK_F3), new GNOMEKeyInfo( 0xFFC0, "F3" ) ); // GDK_F3
- keyMap.put( new Integer(KeyEvent.VK_F4), new GNOMEKeyInfo( 0xFFC1, "F4" ) ); // GDK_F4
- keyMap.put( new Integer(KeyEvent.VK_F5), new GNOMEKeyInfo( 0xFFC2, "F5" ) ); // GDK_F5
- keyMap.put( new Integer(KeyEvent.VK_F6), new GNOMEKeyInfo( 0xFFC3, "F6" ) ); // GDK_F6
- keyMap.put( new Integer(KeyEvent.VK_F7), new GNOMEKeyInfo( 0xFFC4, "F7" ) ); // GDK_F7
- keyMap.put( new Integer(KeyEvent.VK_F8), new GNOMEKeyInfo( 0xFFC5, "F8" ) ); // GDK_F8
- keyMap.put( new Integer(KeyEvent.VK_F9), new GNOMEKeyInfo( 0xFFC6, "F9" ) ); // GDK_F9
- keyMap.put( new Integer(KeyEvent.VK_F10), new GNOMEKeyInfo( 0xFFC7, "F10" ) ); // GDK_F10
- keyMap.put( new Integer(KeyEvent.VK_F11), new GNOMEKeyInfo( 0xFFC8, "F11" ) ); // GDK_F11
- keyMap.put( new Integer(KeyEvent.VK_F12), new GNOMEKeyInfo( 0xFFC9, "F12" ) ); // GDK_F12
- keyMap.put( new Integer(KeyEvent.VK_F13), new GNOMEKeyInfo( 0xFFCA, "F13" ) ); // GDK_F13
- keyMap.put( new Integer(KeyEvent.VK_F14), new GNOMEKeyInfo( 0xFFCB, "F14" ) ); // GDK_F14
- keyMap.put( new Integer(KeyEvent.VK_F15), new GNOMEKeyInfo( 0xFFCC, "F15" ) ); // GDK_F15
- keyMap.put( new Integer(KeyEvent.VK_F16), new GNOMEKeyInfo( 0xFFCD, "F16" ) ); // GDK_F16
- keyMap.put( new Integer(KeyEvent.VK_F17), new GNOMEKeyInfo( 0xFFCE, "F17" ) ); // GDK_F17
- keyMap.put( new Integer(KeyEvent.VK_F18), new GNOMEKeyInfo( 0xFFCF, "F18" ) ); // GDK_F18
- keyMap.put( new Integer(KeyEvent.VK_F19), new GNOMEKeyInfo( 0xFFD0, "F19" ) ); // GDK_F19
- keyMap.put( new Integer(KeyEvent.VK_F20), new GNOMEKeyInfo( 0xFFD1, "F20" ) ); // GDK_F20
- keyMap.put( new Integer(KeyEvent.VK_F21), new GNOMEKeyInfo( 0xFFD2, "F21" ) ); // GDK_F21
- keyMap.put( new Integer(KeyEvent.VK_F22), new GNOMEKeyInfo( 0xFFD3, "F22" ) ); // GDK_F22
- keyMap.put( new Integer(KeyEvent.VK_F23), new GNOMEKeyInfo( 0xFFD4, "F23" ) ); // GDK_F23
- keyMap.put( new Integer(KeyEvent.VK_F24), new GNOMEKeyInfo( 0xFFD5, "F24" ) ); // GDK_F24
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUMPAD0), new GNOMEKeyInfo( 0xFFB0, "KP_0" ) ); // GDK_KP_0
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUMPAD1), new GNOMEKeyInfo( 0xFFB1, "KP_1" ) ); // GDK_KP_1
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUMPAD2), new GNOMEKeyInfo( 0xFFB2, "KP_2" ) ); // GDK_KP_2
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUMPAD3), new GNOMEKeyInfo( 0xFFB3, "KP_3" ) ); // GDK_KP_3
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUMPAD4), new GNOMEKeyInfo( 0xFFB4, "KP_4" ) ); // GDK_KP_4
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUMPAD5), new GNOMEKeyInfo( 0xFFB5, "KP_5" ) ); // GDK_KP_5
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUMPAD6), new GNOMEKeyInfo( 0xFFB6, "KP_6" ) ); // GDK_KP_6
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUMPAD7), new GNOMEKeyInfo( 0xFFB7, "KP_7" ) ); // GDK_KP_7
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUMPAD8), new GNOMEKeyInfo( 0xFFB8, "KP_8" ) ); // GDK_KP_8
+ keyMap.put( Integer.valueOf(KeyEvent.VK_NUMPAD9), new GNOMEKeyInfo( 0xFFB9, "KP_9" ) ); // GDK_KP_9
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F1), new GNOMEKeyInfo( 0xFFBE, "F1" ) ); // GDK_F1
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F2), new GNOMEKeyInfo( 0xFFBF, "F2" ) ); // GDK_F2
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F3), new GNOMEKeyInfo( 0xFFC0, "F3" ) ); // GDK_F3
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F4), new GNOMEKeyInfo( 0xFFC1, "F4" ) ); // GDK_F4
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F5), new GNOMEKeyInfo( 0xFFC2, "F5" ) ); // GDK_F5
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F6), new GNOMEKeyInfo( 0xFFC3, "F6" ) ); // GDK_F6
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F7), new GNOMEKeyInfo( 0xFFC4, "F7" ) ); // GDK_F7
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F8), new GNOMEKeyInfo( 0xFFC5, "F8" ) ); // GDK_F8
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F9), new GNOMEKeyInfo( 0xFFC6, "F9" ) ); // GDK_F9
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F10), new GNOMEKeyInfo( 0xFFC7, "F10" ) ); // GDK_F10
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F11), new GNOMEKeyInfo( 0xFFC8, "F11" ) ); // GDK_F11
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F12), new GNOMEKeyInfo( 0xFFC9, "F12" ) ); // GDK_F12
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F13), new GNOMEKeyInfo( 0xFFCA, "F13" ) ); // GDK_F13
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F14), new GNOMEKeyInfo( 0xFFCB, "F14" ) ); // GDK_F14
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F15), new GNOMEKeyInfo( 0xFFCC, "F15" ) ); // GDK_F15
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F16), new GNOMEKeyInfo( 0xFFCD, "F16" ) ); // GDK_F16
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F17), new GNOMEKeyInfo( 0xFFCE, "F17" ) ); // GDK_F17
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F18), new GNOMEKeyInfo( 0xFFCF, "F18" ) ); // GDK_F18
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F19), new GNOMEKeyInfo( 0xFFD0, "F19" ) ); // GDK_F19
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F20), new GNOMEKeyInfo( 0xFFD1, "F20" ) ); // GDK_F20
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F21), new GNOMEKeyInfo( 0xFFD2, "F21" ) ); // GDK_F21
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F22), new GNOMEKeyInfo( 0xFFD3, "F22" ) ); // GDK_F22
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F23), new GNOMEKeyInfo( 0xFFD4, "F23" ) ); // GDK_F23
+ keyMap.put( Integer.valueOf(KeyEvent.VK_F24), new GNOMEKeyInfo( 0xFFD5, "F24" ) ); // GDK_F24
- keyMap.put( new Integer(KeyEvent.VK_SHIFT), new GNOMEKeyInfo( 0xFFE2, "Shift_R" ) ); //
GDK_Shift_R
- keyMap.put( new Integer(KeyEvent.VK_CONTROL), new GNOMEKeyInfo( 0xFFE4, "Control_R" ) ); //
GDK_Control_R
- keyMap.put( new Integer(KeyEvent.VK_CAPS_LOCK), new GNOMEKeyInfo( 0xFFE5, "Caps_Lock" ) ); //
GDK_Caps_Lock
- keyMap.put( new Integer(KeyEvent.VK_META), new GNOMEKeyInfo( 0xFFE8, "Meta_R" ) ); // GDK_Meta_R
- keyMap.put( new Integer(KeyEvent.VK_ALT), new GNOMEKeyInfo( 0xFFEA, "Alt_R" ) ); // GDK_Alt_R
- keyMap.put( new Integer(KeyEvent.VK_DELETE), new GNOMEKeyInfo( 0xFFFF, "Delete" ) ); // GDK_Delete
+ keyMap.put( Integer.valueOf(KeyEvent.VK_SHIFT), new GNOMEKeyInfo( 0xFFE2, "Shift_R" ) ); //
GDK_Shift_R
+ keyMap.put( Integer.valueOf(KeyEvent.VK_CONTROL), new GNOMEKeyInfo( 0xFFE4, "Control_R" ) ); //
GDK_Control_R
+ keyMap.put( Integer.valueOf(KeyEvent.VK_CAPS_LOCK), new GNOMEKeyInfo( 0xFFE5, "Caps_Lock" ) ); //
GDK_Caps_Lock
+ keyMap.put( Integer.valueOf(KeyEvent.VK_META), new GNOMEKeyInfo( 0xFFE8, "Meta_R" ) ); //
GDK_Meta_R
+ keyMap.put( Integer.valueOf(KeyEvent.VK_ALT), new GNOMEKeyInfo( 0xFFEA, "Alt_R" ) ); //
GDK_Alt_R
+ keyMap.put( Integer.valueOf(KeyEvent.VK_DELETE), new GNOMEKeyInfo( 0xFFFF, "Delete" ) ); //
GDK_Delete
// Left & Right Variations, default (set above) will be right...
- keyMap.put( new Integer(LEFT_OFFSET + KeyEvent.VK_SHIFT), new GNOMEKeyInfo( 0xFFE1, "Shift_L" ) ); //
GDK_Shift_L
- keyMap.put( new Integer(RIGHT_OFFSET + KeyEvent.VK_SHIFT), new GNOMEKeyInfo( 0xFFE2, "Shift_R" ) ); //
GDK_Shift_R
- keyMap.put( new Integer(LEFT_OFFSET + KeyEvent.VK_CONTROL),new GNOMEKeyInfo( 0xFFE3, "Control_L" ) );
// GDK_Control_L
- keyMap.put( new Integer(RIGHT_OFFSET + KeyEvent.VK_CONTROL),new GNOMEKeyInfo( 0xFFE4, "Control_R" ) );
// GDK_Control_R
- keyMap.put( new Integer(LEFT_OFFSET + KeyEvent.VK_META), new GNOMEKeyInfo( 0xFFE7, "Meta_L" ) ); //
GDK_Meta_L
- keyMap.put( new Integer(RIGHT_OFFSET + KeyEvent.VK_META), new GNOMEKeyInfo( 0xFFE8, "Meta_R" ) ); //
GDK_Meta_R
- keyMap.put( new Integer(LEFT_OFFSET + KeyEvent.VK_ALT), new GNOMEKeyInfo( 0xFFE9, "Alt_L" ) ); //
GDK_Alt_L
- keyMap.put( new Integer(RIGHT_OFFSET + KeyEvent.VK_ALT), new GNOMEKeyInfo( 0xFFEA, "Alt_R" ) ); //
GDK_Alt_R
+ keyMap.put( Integer.valueOf(LEFT_OFFSET + KeyEvent.VK_SHIFT), new GNOMEKeyInfo( 0xFFE1, "Shift_L" ) );
// GDK_Shift_L
+ keyMap.put( Integer.valueOf(RIGHT_OFFSET + KeyEvent.VK_SHIFT), new GNOMEKeyInfo( 0xFFE2, "Shift_R" ) );
// GDK_Shift_R
+ keyMap.put( Integer.valueOf(LEFT_OFFSET + KeyEvent.VK_CONTROL),new GNOMEKeyInfo( 0xFFE3, "Control_L" )
); // GDK_Control_L
+ keyMap.put( Integer.valueOf(RIGHT_OFFSET + KeyEvent.VK_CONTROL),new GNOMEKeyInfo( 0xFFE4, "Control_R" )
); // GDK_Control_R
+ keyMap.put( Integer.valueOf(LEFT_OFFSET + KeyEvent.VK_META), new GNOMEKeyInfo( 0xFFE7, "Meta_L" ) );
// GDK_Meta_L
+ keyMap.put( Integer.valueOf(RIGHT_OFFSET + KeyEvent.VK_META), new GNOMEKeyInfo( 0xFFE8, "Meta_R" ) );
// GDK_Meta_R
+ keyMap.put( Integer.valueOf(LEFT_OFFSET + KeyEvent.VK_ALT), new GNOMEKeyInfo( 0xFFE9, "Alt_L" ) );
// GDK_Alt_L
+ keyMap.put( Integer.valueOf(RIGHT_OFFSET + KeyEvent.VK_ALT), new GNOMEKeyInfo( 0xFFEA, "Alt_R" ) );
// GDK_Alt_R
}
}
diff --git a/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
b/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
index 128fb40..61aff2d 100644
--- a/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
+++ b/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
@@ -27,7 +27,6 @@ import java.io.*;
import javax.accessibility.*;
import java.awt.Toolkit;
import javax.management.*;
-import java.util.*;
import javax.swing.JComboBox;
import java.lang.management.*;
@@ -488,7 +487,7 @@ public class AtkWrapper {
}
Object[] args = new Object[2];
- args[0] = new Integer(child_ac.getAccessibleIndexInParent());
+ args[0] = Integer.valueOf(child_ac.getAccessibleIndexInParent());
args[1] = child_ac;
emitSignal(ac, AtkSignal.OBJECT_CHILDREN_CHANGED_ADD, args);
@@ -502,7 +501,7 @@ public class AtkWrapper {
}
Object[] args = new Object[2];
- args[0] = new Integer(child_ac.getAccessibleIndexInParent());
+ args[0] = Integer.valueOf(child_ac.getAccessibleIndexInParent());
args[1] = child_ac;
emitSignal(ac, AtkSignal.OBJECT_CHILDREN_CHANGED_REMOVE, args);
@@ -555,8 +554,8 @@ public class AtkWrapper {
}else if( propertyName.equals(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY) ) {
if (oldValue instanceof Number && newValue instanceof Number) {
Object[] args = new Object[2];
- args[0] = new Double(((Number)oldValue).doubleValue());
- args[1] = new Double(((Number)newValue).doubleValue());
+ args[0] = Double.valueOf(((Number)oldValue).doubleValue());
+ args[1] = Double.valueOf(((Number)newValue).doubleValue());
emitSignal(ac, AtkSignal.OBJECT_PROPERTY_CHANGE_ACCESSIBLE_VALUE, args);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
