--- old/core/JemmyAWTInput/src/org/jemmy/input/AWTMap.java 2019-03-06 17:23:19.000000000 -0800 +++ /dev/null 2019-03-06 17:23:19.000000000 -0800 @@ -1,193 +0,0 @@ -/* - * Copyright (c) 2007, 2017, 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * 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. - */ -package org.jemmy.input; - - -import java.awt.event.InputEvent; -import java.awt.event.KeyEvent; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.jemmy.JemmyException; -import org.jemmy.interfaces.Keyboard.KeyboardButton; -import org.jemmy.interfaces.Keyboard.KeyboardButtons; -import org.jemmy.interfaces.Keyboard.KeyboardModifiers; -import org.jemmy.interfaces.Modifier; -import org.jemmy.interfaces.Mouse.MouseButton; -import org.jemmy.interfaces.Mouse.MouseButtons; -import org.jemmy.interfaces.Mouse.MouseModifiers; - - -/** - * Converts - * @author mrkam - */ -public class AWTMap { - - private static Map int2key = new HashMap(); - private static Map int2modifier = new HashMap(); - private static Map int2button = new HashMap(); - private static Map key2int = new HashMap(); - private static Map modifier2int = new HashMap(); - private static Map button2int = new HashMap(); - - static { - for (KeyboardButtons button : KeyboardButtons.values()) { - String name = button.name(); - try { - int key = KeyEvent.VK_UNDEFINED; - if (name.length() == 2 && name.startsWith("D")) { - // digit - key = KeyEvent.class.getDeclaredField("VK_" + name.substring(1)).getInt(null); - } else { - key = KeyEvent.class.getDeclaredField("VK_" + name).getInt(null); - } - int2key.put(key, button); - key2int.put(button, key); - } catch (NoSuchFieldException ex) { - throw new JemmyException("Unable to recognize key", ex, button); - } catch (SecurityException ex) { - throw new JemmyException("Unable to recognize key", ex, button); - } catch (IllegalArgumentException ex) { - throw new JemmyException("Unable to recognize key", ex, button); - } catch (IllegalAccessException ex) { - throw new JemmyException("Unable to recognize key", ex, button); - } - } - for (KeyboardModifiers modifier : KeyboardModifiers.values()) { - String name = modifier.name(); - try { - int key = InputEvent.class.getDeclaredField(name).getInt(null); - int2modifier.put(key, modifier); - modifier2int.put(modifier, key); - } catch (NoSuchFieldException ex) { - throw new JemmyException("Unable to recognize modifier", ex, modifier); - } catch (SecurityException ex) { - throw new JemmyException("Unable to recognize modifier", ex, modifier); - } catch (IllegalArgumentException ex) { - throw new JemmyException("Unable to recognize modifier", ex, modifier); - } catch (IllegalAccessException ex) { - throw new JemmyException("Unable to recognize modifier", ex, modifier); - } - } - for (MouseModifiers modifier : MouseModifiers.values()) { - String name = modifier.name(); - try { - int key = InputEvent.class.getDeclaredField(name).getInt(null); - int2modifier.put(key, modifier); - modifier2int.put(modifier, key); - } catch (NoSuchFieldException ex) { - throw new JemmyException("Unable to recognize modifier", ex, modifier); - } catch (SecurityException ex) { - throw new JemmyException("Unable to recognize modifier", ex, modifier); - } catch (IllegalArgumentException ex) { - throw new JemmyException("Unable to recognize modifier", ex, modifier); - } catch (IllegalAccessException ex) { - throw new JemmyException("Unable to recognize modifier", ex, modifier); - } - } - for (MouseButtons button : MouseButtons.values()) { - String name = button.name(); - try { - int key = InputEvent.class.getDeclaredField(name + "_MASK").getInt(null); - int2button.put(key, button); - button2int.put(button, key); - } catch (NoSuchFieldException ex) { - throw new JemmyException("Unable to recognize button", ex, button); - } catch (SecurityException ex) { - throw new JemmyException("Unable to recognize button", ex, button); - } catch (IllegalArgumentException ex) { - throw new JemmyException("Unable to recognize button", ex, button); - } catch (IllegalAccessException ex) { - throw new JemmyException("Unable to recognize button", ex, button); - } - } - } - - /** - * TODO Provide javadoc - * @param button todo document - * @return One of InputEvent.VK_* constants - * @see InputEvent - */ - public int convert(KeyboardButton button) { - try { - return key2int.get(button); - } catch(Exception e) { - throw new JemmyException("Unable to recognize key", e, button); - } - } - - public int convert(Modifier... modifiers) { - int result = 0; - for (Modifier modifier : modifiers) { - try { - result |= modifier2int.get(modifier); - } catch (Exception e) { - throw new JemmyException("Unable to recognize modifier", e, modifier); - } - } - return result; - } - - public int convert(MouseButton button) { - try { - return button2int.get(button); - } catch (Exception e) { - throw new JemmyException("Unable to recognize mouse button", e, button); - } - } - - public KeyboardButton convertKeyboardButton(int key) { - KeyboardButton res = int2key.get(key); - if (res == null) { - throw new JemmyException("Unable to recognize key", key); - } - return res; - } - - public Modifier[] convertModifiers(int modifiers) { - List result = new ArrayList(); - for (int key : int2modifier.keySet()) { - if ((key & modifiers) != 0) { - Modifier res = int2modifier.get(key); - if (res == null) { - throw new JemmyException("Unable to recognize modifiers", modifiers); - } - result.add(res); - } - } - return result.toArray(new Modifier[result.size()]); - } - - public MouseButton convertMouseButton(int button) { - MouseButton res = int2button.get(button); - if (res == null) { - throw new JemmyException("Unable to recognize mouse button", button); - } - return res; - } -} --- /dev/null 2019-03-06 17:23:19.000000000 -0800 +++ new/core/JemmyAWTInput/src/org/jemmy/input/awt/AWTMap.java 2019-03-06 17:23:19.000000000 -0800 @@ -0,0 +1,193 @@ +/* + * Copyright (c) 2007, 2017, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ +package org.jemmy.input.awt; + + +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.jemmy.JemmyException; +import org.jemmy.interfaces.Keyboard.KeyboardButton; +import org.jemmy.interfaces.Keyboard.KeyboardButtons; +import org.jemmy.interfaces.Keyboard.KeyboardModifiers; +import org.jemmy.interfaces.Modifier; +import org.jemmy.interfaces.Mouse.MouseButton; +import org.jemmy.interfaces.Mouse.MouseButtons; +import org.jemmy.interfaces.Mouse.MouseModifiers; + + +/** + * Converts + * @author mrkam + */ +public class AWTMap { + + private static Map int2key = new HashMap(); + private static Map int2modifier = new HashMap(); + private static Map int2button = new HashMap(); + private static Map key2int = new HashMap(); + private static Map modifier2int = new HashMap(); + private static Map button2int = new HashMap(); + + static { + for (KeyboardButtons button : KeyboardButtons.values()) { + String name = button.name(); + try { + int key = KeyEvent.VK_UNDEFINED; + if (name.length() == 2 && name.startsWith("D")) { + // digit + key = KeyEvent.class.getDeclaredField("VK_" + name.substring(1)).getInt(null); + } else { + key = KeyEvent.class.getDeclaredField("VK_" + name).getInt(null); + } + int2key.put(key, button); + key2int.put(button, key); + } catch (NoSuchFieldException ex) { + throw new JemmyException("Unable to recognize key", ex, button); + } catch (SecurityException ex) { + throw new JemmyException("Unable to recognize key", ex, button); + } catch (IllegalArgumentException ex) { + throw new JemmyException("Unable to recognize key", ex, button); + } catch (IllegalAccessException ex) { + throw new JemmyException("Unable to recognize key", ex, button); + } + } + for (KeyboardModifiers modifier : KeyboardModifiers.values()) { + String name = modifier.name(); + try { + int key = InputEvent.class.getDeclaredField(name).getInt(null); + int2modifier.put(key, modifier); + modifier2int.put(modifier, key); + } catch (NoSuchFieldException ex) { + throw new JemmyException("Unable to recognize modifier", ex, modifier); + } catch (SecurityException ex) { + throw new JemmyException("Unable to recognize modifier", ex, modifier); + } catch (IllegalArgumentException ex) { + throw new JemmyException("Unable to recognize modifier", ex, modifier); + } catch (IllegalAccessException ex) { + throw new JemmyException("Unable to recognize modifier", ex, modifier); + } + } + for (MouseModifiers modifier : MouseModifiers.values()) { + String name = modifier.name(); + try { + int key = InputEvent.class.getDeclaredField(name).getInt(null); + int2modifier.put(key, modifier); + modifier2int.put(modifier, key); + } catch (NoSuchFieldException ex) { + throw new JemmyException("Unable to recognize modifier", ex, modifier); + } catch (SecurityException ex) { + throw new JemmyException("Unable to recognize modifier", ex, modifier); + } catch (IllegalArgumentException ex) { + throw new JemmyException("Unable to recognize modifier", ex, modifier); + } catch (IllegalAccessException ex) { + throw new JemmyException("Unable to recognize modifier", ex, modifier); + } + } + for (MouseButtons button : MouseButtons.values()) { + String name = button.name(); + try { + int key = InputEvent.class.getDeclaredField(name + "_MASK").getInt(null); + int2button.put(key, button); + button2int.put(button, key); + } catch (NoSuchFieldException ex) { + throw new JemmyException("Unable to recognize button", ex, button); + } catch (SecurityException ex) { + throw new JemmyException("Unable to recognize button", ex, button); + } catch (IllegalArgumentException ex) { + throw new JemmyException("Unable to recognize button", ex, button); + } catch (IllegalAccessException ex) { + throw new JemmyException("Unable to recognize button", ex, button); + } + } + } + + /** + * TODO Provide javadoc + * @param button todo document + * @return One of InputEvent.VK_* constants + * @see InputEvent + */ + public int convert(KeyboardButton button) { + try { + return key2int.get(button); + } catch(Exception e) { + throw new JemmyException("Unable to recognize key", e, button); + } + } + + public int convert(Modifier... modifiers) { + int result = 0; + for (Modifier modifier : modifiers) { + try { + result |= modifier2int.get(modifier); + } catch (Exception e) { + throw new JemmyException("Unable to recognize modifier", e, modifier); + } + } + return result; + } + + public int convert(MouseButton button) { + try { + return button2int.get(button); + } catch (Exception e) { + throw new JemmyException("Unable to recognize mouse button", e, button); + } + } + + public KeyboardButton convertKeyboardButton(int key) { + KeyboardButton res = int2key.get(key); + if (res == null) { + throw new JemmyException("Unable to recognize key", key); + } + return res; + } + + public Modifier[] convertModifiers(int modifiers) { + List result = new ArrayList(); + for (int key : int2modifier.keySet()) { + if ((key & modifiers) != 0) { + Modifier res = int2modifier.get(key); + if (res == null) { + throw new JemmyException("Unable to recognize modifiers", modifiers); + } + result.add(res); + } + } + return result.toArray(new Modifier[result.size()]); + } + + public MouseButton convertMouseButton(int button) { + MouseButton res = int2button.get(button); + if (res == null) { + throw new JemmyException("Unable to recognize mouse button", button); + } + return res; + } +}