diff options
| author | Sebastian Struckmann | 2015-08-20 11:07:17 +0000 |
|---|---|---|
| committer | Sebastian Struckmann | 2015-08-25 14:14:56 +0000 |
| commit | 9a6ff55691b2f279ddb5fb8d7de042195f8eaf58 (patch) | |
| tree | c331f8f8d4a7b6bf4ee44a6b9cd4a382090287af /org.eclipse.jubula.rc.swing/src | |
| parent | d1020777c4bb021a99ab8cd001c82635e40256c6 (diff) | |
| download | org.eclipse.jubula.core-9a6ff55691b2f279ddb5fb8d7de042195f8eaf58.tar.gz org.eclipse.jubula.core-9a6ff55691b2f279ddb5fb8d7de042195f8eaf58.tar.xz org.eclipse.jubula.core-9a6ff55691b2f279ddb5fb8d7de042195f8eaf58.zip | |
Sprint task - Support collecting of all supported parents in OMM for JavaFX, see http://eclip.se/472954
Diffstat (limited to 'org.eclipse.jubula.rc.swing/src')
2 files changed, 11 insertions, 6 deletions
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractAutSwingEventListener.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractAutSwingEventListener.java index e8a00c6e9..bb8490747 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractAutSwingEventListener.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractAutSwingEventListener.java @@ -159,9 +159,13 @@ public abstract class AbstractAutSwingEventListener protected void changeCheckModeState(int mode) { ChangeAUTModeMessage msg = new ChangeAUTModeMessage(); msg.setMode(mode); - msg.setKey(AUTServerConfiguration.getInstance().getKey()); - msg.setKeyModifier( - AUTServerConfiguration.getInstance().getKeyMod()); + msg.setMappingKey(AUTServerConfiguration.getInstance().getMappingKey()); + msg.setMappingWithParentsKey(AUTServerConfiguration + .getInstance().getMappingWithParentsKey()); + msg.setMappingKeyModifier(AUTServerConfiguration + .getInstance().getMappingKeyMod()); + msg.setMappingWithParentsKeyModifier(AUTServerConfiguration + .getInstance().getMappingWithParentsKeyMod()); msg.setKey2(AUTServerConfiguration.getInstance().getKey2()); msg.setKey2Modifier( AUTServerConfiguration.getInstance().getKey2Mod()); diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/KeyAcceptor.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/KeyAcceptor.java index 93d98da20..6921b63fc 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/KeyAcceptor.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/KeyAcceptor.java @@ -90,11 +90,12 @@ public class KeyAcceptor { } } if ((inputCode - == AUTServerConfiguration.getInstance().getKey() + == AUTServerConfiguration.getInstance().getMappingKey() || inputCode - == AUTServerConfiguration.getInstance().getMouseButton()) + == AUTServerConfiguration.getInstance() + .getMappingMouseButton()) && keyMod - == AUTServerConfiguration.getInstance().getKeyMod()) { + == AUTServerConfiguration.getInstance().getMappingKeyMod()) { return MAPPING_KEY_COMB; } if (inputCode |