diff --git a/src/org/synthuse/Config.java b/src/org/synthuse/Config.java index 953582e..37504f5 100644 --- a/src/org/synthuse/Config.java +++ b/src/org/synthuse/Config.java @@ -70,7 +70,7 @@ public class Config extends PropertiesSerializer { alwaysOnTop=aNewValue?"true":"false"; } - public int getRefreshKeyCode() + public char getRefreshKey() { String keyStr = ""; if (this.refreshKey == null) @@ -79,14 +79,19 @@ public class Config extends PropertiesSerializer { keyStr = new Config().refreshKey; //use default value else keyStr = this.refreshKey; - return RobotMacro.getKeyCode(keyStr.charAt(0))[0]; + return keyStr.charAt(0); } - public void setRefreshKeyCode(String aText) { + public int getRefreshKeyCode() + { + return RobotMacro.getKeyCode(this.getRefreshKey())[0]; + } + + public void setRefreshKey(String aText) { this.refreshKey=aText; } - public int getTargetKeyCode() + public char getTargetKey() { String keyStr = ""; if (this.targetKey == null) @@ -95,10 +100,15 @@ public class Config extends PropertiesSerializer { keyStr = new Config().targetKey; //use default value else keyStr = this.targetKey; - return RobotMacro.getKeyCode(keyStr.charAt(0))[0]; + return keyStr.charAt(0); } - public void setTargetKeyCode(String aText) { + public int getTargetKeyCode() + { + return RobotMacro.getKeyCode(this.getTargetKey())[0]; + } + + public void setTargetKey(String aText) { this.targetKey=aText; } diff --git a/src/org/synthuse/PropertiesSerializer.java b/src/org/synthuse/PropertiesSerializer.java index 123bee6..f29c839 100644 --- a/src/org/synthuse/PropertiesSerializer.java +++ b/src/org/synthuse/PropertiesSerializer.java @@ -88,7 +88,7 @@ public class PropertiesSerializer { fields[i].set(this, Boolean.parseBoolean(myProperty + "")); else fields[i].set(this, myProperty); -// System.out.println("Property "+pName+"["+pType+"] set to: "+myProperty); + System.out.println("Property "+pName+"["+pType+"] set to: "+myProperty); } } catch (Exception e) diff --git a/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java b/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java index da619b3..c3d7fbd 100755 --- a/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java +++ b/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java @@ -14,9 +14,9 @@ public class SynthuseConfigDialogControllers { aSynthuseConfigPanel.getAlwaysOnTopCheckBox().setSelected(aConfig.isAlwaysOnTop()); aSynthuseConfigPanel.getDisableFiltersUiaCheckBox().setSelected(aConfig.isFilterUiaDisabled()); aSynthuseConfigPanel.getDisableUiaBridgeCheckBox().setSelected(aConfig.isUiaBridgeDisabled()); - aSynthuseConfigPanel.getRefreshKeyTextField().setText(Integer.toString(aConfig.getRefreshKeyCode())); + aSynthuseConfigPanel.getRefreshKeyTextField().setText(Character.toString(aConfig.getRefreshKey())); aSynthuseConfigPanel.getStrongTextMatchingCheckBox().setSelected(aConfig.isUseStrongTextMatching()); - aSynthuseConfigPanel.getTargetKeyTextField().setText(Integer.toString(aConfig.getTargetKeyCode())); + aSynthuseConfigPanel.getTargetKeyTextField().setText(Character.toString(aConfig.getTargetKey())); aSynthuseConfigPanel.getXPathHighlightTextField().setText(aConfig.getXpathHighlight()); aSynthuseConfigPanel.getXPathListTextField().setText(aConfig.getXpathList()); } @@ -59,7 +59,7 @@ public class SynthuseConfigDialogControllers { return new ActionListener() { @Override public void actionPerformed(ActionEvent aE) { - aConfig.setTargetKeyCode(aSynthuseConfigPanel.getTargetKeyTextField().getText()); + aConfig.setTargetKey(aSynthuseConfigPanel.getTargetKeyTextField().getText()); JOptionPane.showMessageDialog(aSynthuseConfigPanel, "May require restart to be effective"); } }; @@ -80,7 +80,7 @@ public class SynthuseConfigDialogControllers { return new ActionListener() { @Override public void actionPerformed(ActionEvent aE) { - aConfig.setRefreshKeyCode(aSynthuseConfigPanel.getRefreshKeyTextField().getText()); + aConfig.setRefreshKey(aSynthuseConfigPanel.getRefreshKeyTextField().getText()); JOptionPane.showMessageDialog(aSynthuseConfigPanel, "May require restart to be effective"); } };